Last set of syntax fixes

(This used to be commit 1ab824e77edd955e90515b40e0d0c2d4f826b603)

10 files changed, 84 insertions, 59 deletions

diff --git a/docs/docbook/Makefile.in b/docs/docbook/Makefile.in
index f4859de8b3..556e9f9cc1 100644
--- a/docs/docbook/Makefile.in
+++ b/docs/docbook/Makefile.in
@@ -88,7 +88,7 @@ htmlfaq: $(HTMLDIR) CSS
 	@$(XSLTPROC) --stringparam base.dir "$(FAQDIR)/" --stringparam root.filename samba-faq xslt/html-chunk.xsl $(FAQPROJDOC)/sambafaq.xml
 html-single: $(HTMLDIR) CSS $(HTMLDIR)/Samba-HOWTO-Collection.html  $(HTMLDIR)/Samba-Developers-Guide.html
 html: $(HTMLDIR) CSS Samba-HOWTO-Collection.xml
-	@$(XSLTPROC) xslt/html-chunk.xsl Samba-HOWTO-Collection.xml
+	@$(XSLTPROC) -o $(HTMLDIR) xslt/html-chunk.xsl Samba-HOWTO-Collection.xml
 manpages: $(MANDIR) $(MANPAGES)
 tex: Samba-HOWTO-Collection.tex Samba-Developers-Guide.tex
 
@@ -111,7 +111,7 @@ $(DEVDOC)/attributions.xml: $(DEVDOC)/dev-doc.xml
 clean: 
 	@rm -f *.xml $(MANPAGES) $(TXTDIR)/*.txt $(PSDIR)/*.ps $(PDFDIR)/*.pdf 
 	@rm -f $(SMBDOTCONFDOC)/parameters.*.xml $(DVIDIR)/*.dvi
-	@rm -f samba-doc.* dev-doc.* $(PROJDOC)/attributions.xml
+	@rm -f samba-doc.* dev-doc.* $(PROJDOC)/attributions.xml $(DEVDOC)/attributions.xml
 	@rm -f $(IMAGEPROJDIR)/*.eps $(MANPROJDIR)/smb.conf.5.xml
 
 # Text files
@@ -120,7 +120,7 @@ $(TXTDIR):
 
 $(TXTDIR)/%.txt: %.xml
 	@echo "Converting $< to plain text..."
-	@$(XMLTO) txt -o $(TXTDIR) $<
+	@$(XMLTO) txt -o $(TXTDIR) $< > $@
 
 # Tex files
 %.tex: %.xml
diff --git a/docs/docbook/projdoc/CUPS-printing.xml b/docs/docbook/projdoc/CUPS-printing.xml
index 3be540e886..258132ddd9 100644
--- a/docs/docbook/projdoc/CUPS-printing.xml
+++ b/docs/docbook/projdoc/CUPS-printing.xml
@@ -324,9 +324,10 @@ one by one; this yields the old <emphasis>LanMan</emphasis> style
 printing; it uses a <filename>\\sambaserver\printershare</filename>
 type of connection.</para></listitem>
 
-<indexterm><primary>point and print</primary></indexterm>
 
-<listitem><para>deposit and prepare the drivers (for later download) on
+<listitem><para>
+<indexterm><primary>point and print</primary></indexterm>
+		deposit and prepare the drivers (for later download) on
 the print server (Samba); this enables the clients to use
 "Point and Print" to get drivers semi-automatically installed the
 first time they access the printer; with this method NT/2K/XP
@@ -447,9 +448,10 @@ method;</para></listitem>
 <emphasis>upload-from-a-UNIX-workstation</emphasis>
 method;</para></listitem>
 
-<indexterm><primary>imprints</primary></indexterm>
 
-<listitem><para>the <emphasis>Imprints</emphasis> Toolset
+<listitem><para>
+<indexterm><primary>imprints</primary></indexterm>
+		the <emphasis>Imprints</emphasis> Toolset
 method.</para></listitem>
 </itemizedlist>
 
@@ -588,7 +590,7 @@ Systems. Their <emphasis>Core Graphic Engine</emphasis> uses a
 
 <para>
 
-<image><imagedescription>Windows Printing to a local Printer</imagedescription><imagefile>1small</imagefile></image>
+<image id="small1"><imagedescription>Windows Printing to a local Printer</imagedescription><imagefile>1small</imagefile></image>
 </para>
 </sect2>
 
@@ -681,7 +683,7 @@ is CUPS....
 </note>
 
 <para>
-	<image><imagedescription>Printing to a Postscript Printer</imagedescription>
+	<image id="small2"><imagedescription>Printing to a Postscript Printer</imagedescription>
 		<imagefile>2small</imagefile></image>
 </para>
 
@@ -714,7 +716,7 @@ to non-PostScript hardware.
 </para>
 
 <para>
-<image><imagedescription>Ghostscript as a RIP for non-postscript printers</imagedescription>
+	<image id="small3"><imagedescription>Ghostscript as a RIP for non-postscript printers</imagedescription>
 	<imagefile>3small</imagefile>
 </image>
 </para>
@@ -1130,7 +1132,7 @@ print options already embedded into the file.
 </para>
 
 <para>
-	<image scale="25"><imagedescription>Prefiltering in CUPS to form Postscript</imagedescription>
+	<image id="small4" scale="25"><imagedescription>Prefiltering in CUPS to form Postscript</imagedescription>
 	<imagefile>4small</imagefile>
 </image>
 </para>
@@ -1149,7 +1151,7 @@ stapling an punching it, etc.) into the PostScript file.
 </para>
 
 <para>
-	<image scale="25"><imagedescription>Adding Device-specific Print Options</imagedescription>
+	<image id="small5" scale="25"><imagedescription>Adding Device-specific Print Options</imagedescription>
 		<imagefile>5small</imagefile>
 	</image>
 </para>
@@ -1190,7 +1192,7 @@ that are able to generate device-specific printer data.
 </para>
 
 <para>
-	<image scale="25"><imagedescription>Postscript to intermediate Raster format</imagedescription><imagefile>6small</imagefile></image>
+	<image id="small6" scale="25"><imagedescription>Postscript to intermediate Raster format</imagedescription><imagefile>6small</imagefile></image>
 </para>
 
 <para>
@@ -1207,7 +1209,7 @@ than one vendor financing the development of CUPS raster drivers).
 </para>
 
 <para>
-	<image><imagedescription>CUPS-raster production using Ghostscript</imagedescription>
+	<image id="small7"><imagedescription>CUPS-raster production using Ghostscript</imagedescription>
 		<imagefile>7small</imagefile>
 	</image>
 </para>
@@ -1243,7 +1245,7 @@ filtering:
 </para>
 
 <para>
-	<image><imagedescription>Image format to CUPS-raster format conversion</imagedescription>
+	<image id="small8"><imagedescription>Image format to CUPS-raster format conversion</imagedescription>
 		<imagefile>8small</imagefile>
 	</image>
 </para>
@@ -1268,7 +1270,7 @@ closely as possible with CUPS.
 </para>
 
 <para>
-	<image><imagedescription>Raster to Printer Specific formats</imagedescription>
+	<image id="small9"><imagedescription>Raster to Printer Specific formats</imagedescription>
 		<imagefile>9small</imagefile>
 	</image>
 </para>
@@ -1744,7 +1746,7 @@ advantages) than other methods.
 </para>
 
 <para>
-	<image><imagedescription>cupsomatic/foomatic processing versus Native CUPS</imagedescription>
+	<image id="small10"><imagedescription>cupsomatic/foomatic processing versus Native CUPS</imagedescription>
 		<imagefile>10small</imagefile>
 	</image>
 </para>
@@ -2034,7 +2036,7 @@ clients.
 </para>
 
 <para>
-	<image><imagedescription>Print Driver execution on the Client</imagedescription>
+	<image id="small11"><imagedescription>Print Driver execution on the Client</imagedescription>
 		<imagefile>11small</imagefile>
 	</image>
 </para>
@@ -2060,7 +2062,7 @@ understand.
 </para>
 
 <para>
-	<image><imagedescription>Print Driver execution on the Server</imagedescription>
+	<image id="small12"><imagedescription>Print Driver execution on the Server</imagedescription>
 		<imagefile>12small</imagefile>
 	</image>
 </para>
@@ -2134,7 +2136,7 @@ simply use <smbconfoption><name>printing</name><value>sysv</value></smbconfoptio
 </para>
 
 <para>
-<image><imagedescription>Printing via CUPS/samba server</imagedescription>
+<image id="small13"><imagedescription>Printing via CUPS/samba server</imagedescription>
 	<imagefile>13small</imagefile>
 </image>
 </para>
@@ -2738,8 +2740,9 @@ items which weigh in favor of the CUPS ones:
 <listitem><para>no hassle with the question <quote>Where do I
 get the ADOBE*.* driver files from?</quote></para></listitem>
 
+<listitem><para>
 <indexterm><primary>PJL</primary></indexterm>
-<listitem><para>the Adobe drivers (on request of the printer PPD
+		the Adobe drivers (on request of the printer PPD
 associated with them) often put a PJL header in front of the main
 PostScript part of the print file. Thus the printfile starts with
 <parameter>&lt;1B &gt;%-12345X</parameter> or
@@ -2934,8 +2937,9 @@ the procedure
 </para>
 
 <orderedlist>
+	<listitem><para>
 	<indexterm><primary>IPP</primary></indexterm>
-<listitem><para>call the CUPS server via IPP and request the
+			call the CUPS server via IPP and request the
 driver files and the PPD file for the named printer;</para></listitem>
 
 <listitem><para>store the files temporarily in the local
@@ -2947,13 +2951,15 @@ TEMPDIR (as defined in
  share's WIN40 (for Win95/98/ME) and W32X86/ (for WinNT/2k/XP) sub
  directories;</para></listitem>
 
+<listitem><para>
 <indexterm><primary>rpcclient</primary><secondary>adddriver</secondary></indexterm>
-<listitem><para>connect via rpcclient to the Samba server and
+		connect via rpcclient to the Samba server and
 execute the "adddriver" command with the correct
 parameters;</para></listitem>
 
+<listitem><para>
 <indexterm><primary>rpcclient</primary><secondary>setdriver</secondary></indexterm>
-<listitem><para>connect via rpcclient to the Samba server a second
+		connect via rpcclient to the Samba server a second
 time and execute the "setdriver" command.</para></listitem>
 </orderedlist>
 
@@ -3046,7 +3052,7 @@ not intended to, and does not work with, "raw" queues!
 </para>
 
 <para>
-	<image><imagedescription>cupsaddsmb flowchart</imagedescription>
+	<image id="small14"><imagedescription>cupsaddsmb flowchart</imagedescription>
 		<imagefile>14small</imagefile></image>
 </para>
 </sect2>
@@ -3177,12 +3183,14 @@ now);</para></listitem>
 <listitem><para>copy all files to
 		<smbconfsection>[print$]</smbconfsection></para></listitem>
 
+<listitem><para>
 <indexterm><primary>rpcclient</primary><secondary>adddriver</secondary></indexterm>
-<listitem><para>run <command>rpcclient adddriver</command>
+		run <command>rpcclient adddriver</command>
 (for each client architecture you want to support):</para></listitem>
 
+<listitem><para>
 <indexterm><primary>rpcclient</primary><secondary>setdriver</secondary></indexterm>
-<listitem><para>run <command>rpcclient
+		run <command>rpcclient
 setdriver.</command></para></listitem>
 </orderedlist>
 
@@ -3563,7 +3571,7 @@ The driver files now are in the W32X86 architecture "root" of
 <para><screen>
 &rootprompt;<userinput>rpcclient -Uroot%xxxx -c `adddriver "Windows NT x86" "mydrivername: \
   cupsdrvr.dll:mysmbtstprn.PPD: \
-  cupsui.dll:cups.hlp:NULL:RAW<citation>:</citation>NULL" \
+  cupsui.dll:cups.hlp:NULL:RAW:NULL" \
   localhost</userinput>
 Printer Driver mydrivername successfully installed.
 </screen></para>
diff --git a/docs/docbook/projdoc/Compiling.xml b/docs/docbook/projdoc/Compiling.xml
index 8a5c5e89a6..ccb2f46f3f 100644
--- a/docs/docbook/projdoc/Compiling.xml
+++ b/docs/docbook/projdoc/Compiling.xml
@@ -208,9 +208,9 @@ With that said, go ahead and download the following files:
 &prompt;<userinput>wget http://us1.samba.org/samba/ftp/samba-pubkey.asc</userinput>
 </screen></para>
 
-<indexterm><primary>GPG</primary></indexterm>
 
 <para>
+<indexterm><primary>GPG</primary></indexterm>
 The first file is the PGP signature for the Samba source file; the other is the Samba public
 PGP key itself. Import the public PGP key with:
 </para>
@@ -235,9 +235,11 @@ then all is well. The warnings about trust relationships can be ignored. An
 example of what you would not want to see would be:
 </para>
 
+<para>
 <computeroutput>
      gpg: BAD signature from "Samba Distribution Verification Key"
-</computeroutput>
+ </computeroutput>
+ </para>
 
 </sect1>
 
@@ -246,7 +248,8 @@ example of what you would not want to see would be:
 	
 <indexterm><primary>configure</primary></indexterm>
 
-	<para>To do this, first run the program <userinput>./configure
+	<para>
+		To do this, first run the program <userinput>./configure
 	</userinput> in the source directory. This should automatically 
 	configure Samba for your operating system. If you have unusual 
 	needs then you may wish to run</para>
diff --git a/docs/docbook/projdoc/NT4Migration.xml b/docs/docbook/projdoc/NT4Migration.xml
index 8494e06ec8..36bafee2af 100644
--- a/docs/docbook/projdoc/NT4Migration.xml
+++ b/docs/docbook/projdoc/NT4Migration.xml
@@ -288,7 +288,7 @@ generally fit into three basic categories.
 <table frame="all"><title>The 3 Major Site Types</title>
 <tgroup cols="2">
 	<colspec align="left"/>
-	<colspec align="justify" colspec="1*"/>
+	<colspec align="justify"/>
 	<thead>
 	<row><entry>Number of Users</entry><entry>Description</entry></row>
 	</thead>
diff --git a/docs/docbook/projdoc/PAM-Authentication-And-Samba.xml b/docs/docbook/projdoc/PAM-Authentication-And-Samba.xml
index 3a2a6da61e..addd646057 100644
--- a/docs/docbook/projdoc/PAM-Authentication-And-Samba.xml
+++ b/docs/docbook/projdoc/PAM-Authentication-And-Samba.xml
@@ -705,15 +705,15 @@ Options recognized by this module are as follows:
 
 <para>
 <itemizedlist>
-	<listitem><ulink url="mailto:morgan@transmeta.com">Andrew Morgan</ulink>, for providing the Linux-PAM
-	framework, without which none of this would have happened</listitem>
+	<listitem><para><ulink url="mailto:morgan@transmeta.com">Andrew Morgan</ulink>, for providing the Linux-PAM
+			framework, without which none of this would have happened</para></listitem>
 
-	<listitem><ulink url="mailto:gafton@redhat.com">Christian Gafton</ulink> and Andrew Morgan again, for the
-	pam_pwdb module upon which pam_smbpass was originally based</listitem>
+<listitem><para><ulink url="mailto:gafton@redhat.com">Christian Gafton</ulink> and Andrew Morgan again, for the
+		pam_pwdb module upon which pam_smbpass was originally based</para></listitem>
 
-	<listitem><ulink url="mailto:lkcl@switchboard.net">Luke Leighton</ulink> for being receptive to the idea,
+<listitem><para><ulink url="mailto:lkcl@switchboard.net">Luke Leighton</ulink> for being receptive to the idea,
 	and for the occasional good-natured complaint about the project's status
-	that keep me working on it :)</listitem>
+	that keep me working on it :)</para></listitem>
 </itemizedlist>.
 </para>
 
@@ -912,10 +912,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>
diff --git a/docs/docbook/projdoc/Problems.xml b/docs/docbook/projdoc/Problems.xml
index c11862a49e..46f3c002d2 100644
--- a/docs/docbook/projdoc/Problems.xml
+++ b/docs/docbook/projdoc/Problems.xml
@@ -26,7 +26,7 @@ listens on your LAN, analyses the data sent on it and displays it
 on the screen.</para>
 
 <sect2>
-<title>Debugging with Samba itself</title>l
+<title>Debugging with Samba itself</title>
 
   <para>
 One of the best diagnostic tools for debugging problems is Samba itself.  
diff --git a/docs/docbook/projdoc/ProfileMgmt.xml b/docs/docbook/projdoc/ProfileMgmt.xml
index ff0c90067e..37ae2d41e8 100644
--- a/docs/docbook/projdoc/ProfileMgmt.xml
+++ b/docs/docbook/projdoc/ProfileMgmt.xml
@@ -317,6 +317,25 @@ local desktop cache, as shown below.  When this user then next logs in,
 they will be told that they are logging in "for the first time".
 </para>
 
+	<warning>
+		<para>
+        Before deleting the contents of the
+        directory listed in the ProfilePath (this is likely to be
+	<filename>c:\windows\profiles\username)</filename>, ask them if they
+	have any important files stored on their desktop or in their start menu. 
+	Delete the contents of the directory ProfilePath (making a backup if any
+	of the files are needed).
+        </para>
+
+        <para>
+	This will have the effect of removing the local (read-only hidden
+	system file) user.DAT in their profile directory, as well as the
+	local "desktop", "nethood", "start menu" and "programs" folders.
+        </para>
+	</warning>
+
+
+
 <orderedlist>
 	<listitem>
         <para>
@@ -343,23 +362,6 @@ they will be told that they are logging in "for the first time".
 		<para>[Exit the registry editor].</para>
 	</listitem>
 
-	<warning>
-		<para>
-        Before deleting the contents of the
-        directory listed in the ProfilePath (this is likely to be
-	<filename>c:\windows\profiles\username)</filename>, ask them if they
-	have any important files stored on their desktop or in their start menu. 
-	Delete the contents of the directory ProfilePath (making a backup if any
-	of the files are needed).
-        </para>
-
-        <para>
-	This will have the effect of removing the local (read-only hidden
-	system file) user.DAT in their profile directory, as well as the
-	local "desktop", "nethood", "start menu" and "programs" folders.
-        </para>
-	</warning>
-
 	<listitem>
         <para>
 			search for the user's .PWL password-caching file in the <filename>c:\windows</filename>
diff --git a/docs/docbook/projdoc/upgrading-to-3.0.xml b/docs/docbook/projdoc/upgrading-to-3.0.xml
index 95411f429a..b5b2a4bf0a 100644
--- a/docs/docbook/projdoc/upgrading-to-3.0.xml
+++ b/docs/docbook/projdoc/upgrading-to-3.0.xml
@@ -16,7 +16,7 @@
 Major new features:
 </para>
 
-<orderedlist numberation="arabic">
+<orderedlist>
 	<listitem><para>
 	Active Directory support. This release is able to join a ADS realm
 	as a member server and authenticate users using LDAP/kerberos.
diff --git a/docs/docbook/projdoc/winbind.xml b/docs/docbook/projdoc/winbind.xml
index 2340e93551..001b2f16c1 100644
--- a/docs/docbook/projdoc/winbind.xml
+++ b/docs/docbook/projdoc/winbind.xml
@@ -20,8 +20,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>
 
diff --git a/docs/docbook/xslt/expand-sambadoc.xsl b/docs/docbook/xslt/expand-sambadoc.xsl
index 34496a91fc..2749fdf3e9 100644
--- a/docs/docbook/xslt/expand-sambadoc.xsl
+++ b/docs/docbook/xslt/expand-sambadoc.xsl
@@ -191,7 +191,17 @@
 
 <xsl:template match="image">
 	<xsl:element name="figure">
-		<xsl:attribute name="id"><xsl:value-of select="imagefile"/></xsl:attribute>
+		<xsl:attribute name="id">
+			<xsl:choose>
+				<xsl:when test="@id != ''">
+					<xsl:value-of select="@id"/>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:value-of select="imagefile"/>
+				</xsl:otherwise>
+			</xsl:choose>
+		</xsl:attribute>
+			
 		<xsl:element name="title">
 			<xsl:value-of select="imagedescription"/>
 		</xsl:element>