Doc updates from John + some minor fixes by me

(This used to be commit 7fc49746dfd8d93066fe6870e3b642a5898aa032)

1 files changed, 60 insertions, 2 deletions

diff --git a/docs/docbook/global.ent b/docs/docbook/global.ent
index 018d29a6a8..659c448ed1 100644
--- a/docs/docbook/global.ent
+++ b/docs/docbook/global.ent
@@ -96,6 +96,66 @@ never removed by the client.
 &stdarg.logfile;
 '>
 
+<!ENTITY stdarg.resolve.order '
+<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>'>
+
 <!ENTITY stdarg.netbios.name '
 <varlistentry>
 <term>-n &lt;primary NetBIOS name&gt;</term>
@@ -109,8 +169,6 @@ line setting will take precedence over settings in
 <manvolnum>5</manvolnum></citerefentry>.</para></listitem>
 </varlistentry>'>
 
-
-
 <!ENTITY stdarg.scope '
 <varlistentry>
 <term>-i &lt;scope&gt;</term>