From: oetiker <oetiker@a5681a0c-68f1-0310-ab6d-d61299d08faa>
Date: Sat, 24 Sep 2011 15:20:32 +0000 (+0000)
Subject: sync up
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=072dfcd86cb633dacf8583b620c9e1221f0e0678;p=rrdtool-all.git

sync up

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

diff --git a/website/doc/index.wml b/website/doc/index.wml
index 4f08e6c7..4cb57b20 100644
--- a/website/doc/index.wml
+++ b/website/doc/index.wml
@@ -6,3 +6,7 @@
 <dl>
 #include "index.inc"
 </dl>
+
+<h2>Translations</h2>
+
+<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/forum.wml b/website/forum.wml
index d10614e9..f26d3af4 100644
--- a/website/forum.wml
+++ b/website/forum.wml
@@ -1,5 +1,6 @@
 <PAGE AUTHOR = "Tobias Oetiker <tobi@oetiker.ch>"
         PAGE = "forum">
 	
-<a id="nabblelink" href="http://n2.nabble.com/RRD-Mailinglists-f937164.html">RRD Mailinglists</a>
-<script src="http://n2.nabble.com/embed/f937164"></script>
+<a id="nabblelink" href="http://rrd-mailinglists.937164.n2.nabble.com/">RRD Mailinglists</a>
+<script src="http://rrd-mailinglists.937164.n2.nabble.com/embed/f937164"></script>
+
diff --git a/website/gallery/index.en.html b/website/gallery/index.en.html
index 334cff23..e08ecb6c 100644
--- a/website/gallery/index.en.html
+++ b/website/gallery/index.en.html
@@ -141,7 +141,7 @@ as, Phone, VAS and MM4 (others operator). -- Alex Rivoltella &lt;alessio.r-delme
 </div>
 <div class="gallery">
 <h2>2wk Power Usage graph</h2>
-<div class="image"><img src="powermeter-2wk.png" alt="" /></div>
+<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 -->
diff --git a/website/rrdworld/index.wml b/website/rrdworld/index.wml
index fbd6974c..d8b1f125 100644
--- a/website/rrdworld/index.wml
+++ b/website/rrdworld/index.wml
@@ -9,6 +9,7 @@ add-ons to big applications or even replacements for rrdtool itself.</p>
 
 <h2>RRDtool Companions</h2>
 
+#include "rrd-editor.xml"
 #include "drraw.xml"
 #include "dsreport.xml"
 #include "nhawk_description.xml"