Merge in ab's conversion to XML. First step: make SGML documents compatible

with the (more strict) XML format.
(This used to be commit 0930628bd588096d5e5bc2e68fe78eb893d5f18a)

6 files changed, 28 insertions, 25 deletions

diff --git a/docs/docbook/faq/clientapp.sgml b/docs/docbook/faq/clientapp.sgml
index 6d687bf772..3d44dd44c0 100644
--- a/docs/docbook/faq/clientapp.sgml
+++ b/docs/docbook/faq/clientapp.sgml
@@ -1,8 +1,8 @@
-<chapter id="ClientApp">
+<chapter id="FAQ-ClientApp">
 <title>Specific client application problems</title>
 
 <sect1>
-<title>MS Office Setup reports "Cannot change properties of '\MSOFFICE\SETUP.INI'"</title>
+<title>MS Office Setup reports "Cannot change properties of '\\MSOFFICE\\SETUP.INI'"</title>
 <para>
 When installing MS Office on a Samba drive for which you have admin
 user permissions, ie. admin users = username, you will find the
@@ -60,16 +60,16 @@ set the following parameters on the share containing it:
 </para>
 
 <para><programlisting>
-	[MSOP95]
-		path = /where_you_put_it
-		comment = Your comment
-		volume = "The_CD_ROM_Label"
-		read only = yes
-		available = yes
-		share modes = no
-		locking = no
-		browseable = yes
-		public = yes
+[MSOP95]
+	path = /where_you_put_it
+	comment = Your comment
+	volume = "The_CD_ROM_Label"
+	read only = yes
+	available = yes
+	share modes = no
+	locking = no
+	browseable = yes
+	public = yes
 </programlisting></para>
 
 </listitem>
diff --git a/docs/docbook/faq/config.sgml b/docs/docbook/faq/config.sgml
index 78f73252a2..a95ac84d2f 100644
--- a/docs/docbook/faq/config.sgml
+++ b/docs/docbook/faq/config.sgml
@@ -1,4 +1,4 @@
-<chapter id="Config">
+<chapter id="FAQ-Config">
 <title>Configuration problems</title>
 
 <sect1>
diff --git a/docs/docbook/faq/errors.sgml b/docs/docbook/faq/errors.sgml
index 819462899e..905e7c92c2 100644
--- a/docs/docbook/faq/errors.sgml
+++ b/docs/docbook/faq/errors.sgml
@@ -1,4 +1,4 @@
-<chapter id="errors">
+<chapter id="FAQ-errors">
 
 <title>Common errors</title>
 
diff --git a/docs/docbook/faq/features.sgml b/docs/docbook/faq/features.sgml
index d464885f9e..66b05379cc 100644
--- a/docs/docbook/faq/features.sgml
+++ b/docs/docbook/faq/features.sgml
@@ -1,4 +1,4 @@
-<chapter id="features">
+<chapter id="FAQ-features">
 
 <title>Features</title>
 
@@ -83,9 +83,7 @@ manual carefully.</para>
 <title>Tools for printing faxes</title>
 
 <para>Your incomed faxes are in:
-<filename>/var/spool/fax/incoming</filename>
-
-<para>print it with:</para>
+<filename>/var/spool/fax/incoming</filename>. Print it with:</para>
 
 <para><programlisting>
 for i in *
@@ -141,7 +139,7 @@ lp3|fax:\
         :sd=/usr/spool/lp3:\
         :if=/usr/local/etc/mgetty+sendfax/faxfilter:sh:sf:mx#0:\
         :lf=/usr/spool/lp3/fax-log:
-</programlisting>
+</programlisting></para>
 
 <para>Now, edit your <filename>smb.conf</filename> so you have a smb based printer named "fax"</para>
 
diff --git a/docs/docbook/faq/general.sgml b/docs/docbook/faq/general.sgml
index 5111e69bec..3f7c2074f9 100644
--- a/docs/docbook/faq/general.sgml
+++ b/docs/docbook/faq/general.sgml
@@ -1,10 +1,11 @@
-<chapter id="general">
+<chapter id="FAQ-general">
 <title>General Information</title>
 
 <sect1>
 <title>Where can I get it?</title>
 <para>
 The Samba suite is available at the <ulink url="http://samba.org/">samba website</ulink>.
+</para>
 </sect1>
 
 <sect1>
@@ -41,6 +42,7 @@ same version number without the alpha, for example 1.9.16.</member>
 <member>Inevitably bugs are found in the "stable" releases and minor patch
 levels are released which give us the pXX series, for example 1.9.16p2.</member>
 </simplelist>
+</para>
 
 <para>
 So the progression goes:
@@ -134,7 +136,7 @@ already know this, but the rest may need some help. Andrew doesn't ask
 for payment, but he does appreciate it when people give him
 pizza. This calls for a little organisation when the pizza donor is
 twenty thousand kilometres away, but it has been done.
-<?para>
+</para>
 
 <para>
 Method 1: Ring up your local branch of an international pizza chain
diff --git a/docs/docbook/faq/install.sgml b/docs/docbook/faq/install.sgml
index 288e3a5f32..f8341dc65a 100644
--- a/docs/docbook/faq/install.sgml
+++ b/docs/docbook/faq/install.sgml
@@ -1,4 +1,4 @@
-<chapter id="Install">
+<chapter id="FAQ-Install">
 <title>Compiling and installing Samba on a Unix host</title>
 
 <sect1>
@@ -19,9 +19,10 @@ thusly:
 The details of how to do this and the specific syntax varies from
 client to client - check your client's documentation.
 </para>
+</sect1>
 
 <sect1>
-<title>Some files that I KNOW are on the server doesn't show up when I view the files from my client!
+<title>Some files that I KNOW are on the server don't show up when I view the files from my client!</title>
 <para>See the next question.</para>
 </sect1>
 
@@ -146,6 +147,7 @@ coreplus.  Also not that print status error messages don't mean
 printing won't work. The print status is received by a different
 mechanism.
 </para>
+</sect1>
 
 <sect1>
 <title>My client reports "This server is not configured to list shared resources"</title>
@@ -293,14 +295,15 @@ Samba traditionally has had many problems dealing with time zones, due
 to the bizarre ways that Microsoft network protocols handle time
 zones.  
 </para>
+</sect1>
 
 <sect1>
 <title>How do I set the printer driver name correctly?</title>
-<para>Question:<para>
+<para>Question:
 <quote> On NT, I opened "Printer Manager" and "Connect to Printer".
  Enter ["\\ptdi270\ps1"] in the box of printer. I got the
  following error message
- </quote>
+ </quote></para>
  <para>
  <programlisting>
      You do not have sufficient access to your machine