-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

diff --git a/docs/manpages-3/net.8.xml b/docs/manpages-3/net.8.xml
index 0f5019851ca7001af6ae66936c78cd77846956f7..9b7ab691256e57e71a1e39e1fad2556d76e5381a 100644 (file)
--- 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 c7366fcea84dca21adb31b5581180f0d6c6834d0..31b63e122ecea3dff3f8796d148ee0957ff2c2e6 100644 (file)
--- 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 551235b53aa7ed42cc9fcb63b3a17895bbc57b30..b2f5fc687bd3dc2777cb41bd4a9b1bc1db825b33 100644 (file)
--- 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 ce46f639005c6041039dd0c31f36dd6356c32334..cf88d2499e75d4499cff0592180627e9185d0911 100644 (file)
--- 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 51f1d0241046afb8f0d06caa7c91499f5257608d..aaa42b064a19153b3244a72b3e01c56ab9b8fbad 100644 (file)
--- 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 1c19878de044d267c4cb54e2971ef7749b8be6b4..6c396b91b99e879017e31134e415305f5578bda1 100644 (file)
--- 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 e3cefe57d791b4a484bebcc742c009df59ca3146..6deb9e53accf100a52927987a936df0b1a8719fb 100644 (file)
--- 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 607d40ce7f69a5b540bbf835ee47422f2def0c8f..7e4c1a666fe0d8c969d36850e2f1839bd4d6b4ea 100644 (file)
--- 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 9c7cc2f74d6cb50acd62a96b009221ae5fe480d0..b40e5d6b70a28954b1a5a6ccfed0a1c2576165af 100644 (file)
--- 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 302905b6701ec07ba1ffcb42790895921ff002a5..999cd5a6dbc3f47697bc3d3b7111933ba27e6dc7 100644 (file)
--- 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 48655b0ab1fe64e89425ce13bbd9202e13d88e9d..73f2e7141b63c09103b6df67089721fe289894ee 100644 (file)
--- 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 a0f4efb145a7121b4cd4580d4e7fe3f40ed98777..6e425897eff00096b8cc917bd7c19b6f8ca2846a 100644 (file)
--- 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 e493ef25d54bc98f93fbbaad34fc4c821b333f37..1d4d651fbd4fa34d47cdc4e5fe1bdffb1ca8eefb 100644 (file)
--- 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 3ff305dc6213e930f18bda495229ce176d6686cc..75babe717482133aec2203934a05e1d8d87ba527 100644 (file)
--- 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 30ff7b2b651a3d9c2ca0569be8a9ac1293b12929..72cac4452e11275c0f0d9e65b89a454e7c80cf1b 100644 (file)
--- 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 3efeece93bfd637294a99314888f81f22821240a..0fc0e8147fef45dd644b734cb25b37ad8c74d586 100644 (file)
--- 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 c810e2295bddfc07413c3ff4ece774379cd0d55c..5232d2ead22b9b8dba5703a74956d8d3a6d1387d 100644 (file)
--- 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>