syncing docs with HEAD

(This used to be commit d8fe70c3b4be548244e9d7b7ea533e64232df001)

1 files changed, 55 insertions, 0 deletions

diff --git a/docs/docbook/global.ent b/docs/docbook/global.ent
index d88c489a4a..46745c2773 100644
--- a/docs/docbook/global.ent
+++ b/docs/docbook/global.ent
@@ -31,3 +31,58 @@
 <!-- Misc -->
 <!ENTITY samba.pub.cvshost 'pserver.samba.org'>
 
+<!ENTITY stdarg.debuglevel '
+<varlistentry>
+<term>-d|--debug=debuglevel</term>
+<listitem>
+<para><replaceable>debuglevel</replaceable> is an integer 
+from 0 to 10.  The default value if this parameter is 
+not specified is zero.</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 <ulink url="smb.conf.5.html#loglevel">log
+level</ulink> parameter in the <ulink url="smb.conf.5.html">
+<filename>smb.conf(5)</filename></ulink> file.</para>
+</listitem>
+</varlistentry>'>
+
+<!ENTITY stdarg.help '
+<varlistentry>
+<term>-h|--help</term>
+<listitem><para>Print a summary of command line options.
+</para></listitem>
+</varlistentry>'>
+
+<!ENTITY stdarg.configfile '
+<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 <ulink url="smb.conf.5.html"><filename>
+smb.conf(5)</filename></ulink> for more information.
+The default configuration file name is determined at 
+compile time.</para></listitem>
+</varlistentry>'>
+
+<!ENTITY stdarg.version '
+<varlistentry>
+<term>-v</term>
+<listitem><para>Prints the version number for 
+<command>smbd</command>.</para></listitem>
+</varlistentry>'>