Finish conversion of Printing parameters

(This used to be commit 6515b0cff8b0fec25010e5b33b6e7009356146fa)

13 files changed, 377 insertions, 341 deletions

diff --git a/docs/docbook/smbdotconf/printing/addprintercommand.xml b/docs/docbook/smbdotconf/printing/addprintercommand.xml
index abff09cda4..63b3f567b1 100644
--- a/docs/docbook/smbdotconf/printing/addprintercommand.xml
+++ b/docs/docbook/smbdotconf/printing/addprintercommand.xml
@@ -1,60 +1,63 @@
-<samba:parameter xmlns:samba="http://samba.org/common">
-		<term><anchor id="ADDPRINTERCOMMAND"/>addprinter command (G)</term>
-		<listitem><para>With the introduction of MS-RPC based printing
-		support for Windows NT/2000 clients in Samba 2.2, The MS Add
-		Printer Wizard (APW) icon is now also available in the 
-		&quot;Printers...&quot; folder displayed a share listing.  The APW
-		allows for printers to be add remotely to a Samba or Windows 
-		NT/2000 print server.</para>
+<samba:parameter name="addprinter command"
+                 context="G"
+		 advanced="1" developer="1"
+                 xmlns:samba="http://samba.org/common">
+<listitem>
+    <para>With the introduction of MS-RPC based printing
+    support for Windows NT/2000 clients in Samba 2.2, The MS Add
+    Printer Wizard (APW) icon is now also available in the 
+    &quot;Printers...&quot; folder displayed a share listing.  The APW
+    allows for printers to be add remotely to a Samba or Windows 
+    NT/2000 print server.</para>
 		
-		<para>For a Samba host this means that the printer must be 
-		physically added to the underlying printing system.  The <parameter moreinfo="none">add 
-		printer command</parameter> defines a script to be run which 
-		will perform the necessary operations for adding the printer
-		to the print system and to add the appropriate service definition 
-		to the  <filename moreinfo="none">smb.conf</filename> file in order that it can be 
-		shared by <citerefentry><refentrytitle>smbd</refentrytitle>
-		<manvolnum>8</manvolnum></citerefentry>.</para>
+    <para>For a Samba host this means that the printer must be 
+    physically added to the underlying printing system.  The <parameter moreinfo="none">add 
+    printer command</parameter> defines a script to be run which 
+    will perform the necessary operations for adding the printer
+    to the print system and to add the appropriate service definition 
+    to the  <filename moreinfo="none">smb.conf</filename> file in order that it can be 
+    shared by <citerefentry><refentrytitle>smbd</refentrytitle>
+    <manvolnum>8</manvolnum></citerefentry>.</para>
 		
-		<para>The <parameter moreinfo="none">addprinter command</parameter> is
-		automatically invoked with the following parameter (in 
-		order):</para>
+    <para>The <parameter moreinfo="none">addprinter command</parameter> is
+    automatically invoked with the following parameter (in 
+    order):</para>
 		
-		<itemizedlist>
-			<listitem><para><parameter moreinfo="none">printer name</parameter></para></listitem>
-			<listitem><para><parameter moreinfo="none">share name</parameter></para></listitem>
-			<listitem><para><parameter moreinfo="none">port name</parameter></para></listitem>
-			<listitem><para><parameter moreinfo="none">driver name</parameter></para></listitem>
-			<listitem><para><parameter moreinfo="none">location</parameter></para></listitem>
-			<listitem><para><parameter moreinfo="none">Windows 9x driver location</parameter>
-			</para></listitem>
-		</itemizedlist>
+    <itemizedlist>
+	<listitem><para><parameter moreinfo="none">printer name</parameter></para></listitem>
+	<listitem><para><parameter moreinfo="none">share name</parameter></para></listitem>
+	<listitem><para><parameter moreinfo="none">port name</parameter></para></listitem>
+	<listitem><para><parameter moreinfo="none">driver name</parameter></para></listitem>
+	<listitem><para><parameter moreinfo="none">location</parameter></para></listitem>
+	<listitem><para><parameter moreinfo="none">Windows 9x driver location</parameter></para></listitem>
+    </itemizedlist>
 		
-		<para>All parameters are filled in from the PRINTER_INFO_2 structure sent 
-		by the Windows NT/2000 client with one exception.  The &quot;Windows 9x
-		driver location&quot; parameter is included for backwards compatibility
-		only.  The remaining fields in the structure are generated from answers
-		to the APW questions.</para>
+    <para>All parameters are filled in from the PRINTER_INFO_2 structure sent 
+    by the Windows NT/2000 client with one exception.  The &quot;Windows 9x
+    driver location&quot; parameter is included for backwards compatibility
+    only.  The remaining fields in the structure are generated from answers
+    to the APW questions.</para>
 
-		<para>Once the <parameter moreinfo="none">addprinter command</parameter> has 
-		been executed, <command moreinfo="none">smbd</command> will reparse the <filename moreinfo="none">
-		smb.conf</filename> to determine if the share defined by the APW
-		exists.  If the sharename is still invalid, then <command moreinfo="none">smbd
-		</command> will return an ACCESS_DENIED error to the client.</para>
+    <para>Once the <parameter moreinfo="none">addprinter command</parameter> has 
+    been executed, <command moreinfo="none">smbd</command> will reparse the <filename moreinfo="none">
+    smb.conf</filename> to determine if the share defined by the APW
+    exists.  If the sharename is still invalid, then <command moreinfo="none">smbd
+    </command> will return an ACCESS_DENIED error to the client.</para>
 
-		<para>
-		The &quot;add printer command&quot; program can output a single line of text,
-		which Samba will set as the port the new printer is connected to. 
-		If this line isn't output, Samba won't reload its printer shares.
-		</para>
+    <para>
+    The &quot;add printer command&quot; program can output a single line of text,
+    which Samba will set as the port the new printer is connected to. 
+    If this line isn't output, Samba won't reload its printer shares.
+    </para>
 		
-		<para>See also <link linkend="DELETEPRINTERCOMMAND"><parameter moreinfo="none">
-		deleteprinter command</parameter></link>, <link linkend="PRINTING"><parameter moreinfo="none">printing</parameter></link>,
-		<link linkend="SHOWADDPRINTERWIZARD"><parameter moreinfo="none">show add
-		printer wizard</parameter></link></para>
+    <para>See also <link linkend="DELETEPRINTERCOMMAND"><parameter moreinfo="none">
+    deleteprinter command</parameter></link>, <link linkend="PRINTING">
+    <parameter moreinfo="none">printing</parameter></link>,
+    <link linkend="SHOWADDPRINTERWIZARD"><parameter moreinfo="none">show add
+    printer wizard</parameter></link></para>
 		
-		<para>Default: <emphasis>none</emphasis></para>
-		<para>Example: <command moreinfo="none">addprinter command = /usr/bin/addprinter
-		</command></para>
-		</listitem>
-		</samba:parameter>
+    <para>Default: <emphasis>none</emphasis></para>
+
+    <para>Example: <command moreinfo="none">addprinter command = /usr/bin/addprinter</command></para>
+</listitem>
+</samba:parameter>
diff --git a/docs/docbook/smbdotconf/printing/defaultdevmode.xml b/docs/docbook/smbdotconf/printing/defaultdevmode.xml
index 9609038dcd..1f14b21f5f 100644
--- a/docs/docbook/smbdotconf/printing/defaultdevmode.xml
+++ b/docs/docbook/smbdotconf/printing/defaultdevmode.xml
@@ -1,34 +1,37 @@
-<samba:parameter xmlns:samba="http://samba.org/common">
-		<term><anchor id="DEFAULTDEVMODE"/>default devmode (S)</term>
-		<listitem><para>This parameter is only applicable to <link linkend="PRINTOK">printable</link> services.  When smbd is serving
-		Printer Drivers to Windows NT/2k/XP clients, each printer on the Samba
-		server has a Device Mode which defines things such as paper size and
-		orientation and duplex settings.  The device mode can only correctly be
-		generated by the printer driver itself (which can only be executed on a
-		Win32 platform).  Because smbd is unable to execute the driver code
-		to generate the device mode, the default behavior is to set this field
-		to NULL.
-		</para>
+<samba:parameter name="default devmode"
+                 context="S"
+		 print="1"
+                 xmlns:samba="http://samba.org/common">
+<listitem>
+    <para>This parameter is only applicable to <link linkend="PRINTOK">printable</link> services.
+    When smbd is serving Printer Drivers to Windows NT/2k/XP clients, each printer on the Samba
+    server has a Device Mode which defines things such as paper size and
+    orientation and duplex settings.  The device mode can only correctly be
+    generated by the printer driver itself (which can only be executed on a
+    Win32 platform).  Because smbd is unable to execute the driver code
+    to generate the device mode, the default behavior is to set this field
+    to NULL.
+    </para>
 
-		<para>Most problems with serving printer drivers to Windows NT/2k/XP clients
-		can be traced to a problem with the generated device mode.  Certain drivers
-		will do things such as crashing the client's Explorer.exe with a NULL devmode.
-		However, other printer drivers can cause the client's spooler service
-		(spoolsv.exe) to die if the devmode was not created by the driver itself
-		(i.e. smbd generates a default devmode).
-		</para>
+    <para>Most problems with serving printer drivers to Windows NT/2k/XP clients
+    can be traced to a problem with the generated device mode.  Certain drivers
+    will do things such as crashing the client's Explorer.exe with a NULL devmode.
+    However, other printer drivers can cause the client's spooler service
+    (spoolsv.exe) to die if the devmode was not created by the driver itself
+    (i.e. smbd generates a default devmode).
+    </para>
 
-		<para>This parameter should be used with care and tested with the printer
-		driver in question.  It is better to leave the device mode to NULL
-		and let the Windows client set the correct values.  Because drivers do not
-		do this all the time, setting <command moreinfo="none">default devmode = yes</command>
-		will instruct smbd to generate a default one.
-		</para>
+    <para>This parameter should be used with care and tested with the printer
+    driver in question.  It is better to leave the device mode to NULL
+    and let the Windows client set the correct values.  Because drivers do not
+    do this all the time, setting <command moreinfo="none">default devmode = yes</command>
+    will instruct smbd to generate a default one.
+    </para>
 
-		<para>For more information on Windows NT/2k printing and Device Modes,
-		see the <ulink url="http://msdn.microsoft.com/">MSDN documentation</ulink>.
-		</para>
+    <para>For more information on Windows NT/2k printing and Device Modes,
+    see the <ulink url="http://msdn.microsoft.com/">MSDN documentation</ulink>.
+    </para>
 
-		<para>Default: <command moreinfo="none">default devmode = no</command></para>
-		</listitem>
-		</samba:parameter>
+    <para>Default: <command moreinfo="none">default devmode = no</command></para>
+</listitem>
+</samba:parameter>
diff --git a/docs/docbook/smbdotconf/printing/deleteprintercommand.xml b/docs/docbook/smbdotconf/printing/deleteprintercommand.xml
index 23f2ff76b0..864f75168d 100644
--- a/docs/docbook/smbdotconf/printing/deleteprintercommand.xml
+++ b/docs/docbook/smbdotconf/printing/deleteprintercommand.xml
@@ -1,35 +1,38 @@
-<samba:parameter xmlns:samba="http://samba.org/common">
-		<term><anchor id="DELETEPRINTERCOMMAND"/>deleteprinter command (G)</term>
-		<listitem><para>With the introduction of MS-RPC based printer
-		support for Windows NT/2000 clients in Samba 2.2, it is now 
-		possible to delete printer at run time by issuing the 
-		DeletePrinter() RPC call.</para>
+<samba:parameter name="deleteprinter command"
+                 context="G"
+		 advanced="1" developer="1"
+                 xmlns:samba="http://samba.org/common">
+<listitem>
+    <para>With the introduction of MS-RPC based printer
+    support for Windows NT/2000 clients in Samba 2.2, it is now 
+    possible to delete printer at run time by issuing the 
+    DeletePrinter() RPC call.</para>
 		
-		<para>For a Samba host this means that the printer must be 
-		physically deleted from underlying printing system.  The <parameter moreinfo="none">
-		deleteprinter command</parameter> defines a script to be run which 
-		will perform the necessary operations for removing the printer
-		from the print system and from <filename moreinfo="none">smb.conf</filename>.
-		</para>
+    <para>For a Samba host this means that the printer must be 
+    physically deleted from underlying printing system.  The <parameter moreinfo="none">
+    deleteprinter command</parameter> defines a script to be run which 
+    will perform the necessary operations for removing the printer
+    from the print system and from <filename moreinfo="none">smb.conf</filename>.
+    </para>
 		
-		<para>The <parameter moreinfo="none">deleteprinter command</parameter> is 
-		automatically called with only one parameter: <parameter moreinfo="none">
-		&quot;printer name&quot;</parameter>.</para>
+    <para>The <parameter moreinfo="none">deleteprinter command</parameter> is 
+    automatically called with only one parameter: <parameter moreinfo="none">
+    &quot;printer name&quot;</parameter>.</para>
 		
-				
-		<para>Once the <parameter moreinfo="none">deleteprinter command</parameter> has 
-		been executed, <command moreinfo="none">smbd</command> will reparse the <filename moreinfo="none">
-		smb.conf</filename> to associated printer no longer exists.  
-		If the sharename is still valid, then <command moreinfo="none">smbd
-		</command> will return an ACCESS_DENIED error to the client.</para>
+    <para>Once the <parameter moreinfo="none">deleteprinter command</parameter> has 
+    been executed, <command moreinfo="none">smbd</command> will reparse the <filename moreinfo="none">
+    smb.conf</filename> to associated printer no longer exists.  
+    If the sharename is still valid, then <command moreinfo="none">smbd
+    </command> will return an ACCESS_DENIED error to the client.</para>
 		
-		<para>See also <link linkend="ADDPRINTERCOMMAND"><parameter moreinfo="none">
-		addprinter command</parameter></link>, <link linkend="PRINTING"><parameter moreinfo="none">printing</parameter></link>,
-		<link linkend="SHOWADDPRINTERWIZARD"><parameter moreinfo="none">show add
-		printer wizard</parameter></link></para>
+    <para>See also <link linkend="ADDPRINTERCOMMAND"><parameter moreinfo="none">
+    addprinter command</parameter></link>, <link linkend="PRINTING">
+    <parameter moreinfo="none">printing</parameter></link>,
+    <link linkend="SHOWADDPRINTERWIZARD"><parameter moreinfo="none">show add
+    printer wizard</parameter></link></para>
 		
-		<para>Default: <emphasis>none</emphasis></para>
-		<para>Example: <command moreinfo="none">deleteprinter command = /usr/bin/removeprinter
-		</command></para>
-		</listitem>
-		</samba:parameter>
+    <para>Default: <emphasis>none</emphasis></para>
+
+    <para>Example: <command moreinfo="none">deleteprinter command = /usr/bin/removeprinter</command></para>
+</listitem>
+</samba:parameter>
diff --git a/docs/docbook/smbdotconf/printing/enumportscommand.xml b/docs/docbook/smbdotconf/printing/enumportscommand.xml
index b1111a5e1c..89e510483f 100644
--- a/docs/docbook/smbdotconf/printing/enumportscommand.xml
+++ b/docs/docbook/smbdotconf/printing/enumportscommand.xml
@@ -1,22 +1,25 @@
-<samba:parameter xmlns:samba="http://samba.org/common">
-		<term><anchor id="ENUMPORTSCOMMAND"/>enumports command (G)</term>
-		<listitem><para>The concept of a &quot;port&quot; is fairly foreign
-		to UNIX hosts.  Under Windows NT/2000 print servers, a port
-		is associated with a port monitor and generally takes the form of
-		a local port (i.e. LPT1:, COM1:, FILE:) or a remote port
-		(i.e. LPD Port Monitor, etc...).  By default, Samba has only one
-		port defined--<constant>&quot;Samba Printer Port&quot;</constant>.  Under 
-		Windows NT/2000, all printers must have a valid port name.  
-		If you wish to have a list of ports displayed (<command moreinfo="none">smbd
-		</command> does not use a port name for anything) other than 
-		the default <constant>&quot;Samba Printer Port&quot;</constant>, you 
-		can define <parameter moreinfo="none">enumports command</parameter> to point to
-		a program which should generate a list of ports, one per line,
-		to standard output.  This listing will then be used in response
-		to the level 1 and 2 EnumPorts() RPC.</para>
+<samba:parameter name="enumports command"
+                 context="G"
+		 advanced="1" developer="1'
+                 xmlns:samba="http://samba.org/common">
+<listitem>
+    <para>The concept of a &quot;port&quot; is fairly foreign
+    to UNIX hosts.  Under Windows NT/2000 print servers, a port
+    is associated with a port monitor and generally takes the form of
+    a local port (i.e. LPT1:, COM1:, FILE:) or a remote port
+    (i.e. LPD Port Monitor, etc...).  By default, Samba has only one
+    port defined--<constant>&quot;Samba Printer Port&quot;</constant>.  Under 
+    Windows NT/2000, all printers must have a valid port name.  
+    If you wish to have a list of ports displayed (<command moreinfo="none">smbd
+    </command> does not use a port name for anything) other than 
+    the default <constant>&quot;Samba Printer Port&quot;</constant>, you 
+    can define <parameter moreinfo="none">enumports command</parameter> to point to
+    a program which should generate a list of ports, one per line,
+    to standard output.  This listing will then be used in response
+    to the level 1 and 2 EnumPorts() RPC.</para>
 		
-		<para>Default: <emphasis>no enumports command</emphasis></para>
-		<para>Example: <command moreinfo="none">enumports command = /usr/bin/listports
-		</command></para>
-		</listitem>
-		</samba:parameter>
+    <para>Default: <emphasis>no enumports command</emphasis></para>
+
+    <para>Example: <command moreinfo="none">enumports command = /usr/bin/listports</command></para>
+</listitem>
+</samba:parameter>
diff --git a/docs/docbook/smbdotconf/printing/lppausecommand.xml b/docs/docbook/smbdotconf/printing/lppausecommand.xml
index 34d7c7f800..15c5aca990 100644
--- a/docs/docbook/smbdotconf/printing/lppausecommand.xml
+++ b/docs/docbook/smbdotconf/printing/lppausecommand.xml
@@ -1,41 +1,43 @@
-<samba:parameter xmlns:samba="http://samba.org/common">
-		<term><anchor id="LPPAUSECOMMAND"/>lppause command (S)</term>
-		<listitem><para>This parameter specifies the command to be 
-		executed on the server host in order to stop printing or spooling 
-		a specific print job.</para>
-
-		<para>This command should be a program or script which takes 
-		a printer name and job number to pause the print job. One way 
-		of implementing this is by using job priorities, where jobs 
-		having a too low priority won't be sent to the printer.</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).  On HPUX (see <parameter moreinfo="none">printing=hpux
-		</parameter>), if the <parameter moreinfo="none">-p%p</parameter> option is added 
-		to the lpq command, the job will show up with the correct status, i.e. 
-		if the job priority is lower than the set fence priority it will 
-		have the PAUSED status, whereas if  the priority is equal or higher it 
-		will have the SPOOLED or PRINTING status.</para>
-
-		<para>Note that it is good practice to include the absolute path 
-		in the lppause command 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>Default: Currently no default value is given to 
-		this string, unless the value of the <parameter moreinfo="none">printing</parameter> 
-		parameter is <constant>SYSV</constant>, in which case the default is :</para>
-
-		<para><command moreinfo="none">lp -i %p-%j -H hold</command></para>
-
-		<para>or if the value of the <parameter moreinfo="none">printing</parameter> parameter 
-		is <constant>SOFTQ</constant>, then the default is:</para>
-
-		<para><command moreinfo="none">qstat -s -j%j -h</command></para>
+<samba:parameter name="lppause 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 stop printing or spooling 
+    a specific print job.</para>
+
+    <para>This command should be a program or script which takes 
+    a printer name and job number to pause the print job. One way 
+    of implementing this is by using job priorities, where jobs 
+    having a too low priority won't be sent to the printer.</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).  On HPUX (see <parameter moreinfo="none">printing=hpux
+    </parameter>), if the <parameter moreinfo="none">-p%p</parameter> option is added 
+    to the lpq command, the job will show up with the correct status, i.e. 
+    if the job priority is lower than the set fence priority it will 
+    have the PAUSED status, whereas if  the priority is equal or higher it 
+    will have the SPOOLED or PRINTING status.</para>
+
+    <para>Note that it is good practice to include the absolute path 
+    in the lppause command 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>Default: Currently no default value is given to 
+    this string, unless the value of the <parameter moreinfo="none">printing</parameter> 
+    parameter is <constant>SYSV</constant>, in which case the default is :</para>
+
+    <para><command moreinfo="none">lp -i %p-%j -H hold</command></para>
+
+    <para>or if the value of the <parameter moreinfo="none">printing</parameter> parameter 
+    is <constant>SOFTQ</constant>, then the default is:</para>
+
+    <para><command moreinfo="none">qstat -s -j%j -h</command></para>
  
-		<para>Example for HPUX: <command moreinfo="none">lppause command = /usr/bin/lpalt 	
-		%p-%j -p0</command></para>
-		</listitem>
-		</samba:parameter>
+    <para>Example for HPUX: <command moreinfo="none">lppause command = /usr/bin/lpalt %p-%j -p0</command></para>
+</listitem>
+</samba:parameter>
diff --git a/docs/docbook/smbdotconf/printing/lpresumecommand.xml b/docs/docbook/smbdotconf/printing/lpresumecommand.xml
index fbb1ac71ad..ae3241bfa9 100644
--- a/docs/docbook/smbdotconf/printing/lpresumecommand.xml
+++ b/docs/docbook/smbdotconf/printing/lpresumecommand.xml
@@ -1,37 +1,39 @@
-<samba:parameter xmlns:samba="http://samba.org/common">
-		<term><anchor id="LPRESUMECOMMAND"/>lpresume command (S)</term>
-		<listitem><para>This parameter specifies the command to be 
-		executed on the server host in order to restart or continue 
-		printing or spooling a specific print job.</para>
+<samba:parameter name="lpresume 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 restart or continue 
+    printing or spooling a specific print job.</para>
 
-		<para>This command should be a program or script which takes 
-		a printer name and job number to resume the print job. See 
-		also the <link linkend="LPPAUSECOMMAND"><parameter moreinfo="none">lppause command
-		</parameter></link> parameter.</para>
+    <para>This command should be a program or script which takes 
+    a printer name and job number to resume the print job. See 
+    also the <link linkend="LPPAUSECOMMAND"><parameter moreinfo="none">lppause command
+    </parameter></link> parameter.</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">lpresume 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">lpresume 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: Currently no default value is given 
-		to this string, unless the value of the <parameter moreinfo="none">printing</parameter> 
-		parameter is <constant>SYSV</constant>, in which case the default is :</para>
+    <para>Default: Currently no default value is given 
+    to this string, unless the value of the <parameter moreinfo="none">printing</parameter> 
+    parameter is <constant>SYSV</constant>, in which case the default is :</para>
 
-		<para><command moreinfo="none">lp -i %p-%j -H resume</command></para>
+    <para><command moreinfo="none">lp -i %p-%j -H resume</command></para>
 
-		<para>or if the value of the <parameter moreinfo="none">printing</parameter> parameter 
-		is <constant>SOFTQ</constant>, then the default is:</para>
+    <para>or if the value of the <parameter moreinfo="none">printing</parameter> parameter 
+    is <constant>SOFTQ</constant>, then the default is:</para>
 
-		<para><command moreinfo="none">qstat -s -j%j -r</command></para>
+    <para><command moreinfo="none">qstat -s -j%j -r</command></para>
  
-		<para>Example for HPUX: <command moreinfo="none">lpresume command = /usr/bin/lpalt 
-		%p-%j -p2</command></para>
-		</listitem>
-		</samba:parameter>
+    <para>Example for HPUX: <command moreinfo="none">lpresume command = /usr/bin/lpalt %p-%j -p2</command></para>
+</listitem>
+</samba:parameter>
diff --git a/docs/docbook/smbdotconf/printing/os2drivermap.xml b/docs/docbook/smbdotconf/printing/os2drivermap.xml
index fdfba35a49..478031c7b9 100644
--- a/docs/docbook/smbdotconf/printing/os2drivermap.xml
+++ b/docs/docbook/smbdotconf/printing/os2drivermap.xml
@@ -1,22 +1,23 @@
-<samba:parameter xmlns:samba="http://samba.org/common">
-		<term><anchor id="OS2DRIVERMAP"/>os2 driver map (G)</term>
-		<listitem><para>The parameter is used to define the absolute
-		path to a file containing a mapping of Windows NT printer driver
-		names to OS/2 printer driver names.  The format is:</para>
+<samba:parameter name="os2 driver map"
+                 context="G"
+		 advanced="1" developer="1"
+                 xmlns:samba="http://samba.org/common">
+<listitem>
+    <para>The parameter is used to define the absolute
+    path to a file containing a mapping of Windows NT printer driver
+    names to OS/2 printer driver names.  The format is:</para>
 		
-		<para>&lt;nt driver name&gt; = &lt;os2 driver 
-		name&gt;.&lt;device name&gt;</para>
+    <para>&lt;nt driver name&gt; = &lt;os2 driver name&gt;.&lt;device name&gt;</para>
 		
-		<para>For example, a valid entry using the HP LaserJet 5
-		printer driver would appear as <command moreinfo="none">HP LaserJet 5L = LASERJET.HP 
-		LaserJet 5L</command>.</para>
+    <para>For example, a valid entry using the HP LaserJet 5
+    printer driver would appear as <command moreinfo="none">HP LaserJet 5L = LASERJET.HP 
+    LaserJet 5L</command>.</para>
 		
-		<para>The need for the file is due to the printer driver namespace 
-		problem described in the <ulink url="printing.html">Samba 
-		Printing HOWTO</ulink>.  For more details on OS/2 clients, please 
-		refer to the OS2-Client-HOWTO containing in the Samba documentation.</para>
+    <para>The need for the file is due to the printer driver namespace 
+    problem described in the <ulink url="printing.html">Samba 
+    Printing HOWTO</ulink>.  For more details on OS/2 clients, please 
+    refer to the OS2-Client-HOWTO containing in the Samba documentation.</para>
 
-		<para>Default: <command moreinfo="none">os2 driver map = &lt;empty string&gt;
-		</command></para>
-		</listitem>
-		</samba:parameter>
+    <para>Default: <command moreinfo="none">os2 driver map = &lt;empty string&gt;</command></para>
+</listitem>
+</samba:parameter>
diff --git a/docs/docbook/smbdotconf/printing/printer.xml b/docs/docbook/smbdotconf/printing/printer.xml
index 4cf90b06fa..0a9611ee03 100644
--- a/docs/docbook/smbdotconf/printing/printer.xml
+++ b/docs/docbook/smbdotconf/printing/printer.xml
@@ -1,6 +1,9 @@
-<samba:parameter xmlns:samba="http://samba.org/common">
-		<term><anchor id="PRINTER"/>printer (S)</term>
-		<listitem><para>Synonym for <link linkend="PRINTERNAME"><parameter moreinfo="none">
-		printer name</parameter></link>.</para>
-		</listitem>
-		</samba:parameter>
+<samba:parameter name="printer"
+                 context="S"
+		 hide="1"
+                 xmlns:samba="http://samba.org/common">
+<listitem>
+    <para>Synonym for <link linkend="PRINTERNAME"><parameter moreinfo="none">
+    printer name</parameter></link>.</para>
+</listitem>
+</samba:parameter>
diff --git a/docs/docbook/smbdotconf/printing/printername.xml b/docs/docbook/smbdotconf/printing/printername.xml
index 25e6afa1f2..9f76a673ad 100644
--- a/docs/docbook/smbdotconf/printing/printername.xml
+++ b/docs/docbook/smbdotconf/printing/printername.xml
@@ -1,15 +1,18 @@
-<samba:parameter xmlns:samba="http://samba.org/common">
-		<term><anchor id="PRINTERNAME"/>printer name (S)</term>
-		<listitem><para>This parameter specifies the name of the printer 
-		to which print jobs spooled through a printable service will be sent.</para>
+<samba:parameter name="printer name"
+                 context="S"
+		 print="1"
+                 xmlns:samba="http://samba.org/common">
+<listitem>
+    <para>This parameter specifies the name of the printer 
+    to which print jobs spooled through a printable service will be sent.</para>
 
-		<para>If specified in the [global] section, the printer
-		name given will be used for any printable service that does 
-		not have its own printer name specified.</para>
+    <para>If specified in the [global] section, the printer
+    name given will be used for any printable service that does 
+    not have its own printer name specified.</para>
 
-		<para>Default: <emphasis>none (but may be <constant>lp</constant> 
-		on many systems)</emphasis></para>
+    <para>Default: <emphasis>none (but may be <constant>lp</constant> 
+    on many systems)</emphasis></para>
 
-		<para>Example: <command moreinfo="none">printer name = laserwriter</command></para>
-		</listitem>
-		</samba:parameter>
+    <para>Example: <command moreinfo="none">printer name = laserwriter</command></para>
+</listitem>
+</samba:parameter>
diff --git a/docs/docbook/smbdotconf/printing/queuepausecommand.xml b/docs/docbook/smbdotconf/printing/queuepausecommand.xml
index c991994f7f..13741a0e7f 100644
--- a/docs/docbook/smbdotconf/printing/queuepausecommand.xml
+++ b/docs/docbook/smbdotconf/printing/queuepausecommand.xml
@@ -1,26 +1,29 @@
-<samba:parameter xmlns:samba="http://samba.org/common">
-		<term><anchor id="QUEUEPAUSECOMMAND"/>queuepause command (S)</term>
-		<listitem><para>This parameter specifies the command to be 
-		executed on the server host in order to pause the printer queue.</para>
+<samba:parameter name="queuepause 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 pause the printer queue.</para>
 
-		<para>This command should be a program or script which takes 
-		a printer name as its only parameter and stops the printer queue, 
-		such that no longer jobs are submitted to the printer.</para>
+    <para>This command should be a program or script which takes 
+    a printer name as its only parameter and stops the printer queue, 
+    such that no longer jobs are submitted to the printer.</para>
 
-		<para>This command is not supported by Windows for Workgroups, 
-		but can be issued from the Printers window under Windows 95 
-		and NT.</para>
+    <para>This command is not supported by Windows for Workgroups, 
+    but can be issued from the Printers window under Windows 95 
+    and NT.</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>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 command 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 command as the PATH may not be available to the 
+    server.</para>
 
-		<para>Default: <emphasis>depends on the setting of <parameter moreinfo="none">printing
-		</parameter></emphasis></para>
-		<para>Example: <command moreinfo="none">queuepause command = disable %p</command></para>
-		</listitem>
-		</samba:parameter>
+    <para>Default: <emphasis>depends on the setting of <parameter moreinfo="none">printing</parameter></emphasis></para>
+
+    <para>Example: <command moreinfo="none">queuepause command = disable %p</command></para>
+</listitem>
+</samba:parameter>
diff --git a/docs/docbook/smbdotconf/printing/queueresumecommand.xml b/docs/docbook/smbdotconf/printing/queueresumecommand.xml
index 7c0d60961a..23f6702192 100644
--- a/docs/docbook/smbdotconf/printing/queueresumecommand.xml
+++ b/docs/docbook/smbdotconf/printing/queueresumecommand.xml
@@ -1,31 +1,33 @@
-<samba:parameter xmlns:samba="http://samba.org/common">
-		<term><anchor id="QUEUERESUMECOMMAND"/>queueresume command (S)</term>
-		<listitem><para>This parameter specifies the command to be 
-		executed on the server host in order to resume the printer queue. It 
- 		is the command to undo the behavior that is caused by the 
-		previous parameter (<link linkend="QUEUEPAUSECOMMAND"><parameter moreinfo="none">
-		queuepause command</parameter></link>).</para>
+<samba:parameter name="queueresume 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 resume the printer queue. It 
+    is the command to undo the behavior that is caused by the 
+    previous parameter (<link linkend="QUEUEPAUSECOMMAND"><parameter moreinfo="none">
+    queuepause command</parameter></link>).</para>
  
-		<para>This command should be a program or script which takes 
-		a printer name as its only parameter and resumes the printer queue, 
-		such that queued jobs are resubmitted to the printer.</para>
+    <para>This command should be a program or script which takes 
+    a printer name as its only parameter and resumes the printer queue, 
+    such that queued jobs are resubmitted to the printer.</para>
 
-		<para>This command is not supported by Windows for Workgroups, 
-		but can be issued from the Printers window under Windows 95 
-		and NT.</para>
+    <para>This command is not supported by Windows for Workgroups, 
+    but can be issued from the Printers window under Windows 95 
+    and NT.</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>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 command 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 command as the PATH may not be available to the 
+    server.</para>
 
-		<para>Default: <emphasis>depends on the setting of <link linkend="PRINTING"><parameter moreinfo="none">printing</parameter></link></emphasis>
-		</para>
+    <para>Default: <emphasis>depends on the setting of <link linkend="PRINTING">
+    <parameter moreinfo="none">printing</parameter></link></emphasis></para>
 
-		<para>Example: <command moreinfo="none">queuepause command = enable %p
-		</command></para>
-		</listitem>
-		</samba:parameter>
+    <para>Example: <command moreinfo="none">queuepause command = enable %p</command></para>
+</listitem>
+</samba:parameter>
diff --git a/docs/docbook/smbdotconf/printing/showaddprinterwizard.xml b/docs/docbook/smbdotconf/printing/showaddprinterwizard.xml
index 9bf5160ad5..5a0d5c8877 100644
--- a/docs/docbook/smbdotconf/printing/showaddprinterwizard.xml
+++ b/docs/docbook/smbdotconf/printing/showaddprinterwizard.xml
@@ -1,31 +1,35 @@
-<samba:parameter xmlns:samba="http://samba.org/common">
-		<term><anchor id="SHOWADDPRINTERWIZARD"/>show add printer wizard (G)</term>
-		<listitem><para>With the introduction of MS-RPC based printing support
-		for Windows NT/2000 client in Samba 2.2, a &quot;Printers...&quot; folder will 
-		appear on Samba hosts in the share listing.  Normally this folder will 
-		contain an icon for the MS Add Printer Wizard (APW).  However, it is 
-		possible to disable this feature regardless of the level of privilege 
-		of the connected user.</para>
+<samba:parameter name="show add printer wizard"
+                 context="G"
+		 advanced="1" developer="1"
+                 xmlns:samba="http://samba.org/common">
+<listitem>
+    <para>With the introduction of MS-RPC based printing support
+    for Windows NT/2000 client in Samba 2.2, a &quot;Printers...&quot; folder will 
+    appear on Samba hosts in the share listing.  Normally this folder will 
+    contain an icon for the MS Add Printer Wizard (APW).  However, it is 
+    possible to disable this feature regardless of the level of privilege 
+    of the connected user.</para>
 		
-		<para>Under normal circumstances, the Windows NT/2000 client will 
-		open a handle on the printer server with OpenPrinterEx() asking for
-		Administrator privileges.  If the user does not have administrative
-		access on the print server (i.e is not root or a member of the 
-		<parameter moreinfo="none">printer admin</parameter> group), the OpenPrinterEx() 
-		call fails and the client makes another open call with a request for 
-		a lower privilege level.  This should succeed, however the APW 
-		icon will not be displayed.</para>
+    <para>Under normal circumstances, the Windows NT/2000 client will 
+    open a handle on the printer server with OpenPrinterEx() asking for
+    Administrator privileges.  If the user does not have administrative
+    access on the print server (i.e is not root or a member of the 
+    <parameter moreinfo="none">printer admin</parameter> group), the OpenPrinterEx() 
+    call fails and the client makes another open call with a request for 
+    a lower privilege level.  This should succeed, however the APW 
+    icon will not be displayed.</para>
 		
-		<para>Disabling the <parameter moreinfo="none">show add printer wizard</parameter>
-		parameter will always cause the OpenPrinterEx() on the server
-		to fail.  Thus the APW icon will never be displayed. <emphasis>
-		Note :</emphasis>This does not prevent the same user from having 
-		administrative privilege on an individual printer.</para>
+    <para>Disabling the <parameter moreinfo="none">show add printer wizard</parameter>
+    parameter will always cause the OpenPrinterEx() on the server
+    to fail.  Thus the APW icon will never be displayed. <emphasis>
+    Note :</emphasis>This does not prevent the same user from having 
+    administrative privilege on an individual printer.</para>
 		
-		<para>See also <link linkend="ADDPRINTERCOMMAND"><parameter moreinfo="none">addprinter
-		command</parameter></link>, <link linkend="DELETEPRINTERCOMMAND">
-		<parameter moreinfo="none">deleteprinter command</parameter></link>, <link linkend="PRINTERADMIN"><parameter moreinfo="none">printer admin</parameter></link></para>
+    <para>See also <link linkend="ADDPRINTERCOMMAND"><parameter moreinfo="none">addprinter
+    command</parameter></link>, <link linkend="DELETEPRINTERCOMMAND">
+    <parameter moreinfo="none">deleteprinter command</parameter></link>, <link linkend="PRINTERADMIN">
+    <parameter moreinfo="none">printer admin</parameter></link></para>
 		
-		<para>Default :<command moreinfo="none">show add printer wizard = yes</command></para>
-		</listitem>
-		</samba:parameter>
+    <para>Default :<command moreinfo="none">show add printer wizard = yes</command></para>
+</listitem>
+</samba:parameter>
diff --git a/docs/docbook/smbdotconf/printing/useclientdriver.xml b/docs/docbook/smbdotconf/printing/useclientdriver.xml
index 8327d0aaa4..bc4162333b 100644
--- a/docs/docbook/smbdotconf/printing/useclientdriver.xml
+++ b/docs/docbook/smbdotconf/printing/useclientdriver.xml
@@ -1,35 +1,39 @@
-<samba:parameter xmlns:samba="http://samba.org/common">
-		<term><anchor id="USECLIENTDRIVER"/>use client driver (S)</term>
-		<listitem><para>This parameter applies only to Windows NT/2000
-		clients.  It has no affect on Windows 95/98/ME clients.  When 
-		serving a printer to Windows NT/2000 clients without first installing
-		a valid printer driver on the Samba host, the client will be required
-		to install a local printer driver.  From this point on, the client
-		will treat the print as a local printer and not a network printer 
-		connection.  This is much the same behavior that will occur
-		when <command moreinfo="none">disable spoolss = yes</command>.  </para>
+<samba:parameter name="use client driver"
+                 context="S"
+		 print="1"
+                 xmlns:samba="http://samba.org/common">
+<listitem>
+    <para>This parameter applies only to Windows NT/2000
+    clients.  It has no affect on Windows 95/98/ME clients.  When 
+    serving a printer to Windows NT/2000 clients without first installing
+    a valid printer driver on the Samba host, the client will be required
+    to install a local printer driver.  From this point on, the client
+    will treat the print as a local printer and not a network printer 
+    connection.  This is much the same behavior that will occur
+    when <command moreinfo="none">disable spoolss = yes</command>.
+    </para>
 
-		<para>The differentiating 
-		factor is that under normal circumstances, the NT/2000 client will 
-		attempt to open the network printer using MS-RPC.  The problem is that
-		because the client considers the printer to be local, it will attempt
-		to issue the OpenPrinterEx() call requesting access rights associated 
-		with the logged on user. If the user possesses local administator rights
-		but not root privilegde on the Samba host (often the case), the OpenPrinterEx()
-		call will fail.  The result is that the client will now display an &quot;Access
-		Denied; Unable to connect&quot; message in the printer queue window (even though
-		jobs may successfully be printed).  </para>
+    <para>The differentiating  factor is that under normal
+    circumstances, the NT/2000 client will  attempt to open the network
+    printer using MS-RPC.  The problem is that because the client
+    considers the printer to be local, it will attempt to issue the
+    OpenPrinterEx() call requesting access rights associated  with the
+    logged on user. If the user possesses local administator rights but
+    not root privilegde on the Samba host (often the case), the
+    OpenPrinterEx() call will fail.  The result is that the client will
+    now display an &quot;Access Denied; Unable to connect&quot; message
+    in the printer queue window (even though jobs may successfully be
+    printed).  </para>
 
-		<para>If this parameter is enabled for a printer, then any attempt
-		to open the printer with the PRINTER_ACCESS_ADMINISTER right is mapped
-		to PRINTER_ACCESS_USE instead.  Thus allowing the OpenPrinterEx()
-		call to succeed.  <emphasis>This parameter MUST not be able enabled
-		on a print share which has valid print driver installed on the Samba 
-		server.</emphasis></para>
+    <para>If this parameter is enabled for a printer, then any attempt
+    to open the printer with the PRINTER_ACCESS_ADMINISTER right is mapped
+    to PRINTER_ACCESS_USE instead.  Thus allowing the OpenPrinterEx()
+    call to succeed.  <emphasis>This parameter MUST not be able enabled
+    on a print share which has valid print driver installed on the Samba 
+    server.</emphasis></para>
 
-		<para>See also <link linkend="DISABLESPOOLSS">disable spoolss</link>
-		</para>
+    <para>See also <link linkend="DISABLESPOOLSS">disable spoolss</link></para>
 
-		<para>Default: <command moreinfo="none">use client driver = no</command></para>
-		</listitem>
-		</samba:parameter>
+    <para>Default: <command moreinfo="none">use client driver = no</command></para>
+</listitem>
+</samba:parameter>