add hosts file and some more name resolution info

svn path=/trunk/; revision=13027

2 files changed, 66 insertions, 16 deletions

diff --git a/docbook/eug_src/EUG_app_files.xml b/docbook/eug_src/EUG_app_files.xml
index 946e923506..04440298a7 100644
--- a/docbook/eug_src/EUG_app_files.xml
+++ b/docbook/eug_src/EUG_app_files.xml
@@ -84,6 +84,12 @@
 		<entry>%ETHEREAL%\manuf</entry>
 	      </row>
 	      <row>
+		<entry><command>hosts</command></entry>
+		<entry>IPv4 and IPv6 name resolution.</entry>
+		<entry>$HOME/.ethereal/hosts</entry>
+		<entry>%APPDATA%\hosts</entry>
+	      </row>
+	      <row>
 		<entry><command>ipxnets</command></entry>
 		<entry>IPX name resolution.</entry>
 		<entry>$HOME/.ethereal/ipxnets</entry>
@@ -252,6 +258,35 @@ c0-00-ff-ff-ff-ff    TR_broadcast
 		  manufacturers name.  This file has the same format as the ethers 
 		  file, except addresses are three bytes long.
 	    </para>
+	    <para>
+	      An example is:
+	      <programlisting>
+00:00:01	Xerox                  # XEROX CORPORATION
+	      </programlisting>
+	    </para>
+		<para>
+ 		The settings from this file are read in at program start and never 
+		written by Ethereal.
+		</para>
+	  </listitem>
+	</varlistentry>
+	<varlistentry>
+	  <term><command>hosts</command></term>
+	  <listitem>
+	    <para>
+	      Ethereal uses the files listed in <xref linkend="AppFilesTabFolders"/>
+		  to translate IPv4 and IPv6 addresses into names.
+	    </para>
+	    <para>
+		  This file has the same format as the usual /etc/hosts file in unix systems.
+	    </para>
+	    <para>
+	      An example is:
+	      <programlisting>
+# Comments must be prepended by the # sign!
+192.168.0.1 homeserver
+	      </programlisting>
+	    </para>
 		<para>
  		The settings from this file are read in at program start and never 
 		written by Ethereal.
diff --git a/docbook/eug_src/EUG_chapter_advanced.xml b/docbook/eug_src/EUG_chapter_advanced.xml
index d6ce346a0b..40b2c5705f 100644
--- a/docbook/eug_src/EUG_chapter_advanced.xml
+++ b/docbook/eug_src/EUG_chapter_advanced.xml
@@ -190,10 +190,9 @@
 	Name resolution tries to resolve some of the address values to human 
 	readable names. This conversion might fail. For example, the name might be 
 	unknown. Some of the lookups are done with data from your local 
-	machine, while others asking network services such as DNS.
-    </para>
-    <para>
-	XXX - add ipxnets name resolution explanation.
+	machine, while others asking network services such as DNS. For details about
+	the configuration files Ethereal uses for name resolution, see 
+	<xref linkend="AppFiles"/>.
     </para>
     <note><title>Note!</title>
     <para>
@@ -213,19 +212,26 @@
 	following protocol layers:
     </para>
 	<section><title>MAC Layer</title>
-    <para><command>ARP name resolution</command>
-	Convert an ethernet address to the corresponding IP address 
-	(e.g. 00:09:5b:01:02:03 -> 192.168.0.1). 
+    <para><command>ARP name resolution (system service)</command>
+	Ethereal will ask the operating system to convert an ethernet address 
+	to the corresponding IP address (e.g. 00:09:5b:01:02:03 -> 192.168.0.1). 
+    </para>
+    <para><command>Ethernet codes (ethers file)</command>
+	If the ARP name resolution failed, Ethereal tries to convert the ethernet 
+	address to a known device name, which has been assigned by the user using 
+	an ethers file (e.g. 00:09:5b:01:02:03 -> homerouter).
     </para>
-    <para><command>Ethernet manufacturer codes</command>
-	If the ARP name resolution failed, Ethereal tries to convert the first 3 
-	bytes of an ethernet address to an abbreviated manufacturer name, which 
-	has been assigned by the IETF (e.g. 00:09:5b:01:02:03 -> Netgear_01:02:03).
+    <para><command>Ethernet manufacturer codes (manuf file)</command>
+	If both ARP and ethers didn't returned a result, Ethereal tries to convert 
+	the first 3 bytes of an ethernet address to an abbreviated manufacturer name, 
+	which has been assigned by the IETF 
+	(e.g. 00:09:5b:01:02:03 -> Netgear_01:02:03).
     </para>
 	</section>
 	<section><title>Network Layer</title>
-    <para><command>DNS name resolution</command>
-	Convert an IP address to the hostname associated with it 
+    <para><command>DNS name resolution (system/ADNS service)</command>
+	Ethereal will ask the operating system (or the ADNS library, see below), 
+	to convert an IP address to the hostname associated with it 
 	(e.g. 65.208.228.223 -> www.ethereal.com).
     </para>
 	<warning>
@@ -237,10 +243,19 @@
 		case.
 	  </para>
 	</warning>	
+    <para><command>IP name resolution (hosts file)</command>
+	If DNS name resolution failed, Ethereal will try to convert an IP address 
+	to the hostname associated with it, using an hosts file provided by the user
+	(e.g. 65.208.228.223 -> www.ethereal.com).
+    </para>
+    <para><command>ipxnet name resolution (ipxnets file)</command>
+	XXX - add ipxnets name resolution explanation.
+    </para>
 	</section>
-	<section><title>Transport Layer</title>
-    <para><command>TCP/UDP port conversion</command>
-	Convert a TCP or UDP port to its well known name (e.g. 80 -> http).
+	<section><title>Transport Layer (system service)</title>
+    <para><command>TCP/UDP port conversion (system service)</command>
+	Ethereal will ask the operating system to convert a TCP or UDP port to 
+	its well known name (e.g. 80 -> http).
     </para>
 	</section>
 	<section><title>ADNS</title>