-Use '&stdarg.[server|client].debug' instead of '&stdarg.debug';

-Remove the debug section in smbclient manpage (replaced by '&stdarg.client.debug'
-Add '&stdarg.[server|client].debug' where debug section was included with '&popt.common.samba' before the changes in samba.entities

Karolin
(This used to be commit 01fa9b7b217aff816ce9365e122f356f2609daf9)

17 files changed, 18 insertions, 60 deletions

diff --git a/docs/manpages-3/net.8.xml b/docs/manpages-3/net.8.xml
index 0f5019851c..9b7ab69125 100644
--- a/docs/manpages-3/net.8.xml
+++ b/docs/manpages-3/net.8.xml
@@ -122,7 +122,7 @@
 		</para></listitem>
 		</varlistentry>
 
-		&stdarg.debug;
+		&stdarg.server.debug;
 	</variablelist>
 </refsect1>
 
diff --git a/docs/manpages-3/nmbd.8.xml b/docs/manpages-3/nmbd.8.xml
index c7366fcea8..31b63e122e 100644
--- a/docs/manpages-3/nmbd.8.xml
+++ b/docs/manpages-3/nmbd.8.xml
@@ -145,6 +145,7 @@
 	<manvolnum>5</manvolnum></citerefentry> man page for details on the contents of this file.</para></listitem>
 		</varlistentry>
 
+		&stdarg.server.debug;
 		&popt.common.samba;
 		
 		<varlistentry>
diff --git a/docs/manpages-3/nmblookup.1.xml b/docs/manpages-3/nmblookup.1.xml
index 551235b53a..b2f5fc687b 100644
--- a/docs/manpages-3/nmblookup.1.xml
+++ b/docs/manpages-3/nmblookup.1.xml
@@ -130,7 +130,7 @@
 		query a WINS server.</para></listitem>
 		</varlistentry>
 		
-		
+		&stdarg.server.debug;	
 		&popt.common.samba;
 
 		<varlistentry>
diff --git a/docs/manpages-3/ntlm_auth.1.xml b/docs/manpages-3/ntlm_auth.1.xml
index ce46f63900..cf88d2499e 100644
--- a/docs/manpages-3/ntlm_auth.1.xml
+++ b/docs/manpages-3/ntlm_auth.1.xml
@@ -340,6 +340,7 @@
 	    </listitem>
 	</varlistentry>
 
+	  &stdarg.server.debug;
 	  &popt.common.samba;
 	  &stdarg.help;
 	
diff --git a/docs/manpages-3/pdbedit.8.xml b/docs/manpages-3/pdbedit.8.xml
index 51f1d02410..aaa42b064a 100644
--- a/docs/manpages-3/pdbedit.8.xml
+++ b/docs/manpages-3/pdbedit.8.xml
@@ -410,6 +410,7 @@ account policy value for bad lockout attempt is now 3
 		</varlistentry>
 
 		&stdarg.help;
+		&stdarg.server.debug;
 		&popt.common.samba;
 
 	</variablelist>
diff --git a/docs/manpages-3/rpcclient.1.xml b/docs/manpages-3/rpcclient.1.xml
index 1c19878de0..6c396b91b9 100644
--- a/docs/manpages-3/rpcclient.1.xml
+++ b/docs/manpages-3/rpcclient.1.xml
@@ -84,6 +84,7 @@
 		above. </para></listitem>
 		</varlistentry>
 
+		&stdarg.server.debug;
 		&popt.common.samba;
 		&popt.common.credentials;		
 		&popt.common.connection;
diff --git a/docs/manpages-3/smbcacls.1.xml b/docs/manpages-3/smbcacls.1.xml
index e3cefe57d7..6deb9e53ac 100644
--- a/docs/manpages-3/smbcacls.1.xml
+++ b/docs/manpages-3/smbcacls.1.xml
@@ -143,6 +143,7 @@
 		</varlistentry>
 				
 		&stdarg.help;
+		&stdarg.server.debug;
 		&popt.common.samba;
 	</variablelist>
 </refsect1>
diff --git a/docs/manpages-3/smbclient.1.xml b/docs/manpages-3/smbclient.1.xml
index 607d40ce7f..7e4c1a666f 100644
--- a/docs/manpages-3/smbclient.1.xml
+++ b/docs/manpages-3/smbclient.1.xml
@@ -323,58 +323,8 @@
 		</para></listitem>
 		</varlistentry>
 		
-		<varlistentry>
-		<term>-V</term>
-		<listitem><para>Prints the program version number.
-		</para></listitem>
-		</varlistentry>
-
-		<varlistentry>
-		<term>-s &lt;configuration file&gt;</term>
-		<listitem><para>The file specified contains the
-		configuration details required by the server.  The
-		information in this file includes server-specific
-		information such as what printcap file to use, as well
-		as descriptions of all the services that the server is
-		to provide. See &smb.conf; for more information.
-		The default configuration file name is determined at
-		compile time.</para></listitem>
-		</varlistentry>
-	
-		<varlistentry>
-		<term>-d|--debuglevel=level</term>
-		<listitem>
-		<para><replaceable>level</replaceable> is an integer
-		from 0 to 10. The default value if this parameter is
-		not specified is 1 for smbclient.</para>
-
-		<para>The higher this value, the more detail will be
-		logged to the log files about the activities of the
-		server. At level 0, only critical errors and serious
-		warnings will be logged. Level 1 is a reasonable level for
-		day-to-day running - it generates a small amount of
-		information about operations carried out.</para>
-
-		<para>Levels above 1 will generate considerable
-		amounts of log data, and should only be used when
-		investigating a problem. Levels above 3 are designed for
-		use only by developers and generate HUGE amounts of log
-		data, most of which is extremely cryptic.</para>
-
-		<para>Note that specifying this parameter here will
-		override the <parameter>log level</parameter> parameter
-		in the &smb.conf; file.</para>
-		</listitem>
-		</varlistentry>
-
-		<varlistentry>
-		<term>-l|--log-basename=logdirectory</term>
-		<listitem><para>Base directory name for log/debug files. The extension
-		<constant>".progname"</constant> will be appended (e.g. log.smbclient,
-		log.smbd, etc...). The log file is never removed by the client.
-		</para></listitem>
-		</varlistentry>
-
+		&stdarg.client.debug;
+		&popt.common.samba;
 		&popt.common.credentials;
 		&popt.common.connection;
 		
diff --git a/docs/manpages-3/smbcquotas.1.xml b/docs/manpages-3/smbcquotas.1.xml
index 9c7cc2f74d..b40e5d6b70 100644
--- a/docs/manpages-3/smbcquotas.1.xml
+++ b/docs/manpages-3/smbcquotas.1.xml
@@ -107,6 +107,7 @@
 		</varlistentry>
 				
 		&stdarg.help;
+		&stdarg.server.debug;
 		&popt.common.samba;
 		&popt.common.credentials;
 	</variablelist>
diff --git a/docs/manpages-3/smbd.8.xml b/docs/manpages-3/smbd.8.xml
index 302905b670..999cd5a6db 100644
--- a/docs/manpages-3/smbd.8.xml
+++ b/docs/manpages-3/smbd.8.xml
@@ -124,6 +124,7 @@
 		</para></listitem>
 		</varlistentry>
 		
+		&stdarg.server.debug;
 		&popt.common.samba;
 		&stdarg.help;
 
diff --git a/docs/manpages-3/smbsh.1.xml b/docs/manpages-3/smbsh.1.xml
index 48655b0ab1..73f2e7141b 100644
--- a/docs/manpages-3/smbsh.1.xml
+++ b/docs/manpages-3/smbsh.1.xml
@@ -72,7 +72,7 @@
 	    </varlistentry>
 
 		&stdarg.configfile;
-		&stdarg.debug;
+		&stdarg.server.debug;
 		&stdarg.resolve.order;
 
 	    <varlistentry>
diff --git a/docs/manpages-3/smbstatus.1.xml b/docs/manpages-3/smbstatus.1.xml
index a0f4efb145..6e425897ef 100644
--- a/docs/manpages-3/smbstatus.1.xml
+++ b/docs/manpages-3/smbstatus.1.xml
@@ -55,8 +55,9 @@
 		<listitem><para>gives brief output.</para></listitem>
 		</varlistentry>
 
+		&stdarg.server.debug;
 		&popt.common.samba;
-
+	
 		<varlistentry>
 		<term>-v|--verbose</term>
 		<listitem><para>gives verbose output.</para></listitem>
diff --git a/docs/manpages-3/smbtree.1.xml b/docs/manpages-3/smbtree.1.xml
index e493ef25d5..1d4d651fbd 100644
--- a/docs/manpages-3/smbtree.1.xml
+++ b/docs/manpages-3/smbtree.1.xml
@@ -64,6 +64,7 @@
 		</para></listitem>
 		</varlistentry>
 
+		&stdarg.server.debug;
 		&popt.common.samba;
 		&popt.common.credentials;
 		&stdarg.help;
diff --git a/docs/manpages-3/swat.8.xml b/docs/manpages-3/swat.8.xml
index 3ff305dc62..75babe7174 100644
--- a/docs/manpages-3/swat.8.xml
+++ b/docs/manpages-3/swat.8.xml
@@ -77,6 +77,7 @@
         buttons.</para></listitem>
 		</varlistentry>
 
+		&stdarg.server.debug;
 		&popt.common.samba;
 		&stdarg.help;
 
diff --git a/docs/manpages-3/vfstest.1.xml b/docs/manpages-3/vfstest.1.xml
index 30ff7b2b65..72cac4452e 100644
--- a/docs/manpages-3/vfstest.1.xml
+++ b/docs/manpages-3/vfstest.1.xml
@@ -59,6 +59,7 @@
 		</para></listitem>
 		</varlistentry>
 
+		&stdarg.server.debug;
 		&popt.common.samba;
 
 	</variablelist>
diff --git a/docs/manpages-3/winbindd.8.xml b/docs/manpages-3/winbindd.8.xml
index 3efeece93b..0fc0e8147f 100644
--- a/docs/manpages-3/winbindd.8.xml
+++ b/docs/manpages-3/winbindd.8.xml
@@ -160,6 +160,7 @@ hosts:		files wins
 		than a file.</para></listitem>
 		</varlistentry>
 
+		&stdarg.server.debug;
 		&popt.common.samba;
 		&stdarg.help;
 
diff --git a/docs/xslt/man.xsl b/docs/xslt/man.xsl
index c810e2295b..5232d2ead2 100644
--- a/docs/xslt/man.xsl
+++ b/docs/xslt/man.xsl
@@ -175,10 +175,6 @@
   <xsl:apply-templates/>
   <xsl:if test="following-sibling::listitem">
     <xsl:text>.TP</xsl:text> 
-    <xsl:if test="not($list-indent = '')">
-      <xsl:text> </xsl:text>
-      <xsl:value-of select="$list-indent"/>
-    </xsl:if>
     <xsl:text>&#10;</xsl:text>
   </xsl:if>
 </xsl:template>