summaryrefslogtreecommitdiff
path: root/docs/Samba-HOWTO-Collection
diff options
context:
space:
mode:
authorJohn Terpstra <jht@samba.org>2004-09-19 15:22:44 +0000
committerGerald W. Carter <jerry@samba.org>2008-04-23 08:46:02 -0500
commit7be7483cc6d39b939e2e1bb7a4d084877d5cad34 (patch)
tree21d3fec40a2b28ff36cfcaf193f07d15aaeea691 /docs/Samba-HOWTO-Collection
parent40b94496e60c07d104cbb5741b7bb3c4bde98e61 (diff)
downloadsamba-7be7483cc6d39b939e2e1bb7a4d084877d5cad34.tar.gz
samba-7be7483cc6d39b939e2e1bb7a4d084877d5cad34.tar.bz2
samba-7be7483cc6d39b939e2e1bb7a4d084877d5cad34.zip
Relocate name lookup info to correct section.
(This used to be commit 30e1204c31c45b6a8c7e30bc62d619a520d17f02)
Diffstat (limited to 'docs/Samba-HOWTO-Collection')
-rw-r--r--docs/Samba-HOWTO-Collection/NetworkBrowsing.xml35
1 files changed, 17 insertions, 18 deletions
diff --git a/docs/Samba-HOWTO-Collection/NetworkBrowsing.xml b/docs/Samba-HOWTO-Collection/NetworkBrowsing.xml
index ceee0becd9..43965513be 100644
--- a/docs/Samba-HOWTO-Collection/NetworkBrowsing.xml
+++ b/docs/Samba-HOWTO-Collection/NetworkBrowsing.xml
@@ -219,22 +219,6 @@ that it will take time to establish a browse list and it can take up to 45
minutes to stabilize, particularly across network segments.
</para>
-</sect2>
-
-<sect2>
-<title>TCP/IP without NetBIOS</title>
-
-<para>
-<indexterm><primary>NetBIOS</primary></indexterm>
-<indexterm><primary>NetBIOS-less</primary></indexterm>
-<indexterm><primary>DNS</primary></indexterm>
-All TCP/IP-enabled systems use various forms of host name resolution. The primary
-methods for TCP/IP hostname resolution involve either a static file (<filename>/etc/hosts</filename>)
-or the Domain Name System (DNS). DNS is the technology that makes
-the Internet usable. DNS-based host name resolution is supported by nearly all
-TCP/IP-enabled systems. Only a few embedded TCP/IP systems do not support DNS.
-</para>
-
<para>
When an MS Windows 200x/XP system attempts to resolve a host name to an IP address
it follows a defined path:
@@ -243,7 +227,7 @@ it follows a defined path:
<orderedlist>
<listitem><para>
Checks the <filename>hosts</filename> file. It is located in
- <filename>C:\Windows NT\System32\Drivers\etc</filename>.
+ <filename>%SystemRoot%\System32\Drivers\etc</filename>.
</para></listitem>
<listitem><para>
@@ -264,10 +248,25 @@ it follows a defined path:
<listitem><para>
Looks up entries in LMHOSTS, located in
- <filename>C:\Windows NT\System32\Drivers\etc</filename>.
+ <filename>%SystemRoot%\System32\Drivers\etc</filename>.
</para></listitem>
</orderedlist>
+</sect2>
+
+<sect2>
+<title>TCP/IP without NetBIOS</title>
+
+<para>
+<indexterm><primary>NetBIOS</primary></indexterm>
+<indexterm><primary>NetBIOS-less</primary></indexterm>
+<indexterm><primary>DNS</primary></indexterm>
+All TCP/IP-enabled systems use various forms of host name resolution. The primary
+methods for TCP/IP hostname resolution involve either a static file (<filename>/etc/hosts</filename>)
+or the Domain Name System (DNS). DNS is the technology that makes
+the Internet usable. DNS-based host name resolution is supported by nearly all
+TCP/IP-enabled systems. Only a few embedded TCP/IP systems do not support DNS.
+</para>
<para>
<indexterm><primary>DNS</primary></indexterm>