From b2c5dcdafc6ed64d0586143a00e2f8157c3e7117 Mon Sep 17 00:00:00 2001
From: oetiker <oetiker@a5681a0c-68f1-0310-ab6d-d61299d08faa>
Date: Thu, 16 Jul 2009 10:31:22 +0000
Subject: [PATCH] updates

git-svn-id: svn://svn.oetiker.ch/rrdtool/branches/1.3@1873 a5681a0c-68f1-0310-ab6d-d61299d08faa
---
 website/gallery/index.en.html | 26 ++++++++++----------
 website/inc/template.inc      | 36 ++++++++++++++--------------
 website/index.wml             | 45 +++++++++++++----------------------
 website/support.wml           |  9 ++++---
 4 files changed, 53 insertions(+), 63 deletions(-)
diff --git a/website/gallery/index.en.html b/website/gallery/index.en.html
index 3a49b119..0ec3b244 100644
--- a/website/gallery/index.en.html
+++ b/website/gallery/index.en.html
@@ -1,9 +1,9 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.1 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
 <html lang="en" xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=ISO-8859-15" />
-<link REL="icon" HREF="../inc/favicon.ico" TYPE="image/ico" />
+<link rel="icon" href="../inc/favicon.ico" type="image/ico" />
 <title>RRDtool - RRDtool Gallery
 </title>
 
@@ -49,14 +49,14 @@
 <input type="text" name="q" style="width: 180px" maxlength="255" value="" id="sbi"></input>
 </td></tr>
 <tr>
-<td nowrap="nowrap">
+<td nowrap="nowrap" valign="top">
 <table summary="">
 <tr>
 <td>
 <input type="radio" name="sitesearch" value="" id="ss0"></input>
 <label for="ss0" title="Search the Web"><font size="-1" color="#000000">Web</font></label></td>
 <td>
-<input type="radio" name="sitesearch" value="oss.oetiker.ch" checked id="ss1"></input>
+<input type="radio" name="sitesearch" value="oss.oetiker.ch" checked="checked" id="ss1"></input>
 <label for="ss1" title="Search oss.oetiker.ch"><font size="-1" color="#000000">oss.oetiker.ch</font></label></td>
 </tr>
 </table>
@@ -76,7 +76,7 @@
 <br />
 <br />
 <p><b>Gold Sponsors</b></p>
-<p><a href="http://www.loopfuse.net/webrecorder/kredirect?kid=3&cid=LF_00c56f70"><img title="GroundWork Open Source" border="0" alt="GroundWork Open Source Logo" src="../logos/gw200x100.gif" width="200" height="100" /></a></p>
+<p><a href="http://www.loopfuse.net/webrecorder/kredirect?kid=3&amp;cid=LF_00c56f70"><img title="GroundWork Open Source" border="0" alt="GroundWork Open Source Logo" src="../logos/gw200x100.gif" width="200" height="100" /></a></p>
 <p><a href="http://www.zenoss.com/rrdtool?utm_source=rrdtool&amp;utm_medium=logolink&amp;utm_campaign=inbound"><img border="0" title="Zenoss Open Source IT Monitoring" alt="Zenoss Open Source IT Monitoring" src="../logos/zenoss.png" width="200" height="100" /></a></p>
 <p><a href="../sponsor.en.html">Silver Sponsors ...</a></p>
 <br />
@@ -96,14 +96,14 @@
 <!-- ############################# -->
 <!-- # Logo and Body -->
 <!-- ############################# -->
-<td id="bodycell">
+<td id="bodycell" valign="top">
 <div id="mirrors">
-<A HREF="http://oss.oetiker.ch/rrdtool/gallery/index.en.html">Swiss Original</A>.&nbsp;Mirrors:
-<A HREF="http://rrdtool.mirror.graemef.net/gallery/index.en.html">UK</A><!--Graeme Fowler <graeme@graemef.net>-->
-<A HREF="http://rrdtool.cs.pu.edu.tw/gallery/index.en.html">TW</A><!--Hsun-Chang Chang <hsunchang@gmail.com>-->
-<A HREF="http://rrdtool.codemonkey.se/gallery/index.en.html">SE</A><!--Hans Engren <hans@cyclone.se>-->
-<A HREF="http://rrdtool.basemirror.de/gallery/index.en.html">DE</A><!--Baseportal Mirrors <mirrors@baseportal.de>-->
-<A HREF="http://rrdtool.mirroraty.org/gallery/index.en.html">US</A><!--Hossam Hossny <hossam@trexle.com>-->
+<a href="http://oss.oetiker.ch/rrdtool/gallery/index.en.html">Swiss Original</a>.&nbsp;Mirrors:
+<a href="http://rrdtool.mirror.graemef.net/gallery/index.en.html">UK</a><!--Graeme Fowler <graeme@graemef.net>-->
+<a href="http://rrdtool.cs.pu.edu.tw/gallery/index.en.html">TW</a><!--Hsun-Chang Chang <hsunchang@gmail.com>-->
+<a href="http://rrdtool.codemonkey.se/gallery/index.en.html">SE</a><!--Hans Engren <hans@cyclone.se>-->
+<a href="http://rrdtool.basemirror.de/gallery/index.en.html">DE</a><!--Baseportal Mirrors <mirrors@baseportal.de>-->
+<a href="http://rrdtool.mirroraty.org/gallery/index.en.html">US</a><!--Hossam Hossny <hossam@trexle.com>-->
 </div>
 <div id="logo">
 <div class="legacy">
@@ -575,7 +575,7 @@ than 600 pixels.</p>
 <!-- ############################# -->
 <div id="address">
 <small>
-01/25/09 | <A HREF="mailto:tobi@..delete..this..removethis.oetiker.ch">Tobias Oetiker</A> | <A HREF="http://it.oetiker.ch/monitoring/">OETIKER+PARTNER AG</a>
+01/25/09 | <a href="mailto:tobi@..delete..this..removethis.oetiker.ch">Tobias Oetiker</a> | <a href="http://it.oetiker.ch/monitoring/">OETIKER+PARTNER AG</a>
 </small>
 </div>
 </td></tr>
diff --git a/website/inc/template.inc b/website/inc/template.inc
index 38e8395c..59b231e1 100644
--- a/website/inc/template.inc
+++ b/website/inc/template.inc
@@ -1,7 +1,7 @@
 # this seems to confuse just too many things out there ... 
 # guess following the standard is not there yet
-# <?xml version="1.0" encoding="iso-8859-15"?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.1 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<?xml version="1.0" encoding="iso-8859-15"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 # this must be the very first line to make doc-type switching work on IE
 #use wml::std::logo
 #use wml::std::tags
@@ -18,7 +18,7 @@
 <html lang="<lang:star: * />" xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=ISO-8859-15" />
-<link* REL="icon" HREF="$(ROOT)/inc/favicon.ico" TYPE="image/ico" />
+<link* rel="icon" href="$(ROOT)/inc/favicon.ico" type="image/ico" />
 ..Title!>>RRDtool - Page without a Title<<..
 <title*>RRDtool - {#Title#}</title*>
 <protect>
@@ -52,14 +52,14 @@
 <input type="text" name="q" style="width: 180px" maxlength="255" value="" id="sbi"></input>
 </td></tr>
 <tr>
-<td nowrap="nowrap">
+<td nowrap="nowrap" valign="top">
 <table>
 <tr>
 <td>
 <input type="radio" name="sitesearch" value="" id="ss0"></input>
 <label for="ss0" title="Search the Web"><font size="-1" color="#000000">Web</font></label></td>
 <td>
-<input type="radio" name="sitesearch" value="oss.oetiker.ch" checked id="ss1"></input>
+<input type="radio" name="sitesearch" value="oss.oetiker.ch" checked="checked" id="ss1"></input>
 <label for="ss1" title="Search oss.oetiker.ch"><font size="-1" color="#000000">oss.oetiker.ch</font></label></td>
 </tr>
 </table>
@@ -79,7 +79,7 @@
 <br/>
 <br/>
 <p><b>Gold Sponsors</b></p>
-<p><a href="http://www.loopfuse.net/webrecorder/kredirect?kid=3&cid=LF_00c56f70"><img title="GroundWork Open Source" border="0" alt="GroundWork Open Source Logo" src="$(ROOT)/logos/gw200x100.gif"/></a></p>
+<p><a href="http://www.loopfuse.net/webrecorder/kredirect?kid=3&amp;cid=LF_00c56f70"><img title="GroundWork Open Source" border="0" alt="GroundWork Open Source Logo" src="$(ROOT)/logos/gw200x100.gif"/></a></p>
 <p><a href="http://www.zenoss.com/rrdtool?utm_source=rrdtool&amp;utm_medium=logolink&amp;utm_campaign=inbound"><img border="0" title="Zenoss Open Source IT Monitoring" alt="Zenoss Open Source IT Monitoring" src="$(ROOT)/logos/zenoss.png"/></a></p>
 <p><a href="$(ROOT)/sponsor.<lang:star: */>.html">Silver Sponsors ...</a></p>
 <br/>
@@ -99,19 +99,19 @@
 <!-- ############################# -->
 <!-- # Logo and Body -->
 <!-- ############################# -->
-<td id="bodycell">
+<td id="bodycell" valign="top">
 # all mirrors seem dead currently
 <div id="mirrors">
-<A HREF="http://oss.oetiker.ch/rrdtool/<where/>">Swiss Original</A>.&nbsp;Mirrors: 
-<A HREF="http://rrdtool.mirror.graemef.net/<where/>">UK</a><!--Graeme Fowler <graeme@graemef.net>-->
-#<A HREF="http://rrdtool.planetmirror.com/<where/>">AU</A><!--jason andrade <jason@dstc.edu.au>-->
-<A HREF="http://rrdtool.cs.pu.edu.tw/<where/>">TW</A><!--Hsun-Chang Chang <hsunchang@gmail.com>-->
-#<A HREF="http://ftp.heanet.ie/mirrors/oss.oetiker.ch/rrdtool/<where/>">IE</A><!-- <mirrors@heanet.ie>-->
-<A HREF="http://rrdtool.codemonkey.se/<where/>">SE</A><!--Hans Engren <hans@cyclone.se>-->
-<A HREF="http://rrdtool.basemirror.de/<where/>">DE</A><!--Baseportal Mirrors <mirrors@baseportal.de>-->
-<A HREF="http://rrdtool.mirroraty.org/<where/>">US</A><!--Hossam Hossny <hossam@trexle.com>-->
-#<A HREF="http://rrdtool.paracoda.com/<where/>">CA</A><!--Hossam Hossny <admin@paracoda.com>-->
-#<A HREF="http://rrdtool.PlaySystems.ro/<where/>">RO</a><!--dan.draghici@ulbsibiu.ro-->
+<a href="http://oss.oetiker.ch/rrdtool/<where/>">Swiss Original</a>.&nbsp;Mirrors: 
+<a href="http://rrdtool.mirror.graemef.net/<where/>">UK</a><!--Graeme Fowler <graeme@graemef.net>-->
+#<a href="http://rrdtool.planetmirror.com/<where/>">AU</a><!--jason andrade <jason@dstc.edu.au>-->
+<a href="http://rrdtool.cs.pu.edu.tw/<where/>">TW</a><!--Hsun-Chang Chang <hsunchang@gmail.com>-->
+#<a href="http://ftp.heanet.ie/mirrors/oss.oetiker.ch/rrdtool/<where/>">IE</a><!-- <mirrors@heanet.ie>-->
+<a href="http://rrdtool.codemonkey.se/<where/>">SE</a><!--Hans Engren <hans@cyclone.se>-->
+<a href="http://rrdtool.basemirror.de/<where/>">DE</a><!--Baseportal Mirrors <mirrors@baseportal.de>-->
+<a href="http://rrdtool.mirroraty.org/<where/>">US</a><!--Hossam Hossny <hossam@trexle.com>-->
+#<a href="http://rrdtool.paracoda.com/<where/>">CA</a><!--Hossam Hossny <admin@paracoda.com>-->
+#<a href="http://rrdtool.PlaySystems.ro/<where/>">RO</a><!--dan.draghici@ulbsibiu.ro-->
 </div>
 <div id="logo">
 <div class="legacy">
@@ -174,7 +174,7 @@ foreach my $l (qw($(LANGS))){
 	my $text=$1; my $url=$2; $url =~ s/<(\S+)(?:\@|_at_)(\S+)>/mailto:$1\@removethis.$2/;
 	my $LANG = uc("LANG_$l");
 	print <<LINE
-[$LANG:$date | <A HREF="$url">$text</A> | <A HREF="http://it.oetiker.ch/monitoring/">OETIKER+PARTNER AG</a>:$LANG]
+[$LANG:$date | <a href="$url">$text</a> | <a href="http://it.oetiker.ch/monitoring/">OETIKER+PARTNER AG</a>:$LANG]
 LINE
 }
 </protect>
diff --git a/website/index.wml b/website/index.wml
index 980ebf39..8e282770 100644
--- a/website/index.wml
+++ b/website/index.wml
@@ -2,60 +2,47 @@
         PAGE = "welcome">
 
 
-<H1>About RRDtool</H1>
+<h1>About RRDtool</h1>
 
 #<div style="float:right"><a style="border-width: 0px" href="http://www.oetiker.ch/press"><img src="award-white.png" border="0"/></a></div>
 
-<H2>What RRDtool does</H2>
+<h2>What RRDtool does</h2>
 
 <p>RRDtool is the OpenSource industry standard, high performance data
 logging and graphing system for time series data. Use it to write your
 custom monitoring shell scripts or create whole applications using its Perl,
 Python, Ruby, TCL or PHP bindings.</p>
 
-<H2>Do you think RRDtool is cool?</H2>
+<h2>Do you think RRDtool is cool?</h2>
 
 <p>Is RRDtool adding good value to your operations? Please consider <a
 href="http://n2.nabble.com/Supporting-Tobi%27s-OSS-work-in-2009-tp1660428p1660428.html">supporting
 my OSS work</a> in 2009.</p>
 
-<h2>Nordic Meet on Nagios 2009,  June 3-4th</h2>
+<h2>Version 1.4rc2 released, June 8th, 2009</h2>
 
-<p><a href="http://nordicmeetonnagios.op5.org/" border="0"><img src="newbannernmn250x60.gif"/></a></p>
+<p>RRDtool 1.4rc1 opens the last phase of the road to the 1.4 release. Get a
+<a
+href="http://oss.oetiker.ch/rrdtool/pub/beta/rrdtool-1.4rc2.tar.gz">copy</a>,
+test it and report any problems you find.</p>
 
-<p>Nordic Meet on Nagios 2009, June 3-4th, the largest Nagios conference in
-Scandinavia. Tobi Oetiker will be giving a talk on RRDtool scaling. You can
-meet key open source profiles and discuss the future of their Nagios Related
-OSS Projects, listen to the latest news, market trends and case studies
-focusing on business value. There will be open discussions on development
-and technology challenges as well as hands on workshops. Let's meet on
-Nordic Meet on Nagios 2009.</p>
+<h2>Download</h2>
 
-
-<H2>Version 1.3.8 Released, May 19th, 2009</H2>
-
-<p>Read all about bugfixes and features of 1.3.8 in the <a href="forum.en.html#nabble-f937164">announcement</a></p>
-
-<p>Read all about the new features of the 1.3 series in
-<a href="http://oss.oetiker.ch/rrdtool-trac/wiki/RRDtool13">the RRDtool Wiki</a>.</p>
-
-<H2>Download</H2>
-
-<P>RRDtool is available for <A HREF="download.en.html">download</A> from
+<p>RRDtool is available for <a href="download.en.html">download</a> from
 this site. It compiles on a number of different Linux and Unix platforms as
-well as on Microsoft Windows.</P>
+well as on Microsoft Windows.</p>
 
-<H2>RRDtool News Feeds</H2>
+<h2>RRDtool News Feeds</h2>
 
 <div>RRDtool Announcements feed <a href="http://feeds2.feedburner.com/RrdtoolAnnouncements" rel="alternate" type="application/rss+xml"><img src="http://www.feedburner.com/fb/images/pub/feed-icon16x16.png" alt="" style="vertical-align:middle;border:0"/></a>&nbsp;<a href="http://feeds2.feedburner.com/RrdtoolAnnouncements" rel="alternate" type="application/rss+xml">subscribe in a reader</a></div>
 <div>RRDtool Bugs feed <a href="http://feeds2.feedburner.com/RRDtoolBugs" rel="alternate" type="application/rss+xml"><img src="http://www.feedburner.com/fb/images/pub/feed-icon16x16.png" alt="" style="vertical-align:middle;border:0"/></a>&nbsp;<a href="http://feeds.feedburner.com/RRDtoolBugs" rel="alternate" type="application/rss+xml">subscribe in a reader</a></div>
 <div>RRDtool Wiki Updates <a href="http://feeds2.feedburner.com/RRDtoolWikiUpdates" rel="alternate" type="application/rss+xml"><img src="http://www.feedburner.com/fb/images/pub/feed-icon16x16.png" alt="" style="vertical-align:middle;border:0"/></a>&nbsp;<a href="http://feeds.feedburner.com/RRDtoolWikiUpdates" rel="alternate" type="application/rss+xml">subscribe in a reader</a></div>
 <div>RRDtool Checkins <a href="http://feeds2.feedburner.com/RRDtoolCheckins" rel="alternate" type="application/rss+xml"><img src="http://www.feedburner.com/fb/images/pub/feed-icon16x16.png" alt="" style="vertical-align:middle;border:0"/></a>&nbsp;<a href="http://feeds.feedburner.com/RRDtoolCheckins" rel="alternate" type="application/rss+xml">subscribe in a reader</a></div>
 
-<H2>Sponsorship and Appreciators</H2>
+<h2>Sponsorship and Appreciators</h2>
 
-<P>You like RRDtool? You want show your appreciation? You want to sponsor
-future development or a particular new feature? Check out our <A
-HREF="sponsor.en.html">Sponsorship and Appreciation</a> page or visit my <a href="http://tobi.oetiker.ch/wish">wish list</a>.</P>
+<p>You like RRDtool? You want show your appreciation? You want to sponsor
+future development or a particular new feature? Check out our <a
+href="sponsor.en.html">Sponsorship and Appreciation</a> page or visit my <a href="http://tobi.oetiker.ch/wish">wish list</a>.</p>
 
 <p><img src="stream-pop.png"/></p>
diff --git a/website/support.wml b/website/support.wml
index 34c3d57b..406a9d2e 100644
--- a/website/support.wml
+++ b/website/support.wml
@@ -3,18 +3,21 @@
 	
 <H1>Support</H1>
 
-<p>Free support for RRDtool is handled via three special mailinglists:</p>
+<H2>RRD Wizard</H2>
+
+<p>If you just can't seem to cram all the RRDtool options into your head, you may find Ivan Zahariev's
+<a href="http://www.famzah.net/rrdwizard">RRDtool Wizard</a> most helpful. It will help you build these command lines in a snap.</p>
 
 <H2>rrd-announce mailing list</H2>
 
-<P>If you want to keep uptodate with the progress of RRDtool, subscribe to
+<P>If you want to keep up-to-date with the progress of RRDtool, subscribe to
 this LOW VOLUME list by sending a message with the subject 'subscribe' to <A
 HREF="mailto:rrd-announce-request@lists.oetiker.ch?subject=subscribe">rrd-announce-request@lists.oetiker.ch</A>.
 Or on the <a href="http://lists.oetiker.ch">web interface</a>.</p>
 
 
 <P>Note, that posts to this list will be crossposted to the rrd-users and
-rrd-developers mailinglists.</P>
+rrd-developers mailing lists.</P>
 
 <H2>rrd-users mailing list</H2>
 
-- 
2.30.2

