tweak previous; help/ok naddy

1 files changed, 25 insertions, 28 deletions

diff --git a/share/man/man4/vlan.4 b/share/man/man4/vlan.4
index 8ac6b882a1e..18db5d613fe 100644
--- a/share/man/man4/vlan.4
+++ b/share/man/man4/vlan.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: vlan.4,v 1.32 2010/06/03 16:15:00 naddy Exp $
+.\" $OpenBSD: vlan.4,v 1.33 2010/06/08 13:24:16 jmc Exp $
 .\"
 .\" Copyright (c) 2000 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -27,13 +27,13 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: June 3 2010 $
+.Dd $Mdocdate: June 8 2010 $
 .Dt VLAN 4
 .Os
 .Sh NAME
 .Nm vlan ,
 .Nm svlan
-.Nd "IEEE 802.1Q/1AD encapsulation/decapsulation pseudo-devices"
+.Nd IEEE 802.1Q/1AD encapsulation/decapsulation pseudo-device
 .Sh SYNOPSIS
 .Cd "pseudo-device vlan"
 .Sh DESCRIPTION
@@ -42,13 +42,14 @@ The
 Ethernet interface allows construction of virtual LANs when used in
 conjunction with IEEE 802.1Q-compliant Ethernet devices.
 The
-.Ic svlan
-Ethernet interface allows contruction of IEEE 802.1AD-compliant
+.Nm svlan
+Ethernet interface allows construction of IEEE 802.1AD-compliant
 provider bridges.
-.Pp
-A
+It is normally used for QinQ to stack
 .Nm
-interface can be created at runtime using the
+interfaces on top of it.
+.Pp
+The interfaces can be created at runtime using the
 .Ic ifconfig vlan Ns Ar N Ic create
 command or by setting up a
 .Xr hostname.if 5
@@ -58,9 +59,10 @@ The interface itself can be configured with
 .Xr ifconfig 8 ;
 see its manual page for more information.
 .Pp
-This driver currently only supports
-802.1Q encapsulation over Ethernet (Ethernet protocol 0x8100).
-The 802.1Q header specifies the virtual LAN number, and thus allows an
+For
+.Nm
+devices,
+the 802.1Q header specifies the virtual LAN number, and thus allows an
 Ethernet switch (or other 802.1Q compliant network devices) to be aware of
 which LAN the frame is part of, and in the case of a switch, which
 port(s) the frame can go to.
@@ -88,25 +90,18 @@ option for more information.
 Following the vlan header is the actual ether type for the frame and length
 information.
 .Pp
-An
-.Ic svlan
-interface is normally used for QinQ in 802.1AD-compliant provider bridges to
-stack other
-.Nm
-interfaces on top of it.
-It can be created using the
-.Ic ifconfig svlan Ns Ar N Ic create
-command or by setting up a
-.Xr hostname.if 5
-configuration file for
-.Xr netstart 8 .
-The configuration is identical to the
+For
+.Nm svlan
+devices,
+the configuration is identical to the
 .Nm
-interface, the only differences are that it uses a different Ethernet
+interface, the only differences being that it uses a different Ethernet
 type (0x88a8) and an independent VLAN ID space on the parent
 interface.
 .Pp
 .Nm
+and
+.Nm svlan
 interfaces support the following unique
 .Xr ioctl 2 Ns s :
 .Bl -tag -width "SIOCSETVLANPRIO" -offset 3n
@@ -121,16 +116,18 @@ Set the vlan priority for a given vlan interface.
 .El
 .Pp
 .Nm
+and
+.Nm svlan
 interfaces use the following interface capabilities:
 .Bl -tag -width "IFCAP_VLAN_HWTAGGING" -offset 3n
 .It IFCAP_VLAN_MTU
 The parent interface can handle full sized frames, plus the size
 of the vlan tag.
 .It IFCAP_VLAN_HWTAGGING
-The parent interface will participate in the tagging of frames
+The parent interface will participate in the tagging of frames.
 (This is not supported by
-.Ic svlan
-interfaces).
+.Nm svlan
+interfaces.)
 .El
 .Sh DIAGNOSTICS
 .Bl -diag