Allow the "manuf" file to contain well-known MAC addresses and address

[obnox/wireshark/wip.git] / manuf.tmpl

diff --git a/manuf.tmpl b/manuf.tmpl
index a22664d0d8ec6b916207952f6bfe0c06cabb76da..0ef96d19720cd25bf7e0ad12dcb854264961afbd 100644 (file)
--- a/manuf.tmpl
+++ b/manuf.tmpl
@@ -1,7 +1,7 @@
 # 
-# /etc/manuf - Ethernet vendor codes 
+# /etc/manuf - Ethernet vendor codes, and well-known MAC addresses
 #
-# $Id: manuf.tmpl,v 1.6 2002/08/03 00:50:22 jmayer Exp $
+# $Id: manuf.tmpl,v 1.7 2002/09/09 19:38:09 guy Exp $
 #
 # Laurent Deniel <deniel@worldnet.fr>
 #
@@ -39,10 +39,12 @@
 # In the event of data set collisions the Ethereal entries have been given
 # precedence, followed by Michael Patton's, followed by the IEEE.
 #
-#
-#
 # This file is in the same format as ethers(4) except that vendor names
-# are truncated to eight characters when used with Ethereal.
+# are truncated to eight characters when used with Ethereal, and
+# that well-known MAC addresses need not have a full 6 octets and may
+# have a netmask following them specifying how many bits of the address
+# are relevant (the other bits are wildcards).  Also, either ":", "-",
+# or "." can be used to separate the octets.
 #
 
 00:00:00       00:00:00        # Officially Xerox, but 0:0:0:0:0:0 is more common