first stab are replacing format strings in MD pages

14 files changed, 120 insertions, 120 deletions

diff --git a/share/man/man4/man4.hp300/apci.4 b/share/man/man4/man4.hp300/apci.4
index 141006b3826..044829ac1ef 100644
--- a/share/man/man4/man4.hp300/apci.4
+++ b/share/man/man4/man4.hp300/apci.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: apci.4,v 1.13 2010/01/02 19:55:35 schwarze Exp $
+.\"	$OpenBSD: apci.4,v 1.14 2013/06/02 20:42:27 tedu Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -33,7 +33,7 @@
 .\"
 .\"     from: @(#)dca.4	8.1 (Berkeley) 6/9/93
 .\"
-.Dd $Mdocdate: January 2 2010 $
+.Dd $Mdocdate: June 2 2013 $
 .Dt APCI 4 hp300
 .Os
 .Sh NAME
@@ -68,7 +68,7 @@ Input and output for each line may be set to one of the following baud rates:
 .El
 .Sh DIAGNOSTICS
 .Bl -diag
-.It apci%d: silo overflow.
+.It apci0: silo overflow.
 The single-character input
 .Dq silo
 has overflowed and incoming data has been lost.
diff --git a/share/man/man4/man4.hp300/dca.4 b/share/man/man4/man4.hp300/dca.4
index 42e64559915..78235758812 100644
--- a/share/man/man4/man4.hp300/dca.4
+++ b/share/man/man4/man4.hp300/dca.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: dca.4,v 1.14 2010/01/02 19:55:35 schwarze Exp $
+.\"	$OpenBSD: dca.4,v 1.15 2013/06/02 20:42:27 tedu Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -33,7 +33,7 @@
 .\"
 .\"     from: @(#)dca.4	8.1 (Berkeley) 6/9/93
 .\"
-.Dd $Mdocdate: January 2 2010 $
+.Dd $Mdocdate: June 2 2013 $
 .Dt DCA 4 hp300
 .Os
 .Sh NAME
@@ -70,7 +70,7 @@ with carrier always present or 0 if modem control is desired.
 .El
 .Sh DIAGNOSTICS
 .Bl -diag
-.It dca%d: silo overflow.
+.It dca0: silo overflow.
 The single-character input
 .Dq silo
 has overflowed and incoming data has been lost.
diff --git a/share/man/man4/man4.hp300/dcm.4 b/share/man/man4/man4.hp300/dcm.4
index a847b106a33..0f064702a11 100644
--- a/share/man/man4/man4.hp300/dcm.4
+++ b/share/man/man4/man4.hp300/dcm.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: dcm.4,v 1.18 2013/01/17 21:54:18 jmc Exp $
+.\"	$OpenBSD: dcm.4,v 1.19 2013/06/02 20:42:27 tedu Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -33,7 +33,7 @@
 .\"
 .\"     from: @(#)dcm.4	8.1 (Berkeley) 6/9/93
 .\"
-.Dd $Mdocdate: January 17 2013 $
+.Dd $Mdocdate: June 2 2013 $
 .Dt DCM 4 hp300
 .Os
 .Sh NAME
@@ -83,10 +83,10 @@ the interrupt rate drops.
 .El
 .Sh DIAGNOSTICS
 .Bl -diag
-.It dcm%d port%d: silo overflow
+.It dcm0 port0: silo overflow
 Input Silo has overflowed and incoming data
 has been lost.
-.It dcm%d port%d: uart overflow
+.It dcm0 port0: uart overflow
 The 3 character buffer in the UART has
 overflowed.
 .El
diff --git a/share/man/man4/man4.hp300/hd.4 b/share/man/man4/man4.hp300/hd.4
index fcae4a65b59..c2d89ca5181 100644
--- a/share/man/man4/man4.hp300/hd.4
+++ b/share/man/man4/man4.hp300/hd.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: hd.4,v 1.16 2010/07/03 09:20:06 krw Exp $
+.\"	$OpenBSD: hd.4,v 1.17 2013/06/02 20:42:27 tedu Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -33,7 +33,7 @@
 .\"
 .\"     from: @(#)rd.4	8.1 (Berkeley) 6/9/93
 .\"
-.Dd $Mdocdate: July 3 2010 $
+.Dd $Mdocdate: June 2 2013 $
 .Dt HD 4 hp300
 .Os
 .Sh NAME
@@ -71,7 +71,7 @@ raw files
 .El
 .Sh DIAGNOSTICS
 .Bl -diag
-.It "hd%d err: v%d u%d, R0x%x F0x%x A0x%x I0x%x, block %d"
+.It "hd0 err: vNN uNN, R0xXX F0xXX A0xXX I0xXX, block N"
 An unrecoverable data error occurred during transfer of the
 specified block on the specified disk.
 .El
diff --git a/share/man/man4/man4.sparc/magma.4 b/share/man/man4/man4.sparc/magma.4
index cfe21491806..a7409078586 100644
--- a/share/man/man4/man4.sparc/magma.4
+++ b/share/man/man4/man4.sparc/magma.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: magma.4,v 1.16 2008/11/29 01:55:06 ray Exp $
+.\"	$OpenBSD: magma.4,v 1.17 2013/06/02 20:42:27 tedu Exp $
 .\"
 .\"
 .\" Copyright (c) 1998 Iain Hibbert
@@ -24,7 +24,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: November 29 2008 $
+.Dd $Mdocdate: June 2 2013 $
 .Dt MAGMA 4 sparc
 .Os
 .Sh NAME
@@ -69,14 +69,14 @@ Parallel ports
 .El
 .Sh DIAGNOSTICS
 .Bl -diag
-.It "mtty%d%x: ring buffer overflow"
+.It "mtty0X: ring buffer overflow"
 Incoming characters have been discarded due to a buffer overflow.
 This is caused by the process in control of the device not reading characters
 fast enough.
 If need be you can make the ring buffer bigger by changing the
 .Dv MAGMA_RBUF_SIZE
 #define to something bigger, but it should be a multiple of two.
-.It "mtty%d%x: fifo overflow"
+.It "mtty0X: fifo overflow"
 Incoming characters have been discarded due to a CD1400 channel overrun.
 This is caused by interrupts not being serviced sufficiently quickly to prevent
 the 12 byte receive FIFO on a serial channel from overflowing.
diff --git a/share/man/man4/man4.sparc/spif.4 b/share/man/man4/man4.sparc/spif.4
index 05f5b1af71e..44e61a277e4 100644
--- a/share/man/man4/man4.sparc/spif.4
+++ b/share/man/man4/man4.sparc/spif.4
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: spif.4,v 1.16 2010/07/10 19:38:39 miod Exp $
+.\"     $OpenBSD: spif.4,v 1.17 2013/06/02 20:42:27 tedu Exp $
 .\"
 .\" Copyright (c) 1999 Jason L. Wright (jason@thought.net)
 .\" All rights reserved.
@@ -24,7 +24,7 @@
 .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: July 10 2010 $
+.Dd $Mdocdate: June 2 2013 $
 .Dt SPIF 4 sparc
 .Os
 .Sh NAME
@@ -74,9 +74,9 @@ Parallel ports
 .El
 .Sh DIAGNOSTICS
 .Bl -diag
-.It "spif%d: ccr timeout"
+.It "spif0: ccr timeout"
 A timeout occurred while writing to one of the CD180 registers.
-.It "stty%d-%d: ring overflow"
+.It "stty0-N: ring overflow"
 Incoming characters were discarded because the application
 in control of the device did not read the input fast enough.
 .El
diff --git a/share/man/man4/man4.sparc64/magma.4 b/share/man/man4/man4.sparc64/magma.4
index 938727d5531..ad38b13b978 100644
--- a/share/man/man4/man4.sparc64/magma.4
+++ b/share/man/man4/man4.sparc64/magma.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: magma.4,v 1.11 2008/11/29 01:55:06 ray Exp $
+.\"	$OpenBSD: magma.4,v 1.12 2013/06/02 20:42:27 tedu Exp $
 .\"
 .\"
 .\" Copyright (c) 1998 Iain Hibbert
@@ -24,7 +24,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: November 29 2008 $
+.Dd $Mdocdate: June 2 2013 $
 .Dt MAGMA 4 sparc64
 .Os
 .Sh NAME
@@ -69,14 +69,14 @@ Parallel ports
 .El
 .Sh DIAGNOSTICS
 .Bl -diag
-.It "mtty%d%x: ring buffer overflow"
+.It "mtty0X: ring buffer overflow"
 Incoming characters have been discarded due to a buffer overflow.
 This is caused by the process in control of the device not reading characters
 fast enough.
 If need be you can make the ring buffer bigger by changing the
 .Dv MAGMA_RBUF_SIZE
 #define to something bigger, but it should be a multiple of two.
-.It "mtty%d%x: fifo overflow"
+.It "mtty0X: fifo overflow"
 Incoming characters have been discarded due to a CD1400 channel overrun.
 This is caused by interrupts not being serviced sufficiently quickly to prevent
 the 12 byte receive FIFO on a serial channel from overflowing.
diff --git a/share/man/man4/man4.sparc64/spif.4 b/share/man/man4/man4.sparc64/spif.4
index 0fa8a15deb9..faed197ff33 100644
--- a/share/man/man4/man4.sparc64/spif.4
+++ b/share/man/man4/man4.sparc64/spif.4
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: spif.4,v 1.13 2007/05/31 19:19:57 jmc Exp $
+.\"     $OpenBSD: spif.4,v 1.14 2013/06/02 20:42:27 tedu Exp $
 .\"
 .\" Copyright (c) 1999-2002 Jason L. Wright (jason@thought.net)
 .\" All rights reserved.
@@ -24,7 +24,7 @@
 .\" 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 2 2013 $
 .Dt SPIF 4 sparc64
 .Os
 .Sh NAME
@@ -74,9 +74,9 @@ Parallel ports
 .El
 .Sh DIAGNOSTICS
 .Bl -diag
-.It "spif%d: ccr timeout"
+.It "spif0: ccr timeout"
 A timeout occurred while writing to one of the CD180 registers.
-.It "stty%d-%d: ring overflow"
+.It "stty0-N: ring overflow"
 Incoming characters were discarded because the application
 in control of the device did not read the input fast enough.
 .El
diff --git a/share/man/man4/man4.vax/de.4 b/share/man/man4/man4.vax/de.4
index 96fbd0555f5..7f254e75f29 100644
--- a/share/man/man4/man4.vax/de.4
+++ b/share/man/man4/man4.vax/de.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: de.4,v 1.13 2013/01/17 21:54:18 jmc Exp $
+.\"	$OpenBSD: de.4,v 1.14 2013/06/02 20:42:27 tedu Exp $
 .\"	$NetBSD: de.4,v 1.3 1996/03/03 17:13:19 thorpej Exp $
 .\"
 .\" Copyright (c) 1986, 1991 The Regents of the University of California.
@@ -30,7 +30,7 @@
 .\"
 .\"     from: @(#)de.4	6.5 (Berkeley) 3/27/91
 .\"
-.Dd $Mdocdate: January 17 2013 $
+.Dd $Mdocdate: June 2 2013 $
 .Dt DE 4 vax
 .Os
 .Sh NAME
@@ -61,18 +61,18 @@ flag with an
 .Xr ioctl 2 .
 .Sh DIAGNOSTICS
 .Bl -diag
-.It de%d: hardware address %s.
+.It de0: hardware address ....
 This is a normal autoconfiguration message noting the 6 byte physical
 Ethernet address of the adapter.
-.It de%d: oerror, flags=%b tdrerr=%b.
+.It de0: oerror, flags=... tdrerr=....
 The hardware indicated an error
 in transmitting a packet to the cable.
 The status and error flags are reported.
-.It de%d: ierror, flags=%b lenerr=%b (len=%d).
+.It de0: ierror, flags=... lenerr=... (len=N).
 The hardware indicated an error
 in reading a packet from the cable.
 The status and error flags are reported.
-.It de%d: buffer unavailable.
+.It de0: buffer unavailable.
 The interface received more packets
 than it had buffers allocated to receive them.
 .El
@@ -83,11 +83,11 @@ The two control and status registers
 should indicate the nature of the failure.
 See the hardware manual for details.
 .Bl -diag
-.It de%d: reset failed, csr0=%b csr1=%b.
-.It de%d: ppcb failed, csr0=%b csr1=%b.
-.It de%d: read addr failed, csr0=%b csr1=%b.
-.It de%d: wtring failed, csr0=%b csr1=%b.
-.It de%d: wtmode failed, csr0=%b csr1=%b.
+.It de0: reset failed, csr0=... csr1=....
+.It de0: ppcb failed, csr0=... csr1=....
+.It de0: read addr failed, csr0=... csr1=....
+.It de0: wtring failed, csr0=... csr1=....
+.It de0: wtmode failed, csr0=... csr1=....
 .El
 .Sh SEE ALSO
 .Xr arp 4 ,
diff --git a/share/man/man4/man4.vax/dz.4 b/share/man/man4/man4.vax/dz.4
index fba30aaf95b..46d4a4d3e96 100644
--- a/share/man/man4/man4.vax/dz.4
+++ b/share/man/man4/man4.vax/dz.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: dz.4,v 1.12 2008/08/18 23:19:18 miod Exp $
+.\"	$OpenBSD: dz.4,v 1.13 2013/06/02 20:42:27 tedu Exp $
 .\"	$NetBSD: dz.4,v 1.3 1996/03/03 17:13:29 thorpej Exp $
 .\"
 .\" Copyright (c) 1980, 1991 Regents of the University of California.
@@ -30,7 +30,7 @@
 .\"
 .\"     from: @(#)dz.4	6.3 (Berkeley) 3/27/91
 .\"
-.Dd $Mdocdate: August 18 2008 $
+.Dd $Mdocdate: June 2 2013 $
 .Dt DZ 4 vax
 .Os
 .Sh NAME
@@ -104,7 +104,7 @@ dialups
 .El
 .Sh DIAGNOSTICS
 .Bl -diag
-.It dz%d: silo overflow.
+.It dz0: silo overflow.
 The 64 character input silo overflowed
 before it could be serviced.
 This can happen if a hard error occurs when the
diff --git a/share/man/man4/man4.vax/mt.4 b/share/man/man4/man4.vax/mt.4
index 2f1c29f4b06..956544684db 100644
--- a/share/man/man4/man4.vax/mt.4
+++ b/share/man/man4/man4.vax/mt.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mt.4,v 1.11 2013/01/17 21:54:18 jmc Exp $
+.\"	$OpenBSD: mt.4,v 1.12 2013/06/02 20:42:27 tedu Exp $
 .\"	$NetBSD: mt.4,v 1.3 1996/03/03 17:13:52 thorpej Exp $
 .\"
 .\" Copyright (c) 1980, 1991 Regents of the University of California.
@@ -30,7 +30,7 @@
 .\"
 .\"     from: @(#)mt.4	6.4 (Berkeley) 3/27/91
 .\"
-.Dd $Mdocdate: January 17 2013 $
+.Dd $Mdocdate: June 2 2013 $
 .Dt MT 4 vax
 .Os
 .Sh NAME
@@ -56,20 +56,20 @@ runs at 125
 and autoloads tapes.
 .Sh DIAGNOSTICS
 .Bl -diag
-.It mu%d: no write ring.
+.It mu0: no write ring.
 An attempt was made to write on the tape drive
 when no write ring was present; this message is written on the terminal of
 the user who tried to access the tape.
-.It mu%d: not online.
+.It mu0: not online.
 An attempt was made to access the tape while it
 was offline; this message is written on the terminal of the user
 who tried to access the tape.
-.It "mu%d: can't change density in mid-tape."
+.It "mu0: can't change density in mid-tape."
 An attempt was made to write
 on a tape at a different density than is already recorded on the tape.
 This message is written on the terminal of the user who tried to switch
 the density.
-.It "mu%d: hard error bn%d mbsr=%b er=%x ds=%b."
+.It "mu0: hard error bnN mbsr=... er=X ds=...."
 A tape error occurred
 at block
 .Em bn ;
@@ -77,10 +77,10 @@ the mt error register and drive status register are
 printed in octal with the bits symbolically decoded.
 Any error is fatal on non-raw tape; when possible the driver will have retried
 the operation which failed several times before reporting the error.
-.It mu%d: blank tape.
+.It mu0: blank tape.
 An attempt was made to read a blank tape (a tape without even
 end-of-file marks).
-.It mu%d: offline.
+.It mu0: offline.
 During an i/o operation the device was set offline.
 If a non-raw tape was used in the access it is closed.
 .El
diff --git a/share/man/man4/man4.vax/ra.4 b/share/man/man4/man4.vax/ra.4
index adbd658949f..a0a02438c3d 100644
--- a/share/man/man4/man4.vax/ra.4
+++ b/share/man/man4/man4.vax/ra.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ra.4,v 1.9 2013/01/17 21:54:18 jmc Exp $
+.\"	$OpenBSD: ra.4,v 1.10 2013/06/02 20:42:27 tedu Exp $
 .\"
 .\" Copyright (c) 2003 Jason L. Wright (jason@thought.net)
 .\" All rights reserved.
@@ -24,7 +24,7 @@
 .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: January 17 2013 $
+.Dd $Mdocdate: June 2 2013 $
 .Dt RA 4 vax
 .Os
 .Sh NAME
@@ -56,7 +56,7 @@ partition
 .El
 .Sh DIAGNOSTICS
 .Bl -diag
-.It "ra%d: don't have a partition table for %s; using (s,t,c)=(%d,%d,%d)"
+.It "ra0: don't have a partition table for ...; using (s,t,c)=(X,Y,Z)"
 The controller found a drive whose media identifier (e.g. `RA 25')
 does not have a default partition table.
 A temporary partition
@@ -66,19 +66,19 @@ track (s), tracks per cylinder (t), and total cylinders (c).
 Give the pack a label with the
 .Xr disklabel 8
 utility.
-.It "ra%d: drive will not come on line"
+.It "ra0: drive will not come on line"
 The drive will not come on line, probably because it is spun down.
 This should be preceded by a message giving details as to why the
 drive stayed off line.
-.It "uda%d: attempt to bring ra%d on line failed:  `detail'"
+.It "uda0: attempt to bring ra0 on line failed:  `detail'"
 The drive could not be brought on line.
 The
 .Em detail
 message tells why.
-.It "uda%d: ra%d: unknown type %d"
+.It "uda0: ra0: unknown type N"
 The type index of the named drive is not known to the driver, so the
 drive will be ignored.
-.It "ra%d: changed types! was %d now %d"
+.It "ra0: changed types! was X now Y"
 A drive somehow changed from one kind to another, e.g., from an
 .Tn RA80
 to an
@@ -87,11 +87,11 @@ The numbers printed are the encoded media identifiers (see
 .Aq Pa vax/mscp.h
 for the encoding).
 The driver believes the new type.
-.It "ra%d: uda%d, unit %d, size = %d sectors"
+.It "ra0: uda0, unit N, size = N sectors"
 The named drive is on the indicated controller as the given unit,
 and has that many sectors of user-file area.
 This is printed during configuration.
-.It "ra%d: bad block report: %d"
+.It "ra0: bad block report: N"
 The drive has reported the given block as bad.
 If there are multiple bad blocks, the drive will report only the first;
 in this case this message will be followed by `+ others'.
@@ -100,32 +100,32 @@ Get
 to forward the
 block with
 .Tn EVRLK .
-.It "ra%d: bad lbn (%d)?"
+.It "ra0: bad lbn (N)?"
 The drive has reported an invalid command error, probably due to an
 invalid block number.
 If the lbn value is very much greater than the
 size reported by the drive, this is the problem.
 It is probably due to an improperly configured partition table.
 Other invalid commands indicate a bug in the driver, or hardware trouble.
-.It "ra%d: duplicate ONLINE ignored"
+.It "ra0: duplicate ONLINE ignored"
 The drive has come on-line while already on-line.
 This condition can probably be ignored (and has been).
-.It "ra%d: io done, but no buffer?"
+.It "ra0: io done, but no buffer?"
 Hardware trouble, or a bug; the drive has finished an I/O
 request,
 but the response has an invalid (zero) command reference number.
-.It "ra%d: bogus REPLACE end"
+.It "ra0: bogus REPLACE end"
 The drive has reported finishing a bad sector replacement, but the
 driver never issues bad sector replacement commands.
 The report is ignored.
 This is likely a hardware problem.
-.It "ra%d: unknown opcode 0x%x status 0x%x ignored"
+.It "ra0: unknown opcode 0x%x status 0x%x ignored"
 The drive has reported something that the driver cannot understand.
 Perhaps
 .Tn DEC
 has been inventive, or perhaps your hardware is ill.
 This is followed by a hex dump of the offending packet.
-.It "ra%d%c: hard error %sing fsbn %d [of %d-%d] (ra%d bn %d cn %d tn %d sn %d)."
+.It "ra0%c: hard error %sing fsbn N [of X-Y] (ra0 bn N cn N tn N sn N)."
 An unrecoverable error occurred during transfer of the specified
 filesystem block number(s),
 which are logical block numbers on the indicated partition.
diff --git a/share/man/man4/man4.vax/rx.4 b/share/man/man4/man4.vax/rx.4
index efe4165f0df..bb2d7fc09f5 100644
--- a/share/man/man4/man4.vax/rx.4
+++ b/share/man/man4/man4.vax/rx.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rx.4,v 1.15 2013/01/17 21:54:18 jmc Exp $
+.\"	$OpenBSD: rx.4,v 1.16 2013/06/02 20:42:27 tedu Exp $
 .\"	$NetBSD: rx.4,v 1.3 1996/03/03 17:14:03 thorpej Exp $
 .\"
 .\" Copyright (c) 1983, 1991 Regents of the University of California.
@@ -30,7 +30,7 @@
 .\"
 .\"     from: @(#)rx.4	6.2 (Berkeley) 3/27/91
 .\"
-.Dd $Mdocdate: January 17 2013 $
+.Dd $Mdocdate: June 2 2013 $
 .Dt RX 4 vax
 .Os
 .Sh NAME
@@ -131,11 +131,11 @@ hold file systems.
 .El
 .Sh DIAGNOSTICS
 .Bl -diag
-.It "rx%d: hard error, trk %d psec %d cs=%b, db=%b, err=%x, %x, %x, %x."
+.It "rx0: hard error, trk N psec N cs=..., db=..., err=X, X, X, X."
 An unrecoverable error was encountered.
 The track and physical sector numbers, the device registers and the
 extended error status are displayed.
-.It rx%d: state %d (reset).
+.It rx0: state N (reset).
 The driver entered a bogus state.
 This should not happen.
 .El
diff --git a/share/man/man4/man4.vax/uda.4 b/share/man/man4/man4.vax/uda.4
index c8149c9dac2..0fb3c45bd1c 100644
--- a/share/man/man4/man4.vax/uda.4
+++ b/share/man/man4/man4.vax/uda.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: uda.4,v 1.19 2010/02/18 13:23:38 schwarze Exp $
+.\"	$OpenBSD: uda.4,v 1.20 2013/06/02 20:42:27 tedu Exp $
 .\"	$NetBSD: uda.4,v 1.3 1996/03/03 17:14:10 thorpej Exp $
 .\"
 .\" Copyright (c) 1980, 1987, 1991 Regents of the University of California.
@@ -30,7 +30,7 @@
 .\"
 .\"     from: @(#)uda.4	6.6 (Berkeley) 3/27/91
 .\"
-.Dd $Mdocdate: February 18 2010 $
+.Dd $Mdocdate: June 2 2013 $
 .Dt UDA 4 vax
 .Os
 .Sh NAME
@@ -218,42 +218,42 @@ copying (it maps the entire disk).
 No command packets were available while the driver was looking
 for disk drives.
 The controller is not extending enough credits to use the drives.
-.It "uda%d: no response to Get Unit Status request"
+.It "uda0: no response to Get Unit Status request"
 A disk drive was found, but did not respond to a status request.
 This is either a hardware problem or someone pulling unit number
 plugs very fast.
-.It "uda%d: unit %d off line"
+.It "uda0: unit N off line"
 While searching for drives, the controller found one that
 seems to be manually disabled.
 It is ignored.
-.It "uda%d: unable to get unit status"
+.It "uda0: unable to get unit status"
 Something went wrong while trying to determine the status of
 a disk drive.
 This is followed by an error detail.
-.It "uda%d: unit %d, next %d"
+.It "uda0: unit N, next X"
 This probably never happens, but I wanted to know if it did.
 I have no idea what one should do about it.
-.It "uda%d: cannot handle unit number %d (max is %d)"
+.It "uda0: cannot handle unit number N (max is X)"
 The controller found a drive whose unit number is too large.
 Valid unit numbers are those in the range [0..7].
-.It "uda%d: uballoc map failed"
+.It "uda0: uballoc map failed"
 UNIBUS resource map allocation failed during initialization.
 This can only happen if you have 496 devices on a UNIBUS.
-.It "uda%d: timeout during init"
+.It "uda0: timeout during init"
 The controller did not initialize within ten seconds.
 A hardware problem, but it sometimes goes away if you try again.
-.It "uda%d: init failed, sa=%b"
+.It "uda0: init failed, sa=..."
 The controller refused to initialize.
-.It "uda%d: controller hung"
+.It "uda0: controller hung"
 The controller never finished initialization.
 Retrying may sometimes fix it.
-.It "uda%d: still hung"
+.It "uda0: still hung"
 When the controller hangs, the driver occasionally tries to reinitialize
 it.
 This means it just tried, without success.
 .It "panic: udastart: bp==NULL"
 A bug in the driver has put an empty drive queue on a controller queue.
-.It "uda%d: command ring too small"
+.It "uda0: command ring too small"
 If you increase
 .Dv NCMDL2 ,
 you may see a performance improvement.
@@ -263,7 +263,7 @@ you may see a performance improvement.
 A drive was found marked for status or on-line functions while performing
 status or on-line functions.
 This indicates a bug in the driver.
-.It "uda%d: controller error, sa=0%o (%s)"
+.It "uda0: controller error, sa=0%o (...)"
 The controller reported an error.
 The error code is printed in
 octal, along with a short description if the code is known (see the
@@ -276,15 +276,15 @@ If this occurs during normal
 operation, the driver will reset it and retry pending I/O.
 If
 it occurs during configuration, the controller may be ignored.
-.It "uda%d: stray intr"
+.It "uda0: stray intr"
 The controller interrupted when it should have stayed quiet.
 The interrupt has been ignored.
-.It "uda%d: init step %d failed, sa=%b"
+.It "uda0: init step N failed, sa=..."
 The controller reported an error during the named initialization step.
 The driver will retry initialization later.
-.It "uda%d: version %d model %d"
+.It "uda0: version X model Y"
 An informational message giving the revision level of the controller.
-.It "uda%d: DMA burst size set to %d"
+.It "uda0: DMA burst size set to N"
 An informational message showing the
 .Tn DMA
 burst size, in words.
@@ -292,32 +292,32 @@ burst size, in words.
 Indicates a bug in the generic
 .Tn MSCP
 code.
-.It "uda%d: driver bug, state %d"
+.It "uda0: driver bug, state N"
 The driver has a bogus value for the controller state.
 Something is quite wrong.
 This is immediately followed by a
 .Sq panic: udastate .
-.It "uda%d: purge bdp %d"
+.It "uda0: purge bdp N"
 A benign message tracing BDP purges.
 I have been trying to figure out what BDP purges are for.
 You might want to comment out this
 call to log() in
 .Pa /sys/arch/vax/uba/uda.c .
-.It "uda%d: SETCTLRC failed:  `detail'"
+.It "uda0: SETCTLRC failed:  `detail'"
 The Set Controller Characteristics command (the last part of the
 controller initialization sequence) failed.
 The
 .Em detail
 message tells why.
-.It "uda%d: attempt to bring ra%d on line failed:  `detail'"
+.It "uda0: attempt to bring ra0 on line failed:  `detail'"
 The drive could not be brought on line.
 The
 .Em detail
 message tells why.
-.It "uda%d: ra%d: unknown type %d"
+.It "uda0: ra0: unknown type N"
 The type index of the named drive is not known to the driver, so the
 drive will be ignored.
-.It "uda%d: attempt to get status for ra%d failed:  `detail'"
+.It "uda0: attempt to get status for ra0 failed:  `detail'"
 A status request failed.
 The
 .Em detail
@@ -333,7 +333,7 @@ so something is wrong.
 The controller reported completion of bad block related I/O.
 The
 driver never issues any such, so something is wrong.
-.It "uda%d: lost interrupt"
+.It "uda0: lost interrupt"
 The controller has gone out to lunch, and is being reset to try to bring
 it back.
 .It "panic: mscp_go: AEB_MAX_BP too small"
@@ -347,22 +347,22 @@ Raise
 .Dv AEB_MAX_BP
 or turn off
 .Dv AVOID_EMULEX_BUG .
-.It "uda%d: unit %d: unknown message type 0x%x ignored"
+.It "uda0: unit N: unknown message type 0xXXX ignored"
 The controller responded with a mysterious message type.
 See
 .Pa /sys/vax/mscp.h
 for a list of known message types.
 This is probably a controller hardware problem.
-.It "uda%d: unit %d out of range"
+.It "uda0: unit N out of range"
 The disk drive unit number (the unit plug) is higher than the
 maximum number the driver allows (currently 7).
-.It "uda%d: unit %d not configured, message ignored"
+.It "uda0: unit N not configured, message ignored"
 The named disk drive has announced its presence to the controller,
 but was not, or cannot now be, configured into the running system.
 .Em Message
 is one of `available attention' (an `I am here' message) or
-`stray response op 0x%x status 0x%x' (anything else).
-.It "Emulex SC41/MS screwup: uda%d, got %d correct, then changed 0x%x to 0x%x"
+`stray response op 0xXXXX status 0xXXXX' (anything else).
+.It "Emulex SC41/MS screwup: uda0, got N correct, then changed 0xXXXX to 0xYYYY"
 You turned on
 .Dv AVOID_EMULEX_BUG ,
 and the driver successfully
@@ -378,7 +378,7 @@ avoided the avoidance.
 Try turning on
 .Dv MSCP_PARANOIA
 instead.
-.It "uda%d: bad response packet ignored"
+.It "uda0: bad response packet ignored"
 You turned on
 .Dv MSCP_PARANOIA ,
 and the driver caught the controller in
@@ -386,7 +386,7 @@ a lie.
 The lie has been ignored, and the controller will soon be
 reset (after a `lost' interrupt).
 This is followed by a hex dump of the offending packet.
-.It "uda%d: %s error datagram"
+.It "uda0: ... error datagram"
 The controller has reported some kind of error, either `hard'
 (unrecoverable) or `soft' (recoverable).
 If the controller is going on
@@ -402,7 +402,7 @@ be followed by a failure detail message (also listed below).
 .It memory addr 0x%x
 A host memory access error; this is the address that could not be
 read.
-.It "unit %d: level %d retry %d, %s %d"
+.It "unit N: level N retry N, ... N"
 A typical disk error; the retry count and error recovery levels are
 printed, along with the block type (`lbn', or logical block; or `rbn',
 or replacement block) and number.
@@ -410,7 +410,7 @@ If the string is something else,
 .Tn DEC
 has been clever, or your hardware has gone to Australia for vacation
 (unless you live there; then it might be in New Zealand, or Brazil).
-.It unit %d: %s %d
+.It unit N: ... N
 Also a disk error, but an `SDI' error, whatever that is.
 .Po
 I doubt it has anything to do with Ronald Reagan.
@@ -423,12 +423,12 @@ be used by field service as an aid in locating failing hardware.
 The codes for RA81s can be found in the
 .%T RA81 Maintenance Guide ,
 DEC order number AA-M879A-TC, in appendices E and F.
-.It "unit %d: small disk error, cyl %d"
+.It "unit N: small disk error, cyl N"
 Yet another kind of disk error, but for small disks.
 .Po
 ``That's what it says, guv'nor. Dunnask me what it means.''
 .Pc
-.It "unit %d: unknown error, format 0x%x"
+.It "unit N: unknown error, format 0x%x"
 A mysterious error: the given format code is not known.
 .El
 .Ed
@@ -436,26 +436,26 @@ A mysterious error: the given format code is not known.
 The detail messages are as follows:
 .Bd -filled -offset indent
 .Bl -diag
-.It success (%s) (code 0, subcode %d)
+.It success (...) (code 0, subcode N)
 Everything worked, but the controller thought it would let you know
 that something went wrong.
 No matter what subcode, this can probably
 be ignored.
-.It "invalid command (%s) (code 1, subcode %d)"
-This probably cannot occur unless the hardware is out; %s should be
+.It "invalid command (...) (code 1, subcode N)"
+This probably cannot occur unless the hardware is out; ... should be
 `invalid msg length', meaning some command was too short or too long.
-.It "command aborted (unknown subcode) (code 2, subcode %d)"
+.It "command aborted (unknown subcode) (code 2, subcode N)"
 This should never occur, as the driver never aborts commands.
-.It "unit offline (%s) (code 3, subcode %d)"
+.It "unit offline (...) (code 3, subcode N)"
 The drive is offline, either because it is not around (`unknown
 drive'), stopped (`not mounted'), out of order (`inoperative'), has the
 same unit number as some other drive (`duplicate'), or has been
 disabled for diagnostics (`in diagnosis').
-.It "unit available (unknown subcode) (code 4, subcode %d)"
+.It "unit available (unknown subcode) (code 4, subcode N)"
 The controller has decided to report a perfectly normal event as
 an error.
 (Why?)
-.It "media format error (%s) (code 5, subcode %d)"
+.It "media format error (...) (code 5, subcode N)"
 The drive cannot be used without reformatting.
 The Format Control
 Table cannot be read (`fct unread - edc'), there is a bad sector
@@ -466,14 +466,14 @@ or the
 has an uncorrectable
 .Tn ECC
 error (`fct ecc').
-.It "write protected (%s) (code 6, subcode %d)"
+.It "write protected (...) (code 6, subcode N)"
 The drive is write protected, either by the front panel switch
 (`hardware') or via the driver (`software').
 The driver never sets software write protect.
-.It "compare error (unknown subcode) (code 7, subcode %d)"
+.It "compare error (unknown subcode) (code 7, subcode N)"
 A compare operation showed some sort of difference.
 The driver never uses compare operations.
-.It "data error (%s) (code 7, subcode %d)"
+.It "data error (...) (code 7, subcode N)"
 Something went wrong reading or writing a data sector.
 A `forced
 error' is a software-asserted error used to mark a sector that contains
@@ -487,7 +487,7 @@ An `uncorrectable ecc' error is an ordinary data error that cannot
 be fixed via
 .Tn ECC
 logic.
-A `%d symbol ecc' error is a data error
+A `N symbol ecc' error is a data error
 that can be (and presumably has been) corrected by the
 .Tn ECC
 logic.
@@ -495,19 +495,19 @@ It might indicate a sector that is imperfect but usable, or that
 is starting to go bad.
 If any of these errors recur, the sector
 may need to be replaced.
-.It "host buffer access error (%s) (code %d, subcode %d)"
+.It "host buffer access error (...) (code N, subcode N)"
 Something went wrong while trying to copy data to or from the host
 (Vax).
 The subcode is one of `odd xfer addr', `odd xfer count',
 `non-exist. memory', or `memory parity'.
 The first two could be a
 software glitch; the last two indicate hardware problems.
-.It controller error (%s) (code %d, subcode %d)
+.It controller error (...) (code N, subcode N)
 The controller has detected a hardware error in itself.
 A `serdes overrun' is a serialiser / deserialiser overrun; `edc'
 probably stands for `error detection code'; and `inconsistent
 internal data struct' is obvious.
-.It "drive error (%s) (code %d, subcode %d)"
+.It "drive error (...) (code N, subcode N)"
 Either the controller or the drive has detected a hardware error
 in the drive.
 I am not sure what an `sdi command timeout' is, but