diff --git a/docs/docbook/global.ent b/docs/docbook/global.ent
index 604dec7e185..46745c27738 100644
--- a/docs/docbook/global.ent
+++ b/docs/docbook/global.ent
@@ -34,11 +34,29 @@
 <!ENTITY stdarg.debuglevel '
 <varlistentry>
 <term>-d|--debug=debuglevel</term>
-<listitem><para>set the debuglevel. Debug level 0 is the lowest
-and 100 being the highest. This should be set to 100 if you are
-planning on submitting a bug report to the Samba team (see
-<filename>BUGS.txt</filename>).
-</para></listitem>
+<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 '
@@ -47,3 +65,24 @@ planning on submitting a bug report to the Samba team (see
 <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>'>
diff --git a/docs/docbook/manpages/nmbd.8.sgml b/docs/docbook/manpages/nmbd.8.sgml
index bd8bf964f14..8564ac79244 100644
--- a/docs/docbook/manpages/nmbd.8.sgml
+++ b/docs/docbook/manpages/nmbd.8.sgml
@@ -318,7 +318,7 @@
 <refsect1>
 	<title>VERSION</title>
 
-	<para>This man page is correct for version 2.2 of 
+	<para>This man page is correct for version 3.0 of 
 	the Samba suite.</para>
 </refsect1>
 
diff --git a/docs/docbook/manpages/pdbedit.8.sgml b/docs/docbook/manpages/pdbedit.8.sgml
index e918870ac16..a3fd7be7b4e 100644
--- a/docs/docbook/manpages/pdbedit.8.sgml
+++ b/docs/docbook/manpages/pdbedit.8.sgml
@@ -161,9 +161,8 @@
 		</varlistentry>
 		
 		
-		
 		<varlistentry>
-		<term>-d drive</term>
+		<term>-D drive</term>
 		<listitem><para>This option can be used while adding or
 		modifing a user account. It will specify the windows drive
 		letter to be used to map the home directory.</para>
@@ -175,7 +174,7 @@
 		
 		
 		<varlistentry>
-		<term>-s script</term>
+		<term>-S script</term>
 		<listitem><para>This option can be used while adding or
 		modifing a user account. It will specify the user's logon
 		script path.</para>
@@ -300,6 +299,10 @@
 		</programlisting></para>
 		</listitem>
 		</varlistentry>
+		
+		&stdarg.debuglevel;
+		&stdarg.help;
+		&stdarg.configfile;
 
 	</variablelist>
 </refsect1>
diff --git a/docs/docbook/manpages/wbinfo.1.sgml b/docs/docbook/manpages/wbinfo.1.sgml
index f1461b07b9c..59cab3fc97c 100644
--- a/docs/docbook/manpages/wbinfo.1.sgml
+++ b/docs/docbook/manpages/wbinfo.1.sgml
@@ -17,8 +17,8 @@
 		<command>wbinfo</command>
 		<arg choice="opt">-u</arg>
 		<arg choice="opt">-g</arg>
-		<arg choice="opt">-h name</arg>
-		<arg choice="opt">-i ip</arg>
+!		<arg choice="opt">-i ip</arg>
+		<arg choice="opt">-N netbios-name</arg>
 		<arg choice="opt">-n name</arg>
 		<arg choice="opt">-s sid</arg>
 		<arg choice="opt">-U uid</arg>
@@ -30,6 +30,7 @@
 		<arg choice="opt">-r user</arg>
 		<arg choice="opt">-a user%password</arg>
 		<arg choice="opt">-A user%password</arg>
+		<arg choice="opt">-p</arg>
 	</cmdsynopsis>
 </refsynopsisdiv>
 
@@ -72,10 +73,9 @@
 		<command>winbindd(8)</command>. </para></listitem>
 		</varlistentry>
 		
-		
 		<varlistentry>
-		<term>-h name</term>
-		<listitem><para>The <parameter>-h</parameter> option 
+		<term>-N name</term>
+		<listitem><para>The <parameter>-N</parameter> option 
 		queries <command>winbindd(8)</command> to query the WINS
 		server for the IP address associated with the NetBIOS name
 		specified by the <parameter>name</parameter> parameter.
@@ -84,8 +84,8 @@
 
 
 		<varlistentry>
-		<term>-i ip</term>
-		<listitem><para>The <parameter>-i</parameter> option 
+		<term>-I ip</term>
+		<listitem><para>The <parameter>-I</parameter> option 
 		queries <command>winbindd(8)</command> to send a node status
 		request to get the NetBIOS name associated with the IP address
 		specified by the <parameter>ip</parameter> parameter.
@@ -210,7 +210,7 @@
 <refsect1>
 	<title>VERSION</title>
 
-	<para>This man page is correct for version 2.2 of 
+	<para>This man page is correct for version 3.0 of 
 	the Samba suite.</para>
 </refsect1>