3 files changed, 32 insertions, 27 deletions
diff --git a/libexec/login_passwd/login_passwd.8 b/libexec/login_passwd/login_passwd.8
index 04b17639a36..1716bcd2bf8 100644
--- a/libexec/login_passwd/login_passwd.8
+++ b/libexec/login_passwd/login_passwd.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: login_passwd.8,v 1.9 2012/02/01 17:32:59 sobrado Exp $
+.\" $OpenBSD: login_passwd.8,v 1.10 2015/09/11 21:19:34 schwarze Exp $
 .\"
 .\" Copyright (c) 2000 Todd C. Miller <Todd.Miller@courtesan.com>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: February 1 2012 $
+.Dd $Mdocdate: September 11 2015 $
 .Dt LOGIN_PASSWD 8
 .Os
 .Sh NAME
@@ -23,8 +23,8 @@
 .Sh SYNOPSIS
 .Nm login_passwd
 .Op Fl s Ar service
-.Op Fl v Ar wheel Ns = Ns Li yes Ns | Ns Li no
-.Op Fl v Ar lastchance Ns = Ns Li yes Ns | Ns Li no
+.Op Fl v Cm wheel Ns = Ns Cm yes Ns | Ns Cm no
+.Op Fl v Cm lastchance Ns = Ns Cm yes Ns | Ns Cm no
 .Ar user
 .Op Ar class
 .Sh DESCRIPTION
@@ -57,18 +57,18 @@ protocol is silently ignored but will report success as passwd-style
 authentication is not challenge-response based).
 .Pp
 If the
-.Ar wheel
+.Cm wheel
 argument is specified and is not set to
-.Dq yes ,
+.Cm yes ,
 then the user will be rejected as not being in group
 .Dq wheel .
 This is used by
 .Xr su 1 .
 .Pp
 If the
-.Ar lastchance
+.Cm lastchance
 argument is specified and is equal to
-.Dq yes ,
+.Cm yes ,
 then if the user's password has expired, and it has not been
 expired longer than
 .Dq password-dead
diff --git a/usr.bin/kdump/kdump.1 b/usr.bin/kdump/kdump.1
index a3d10939220..ea714979567 100644
--- a/usr.bin/kdump/kdump.1
+++ b/usr.bin/kdump/kdump.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: kdump.1,v 1.24 2014/12/15 01:48:54 guenther Exp $
+.\"	$OpenBSD: kdump.1,v 1.25 2015/09/11 21:19:34 schwarze Exp $
 .\"
 .\" Copyright (c) 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\"
 .\"	from: @(#)kdump.1	8.1 (Berkeley) 6/6/93
 .\"
-.Dd $Mdocdate: December 15 2014 $
+.Dd $Mdocdate: September 11 2015 $
 .Dt KDUMP 1
 .Os
 .Sh NAME
@@ -37,14 +37,12 @@
 .Nd display kernel trace data
 .Sh SYNOPSIS
 .Nm kdump
-.Bk -words
 .Op Fl dHlnRTXx
 .Op Fl e Ar emulation
 .Op Fl f Ar file
 .Op Fl m Ar maxdata
 .Op Fl p Ar pid
-.Op Fl t Op ceinstuw
-.Ek
+.Op Fl t Op Cm ceinstuw
 .Sh DESCRIPTION
 .Nm
 displays the kernel trace files produced with
@@ -100,7 +98,7 @@ specified.
 Display relative timestamps (time since previous entry).
 .It Fl T
 Display absolute timestamps for each entry (seconds since the Epoch).
-.It Fl t Op ceinstuw
+.It Fl t Op Cm ceinstuw
 Selects which tracepoints to display.
 See the
 .Fl t
diff --git a/usr.sbin/gpioctl/gpioctl.8 b/usr.sbin/gpioctl/gpioctl.8
index be088da0255..0b91a2ce4b6 100644
--- a/usr.sbin/gpioctl/gpioctl.8
+++ b/usr.sbin/gpioctl/gpioctl.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: gpioctl.8,v 1.23 2013/11/20 22:34:13 jmc Exp $
+.\"	$OpenBSD: gpioctl.8,v 1.24 2015/09/11 21:19:34 schwarze Exp $
 .\"
 .\" Copyright (c) 2004 Alexander Yurchenko <grange@openbsd.org>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: November 20 2013 $
+.Dd $Mdocdate: September 11 2015 $
 .Dt GPIOCTL 8
 .Os
 .Sh NAME
@@ -25,23 +25,23 @@
 .Op Fl q
 .Ar device
 .Ar pin
-.Op Ar 0 | 1 | 2 | on | off | toggle
+.Op Cm 0 | 1 | 2 | on | off | toggle
 .Nm gpioctl
 .Op Fl q
 .Ar device
 .Ar pin
-set
+.Cm set
 .Op Ar flags
 .Op Ar name
 .Nm gpioctl
 .Op Fl q
 .Ar device
 .Ar pin
-unset
+.Cm unset
 .Nm gpioctl
 .Op Fl q
 .Ar device
-attach
+.Cm attach
 .Ar device
 .Ar offset
 .Ar mask
@@ -49,7 +49,7 @@ attach
 .Nm gpioctl
 .Op Fl q
 .Ar device
-detach
+.Cm detach
 .Ar device
 .Sh DESCRIPTION
 The
@@ -86,15 +86,20 @@ from the GPIO controller and displayed.
 To write to a pin, a value must be specified after the
 .Ar pin
 number.
-Values can be either 0 or 1.
-A value of 2 has a special meaning: it
+Values can be either
+.Cm 0
+or
+.Cm 1 .
+A value of
+.Cm 2
+has a special meaning: it
 .Dq toggles
 the pin, i.e. changes its state to the opposite.
 Instead of the numerical values, the word
-.Ar on ,
-.Ar off ,
+.Cm on ,
+.Cm off ,
 or
-.Ar toggle
+.Cm toggle
 can be used.
 .Pp
 Only pins that have been configured at securelevel 0, typically during system
@@ -151,7 +156,9 @@ reads information about the
 .Tn GPIO
 device and displays it.
 At securelevel 0 the number of physically available pins is displayed,
-at higher securelevels the number of configured (set) pins is displayed.
+at higher securelevels the number of configured
+.Pq Cm set
+pins is displayed.
 .Pp
 The options are as follows:
 .Bl -tag -width Ds