12 files changed, 130 insertions, 53 deletions
diff --git a/docs/docbook/global.ent b/docs/docbook/global.ent
index 9a7344660f..70f7849868 100644
--- a/docs/docbook/global.ent
+++ b/docs/docbook/global.ent
@@ -378,3 +378,104 @@ an Active Directory environment.
 
 <!-- We only need this for SGML, and not for XML... -->
 <!ENTITY percnt '%'>
+
+<!-- IDs for various Samba documentation sections -->
+
+<!ENTITY ID-UNIX-INSTALL SYSTEM "install">
+<!ENTITY ID-ENCRYPTION SYSTEM "pwencrypt">
+<!ENTITY ID-MS-Dfs-Setup SYSTEM "msdfs">
+<!ENTITY ID-PRINTER-DRIVER2 SYSTEM "printing">
+<!ENTITY ID-DOMAIN-MEMBER SYSTEM "domain-security">
+<!ENTITY ID-WINBIND SYSTEM "winbind">
+<!ENTITY ID-NT-Security SYSTEM "unix-permissions">
+<!ENTITY ID-Samba-PDC-HOWTO SYSTEM "samba-pdc">
+<!ENTITY ID-Samba-BDC-HOWTO SYSTEM "samba-bdc">
+<!ENTITY ID-CVS-Access SYSTEM "cvs-access">
+<!ENTITY ID-IntegratingWithWindows SYSTEM "integrate-ms-networks">
+<!ENTITY ID-Samba-PAM SYSTEM "pam">
+<!ENTITY ID-Samba-LDAP SYSTEM "samba-ldap-howto">
+<!ENTITY ID-Diagnosis SYSTEM "diagnosis">
+<!ENTITY ID-BUGS SYSTEM "bugreport">
+<!ENTITY ID-SECURITY-LEVEL SYSTEM "securitylevels">
+<!ENTITY ID-SPEED SYSTEM "speed">
+<!ENTITY ID-BROWSING SYSTEM "improved-browsing">
+<!ENTITY ID-BROWSING-Quick SYSTEM "Browsing-Quick">
+<!ENTITY ID-GROUP-MAPPING-HOWTO SYSTEM "groupmapping">
+<!ENTITY ID-Portability SYSTEM "Portability">
+<!ENTITY ID-Other-Clients SYSTEM "Other-Clients">
+<!ENTITY ID-ADS-HOWTO SYSTEM "ADS">
+<!ENTITY ID-pdb-mysql SYSTEM "pdb-mysql">
+<!ENTITY ID-pdb-xml SYSTEM "pdb-xml">
+<!ENTITY ID-VFS SYSTEM "VFS">
+
+<!ENTITY MANUALPAGES SYSTEM "manpages/manuals.sgml">
+<!ENTITY MAN-FINDSMB SYSTEM "manpages/findsmb.1.sgml">
+<!ENTITY MAN-NMBLOOKUP SYSTEM "manpages/nmblookup.1.sgml">
+<!ENTITY MAN-RPCCLIENT SYSTEM "manpages/rpcclient.1.sgml">
+<!ENTITY MAN-SMBCACLS SYSTEM "manpages/smbcacls.1.sgml">
+<!ENTITY MAN-SMBCLIENT SYSTEM "manpages/smbclient.1.sgml">
+<!ENTITY MAN-SMBCONTROL SYSTEM "manpages/smbcontrol.1.sgml">
+<!ENTITY MAN-LMHOSTS SYSTEM "manpages/lmhosts.5.sgml">
+<!ENTITY MAN-SMBCONF SYSTEM "manpages/smb.conf.5.sgml">
+<!ENTITY MAN-SAMBA SYSTEM "manpages/samba.7.sgml">
+<!ENTITY MAN-NET SYSTEM "manpages/net.8.sgml">
+<!ENTITY MAN-NMBD SYSTEM "manpages/nmbd.8.sgml">
+<!ENTITY MAN-PDBEDIT SYSTEM "manpages/pdbedit.8.sgml">
+<!ENTITY MAN-SMBD SYSTEM "manpages/smbd.8.sgml">
+<!ENTITY MAN-SMBGROUPEDIT SYSTEM "manpages/smbgroupedit.8.sgml">
+<!ENTITY MAN-SMBMOUNT SYSTEM "manpages/smbmount.8.sgml">
+<!ENTITY MAN-SMBMNT SYSTEM "manpages/smbmnt.8.sgml">
+<!ENTITY MAN-SMBPASSWDCONF SYSTEM "manpages/smbpasswd.5.sgml">
+<!ENTITY MAN-SMBPASSWD SYSTEM "manpages/smbpasswd.8.sgml">
+<!ENTITY MAN-SMBSH SYSTEM "manpages/smbsh.1.sgml">
+<!ENTITY MAN-SMBTAR SYSTEM "manpages/smbtar.1.sgml">
+<!ENTITY MAN-SMBSPOOL SYSTEM "manpages/smbspool.8.sgml">
+<!ENTITY MAN-SMBSTATUS SYSTEM "manpages/smbstatus.1.sgml">
+<!ENTITY MAN-SMBUMOUNT SYSTEM "manpages/smbumount.8.sgml">
+<!ENTITY MAN-SWAT SYSTEM "manpages/swat.8.sgml">
+<!ENTITY MAN-TESTPARM SYSTEM "manpages/testparm.1.sgml">
+<!ENTITY MAN-TESTPRNS SYSTEM "manpages/testprns.1.sgml">
+<!ENTITY MAN-VFSTEST SYSTEM "manpages/vfstest.1.sgml">
+<!ENTITY MAN-WBINFO SYSTEM "manpages/wbinfo.1.sgml">
+<!ENTITY MAN-WINBINDD SYSTEM "manpages/winbindd.8.sgml">
+
+
+<!ENTITY UNIX-INSTALL SYSTEM "projdoc/UNIX_INSTALL.sgml">
+<!ENTITY ENCRYPTION SYSTEM "projdoc/ENCRYPTION.sgml">
+<!ENTITY MS-Dfs-Setup SYSTEM "projdoc/msdfs_setup.sgml">
+<!ENTITY PRINTER-DRIVER2 SYSTEM "projdoc/printer_driver2.sgml">
+<!ENTITY DOMAIN-MEMBER SYSTEM "projdoc/DOMAIN_MEMBER.sgml">
+<!ENTITY WINBIND SYSTEM "projdoc/winbind.sgml">
+<!ENTITY NT-Security SYSTEM "projdoc/NT_Security.sgml">
+<!ENTITY Samba-PDC-HOWTO SYSTEM "projdoc/Samba-PDC-HOWTO.sgml">
+<!ENTITY Samba-BDC-HOWTO SYSTEM "projdoc/Samba-BDC-HOWTO.sgml">
+<!ENTITY CVS-Access SYSTEM "projdoc/CVS-Access.sgml">
+<!ENTITY IntegratingWithWindows SYSTEM "projdoc/Integrating-with-Windows.sgml">
+<!ENTITY Samba-PAM SYSTEM "projdoc/PAM-Authentication-And-Samba.sgml">
+<!ENTITY Samba-LDAP SYSTEM "projdoc/Samba-LDAP-HOWTO.sgml">
+<!ENTITY Diagnosis SYSTEM "projdoc/Diagnosis.sgml">
+<!ENTITY BUGS SYSTEM "projdoc/Bugs.sgml">
+<!ENTITY SECURITY-LEVEL SYSTEM "projdoc/security_level.sgml">
+<!ENTITY SPEED SYSTEM "projdoc/Speed.sgml">
+<!ENTITY BROWSING SYSTEM "projdoc/Browsing.sgml">
+<!ENTITY BROWSING-Quick SYSTEM "projdoc/Browsing-Quickguide.sgml">
+<!ENTITY GROUP-MAPPING-HOWTO SYSTEM "projdoc/GROUP-MAPPING-HOWTO.sgml">
+<!ENTITY Portability SYSTEM "projdoc/Portability.sgml">
+<!ENTITY Other-Clients SYSTEM "projdoc/Other-Clients.sgml">
+<!ENTITY ADS-HOWTO SYSTEM "projdoc/ADS-HOWTO.sgml">
+<!ENTITY pdb-mysql SYSTEM "projdoc/pdb_mysql.sgml">
+<!ENTITY pdb.sgml SYSTEM "projdoc/pdb.sgml.sgml">
+<!ENTITY VFS SYSTEM "projdoc/VFS.sgml">
+<!ENTITY Passdb SYSTEM "projdoc/passdb.sgml">
+<!ENTITY ServerType SYSTEM "projdoc/ServerType.sgml">
+<!ENTITY SecuringSamba SYSTEM "projdoc/securing-samba.sgml">
+<!ENTITY Compiling SYSTEM "projdoc/Compiling.sgml">
+<!ENTITY unicode SYSTEM "projdoc/unicode.sgml">
+<!ENTITY CUPS SYSTEM "projdoc/CUPS-printing.sgml">
+<!ENTITY AdvancedNetworkAdmin SYSTEM "projdoc/AdvancedNetworkAdmin.sgml">
+<!ENTITY PolicyMgmt SYSTEM "projdoc/PolicyMgmt.sgml">
+<!ENTITY ProfileMgmt SYSTEM "projdoc/ProfileMgmt.sgml">
+<!ENTITY NT4Migration SYSTEM "projdoc/NT4Migration.sgml">
+<!ENTITY SWAT SYSTEM "projdoc/SWAT.sgml">
+<!ENTITY Trusts SYSTEM "projdoc/InterdomainTrusts.sgml">
+<!ENTITY problems SYSTEM "projdoc/Problems.sgml">
diff --git a/docs/docbook/projdoc/Bugs.sgml b/docs/docbook/projdoc/Bugs.sgml
index d3525f5f95..155ab353f4 100644
--- a/docs/docbook/projdoc/Bugs.sgml
+++ b/docs/docbook/projdoc/Bugs.sgml
@@ -62,7 +62,7 @@ file for correct syntax.
 </para>
 
 <para>
-Have you run through the <link linkend="Diagnosis">diagnosis</link>? 
+Have you run through the <link linkend="diagnosis">diagnosis</link>? 
 This is very important.
 </para>
 
diff --git a/docs/docbook/projdoc/CUPS-printing.sgml b/docs/docbook/projdoc/CUPS-printing.sgml
index fd954cc1c5..ea10ba0e75 100644
--- a/docs/docbook/projdoc/CUPS-printing.sgml
+++ b/docs/docbook/projdoc/CUPS-printing.sgml
@@ -23,7 +23,7 @@ a very mystical tool. There is a great deal of uncertainty regarding CUPS and ho
 it works. The result is seen in a large number of posting on the samba mailing lists
 expressing frustration when MS Windows printers appear not to work with a CUPS
 backr-end.
-/para>
+</para>
 
 <para>
 This is a good time to point out how CUPS can be used and what it does. CUPS is more
@@ -112,8 +112,8 @@ do any print file format conversion work.
 The CUPS files that need to be correctly set for RAW mode printers to work are:
 
 <itemizedlist>
-	<listitem><para><filename>/etc/cups/mime.types</filename><para></listitem>
-	<listitem><para><filename>/etc/cups/mime.convs</filename><para></listitem>
+	<listitem><para><filename>/etc/cups/mime.types</filename></para></listitem>
+	<listitem><para><filename>/etc/cups/mime.convs</filename></para></listitem>
 </itemizedlist>
 
 Both contain entries that must be uncommented to allow <emphasis>RAW</emphasis> mode
@@ -172,6 +172,7 @@ the process of determining proper treatment while in the print queue system.
 		<listitem><para>* application/vnd.cups-postscript</para></listitem>
 	</itemizedlist>
 	</para>
+	</listitem>
 </itemizedlist>
 </para>
 
@@ -186,14 +187,14 @@ the filtered file could possibly have an unwanted PJL header.
 
 <para>
 "application/postscript" will be all files with a ".ps", ".ai", ".eps" suffix or which
-have as their first character string one of "%!" or "<04>%".
+have as their first character string one of "%!" or "&gt;04&lt;%".
 </para>
 
 <para>
 "application/vnd.cups-postscript" will files which contain the string
 "LANGUAGE=POSTSCRIPT" (or similar variations with different capitalization) in the
 first 512 bytes, and also contain the "PJL super escape code" in the first 128 bytes
-("<1B>%-12345X"). Very likely, most PostScript files generated on Windows using a CUPS
+("&gt;1B&lt;%-12345X"). Very likely, most PostScript files generated on Windows using a CUPS
 or other PPD, will have to be auto-typed as "vnd.cups-postscript".  A file produced
 with a "Generic PostScript driver" will just be tagged "application/postscript".
 </para>
@@ -1072,7 +1073,7 @@ The recommended driver is "ljet4". It has a link to the page for the ljet4
 driver too:
 </para>
 
-<para><ulink url="http://www.linuxprinting.org/show_driver.cgi?driver=ljet4">http://www.linuxprinting.org/show_driver.cgi?driver=ljet4</ulink>
+<para><ulink url="http://www.linuxprinting.org/show_driver.cgi?driver=ljet4">http://www.linuxprinting.org/show_driver.cgi?driver=ljet4</ulink></para>
 
 <para>
 On the driver's page, you'll find important and detailed info about how to use
@@ -1173,6 +1174,7 @@ Summary - You need:
 	<member>Ghostscript (because it is called and controlled by the PPD/cupsomatic combo in a way to fit your printermodel/driver combo.</member>
 	<member>Ghostscript *must*, depending on the driver/model, contain support for a certain "device" (as shown by "gs -h")</member>
 </simplelist>
+</para>
 
 <para>
 In the case of the "hpijs" driver, you need a Ghostscript version, which
@@ -1227,6 +1229,8 @@ for the whereabouts of your Windows-originating printjobs:
 	<member>are there "filter rules" defined in "/etc/cups/mime.convs" for this MIME type?</member>
 </simplelist>
 
+</sect2>
+
 </sect1>
 
 
diff --git a/docs/docbook/projdoc/Compiling.sgml b/docs/docbook/projdoc/Compiling.sgml
index 868ed52b74..b8471508f6 100644
--- a/docs/docbook/projdoc/Compiling.sgml
+++ b/docs/docbook/projdoc/Compiling.sgml
@@ -227,7 +227,7 @@ on this system just substitute the correct package name
 	<simplelist>
 	<member>the MIT kerberos development libraries (either install from the sources or use a package). The heimdal libraries will not work.</member>
 	<member>the OpenLDAP development libraries.</member>
-	</simplelist>
+</simplelist></para>
 
 	<para>If your kerberos libraries are in a non-standard location then
 	  remember to add the configure option --with-krb5=DIR.</para>
diff --git a/docs/docbook/projdoc/DOMAIN_MEMBER.sgml b/docs/docbook/projdoc/DOMAIN_MEMBER.sgml
index dc5b7d6e8c..6f995af286 100644
--- a/docs/docbook/projdoc/DOMAIN_MEMBER.sgml
+++ b/docs/docbook/projdoc/DOMAIN_MEMBER.sgml
@@ -1,4 +1,4 @@
-<chapter id="domain-security">
+<chapter id="domain-member">
 
 <chapterinfo>
 	&author.jeremy;
diff --git a/docs/docbook/projdoc/Diagnosis.sgml b/docs/docbook/projdoc/Diagnosis.sgml
index bf6846b5cb..9ab95dad86 100644
--- a/docs/docbook/projdoc/Diagnosis.sgml
+++ b/docs/docbook/projdoc/Diagnosis.sgml
@@ -484,7 +484,7 @@ set to "yes".
 <title>Still having troubles?</title>
 
 <para>Read the chapter on 
-<link linkend="Problems">Analysing and Solving Problems</link>.
+<link linkend="problems">Analysing and Solving Problems</link>.
 </para>
 
 </sect1>
diff --git a/docs/docbook/projdoc/InterdomainTrusts.sgml b/docs/docbook/projdoc/InterdomainTrusts.sgml
index 0fc634c544..7ad546bb7b 100644
--- a/docs/docbook/projdoc/InterdomainTrusts.sgml
+++ b/docs/docbook/projdoc/InterdomainTrusts.sgml
@@ -68,6 +68,7 @@ an inherent feature of ADS domains.
 
 <para>
 There are two steps to creating an inter-domain trust relationship.
+</para>
 
 <sect2>
 <title>NT4 as the Trusting Domain</title>
@@ -94,7 +95,7 @@ with the trusted domain. To consumate the trust relationship the administrator w
 Domain User Manager, from the menu select Policies, then select Trust Relationships, then click on the
 "Add" button that is next to the box that is labelled "Trusted Domains". A panel will open in
 which must be entered the name of the remote domain as well as the password assigned to that trust.
-<para>
+</para>
 
 </sect2>
 </sect1>
diff --git a/docs/docbook/projdoc/PolicyMgmt.sgml b/docs/docbook/projdoc/PolicyMgmt.sgml
index 35519d750c..7557d496a4 100644
--- a/docs/docbook/projdoc/PolicyMgmt.sgml
+++ b/docs/docbook/projdoc/PolicyMgmt.sgml
@@ -206,7 +206,8 @@ executable name poledit.exe), GPOs are created and managed using a Microsoft Man
 <para>
 Go to the Windows 200x / XP menu <filename>Start->Programs->Administrative Tools</filename>
 	and select the MMC snap-in called "Active Directory Users and Computers"
-<para></step>
+</para>
+</step>
 
 <step><para>
 Select the domain or organizational unit (OU) that you wish to manage, then right click
@@ -241,6 +242,7 @@ use this powerful tool. Please refer to the resource kit manuals for specific us
 </para>
 </note>
 
+</sect3>
 </sect2>
 </sect1>
 
@@ -312,6 +314,7 @@ With a Samba Domain Controller, the new tools for managing of user account and p
 man pages for these tools and become familiar with their use.
 </para>
 
+</sect2>
 </sect1>
 
 <sect1>
diff --git a/docs/docbook/projdoc/ProfileMgmt.sgml b/docs/docbook/projdoc/ProfileMgmt.sgml
index 13ec698384..bc0113baeb 100644
--- a/docs/docbook/projdoc/ProfileMgmt.sgml
+++ b/docs/docbook/projdoc/ProfileMgmt.sgml
@@ -84,7 +84,7 @@ meta-service name as part of the profile share path.
 <para>
 To support Windows 9x / Me clients, you must use the "logon home" parameter. Samba has
 now been fixed so that <userinput>net use /home</userinput> now works as well, and it, too, relies
-on the <command>logon home</command< parameter.
+on the <command>logon home</command> parameter.
 </para>
 
 <para>
@@ -560,6 +560,8 @@ domain is not a member of a trust relationship with your NT4 PDC.</para></note>
 Follow the above for every profile you need to migrate.
 </para>
 
+</sect3>
+
 <sect3>
 <title>Side bar Notes</title>
 
@@ -575,7 +577,6 @@ settings as well as all your users.
 
 </sect3>
 
-
 <sect3>
 <title>moveuser.exe</title>
 
@@ -682,7 +683,7 @@ is located on the Windows workstation, and knowing which registry keys affect th
 from which the default profile is created, it is possible to modify the default profile
 to one that has been optimised for the site. This has significant administrative 
 advantages.
-<para>
+</para>
 
 <sect2>
 <title>MS Windows 9x/Me</title>
@@ -1061,7 +1062,7 @@ A roaming profile will be cached locally unless the following registry key is cr
 
 In which case, the local cache copy will be deleted on logout.
 </para>
-</sect2
+</sect2>
 </sect1>
 
 </chapter>
diff --git a/docs/docbook/projdoc/samba-doc.sgml b/docs/docbook/projdoc/samba-doc.sgml
index c6ef1c108c..3c6028e61c 100644
--- a/docs/docbook/projdoc/samba-doc.sgml
+++ b/docs/docbook/projdoc/samba-doc.sgml
@@ -1,39 +1,5 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
 <!ENTITY % globalentities SYSTEM '../global.ent'> %globalentities;
-<!ENTITY UNIX-INSTALL SYSTEM "UNIX_INSTALL.sgml">
-<!ENTITY MS-Dfs-Setup SYSTEM "msdfs_setup.sgml">
-<!ENTITY PRINTER-DRIVER2 SYSTEM "printer_driver2.sgml">
-<!ENTITY DOMAIN-MEMBER SYSTEM "DOMAIN_MEMBER.sgml">
-<!ENTITY WINBIND SYSTEM "winbind.sgml">
-<!ENTITY NT-Security SYSTEM "NT_Security.sgml">
-<!ENTITY ServerType SYSTEM "ServerType.sgml">
-<!ENTITY Samba-PDC-HOWTO SYSTEM "Samba-PDC-HOWTO.sgml">
-<!ENTITY Samba-BDC-HOWTO SYSTEM "Samba-BDC-HOWTO.sgml">
-<!ENTITY IntegratingWithWindows SYSTEM "Integrating-with-Windows.sgml">
-<!ENTITY Samba-PAM SYSTEM "PAM-Authentication-And-Samba.sgml">
-<!ENTITY Diagnosis SYSTEM "Diagnosis.sgml">
-<!ENTITY BUGS SYSTEM "Bugs.sgml">
-<!ENTITY SECURITY-LEVEL SYSTEM "security_level.sgml">
-<!ENTITY SPEED SYSTEM "Speed.sgml">
-<!ENTITY BROWSING SYSTEM "Browsing.sgml">
-<!ENTITY BROWSING-Quick SYSTEM "Browsing-Quickguide.sgml">
-<!ENTITY GROUP-MAPPING-HOWTO SYSTEM "GROUP-MAPPING-HOWTO.sgml">
-<!ENTITY Portability SYSTEM "Portability.sgml">
-<!ENTITY Other-Clients SYSTEM "Other-Clients.sgml">
-<!ENTITY ADS-HOWTO SYSTEM "ADS-HOWTO.sgml">
-<!ENTITY Passdb SYSTEM "passdb.sgml">
-<!ENTITY VFS SYSTEM "VFS.sgml">
-<!ENTITY SecuringSamba SYSTEM "securing-samba.sgml">
-<!ENTITY Compiling SYSTEM "Compiling.sgml">
-<!ENTITY unicode SYSTEM "unicode.sgml">
-<!ENTITY CUPS SYSTEM "CUPS-printing.sgml">
-<!ENTITY AdvancedNetworkAdmin SYSTEM "AdvancedNetworkAdmin.sgml">
-<!ENTITY PolicyMgmt SYSTEM "PolicyMgmt.sgml">
-<!ENTITY ProfileMgmt SYSTEM "ProfileMgmt.sgml">
-<!ENTITY NT4Migration SYSTEM "NT4Migration.sgml">
-<!ENTITY SWAT SYSTEM "SWAT.sgml">
-<!ENTITY Trusts SYSTEM "InterdomainTrusts.sgml">
-<!ENTITY problems SYSTEM "Problems.sgml">
 ]>
 
 <book id="Samba-HOWTO-Collection">
@@ -140,3 +106,4 @@ for various environments.
 &problems;
 &BUGS;
 </part>
+</book>
diff --git a/docs/docbook/projdoc/securing-samba.sgml b/docs/docbook/projdoc/securing-samba.sgml
index 88e216ac58..e9e8c4f9f8 100644
--- a/docs/docbook/projdoc/securing-samba.sgml
+++ b/docs/docbook/projdoc/securing-samba.sgml
@@ -68,7 +68,7 @@ You can change this behaviour using options like the following:
 <para><programlisting>
   interfaces = eth* lo
   bind interfaces only = yes
-</programlisting><para>
+</programlisting></para>
 
 <para>
 This tells Samba to only listen for connections on interfaces with a
diff --git a/docs/docbook/projdoc/security_level.sgml b/docs/docbook/projdoc/security_level.sgml
index 99f21aec5d..4ce5955e35 100644
--- a/docs/docbook/projdoc/security_level.sgml
+++ b/docs/docbook/projdoc/security_level.sgml
@@ -3,7 +3,7 @@
 	&author.tridge;
 	&author.jelmer;
 </chapterinfo>
-<title>Samba as Stand-Alone Server</title
+<title>Samba as Stand-Alone Server</title>
 
 <para>
 In this section the function and purpose of Samba's <emphasis>security</emphasis>
@@ -11,7 +11,7 @@ modes are described.
 </para>
 
 <sect1>
-<Title>User and Share security level</title>
+<title>User and Share security level</title>
 
 <para>
 A SMB server tells the client at startup what "security level" it is