Convert more parameters to new smb.conf(5) style. Document found occurences of non-documented parameters in doc-status

(This used to be commit 3a9784d8b2318af4d9b349edd1aba4065d25da23)

12 files changed, 308 insertions, 265 deletions

diff --git a/docs/docbook/smbdotconf/printing/disablespoolss.xml b/docs/docbook/smbdotconf/printing/disablespoolss.xml
index dff1e63fab..366092fce1 100644
--- a/docs/docbook/smbdotconf/printing/disablespoolss.xml
+++ b/docs/docbook/smbdotconf/printing/disablespoolss.xml
@@ -1,20 +1,23 @@
-<samba:parameter xmlns:samba="http://samba.org/common">
-		<term><anchor id="DISABLESPOOLSS"/>disable spoolss (G)</term>
-		<listitem><para>Enabling this parameter will disable Samba's support
-		for the SPOOLSS set of MS-RPC's and will yield identical behavior
-		as Samba 2.0.x.  Windows NT/2000 clients will downgrade to using
-		Lanman style printing commands. Windows 9x/ME will be uneffected by
-		the parameter. However, this will also disable the ability to upload
-		printer drivers to a Samba server via the Windows NT Add Printer
-		Wizard or by using the NT printer properties dialog window.  It will
-		also disable the capability of Windows NT/2000 clients to download
-		print drivers from the Samba host upon demand.
-		<emphasis>Be very careful about enabling this parameter.</emphasis>
-		</para>
+<samba:parameter name="disable spoolss"
+                 context="G"
+		 print="1"
+                 xmlns:samba="http://samba.org/common">
+<listitem>
+    <para>Enabling this parameter will disable Samba's support
+    for the SPOOLSS set of MS-RPC's and will yield identical behavior
+    as Samba 2.0.x.  Windows NT/2000 clients will downgrade to using
+    Lanman style printing commands. Windows 9x/ME will be uneffected by
+    the parameter. However, this will also disable the ability to upload
+    printer drivers to a Samba server via the Windows NT Add Printer
+    Wizard or by using the NT printer properties dialog window.  It will
+    also disable the capability of Windows NT/2000 clients to download
+    print drivers from the Samba host upon demand.
+    <emphasis>Be very careful about enabling this parameter.</emphasis>
+    </para>
 
-		<para>See also <link linkend="USECLIENTDRIVER">use client driver</link>
-		</para>
+    <para>See also <link linkend="USECLIENTDRIVER">use client driver</link>
+    </para>
  
-		<para>Default : <command moreinfo="none">disable spoolss = no</command></para>
-		</listitem>
-		</samba:parameter>
+    <para>Default : <command moreinfo="none">disable spoolss = no</command></para>
+</listitem>
+</samba:parameter>
diff --git a/docs/docbook/smbdotconf/printing/loadprinters.xml b/docs/docbook/smbdotconf/printing/loadprinters.xml
index adaa8afca9..efc2658ba8 100644
--- a/docs/docbook/smbdotconf/printing/loadprinters.xml
+++ b/docs/docbook/smbdotconf/printing/loadprinters.xml
@@ -1,9 +1,13 @@
-<samba:parameter xmlns:samba="http://samba.org/common">
-		<term><anchor id="LOADPRINTERS"/>load printers (G)</term>
-		<listitem><para>A boolean variable that controls whether all 
-		printers in the printcap will be loaded for browsing by default. 
-		See the <link linkend="PRINTERSSECT">printers</link> section for 
-		more details.</para>
+<samba:parameter name="load printers"
+                 context="G"
+		 print="1"
+                 xmlns:samba="http://samba.org/common">
+<listitem>
+    <para>A boolean variable that controls whether all 
+    printers in the printcap will be loaded for browsing by default. 
+    See the <link linkend="PRINTERSSECT">printers</link> section for 
+    more details.</para>
 
-		<para>Default: <command moreinfo="none">load printers = yes</command></para></listitem>
-		</samba:parameter>
+    <para>Default: <command moreinfo="none">load printers = yes</command></para>
+</listitem>
+</samba:parameter>
diff --git a/docs/docbook/smbdotconf/printing/lpqcommand.xml b/docs/docbook/smbdotconf/printing/lpqcommand.xml
index ddcdf1ef49..f1b62af627 100644
--- a/docs/docbook/smbdotconf/printing/lpqcommand.xml
+++ b/docs/docbook/smbdotconf/printing/lpqcommand.xml
@@ -1,41 +1,44 @@
-<samba:parameter xmlns:samba="http://samba.org/common">
-		<term><anchor id="LPQCOMMAND"/>lpq command (S)</term>
-		<listitem><para>This parameter specifies the command to be 
-		executed on the server host in order to obtain <command moreinfo="none">lpq
-		</command>-style printer status information.</para>
-
-		<para>This command should be a program or script which 
-		takes a printer name as its only parameter and outputs printer 
-		status information.</para>
-
-		<para>Currently nine styles of printer status information 
-		are supported; BSD, AIX, LPRNG, PLP, SYSV, HPUX, QNX, CUPS, and SOFTQ. 
-		This covers most UNIX systems. You control which type is expected 
-		using the <parameter moreinfo="none">printing =</parameter> option.</para>
-
-		<para>Some clients (notably Windows for Workgroups) may not 
-		correctly send the connection number for the printer they are 
-		requesting status information about. To get around this, the 
-		server reports on the first printer service connected to by the 
-		client. This only happens if the connection number sent is invalid.</para>
-
-		<para>If a <parameter moreinfo="none">%p</parameter> is given then the printer name 
-		is put in its place. Otherwise it is placed at the end of the 
-		command.</para>
-
-		<para>Note that it is good practice to include the absolute path 
-		in the <parameter moreinfo="none">lpq command</parameter> as the <envar>$PATH
-		</envar> may not be available to the server.  When compiled with
-		the CUPS libraries, no <parameter moreinfo="none">lpq command</parameter> is
-		needed because smbd will make a library call to obtain the 
-		print queue listing.</para>
-
-		<para>See also the <link linkend="PRINTING"><parameter moreinfo="none">printing
-		</parameter></link> parameter.</para>
-
-		<para>Default: <emphasis>depends on the setting of <parameter moreinfo="none">
-		printing</parameter></emphasis></para>
-
-		<para>Example: <command moreinfo="none">lpq command = /usr/bin/lpq -P%p</command></para>
-		</listitem>
-		</samba:parameter>
+<samba:parameter name="lpq command"
+                 context="S"
+		 print="1"
+                 xmlns:samba="http://samba.org/common">
+<listitem>
+    <para>This parameter specifies the command to be 
+    executed on the server host in order to obtain <command moreinfo="none">lpq
+    </command>-style printer status information.</para>
+
+    <para>This command should be a program or script which 
+    takes a printer name as its only parameter and outputs printer 
+    status information.</para>
+
+    <para>Currently nine styles of printer status information 
+    are supported; BSD, AIX, LPRNG, PLP, SYSV, HPUX, QNX, CUPS, and SOFTQ. 
+    This covers most UNIX systems. You control which type is expected 
+    using the <parameter moreinfo="none">printing =</parameter> option.</para>
+
+    <para>Some clients (notably Windows for Workgroups) may not 
+    correctly send the connection number for the printer they are 
+    requesting status information about. To get around this, the 
+    server reports on the first printer service connected to by the 
+    client. This only happens if the connection number sent is invalid.</para>
+
+    <para>If a <parameter moreinfo="none">%p</parameter> is given then the printer name 
+    is put in its place. Otherwise it is placed at the end of the 
+    command.</para>
+
+    <para>Note that it is good practice to include the absolute path 
+    in the <parameter moreinfo="none">lpq command</parameter> as the <envar>$PATH
+    </envar> may not be available to the server.  When compiled with
+    the CUPS libraries, no <parameter moreinfo="none">lpq command</parameter> is
+    needed because smbd will make a library call to obtain the 
+    print queue listing.</para>
+
+    <para>See also the <link linkend="PRINTING"><parameter moreinfo="none">printing
+    </parameter></link> parameter.</para>
+
+    <para>Default: <emphasis>depends on the setting of <parameter moreinfo="none">
+    printing</parameter></emphasis></para>
+
+    <para>Example: <command moreinfo="none">lpq command = /usr/bin/lpq -P%p</command></para>
+</listitem>
+</samba:parameter>
diff --git a/docs/docbook/smbdotconf/printing/lprmcommand.xml b/docs/docbook/smbdotconf/printing/lprmcommand.xml
index 7f59d6c5a0..567602c4f9 100644
--- a/docs/docbook/smbdotconf/printing/lprmcommand.xml
+++ b/docs/docbook/smbdotconf/printing/lprmcommand.xml
@@ -1,27 +1,30 @@
-<samba:parameter xmlns:samba="http://samba.org/common">
-		<term><anchor id="LPRMCOMMAND"/>lprm command (S)</term>
-		<listitem><para>This parameter specifies the command to be 
-		executed on the server host in order to delete a print job.</para>
+<samba:parameter name="lprm command"
+                 context="S"
+		 print="1"
+                 xmlns:samba="http://samba.org/common">
+<listitem>
+    <para>This parameter specifies the command to be 
+    executed on the server host in order to delete a print job.</para>
 
-		<para>This command should be a program or script which takes 
-		a printer name and job number, and deletes the print job.</para>
+    <para>This command should be a program or script which takes 
+    a printer name and job number, and deletes the print job.</para>
 
-		<para>If a <parameter moreinfo="none">%p</parameter> is given then the printer name 
-		is put in its place. A <parameter moreinfo="none">%j</parameter> is replaced with 
-		the job number (an integer).</para>
+    <para>If a <parameter moreinfo="none">%p</parameter> is given then the printer name 
+    is put in its place. A <parameter moreinfo="none">%j</parameter> is replaced with 
+    the job number (an integer).</para>
 
-		<para>Note that it is good practice to include the absolute 
-		path in the <parameter moreinfo="none">lprm command</parameter> as the PATH may not be 
-		available to the server.</para>
+    <para>Note that it is good practice to include the absolute 
+    path in the <parameter moreinfo="none">lprm command</parameter> as the PATH may not be 
+    available to the server.</para>
 
-		<para>See also the <link linkend="PRINTING"><parameter moreinfo="none">printing
-		</parameter></link> parameter.</para>
+    <para>See also the <link linkend="PRINTING"><parameter moreinfo="none">printing
+    </parameter></link> parameter.</para>
 
-		<para>Default: <emphasis>depends on the setting of <parameter moreinfo="none">printing
-		</parameter></emphasis></para>
+    <para>Default: <emphasis>depends on the setting of <parameter moreinfo="none">printing
+    </parameter></emphasis></para>
 
-		<para>Example 1: <command moreinfo="none">lprm command = /usr/bin/lprm -P%p %j
-		</command></para>
-		<para>Example 2: <command moreinfo="none">lprm command = /usr/bin/cancel %p-%j
-		</command></para></listitem>
-		</samba:parameter>
+    <para>Example 1: <command moreinfo="none">lprm command = /usr/bin/lprm -P%p %j</command></para>
+
+    <para>Example 2: <command moreinfo="none">lprm command = /usr/bin/cancel %p-%j</command></para>
+</listitem>
+</samba:parameter>
diff --git a/docs/docbook/smbdotconf/printing/maxprintjobs.xml b/docs/docbook/smbdotconf/printing/maxprintjobs.xml
index f0c7d83d3f..a631b6b8c4 100644
--- a/docs/docbook/smbdotconf/printing/maxprintjobs.xml
+++ b/docs/docbook/smbdotconf/printing/maxprintjobs.xml
@@ -1,14 +1,18 @@
-<samba:parameter xmlns:samba="http://samba.org/common">
-		<term><anchor id="MAXPRINTJOBS"/>max print jobs (S)</term>
-		<listitem><para>This parameter limits the maximum number of 
-		jobs allowable in a Samba printer queue at any given moment.
-		If this number is exceeded, <citerefentry><refentrytitle>smbd</refentrytitle>
-		<manvolnum>8</manvolnum></citerefentry> will remote &quot;Out of Space&quot; to the client.
-		See all <link linkend="TOTALPRINTJOBS"><parameter moreinfo="none">total
-		print jobs</parameter></link>.
-		</para>
+<samba:parameter name="max print jobs"
+                 context="S"
+		 print="1"
+                 xmlns:samba="http://samba.org/common">
+<listitem>
+    <para>This parameter limits the maximum number of 
+    jobs allowable in a Samba printer queue at any given moment.
+    If this number is exceeded, <citerefentry><refentrytitle>smbd</refentrytitle>
+    <manvolnum>8</manvolnum></citerefentry> will remote &quot;Out of Space&quot; to the client.
+    See all <link linkend="TOTALPRINTJOBS"><parameter moreinfo="none">total
+    print jobs</parameter></link>.
+    </para>
 
-		<para>Default: <command moreinfo="none">max print jobs = 1000</command></para>
-		<para>Example: <command moreinfo="none">max print jobs = 5000</command></para>
-		</listitem>
-		</samba:parameter>
+    <para>Default: <command moreinfo="none">max print jobs = 1000</command></para>
+
+    <para>Example: <command moreinfo="none">max print jobs = 5000</command></para>
+</listitem>
+</samba:parameter>
diff --git a/docs/docbook/smbdotconf/printing/printable.xml b/docs/docbook/smbdotconf/printing/printable.xml
index 22d4d73b01..946e8b4b96 100644
--- a/docs/docbook/smbdotconf/printing/printable.xml
+++ b/docs/docbook/smbdotconf/printing/printable.xml
@@ -1,15 +1,18 @@
-<samba:parameter xmlns:samba="http://samba.org/common">
-		<term><anchor id="PRINTABLE"/>printable (S)</term>
-		<listitem><para>If this parameter is <constant>yes</constant>, then 
-		clients may open, write to and submit spool files on the directory 
-		specified for the service. </para>
+<samba:parameter name="printable"
+                 context="S"
+		 print="1"
+                 xmlns:samba="http://samba.org/common">
+<listitem>
+    <para>If this parameter is <constant>yes</constant>, then 
+    clients may open, write to and submit spool files on the directory 
+    specified for the service. </para>
 		
-		<para>Note that a printable service will ALWAYS allow writing 
-		to the service path (user privileges permitting) via the spooling 
-		of print data. The <link linkend="READONLY"><parameter moreinfo="none">read only
-		</parameter></link> parameter controls only non-printing access to 
-		the resource.</para>
+    <para>Note that a printable service will ALWAYS allow writing 
+    to the service path (user privileges permitting) via the spooling 
+    of print data. The <link linkend="READONLY"><parameter moreinfo="none">read only
+    </parameter></link> parameter controls only non-printing access to 
+    the resource.</para>
 
-		<para>Default: <command moreinfo="none">printable = no</command></para>
-		</listitem>
-		</samba:parameter>
+    <para>Default: <command moreinfo="none">printable = no</command></para>
+</listitem>
+</samba:parameter>
diff --git a/docs/docbook/smbdotconf/printing/printcap.xml b/docs/docbook/smbdotconf/printing/printcap.xml
index 2f5e4af580..0ee08a263f 100644
--- a/docs/docbook/smbdotconf/printing/printcap.xml
+++ b/docs/docbook/smbdotconf/printing/printcap.xml
@@ -1,6 +1,9 @@
-<samba:parameter xmlns:samba="http://samba.org/common">
-		<term><anchor id="PRINTCAP"/>printcap (G)</term>
-		<listitem><para>Synonym for 	<link linkend="PRINTCAPNAME"><parameter moreinfo="none">
-		printcap name</parameter></link>.</para>
-		</listitem>
-		</samba:parameter>
+<samba:parameter name="printcap"
+                 context="G"
+		 hide="1"
+                 xmlns:samba="http://samba.org/common">
+<listitem>	
+    <para>Synonym for <link linkend="PRINTCAPNAME"><parameter moreinfo="none">
+    printcap name</parameter></link>.</para>
+</listitem>
+</samba:parameter>
diff --git a/docs/docbook/smbdotconf/printing/printcapname.xml b/docs/docbook/smbdotconf/printing/printcapname.xml
index 0025624d25..5f5b5c86a9 100644
--- a/docs/docbook/smbdotconf/printing/printcapname.xml
+++ b/docs/docbook/smbdotconf/printing/printcapname.xml
@@ -1,28 +1,32 @@
-<samba:parameter xmlns:samba="http://samba.org/common">
-		<term><anchor id="PRINTCAPNAME"/>printcap name (G)</term>
-		<listitem><para>This parameter may be used to override the 
-		compiled-in default printcap name used by the server (usually <filename moreinfo="none">
-		/etc/printcap</filename>). See the discussion of the <link linkend="PRINTERSSECT">[printers]</link> section above for reasons 
-		why you might want to do this.</para>
+<samba:parameter name="max print jobs"
+                 context="S"
+		 print="1" developer="1"
+                 xmlns:samba="http://samba.org/common">
+<listitem>
+    <para>This parameter may be used to override the 
+    compiled-in default printcap name used by the server (usually <filename moreinfo="none">
+    /etc/printcap</filename>). See the discussion of the <link 
+    linkend="PRINTERSSECT">[printers]</link> section above for reasons 
+    why you might want to do this.</para>
 
-		<para>To use the CUPS printing interface set <command moreinfo="none">printcap name = cups
-		</command>. This should be supplemented by an addtional setting 
-		<link linkend="PRINTING">printing = cups</link> in the [global] 
-		section.  <command moreinfo="none">printcap name = cups</command> will use the  
-		&quot;dummy&quot; printcap created by CUPS, as specified in your CUPS
-		configuration file.
-		</para>
+    <para>To use the CUPS printing interface set <command moreinfo="none">printcap name = cups
+    </command>. This should be supplemented by an addtional setting 
+    <link linkend="PRINTING">printing = cups</link> in the [global] 
+    section.  <command moreinfo="none">printcap name = cups</command> will use the  
+    &quot;dummy&quot; printcap created by CUPS, as specified in your CUPS
+    configuration file.
+    </para>
 
-		<para>On System V systems that use <command moreinfo="none">lpstat</command> to 
-		list available printers you can use <command moreinfo="none">printcap name = lpstat
-		</command> to automatically obtain lists of available printers. This 
-		is the default for systems that define SYSV at configure time in 
-		Samba (this includes most System V based systems). If <parameter moreinfo="none">
-		printcap name</parameter> is set to <command moreinfo="none">lpstat</command> on 
-		these systems then Samba will launch <command moreinfo="none">lpstat -v</command> and 
-		attempt to parse the output to obtain a printer list.</para>
+    <para>On System V systems that use <command moreinfo="none">lpstat</command> to 
+    list available printers you can use <command moreinfo="none">printcap name = lpstat
+    </command> to automatically obtain lists of available printers. This 
+    is the default for systems that define SYSV at configure time in 
+    Samba (this includes most System V based systems). If <parameter moreinfo="none">
+    printcap name</parameter> is set to <command moreinfo="none">lpstat</command> on 
+    these systems then Samba will launch <command moreinfo="none">lpstat -v</command> and 
+    attempt to parse the output to obtain a printer list.</para>
 
-		<para>A minimal printcap file would look something like this:</para>
+    <para>A minimal printcap file would look something like this:</para>
 
 <para><programlisting format="linespecific">
 print1|My Printer 1
@@ -32,16 +36,17 @@ print4|My Printer 4
 print5|My Printer 5
 </programlisting></para>
 	
-		<para>where the '|' separates aliases of a printer. The fact 
-		that the second alias has a space in it gives a hint to Samba 
-		that it's a comment.</para>
+    <para>where the '|' separates aliases of a printer. The fact 
+    that the second alias has a space in it gives a hint to Samba 
+    that it's a comment.</para>
 
-		<note><para>Under AIX the default printcap 
-		name is <filename moreinfo="none">/etc/qconfig</filename>. Samba will assume the 
-		file is in AIX <filename moreinfo="none">qconfig</filename> format if the string
-		<filename moreinfo="none">qconfig</filename> appears in the printcap filename.</para></note>
+    <note><para>Under AIX the default printcap 
+    name is <filename moreinfo="none">/etc/qconfig</filename>. Samba will assume the 
+    file is in AIX <filename moreinfo="none">qconfig</filename> format if the string
+    <filename moreinfo="none">qconfig</filename> appears in the printcap filename.</para></note>
 
-		<para>Default: <command moreinfo="none">printcap name = /etc/printcap</command></para>
-		<para>Example: <command moreinfo="none">printcap name = /etc/myprintcap</command></para>
-		</listitem>
-		</samba:parameter>
+    <para>Default: <command moreinfo="none">printcap name = /etc/printcap</command></para>
+
+    <para>Example: <command moreinfo="none">printcap name = /etc/myprintcap</command></para>
+</listitem>
+</samba:parameter>
diff --git a/docs/docbook/smbdotconf/printing/printcommand.xml b/docs/docbook/smbdotconf/printing/printcommand.xml
index c996ed6c2e..5444309053 100644
--- a/docs/docbook/smbdotconf/printing/printcommand.xml
+++ b/docs/docbook/smbdotconf/printing/printcommand.xml
@@ -1,86 +1,89 @@
-<samba:parameter xmlns:samba="http://samba.org/common">
-		<term><anchor id="PRINTCOMMAND"/>print command (S)</term>
-		<listitem><para>After a print job has finished spooling to 
-		a service, this command will be used via a <command moreinfo="none">system()</command> 
-		call to process the spool file. Typically the command specified will 
-		submit the spool file to the host's printing subsystem, but there 
- 		is no requirement that this be the case. The server will not remove 
-		the spool file, so whatever command you specify should remove the 
-		spool file when it has been processed, otherwise you will need to 
-		manually remove old spool files.</para>
+<samba:parameter name="print command"
+                 context="S"
+		 print="1"
+                 xmlns:samba="http://samba.org/common">
+<listitem>
+    <para>After a print job has finished spooling to 
+    a service, this command will be used via a <command moreinfo="none">system()</command> 
+    call to process the spool file. Typically the command specified will 
+    submit the spool file to the host's printing subsystem, but there 
+    is no requirement that this be the case. The server will not remove 
+    the spool file, so whatever command you specify should remove the 
+    spool file when it has been processed, otherwise you will need to 
+    manually remove old spool files.</para>
 		
-		<para>The print command is simply a text string. It will be used 
-		verbatim after macro substitutions have been made:</para>
+    <para>The print command is simply a text string. It will be used 
+    verbatim after macro substitutions have been made:</para>
 
-		<para>s, %p - the path to the spool
-		file name</para>
+    <para>%s, %p - the path to the spool
+    file name</para>
 
-		<para>%p - the appropriate printer 
-		name</para>
+    <para>%p - the appropriate printer 
+    name</para>
 
-		<para>%J - the job 
-		name as transmitted by the client.</para>
+    <para>%J - the job 
+    name as transmitted by the client.</para>
 
-		<para>%c - The number of printed pages
-		of the spooled job (if known).</para>
+    <para>%c - The number of printed pages
+    of the spooled job (if known).</para>
 
-		<para>%z - the size of the spooled
-		print job (in bytes)</para>
+    <para>%z - the size of the spooled
+    print job (in bytes)</para>
 
-		<para>The print command <emphasis>MUST</emphasis> contain at least 
-		one occurrence of <parameter moreinfo="none">%s</parameter> or <parameter moreinfo="none">%f
-		</parameter> - the <parameter moreinfo="none">%p</parameter> is optional. At the time 
-		a job is submitted, if no printer name is supplied the <parameter moreinfo="none">%p
-		</parameter> will be silently removed from the printer command.</para>
+    <para>The print command <emphasis>MUST</emphasis> contain at least 
+    one occurrence of <parameter moreinfo="none">%s</parameter> or <parameter moreinfo="none">%f
+    </parameter> - the <parameter moreinfo="none">%p</parameter> is optional. At the time 
+    a job is submitted, if no printer name is supplied the <parameter moreinfo="none">%p
+    </parameter> will be silently removed from the printer command.</para>
 
-		<para>If specified in the [global] section, the print command given 
-		will be used for any printable service that does not have its own 
-		print command specified.</para>
+    <para>If specified in the [global] section, the print command given 
+    will be used for any printable service that does not have its own 
+    print command specified.</para>
 
-		<para>If there is neither a specified print command for a 
-		printable service nor a global print command, spool files will 
-		be created but not processed and (most importantly) not removed.</para>
+    <para>If there is neither a specified print command for a 
+    printable service nor a global print command, spool files will 
+    be created but not processed and (most importantly) not removed.</para>
 
-		<para>Note that printing may fail on some UNIXes from the 
-		<constant>nobody</constant> account. If this happens then create 
-		an alternative guest account that can print and set the <link linkend="GUESTACCOUNT"><parameter moreinfo="none">guest account</parameter></link> 
-		in the [global] section.</para>
+    <para>Note that printing may fail on some UNIXes from the 
+    <constant>nobody</constant> account. If this happens then create 
+    an alternative guest account that can print and set the <link linkend="GUESTACCOUNT">
+    <parameter moreinfo="none">guest account</parameter></link> 
+    in the [global] section.</para>
 
-		<para>You can form quite complex print commands by realizing 
-		that they are just passed to a shell. For example the following 
-		will log a print job, print the file, then remove it. Note that 
-		';' is the usual separator for command in shell scripts.</para>
+    <para>You can form quite complex print commands by realizing 
+    that they are just passed to a shell. For example the following 
+    will log a print job, print the file, then remove it. Note that 
+    ';' is the usual separator for command in shell scripts.</para>
 
-		<para><command moreinfo="none">print command = echo Printing %s &gt;&gt; 
-		/tmp/print.log; lpr -P %p %s; rm %s</command></para>
+    <para><command moreinfo="none">print command = echo Printing %s &gt;&gt; 
+    /tmp/print.log; lpr -P %p %s; rm %s</command></para>
 
-		<para>You may have to vary this command considerably depending 
-		on how you normally print files on your system. The default for 
-		the parameter varies depending on the setting of the <link linkend="PRINTING">
-		<parameter moreinfo="none">printing</parameter></link> parameter.</para>
+    <para>You may have to vary this command considerably depending 
+    on how you normally print files on your system. The default for 
+    the parameter varies depending on the setting of the <link linkend="PRINTING">
+    <parameter moreinfo="none">printing</parameter></link> parameter.</para>
 
-		<para>Default: For <command moreinfo="none">printing = BSD, AIX, QNX, LPRNG 
-		or PLP :</command></para>
-		<para><command moreinfo="none">print command = lpr -r -P%p %s</command></para>
+    <para>Default: For <command moreinfo="none">printing = BSD, AIX, QNX, LPRNG 
+    or PLP :</command></para>
+    <para><command moreinfo="none">print command = lpr -r -P%p %s</command></para>
 
-		<para>For <command moreinfo="none">printing = SYSV or HPUX :</command></para>
-		<para><command moreinfo="none">print command = lp -c -d%p %s; rm %s</command></para>
+    <para>For <command moreinfo="none">printing = SYSV or HPUX :</command></para>
+    <para><command moreinfo="none">print command = lp -c -d%p %s; rm %s</command></para>
 
-		<para>For <command moreinfo="none">printing = SOFTQ :</command></para>
-		<para><command moreinfo="none">print command = lp -d%p -s %s; rm %s</command></para>
+    <para>For <command moreinfo="none">printing = SOFTQ :</command></para>
+    <para><command moreinfo="none">print command = lp -d%p -s %s; rm %s</command></para>
 
-		<para>For printing = CUPS :   If SAMBA is compiled against
-		libcups, then <link linkend="PRINTING">printcap = cups</link> 
-		uses the CUPS API to
-		submit jobs, etc.  Otherwise it maps to the System V
-		commands with the -oraw option for printing, i.e. it
-		uses <command moreinfo="none">lp -c -d%p -oraw; rm %s</command>.   
-		With <command moreinfo="none">printing = cups</command>,
-		and if SAMBA is compiled against libcups, any manually 
-		set print command will be ignored.</para>
+    <para>For printing = CUPS :   If SAMBA is compiled against
+    libcups, then <link linkend="PRINTING">printcap = cups</link> 
+    uses the CUPS API to
+    submit jobs, etc.  Otherwise it maps to the System V
+    commands with the -oraw option for printing, i.e. it
+    uses <command moreinfo="none">lp -c -d%p -oraw; rm %s</command>.   
+    With <command moreinfo="none">printing = cups</command>,
+    and if SAMBA is compiled against libcups, any manually 
+    set print command will be ignored.</para>
 
 
-		<para>Example: <command moreinfo="none">print command = /usr/local/samba/bin/myprintscript
-		%p %s</command></para>
-		</listitem>
-		</samba:parameter>
+    <para>Example: <command moreinfo="none">print command = /usr/local/samba/bin/myprintscript %p %s</command></para>
+</listitem>
+</samba:parameter>
diff --git a/docs/docbook/smbdotconf/printing/printing.xml b/docs/docbook/smbdotconf/printing/printing.xml
index d49c0e2471..4e9caa9b54 100644
--- a/docs/docbook/smbdotconf/printing/printing.xml
+++ b/docs/docbook/smbdotconf/printing/printing.xml
@@ -1,26 +1,31 @@
-<samba:parameter xmlns:samba="http://samba.org/common">
-		<term><anchor id="PRINTING"/>printing (S)</term>
-		<listitem><para>This parameters controls how printer status 
-		information is interpreted on your system. It also affects the 
-		default values for the <parameter moreinfo="none">print command</parameter>, 
-		<parameter moreinfo="none">lpq command</parameter>, <parameter moreinfo="none">lppause command
-		</parameter>, <parameter moreinfo="none">lpresume command</parameter>, and 
-		<parameter moreinfo="none">lprm command</parameter> if specified in the 
-		[global] section.</para>
+<samba:parameter name="printing"
+                 context="S"
+		 print="1"
+                 xmlns:samba="http://samba.org/common">
+<listitem>
+    <para>This parameters controls how printer status  information is
+    interpreted on your system. It also affects the  default values for
+    the <parameter moreinfo="none">print command</parameter>,  parameter
+    moreinfo="none">lpq command</parameter>, <parameter
+    moreinfo="none">lppause command </parameter>, <parameter
+    moreinfo="none">lpresume command</parameter>, and  <parameter
+    moreinfo="none">lprm command</parameter> if specified in the 
+    [global] section.</para>
 
-		<para>Currently nine printing styles are supported. They are
-		<constant>BSD</constant>, <constant>AIX</constant>, 
-		<constant>LPRNG</constant>, <constant>PLP</constant>,
-		<constant>SYSV</constant>, <constant>HPUX</constant>,
-		<constant>QNX</constant>, <constant>SOFTQ</constant>,
-		and <constant>CUPS</constant>.</para>
+    <para>Currently nine printing styles are supported. They are
+    <constant>BSD</constant>, <constant>AIX</constant>, 
+    <constant>LPRNG</constant>, <constant>PLP</constant>,
+    <constant>SYSV</constant>, <constant>HPUX</constant>,
+    <constant>QNX</constant>, <constant>SOFTQ</constant>,
+    and <constant>CUPS</constant>.</para>
 
-		<para>To see what the defaults are for the other print 
-		commands when using the various options use the <ulink url="testparm.1.html">testparm(1)</ulink> program.</para>
+    <para>To see what the defaults are for the other print 
+    commands when using the various options use the <citerefentry><refentrytitle>testparm</refentrytitle>
+    <manvolnum>1</manvolnum></citerefentry> program.</para>
 
-		<para>This option can be set on a per printer basis</para>
+    <para>This option can be set on a per printer basis</para>
 
-		<para>See also the discussion in the <link linkend="PRINTERSSECT">
-		[printers]</link> section.</para>
-		</listitem>
-		</samba:parameter>
+    <para>See also the discussion in the <link linkend="PRINTERSSECT">
+    [printers]</link> section.</para>
+</listitem>
+</samba:parameter>
diff --git a/docs/docbook/smbdotconf/printing/printok.xml b/docs/docbook/smbdotconf/printing/printok.xml
index 7900e91bbb..0a0e6605f1 100644
--- a/docs/docbook/smbdotconf/printing/printok.xml
+++ b/docs/docbook/smbdotconf/printing/printok.xml
@@ -1,6 +1,9 @@
-<samba:parameter xmlns:samba="http://samba.org/common">
-		<term><anchor id="PRINTOK"/>print ok (S)</term>
-		<listitem><para>Synonym for <link linkend="PRINTABLE">
-		<parameter moreinfo="none">printable</parameter></link>.</para>
-		</listitem>
-		</samba:parameter>
+<samba:parameter name="print ok"
+                 context="S"
+		 hide="1"
+                 xmlns:samba="http://samba.org/common">
+<listitem>
+    <para>Synonym for <link linkend="PRINTABLE">
+    <parameter moreinfo="none">printable</parameter></link>.</para>
+</listitem>
+</samba:parameter>
diff --git a/docs/docbook/smbdotconf/printing/totalprintjobs.xml b/docs/docbook/smbdotconf/printing/totalprintjobs.xml
index 25784a3c29..ccdb137a69 100644
--- a/docs/docbook/smbdotconf/printing/totalprintjobs.xml
+++ b/docs/docbook/smbdotconf/printing/totalprintjobs.xml
@@ -1,18 +1,22 @@
-<samba:parameter xmlns:samba="http://samba.org/common">
-		<term><anchor id="TOTALPRINTJOBS"/>total print jobs (G)</term>
-		<listitem><para>This parameter accepts an integer value which defines
-		a limit on the maximum number of print jobs that will be accepted 
-		system wide at any given time.  If a print job is submitted
-		by a client which will exceed this number, then <citerefentry><refentrytitle>smbd</refentrytitle>
-		<manvolnum>8</manvolnum></citerefentry> will return an 
-		error indicating that no space is available on the server.  The 
-		default value of 0 means that no such limit exists.  This parameter
-		can be used to prevent a server from exceeding its capacity and is
-		designed as a printing throttle.  See also 
-		<link linkend="MAXPRINTJOBS"><parameter moreinfo="none">max print jobs</parameter></link>.
-		</para>
+<samba:parameter name="total print jobs"
+                 context="G"
+                 print="1"
+                 xmlns:samba="http://samba.org/common">
+<listitem>
+    <para>This parameter accepts an integer value which defines
+    a limit on the maximum number of print jobs that will be accepted 
+    system wide at any given time.  If a print job is submitted
+    by a client which will exceed this number, then <citerefentry><refentrytitle>smbd</refentrytitle>
+    <manvolnum>8</manvolnum></citerefentry> will return an 
+    error indicating that no space is available on the server.  The 
+    default value of 0 means that no such limit exists.  This parameter
+    can be used to prevent a server from exceeding its capacity and is
+    designed as a printing throttle.  See also <link linkend="MAXPRINTJOBS">
+    <parameter moreinfo="none">max print jobs</parameter></link>.
+    </para>
 		
-		<para>Default: <command moreinfo="none">total print jobs = 0</command></para>
-		<para>Example: <command moreinfo="none">total print jobs = 5000</command></para>
-		</listitem>
-		</samba:parameter>
+    <para>Default: <command moreinfo="none">total print jobs = 0</command></para>
+
+    <para>Example: <command moreinfo="none">total print jobs = 5000</command></para>
+</listitem>
+</samba:parameter>