Better compatibility with official syntax

(This used to be commit 9a5304a5ea9b65dbfe5980e35b8456946a331f80)

11 files changed, 89 insertions, 89 deletions

diff --git a/docs/docbook/projdoc/AccessControls.xml b/docs/docbook/projdoc/AccessControls.xml
index d31dffa9b6..22a08e4d08 100644
--- a/docs/docbook/projdoc/AccessControls.xml
+++ b/docs/docbook/projdoc/AccessControls.xml
@@ -1005,10 +1005,10 @@ Before using any of the following options please refer to the man page for &smb.
 		These are :
 
 		<itemizedlist>
-			<listitem><smbconfoption><name>security mask</name></smbconfoption></listitem>
-			<listitem><smbconfoption><name>force security mode</name></smbconfoption></listitem>
-			<listitem><smbconfoption><name>directory security mask</name></smbconfoption></listitem>
-			<listitem><smbconfoption><name>force directory security mode</name></smbconfoption></listitem>
+			<listitem><para><smbconfoption><name>security mask</name></smbconfoption></para></listitem>
+			<listitem><para><smbconfoption><name>force security mode</name></smbconfoption></para></listitem>
+			<listitem><para><smbconfoption><name>directory security mask</name></smbconfoption></para></listitem>
+			<listitem><para><smbconfoption><name>force directory security mode</name></smbconfoption></para></listitem>
 	</itemizedlist>
 
 		</para>
diff --git a/docs/docbook/projdoc/CUPS-printing.xml b/docs/docbook/projdoc/CUPS-printing.xml
index e37842435d..e4169aeda3 100644
--- a/docs/docbook/projdoc/CUPS-printing.xml
+++ b/docs/docbook/projdoc/CUPS-printing.xml
@@ -2551,9 +2551,9 @@ the Windows NT/2000/XP client:
 
 <para>
 	<itemizedlist>
-		<listitem>cups.hlp</listitem>
-		<listitem>cupsdrvr.dll</listitem>
-		<listitem>cupsui.dll</listitem>
+		<listitem><para>cups.hlp</para></listitem>
+		<listitem><para>cupsdrvr.dll</para></listitem>
+		<listitem><para>cupsui.dll</para></listitem>
 	</itemizedlist>
 </para>
 
@@ -2567,12 +2567,12 @@ different platforms.
 
 <para>
 	<itemizedlist>
-	<listitem>ADFONTS.MFM</listitem>
-	<listitem>ADOBEPS4.DRV</listitem>
-	<listitem>ADOBEPS4.HLP</listitem>
-	<listitem>DEFPRTR2.PPD</listitem>
-	<listitem>ICONLIB.DLL</listitem>
-	<listitem>PSMON.DLL</listitem>
+	<listitem><para>ADFONTS.MFM</para></listitem>
+	<listitem><para>ADOBEPS4.DRV</para></listitem>
+	<listitem><para>ADOBEPS4.HLP</para></listitem>
+	<listitem><para>DEFPRTR2.PPD</para></listitem>
+	<listitem><para>ICONLIB.DLL</para></listitem>
+	<listitem><para>PSMON.DLL</para></listitem>
 </itemizedlist>
 </para>
 
@@ -2580,9 +2580,9 @@ different platforms.
 
 <para>
 <itemizedlist>
-	<listitem>ADOBEPS5.DLL</listitem>
-	<listitem>ADOBEPSU.DLL</listitem>
-	<listitem>ADOBEPSU.HLP</listitem>
+	<listitem><para>ADOBEPS5.DLL</para></listitem>
+	<listitem><para>ADOBEPSU.DLL</para></listitem>
+	<listitem><para>ADOBEPSU.HLP</para></listitem>
 </itemizedlist>
 
 </para>
@@ -5091,9 +5091,9 @@ for: you can include the required parameters as part of the
 </para>
 
 <itemizedlist>
-	<listitem>smb://WORKGROUP/WINDOWSNETBIOSNAME/printersharename </listitem>
-	<listitem>smb://username:password@WORKGROUP/WINDOWSNETBIOSNAME/printersharename</listitem>
-	<listitem>smb://username:password@WINDOWSNETBIOSNAME/printersharename</listitem>
+	<listitem><para>smb://WORKGROUP/WINDOWSNETBIOSNAME/printersharename </para></listitem>
+	<listitem><para>smb://username:password@WORKGROUP/WINDOWSNETBIOSNAME/printersharename</para></listitem>
+	<listitem><para>smb://username:password@WINDOWSNETBIOSNAME/printersharename</para></listitem>
 </itemizedlist>
 
 <para>
diff --git a/docs/docbook/projdoc/Compiling.xml b/docs/docbook/projdoc/Compiling.xml
index 023290f742..8a5c5e89a6 100644
--- a/docs/docbook/projdoc/Compiling.xml
+++ b/docs/docbook/projdoc/Compiling.xml
@@ -325,8 +325,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>
@@ -337,9 +337,9 @@ example of what you would not want to see would be:
 	<para>On RedHat 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/docbook/projdoc/NetworkBrowsing.xml b/docs/docbook/projdoc/NetworkBrowsing.xml
index 20f085d646..3f5e7b0ec4 100644
--- a/docs/docbook/projdoc/NetworkBrowsing.xml
+++ b/docs/docbook/projdoc/NetworkBrowsing.xml
@@ -92,12 +92,12 @@ The technologies (or methods) employed in making all of this work includes:
 </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>
@@ -1093,17 +1093,17 @@ are:
 </para>
 
 <itemizedlist>
-	<listitem>WINS: the best tool!</listitem>
-	<listitem>LMHOSTS: is static and hard to maintain.</listitem>
-	<listitem>Broadcast: uses UDP and can not resolve names across remote segments.</listitem>
+	<listitem><para>WINS: the best tool!</para></listitem>
+	<listitem><para>LMHOSTS: is static and hard to maintain.</para></listitem>
+	<listitem><para>Broadcast: uses UDP and can not resolve names across remote segments.</para></listitem>
 </itemizedlist>
 
 <para>
 Alternative means of name resolution includes:
 </para>
 <itemizedlist>
-<listitem><filename>/etc/hosts</filename>: is static, hard to maintain, and lacks name_type info</listitem>
-<listitem>DNS: is a good choice but lacks essential name_type info.</listitem>
+<listitem><para><filename>/etc/hosts</filename>: is static, hard to maintain, and lacks name_type info</para></listitem>
+<listitem><para>DNS: is a good choice but lacks essential name_type info.</para></listitem>
 </itemizedlist>
 
 <para>
diff --git a/docs/docbook/projdoc/Other-Clients.xml b/docs/docbook/projdoc/Other-Clients.xml
index 066eeccd08..968a584f9d 100644
--- a/docs/docbook/projdoc/Other-Clients.xml
+++ b/docs/docbook/projdoc/Other-Clients.xml
@@ -52,9 +52,9 @@ packages, Samba, and Linux (and other UNIX-based systems) see
 		<para>Basically, you need three components:</para>
 		
 		<itemizedlist>
-			<listitem>The File and Print Client ('IBM Peer')</listitem>
-			<listitem>TCP/IP ('Internet support') </listitem>
-			<listitem>The "NetBIOS over TCP/IP" driver ('TCPBEUI')</listitem>
+			<listitem><para>The File and Print Client ('IBM Peer')</para></listitem>
+			<listitem><para>TCP/IP ('Internet support') </para></listitem>
+			<listitem><para>The "NetBIOS over TCP/IP" driver ('TCPBEUI')</para></listitem>
 		</itemizedlist>
 		
 		<para>Installing the first two together with the base operating 
diff --git a/docs/docbook/projdoc/PolicyMgmt.xml b/docs/docbook/projdoc/PolicyMgmt.xml
index b17fb136a0..351c51d1c6 100644
--- a/docs/docbook/projdoc/PolicyMgmt.xml
+++ b/docs/docbook/projdoc/PolicyMgmt.xml
@@ -327,11 +327,11 @@ Common restrictions that are frequently used includes:
 
 <para>
 <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>
 
@@ -416,10 +416,10 @@ reboot and as part of the user logon:
 	An ordered list of User GPOs is obtained. The list contents depends on what is configured in respect of:
 
 <itemizedlist>
-	<listitem>Is user a domain member, thus subject to particular policies</listitem>
-	<listitem>Loopback enablement, and the state of the loopback policy (Merge or Replace)</listitem>
-	<listitem>Location of the Active Directory itself</listitem>
-	<listitem>Has the list of GPOs changed. No processing is needed if not changed.</listitem>
+	<listitem><para>Is user a domain member, thus subject to particular policies</para></listitem>
+	<listitem><para>Loopback enablement, and the state of the loopback policy (Merge or Replace)</para></listitem>
+	<listitem><para>Location of the Active Directory itself</para></listitem>
+	<listitem><para>Has the list of GPOs changed. No processing is needed if not changed.</para></listitem>
 </itemizedlist>
 	</para></listitem>
 
diff --git a/docs/docbook/projdoc/ProfileMgmt.xml b/docs/docbook/projdoc/ProfileMgmt.xml
index 83d8b9907f..013566b124 100644
--- a/docs/docbook/projdoc/ProfileMgmt.xml
+++ b/docs/docbook/projdoc/ProfileMgmt.xml
@@ -838,8 +838,8 @@ When a new user first logs onto an MS Windows NT4 machine a new profile is creat
 </para>
 
 <itemizedlist>
-	<listitem>All Users settings</listitem>
-	<listitem>Default User settings (contains the default NTUser.DAT file)</listitem>
+	<listitem><para>All Users settings</para></listitem>
+	<listitem><para>Default User settings (contains the default NTUser.DAT file)</para></listitem>
 </itemizedlist>
 
 <para>
@@ -1178,9 +1178,9 @@ be either:
 </para>
 
 <itemizedlist>
-	<listitem>A profile unique to that user</listitem>
-	<listitem>A mandatory profile (one the user can not change)</listitem>
-	<listitem>A group profile (really should be mandatory ie:unchangable)</listitem>
+	<listitem><para>A profile unique to that user</para></listitem>
+	<listitem><para>A mandatory profile (one the user can not change)</para></listitem>
+	<listitem><para>A group profile (really should be mandatory ie:unchangable)</para></listitem>
 </itemizedlist>
 
 </sect2>
diff --git a/docs/docbook/projdoc/Samba-PDC-HOWTO.xml b/docs/docbook/projdoc/Samba-PDC-HOWTO.xml
index d6d7a9fd3a..b19609a093 100644
--- a/docs/docbook/projdoc/Samba-PDC-HOWTO.xml
+++ b/docs/docbook/projdoc/Samba-PDC-HOWTO.xml
@@ -272,12 +272,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 ANY Active Directory management tools to manage users and machines</listitem>
-	<listitem>Registry changes tattoo the main registry, while with AD they do NOT. ie: Leave permanent changes in effect</listitem>
-	<listitem>Without AD you can not peprform 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 ANY 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. ie: Leave permanent changes in effect</para></listitem>
+	<listitem><para>Without AD you can not peprform the function of exporting specific applications to specific users or groups</para></listitem>
 </itemizedlist>
 </para>
 
diff --git a/docs/docbook/projdoc/ServerType.xml b/docs/docbook/projdoc/ServerType.xml
index ea9e05056c..64b8f48444 100644
--- a/docs/docbook/projdoc/ServerType.xml
+++ b/docs/docbook/projdoc/ServerType.xml
@@ -99,15 +99,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/docbook/projdoc/VFS.xml b/docs/docbook/projdoc/VFS.xml
index daeac5b337..c949055371 100644
--- a/docs/docbook/projdoc/VFS.xml
+++ b/docs/docbook/projdoc/VFS.xml
@@ -89,10 +89,10 @@ This can be done using a configuration similar to the one below.
 		A simple module to audit file access to the syslog
 		facility.  The following operations are logged:
 		<itemizedlist>
-		<listitem>share</listitem>
-		<listitem>connect/disconnect</listitem>
-		<listitem>directory opens/create/remove</listitem>
-		<listitem>file open/close/rename/unlink/chmod</listitem>
+		<listitem><para>share</para></listitem>
+		<listitem><para>connect/disconnect</para></listitem>
+		<listitem><para>directory opens/create/remove</para></listitem>
+		<listitem><para>file open/close/rename/unlink/chmod</para></listitem>
 		</itemizedlist>
 		</para>
 
diff --git a/docs/docbook/projdoc/passdb.xml b/docs/docbook/projdoc/passdb.xml
index 8c005e0d0a..ab7c9932fb 100644
--- a/docs/docbook/projdoc/passdb.xml
+++ b/docs/docbook/projdoc/passdb.xml
@@ -262,10 +262,10 @@ Samba-3 introduces the following 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 [se]</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 [se]</para></listitem>
+			<listitem><para>Windows Me</para></listitem>
 		</itemizedlist>
 
 		<note>
@@ -280,11 +280,11 @@ Samba-3 introduces the following 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>
@@ -438,12 +438,12 @@ be announced in time for the Samba-3.0.1 release.
 		</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>
@@ -502,9 +502,9 @@ be announced in time for the Samba-3.0.1 release.
 		</para>
 
 		<itemizedlist>
-			<listitem>add, remove or modify user accounts</listitem>
-			<listitem>listing user accounts</listitem>
-			<listitem>migrate user accounts</listitem>
+			<listitem><para>add, remove or modify user accounts</para></listitem>
+			<listitem><para>listing user accounts</para></listitem>
+			<listitem><para>migrate user accounts</para></listitem>
 		</itemizedlist>
 
 		<para>
@@ -1207,10 +1207,10 @@ Refer to the <command>logon home</command> parameter in the &smb.conf; man page
 			</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>