From 841a0c56d40d48c6a2d009a3aa6cb472fb41d2ad Mon Sep 17 00:00:00 2001 From: Gerald Combs Date: Sun, 26 Nov 2000 19:35:31 +0000 Subject: [PATCH] Credit Michael Patton and the IEEE in the document header. Add URLs to the IEEE data (Michael's was already there). svn path=/trunk/; revision=2701 --- manuf | 19 +++++++++++++++++-- manuf.tmpl | 19 +++++++++++++++++-- 2 files changed, 34 insertions(+), 4 deletions(-) diff --git a/manuf b/manuf index 16054fdc5c..b24b413264 100644 --- a/manuf +++ b/manuf @@ -1,7 +1,7 @@ # # /etc/manuf - Ethernet vendor codes # -# $Id: manuf,v 1.10 2000/11/23 18:22:00 gerald Exp $ +# $Id: manuf,v 1.11 2000/11/26 19:35:31 gerald Exp $ # # Laurent Deniel # @@ -24,10 +24,25 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # # -# This is a subset of the list mantained by Michael Patton available from: +# +# The data below has been assembled from the following sources: +# +# The IEEE public OUI listing available from: +# http://standards.ieee.org/regauth/oui/index.shtml +# http://standards.ieee.org/regauth/oui/oui.txt +# +# Michael Patton's "Ethernet Codes Master Page" available from: # # # +# The Ethereal 'manuf' file, which started out as a subset of Michael +# Patton's list and grew from there. +# +# 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. # diff --git a/manuf.tmpl b/manuf.tmpl index 63c87072be..0ace1f9ce6 100644 --- a/manuf.tmpl +++ b/manuf.tmpl @@ -1,7 +1,7 @@ # # /etc/manuf - Ethernet vendor codes # -# $Id: manuf.tmpl,v 1.1 2000/11/23 18:22:00 gerald Exp $ +# $Id: manuf.tmpl,v 1.2 2000/11/26 19:35:31 gerald Exp $ # # Laurent Deniel # @@ -24,10 +24,25 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # # -# This is a subset of the list mantained by Michael Patton available from: +# +# The data below has been assembled from the following sources: +# +# The IEEE public OUI listing available from: +# http://standards.ieee.org/regauth/oui/index.shtml +# http://standards.ieee.org/regauth/oui/oui.txt +# +# Michael Patton's "Ethernet Codes Master Page" available from: # # # +# The Ethereal 'manuf' file, which started out as a subset of Michael +# Patton's list and grew from there. +# +# 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. #