Fix most of the invalid usages of DocBook in the Samba 3 HOWTO.

make check FTW!

10 files changed, 25 insertions, 26 deletions

diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-BDC.xml b/docs-xml/Samba3-HOWTO/TOSHARG-BDC.xml
index 35fdd9ee572..ec3dea7c5b3 100644
--- a/docs-xml/Samba3-HOWTO/TOSHARG-BDC.xml
+++ b/docs-xml/Samba3-HOWTO/TOSHARG-BDC.xml
@@ -153,7 +153,7 @@ provided this capability. The technology has become known as the LanMan Netlogon
 </para>
 
 <para>
-<indexterm>network<primary></primary><secondary>logon</secondary><tertiary>service</tertiary></indexterm>
+<indexterm><primary>network</primary><secondary>logon</secondary><tertiary>service</tertiary></indexterm>
 <indexterm><primary>Windows NT3.10</primary></indexterm>
 When MS Windows NT3.10 was first released, it supported a new style of Domain Control
 and with it a new form of the network logon service that has extended functionality.
diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-CUPS-printing.xml b/docs-xml/Samba3-HOWTO/TOSHARG-CUPS-printing.xml
index 50d2f6b32e4..70581121fb8 100644
--- a/docs-xml/Samba3-HOWTO/TOSHARG-CUPS-printing.xml
+++ b/docs-xml/Samba3-HOWTO/TOSHARG-CUPS-printing.xml
@@ -627,11 +627,11 @@ application/octet-stream   application/vnd.cups-raw   0   -
 	</para></note>
 
 	<para>
-	The example in <link linkend="1small">Windows Printing to a Local Printer</link> illustrates local Windows
+	The example in <link linkend="f1small">Windows Printing to a Local Printer</link> illustrates local Windows
 	printing.
 	</para>
 
-	<figure id="1small">
+	<figure id="f1small">
 		<title>Windows Printing to a Local Printer.</title>
 		<imagefile>1small</imagefile>
 	</figure>
@@ -714,11 +714,11 @@ application/octet-stream   application/vnd.cups-raw   0   -
 	PPD-aware. PPDs are <quote>PostScript Printer Description</quote> files. They enable you to specify and
 	control all options a printer supports: duplexing, stapling, and punching. Therefore, UNIX users for a long
 	time couldn't choose many of the supported device and job options, unlike Windows or Apple users. But now
-	there is CUPS. as illustrated in <link linkend="2small">Printing to a PostScript Printer</link>.
+	there is CUPS. as illustrated in <link linkend="f2small">Printing to a PostScript Printer</link>.
 	</para>
 	</note>
 
-	<figure id="2small">
+	<figure id="f2small">
 		<title>Printing to a PostScript Printer.</title>
 		<imagefile>2small</imagefile>
 	</figure>
@@ -742,10 +742,10 @@ application/octet-stream   application/vnd.cups-raw   0   -
 	used on UNIX platforms. It is a RIP in software, capable of doing a <emphasis>lot</emphasis> of file format
 	conversions for a very broad spectrum of hardware devices as well as software file formats.  Ghostscript
 	technology and drivers are what enable PostScript printing to non-PostScript hardware. This is shown in
-	<link linkend="3small">Ghostscript as a RIP for Non-PostScript Printers</link>.
+	<link linkend="f3small">Ghostscript as a RIP for Non-PostScript Printers</link>.
 	</para>
 
-	<figure id="3small">
+	<figure id="f3small">
 		<title>Ghostscript as a RIP for Non-PostScript Printers.</title>
 		<imagefile>3small</imagefile>
 	</figure>
@@ -1176,11 +1176,11 @@ text/plain              application/postscript   33    texttops
 	embedded into the PostScript by CUPS and that the next filter to be called is pstops). Another prefilter is
 	running on all supported image formats, the <parameter>imagetops</parameter> filter. Its outcome is always of
 	MIME type <parameter>application/vnd.cups-postscript</parameter> (not application/postscript), meaning it has
-	the print options already embedded into the file. This is shown in <link linkend="4small">Prefiltering in
+	the print options already embedded into the file. This is shown in <link linkend="f4small">Prefiltering in
 	CUPS to Form PostScript</link>.
 	</para>
 
-	<figure id="4small">
+	<figure id="f4small">
 		<title>Prefiltering in CUPS to Form PostScript.</title>
 		<imagefile scale="25">4small</imagefile>
 	</figure>
@@ -1202,10 +1202,10 @@ text/plain              application/postscript   33    texttops
 	<parameter>application/vnd.cups-postscript</parameter>. As stated earlier, this filter inserts all
 	device-specific print options (commands to the printer to ask for the duplexing of output, or stapling and
 	punching it, and so on) into the PostScript file. An example is illustrated in <link
-	linkend="5small">Adding Device-Specific Print Options</link>.
+	linkend="f5small">Adding Device-Specific Print Options</link>.
 	</para>
 
-	<figure id="5small">
+	<figure id="f5small">
 		<title>Adding Device-Specific Print Options.</title>
 		<imagefile scale="25">5small</imagefile>
 	</figure>
@@ -2213,11 +2213,11 @@ long as Samba has been compiled with CUPS library (libcups) support. If Samba ha
 support, and if no other print commands are set up, then printing will use the <emphasis>System V</emphasis>
 AT&amp;T command set, with the -oraw option automatically passing through (if you want your own defined print
 commands to work with a Samba server that has CUPS support compiled in, simply use <smbconfoption
-name="classicalprinting">sysv</smbconfoption>). This is illustrated in <link linkend="13small">the Printing via
+name="classicalprinting">sysv</smbconfoption>). This is illustrated in <link linkend="f13small">the Printing via
 CUPS/Samba Server diagram</link>.
 </para>
 
-	<figure id="13small">
+	<figure id="f13small">
 		<title>Printing via CUPS/Samba Server.</title>
 		<imagefile>13small</imagefile>
 	</figure>
diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-IDMAP.xml b/docs-xml/Samba3-HOWTO/TOSHARG-IDMAP.xml
index 2ff794939c8..47819948816 100644
--- a/docs-xml/Samba3-HOWTO/TOSHARG-IDMAP.xml
+++ b/docs-xml/Samba3-HOWTO/TOSHARG-IDMAP.xml
@@ -56,9 +56,9 @@ reduced. This works reasonably well if the servers belong to a single domain, an
 are not needed. On the other hand, if the Samba servers are NT4 domain members, or ADS  domain members,
 or if there is a need to keep the security name-space separate (i.e., the user
 <literal>DOMINICUS\FJones</literal> must not be given access to the account resources of the user 
-<literal>FRANCISCUS\FJones</literal><footnote>Samba local account mode results in both
+<literal>FRANCISCUS\FJones</literal><footnote><para>Samba local account mode results in both
 <literal>DOMINICUS\FJones</literal> and <literal>FRANCISCUS\FJones</literal> mapping to the UNIX user
-<literal>FJones</literal>.</footnote> free from inadvertent cross-over, close attention should be given
+<literal>FJones</literal>.</para></footnote> free from inadvertent cross-over, close attention should be given
 to the way that the IDMAP facility is configured.
 </para>
 
diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-NetworkBrowsing.xml b/docs-xml/Samba3-HOWTO/TOSHARG-NetworkBrowsing.xml
index 563550ee9bd..58aaa29d17a 100644
--- a/docs-xml/Samba3-HOWTO/TOSHARG-NetworkBrowsing.xml
+++ b/docs-xml/Samba3-HOWTO/TOSHARG-NetworkBrowsing.xml
@@ -898,14 +898,14 @@ in <link linkend="xremmb">&smb.conf; for Not Being a master browser</link>
 </para>
 
 <para>
-<example id="xremmb">
+<smbconfexample id="xremmb">
 <title>&smb.conf; for Not Being a master browser</title>
 <smbconfsection name="[global]"/>
 <smbconfoption name="domain master">no</smbconfoption>
 <smbconfoption name="local master">no</smbconfoption>
 <smbconfoption name="preferred master">no</smbconfoption>
 <smbconfoption name="os level">0</smbconfoption>
-</example>
+</smbconfexample>
 </para>
 
 </sect2>
diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-PDC.xml b/docs-xml/Samba3-HOWTO/TOSHARG-PDC.xml
index d37edbe17fa..a9a81c46e6a 100644
--- a/docs-xml/Samba3-HOWTO/TOSHARG-PDC.xml
+++ b/docs-xml/Samba3-HOWTO/TOSHARG-PDC.xml
@@ -80,7 +80,7 @@ to not inflict pain on others. Do your learning on a test network.
 </para>
 
 <para>
-<indexterm>single sign-on<primary></primary><see>SSO</see></indexterm>
+<indexterm><primary>single sign-on</primary><see>SSO</see></indexterm>
 <indexterm><primary>trust</primary></indexterm>
 <indexterm><primary>account</primary></indexterm>
 <indexterm><primary>domain</primary><secondary>security</secondary><tertiary>protocols</tertiary></indexterm>
@@ -462,7 +462,7 @@ Before we branch into a brief overview of domain control, there are three basic
 <indexterm><primary>PDC</primary></indexterm>
 <indexterm><primary>powerful</primary></indexterm>
 <indexterm><primary>network</primary><secondary>performance</secondary></indexterm>
-<indexterm><primary>domain</primary><secondary>member</secondary><secondary>server</secondary></indexterm>
+<indexterm><primary>domain</primary><secondary>member</secondary><tertiary>server</tertiary></indexterm>
 The <emphasis>Primary Domain Controller</emphasis> or PDC plays an important role in MS Windows NT4. In
 Windows 200x domain control architecture, this role is held by domain controllers.  Folklore dictates that
 because of its role in the MS Windows network, the domain controller should be the most powerful and most
@@ -486,7 +486,7 @@ database with BDCs.
 <para>
 <indexterm><primary>domain</primary><secondary>controller</secondary><tertiary>hierarchy</tertiary></indexterm>
 <indexterm><primary>LDAP</primary></indexterm>
-<indexterm>account<primary></primary><secondary>backend</secondary></indexterm>
+<indexterm><primary>account</primary><secondary>backend</secondary></indexterm>
 <indexterm><primary>machine account</primary></indexterm>
 With MS Windows 200x Server-based Active Directory domains, one domain controller initiates a potential
 hierarchy of domain controllers, each with its own area of delegated control. The master domain
@@ -500,7 +500,7 @@ LDAP-based user and machine account backend.
 <indexterm><primary>registry</primary></indexterm>
 New to Samba-3 is the ability to use a backend database that holds the same type of data as the NT4-style SAM
 database (one of the registry files)<footnote><para>See also <link linkend="passdb">Account Information
-Databases</link>.</para>.</footnote>
+Databases</link>.</para></footnote>
 </para>
 
 <para>
diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-ProfileMgmt.xml b/docs-xml/Samba3-HOWTO/TOSHARG-ProfileMgmt.xml
index 571ca323ce6..48c99c542c4 100644
--- a/docs-xml/Samba3-HOWTO/TOSHARG-ProfileMgmt.xml
+++ b/docs-xml/Samba3-HOWTO/TOSHARG-ProfileMgmt.xml
@@ -571,7 +571,7 @@ and Windows 2003.
 
 <para>
 The UPHClean software package can be downloaded from the User Profile Hive Cleanup
-Service<footnote>http://www.microsoft.com/downloads/details.aspx?FamilyID=1B286E6D-8912-4E18-B570-42470E2F3582&amp;displaylang=en</footnote>
+Service<footnote><para>http://www.microsoft.com/downloads/details.aspx?FamilyID=1B286E6D-8912-4E18-B570-42470E2F3582&amp;displaylang=en</para></footnote>
 web site.
 </para>
 
diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-Securing.xml b/docs-xml/Samba3-HOWTO/TOSHARG-Securing.xml
index 21218ea9da4..0a90ff1aa9c 100644
--- a/docs-xml/Samba3-HOWTO/TOSHARG-Securing.xml
+++ b/docs-xml/Samba3-HOWTO/TOSHARG-Securing.xml
@@ -80,7 +80,7 @@ name="[IPC$]"/> share is used for browsing purposes as well as to establish TCP/
 <para>
 <indexterm><primary>Access Control Entries</primary><see>ACE</see></indexterm>
 <indexterm><primary>ACL</primary></indexterm>
-<indexterm>controls<primary></primary></indexterm>
+<indexterm><primary>controls</primary></indexterm>
 Another method by which Samba may be secured is by setting Access Control Entries (ACEs) in an Access 
 Control List (ACL) on the shares themselves. This is discussed in
 <link linkend="AccessControls">File, Directory, and Share Access Controls</link>.
diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-TheNetCommand.xml b/docs-xml/Samba3-HOWTO/TOSHARG-TheNetCommand.xml
index d1895829a95..ea0ed485c00 100644
--- a/docs-xml/Samba3-HOWTO/TOSHARG-TheNetCommand.xml
+++ b/docs-xml/Samba3-HOWTO/TOSHARG-TheNetCommand.xml
@@ -1662,7 +1662,7 @@ net rpc share MIGRATE ALL &lt;share-name&gt; -S &lt;source&gt;
 	the application that receives the network requests to create the necessary services must call out
 	to the operating system in order to create the underlying printers. The call-out is implemented
 	by way of an interface script that can be specified by the &smb.conf; file parameter
-	<smbconfoption id="add printer script"/>. This script is essential to the migration process.
+	<smbconfoption name="add printer script"/>. This script is essential to the migration process.
 	A suitable example script may be obtained from the <filename>$SAMBA_SOURCES/examples/scripts</filename>
 	directory. Take note that this script must be customized to suit the operating system environment
 	and may use its tools to create a print queue.
diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-Winbind.xml b/docs-xml/Samba3-HOWTO/TOSHARG-Winbind.xml
index adb0ba24d39..33e2697bd3f 100644
--- a/docs-xml/Samba3-HOWTO/TOSHARG-Winbind.xml
+++ b/docs-xml/Samba3-HOWTO/TOSHARG-Winbind.xml
@@ -93,7 +93,7 @@
 <indexterm><primary>idmap uid</primary></indexterm>
 <indexterm><primary>idmap gid</primary></indexterm>
 <indexterm><primary>idmap backend</primary></indexterm>
-<indexterm><primary></primary>LDAP</indexterm>
+<indexterm><primary>LDAP</primary></indexterm>
 		Winbind maintains a database called winbind_idmap.tdb in which it stores
 		mappings between UNIX UIDs, GIDs, and NT SIDs. This mapping is used only
 		for users and groups that do not have a local UID/GID. It stores the UID/GID
diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-locking.xml b/docs-xml/Samba3-HOWTO/TOSHARG-locking.xml
index ee48f8c90d6..297585d45d5 100644
--- a/docs-xml/Samba3-HOWTO/TOSHARG-locking.xml
+++ b/docs-xml/Samba3-HOWTO/TOSHARG-locking.xml
@@ -1091,7 +1091,6 @@ tdb(/usr/local/samba_2.2.7/var/locks/locking.tdb): rec_read bad magic
 	</sect2>
 
 	<sect2>
-
 		<title>Long Delays Deleting Files over Network with XP SP1</title>
 		
 		<para><quote>It sometimes takes approximately 35 seconds to delete files over the network after XP SP1 has been applied.</quote></para>