From de693b4e6100284ce63ab59ebbc9dbf2760813f2 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sat, 9 Jun 2007 15:11:05 +1000
Subject: [PATCH] doc updates (This used to be ctdb commit
 0e6a0b2d377a48eba9ba313e4e63c3ee4cd6722a)

---
 ctdb/web/documentation.html |  1 +
 ctdb/web/download.html      | 16 +++++++++--
 ctdb/web/index.html         | 56 -------------------------------------
 ctdb/web/nfs.html           |  7 +++++
 4 files changed, 21 insertions(+), 59 deletions(-)

diff --git a/ctdb/web/documentation.html b/ctdb/web/documentation.html
index cd903b68303..dc6d35fe4f9 100644
--- a/ctdb/web/documentation.html
+++ b/ctdb/web/documentation.html
@@ -12,6 +12,7 @@ get you started
 
 <ul>
 <li><a href="http://ctdb.samba.org/~tridge/ctdb/doc/ctdb.1.html">ctdb manual page</a>
+<li><a href="download.html">downloading CTDB</a>
 <li><a href="building.html">building CTDB</a>
 <li><a href="configuring.html">configuring CTDB</a>
 <li><a href="configuring.html">testing CTDB</a>
diff --git a/ctdb/web/download.html b/ctdb/web/download.html
index c1cf79b1af9..0e4e7f904e9 100644
--- a/ctdb/web/download.html
+++ b/ctdb/web/download.html
@@ -7,11 +7,12 @@
 
 <H2 align="center">Getting the code</h2>
 
-You need two source trees, one is a copy of Samba3 with clustering patches, and the other is the ctdb code itself.<br>
+You need two source trees, one is a copy of Samba3 with clustering
+patches, and the other is the ctdb code itself.<p>
 
-Both source trees are stored in bzr repositories.<br><br>
+Both source trees are stored in bzr repositories.<p>
 
-See http://bazaar-vcs.org/ for more information on bzr.<br><br>
+See http://bazaar-vcs.org/ for more information on bzr.<p>
 
 <h2>CTDB</h2>
 To get an initial checkout of the ctdb code do this:
@@ -50,4 +51,13 @@ If you don't have bzr and can't easily install it, then you can instead use the
     rsync -avz samba.org::ftp/unpacked/samba_3_0_ctdb/ .
 </pre>
 
+<h2>Binary Packages</h2>
+
+Note that packages are so far only available for RHEL4. Other packages
+will come later. <p>
+
+See <a href="packages/">packages</a> directory for package
+downloads.
+
+
 <!--#include virtual="footer.html" -->
diff --git a/ctdb/web/index.html b/ctdb/web/index.html
index 9806cd51961..925cbf0acf4 100644
--- a/ctdb/web/index.html
+++ b/ctdb/web/index.html
@@ -124,37 +124,6 @@ attached clients to trigger the clients to immediately recognize that
 the TCP connection needs to be re-established and to shortcut any TCP
 retransmission timeouts that may be active in the clients.
 
-<h2>Services using CTDB</h2>
-
-<h3>Samba 3/4</h3>
-
-Extensions has been developed to Samba3 and Samba 4 to integrate with
-CTDB to build a clustered highly available version of Samba where the
-same data/network shares are exported read-write from multiple nodes
-in a cluster. These versions of Samba have been demonstrated to provide very good
-scalability.<br><br>
-
-See <a href="samba.html">Setting up clustered Samba</a> for instructions on how to configure samba for clustering.<br>
-
-<p>Also see the <a href="http://wiki.samba.org/index.php/CTDB_Project">CTDB
-Project at samba.org</a> for more information about
-this <strong>pCIFS</strong> implementation.
-
-<h3>NFS v2/v3</h3>
-
-NFS v2/v3 has been successfully tested with exporting the same
-data/network share from multiple nodes in a CTDB cluster with correct
-file locking behaviour and lock recovery.<br><br>
-
-See <a href="nfs.html">Setting up clustered NFS</a> for instruction on how to set up a NFS cluster.<br>
-
-Also see <a href="http://wiki.samba.org/index.php/CTDB_Setup#Setting_up_CTDB_for_clustered_NFS">Configuring
-NFS for CTDB clustering</a> at samba.org for additional information.
-
-<h3>FTP</h3>
-
-See <a href="ftp.html">Setting up clustered FTP</a><br> for instructions on how to use vsftpd together with CTDB to provide a HA solution for FTP.
-
 <h2>Discussion and bug reports</h2>
 
 For discussions please use
@@ -169,31 +138,6 @@ projects that want to make their services cluster aware using CTDB.
 <p>CTDB discussions also happen on the #ctdb IRC channel on freenode.net
 
 
-<h2>Download</h2>
-
-You can download the latest source release
-using <a href="http://bazaar-vcs.org/">bzr</a>. Install bzr, then run
-this command:
-
-<pre>
-  bzr branch http://samba.org/~tridge/ctdb
-</pre>
-
-Or alternatively you can use rsync like this:
-
-<pre>
-  rsync -avz samba.org::ftp/unpacked/ctdb .
-</pre>
-
-
-<h2>Binary Packages</h2>
-
-Note that packages are so far only available for RHEL4. Other packages
-will come later. <p>
-
-See <a href="packages/">packages</a> directory for package
-downloads.
-
 <hr>
 <h2>Developers</h2>
 <ul>
diff --git a/ctdb/web/nfs.html b/ctdb/web/nfs.html
index 56c8868946f..563b65991cd 100644
--- a/ctdb/web/nfs.html
+++ b/ctdb/web/nfs.html
@@ -7,6 +7,13 @@
 
 <h1>Setting up clustered NFS</h1>
 
+NFS v2/v3 has been successfully tested with exporting the same
+data/network share from multiple nodes in a CTDB cluster with correct
+file locking behaviour and lock recovery.<br><br>
+
+Also see <a href="http://wiki.samba.org/index.php/CTDB_Setup#Setting_up_CTDB_for_clustered_NFS">Configuring
+NFS for CTDB clustering</a> at samba.org for additional information.
+
 <h2>Prereqs</h2>
 Configure CTDB as above and set it up to use public ipaddresses.<br>
 Verify that the CTDB cluster works.