Better conformance to DocBook standards

(This used to be commit 54d2975708657319e6ca42c44bd1e871abd09d85)

8 files changed, 59 insertions, 61 deletions

diff --git a/docs/Samba-HOWTO-Collection/Compiling.xml b/docs/Samba-HOWTO-Collection/Compiling.xml
index 4260e7dda0..b6dea57abb 100644
--- a/docs/Samba-HOWTO-Collection/Compiling.xml
+++ b/docs/Samba-HOWTO-Collection/Compiling.xml
@@ -312,8 +312,8 @@ example of what you would not want to see would be:
 	<para>On Debian, you need to install the following packages:</para>
 	<para>
 		<itemizedlist>
-			<listitem>libkrb5-dev</listitem>
-			<listitem>krb5-user</listitem>
+			<listitem><para>libkrb5-dev</para></listitem>
+			<listitem><para>krb5-user</para></listitem>
 		</itemizedlist>
 	</para>
 	</sect3>
@@ -324,9 +324,9 @@ example of what you would not want to see would be:
 	<para>On Red Hat Linux, this means you should have at least: </para>
 	<para>
 		<itemizedlist>
-			<listitem>krb5-workstation (for kinit)</listitem>
-			<listitem>krb5-libs (for linking with)</listitem>
-			<listitem>krb5-devel (because you are compiling from source)</listitem>
+			<listitem><para>krb5-workstation (for kinit)</para></listitem>
+			<listitem><para>krb5-libs (for linking with)</para></listitem>
+			<listitem><para>krb5-devel (because you are compiling from source)</para></listitem>
 		</itemizedlist>
 	</para>
 
diff --git a/docs/Samba-HOWTO-Collection/DomainMember.xml b/docs/Samba-HOWTO-Collection/DomainMember.xml
index df38cef0b6..d1f2386d54 100644
--- a/docs/Samba-HOWTO-Collection/DomainMember.xml
+++ b/docs/Samba-HOWTO-Collection/DomainMember.xml
@@ -895,7 +895,7 @@ may want to create the machine account within a particular organizational unit.
 this to be done using the following syntax:
 <screen>
 &rootprompt; <userinput>kinit Administrator@your.kerberos.REALM</userinput>
-&rootprompt; <userinput>net ads join <quote>organizational_unit</quote></userinput>
+&rootprompt; <userinput>net ads join "organizational_unit"</userinput>
 </screen>
 </para>
 
diff --git a/docs/Samba-HOWTO-Collection/NetworkBrowsing.xml b/docs/Samba-HOWTO-Collection/NetworkBrowsing.xml
index 1855fa1809..9b93c8a434 100644
--- a/docs/Samba-HOWTO-Collection/NetworkBrowsing.xml
+++ b/docs/Samba-HOWTO-Collection/NetworkBrowsing.xml
@@ -99,12 +99,12 @@ The technologies (or methods) employed in making all of this work include:
 </para>
 
 <itemizedlist>
-	<listitem>MS Windows machines register their presence to the network.</listitem>
-	<listitem>Machines announce themselves to other machines on the network.</listitem>
-	<listitem>One or more machine on the network collates the local announcements.</listitem>
-	<listitem>The client machine finds the machine that has the collated list of machines.</listitem>
-	<listitem>The client machine is able to resolve the machine names to IP addresses.</listitem>
-	<listitem>The client machine is able to connect to a target machine.</listitem>
+	<listitem><para>MS Windows machines register their presence to the network.</para></listitem>
+	<listitem><para>Machines announce themselves to other machines on the network.</para></listitem>
+	<listitem><para>One or more machine on the network collates the local announcements.</para></listitem>
+	<listitem><para>The client machine finds the machine that has the collated list of machines.</para></listitem>
+	<listitem><para>The client machine is able to resolve the machine names to IP addresses.</para></listitem>
+	<listitem><para>The client machine is able to connect to a target machine.</para></listitem>
 </itemizedlist>
 
 <para>
@@ -1184,17 +1184,17 @@ are:
 </para>
 
 <itemizedlist>
-	<listitem>WINS &smbmdash; the best tool.</listitem>
-	<listitem>LMHOSTS &smbmdash; static and hard to maintain.</listitem>
-	<listitem>Broadcast &smbmdash; uses UDP and cannot resolve names across remote segments.</listitem>
+	<listitem><para>WINS &smbmdash; the best tool.</para></listitem>
+	<listitem><para>LMHOSTS &smbmdash; static and hard to maintain.</para></listitem>
+	<listitem><para>Broadcast &smbmdash; uses UDP and cannot resolve names across remote segments.</para></listitem>
 </itemizedlist>
 
 <para>
 Alternative means of name resolution include:
 </para>
 <itemizedlist>
-<listitem>Static <filename>/etc/hosts</filename> &smbmdash;  hard to maintain, and lacks name_type info.</listitem>
-<listitem>DNS &smbmdash; is a good choice but lacks essential name_type info.</listitem>
+<listitem><para>Static <filename>/etc/hosts</filename> &smbmdash;  hard to maintain, and lacks name_type info.</para></listitem>
+<listitem><para>DNS &smbmdash; is a good choice but lacks essential name_type info.</para></listitem>
 </itemizedlist>
 
 <para>
diff --git a/docs/Samba-HOWTO-Collection/PDC.xml b/docs/Samba-HOWTO-Collection/PDC.xml
index 8a83997347..14f05d7eea 100644
--- a/docs/Samba-HOWTO-Collection/PDC.xml
+++ b/docs/Samba-HOWTO-Collection/PDC.xml
@@ -250,7 +250,7 @@ LDAP-based user and machine account backend.
 
 <para>
 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>See also <link linkend="passdb">Account Information Databases</link>.</footnote>.
+the NT4-style SAM database (one of the registry files)<footnote><para>See also <link linkend="passdb">Account Information Databases</link>.</para></footnote>.
 </para>
 
 <para>
@@ -299,12 +299,12 @@ management requirements. Samba can act as a NT4-style DC in a Windows 2000/XP
 environment. However, there are certain compromises:
 
 <itemizedlist>
-	<listitem>No machine policy files.</listitem>
-	<listitem>No Group Policy Objects.</listitem>
-	<listitem>No synchronously executed AD logon scripts.</listitem>
-	<listitem>Can't use Active Directory management tools to manage users and machines.</listitem>
-	<listitem>Registry changes tattoo the main registry, while with AD they do not leave permanent changes in effect.</listitem>
-	<listitem>Without AD you cannot perform the function of exporting specific applications to specific users or groups.</listitem>
+	<listitem><para>No machine policy files.</para></listitem>
+	<listitem><para>No Group Policy Objects.</para></listitem>
+	<listitem><para>No synchronously executed AD logon scripts.</para></listitem>
+	<listitem><para>Can't use Active Directory management tools to manage users and machines.</para></listitem>
+	<listitem><para>Registry changes tattoo the main registry, while with AD they do not leave permanent changes in effect.</para></listitem>
+	<listitem><para>Without AD you cannot perform the function of exporting specific applications to specific users or groups.</para></listitem>
 </itemizedlist>
 </para>
 
@@ -414,7 +414,7 @@ A Domain Controller is an SMB/CIFS server that:
 It is rather easy to configure Samba to provide these. Each Samba Domain Controller must provide
 the NETLOGON service that Samba calls the <smbconfoption><name>domain logons</name></smbconfoption> functionality
 (after the name of the parameter in the &smb.conf; file). Additionally, one server in a Samba-3
-Domain must advertise itself as the Domain Master Browser<footnote>See <link linkend="NetworkBrowsing">Network Browsing</link>.</footnote>.
+Domain must advertise itself as the Domain Master Browser<footnote><para>See <link linkend="NetworkBrowsing">Network Browsing</link>.</para></footnote>.
 This causes the Primary Domain Controller to claim a domain-specific NetBIOS name that identifies it as a
 Domain Master Browser for its given domain or workgroup. Local master browsers in the same domain or workgroup on
 broadcast-isolated subnets then ask for a complete copy of the browse list for the whole wide area network.
@@ -836,7 +836,7 @@ Create a user without the <quote>$</quote>. Then use <command>vipw</command> to
 the <quote>$</quote>. Or create the whole entry with vipw if you like; make sure you use a unique user login ID.
 </para>
 
-<para><note>The machine account must have the exact name that the workstation has.</note></para>
+<note><para>The machine account must have the exact name that the workstation has.</para></note>
 
 <note><para>
 The UNIX tool <command>vipw</command> is a common tool for directly editing the <filename>/etc/passwd</filename> file.
diff --git a/docs/Samba-HOWTO-Collection/Passdb.xml b/docs/Samba-HOWTO-Collection/Passdb.xml
index 53767e9272..0b81674489 100644
--- a/docs/Samba-HOWTO-Collection/Passdb.xml
+++ b/docs/Samba-HOWTO-Collection/Passdb.xml
@@ -268,10 +268,10 @@ Samba-3 introduces a number of new password backend capabilities.
 		</para>
 
 		<itemizedlist>
-			<listitem>MS DOS Network client 3.0 with the basic network redirector installed.</listitem>
-			<listitem>Windows 95 with the network redirector update installed.</listitem>
-			<listitem>Windows 98 [Second Edition].</listitem>
-			<listitem>Windows Me.</listitem>
+			<listitem><para>MS DOS Network client 3.0 with the basic network redirector installed.</para></listitem>
+			<listitem><para>Windows 95 with the network redirector update installed.</para></listitem>
+			<listitem><para>Windows 98 [Second Edition].</para></listitem>
+			<listitem><para>Windows Me.</para></listitem>
 		</itemizedlist>
 
 		<note>
@@ -285,11 +285,11 @@ Samba-3 introduces a number of new password backend capabilities.
 		</para>
 
 		<itemizedlist>
-			<listitem>Windows NT 3.5x.</listitem>
-			<listitem>Windows NT 4.0.</listitem>
-			<listitem>Windows 2000 Professional.</listitem>
-			<listitem>Windows 200x Server/Advanced Server.</listitem>
-			<listitem>Windows XP Professional.</listitem>
+			<listitem><para>Windows NT 3.5x.</para></listitem>
+			<listitem><para>Windows NT 4.0.</para></listitem>
+			<listitem><para>Windows 2000 Professional.</para></listitem>
+			<listitem><para>Windows 200x Server/Advanced Server.</para></listitem>
+			<listitem><para>Windows XP Professional.</para></listitem>
 		</itemizedlist>
 			
 		<para>
@@ -481,12 +481,12 @@ called <command>smbpasswd</command> and <command>pdbedit</command>.
 		</para>
 
 		<itemizedlist>
-			<listitem><emphasis>add</emphasis> user or machine accounts.</listitem>
-			<listitem><emphasis>delete</emphasis> user or machine accounts.</listitem>
-			<listitem><emphasis>enable</emphasis> user or machine accounts.</listitem>
-			<listitem><emphasis>disable</emphasis> user or machine accounts.</listitem>
-			<listitem><emphasis>set to NULL</emphasis> user passwords.</listitem>
-			<listitem><emphasis>manage interdomain trust accounts.</emphasis></listitem>
+			<listitem><para><emphasis>add</emphasis> user or machine accounts.</para></listitem>
+			<listitem><para><emphasis>delete</emphasis> user or machine accounts.</para></listitem>
+			<listitem><para><emphasis>enable</emphasis> user or machine accounts.</para></listitem>
+			<listitem><para><emphasis>disable</emphasis> user or machine accounts.</para></listitem>
+			<listitem><para><emphasis>set to NULL</emphasis> user passwords.</para></listitem>
+			<listitem><para><emphasis>manage interdomain trust accounts.</emphasis></para></listitem>
 		</itemizedlist>
 		
 		<para>
@@ -549,9 +549,9 @@ called <command>smbpasswd</command> and <command>pdbedit</command>.
 		</para>
 
 		<itemizedlist>
-			<listitem>add, remove or modify user accounts.</listitem>
-			<listitem>list user accounts.</listitem>
-			<listitem>migrate user accounts.</listitem>
+			<listitem><para>add, remove or modify user accounts.</para></listitem>
+			<listitem><para>list user accounts.</para></listitem>
+			<listitem><para>migrate user accounts.</para></listitem>
 		</itemizedlist>
 
 		<para>
@@ -1314,10 +1314,10 @@ access to attrs=SambaLMPassword,SambaNTPassword
 			</para>
 
 			<itemizedlist>
-				<listitem>sambaHomePath</listitem>
-				<listitem>sambaLogonScript</listitem>
-				<listitem>sambaProfilePath</listitem>
-				<listitem>sambaHomeDrive</listitem>
+				<listitem><para>sambaHomePath</para></listitem>
+				<listitem><para>sambaLogonScript</para></listitem>
+				<listitem><para>sambaProfilePath</para></listitem>
+				<listitem><para>sambaHomeDrive</para></listitem>
 			</itemizedlist>
 
 			<para>
diff --git a/docs/Samba-HOWTO-Collection/PolicyMgmt.xml b/docs/Samba-HOWTO-Collection/PolicyMgmt.xml
index 5134684678..c861c4bf12 100644
--- a/docs/Samba-HOWTO-Collection/PolicyMgmt.xml
+++ b/docs/Samba-HOWTO-Collection/PolicyMgmt.xml
@@ -345,11 +345,11 @@ Common restrictions that are frequently used include:
 <para>
 <indexterm><primary>Account Controls</primary></indexterm>
 <itemizedlist>
-	<listitem>Logon hours</listitem>
-	<listitem>Password aging</listitem>
-	<listitem>Permitted logon from certain machines only</listitem>
-	<listitem>Account type (local or global)</listitem>
-	<listitem>User rights</listitem>
+	<listitem><para>Logon hours</para></listitem>
+	<listitem><para>Password aging</para></listitem>
+	<listitem><para>Permitted logon from certain machines only</para></listitem>
+	<listitem><para>Account type (local or global)</para></listitem>
+	<listitem><para>User rights</para></listitem>
 </itemizedlist>
 </para>
 
diff --git a/docs/Samba-HOWTO-Collection/ServerType.xml b/docs/Samba-HOWTO-Collection/ServerType.xml
index 28ccd7158b..8efebcb6c9 100644
--- a/docs/Samba-HOWTO-Collection/ServerType.xml
+++ b/docs/Samba-HOWTO-Collection/ServerType.xml
@@ -111,15 +111,15 @@ different type of servers:</para>
 <itemizedlist>
 	<listitem><para>Domain Controller</para>
 		<itemizedlist>
-			<listitem>Primary Domain Controller</listitem>
-			<listitem>Backup Domain Controller</listitem>
-			<listitem>ADS Domain Controller</listitem>
+			<listitem><para>Primary Domain Controller</para></listitem>
+			<listitem><para>Backup Domain Controller</para></listitem>
+			<listitem><para>ADS Domain Controller</para></listitem>
 		</itemizedlist>
 	</listitem>
 	<listitem><para>Domain Member Server</para>
 		<itemizedlist>
-			<listitem>Active Directory Domain Server</listitem>
-			<listitem>NT4 Style Domain Domain Server</listitem>
+			<listitem><para>Active Directory Domain Server</para></listitem>
+			<listitem><para>NT4 Style Domain Domain Server</para></listitem>
 		</itemizedlist>
 	</listitem>
 	<listitem><para>Stand-alone Server</para></listitem>
diff --git a/docs/xslt/generate-attributions.xsl b/docs/xslt/generate-attributions.xsl
index 718af13f72..a6e7f98e16 100644
--- a/docs/xslt/generate-attributions.xsl
+++ b/docs/xslt/generate-attributions.xsl
@@ -16,9 +16,7 @@
 <xsl:template match="/">
 	<xsl:element name="preface">
 		<xsl:element name="title"><xsl:text>Attribution</xsl:text></xsl:element>
-		<xsl:element name="para">
-			<xsl:apply-templates/>
-		</xsl:element>
+		<xsl:apply-templates/>
 	</xsl:element>
 </xsl:template>