From 658511bae470ce9e36f7afb04b068350fec3a571 Mon Sep 17 00:00:00 2001
From: oetiker <oetiker@a5681a0c-68f1-0310-ab6d-d61299d08faa>
Date: Tue, 22 Nov 2011 16:14:23 +0000
Subject: [PATCH] weeding

git-svn-id: svn://svn.oetiker.ch/rrdtool/branches/1.4@2214 a5681a0c-68f1-0310-ab6d-d61299d08faa
---
 website/doc/index.wml               |   2 ++
 website/logos/opennmscolorgroup.png | Bin 0 -> 3292 bytes
 website/rrdworld/akkada.gif         | Bin 1614 -> 0 bytes
 website/rrdworld/akkada.xml         |  20 --------------------
 website/rrdworld/aware.xml          |  21 ---------------------
 website/rrdworld/index.wml          |   4 +---
 website/rrdworld/toolsmith.xml      |   2 +-
 website/sponsor.wml                 |  10 +++++++++-
 8 files changed, 13 insertions(+), 46 deletions(-)
 create mode 100644 website/logos/opennmscolorgroup.png
 delete mode 100644 website/rrdworld/akkada.gif
 delete mode 100644 website/rrdworld/akkada.xml
 delete mode 100644 website/rrdworld/aware.xml

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 0000000000000000000000000000000000000000..7abf57b274cba04f87e1db5bb50bbe3619937e0b
GIT binary patch
literal 3292
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
a1Q-Ao!n|K9mt6<|0000<MNUMnLSTZfOm~I=

literal 0
HcmV?d00001

diff --git a/website/rrdworld/akkada.gif b/website/rrdworld/akkada.gif
deleted file mode 100644
index 263f3d77f968a4b1fb8d64c3bf4b2b8f04a87559..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1614
zcmchW>pRm60LOo`#Vo^&V>BnmMjJAlr3|x#iBs(;m2svO6?s-qSDf0UBSnu(xfL0k
z++yZZsgA8}+FS~c4lzP5T^wmom?-CT{)qE^@p=1s^Z5oc0z9`yGXOIn4frt-2m}U$
zArOeZzCIKRg~4F!*RO}e;l{?sCMG5b1OkafqEIL+E2|9~HlWeyjT<-G+S=OL*<mmk
zEEbEy;hdbD@OV6dKyYz!admYi5{d5a?j#b4LZNKgvc=QWbKACUR4Ucm+uPUIHynkc
z(P(~tesntB-`{`7jvax4fgvFwp`oF>cJ11;XHQsI*uH)H!o$N49y}Nk5y4`yA|oTC
zqN1Xsqd6Q-OiWB{Z0xaP$KvAR;^X5J5)!yv?#YuU&zw1P{`~pG#Kfeeq~zq}5-9X8
z3|2&?mcroz6O%GCvodpYp{1n|g%Vj?i_qwMc6QZ{j<p2BeOK2iclSCXv7St>qf#X<
zE@BErLZvqP_%!+Wv{I>0e0=V**-do%gTTPYOlBL4C1tZ^(b3P298sP)@tn(5pFOKS
zcdj!zna}5^q@<*#rlzH(WoBk(XJ_Z;=H9w>D=#lEKR>^qprEj@u&Ai$_U+qu?%XLZ
zE-oo4DJ?A(2n6Nj<wBuQBob9rR8&@0R#jEi)YR10*4Ee8i^XDzMAF>c+|ttW=+UFr
z*4C#_pSHENb@O<=*RBl|77i8{4+#XCii(ly>UULDV-m@DQ`1Cq^W>8!Q*CWBnM^L1
zD-;T)Qu+M(bCpV^R;xQZJG;BPU%Ytn^5x6k-rl~xzW)CHfq{Y7uU`)j4{J1<k&%(n
z(b2bZ`Ls+nBa^*TDCVTn_bSzgj*hukujYq`wWFijH*Y2;CZ?vQW@ctSeE9J3<Hy<A
z*}1v7PoF+5OiwS(&d$%zYqi=hU%o6XEG#ZAE-fv6)oNE37FL#)bUNMg^76{c%BoKH
z?O(30ep_Ar{{8#f+S-3f{(rDrhWsmA1Dt;-e|!Rft^sXMRzc!Y*<~ma?*PSR$kR;i
zgZooDA-wA-(s7Ndp*%37sVN=JkO&#XBIk=NwFJw{!g1RDtF(vGea|`^O=Zu7f&l#+
zlMUPk=>{)T0P=9$;7U8h@#5?<SO^L_@t{w5fb;&RmYg1(sKGxcrrm2u@~Y>d-)lSs
zbTMRwGlogo+d%<55g|FRuItB8>B@H|<@>W~ETapC=^O`U{4I^eI!1o1efN;Zk&q#q
zmIOp4bRS-?{qcoOH?N6wWx&?*qhnH1s{clMtvM-xiG^D_#04J;#$Y?@x;7D`Z1aLF
zs=!vmby_KYFg>F(5Y5Eda}4)l5`}B-<l`u3!#`l~!Qz11ScktEb?MLa8MsN0$lc&W
z(81Jq9f}DR*%!ha!FQUv!x4Ii!_pAgJAHltqDiZPRl7+`D49w}Ci(E`aRxGBEG--T
zLP&#nxB>;Cl+(vf=TipIDYSrf<QzR4I*UxR=L7RRyjA?59pldsK|3)l3y~RAWMP_q
z=_>+co9Pu#e(T|_a_TU+&gCM&b^8lJPS&TOcZ+^LE?1is@Pd@Y-8cgtxRLq*Z4YMm
z=ebG5bbdySXJZG!`Y>5)xA|(BC4hG(fdQ|11TQ=8hJX6Wp<0>3@l5s26q00>c$L`b
zId(5%n_Ia7$N;~_x$I1dA^W2<HMDX2j`KZ!PS_`kX))%&ukFZK;rKeUo2iMtCRi8b
zv+5eRQUlUfMXSuX+wCesKg;|x6muVv+ht$h1tKK<)dbQ6srG*^;KUp*&pZG!VrJN0
zS`|P&BBLB^^vuPWon>dooB5zLb2&Z0J&S2z%ROoew(*@G+phO`?;d^gpe$^T>n|As
z3+vr%e%Dhqu_w6N^8J>pe89+vXViseS^|~tMSN#bv;)oX#_FM9+etq&1^5|du>jee
z5oXwk@y@-1Y!%06>v;@{r8_Jpd+2uoXSRI(?`FVuI83KY8K6wL9Szt$#XbkSWZ2n>
zP5zD0$MCS9I;D0|CY)kyKKNLun+R7=dY;mAaaf+bNoY_`6~xvpPe-u$J86K|KcVWe
AcmMzZ

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>
-- 
2.30.2