From: oetiker <oetiker@a5681a0c-68f1-0310-ab6d-d61299d08faa>
Date: Tue, 22 Nov 2011 16:14:23 +0000 (+0000)
Subject: weeding
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=658511bae470ce9e36f7afb04b068350fec3a571;p=rrdtool-all.git

weeding

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

diff --git a/website/doc/index.wml b/website/doc/index.wml
index 4cb57b20..36b8a822 100644
--- a/website/doc/index.wml
+++ b/website/doc/index.wml
@@ -9,4 +9,6 @@
 
 <h2>Translations</h2>
 
+<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/logos/opennmscolorgroup.png b/website/logos/opennmscolorgroup.png
new file mode 100644
index 00000000..7abf57b2
Binary files /dev/null and b/website/logos/opennmscolorgroup.png differ
diff --git a/website/rrdworld/akkada.gif b/website/rrdworld/akkada.gif
deleted file mode 100644
index 263f3d77..00000000
Binary files a/website/rrdworld/akkada.gif and /dev/null differ
diff --git a/website/rrdworld/akkada.xml b/website/rrdworld/akkada.xml
deleted file mode 100644
index 1e8a17a7..00000000
--- a/website/rrdworld/akkada.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<rrdworld type="application"                          
-          icon="akkada.gif">
- 
-       <name> akk@da </name>
-     <author> Piotr Kodzis </author>
-<description>System designed for middle size computer networks. Its purpose
-is to quick detect system or network fault and to display information about its
-for administrator. akk@da does not wait for information from any agents,
-systems. Almost all services of the monitored hosts are discovered
-automatically.</description>
-   <homepage> http://akkada.tivi.net.pl </homepage> 
-       <year> 2006 </year><month> 7 </month> <!-- Entry creation date -->
-    <license> GPL </license>
-
-   <!-- Optional -->   
-
-      <email> piotr.kodzis@inteligo.pl </email> <!-- Author contact -->
-
-</rrdworld>
-
diff --git a/website/rrdworld/aware.xml b/website/rrdworld/aware.xml
deleted file mode 100644
index 19e29d43..00000000
--- a/website/rrdworld/aware.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<rrdworld type="application"
-         icon="awicon64.png" > <!-- Size 100x66 -->
-
-      <name> Aware </name>
-    <author> Russell Leighton </author>
-<description>
-
-The *Aware* project is an effort to create a software framework
-to measure, monitor, and control computer system resources. Aware is
-intended to enable system administrators tune system variables, set
-monitoring/security alarms and build adaptive distributed systems.
-Aware modules may be linked into applications making them 'aware' and
-able to participate in the larger managed system.
-
-</description>
-  <homepage> http://www.elegant-software.com/software/aware/ </homepage> 
-      <year> 2006 </year><month> 4 </month> <!-- Entry creation date -->
-   <license> LGPL </license>
-
-
-</rrdworld>
diff --git a/website/rrdworld/index.wml b/website/rrdworld/index.wml
index cfeda433..9429bbf4 100644
--- a/website/rrdworld/index.wml
+++ b/website/rrdworld/index.wml
@@ -24,8 +24,6 @@ add-ons to big applications or even replacements for rrdtool itself.</p>
 
 <h2>Free Applications</h2>
 
-#include "akkada.xml"
-#include "aware.xml"
 #include "bbstatus.xml"
 #include "bigsis_rrdworld.xml"
 #include "cacti.xml"
@@ -61,6 +59,7 @@ add-ons to big applications or even replacements for rrdtool itself.</p>
 #include "snm_at_rrdworld.xml"
 #include "snmpgraph.xml"
 #include "statsdawg.xml"
+#include "stormons.xml"
 #include "systemgraph.xml"
 #include "thermometer.xml"
 #include "tinygraph.xml"
@@ -75,7 +74,6 @@ add-ons to big applications or even replacements for rrdtool itself.</p>
 
 <h2>Commercial Applications</h2>
 
-#include "stormons.xml"
 #include "airwave.xml"
 #include "prefixmaster.xml"
 #include "wanguard.xml"
diff --git a/website/rrdworld/toolsmith.xml b/website/rrdworld/toolsmith.xml
index 035d898d..dbdb6c53 100644
--- a/website/rrdworld/toolsmith.xml
+++ b/website/rrdworld/toolsmith.xml
@@ -9,7 +9,7 @@ an RRD is loaded into the Editor you can quickly locate a specific data
 point to modify or an entire Round Robin
 Archive can be removed.  The tool also allows new data sources and RRAs to
 be added. </description>
-   <homepage> http://thetoolsmith.com </homepage>
+   <homepage> http://sourceforge.net/projects/rrdeditor </homepage>
        <year> 2006 </year><month> 4 </month> <!-- Entry creation date -->
     <license> GPL </license>
 
diff --git a/website/sponsor.wml b/website/sponsor.wml
index f9a1e528..09440157 100644
--- a/website/sponsor.wml
+++ b/website/sponsor.wml
@@ -11,6 +11,15 @@ 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>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>
+#<a href="http://it.oetiker.ch/monitoring/sponsoring.var"><img border="0" alt="Silver Sponsor" src="$(ROOT)/inc/silver-logo.png"/></a>      
+</p>
+
 <h2>2011 Gold Sponsors</h2>
 
 <p>
@@ -38,7 +47,6 @@ sponsor</a>!</p>
 <a href="http://www.hitmeister.de"><img border="0" title="Hitmeister GmbH" src="$(ROOT)/logos/hitmeister.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://it.oetiker.ch/monitoring/sponsoring.var"><img border="0" alt="Silver Sponsor" src="$(ROOT)/inc/silver-logo.png"/></a>      
 </p>
 
 #<h2>2010 Silver Sponsors</h2>