From: oetiker <oetiker@a5681a0c-68f1-0310-ab6d-d61299d08faa>
Date: Fri, 6 May 2011 06:17:03 +0000 (+0000)
Subject: sync with reality
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=912f47dc5e944aa8282864fc19c77edab1081dbb;p=rrdtool-all.git

sync with reality


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

diff --git a/program/rrdtool-1.4-release b/program/rrdtool-1.4-release
index f525bc4c..5e209da3 100755
--- a/program/rrdtool-1.4-release
+++ b/program/rrdtool-1.4-release
@@ -36,5 +36,5 @@ scp CHANGES rrdtool*.tar.gz  oposs@james:public_html/rrdtool/pub
 ssh oposs@james "cd public_html/rrdtool/pub/;rm rrdtool.tar.gz;ln -s rrdtool-$VERSION.tar.gz rrdtool.tar.gz"
 cd ..
 rm -rf rrdtool-$$
-svn copy -m "tagging version $VERSION" svn://svn.oetiker.ch/rrdtool/branch/1.4/program svn://svn.oetiker.ch/rrdtool/tags/$VERSION
+svn copy -m "tagging version $VERSION" svn://svn.oetiker.ch/rrdtool/branches/1.4/program svn://svn.oetiker.ch/rrdtool/tags/$VERSION
 
diff --git a/website/download.wml b/website/download.wml
index 61c28c83..96ddf62a 100644
--- a/website/download.wml
+++ b/website/download.wml
@@ -42,6 +42,13 @@ You can download RRD tool from several places:
  <LI>Cygwin Windows <A HREF="http://www.cacti.net/downloads/rrdtool/win32">http://www.cacti.net/downloads/rrdtool/win32/</a></LI>
 </UL>
 
+<H2>Language Bindings</H2>
+
+<p>The bindings for perl, tcl, ruby and python are part of the rrdtool distribution. Here is a list of others:</p>
+<ul>
+<li><a href="http://pecl.php.net/package/rrd">PHP bindings to the rrd tool system</a> by Miroslav Kubelík</li>
+</ul>
+
 <H2>Anonymous SVN for RRDtool</H2>
 
 <p>RRDtool source is stored in a subversion repository with anonymous access.</p>
diff --git a/website/inc/pub_contrib_header.html b/website/inc/pub_contrib_header.html
index 32b21a13..0f827e5b 100644
--- a/website/inc/pub_contrib_header.html
+++ b/website/inc/pub_contrib_header.html
@@ -77,7 +77,6 @@
 <br />
 <p><b>Gold Sponsors</b></p>
 <p><a href="http://www.zenoss.com/?rrdtool"><img border="0" title="Zenoss Open Source IT Monitoring" alt="Zenoss Open Source IT Monitoring" src="/rrdtool/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="/rrdtool/logos/gw200x100.gif"/></a></p>    
 <p><a href="../../sponsor.en.html">Silver Sponsors ...</a></p>
 <br />
 <br />
diff --git a/website/inc/pub_header.html b/website/inc/pub_header.html
index 7d5517af..46ee737f 100644
--- a/website/inc/pub_header.html
+++ b/website/inc/pub_header.html
@@ -77,7 +77,6 @@
 <br />
 <p><b>Gold Sponsors</b></p>
 <p><a href="http://www.zenoss.com/?rrdtool"><img border="0" title="Zenoss Open Source IT Monitoring" alt="Zenoss Open Source IT Monitoring" src="/rrdtool/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="/rrdtool/logos/gw200x100.gif"/></a></p>
 <p><a href="../sponsor.en.html">Silver Sponsors ...</a></p>
 <br />
 <br />
diff --git a/website/logos/chinavasion.png b/website/logos/chinavasion.png
new file mode 100644
index 00000000..84da4e96
Binary files /dev/null and b/website/logos/chinavasion.png differ
diff --git a/website/logos/openlane_101x51.jpg b/website/logos/openlane_101x51.jpg
new file mode 100644
index 00000000..0f12f41a
Binary files /dev/null and b/website/logos/openlane_101x51.jpg differ
diff --git a/website/logos/opensystems-51x51.png b/website/logos/opensystems-51x51.png
new file mode 100644
index 00000000..912d9b39
Binary files /dev/null and b/website/logos/opensystems-51x51.png differ
diff --git a/website/sponsor.wml b/website/sponsor.wml
index d6107337..f9a1e528 100644
--- a/website/sponsor.wml
+++ b/website/sponsor.wml
@@ -36,6 +36,8 @@ sponsor</a>!</p>
 <a href="http://www.temperatur.nu"><img border="0" alt="www.temperatur.nu" src="$(ROOT)/logos/temperatur.nu_101x51.png"/></a>&nbsp;
 #From: Karsten Tralst <karsten.tralst@hitmeister.de>
 <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>