summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sbin/ifconfig/ifconfig.810
-rw-r--r--share/man/man4/mpip.48
-rw-r--r--share/man/man4/mpw.48
3 files changed, 15 insertions, 11 deletions
diff --git a/sbin/ifconfig/ifconfig.8 b/sbin/ifconfig/ifconfig.8
index 9c95dca5378..a9e968ce13f 100644
--- a/sbin/ifconfig/ifconfig.8
+++ b/sbin/ifconfig/ifconfig.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ifconfig.8,v 1.326 2019/03/11 11:26:37 dlg Exp $
+.\" $OpenBSD: ifconfig.8,v 1.327 2019/03/11 18:55:29 jmc 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 $
.\"
@@ -1288,6 +1288,8 @@ If
is omitted, it is decreased by 1.
.El
.Sh MPLS
+.nr nS 1
+.Bk -words
.Nm ifconfig
.Ar mpls-interface
.Op Cm mplslabel Ar mpls-label
@@ -1295,6 +1297,8 @@ is omitted, it is decreased by 1.
.Op Oo Fl Oc Ns Cm pwecw
.Op Oo Fl Oc Ns Cm pwefat
.Op Cm tunneldomain Ar rdomain
+.Ek
+.nr nS 0
.Pp
The following options are available for
.Xr mpe 4 ,
@@ -1318,8 +1322,8 @@ The MPLS encapsulated traffic does not need to terminate in the same
routing domain as the interface itself.
.El
.Pp
-The following options are availble for the
-.Xr mpip 4 ,
+The following options are available for the
+.Xr mpip 4
and
.Xr mpw 4
interfaces that provide MPLS Pseudowire Emulation Edge-to-Edge (PWE3)
diff --git a/share/man/man4/mpip.4 b/share/man/man4/mpip.4
index 6ac3ae2ec99..31192db312a 100644
--- a/share/man/man4/mpip.4
+++ b/share/man/man4/mpip.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: mpip.4,v 1.1 2019/03/11 10:48:45 dlg Exp $
+.\" $OpenBSD: mpip.4,v 1.2 2019/03/11 18:55:29 jmc Exp $
.\"
.\" Copyright (C) 2019 David Gwynne <dlg@openbsd.org>
.\"
@@ -19,7 +19,7 @@
.Os
.Sh NAME
.Nm mpip
-.Nd MPLS IP Layer 2 pseudowire
+.Nd MPLS IP layer 2 pseudowire
.Sh SYNOPSIS
.Cd "pseudo-device mpip"
.Sh DESCRIPTION
@@ -46,7 +46,7 @@ but it is also possible to configure them manually using
.Xr ifconfig 8 .
.Sh EXAMPLES
Create a pseudowire with local label 20 and remote label 21 on
-neighbor 10.254.0.1.
+neighbor 10.254.0.1:
.Bd -literal -offset indent
# ifconfig mpip5 create
# ifconfig mpip5 mplslabel 20 pweneighbor 21 10.254.0.1
@@ -55,7 +55,7 @@ neighbor 10.254.0.1.
.Pp
Disable the use of the Pseudowire Emulation Edge-to-Edge (PWE3)
Control Word, and enable the use of a Flow label for Flow-Aware
-Transport of Pseudowires.
+Transport of Pseudowires:
.Bd -literal -offset indent
# ifconfig mpip5 -pwecw pwefat
.Ed
diff --git a/share/man/man4/mpw.4 b/share/man/man4/mpw.4
index 7ecbe8a6a7a..731206981f5 100644
--- a/share/man/man4/mpw.4
+++ b/share/man/man4/mpw.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: mpw.4,v 1.4 2019/03/11 10:54:57 dlg Exp $
+.\" $OpenBSD: mpw.4,v 1.5 2019/03/11 18:55:29 jmc Exp $
.\"
.\" Copyright (C) 2015 Rafael Zalamena <rzalamena@openbsd.org>
.\"
@@ -28,7 +28,7 @@ The
interface is used to create an MPLS Ethernet layer 2 tunnel between
two points.
.Pp
-A
+An
.Nm
interface can be created at runtime using the
.Sy ifconfig Nm Ns Ar N Cm create
@@ -47,7 +47,7 @@ but it is also possible to configure them manually using
.Xr ifconfig 8 .
.Sh EXAMPLES
Create a pseudowire with local label 20 and remote label 21 on
-neighbor 10.254.0.1.
+neighbor 10.254.0.1:
.Bd -literal -offset indent
# ifconfig mpw5 create
# ifconfig mpw5 mplslabel 20 pweneighbor 21 10.254.0.1
@@ -56,7 +56,7 @@ neighbor 10.254.0.1.
.Pp
Enable the use of the Pseudowire Emulation Edge-to-Edge (PWE3)
Control Word, and disable the use of a Flow label for Flow-Aware
-Transport of Pseudowires.
+Transport of Pseudowires:
.Bd -literal -offset indent
# ifconfig mpw5 pwecw -pwefat
.Ed