Instead of saying the "manuf" file is in "/usr/local/etc/manuf", say

it's in the "etc" subdirectory of the installation directory on UNIX and
in the installation directory on Windows, and give the typical pathnames
of both of those directories.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@4014 f5534014-38df-0310-8fa8-9805f1628bb7

2 files changed, 16 insertions, 8 deletions

diff --git a/doc/ethereal.pod.template b/doc/ethereal.pod.template
index a33367ff56..4a6e88d5bf 100644
--- a/doc/ethereal.pod.template
+++ b/doc/ethereal.pod.template
@@ -984,10 +984,14 @@ file:
   c0-00-ff-ff-ff-ff          TR_broadcast
   00.00.00.00.00.00          Zero_broadcast
 
-F</usr/local/etc/manuf> 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.
+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
+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>
diff --git a/doc/tethereal.pod.template b/doc/tethereal.pod.template
index 36bd150fd2..78391d13ad 100644
--- a/doc/tethereal.pod.template
+++ b/doc/tethereal.pod.template
@@ -461,10 +461,14 @@ file:
   c0-00-ff-ff-ff-ff          TR_broadcast
   00.00.00.00.00.00          Zero_broadcast
 
-F</usr/local/etc/manuf> 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.
+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
+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>