sponsor 2013

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

diff --git a/website/doc/index.wml b/website/doc/index.wml
index 36b8a8221cbb9644c0513e186e3c63713dbb2ebf..b8cea87f5b99e9b46803ffb55c2b3f88b199f6c5 100644 (file)
--- a/website/doc/index.wml
+++ b/website/doc/index.wml
@@ -11,4 +11,3 @@
 
 <p>George Wise is created <a href="http://ru.wikibooks.org/wiki/RRDtool">Russian translations</a> over at wikibooks.</p>
 
-<p>Amanda Lynn has provided a <a href="http://www.fatcow.com/edu/rrdcreate-oss-be">Belorussian translation</a> of the RRDcreate manual page.</p>

diff --git a/website/gallery/index.en.html b/website/gallery/index.en.html
index de33043369407bdf9c00d687072acf459147d259..048b373a062349f52cb9f2c8f14840fe95476165 100644 (file)
--- a/website/gallery/index.en.html
+++ b/website/gallery/index.en.html
@@ -76,7 +76,7 @@
 <br />
 <br />
 <p><b>Gold Sponsors</b></p>
-<p><a href="http://www.serverscheck.com/sensors?utm_source=mrtg&utm_medium=banner&utm_term=rrdtool&utm_campaign=mrtg"><img border="0" title="Serverscheck" alt="Serverscheck" src="../logos/mrtg_sensorgateway.png" width="200" height="100" /></a></p>
+<p><a href="http://it.oetiker.ch/monitoring/sponsoring.var"><img border="0" alt="Open Gold Sponsorship Slot" src="../inc/rrdtool-gold.png" width="200" height="100" /></a></p>
 <p><a href="http://it.oetiker.ch/monitoring/sponsoring.var"><img border="0" alt="Open Gold Sponsorship Slot" src="../inc/rrdtool-gold.png" width="200" height="100" /></a></p>
 <p><a href="../sponsor.en.html">Silver Sponsors ...</a></p>
 <br />
@@ -143,34 +143,32 @@ as, Phone, VAS and MM4 (others operator). -- Alex Rivoltella &lt;alessio.r-delme
         <!-- creation date -->
    <!-- Optional -->
 <div class="gallery">
-<h2> GOES-13 Solar Particle Flux </h2>
-<div class="image"><img src="ace-part.png" alt="" /></div>
-<div class="caption"> High energy solar wind particles measured by GOES-13 satellite -- Stefan Wernli &lt;hb9tmc@<span class="legacy">XYZ-</span>bigfoot.com&gt;, 2012/12 <a href="http://crna.zapto.org/rrd/swpc/">[demo]</a></div>
+<h2> Trafico OSPF </h2>
+<div class="image"><img src="ospf.png" alt="" width="596" height="389" /></div>
+<div class="caption"> This simple graph show the OSPF traffic that pass through in two central routers. -- Alessandro Palermo &lt;info.xmon@<span class="legacy">XYZ-</span>gmail.com&gt;, 2012/9 <a href="http://xmon.dyndns.org">[demo]</a></div>
 </div>
+ <!-- no wider than 600 pixle -->
+        <!-- creation date -->
+   <!-- Optional -->
 <div class="gallery">
-<h2>Outside temperature in Södermalm, Sundsvall, Sweden</h2>
-<div class="image"><img src="mgroth.png" alt="" width="537" height="468" /></div>
-<div class="caption">This graph is created to be able to see the temperature with the average for the year has been. Data for temperature is taken from a MCP9803 sensor that sits outdoors in an IP65 enclosure. -- Magnus Groth &lt;mgroth@<span class="legacy">XYZ-</span>gmail.com&gt;, 2011/7 </div>
+<h2> Sahi end2end web test runtimes </h2>
+<div class="image"><img src="sahi_end2end.png" alt="" width="597" height="271" /></div>
+<div class="caption"> This graph shows the results of a sahi end2end web test, which was executed by Nagios. The three AREAs from the bottom upwards describe the runtimes of each logical step within this test, the blue AREA on top is the test's overhead runtime. The orange TICKs on top are printed whenever one ore more steps exceeded the allowed runtime. The pnp4nagios/PHP config file for this graph is available on git. -- Simon Meggle &lt;simon.meggle@<span class="legacy">XYZ-</span>consol.de&gt;, 2012/12 <a href="https://github.com/simonmeggle/sahi2omd-db">[demo]</a></div>
 </div>
  <!-- no wider than 600 pixle -->
         <!-- creation date -->
    <!-- Optional -->
 <div class="gallery">
-<h2> Sensor Network Temperature Gradients </h2>
-<div class="image"><img src="ga-usa.png" alt="" width="600" height="296" /></div>
-<div class="caption">
-Created as part of a 1-Wire temperature network project with related
-implementation/technical posts at <a href="http://web-tech.ga-usa.com/?s=sensor+network">ga-usa</a>.
-Background: <a href="http://web-tech.ga-usa.com/2012/05/creating-a-custom-hot-to-cold-temperature-color-gradient-for-use-with-rrdtool/">here</a>
-and <a href="http://web-tech.ga-usa.com/2012/05/creating-color-gradients-with-rrdtool-bash-using-temperatures/">here</a>.
-  -- Dale Reagan &lt;rrd_gradients@<span class="legacy">XYZ-</span>ga-usa.net&gt;, 2012/5 <a href="http://web-tech.ga-usa.com/weather/gradients/">[demo]</a></div>
+<h2> GOES-13 Solar Particle Flux </h2>
+<div class="image"><img src="ace-part.png" alt="" /></div>
+<div class="caption"> High energy solar wind particles measured by GOES-13 satellite -- Stefan Wernli &lt;hb9tmc@<span class="legacy">XYZ-</span>bigfoot.com&gt;, 2012/12 <a href="http://crna.zapto.org/rrd/swpc/">[demo]</a></div>
 </div>
 <div class="gallery">
-<h2>2wk Power Usage graph</h2>
-<div class="image"><img src="powerusage-2wk.png" alt="" width="600" height="300" /></div>
-<div class="caption">kWh usage from my house, measured with an attiny85 and an LDR connected to the kWh meter. Background color signifies high/low tariff. Graph uses various colors for usage level. -- Mark Janssen -- sig-io.nl &lt;mark@<span class="legacy">XYZ-</span>sig-io.nl&gt;, 2011/09 <a href="http://stats.revspace.nl/power/">[demo]</a></div>
+<h2>Outside temperature in Södermalm, Sundsvall, Sweden</h2>
+<div class="image"><img src="mgroth.png" alt="" width="537" height="468" /></div>
+<div class="caption">This graph is created to be able to see the temperature with the average for the year has been. Data for temperature is taken from a MCP9803 sensor that sits outdoors in an IP65 enclosure. -- Magnus Groth &lt;mgroth@<span class="legacy">XYZ-</span>gmail.com&gt;, 2011/7 </div>
 </div>
- <!-- no wider than 600 pixels -->
+ <!-- no wider than 600 pixle -->
         <!-- creation date -->
    <!-- Optional -->
 <div class="gallery">
@@ -192,6 +190,24 @@ google_color_text = "000000";
   src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
 </script>
 </p>
+<h2> Sensor Network Temperature Gradients </h2>
+<div class="image"><img src="ga-usa.png" alt="" width="600" height="296" /></div>
+<div class="caption">
+Created as part of a 1-Wire temperature network project with related
+implementation/technical posts at <a href="http://web-tech.ga-usa.com/?s=sensor+network">ga-usa</a>.
+Background: <a href="http://web-tech.ga-usa.com/2012/05/creating-a-custom-hot-to-cold-temperature-color-gradient-for-use-with-rrdtool/">here</a>
+and <a href="http://web-tech.ga-usa.com/2012/05/creating-color-gradients-with-rrdtool-bash-using-temperatures/">here</a>.
+  -- Dale Reagan &lt;rrd_gradients@<span class="legacy">XYZ-</span>ga-usa.net&gt;, 2012/5 <a href="http://web-tech.ga-usa.com/weather/gradients/">[demo]</a></div>
+</div>
+<div class="gallery">
+<h2>2wk Power Usage graph</h2>
+<div class="image"><img src="powerusage-2wk.png" alt="" width="600" height="300" /></div>
+<div class="caption">kWh usage from my house, measured with an attiny85 and an LDR connected to the kWh meter. Background color signifies high/low tariff. Graph uses various colors for usage level. -- Mark Janssen -- sig-io.nl &lt;mark@<span class="legacy">XYZ-</span>sig-io.nl&gt;, 2011/09 <a href="http://stats.revspace.nl/power/">[demo]</a></div>
+</div>
+ <!-- no wider than 600 pixels -->
+        <!-- creation date -->
+   <!-- Optional -->
+<div class="gallery">
 <h2> PS Network Traffic </h2>
 <div class="image"><img src="PS_Network_traffic.png" alt="" width="597" height="363" /></div>
 <div class="caption"> This graph shows the PS network traffic generated from the users of a telecommunication operator using USB modems, smartphones.. for 24 hours. Interesting the period from 8:00AM to 8:00PM, where there are peaks of traffic every 15 minutes. These are generated by Smartphones sincro. -- Enrique Gómez &lt;egomezm@<span class="legacy">XYZ-</span>gmail.com&gt;, 2011/8 <a href="">[demo]</a></div>
@@ -704,7 +720,7 @@ than 600 pixels.</p>
 <!-- ############################# -->
 <div id="address">
 <small>
-12/26/12 | <a href="mailto:tobi@..delete..this..removethis.oetiker.ch">Tobias Oetiker</a> | <a href="http://it.oetiker.ch/monitoring/">OETIKER+PARTNER AG</a>
+01/15/13 | <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/gallery/index.wml b/website/gallery/index.wml
index 4dd22516560109c43d94e124ef72b6ade3574132..114779b9c95dd4b5a197f327929cac8ad1679f66 100644 (file)
--- a/website/gallery/index.wml
+++ b/website/gallery/index.wml
@@ -5,6 +5,7 @@
 <H1>RRDtool Gallery</H1>
 
 #include "mmh11.xml"
+#include "ospf.xml"
 #include "sahi_end2end.xml"
 #include "ace_part.xml"
 #include "mgroth.xml"

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

diff --git a/website/gallery/ospf.xml b/website/gallery/ospf.xml
new file mode 100644 (file)
index 0000000..4f32e33
--- /dev/null
+++ b/website/gallery/ospf.xml
@@ -0,0 +1,13 @@
+<gallery image="ospf.png" > <!-- no wider than 600 pixle -->
+
+      <title> Trafico OSPF </title>
+     <author> Alessandro Palermo </author> 
+<description> This simple graph show the OSPF traffic that pass through in two central routers. </description>
+       <year> 2012 </year><month> 9 </month> <!-- creation date -->
+      
+   <!-- Optional -->   
+
+   <livesite> http://xmon.dyndns.org </livesite> 
+      <email> info.xmon@gmail.com </email>
+
+</gallery>
\ No newline at end of file

diff --git a/website/inc/rrdtool-design.xar b/website/inc/rrdtool-design.xar
index 0f52479265c33ababb8c50b266b6fca104d6c91f..2d04be65e8de76ebd1277fc538152162332b5fdd 100644 (file)
Binary files a/website/inc/rrdtool-design.xar and b/website/inc/rrdtool-design.xar differ

diff --git a/website/inc/template.inc b/website/inc/template.inc
index 4169442bef06069ea24b9d1f43b27194ef715765..ec48b0fbcf7bba66ecba2875b76518429749067d 100644 (file)
--- a/website/inc/template.inc
+++ b/website/inc/template.inc
@@ -80,10 +80,10 @@
 <br/>
 <br/>
 <p><b>Gold Sponsors</b></p>
-<p><a href="http://www.serverscheck.com/sensors?utm_source=mrtg&utm_medium=banner&utm_term=rrdtool&utm_campaign=mrtg"><img border="0" title="Serverscheck" alt="Serverscheck" src="$(ROOT)/logos/mrtg_sensorgateway.png"/></a></p>
+#<p><a href="http://www.serverscheck.com/sensors?utm_source=mrtg&utm_medium=banner&utm_term=rrdtool&utm_campaign=mrtg"><img border="0" title="Serverscheck" alt="Serverscheck" src="$(ROOT)/logos/mrtg_sensorgateway.png"/></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="http://www.groundworkopensource.com/products/components/rrdtool.html?ldsrc=AD-RRDtool"><img title="GroundWork Open Source" border="0" alt="GroundWork Open Source Logo" src="$(ROOT)/logos/gw200x100.gif"/></a></p>
-#<p><a href="http://it.oetiker.ch/monitoring/sponsoring.var"><img border="0" alt="Open Gold Sponsorship Slot" src="$(ROOT)/inc/rrdtool-gold.png"/></a></p>
+<p><a href="http://it.oetiker.ch/monitoring/sponsoring.var"><img border="0" alt="Open Gold Sponsorship Slot" src="$(ROOT)/inc/rrdtool-gold.png"/></a></p>
 <p><a href="http://it.oetiker.ch/monitoring/sponsoring.var"><img border="0" alt="Open Gold Sponsorship Slot" src="$(ROOT)/inc/rrdtool-gold.png"/></a></p>
 <p><a href="$(ROOT)/sponsor.<lang:star: */>.html">Silver Sponsors ...</a></p>
 <br/>

diff --git a/website/license.wml b/website/license.wml
index 95dc118548cf49dbbc300702a3c40ea86bc2617a..c16325d104324616dcb364e481c4b8b5dec23177 100644 (file)
--- a/website/license.wml
+++ b/website/license.wml
@@ -6,7 +6,7 @@
 <H2>GNU General Public License</H2>
 
 <P>RRDtool is available under the terms of the <A
-HREF="http://www.gnu.org/copyleft/gpl.html">GNU General Public License</A>.
+HREF="http://www.gnu.org/licenses/old-licenses/gpl-2.0.html">GNU General Public License V2 or later</A>.
 This means you can do most things you want with this software as long as you
 do not claim you created the software and don't sell it (or modified version
 of it) under a license other than the GNU GPL.</P>
@@ -14,7 +14,7 @@ of it) under a license other than the GNU GPL.</P>
 <p>If you want to use RRDtool with an open source tool that has a GPL
 incompatible license, you may be able to get around the problem thanks to
 the <a
-href="http://oss.oetiker.ch/rrdtool-trac/browser/branches/1.2/program/COPYRIGHT">FLOSS
+href="https://raw.github.com/oetiker/rrdtool-1.x/master/COPYRIGHT">FLOSS
 License Exception</a> in the RRDtool license.</p>
 
 <H2>Give Credit</H2>

diff --git a/website/logos/wuerth-phoenix.png b/website/logos/wuerth-phoenix.png
new file mode 100644 (file)
index 0000000..18b8787
Binary files /dev/null and b/website/logos/wuerth-phoenix.png differ

diff --git a/website/sponsor.wml b/website/sponsor.wml
index ff7cf80454507d77f0a8416263a164feb223c0a4..50abaac4d62b347cca87dc6b0b345c7b2595839a 100644 (file)
--- a/website/sponsor.wml
+++ b/website/sponsor.wml
@@ -11,31 +11,63 @@ If you profit from RRDtool and want to support the project as a whole, you
 could <a href="http://it.oetiker.ch/monitoring/sponsoring.var">become a
 sponsor</a>!</p>
 
-<h2>2012 Gold Sponsors</h2>
+#<h2>2013 Gold Sponsors</h2>
 
-<p>
-#maarten.vanlaere@serverscheck.com
-<a href="http://www.serverscheck.com/sensors/sensorgateway_availability.asp"><img border="0" title="ServersCheck" alt="ServersCheck" src="$(ROOT)/logos/mrtg_sensorgateway.png"/></a>
-</p>
+#<p>
+##maarten.vanlaere@serverscheck.com
+#<a href="http://www.serverscheck.com/sensors/sensorgateway_availability.asp"><img border="0" title="ServersCheck" alt="ServersCheck" src="$(ROOT)/logos/mrtg_sensorgateway.png"/></a>
+#</p>
 
-<h2>2012 Silver Sponsors</h2>
+<h2>2013 Silver Sponsors</h2>
 <p>
+# Ethan Galstad <egalstad@nagios.com> Tue, 28 Sep 2010 23:18:27 +0200
+<a href="http://www.nagios.com"><img border="0" alt="Nagios" src="$(ROOT)/logos/nagios.png"/></a>&nbsp;
+# "Cunaccia, Arianna" <Arianna.Cunaccia@wuerth-phoenix.com>
+<a href="http://www.wuerth-phoenix.com"><img border="0" alt="Wuerth Phoenix" src="$(ROOT)/logos/wuerth-phoenix.png"/></a>&nbsp;
 # Tarus Balog <tarus@opennms.org> rt#14393
 <a href="http://www.opennms.org"><img border="0" title="openNMS" alt="openNMS" src="$(ROOT)/logos/opennmscolorgroup.png"/></a>&nbsp;
+# christian@heutger.net
+<a href="http://www.psw.net"><img border="0" alt="PSW" src="$(ROOT)/logos/psw.jpg"/></a>&nbsp;
+#From: David Schweikert <dws@open.ch>
+<a href="http://www.open.ch"><img border="0" title="open systems ag" alt="open systems ag" src="$(ROOT)/logos/opensystems-51x51.png"/></a>&nbsp;
+
+# Klas Bernehjält <klas.bernehjalt@op5.com>
+#<a href="http://www.op5.com"><img border="0" title="op5" alt="op5" src="$(ROOT)/logos/op5logoweb101x51.gif"/></a>&nbsp;
+# Felix Schueren <felix.schueren@hosteurope.de> Thu, 21 Dec 2006 12:24:51 +0100
+#<a href="http://www.hosteurope.de/"><img border="0" alt="HostEurope" src="$(ROOT)/logos/HE_Logo_101x51.gif"/></a>&nbsp;
+# oliver.mueller@digicomp.ch
+#<a href="http://www.digicomp.ch/linux"><img border="0" alt="Digicomp Academy AG" src="$(ROOT)/logos/digicomp.gif"/></a>&nbsp;
+# Ulf Zimmermann <ulf@openlane.com> Thu, 10 May 2007 14:08:10 -0700
+#<a href="http://www.openlane.com"><img border="0" title="Openlane, Inc." src="$(ROOT)/logos/openlane_101x51.jpg"/></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>
+
+#<h2>2012 Gold Sponsors</h2>
+
+#<p>
+#maarten.vanlaere@serverscheck.com
+#<a href="http://www.serverscheck.com/sensors/sensorgateway_availability.asp"><img border="0" title="ServersCheck" alt="ServersCheck" src="$(ROOT)/logos/mrtg_sensorgateway.png"/></a>
+#</p>
+
+#<h2>2012 Silver Sponsors</h2>
+#<p>
+# Tarus Balog <tarus@opennms.org> rt#14393
+#<a href="http://www.opennms.org"><img border="0" title="openNMS" alt="openNMS" src="$(ROOT)/logos/opennmscolorgroup.png"/></a>&nbsp;
 # Klas Bernehjält <klas.bernehjalt@op5.com>
-<a href="http://www.op5.com"><img border="0" title="op5" alt="op5" src="$(ROOT)/logos/op5logoweb101x51.gif"/></a>&nbsp;
+#<a href="http://www.op5.com"><img border="0" title="op5" alt="op5" src="$(ROOT)/logos/op5logoweb101x51.gif"/></a>&nbsp;
 # Ethan Galstad <egalstad@nagios.com> Tue, 28 Sep 2010 23:18:27 +0200
-<a href="http://www.nagios.com"><img border="0" alt="Silver Sponsor" src="$(ROOT)/logos/nagios.png"/></a>&nbsp;
+#<a href="http://www.nagios.com"><img border="0" alt="Silver Sponsor" src="$(ROOT)/logos/nagios.png"/></a>&nbsp;
 # christian@heutger.net
-<a href="http://www.psw.net"><img border="0" alt="Silver Sponsor" src="$(ROOT)/logos/psw.jpg"/></a>&nbsp;
+#<a href="http://www.psw.net"><img border="0" alt="Silver Sponsor" src="$(ROOT)/logos/psw.jpg"/></a>&nbsp;
 # Felix Schueren <felix.schueren@hosteurope.de> Thu, 21 Dec 2006 12:24:51 +0100
-<a href="http://www.hosteurope.de/"><img border="0" alt="HostEurope" src="$(ROOT)/logos/HE_Logo_101x51.gif"/></a>&nbsp;
+#<a href="http://www.hosteurope.de/"><img border="0" alt="HostEurope" src="$(ROOT)/logos/HE_Logo_101x51.gif"/></a>&nbsp;
 #From: David Schweikert <dws@open.ch>
-<a href="http://www.open.ch"><img border="0" title="open systems ag" alt="open systems ag" src="$(ROOT)/logos/opensystems-51x51.png"/></a>&nbsp;
+#<a href="http://www.open.ch"><img border="0" title="open systems ag" alt="open systems ag" src="$(ROOT)/logos/opensystems-51x51.png"/></a>&nbsp;
 # oliver.mueller@digicomp.ch
-<a href="http://www.digicomp.ch/linux"><img border="0" alt="Digicomp Academy AG" src="$(ROOT)/logos/digicomp.gif"/></a>&nbsp;
+#<a href="http://www.digicomp.ch/linux"><img border="0" alt="Digicomp Academy AG" src="$(ROOT)/logos/digicomp.gif"/></a>&nbsp;
 # Ulf Zimmermann <ulf@openlane.com> Thu, 10 May 2007 14:08:10 -0700
-<a href="http://www.openlane.com"><img border="0" title="Openlane, Inc." src="$(ROOT)/logos/openlane_101x51.jpg"/></a>&nbsp;
+#<a href="http://www.openlane.com"><img border="0" title="Openlane, Inc." src="$(ROOT)/logos/openlane_101x51.jpg"/></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>