Large number of updates - new structure of the HOWTO, better names, introductions, updating to 3.0

(This used to be commit dfc3d55493c40201244a9e44b89868f7128c6f85)

1 files changed, 43 insertions, 12 deletions

diff --git a/docs/docbook/projdoc/samba-doc.sgml b/docs/docbook/projdoc/samba-doc.sgml
index f20849edbf..1a35cbd35d 100644
--- a/docs/docbook/projdoc/samba-doc.sgml
+++ b/docs/docbook/projdoc/samba-doc.sgml
@@ -13,7 +13,6 @@
 <!ENTITY Samba-PAM SYSTEM "PAM-Authentication-And-Samba.sgml">
 <!ENTITY Samba-LDAP SYSTEM "Samba-LDAP-HOWTO.sgml">
 <!ENTITY Diagnosis SYSTEM "Diagnosis.sgml">
-<!ENTITY PRINTING SYSTEM "Printing.sgml">
 <!ENTITY BUGS SYSTEM "Bugs.sgml">
 <!ENTITY SECURITY-LEVEL SYSTEM "security_level.sgml">
 <!ENTITY SPEED SYSTEM "Speed.sgml">
@@ -23,6 +22,7 @@
 <!ENTITY Portability SYSTEM "Portability.sgml">
 <!ENTITY Other-Clients SYSTEM "Other-Clients.sgml">
 <!ENTITY ADS-HOWTO SYSTEM "ADS-HOWTO.sgml">
+<!ENTITY oplocks SYSTEM "oplocks.sgml">
 ]>
 
 <book id="Samba-HOWTO-Collection">
@@ -66,30 +66,61 @@ Cheers, jerry
 </dedication>
 
 <!-- Chapters -->
+<part>
+<title>General installation</title>
+<partintro>
+<title>Introduction</title>
+<para>This part 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>
 &UNIX-INSTALL;
+&BROWSING;
+&oplocks;
+&BROWSING-Quick;
+&ENCRYPTION;
+</part>
+
+<part>
+<title>Type of installation</title>
+<partintro>
+<title>Introduction</title>
+<para>This part contains information on using samba in a (NT 4 or ADS) domain. 
+If you wish to run samba as a domain member or DC, read the appropriate chapter in 
+this part.</para>
+</partintro>
+&Samba-PDC-HOWTO;
+&Samba-BDC-HOWTO;
+&ADS-HOWTO;
+&DOMAIN-MEMBER;
+</part>
+
+<part>
+<title>Optional 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>
+</partintro>
 &IntegratingWithWindows;
+&NT-Security;
 &Samba-PAM;
 &MS-Dfs-Setup;
-&NT-Security;
 &PRINTER-DRIVER2;
-&PRINTING;
 &SECURITY-LEVEL;
-&DOMAIN-MEMBER;
 &WINBIND;
-&Samba-PDC-HOWTO;
-&Samba-BDC-HOWTO;
 &Samba-LDAP;
-&ADS-HOWTO;
-&BROWSING;
-&BROWSING-Quick;
-&SPEED;
 &CVS-Access;
-&BUGS;
 &GROUP-MAPPING-HOWTO;
+&SPEED;
+</part>
 
-<!-- Appendices -->
+<part>
+<title>Appendixes</title>
 &Portability;
 &Other-Clients;
+&BUGS;
 &Diagnosis;
+</part>
 
 </book>