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

[obnox/wireshark/wip.git] / doc / ethereal.pod.template

diff --git a/doc/ethereal.pod.template b/doc/ethereal.pod.template
index 6c59475848e46f9c8c536985174d6e8ca36f9161..4a6e88d5bf81cc8e1110d526740b81b03175d2c2 100644 (file)
--- 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>
@@ -1152,6 +1156,15 @@ B<http://www.ethereal.com>.
   Lee Berger               <lberger[AT]roy.org>
   Motonori Shindo          <mshindo[AT]mshindo.net>
   Terje Krogdahl           <tekr[AT]nextra.com>
+  Jean-Francois Mule       <jfmule[AT]clarent.com>
+  Thomas Wittwer           <thomas.wittwer[AT]iclip.ch>
+  Palle Lyckegaard         <Palle[AT]lyckegaard.dk>
+  Nicolas Balkota          <balkota[AT]mac.com>
+  Tom Uijldert             <Tom.Uijldert[AT]cmg.nl>
+  Endoh Akira              <endoh[AT]netmarks.co.jp>
+  Graeme Hewson            <graeme.hewson[AT]oracle.com>
+  Pasi Eronen              <pasi.eronen[at]nixu.com>
+  Georg von Zezschwitz     <gvz[AT]2scale.net>
 
 Alain Magloire <alainm[AT]rcsm.ece.mcgill.ca> was kind enough to give his
 permission to use his version of snprintf.c.