Fix SGML/XML incompability before starting conversion to XML

(This used to be commit 1b5ad8a502a641f285b986c81216d7c5e5c33e79)

8 files changed, 74 insertions, 52 deletions

diff --git a/docs/docbook/projdoc/IntroSMB.sgml b/docs/docbook/projdoc/IntroSMB.sgml
index 32b18cc8fc..4ead422fb8 100644
--- a/docs/docbook/projdoc/IntroSMB.sgml
+++ b/docs/docbook/projdoc/IntroSMB.sgml
@@ -239,58 +239,68 @@ walk through the establishment of a SMB/CIFS session step by step.
 <itemizedlist>
 
 	<listitem><para>
-	<emphasis>CIFS: Common Insecurities Fail Scrutiny</emphasis> by "Hobbit", 
-	http://hr.uoregon.edu/davidrl/cifs.txt
+	<ulink url="http://hr.uoregon.edu/davidrl/cifs.txt">
+	<emphasis>CIFS: Common Insecurities Fail Scrutiny</emphasis> by "Hobbit"</ulink>
 	</para></listitem>
 
 	<listitem><para>
-	<emphasis>Doing the Samba on Windows</emphasis> by Financial Review,
-	http://afr.com/it/2002/10/01/FFXDF43AP6D.html
+	<ulink url="http://afr.com/it/2002/10/01/FFXDF43AP6D.html">
+	<emphasis>Doing the Samba on Windows</emphasis> by Financial Review
+	</ulink>
 	</para></listitem>
 
 	<listitem><para>
-	<emphasis>Implementing CIFS</emphasis> by Christopher R. Hertel,
-	http://ubiqx.org/cifs/
+	<ulink url="http://ubiqx.org/cifs/">
+	<emphasis>Implementing CIFS</emphasis> by Christopher R. Hertel
+	</ulink>
 	</para></listitem>
 
 	<listitem><para>
-	<emphasis>Just What Is SMB?</emphasis> by Richard Sharpe,
-	http://samba.anu.edu.au/cifs/docs/what-is-smb.html
+	<ulink url="http://samba.anu.edu.au/cifs/docs/what-is-smb.html">
+	<emphasis>Just What Is SMB?</emphasis> by Richard Sharpe
+	</ulink>
 	</para></listitem>
 
 	<listitem><para>
-	<emphasis>Opening Windows Everywhere</emphasis> by Mike Warfield,
-	http://www.linux-mag.com/1999-05/samba_01.html
+	<ulink url="http://www.linux-mag.com/1999-05/samba_01.html">
+	<emphasis>Opening Windows Everywhere</emphasis> by Mike Warfield
+	</ulink>
 	</para></listitem>
 
 	<listitem><para>
-	<emphasis>SMB HOWTO</emphasis> by David Wood,
-	http://www.tldp.org/HOWTO/SMB-HOWTO.html
+	<ulink url="http://www.tldp.org/HOWTO/SMB-HOWTO.html">
+	<emphasis>SMB HOWTO</emphasis> by David Wood
+	</ulink>
 	</para></listitem>
 
 	<listitem><para>
-	<emphasis>SMB/CIFS by The Root</emphasis> by "ledin",
-	http://www.phrack.org/phrack/60/p60-0x0b.txt
+	<ulink url="http://www.phrack.org/phrack/60/p60-0x0b.txt">
+	<emphasis>SMB/CIFS by The Root</emphasis> by "ledin"
+	</ulink>
 	</para></listitem>
 
 	<listitem><para>
-	<emphasis>The Story of Samba</emphasis> by Christopher R. Hertel,
-	http://www.linux-mag.com/1999-09/samba_01.html
+	<ulink url="http://www.linux-mag.com/1999-09/samba_01.html">
+	<emphasis>The Story of Samba</emphasis> by Christopher R. Hertel
+	</ulink>
 	</para></listitem>
 
 	<listitem><para>
-	<emphasis>The Unofficial Samba HOWTO</emphasis> by David Lechnyr,
-	http://hr.uoregon.edu/davidrl/samba/
+	<ulink url="http://hr.uoregon.edu/davidrl/samba/">
+	<emphasis>The Unofficial Samba HOWTO</emphasis> by David Lechnyr
+	</ulink>
 	</para></listitem>
 
 	<listitem><para>
-	<emphasis>Understanding the Network Neighborhood</emphasis> by Christopher R. Hertel,
-	http://www.linux-mag.com/2001-05/smb_01.html
+	<ulink url="http://www.linux-mag.com/2001-05/smb_01.html">
+	<emphasis>Understanding the Network Neighborhood</emphasis> by Christopher R. Hertel
+	</ulink>
 	</para></listitem>
 
 	<listitem><para>
-	<emphasis>Using Samba as a PDC</emphasis> by Andrew Bartlett,
-	http://www.linux-mag.com/2002-02/samba_01.html
+	<ulink url="http://www.linux-mag.com/2002-02/samba_01.html">
+	<emphasis>Using Samba as a PDC</emphasis> by Andrew Bartlett
+	</ulink>
 	</para></listitem>
 
 </itemizedlist>
@@ -335,9 +345,8 @@ not the completely clueless user who probably sits there shivering thinking
 That's what's really irritating to me."
 </emphasis></para>
 
-<para>
--- Linus Torvalds, from an interview with BOOT Magazine, Sept 1998
-(http://hr.uoregon.edu/davidrl/boot.txt)
+<para>-- 
+<ulink url="http://hr.uoregon.edu/davidrl/boot.txt">Linus Torvalds, from an interview with BOOT Magazine, Sept 1998</ulink>
 </para>
 
 </sect1>
diff --git a/docs/docbook/projdoc/NT4Migration.sgml b/docs/docbook/projdoc/NT4Migration.sgml
index 733d1f75ae..7b1d2f20b3 100644
--- a/docs/docbook/projdoc/NT4Migration.sgml
+++ b/docs/docbook/projdoc/NT4Migration.sgml
@@ -345,9 +345,9 @@ based solution fit into three basic categories.
 	<row><entry align="center">Number of Users</entry><entry>Description</entry></row>
 	</thead>
 	<tbody>
-	<row><entry align="center">&lt 50</entry><entry><para>Want simple conversion with NO pain</para></entry></row>
+	<row><entry align="center">&lt; 50</entry><entry><para>Want simple conversion with NO pain</para></entry></row>
 	<row><entry align="center">50 - 250</entry><entry><para>Want new features, can manage some in-house complexity</para></entry></row>
-	<row><entry align="center">&gt 250</entry><entry><para>Solution/Implementation MUST scale well, complex needs. Cross departmental decision process. Local expertise in most areas</para></entry></row>
+	<row><entry align="center">&gt; 250</entry><entry><para>Solution/Implementation MUST scale well, complex needs. Cross departmental decision process. Local expertise in most areas</para></entry></row>
 	</tbody>
 </tgroup>
 </table>
diff --git a/docs/docbook/projdoc/PAM-Authentication-And-Samba.sgml b/docs/docbook/projdoc/PAM-Authentication-And-Samba.sgml
index 90a07a13bd..4b5179acc7 100644
--- a/docs/docbook/projdoc/PAM-Authentication-And-Samba.sgml
+++ b/docs/docbook/projdoc/PAM-Authentication-And-Samba.sgml
@@ -236,29 +236,29 @@ Options recognized by this module are as follows:
         migrate         -       only meaningful in an "auth" context;
                                 used to update smbpasswd file with a
                                 password used for successful authentication.
-        smbconf=&lt file &gt  -     specify an alternate path to the smb.conf
+        smbconf=&lt; file &gt;  -     specify an alternate path to the smb.conf
                                 file.
 </programlisting></para>
 
 <para><programlisting>
 Thanks go to the following people:
 
-	* Andrew Morgan &lt morgan@transmeta.com &gt, for providing the Linux-PAM
+	* Andrew Morgan &lt; morgan@transmeta.com &gt;, for providing the Linux-PAM
 	framework, without which none of this would have happened
 
-	* Christian Gafton &lt gafton@redhat.com &gt and Andrew Morgan again, for the
+	* Christian Gafton &lt; gafton@redhat.com &gt; and Andrew Morgan again, for the
 	pam_pwdb module upon which pam_smbpass was originally based
 
-	* Luke Leighton &lt lkcl@switchboard.net &gt for being receptive to the idea,
+	* Luke Leighton &lt; lkcl@switchboard.net &gt; for being receptive to the idea,
 	and for the occasional good-natured complaint about the project's status
 	that keep me working on it :)
 
 	* and of course, all the other members of the Samba team
-	&lt http://www.samba.org/samba/team.html &gt, for creating a great product
+	&lt;http://www.samba.org/samba/team.html&gt;, for creating a great product
 	and for giving this project a purpose
 
 	---------------------
-	Stephen Langasek &lt vorlon@netexpress.net &gt
+	Stephen Langasek &lt; vorlon@netexpress.net &gt;
 </programlisting></para>
 
 <para>
diff --git a/docs/docbook/projdoc/PolicyMgmt.sgml b/docs/docbook/projdoc/PolicyMgmt.sgml
index 333fe6ad0b..2ae3fa5ea7 100644
--- a/docs/docbook/projdoc/PolicyMgmt.sgml
+++ b/docs/docbook/projdoc/PolicyMgmt.sgml
@@ -195,13 +195,12 @@ exists with NT4 style policy files.
 <sect3>
 <title>Administration of Win2K / XP Policies</title>
 
-<procedure>
 <title>Instructions</title>
 <para>
 Instead of using the tool called "The System Policy Editor", commonly called Poledit (from the
 executable name poledit.exe), GPOs are created and managed using a Microsoft Management Console
 (MMC) snap-in as follows:</para>
-
+<procedure>
 <step>
 <para>
 Go to the Windows 200x / XP menu <filename>Start->Programs->Administrative Tools</filename>
diff --git a/docs/docbook/projdoc/locking.sgml b/docs/docbook/projdoc/locking.sgml
index facaef551f..adb4356497 100644
--- a/docs/docbook/projdoc/locking.sgml
+++ b/docs/docbook/projdoc/locking.sgml
@@ -371,9 +371,9 @@ Section of the Microsoft MSDN Library on opportunistic locking:
 </para>
 
 <para>
-Opportunistic Locks, Microsoft Developer Network (MSDN), Windows Development &gt
-Windows Base Services &gt Files and I/O &gt SDK Documentation &gt File Storage &gt File Systems
-&gt About File Systems &gt Opportunistic Locks, Microsoft Corporation.
+Opportunistic Locks, Microsoft Developer Network (MSDN), Windows Development &gt;
+Windows Base Services &gt; Files and I/O &gt; SDK Documentation &gt; File Storage &gt; File Systems
+&gt; About File Systems &gt; Opportunistic Locks, Microsoft Corporation.
 <ulink url="http://msdn.microsoft.com/library/en-us/fileio/storage_5yk3.asp">http://msdn.microsoft.com/library/en-us/fileio/storage_5yk3.asp</ulink>
 </para>
 
diff --git a/docs/docbook/projdoc/passdb.sgml b/docs/docbook/projdoc/passdb.sgml
index 38e1cd6a2f..cc497f7d93 100644
--- a/docs/docbook/projdoc/passdb.sgml
+++ b/docs/docbook/projdoc/passdb.sgml
@@ -811,7 +811,7 @@ You either can set up your own table and specify the field names to pdb_mysql (s
 for the column names) or use the default table. The file <filename>examples/pdb/mysql/mysql.dump</filename> 
 contains the correct queries to create the required tables. Use the command :
 
-<command>mysql -u<replaceable>username</replaceable> -h<replaceable>hostname</replaceable> -p<replaceable>password</replaceable> <replaceable>databasename</replaceable> < <filename>/path/to/samba/examples/pdb/mysql/mysql.dump</filename></command>
+<command>mysql -u<replaceable>username</replaceable> -h<replaceable>hostname</replaceable> -p<replaceable>password</replaceable> <replaceable>databasename</replaceable> &gt; <filename>/path/to/samba/examples/pdb/mysql/mysql.dump</filename></command>
 
 </para>
 </sect2>
diff --git a/docs/docbook/projdoc/security_level.sgml b/docs/docbook/projdoc/security_level.sgml
index f19ec4a1e8..528c87c52c 100644
--- a/docs/docbook/projdoc/security_level.sgml
+++ b/docs/docbook/projdoc/security_level.sgml
@@ -320,7 +320,7 @@ MS Windows through things such as setting an invalid shell in the
 
 <para>
 An alternative to assigning UIDs to Windows users on a Samba member server is
-presented in the <ulink url="winbind.html">Winbind Overview</ulink> chapter
+presented in the <link linkend="winbind">Winbind Overview</link> chapter
 in this HOWTO collection.
 </para>
 
diff --git a/docs/docbook/projdoc/unicode.sgml b/docs/docbook/projdoc/unicode.sgml
index eaf9990dcb..2351668e56 100644
--- a/docs/docbook/projdoc/unicode.sgml
+++ b/docs/docbook/projdoc/unicode.sgml
@@ -109,20 +109,34 @@ filenames from CP850 to the iso8859-15 charset.</para>
 <sect1>
 <title>Japanese charsets</title>
 
-<para>Samba doesn't work correctly with Japanese charsets yet. Here are points of attention when setting it up:</para>
-
-<simplelist>
-<member>You should set <command>mangling method = hash</command></member>
-<member>There are various iconv() implementations around and not all of 
-them work equally well. glibc2's iconv() has a critical problem in CP932. 
-libiconv-1.8 works with CP932 but still has some problems and does not 
-work with EUC-JP. </member>
-<member>You should set <command>dos charset = CP932</command>, not Shift_JIS, SJIS...</member>
-<member>Currently only <command>unix charset = CP932</command> will work (but still has some problems...) because of iconv() issues. <command>unix charset = EUC-JP</command> doesn't work well because of iconv() issues.</member>
-<member>Currently Samba 3.0 does not support <command>unix charset = UTF8-MAC/CAP/HEX/JIS*</command></member>
-</simplelist>
+<para>Samba doesn't work correctly with Japanese charsets yet. Here are
+points of attention when setting it up:</para>
+
+<itemizedlist>
+
+<listitem><para>You should set <command>mangling method =
+hash</command></para></listitem>
+
+<listitem><para>There are various iconv() implementations around and not
+all of  them work equally well. glibc2's iconv() has a critical problem
+in CP932.  libiconv-1.8 works with CP932 but still has some problems and
+does not  work with EUC-JP.</para></listitem>
+
+<listitem><para>You should set <command>dos charset = CP932</command>, not
+Shift_JIS, SJIS...</para></listitem>
+
+<listitem><para>Currently only <command>unix charset = CP932</command>
+will work (but still has some problems...) because of iconv() issues.
+<command>unix charset = EUC-JP</command> doesn't work well because of
+iconv() issues.</para></listitem>
+
+<listitem><para>Currently Samba 3.0 does not support <command>unix charset
+= UTF8-MAC/CAP/HEX/JIS*</command></para></listitem>
+
+</itemizedlist>
 
 <para>More information (in Japanese) is available at: <ulink url="http://www.atmarkit.co.jp/flinux/special/samba3/samba3a.html">http://www.atmarkit.co.jp/flinux/special/samba3/samba3a.html</ulink>.</para>
+
 </sect1>
 
 </chapter>