More updates to better conform to the DTD

(This used to be commit ca5371803cd18166cc9f8605be737b3760e69d4f)

5 files changed, 29 insertions, 24 deletions

diff --git a/docs/docbook/projdoc/CUPS-printing.xml b/docs/docbook/projdoc/CUPS-printing.xml
index ac1bb915c1..adb93dcc9d 100644
--- a/docs/docbook/projdoc/CUPS-printing.xml
+++ b/docs/docbook/projdoc/CUPS-printing.xml
@@ -1736,8 +1736,8 @@ advantages) than other methods.
 One other method is the <parameter>cupsomatic/foomatic-rip</parameter>
 way. Note that <parameter>cupsomatic</parameter> is <emphasis>not</emphasis> made by the CUPS
 developers. It is an independent contribution to printing development,
-made by people from Linuxprinting.org <footnote>see also <ulink
-	noescape="1" url="http://www.cups.org/cups-help.html">http://www.cups.org/cups-help.html</ulink></footnote>.
+made by people from Linuxprinting.org <footnote><para>see also <ulink
+			noescape="1" url="http://www.cups.org/cups-help.html">http://www.cups.org/cups-help.html</ulink></para></footnote>.
 <parameter>cupsomatic</parameter> is no longer developed and maintained and is no longer
 supported. It has now been replaced by
 <parameter>foomatic-rip</parameter>. <parameter>foomatic-rip</parameter> is a complete re-write
@@ -3733,7 +3733,7 @@ back.
 <para>
 <indexterm significance="preferred"><primary>point 'n' print</primary></indexterm>
 	<screen>
-&dosprompt;<userinput>rundll32 printui.dll,PrintUIEntry /in /n <quote>\\sambaserver\mysmbtstprn</quote></userinput>
+&dosprompt;<userinput>rundll32 printui.dll,PrintUIEntry /in /n "\\sambaserver\mysmbtstprn"</userinput>
 </screen></para>
 
 <para>
@@ -5025,9 +5025,9 @@ for: You can include the required parameters as part of the
 </para>
 
 <itemizedlist>
-	<listitem><filename>smb://WORKGROUP/WINDOWSNETBIOSNAME/printersharename</filename></listitem>
-	<listitem><filename>smb://username:password@WORKGROUP/WINDOWSNETBIOSNAME/printersharename</filename></listitem>
-	<listitem><filename>smb://username:password@WINDOWSNETBIOSNAME/printersharename</filename></listitem>
+	<listitem><para><filename>smb://WORKGROUP/WINDOWSNETBIOSNAME/printersharename</filename></para></listitem>
+	<listitem><para><filename>smb://username:password@WORKGROUP/WINDOWSNETBIOSNAME/printersharename</filename></para></listitem>
+	<listitem><para><filename>smb://username:password@WINDOWSNETBIOSNAME/printersharename</filename></para></listitem>
 </itemizedlist>
 
 <para>
diff --git a/docs/docbook/projdoc/PolicyMgmt.xml b/docs/docbook/projdoc/PolicyMgmt.xml
index 10ecc0e440..74d35a0555 100644
--- a/docs/docbook/projdoc/PolicyMgmt.xml
+++ b/docs/docbook/projdoc/PolicyMgmt.xml
@@ -449,10 +449,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 the 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 the 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/SWAT.xml b/docs/docbook/projdoc/SWAT.xml
index 346fe86948..e25b6470b5 100644
--- a/docs/docbook/projdoc/SWAT.xml
+++ b/docs/docbook/projdoc/SWAT.xml
@@ -351,7 +351,7 @@ and the SSL connection is up.
 SWAT can be configured to display its messages to match the settings of
 the language configurations of your Web browser. It will be passed to SWAT 
 in the Accept-Language header of the HTTP request.
-<para>
+</para>
 
 <para>
 To enable this feature:
@@ -391,7 +391,7 @@ and so on. If you find a mistake or create a new <command>msg</command> file, pl
 to us so we will include this in the next release of Samba.
 </para>
 
-</para>
+<para>
 Note that if you enable this feature and the <smbconfoption><name>display charset</name></smbconfoption> is not
 matched to your browser's setting, the SWAT display may be corrupted.  In a future version of
 Samba, SWAT will always display messages with UTF-8 encoding. You will then not need to set
diff --git a/docs/docbook/projdoc/printer_driver2.xml b/docs/docbook/projdoc/printer_driver2.xml
index c823de28bf..93358df7a1 100644
--- a/docs/docbook/projdoc/printer_driver2.xml
+++ b/docs/docbook/projdoc/printer_driver2.xml
@@ -2230,9 +2230,6 @@ paragraphs. Your users complain about various issues (such as, <quote>We need to
 for each job from Letter to A4 and it will not store it.</quote>)
 </para>
 
-<sect2>
-<title>Setting Default Print Options for Client Drivers</title>
-
 <para>
 The last sentence might be viewed with mixed feelings by some users and
 admins. They have struggled for hours and could not arrive at a point
@@ -2244,8 +2241,8 @@ you to set printer options in three different ways. Here is the definite
 answer to the Samba default driver setting FAQ:
 </para>
 
-<formalpara><title><quote>I can not set and save default print options
-for all users on Windows 200x/XP. Why not?</quote></title>
+<sect2>
+<title>Setting Default Print Options for Client Drivers</title>
 
 <para>
 How are you doing it? I bet the wrong way. (It is not easy to find out, though). There are three different
@@ -2254,14 +2251,19 @@ dialogs look the same, but only one
 of them does what you intend. You need to be Administrator or Print Administrator to do this for all
 users. Here is how I reproduce it in an XP Professional:
 </para>
-The following list needs periods after the letters and numbers:::::::::
+
+<para>
+	The following list needs periods after the letters and numbers:::::::::
+</para>
+
+<para>
 <orderedlist numeration="upperalpha">
 	<listitem><para>The first <quote>wrong</quote> way:
 	<orderedlist numeration="arabic">
 		<listitem><para>Open the <guiicon>Printers</guiicon> folder.</para></listitem>
 
 		<listitem><para>Right-click on the printer (<emphasis>remoteprinter on cupshost</emphasis>) and
-		select in context menu <guimenu>Printing Preferences...</guimenu></para></listitem>.
+		select in context menu <guimenu>Printing Preferences...</guimenu></para></listitem>
 
 		<listitem><para>Look at this dialog closely and remember what it looks like.</para></listitem>
 	</orderedlist></para></listitem>
@@ -2275,10 +2277,10 @@ The following list needs periods after the letters and numbers:::::::::
 			<guimenuitem>Properties</guimenuitem></para></listitem>
 
 			<listitem><para>Click on the <guilabel>General</guilabel>
-			tab</para></listitem>.
+			tab</para></listitem>
 
 			<listitem><para>Click on the <guibutton>Printing
-			Preferences...</guibutton></para></listitem> button.
+			Preferences...</guibutton> button.</para></listitem> 
 
 			<listitem><para>A new dialog opens. Keep this dialog open and go back
 			to the parent dialog.</para></listitem>
@@ -2309,6 +2311,7 @@ The following list needs periods after the letters and numbers:::::::::
 		</orderedlist>
 	</listitem>
 </orderedlist>
+</para>
 
 <para>
 Do you see any difference in the two settings dialogs? I do not either. However, only the last one, which
@@ -2324,7 +2327,7 @@ arrive at when you right-click on the printer and select <guimenuitem>Print Sett
 is the one that you were taught to use back in the days of Windows NT, so it is only natural to try the
 same way with Windows 200x/XP. You would not dream that there is now a different path to arrive at an
 identically looking, but functionally different, dialog to set defaults for all users.
-</para></formalpara>
+</para>
 
 <tip><para>Try (on Windows 200x/XP) to run this command (as a user with the right privileges):
 </para>
diff --git a/docs/docbook/projdoc/winbind.xml b/docs/docbook/projdoc/winbind.xml
index d460694496..408d1a4f72 100644
--- a/docs/docbook/projdoc/winbind.xml
+++ b/docs/docbook/projdoc/winbind.xml
@@ -19,8 +19,8 @@
 	<author>
 		<firstname>John</firstname><surname>Trostel</surname>
 		<affiliation>
-			<address><email>jtrostel@snapserver.com</email></address>
 			<orgname>SNAP</orgname>
+			<address><email>jtrostel@snapserver.com</email></address>
 		</affiliation>
 	</author>
 
@@ -576,7 +576,7 @@ linkend="winbindcfg"/>, was modified to include the necessary entries in the [gl
 <para><smbconfexample id="winbindcfg">
 		<title>smb.conf for Winbind set-up</title>
 <smbconfsection>[global]</smbconfsection>
-     &lt;...&gt;
+<member>&lt;...&gt;</member>
 <smbconfcomment> separate domain and username with '+', like DOMAIN+username</smbconfcomment>
 <smbconfoption><name>winbind separator</name><value>+</value></smbconfoption>
 <smbconfcomment> use uids from 10000 to 20000 for domain users</smbconfcomment>
@@ -1209,10 +1209,12 @@ maryo:x:15000:15003:Mary Orville:/home/MIDEARTH/maryo:/bin/false
 
 <para><quote>
 But the following command just fails:
+</quote>
 <screen>
 &rootprompt;<userinput>chown maryo a_file</userinput>
 chown: `maryo': invalid user
 </screen>
+<quote>
 This is driving me nuts! What can be wrong?
 </quote></para>