Updates.

(This used to be commit 27eafbec10ae82eb686a7326f23e2ad9de2369dd)

4 files changed, 80 insertions, 36 deletions

diff --git a/docs/docbook/projdoc/NT4Migration.sgml b/docs/docbook/projdoc/NT4Migration.sgml
index 84719b9a94..60d9f121f4 100644
--- a/docs/docbook/projdoc/NT4Migration.sgml
+++ b/docs/docbook/projdoc/NT4Migration.sgml
@@ -445,9 +445,10 @@ Authentication database back end
 	Winbind (external Samba or NT4/200x server)
 	Can use pam_mkhomedir.so to auto-create home dirs
 	External server could use Active Directory or NT4 Domain
+
 Database type
 	smbpasswd, tdbsam, ldapsam, MySQLsam
-		With local accounts or with No Unix Accounts (NUA option)
+
 Access Control Points
 	On the Share itself (Use NT4 Server Manager)
 	On the file system
@@ -455,19 +456,24 @@ Access Control Points
 	Posix ACLs enablement in file system?
 	Through Samba share parameters
 		Not recommended - except as only resort
+
 Policies (migrate or create new ones)
 	Group Policy Editor (NT4)
 	Watch out for Tattoo effect
+
 User and Group Profiles
 	Platform specific so use platform tool to change from a Local to a Roaming profile
 	Can use new profiles tool to change SIDs (NTUser.DAT)
+
 Logon Scripts (Know how they work)
+
 User and Group mapping to Unix/Linux
 	username map facility may be needed
 	Use smbgroupedit to connect NT4 groups to Unix groups
 	Use pdbedit to set/change user configuration
 NOTE:
 If migrating to LDAP back end it may be easier to dump initial LDAP database to LDIF, then edit, then reload into LDAP
+
 	OS specific scripts / programs may be needed
 		Add / delete Users
 			Note OS limits on size of name (Linux 8 chars)
@@ -481,23 +487,16 @@ If migrating to LDAP back end it may be easier to dump initial LDAP database to
 Migration Tools
 	Domain Control (NT4 Style)
 	Profiles, Policies, Access Controls, Security
+
 Migration Tools
 	Samba: net, rpcclient, smbpasswd, pdbedit, smbgroupedit, profiles
 	Windows: NT4 Domain User Manager, Server Manager (NEXUS)
+
 Authentication
 	New SAM back end (smbpasswd, tdbsam, ldapsam, mysqlsam)
-		With of without Unix Accounts (NUA)
 </programlisting>
 </para>
 
 </sect1>
 
-<sect1>
-<title>Managing Samba-3 Domain Control</title>
-
-<para>
-Lots of blah blah here.
-</para>
-
-</sect1>
 </chapter>
diff --git a/docs/docbook/projdoc/NetworkBrowsing.sgml b/docs/docbook/projdoc/NetworkBrowsing.sgml
index c4b6a07777..7743cb9c75 100644
--- a/docs/docbook/projdoc/NetworkBrowsing.sgml
+++ b/docs/docbook/projdoc/NetworkBrowsing.sgml
@@ -2,7 +2,7 @@
 <chapterinfo>
 	&author.jht;
 	<pubdate>July 5, 1998</pubdate>
-	<pubdate>Updated: March 15, 2003</pubdate>
+	<pubdate>Updated: April 21, 2003</pubdate>
 </chapterinfo>
 
 <title>Samba / MS Windows Network Browsing Guide</title>
@@ -220,7 +220,7 @@ and so on.
 </para>
 
 <sect2>
-<title>Setting up Browsing in a WORKGROUP</title>
+<title>Setting up WORKGROUP Browsing</title>
 
 <para>
 To set up cross subnet browsing on a network containing machines
@@ -322,7 +322,7 @@ options in the <command>[global]</command> section of the
 </sect2>
 
 <sect2>
-<title>Setting up Browsing in a DOMAIN</title>
+<title>Setting up DOMAIN Browsing</title>
 
 <para>
 If you are adding Samba servers to a Windows NT Domain then
@@ -743,7 +743,7 @@ all &smb.conf; files :
 </para>
 
 <para>
-where &gt;name or IP address&lt; is either the DNS name of the WINS server
+where &lt;name or IP address&gt; is either the DNS name of the WINS server
 machine or its IP address.
 </para>
 
@@ -1147,7 +1147,7 @@ Now examine subnet 2.  As soon as N2_B has become the local
 master browser it looks for a Domain master browser to synchronize
 its browse list with.  It does this by querying the WINS server
 (N2_D) for the IP address associated with the NetBIOS name 
-WORKGROUP&gt;1B&lt;.  This name was registerd by the Domain master
+WORKGROUP&lt;1B&gt;.  This name was registerd by the Domain master
 browser (N1_C) with the WINS server as soon as it was booted.
 </para>
 
diff --git a/docs/docbook/projdoc/SWAT.sgml b/docs/docbook/projdoc/SWAT.sgml
index 7326a49874..ad43fd7b8a 100644
--- a/docs/docbook/projdoc/SWAT.sgml
+++ b/docs/docbook/projdoc/SWAT.sgml
@@ -1,19 +1,49 @@
 <chapter id="SWAT">
 <chapterinfo>
 	&author.jht;
-	<pubdate>April 3, 2003</pubdate>
+	<pubdate>April 21, 2003</pubdate>
 </chapterinfo>
 
 <title>SWAT - The Samba Web Admininistration Tool</title>
 
 <para>
-This is a rough guide to SWAT.
+There are many and varied opinions regarding the usefulness or otherwise of SWAT.
+No matter how hard one tries to produce the perfect configuration tool it remains
+an object of personal taste. SWAT is a tool that will allow web based configuration
+of samba. It has a wizard that may help to get samba configured quickly, it has context
+sensitive help on each smb.conf parameter, it provides for monitoring of current state
+of connection information, and it allows network wide MS Windows network password
+management.
 </para>
 
 <sect1>
 <title>SWAT Features and Benefits</title>
 
-<para>You must use at least the following ...</para>
+<para>
+There are network administrators who believe that it is a good idea to write systems
+documentation inside configuration files, for them SWAT will aways be a nasty tool. SWAT
+does not store the configuration file in any intermediate form, rather, it stores only the
+parameter settings, so when SWAT writes the smb.conf file to disk it will write only
+those parameters that are at other than the default settings. The result is that all comments
+will be lost from the smb.conf file. Additionally, the parameters will be written back in
+internal ordering.
+</para>
+
+<para><note>
+So before using SWAT please be warned - SWAT will completely replace your smb.conf with
+a fully optimised file that has been stripped of all comments you might have placed there
+and only non-default settings will be written to the file.
+</note></para>
+
+<para>
+SWAT should be installed to run via the network super daemon. Depending on which system
+your Unix/Linux system has you will have either an <filename>inetd</filename> or
+<filename>xinetd</filename> based system.
+</para>
+
+<para>
+The nature and location of the network super
+</para>
 
 <sect2>
 <title>The SWAT Home Page</title>
diff --git a/docs/docbook/projdoc/samba-doc.sgml b/docs/docbook/projdoc/samba-doc.sgml
index 5c3793a1ba..6048d60e5f 100644
--- a/docs/docbook/projdoc/samba-doc.sgml
+++ b/docs/docbook/projdoc/samba-doc.sgml
@@ -14,17 +14,29 @@
 	<editor>&person.jht;</editor>
 	<editor>&person.jerry;</editor>
 
-	<pubdate>Sunday 6 April</pubdate>
+	<pubdate>Monday April 21, 2003</pubdate>
 
 <abstract>
 <para>
 This book is a collection of HOWTOs added to Samba documentation over the years.
-Samba is always under development, and so is it's documentation.
-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:jerry@samba.org">jerry@samba.org</ulink> or 
-<ulink url="mailto:jelmer@samba.org">jelmer@samba.org</ulink>.
+Samba is always under development, and so is it's documentation. This release of the
+documentation represents a major revision or layout as well as contents.
+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@samba.org</ulink>,
+<ulink url="mailto:jht@samba.org">jht@samba.org</ulink> or
+<ulink url="mailto:jerry@samba.org">jerry@samba.org</ulink>.
+</para>
+
+<para>
+The Samba-Team would like to express sincere thanks to the many people who have with
+or without their knwoledge contributed to this update. The size and scope of this
+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 you Unofficial HOWTO's - they are a source of inspiration and
+application knowledge that is most to be desired by may Samba users and administrators.
 </para>
 
 </abstract>
@@ -41,26 +53,25 @@ url="http://www.fsf.org/licenses/gpl.txt">http://www.fsf.org/licenses/gpl.txt</u
 
 <!-- Chapters -->
 <part id="introduction">
-<title>General installation</title>
+<title>General Installation</title>
 <partintro>
-<title>Introduction</title>
-<para>This part contains general info on how to install samba 
+<title>Preparing Samba for Configuration</title>
+<para>This section of the Samba-HOWTO-Collection contains general info on how to install samba 
 and how to configure the parts of samba you will most likely need.
 PLEASE read this.</para>
 </partintro>
 &IntroSMB;
 &UNIX-INSTALL;
-&NetworkBrowsing;
-&Passdb;
 </part>
 
 <part id="type">
-<title>Type of installation</title>
+<title>Server Configuration Basics</title>
 <partintro>
-<title>Introduction</title>
+<title>First Steps in Server Configuration</title>
 <para>
-Samba can operate in various SMB networks. This part contains information on configuring samba 
-for various environments.
+Samba can operate in various modes within SMB networks. This HOWTO section contains information on
+configuring samba to function as the type of server your network requires. Please read this
+section carefully.
 </para>
 </partintro>
 &ServerType;
@@ -74,9 +85,13 @@ for various environments.
 <part id="optional">
 <title>Advanced Configuration</title>
 <partintro>
-<title>Introduction</title>
-<para>Samba has several features that you might want or might not want to use. The chapters in this part each cover one specific feature.</para>
+<title>Valuable Nuts and Bolts Information</title>
+<para>
+Samba has several features that you might want or might not want to use. The chapters in this part each cover specific Samba features.
+</para>
 </partintro>
+&NetworkBrowsing;
+&Passdb;
 &NT-Security;
 &GROUP-MAPPING-HOWTO;
 &PRINTER-DRIVER2;