summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhenning <henning@openbsd.org>2014-04-22 10:11:32 +0000
committerhenning <henning@openbsd.org>2014-04-22 10:11:32 +0000
commitc0c47f9e3545b93f77b80f0193f50fd1e8de39d3 (patch)
tree56d275a98cedda80be1bd52b9c0e982b4a78a4c4
parentOh yeah, MLINKS for errc family (diff)
downloadwireguard-openbsd-c0c47f9e3545b93f77b80f0193f50fd1e8de39d3.tar.xz
wireguard-openbsd-c0c47f9e3545b93f77b80f0193f50fd1e8de39d3.zip
for consistency's sake, use the terminology from the 802.1Q standard
here too. pt out by alexey suslikov via mpi, ok reyk
-rw-r--r--sbin/ifconfig/ifconfig.810
1 files changed, 5 insertions, 5 deletions
diff --git a/sbin/ifconfig/ifconfig.8 b/sbin/ifconfig/ifconfig.8
index 4741183c13d..909f1419790 100644
--- a/sbin/ifconfig/ifconfig.8
+++ b/sbin/ifconfig/ifconfig.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ifconfig.8,v 1.240 2014/02/26 21:19:44 claudio Exp $
+.\" $OpenBSD: ifconfig.8,v 1.241 2014/04/22 10:11:32 henning Exp $
.\" $NetBSD: ifconfig.8,v 1.11 1996/01/04 21:27:29 pk Exp $
.\" $FreeBSD: ifconfig.8,v 1.16 1998/02/01 07:03:29 steve Exp $
.\"
@@ -31,7 +31,7 @@
.\"
.\" @(#)ifconfig.8 8.4 (Berkeley) 6/1/94
.\"
-.Dd $Mdocdate: February 26 2014 $
+.Dd $Mdocdate: April 22 2014 $
.Dt IFCONFIG 8
.Os
.Sh NAME
@@ -265,7 +265,7 @@ of the
.Xr vlan 4
tag.
.It Sy VLAN_HWTAGGING
-On transmit, the device can prepend the
+On transmit, the device can add the
.Xr vlan 4
tag.
.It Sy CSUM_TCPv6
@@ -1516,8 +1516,8 @@ Associate with interface
Packets transmitted through the vlan interface will be
diverted to the specified interface
.Ar parent-interface
-with 802.1Q vlan encapsulation.
-Packets with 802.1Q encapsulation received
+with 802.1Q vlan tagging.
+Packets with 802.1Q tagging received
by the parent interface with the correct vlan tag will be diverted to
the associated vlan pseudo-device.
The vlan interface is assigned a