6 files changed, 65 insertions, 65 deletions
diff --git a/share/man/man4/gre.4 b/share/man/man4/gre.4
index ecceef24309..a482800893d 100644
--- a/share/man/man4/gre.4
+++ b/share/man/man4/gre.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: gre.4,v 1.29 2007/05/31 19:19:50 jmc Exp $
+.\" $OpenBSD: gre.4,v 1.30 2007/06/01 16:56:26 jmc Exp $
 .\" $NetBSD: gre.4,v 1.10 1999/12/22 14:55:49 kleink Exp $
 .\"
 .\" Copyright 1998 (c) The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
 .\" ARISING IN ANY WAY  OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 1 2007 $
 .Dt GRE 4
 .Os
 .Sh NAME
@@ -43,7 +43,12 @@
 .Nd encapsulating network device
 .Sh SYNOPSIS
 .Cd "pseudo-device gre"
-.Sh NOTE
+.Sh DESCRIPTION
+The
+.Nm
+network interface allows tunnel construction using the Cisco GRE or
+the Mobile-IP (RFC 2004) encapsulation protocols.
+.Pp
 .Tn GRE ,
 .Tn WCCPv1 ,
 and
@@ -60,11 +65,6 @@ Allow WCCPv1-style GRE packets into the system (depends on the above).
 .It Va net.inet.mobileip.allow
 Allow MobileIP packets in and out of the system.
 .El
-.Sh DESCRIPTION
-The
-.Nm
-network interface allows tunnel construction using the Cisco GRE or
-the Mobile-IP (RFC 2004) encapsulation protocols.
 .Pp
 A
 .Nm
diff --git a/share/man/man4/ubsa.4 b/share/man/man4/ubsa.4
index 78b40a47303..9ab024e33f8 100644
--- a/share/man/man4/ubsa.4
+++ b/share/man/man4/ubsa.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ubsa.4,v 1.12 2007/05/31 19:19:52 jmc Exp $
+.\" $OpenBSD: ubsa.4,v 1.13 2007/06/01 16:56:26 jmc Exp $
 .\" $NetBSD: ubsa.4,v 1.1 2002/10/08 13:18:42 augustss Exp $
 .\"
 .\" Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 1 2007 $
 .Dt UBSA 4
 .Os
 .Sh NAME
@@ -44,6 +44,22 @@
 .Sh SYNOPSIS
 .Cd "ubsa*  at uhub?"
 .Cd "ucom*  at ubsa?"
+.Sh DESCRIPTION
+The
+.Nm
+driver provides support for the USB-to-RS232 Bridge chip used by a variety of
+serial adapters from Belkin and other vendors.
+.Pp
+Some 3G (UMTS/GPRS/GSM)
+.Xr cardbus 4
+devices use a Belkin serial adapter and an
+.Xr ohci 4
+controller to provide a common AT interface.
+.Pp
+The device is accessed through the
+.Xr ucom 4
+driver which makes it behave like a
+.Xr tty 4 .
 .Sh HARDWARE
 The
 .Nm
@@ -64,22 +80,6 @@ driver supports the following adapters:
 .It Peracom single port serial adapter
 .It Vodafone Mobile Connect 3G
 .El
-.Sh DESCRIPTION
-The
-.Nm
-driver provides support for the USB-to-RS232 Bridge chip used by a variety of
-serial adapters from Belkin and other vendors.
-.Pp
-Some 3G (UMTS/GPRS/GSM)
-.Xr cardbus 4
-devices use a Belkin serial adapter and an
-.Xr ohci 4
-controller to provide a common AT interface.
-.Pp
-The device is accessed through the
-.Xr ucom 4
-driver which makes it behave like a
-.Xr tty 4 .
 .Sh SEE ALSO
 .Xr cardbus 4 ,
 .Xr tty 4 ,
diff --git a/share/man/man4/uipaq.4 b/share/man/man4/uipaq.4
index 38bd6440dc2..40a2374358c 100644
--- a/share/man/man4/uipaq.4
+++ b/share/man/man4/uipaq.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: uipaq.4,v 1.5 2007/05/31 19:19:52 jmc Exp $
+.\" $OpenBSD: uipaq.4,v 1.6 2007/06/01 16:56:26 jmc Exp $
 .\" $NetBSD: uipaq.4,v 1.6 2001/05/22 00:21:25 jhawk Exp $
 .\"
 .\" Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 1 2007 $
 .Dt UIPAQ 4
 .Os
 .Sh NAME
@@ -44,6 +44,16 @@
 .Sh SYNOPSIS
 .Cd "uipaq* at uhub?"
 .Cd "ucom*   at uipaq?"
+.Sh DESCRIPTION
+The
+.Nm
+driver provides support for the USB serial emulation provided
+by the iPAQ devices.
+.Pp
+The device is accessed through the
+.Xr ucom 4
+driver which makes it behave like a
+.Xr tty 4 .
 .Sh HARDWARE
 The
 .Nm
@@ -56,16 +66,6 @@ driver supports the following adapters:
 .It HP iPAQ 22xx/Jornada 548
 .It HP Jornada 568
 .El
-.Sh DESCRIPTION
-The
-.Nm
-driver provides support for the USB serial emulation provided
-by the iPAQ devices.
-.Pp
-The device is accessed through the
-.Xr ucom 4
-driver which makes it behave like a
-.Xr tty 4 .
 .Sh SEE ALSO
 .Xr tty 4 ,
 .Xr ucom 4 ,
diff --git a/share/man/man4/umct.4 b/share/man/man4/umct.4
index ef3b5e30d3f..72301887b24 100644
--- a/share/man/man4/umct.4
+++ b/share/man/man4/umct.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: umct.4,v 1.10 2007/05/31 19:19:52 jmc Exp $
+.\" $OpenBSD: umct.4,v 1.11 2007/06/01 16:56:26 jmc Exp $
 .\" $NetBSD: umct.4,v 1.5 2002/02/07 03:15:09 ross Exp $
 .\"
 .\" Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 1 2007 $
 .Dt UMCT 4
 .Os
 .Sh NAME
@@ -44,6 +44,16 @@
 .Sh SYNOPSIS
 .Cd "umct*  at uhub?"
 .Cd "ucom*  at umct?"
+.Sh DESCRIPTION
+The
+.Nm
+driver provides support for MCT USB-to-RS232 Converter and their family
+products.
+.Pp
+The device is accessed through the
+.Xr ucom 4
+driver which makes it behave like a
+.Xr tty 4 .
 .Sh HARDWARE
 The
 .Nm
@@ -57,16 +67,6 @@ driver supports the following adapters:
 .It MCT USB-RS232 Converter 25 pin Model U232-P25
 .It Sitecom USB-RS232 Converter
 .El
-.Sh DESCRIPTION
-The
-.Nm
-driver provides support for MCT USB-to-RS232 Converter and their family
-products.
-.Pp
-The device is accessed through the
-.Xr ucom 4
-driver which makes it behave like a
-.Xr tty 4 .
 .Sh SEE ALSO
 .Xr tty 4 ,
 .Xr ucom 4 ,
diff --git a/share/man/man4/uplcom.4 b/share/man/man4/uplcom.4
index 842c6310e33..7e4ee40a9a6 100644
--- a/share/man/man4/uplcom.4
+++ b/share/man/man4/uplcom.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: uplcom.4,v 1.21 2007/05/31 19:19:52 jmc Exp $
+.\" $OpenBSD: uplcom.4,v 1.22 2007/06/01 16:56:26 jmc Exp $
 .\" $NetBSD: uplcom.4,v 1.6 2001/05/22 00:21:25 jhawk Exp $
 .\"
 .\" Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 1 2007 $
 .Dt UPLCOM 4
 .Os
 .Sh NAME
@@ -44,6 +44,15 @@
 .Sh SYNOPSIS
 .Cd "uplcom* at uhub?"
 .Cd "ucom*   at uplcom?"
+.Sh DESCRIPTION
+The
+.Nm
+driver provides support for the Prolific PL-2303 USB-to-RS232 Bridge chip.
+.Pp
+The device is accessed through the
+.Xr ucom 4
+driver which makes it behave like a
+.Xr tty 4 .
 .Sh HARDWARE
 The
 .Nm
@@ -80,15 +89,6 @@ driver supports the following adapters:
 .It TDK USB-PHS Adapter UHA6400
 .It Tripp-Lite U209
 .El
-.Sh DESCRIPTION
-The
-.Nm
-driver provides support for the Prolific PL-2303 USB-to-RS232 Bridge chip.
-.Pp
-The device is accessed through the
-.Xr ucom 4
-driver which makes it behave like a
-.Xr tty 4 .
 .Sh SEE ALSO
 .Xr tty 4 ,
 .Xr ucom 4 ,
diff --git a/share/man/man7/securelevel.7 b/share/man/man7/securelevel.7
index 6dd645db2ea..b54eee79d7c 100644
--- a/share/man/man7/securelevel.7
+++ b/share/man/man7/securelevel.7
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: securelevel.7,v 1.20 2007/05/31 19:19:58 jmc Exp $
+.\"     $OpenBSD: securelevel.7,v 1.21 2007/06/01 16:56:26 jmc Exp $
 .\"
 .\" Copyright (c) 2000 Hugh Graham
 .\"
@@ -23,13 +23,13 @@
 .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 1 2007 $
 .Dt SECURELEVEL 7
 .Os
 .Sh NAME
 .Nm securelevel
 .Nd securelevel and its effects
-.Sh SYNOPSIS
+.Sh DESCRIPTION
 The
 .Ox
 kernel provides four levels of system security:
@@ -116,7 +116,7 @@ may not set the time backwards or close to overflow
 filter and NAT rules may not be altered
 .El
 .El
-.Sh DESCRIPTION
+.Pp
 Securelevel provides convenient means of
 .Dq locking down
 a system to a degree suited to its environment.