Doc updates from John + some minor fixes by me

(This used to be commit 7fc49746dfd8d93066fe6870e3b642a5898aa032)

1 files changed, 2 insertions, 81 deletions

diff --git a/docs/docbook/manpages/smbsh.1.sgml b/docs/docbook/manpages/smbsh.1.sgml
index af080c298c..5a53c53be3 100644
--- a/docs/docbook/manpages/smbsh.1.sgml
+++ b/docs/docbook/manpages/smbsh.1.sgml
@@ -70,87 +70,8 @@
 		</para></listitem>
 	    </varlistentry>
 
-	    <varlistentry>
-		<term>-R &lt;name resolve order&gt;</term> 
-		<listitem><para>This option is used to determine what naming 
-		services and in what order to resolve 
-		host names to IP addresses. The option takes a space-separated 
-		string of different name resolution options.</para>
-
-		<para>The options are: "lmhosts", "host", "wins" and "bcast". 
-		They cause names to be resolved as follows :</para>
-
-		<itemizedlist>
-			<listitem><para><constant>lmhosts</constant>: 
-			Lookup an IP address in the Samba lmhosts file. If the 
-			line in lmhosts has no name type attached to the 
-			NetBIOS name 
-			(see the <citerefentry><refentrytitle>lmhosts</refentrytitle>
-			<manvolnum>5</manvolnum></citerefentry>	for details) 
-			then any name type matches for lookup.
-			</para></listitem>
-
-			<listitem><para><constant>host</constant>: 
-			Do a standard host name to IP address resolution, using
-			the system <filename>/etc/hosts</filename>, NIS, or DNS
-			lookups. This method of name resolution is operating 
-			system dependent, for instance on IRIX or Solaris this 
-			may be controlled by the <filename>/etc/nsswitch.conf
-			</filename> file).  Note that this method is only used 
-			if the NetBIOS name type being queried is the 0x20 
-			(server) name type, otherwise it is ignored.
-			</para></listitem>
-
-			<listitem><para><constant>wins</constant>: 
-			Query a name with the IP address listed in the 
-			<parameter>wins server</parameter> parameter.  If no 
-			WINS server has been specified this method will be 
-			ignored.
-			</para></listitem>
-
-			<listitem><para><constant>bcast</constant>: 
-			Do a broadcast on each of the known local interfaces 
-			listed in the <parameter>interfaces</parameter>
-			parameter. This is the least reliable of the name 
-			resolution methods as it depends on the target host 
-			being on a locally connected subnet.
-			</para></listitem>
-		</itemizedlist>
-
-		<para>If this parameter is not set then the name resolve order 
-		defined in the <citerefentry><refentrytitle>smb.conf</refentrytitle>
-		<manvolnum>5</manvolnum></citerefentry> file parameter  
-		(<parameter>name resolve order</parameter>) will be used. </para>
-
-		<para>The default order is lmhosts, host, wins, bcast. Without 
-		this parameter or any entry in the <parameter>name resolve order
-		</parameter> parameter of the <citerefentry><refentrytitle>smb.conf</refentrytitle>
-		<manvolnum>5</manvolnum></citerefentry> file, the name resolution methods 
-		will be attempted in this order. </para></listitem>
-	    </varlistentry>
-
-	    <varlistentry>
-		<term>-d &lt;debug level&gt;</term>
-		<listitem><para>debug level is an integer from 0 to 10.</para>
-
-		<para>The default value if this parameter is not specified
-		is zero.</para>
-
-		<para>The higher this value, the more detail will be logged
-		about the activities of <citerefentry><refentrytitle>nmblookup</refentrytitle>
-		<manvolnum>1</manvolnum></citerefentry>. At level
-		0, only critical errors and serious warnings will be logged.
-		</para></listitem>
-	    </varlistentry>
-
-	    <varlistentry>
-		<term>-l logfilename</term>
-		<listitem><para>If specified causes all debug messages to be
-		written to the file specified by <replaceable>logfilename
-		</replaceable>. If not specified then all messages will be 
-		written to<replaceable>stderr</replaceable>.
-		</para></listitem>
-	    </varlistentry>
+		&popt.common.samba;
+		&stdarg.resolve.order;
 
 	    <varlistentry>
 		<term>-L libdir</term>