From owner-svn-src-head@FreeBSD.ORG  Wed Jan  4 21:04:57 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id CCA1A106566B;
	Wed,  4 Jan 2012 21:04:57 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id BB9BF8FC1B;
	Wed,  4 Jan 2012 21:04:57 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q04L4vc6096190;
	Wed, 4 Jan 2012 21:04:57 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q04L4vSG096187;
	Wed, 4 Jan 2012 21:04:57 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <201201042104.q04L4vSG096187@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Wed, 4 Jan 2012 21:04:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r229518 - head/sbin/ifconfig
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 04 Jan 2012 21:04:57 -0000

Author: rwatson
Date: Wed Jan  4 21:04:57 2012
New Revision: 229518
URL: http://svn.freebsd.org/changeset/base/229518

Log:
  Adjust the VLAN section of the ifconfig(8) man page to better reflect
  reality:
  
  1. Only 12-bit VLAN Identifiers, not full 16-bit VLAN tags can be set using
     ifconfig vlan.
  
  2. When we mean VLAN Identifiers, spell it that way, rather than as VLAN tag.
  
  MFC after:	3 days
  Sponsored by:	Adara Networks, Inc.

Modified:
  head/sbin/ifconfig/ifconfig.8

Modified: head/sbin/ifconfig/ifconfig.8
==============================================================================
--- head/sbin/ifconfig/ifconfig.8	Wed Jan  4 20:14:07 2012	(r229517)
+++ head/sbin/ifconfig/ifconfig.8	Wed Jan  4 21:04:57 2012	(r229518)
@@ -28,7 +28,7 @@
 .\"     From: @(#)ifconfig.8	8.3 (Berkeley) 1/5/94
 .\" $FreeBSD$
 .\"
-.Dd December 17, 2011
+.Dd January 4, 2012
 .Dt IFCONFIG 8
 .Os
 .Sh NAME
@@ -2378,7 +2378,7 @@ interfaces:
 .It Cm vlan Ar vlan_tag
 Set the VLAN tag value to
 .Ar vlan_tag .
-This value is a 16-bit number which is used to create an 802.1Q
+This value is a 12-bit VLAN Identifier (VID) which is used to create an 802.1Q
 VLAN header for packets sent from the
 .Xr vlan 4
 interface.
@@ -2400,7 +2400,7 @@ diverted to the specified physical inter
 .Ar iface
 with 802.1Q VLAN encapsulation.
 Packets with 802.1Q encapsulation received
-by the parent interface with the correct VLAN tag will be diverted to
+by the parent interface with the correct VLAN Identifier will be diverted to
 the associated
 .Xr vlan 4
 pseudo-interface.
@@ -2439,7 +2439,8 @@ pseudo device, disassociate the parent i
 This breaks the link between the
 .Xr vlan 4
 interface and its parent,
-clears its VLAN tag, flags and its link address and shuts the interface down.
+clears its VLAN Identifier, flags and its link address and shuts the interface
+down.
 The
 .Ar iface
 argument is useless and hence deprecated.