summaryrefslogtreecommitdiff
path: root/docs/smbdotconf/protocol
diff options
context:
space:
mode:
authorJohn Terpstra <jht@samba.org>2005-11-01 22:33:40 +0000
committerGerald W. Carter <jerry@samba.org>2008-04-23 08:47:10 -0500
commit8920ad1215beab24e1bc1b59805e0d51d9bd1615 (patch)
treeeb5c6ad678878678ffda43d7dc96b92993994f9c /docs/smbdotconf/protocol
parente640a8e7b380ebbf7822f8ddac4dfdccefd221b6 (diff)
downloadsamba-8920ad1215beab24e1bc1b59805e0d51d9bd1615.tar.gz
samba-8920ad1215beab24e1bc1b59805e0d51d9bd1615.tar.bz2
samba-8920ad1215beab24e1bc1b59805e0d51d9bd1615.zip
A slew of fixups that were causing problems for some folk.
(This used to be commit 6b2ea0772cd3ec8cd735acec2cde807d972737c5)
Diffstat (limited to 'docs/smbdotconf/protocol')
-rw-r--r--docs/smbdotconf/protocol/nameresolveorder.xml28
1 files changed, 14 insertions, 14 deletions
diff --git a/docs/smbdotconf/protocol/nameresolveorder.xml b/docs/smbdotconf/protocol/nameresolveorder.xml
index d8bbb39589..9b1ad075b1 100644
--- a/docs/smbdotconf/protocol/nameresolveorder.xml
+++ b/docs/smbdotconf/protocol/nameresolveorder.xml
@@ -16,23 +16,23 @@
<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 <usmbconfoption
- noescape="1" url="lmhosts.5.html">lmhosts(5)</usmbconfoption> for details) then
- any name type matches for lookup.</para>
+ <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 manpage for lmhosts 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 moreinfo="none">/etc/hosts
- </filename>, NIS, or DNS lookups. This method of name resolution
- is operating system depended for instance on IRIX or Solaris this
- may be controlled by the <filename moreinfo="none">/etc/nsswitch.conf</filename>
- file. Note that this method is used only if the NetBIOS name
- type being queried is the 0x20 (server) name type or 0x1c (domain controllers).
- The latter case is only useful for active directory domains and results in a DNS
- query for the SRV RR entry matching _ldap._tcp.domain.</para>
+ <para>
+ <constant>host</constant> : Do a standard host name to IP address resolution, using the system
+ <filename moreinfo="none">/etc/hosts </filename>, NIS, or DNS lookups. This method of name resolution is
+ operating system depended for instance on IRIX or Solaris this may be controlled by the <filename
+ moreinfo="none">/etc/nsswitch.conf</filename> file. Note that this method is used only if the NetBIOS name
+ type being queried is the 0x20 (server) name type or 0x1c (domain controllers). The latter case is only
+ useful for active directory domains and results in a DNS query for the SRV RR entry matching
+ _ldap._tcp.domain.
+ </para>
</listitem>
<listitem>