From 4a090ba06a54f5da179ac02bb307cc03d08831bf Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Wed, 16 Jul 2003 05:34:56 +0000
Subject: trying to get HEAD building again.  If you want the code prior to
 this merge, checkout HEAD_PRE_3_0_0_BETA_3_MERGE (This used to be commit
 adb98e7b7cd0f025b52c570e4034eebf4047b1ad)

---
 docs/docbook/projdoc/samba-doc.xml | 32 ++++++++++++++++++++++++--------
 1 file changed, 24 insertions(+), 8 deletions(-)

(limited to 'docs/docbook/projdoc/samba-doc.xml')

diff --git a/docs/docbook/projdoc/samba-doc.xml b/docs/docbook/projdoc/samba-doc.xml
index a4394d263f..91002c9133 100644
--- a/docs/docbook/projdoc/samba-doc.xml
+++ b/docs/docbook/projdoc/samba-doc.xml
@@ -9,10 +9,6 @@
 
 <bookinfo>
 	<authorgroup>
-	<author>
-		<othername>SAMBA Team</othername>
-		<affiliation><address><email>samba@samba.org</email></address></affiliation>
-	</author>
 	<editor>&person.jelmer;</editor>
 	<editor>&person.jht;</editor>
 	<editor>&person.jerry;</editor>
@@ -28,7 +24,7 @@ The most recent version of this document can be found at
 <ulink url="http://www.samba.org/">http://www.samba.org/</ulink>
 on the "Documentation" page.  Please send updates to
 <ulink url="mailto:jelmer@samba.org">Jelmer Vernooij</ulink>,
-<ulink url="mailto:jht@samba.org">John H Terpstra</ulink> or
+<ulink url="mailto:jht@samba.org">John H. Terpstra</ulink> or
 <ulink url="mailto:jerry@samba.org">Gerald (Jerry) Carter</ulink>.
 </para>
 
@@ -38,7 +34,7 @@ or without their knowledge contributed to this update. The size and scope of thi
 project would not have been possible without significant community contribution. A not
 insignificant number of ideas for inclusion (if not content itself) has been obtained
 from a number of Unofficial HOWTOs - to each such author a big "Thank-you" is also offered.
-Please keep publishing your Unofficial HOWTO's - they are a source of inspiration and
+Please keep publishing your Unofficial HOWTOs - they are a source of inspiration and
 application knowledge that is most to be desired by many Samba users and administrators.
 </para>
 
@@ -50,6 +46,14 @@ version 2.  A copy of the license is included with the Samba source
 distribution.  A copy can be found on-line at <ulink 
 url="http://www.fsf.org/licenses/gpl.txt">http://www.fsf.org/licenses/gpl.txt</ulink>
 </para>
+
+<formalpara>
+	<title>Attributions</title>
+	<para>
+		&attributions;
+	</para>
+</formalpara>
+
 </legalnotice>
 </bookinfo>
 
@@ -67,6 +71,7 @@ PLEASE read this.</para>
 </partintro>
 &IntroSMB;
 &UNIX-INSTALL;
+&FastStart;
 </part>
 
 <part id="type">
@@ -84,6 +89,7 @@ section carefully.
 &Samba-BDC-HOWTO;
 &DOMAIN-MEMBER;
 &StandAloneServer;
+&ClientConfig;
 </part>
 
 <part id="optional">
@@ -112,6 +118,15 @@ Samba has several features that you might want or might not want to use. The cha
 &Samba-PAM;
 &IntegratingWithWindows;
 &unicode;
+&Backup;
+&HighAvailability;
+</part>
+
+<part id="migration">
+<title>Migration and Updating</title>
+&upgrading;
+&NT4Migration;
+&SWAT;
 </part>
 
 <part id="troubleshooting">
@@ -124,12 +139,13 @@ Samba has several features that you might want or might not want to use. The cha
 <part id="Appendixes">
 <title>Appendixes</title>
 &Compiling;
-&NT4Migration;
 &Portability;
 &Other-Clients;
-&SWAT;
 &SPEED;
+&DNS-DHCP-Configuration;
 &Further-Resources;
 </part>
 
+<index/>
+
 </book>
-- 
cgit