On Windows, get the "ethers" and "ipxnets" file from the directory in

which the Ethereal binary is found; there's no notion of "/etc" or of
"/etc/ethers" or "/etc/ipxnets" files on Windows.

Update the documentation to reflect that, and fix a typo in the Ethereal
and Tethereal man pages.

svn path=/trunk/; revision=4055

2 files changed, 70 insertions, 52 deletions

diff --git a/doc/ethereal.pod.template b/doc/ethereal.pod.template
index ac390979fd..870383648c 100644
--- a/doc/ethereal.pod.template
+++ b/doc/ethereal.pod.template
@@ -953,15 +953,19 @@ type of the field is also given.
 
 =head1 FILES
 
-F</usr/local/etc/ethereal.conf> and F<$HOME/.ethereal/preferences>
-contain system-wide and personal preference settings, respectively.  The
-file contains preference settings of the form I<prefname>B<:>I<value>,
-one per line, where I<prefname> is the name of the preference (which is
-the same name that would appear in the preference file), and I<value> is
-the value to which it should be set; white space is allowed between B<:>
-and I<value>.  A preference setting can be continued on subsequent lines
-by indenting the continuation lines with white space.  A B<#> character
-starts a comment that runs to the end of the line.
+The F<ethereal.conf> file, which is installed in the F<etc> directory
+under the main installation directory (for example, F</usr/local/etc>)
+on UNIX-compatible systems, and in the main installation directory (for
+example, F<C:\Program Files\Ethereal>) on Windows systems, and
+F<$HOME/.ethereal/preferences>, contain system-wide and personal
+preference settings, respectively.  The file contains preference
+settings of the form I<prefname>B<:>I<value>, one per line, where
+I<prefname> is the name of the preference (which is the same name that
+would appear in the preference file), and I<value> is the value to which
+it should be set; white space is allowed between B<:> and I<value>.  A
+preference setting can be continued on subsequent lines by indenting the
+continuation lines with white space.  A B<#> character starts a comment
+that runs to the end of the line. 
 
 The system-wide preference file is read first, if it exists, overriding
 B<Ethereal>'s default values; the personal preferences file is then
@@ -973,13 +977,15 @@ in the I<Edit:Preferences> dialog box, F<$HOME/.ethereal/preferences>
 will be overwritten with the new settings, destroying any comments that
 were in the file.
 
-F</etc/ethers> is consulted to correlate 6-byte hardware addresses to
-names.  If an address is not found in F</etc/ethers>, the
-F<$HOME/.ethereal/ethers> file is consulted next.  Each line contains
-one hardware address and name, separated by whitespace.  The digits of
-the hardware address are separated by either a colon (:), a dash (-), or
-a period (.).  The following three lines are valid lines of an ethers
-file:
+The F<ethers> file, which is found in the F</etc> directory on
+UNIX-compatible systems, and in the main installation directory (for
+example, F<C:\Program Files\Ethereal>) on Windows systems, is consulted
+to correlate 6-byte hardware addresses to names.  If an address is not
+found in the F<ethers> file, the F<$HOME/.ethereal/ethers> file is
+consulted next.  Each line contains one hardware address and name,
+separated by whitespace.  The digits of the hardware address are
+separated by either a colon (:), a dash (-), or a period (.).  The
+following three lines are valid lines of an ethers file:
 
   ff:ff:ff:ff:ff:ff          Broadcast
   c0-00-ff-ff-ff-ff          TR_broadcast
@@ -988,18 +994,21 @@ file:
 The F<manuf> file, which is installed in the F<etc> directory under the
 main installation directory (for example, F</usr/local/etc>) on
 UNIX-compatible systems, and in the main installation directory (for
-example, F<C:\Program Files\Ethereal> on Windows systems, matches the
+example, F<C:\Program Files\Ethereal>) on Windows systems, matches the
 3-byte vendor portion of a 6-byte hardware address with the
 manufacturer's name.  The format of the file is the same as the
-F</etc/ethers> file, except that each address is three bytes instead of
-six.
-
-F</etc/ipxnets> and F<$HOME/.ethereal/ipxnets> correlate 4-byte IPX
-network numbers to names.  The format is the same as the F</etc/ethers>
-file, except that each address if four bytes instead of six. 
-Additionally, the address can be represented a single hexadecimal
-number, as is more common in the IPX world, rather than four hex octets. 
-For example, these four lines are valid lines of an ipxnets file.
+F<ethers> file, except that each address is three bytes instead of six.
+
+The F<ipxnets> file, which is found in the F</etc> directory on
+UNIX-compatible systems, and in the main installation directory (for
+example, F<C:\Program Files\Ethereal>) on Windows systems, correlates
+4-byte IPX network numbers to names.  If a network number is not found
+in the F<ipxnets> file, the F<$HOME/.ethereal/ipxnets> file is consulted
+next.  The format is the same as the F<ethers> file, except that each
+address if four bytes instead of six.  Additionally, the address can be
+represented a single hexadecimal number, as is more common in the IPX
+world, rather than four hex octets.  For example, these four lines are
+valid lines of an ipxnets file.
 
   C0.A8.2C.00              HR
   c0-a8-1c-00              CEO
diff --git a/doc/tethereal.pod.template b/doc/tethereal.pod.template
index a7bd2699c9..d1cb33a1f1 100644
--- a/doc/tethereal.pod.template
+++ b/doc/tethereal.pod.template
@@ -437,28 +437,34 @@ type of the field is also given.
 
 =head1 FILES
 
-F</usr/local/etc/ethereal.conf> and F<$HOME/.ethereal/preferences>
-contain system-wide and personal preference settings, respectively.  The
-file contains preference settings of the form I<prefname>B<:>I<value>,
-one per line, where I<prefname> is the name of the preference (which is
-the same name that would appear in the preference file), and I<value> is
-the value to which it should be set; white space is allowed between B<:>
-and I<value>.  A preference setting can be continued on subsequent lines
-by indenting the continuation lines with white space.  A B<#> character
-starts a comment that runs to the end of the line.
+The F<ethereal.conf> file, which is installed in the F<etc> directory
+under the main installation directory (for example, F</usr/local/etc>)
+on UNIX-compatible systems, and in the main installation directory (for
+example, F<C:\Program Files\Ethereal>) on Windows systems, and
+F<$HOME/.ethereal/preferences>, contain system-wide and personal
+preference settings, respectively.  The file contains preference
+settings of the form I<prefname>B<:>I<value>, one per line, where
+I<prefname> is the name of the preference (which is the same name that
+would appear in the preference file), and I<value> is the value to which
+it should be set; white space is allowed between B<:> and I<value>.  A
+preference setting can be continued on subsequent lines by indenting the
+continuation lines with white space.  A B<#> character starts a comment
+that runs to the end of the line.
 
 The system-wide preference file is read first, if it exists, overriding
 B<Tethereal>'s default values; the personal preferences file is then
 read, if it exists, overriding default values and values read from the
 system-wide preference file.
 
-F</etc/ethers> is consulted to correlate 6-byte hardware addresses to
-names.  If an address is not found in F</etc/ethers>, the
-F<$HOME/.ethereal/ethers> file is consulted next.  Each line contains
-one hardware address and name, separated by whitespace.  The digits of
-the hardware address are separated by either a colon (:), a dash (-), or
-a period (.).  The following three lines are valid lines of an ethers
-file:
+The F<ethers> file, which is found in the F</etc> directory on
+UNIX-compatible systems, and in the main installation directory (for
+example, F<C:\Program Files\Ethereal>) on Windows systems, is consulted
+to correlate 6-byte hardware addresses to names.  If an address is not
+found in the F<ethers> file, the F<$HOME/.ethereal/ethers> file is
+consulted next.  Each line contains one hardware address and name,
+separated by whitespace.  The digits of the hardware address are
+separated by either a colon (:), a dash (-), or a period (.).  The
+following three lines are valid lines of an ethers file:
 
   ff:ff:ff:ff:ff:ff          Broadcast
   c0-00-ff-ff-ff-ff          TR_broadcast
@@ -467,18 +473,21 @@ file:
 The F<manuf> file, which is installed in the F<etc> directory under the
 main installation directory (for example, F</usr/local/etc>) on
 UNIX-compatible systems, and in the main installation directory (for
-example, F<C:\Program Files\Ethereal> on Windows systems, matches the
+example, F<C:\Program Files\Ethereal>) on Windows systems, matches the
 3-byte vendor portion of a 6-byte hardware address with the
 manufacturer's name.  The format of the file is the same as the
-F</etc/ethers> file, except that each address is three bytes instead of
-six.
-
-F</etc/ipxnets> and F<$HOME/.ethereal/ipxnets> correlate 4-byte IPX
-network numbers to names.  The format is the same as the F</etc/ethers>
-file, except that each address if four bytes instead of six. 
-Additionally, the address can be represented a single hexadecimal
-number, as is more common in the IPX world, rather than four hex octets. 
-For example, these four lines are valid lines of an ipxnets file.
+F<ethers> file, except that each address is three bytes instead of six.
+
+The F<ipxnets> file, which is found in the F</etc> directory on
+UNIX-compatible systems, and in the main installation directory (for
+example, F<C:\Program Files\Ethereal>) on Windows systems, correlates
+4-byte IPX network numbers to names.  If a network number is not found
+in the F<ipxnets> file, the F<$HOME/.ethereal/ipxnets> file is consulted
+next.  The format is the same as the F<ethers> file, except that each
+address if four bytes instead of six.  Additionally, the address can be
+represented a single hexadecimal number, as is more common in the IPX
+world, rather than four hex octets.  For example, these four lines are
+valid lines of an ipxnets file.
 
   C0.A8.2C.00              HR
   c0-a8-1c-00              CEO