From 30a6d4d91be37f11e3241a57ff2f7bd013ce6353 Mon Sep 17 00:00:00 2001
From: oetiker <oetiker@a5681a0c-68f1-0310-ab6d-d61299d08faa>
Date: Thu, 21 Jan 2010 14:42:01 +0000
Subject: [PATCH] update download instructions

git-svn-id: svn://svn.oetiker.ch/rrdtool/branches/1.4@2007 a5681a0c-68f1-0310-ab6d-d61299d08faa
---
 website/download.wml          | 40 ++++++++++++++++++-----------------
 website/gallery/index.en.html |  2 +-
 2 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/website/download.wml b/website/download.wml
index de0d5ab3..61c28c83 100644
--- a/website/download.wml
+++ b/website/download.wml
@@ -46,34 +46,36 @@ You can download RRD tool from several places:
 
 <p>RRDtool source is stored in a subversion repository with anonymous access.</p>
 
-<p>Browse the RRDtool SVN via <a href="http://oss.oetiker.ch/rrdtool-trac/browser/branches/1.2/program">RRDtrac</a>.
+<p>Browse the RRDtool SVN via <a href="http://oss.oetiker.ch/rrdtool-trac/browser/trunk/program">RRDtrac</a>.
 Or if you want todo more than look ...</p>
 
 <pre>
-svn ls -R svn://svn.oetiker.ch/rrdtool/
+svn ls svn://svn.oetiker.ch/rrdtool/
 </pre>
 
-<p>tells you what is in the repository. Normally, development will happen in
-the "trunk" directory. Every major release gets an entry in the "branches"
-tree, and every released version get added to the "tags" tree.</p>
-
-<p>If you checkout code from the subversion repository, you will find that
-the <b>configure</b> script is missing. You get this generated by running:
-<B>./MakeMakefile</B> ... note that you will need automake, autoconf and
-libtool installed for this to work.</p>
+<p>tells you what is in the repository. Development will happen in the
+"trunk" directory. Every major release gets an entry in the "branches" tree
+as soon as development in trunk starts up again ... normally after a bit of
+a settling periode, and every released version get added to the "tags"
+tree.</p>
 
+<p>To get the latest changes from the current trunk use this:</p>
+<pre>
+svn checkout svn://svn.oetiker.ch/rrdtool/trunk/program
+mv program rrdtool-trunk
+cd rrdtool-trunk
+./autogen.sh
+</pre>
 
-<p>If you fix a bug, I would love to see the output of '<b>svn diff</b>'.</p>
+<p>If you checkout code from the subversion repository, you will find that
+the <b>configure</b> script is missing. The last line in the example above
+should have taken care of this problem. If not, it could be that you are
+missing automake, autoconf and libtool installations on your system.</p>
 
-<p>Starting with rrdtool 1.3rc1, make sure to run <code>./configure --enable-maintainer-mode</code> prior
+<p>Make sure to run <code>./configure --enable-maintainer-mode</code> prior
 before 'makeing' modified source, to ensure that all bits get properly
 rebuilt.</p>
 
-<p>To get the latest changes from the current 1.2 branch use this:</p>
-<pre>
-svn checkout svn://svn.oetiker.ch/rrdtool/branches/1.2/program
-mv program rrdtool-1.2
-cd rrdtool-1.2
-./MakeMakefile
-</pre>
+<p>If you fix a bug, I would love to see the output of '<b>svn diff</b>'.</p>
+
 
diff --git a/website/gallery/index.en.html b/website/gallery/index.en.html
index 7e30ae5c..32a68e5d 100644
--- a/website/gallery/index.en.html
+++ b/website/gallery/index.en.html
@@ -77,7 +77,7 @@
 <br />
 <p><b>Gold Sponsors</b></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="../logos/zenoss.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/rrd-gold.png" /></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 />
 <br />
-- 
2.30.2