- remove some silly .Tn/.Tm

- supply a missing -width to one of the lists

4 files changed, 38 insertions, 68 deletions

diff --git a/share/man/man4/man4.amd64/apm.4 b/share/man/man4/man4.amd64/apm.4
index c79cffbb3ca..a6804f2d9d8 100644
--- a/share/man/man4/man4.amd64/apm.4
+++ b/share/man/man4/man4.amd64/apm.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: apm.4,v 1.3 2007/11/29 11:35:35 jmc Exp $
+.\"	$OpenBSD: apm.4,v 1.4 2010/09/19 12:32:10 jmc Exp $
 .\"
 .\"	Copyright (c) 1998 Marco S. Hyman
 .\"
@@ -9,7 +9,7 @@
 .\"	LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
 .\"	FOR A PARTICULAR PURPOSE.
 .\"
-.Dd $Mdocdate: November 29 2007 $
+.Dd $Mdocdate: September 19 2010 $
 .Dt APM 4 amd64
 .Os
 .Sh NAME
@@ -100,9 +100,7 @@ value contains the estimated number of minutes of battery life
 remaining.
 .It Dv APM_IOC_NEXTEVENT
 .Pq Li "struct apm_event_info"
-The
-.Tn APM
-driver stores up to
+The APM driver stores up to
 .Dv APM_NEVENTS
 events.
 This was defined as 16 at the time this documentation was written.
@@ -141,8 +139,7 @@ is one of:
 .It Dv APM_IOC_DEV_CTL
 .Pq Li "struct apm_ctl"
 Allows an application to directly set the
-.Tm APM
-operating mode.
+APM operating mode.
 The argument structure is as follows:
 .Bd -literal -offset indent
 struct apm_ctl {
@@ -158,7 +155,7 @@ indicates the device, typically
 .Va mode
 indicates the desired operating mode.
 Possible values are
-.Bl -tag -compact -offset indent
+.Bl -tag -width Ds -compact -offset indent
 .It Dv APM_SYS_READY
 .It Dv APM_SYS_STANDBY
 .It Dv APM_SYS_SUSPEND
@@ -170,8 +167,7 @@ Possible values are
 .Pq Li "int"
 This
 .Xr ioctl 2
-controls message output by the
-.Tn APM
+controls message output by the APM
 driver when a power change event is detected.
 The integer parameter is one of:
 .Bl -tag -width Ds
diff --git a/share/man/man4/man4.i386/apm.4 b/share/man/man4/man4.i386/apm.4
index a1006e753da..d5d84f14e16 100644
--- a/share/man/man4/man4.i386/apm.4
+++ b/share/man/man4/man4.i386/apm.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: apm.4,v 1.29 2007/11/29 11:35:35 jmc Exp $
+.\"	$OpenBSD: apm.4,v 1.30 2010/09/19 12:32:10 jmc Exp $
 .\"
 .\"	Copyright (c) 1998 Marco S. Hyman
 .\"
@@ -9,7 +9,7 @@
 .\"	LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
 .\"	FOR A PARTICULAR PURPOSE.
 .\"
-.Dd $Mdocdate: November 29 2007 $
+.Dd $Mdocdate: September 19 2010 $
 .Dt APM 4 i386
 .Os
 .Sh NAME
@@ -21,9 +21,8 @@
 The
 .Nm
 driver provides an interface to the Advanced Power Management
-.Pq Tn APM
-.Tn BIOS
-functions.
+.Pq APM
+BIOS functions.
 The driver supports versions 1.0, 1.1, and 1.2 interface specifications.
 .Pp
 This driver also provides an interface to
@@ -36,17 +35,14 @@ The value of 0x0101 would specify version 1.1 of the interface
 specification to be used.
 .Pp
 The value of 0x10000 specifies whether to leave interrupts enabled
-when calling
-.Tn APM BIOS
-routines.
+when calling APM BIOS routines.
 This is needed for some
 .Tn IBM
 laptops, the symptoms are
 hangs and freezes on suspend, stand by, and hibernation activities.
 .Pp
 The value of 0x20000 specifies to swap the bytes of the battery
-life estimation (the DX register) as given from the
-.Tn APM BIOS .
+life estimation (the DX register) as given from the APM BIOS.
 This is needed for some
 .Tn SONY VAIO
 laptops, such as some 505 models.
@@ -138,9 +134,7 @@ value contains the estimated number of minutes of battery life
 remaining.
 .It Dv APM_IOC_NEXTEVENT
 .Pq Li "struct apm_event_info"
-The
-.Tn APM
-driver stores up to
+The APM driver stores up to
 .Dv APM_NEVENTS
 events.
 This was defined as 16 at the time this documentation was written.
@@ -179,8 +173,7 @@ is one of:
 .It Dv APM_IOC_DEV_CTL
 .Pq Li "struct apm_ctl"
 Allows an application to directly set the
-.Tm APM
-operating mode.
+APM operating mode.
 The argument structure is as follows:
 .Bd -literal -offset indent
 struct apm_ctl {
@@ -196,7 +189,7 @@ indicates the device, typically
 .Va mode
 indicates the desired operating mode.
 Possible values are
-.Bl -tag -compact -offset indent
+.Bl -tag -width Ds -compact -offset indent
 .It Dv APM_SYS_READY
 .It Dv APM_SYS_STANDBY
 .It Dv APM_SYS_SUSPEND
@@ -208,8 +201,7 @@ Possible values are
 .Pq Li "int"
 This
 .Xr ioctl 2
-controls message output by the
-.Tn APM
+controls message output by the APM
 driver when a power change event is detected.
 The integer parameter is one of:
 .Bl -tag -width Ds
@@ -235,8 +227,7 @@ to zero disables all warnings regardless of the
 setting.
 .El
 .Pp
-As noted above, the operation of the
-.Tn APM
+As noted above, the operation of the APM
 driver can be modified using the
 .Dv machdep.apmwarn
 .Xr sysctl 8
@@ -246,8 +237,7 @@ Another driver modifier is the
 variable.
 When
 .Dv machdep.apmhalt
-is set to 1 the
-.Tn APM
+is set to 1 the APM
 power down code is modified in a way necessary for correct operation on
 some systems, mainly
 .Tn IBM
diff --git a/share/man/man4/man4.macppc/apm.4 b/share/man/man4/man4.macppc/apm.4
index 57ea5993362..409a79ae1ee 100644
--- a/share/man/man4/man4.macppc/apm.4
+++ b/share/man/man4/man4.macppc/apm.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: apm.4,v 1.9 2007/11/29 11:35:35 jmc Exp $
+.\"	$OpenBSD: apm.4,v 1.10 2010/09/19 12:32:10 jmc Exp $
 .\"
 .\"	Copyright (c) 1998 Marco S. Hyman
 .\"
@@ -9,7 +9,7 @@
 .\"	LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
 .\"	FOR A PARTICULAR PURPOSE.
 .\"
-.Dd $Mdocdate: November 29 2007 $
+.Dd $Mdocdate: September 19 2010 $
 .Dt APM 4 macppc
 .Os
 .Sh NAME
@@ -21,12 +21,9 @@
 The
 .Nm
 driver provides an interface which simulates the Advanced Power Management
-.Pq Tn APM
-.Tn BIOS
-functions.
-The
-.Tn BIOS
-functions are translated into the appropriate PowerManager requests.
+.Pq APM
+BIOS functions.
+The BIOS functions are translated into the appropriate PowerManager requests.
 Currently only battery level, AC connection, and charging status is available
 from the
 .Nm
@@ -131,9 +128,7 @@ value contains the estimated number of minutes of battery life remaining.
 .It Dv APM_IOC_NEXTEVENT
 .Em NOT YET SUPPORTED on macppc
 .Pq Li "struct apm_event_info"
-The
-.Tn APM
-driver stores up to
+The APM driver stores up to
 .Dv APM_NEVENTS
 events.
 This was defined as 16 at the time this documentation was written.
@@ -174,8 +169,7 @@ is one of:
 .Em NOT YET SUPPORTED on macppc
 .Pq Li "struct apm_ctl"
 Allows an application to directly set the
-.Tm APM
-operating mode.
+APM operating mode.
 The argument structure is as follows:
 .Bd -literal -offset indent
 struct apm_ctl {
@@ -191,7 +185,7 @@ indicates the device, typically
 .Va mode
 indicates the desired operating mode.
 Possible values are
-.Bl -tag -compact -offset indent
+.Bl -tag -width Ds -compact -offset indent
 .It Dv APM_SYS_READY
 .It Dv APM_SYS_STANDBY
 .It Dv APM_SYS_SUSPEND
@@ -204,8 +198,7 @@ Possible values are
 .Pq Li "int"
 This
 .Xr ioctl 2
-controls message output by the
-.Tn APM
+controls message output by the APM
 driver when a power change event is detected.
 The integer parameter is one of:
 .Bl -tag -width Ds
@@ -232,8 +225,7 @@ setting.
 .El
 .Pp
 .Em NOT YET SUPPORTED on macppc:
-As noted above, the operation of the
-.Tn APM
+As noted above, the operation of the APM
 driver can be modified using the
 .Dv machdep.apmwarn
 .Xr sysctl 8
@@ -243,8 +235,7 @@ Another driver modifier is the
 variable.
 When
 .Dv machdep.apmhalt
-is set to 1 the
-.Tn APM
+is set to 1 the APM
 power down code is modified in a way necessary for correct operation on
 some systems, mainly
 .Tn IBM
diff --git a/share/man/man4/man4.zaurus/apm.4 b/share/man/man4/man4.zaurus/apm.4
index bd1a6797890..808c8b0c548 100644
--- a/share/man/man4/man4.zaurus/apm.4
+++ b/share/man/man4/man4.zaurus/apm.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: apm.4,v 1.11 2007/11/29 11:35:35 jmc Exp $
+.\"	$OpenBSD: apm.4,v 1.12 2010/09/19 12:32:10 jmc Exp $
 .\"
 .\"	Copyright (c) 1998 Marco S. Hyman
 .\"
@@ -9,7 +9,7 @@
 .\"	LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
 .\"	FOR A PARTICULAR PURPOSE.
 .\"
-.Dd $Mdocdate: November 29 2007 $
+.Dd $Mdocdate: September 19 2010 $
 .Dt APM 4 zaurus
 .Os
 .Sh NAME
@@ -21,12 +21,9 @@
 The
 .Nm
 driver provides an interface which simulates the Advanced Power Management
-.Pq Tn APM
-.Tn BIOS
-functions.
-The
-.Tn BIOS
-functions are translated into the appropriate Power Manager requests.
+.Pq APM
+BIOS functions.
+The BIOS functions are translated into the appropriate Power Manager requests.
 Currently only battery level, AC connection, and charging status is available
 from the
 .Nm
@@ -127,9 +124,7 @@ value is 0.
 .It Dv APM_IOC_NEXTEVENT
 .Em NOT YET SUPPORTED on zaurus
 .Pq Li "struct apm_event_info"
-The
-.Tn APM
-driver stores up to
+The APM driver stores up to
 .Dv APM_NEVENTS
 events.
 This was defined as 16 at the time this documentation was written.
@@ -170,8 +165,7 @@ is one of:
 .Em NOT YET SUPPORTED on zaurus
 .Pq Li "struct apm_ctl"
 Allows an application to directly set the
-.Tm APM
-operating mode.
+APM operating mode.
 The argument structure is as follows:
 .Bd -literal -offset indent
 struct apm_ctl {
@@ -187,7 +181,7 @@ indicates the device, typically
 .Va mode
 indicates the desired operating mode.
 Possible values are
-.Bl -tag -compact -offset indent
+.Bl -tag -width Ds -compact -offset indent
 .It Dv APM_SYS_READY
 .It Dv APM_SYS_STANDBY
 .It Dv APM_SYS_SUSPEND
@@ -199,8 +193,7 @@ Possible values are
 .Pq Li "int"
 This
 .Xr ioctl 2
-controls message output by the
-.Tn APM
+controls message output by the APM
 driver when a power change event is detected.
 The integer parameter is one of:
 .Bl -tag -width Ds