added fsu and terractive

git-svn-id: svn://svn.oetiker.ch/rrdtool/branches/1.2@1151 a5681a0c-68f1-0310-ab6d-d61299d08faa

diff --git a/website/gallery/fsu_predict.png b/website/gallery/fsu_predict.png
new file mode 100644 (file)
index 0000000..0b27481
Binary files /dev/null and b/website/gallery/fsu_predict.png differ

diff --git a/website/gallery/fsu_predict.xml b/website/gallery/fsu_predict.xml
new file mode 100644 (file)
index 0000000..e040bcd
--- /dev/null
+++ b/website/gallery/fsu_predict.xml
@@ -0,0 +1,8 @@
+<gallery image="fsu_predict.png">
+  <title>Filesystem Utilization and Predicted Trends</title>
+  <author>Damien S. Stuart</author>
+  <description>Shows filesystem utilization with projected trend lines based on various starting points in the dataset. Trends are computed using the rrdtool Least Squares Line functions. If a trend is predicted to cross 100% utiliztion within the graph window, the date of the crossing is displayed.</description>
+  <year>2007</year><month>6</month>
+  <email>dstuart@dstuart.org</email>
+</gallery>
+

diff --git a/website/gallery/index.wml b/website/gallery/index.wml
index 66ac586561910af7853ccd93c65330925320eab8..bb6813c5b95675fb65bcc44286572c1369cb55df 100644 (file)
--- a/website/gallery/index.wml
+++ b/website/gallery/index.wml
@@ -5,7 +5,7 @@
 <H1>RRDtool Gallery</H1>
 
 #include "mmh11.xml"
-
+#include "fsu_predict.xml"
 #include "stream-pop.xml"
 #include "n20e-daily.xml"
 #include "ups_voltage_month.xml"

diff --git a/website/inc/template.inc b/website/inc/template.inc
index ea7882da86efb504d5f9938a7a4140a8c36a2e8f..127c3272fdc6313c8b39e0db0601a29672af20e0 100644 (file)
--- a/website/inc/template.inc
+++ b/website/inc/template.inc
@@ -74,7 +74,7 @@
 ##<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/people.ee.ethz.ch/%257Eoetiker/webtools/rrdtool/<where/>">IE</A><!--Colm MacCárthaigh <colm.maccarthaigh@heanet.ie>-->
-##<A HREF="http://rrdtool.cyclone.se/<where/>">SE</A><!--Hans Engren <hans@cyclone.se>-->
+<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>-->

diff --git a/website/index.wml b/website/index.wml
index 63bec32808a69508d19f88905c6cab232835197c..69cf4467b07ac70e66d51cd213efcf3b2dfa0233 100644 (file)
--- a/website/index.wml
+++ b/website/index.wml
@@ -13,13 +13,10 @@ Read about RRDtool 1.3 development on the
 
 <H2>Logging &amp; Graphing</H2>
 
-<p>The industry standard data logging and graphing application.
-Use it to write your custom monitoring shell scripts or create whole
-applications using its Perl, Python or PHP bindings. Create graphs like this:</p>
-
-<P>RRD is the acronym for Round Robin Database. It is a system to store and
-display time-series data (i.e. network bandwidth, machine-room temperature,
-server load average).</P>
+<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>Download</H2>
 
@@ -33,4 +30,4 @@ well as on Microsoft Windows.</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.</P>
+HREF="sponsor.en.html">Sponsorship and Appreciation</a> page or visit my <a href="http://tobi.oetiker.ch/wish">wish list</a>.</P>

diff --git a/website/logos/terreactive.png b/website/logos/terreactive.png
new file mode 100644 (file)
index 0000000..9d5e6c8
Binary files /dev/null and b/website/logos/terreactive.png differ

diff --git a/website/rrdworld/rrdcreator.xml b/website/rrdworld/rrdcreator.xml
index 2f505dbd9d55acfed027d1fe060f1f290db8f5e5..50dd51cc02703c4e9e73ea480dd612d77b6d8406 100644 (file)
--- a/website/rrdworld/rrdcreator.xml
+++ b/website/rrdworld/rrdcreator.xml
@@ -4,9 +4,7 @@
   <description>
     Perl module to simplify the creation of different kind of common RRD
   </description>
-  <homepage>
-    http://search.cpan.org/search?query=RRDTool::Creator&amp;mode=module
-  </homepage>
+  <homepage>http://search.cpan.org/search?query=RRDTool::Creator&amp;mode=module</homepage>
   <year> 2007 </year>
   <month> 6 </month>
   <license> CeCILL-C </license>

diff --git a/website/sponsor.wml b/website/sponsor.wml
index 7093908c78f621ad46977491ccaef0ecb145827b..9319b9cbfd0cac3bc7f57318130d4cabd6971389 100644 (file)
--- a/website/sponsor.wml
+++ b/website/sponsor.wml
@@ -32,6 +32,9 @@ sponsor</a>!</p>
 <a href="http://www.contego.net"><img border="0" title="CONTEGO Solutions, LLC" src="$(ROOT)/logos/Contego_Logo_101x51.gif"/></a>&nbsp;
 # Ulf Zimmermann <ulf@atc-onlane.com> Thu, 10 May 2007 14:08:10 -0700
 <a href="http://www.atc-onlane.com"><img border="0" title="ATC-Onlane, Inc." src="$(ROOT)/logos/atc-onlane101x51.gif"/></a>&nbsp;
+# Rolf Hefti <rolf.hefti@terreactive.ch> Mon, 9 Jul 2007 10:58:10 +0200
+<a href="http://www.terreactive.ch"><img border="0" title="terreActive AG" src="$(ROOT)/logos/terreactive.png"/></a>&nbsp;
+
 <a href="http://it.oetiker.ch/monitoring/sponsoring.var"><img border="0" alt="Silver Sponsor" src="$(ROOT)/inc/silver-logo.png"/></a>      
 </p>