summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--kerberosV/src/kdc/hprop.82
-rw-r--r--lib/libc/sys/reboot.26
-rw-r--r--libexec/ld.so/ld.so.16
-rw-r--r--libexec/makewhatis/makewhatis.86
-rw-r--r--regress/usr.bin/mandoc/mdoc/Xr/Makefile6
-rw-r--r--regress/usr.bin/mandoc/mdoc/Xr/args.in10
-rw-r--r--regress/usr.bin/mandoc/mdoc/Xr/args.out_ascii7
-rw-r--r--sbin/fsdb/fsdb.86
-rw-r--r--share/man/man4/gif.46
-rw-r--r--share/man/man4/lc.46
-rw-r--r--share/man/man4/man4.sparc/mgx.46
-rw-r--r--share/man/man4/man4.sparc/tvtwo.46
-rw-r--r--share/man/man4/man4.sparc64/mgx.46
-rw-r--r--share/man/man4/man4.sparc64/tvtwo.46
-rw-r--r--share/man/man4/netintro.46
-rw-r--r--share/man/man4/sm.46
-rw-r--r--share/man/man4/we.46
-rw-r--r--share/man/man5/bsd.port.mk.512
-rw-r--r--sys/arch/amd64/stand/biosboot/biosboot.812
-rw-r--r--sys/arch/i386/stand/biosboot/biosboot.812
-rw-r--r--usr.bin/jot/jot.16
-rw-r--r--usr.bin/mandoc/mdoc_macro.c15
-rw-r--r--usr.sbin/sensorsd/sensorsd.conf.56
23 files changed, 74 insertions, 92 deletions
diff --git a/kerberosV/src/kdc/hprop.8 b/kerberosV/src/kdc/hprop.8
index 732c85cfb8e..8b6dbf48d95 100644
--- a/kerberosV/src/kdc/hprop.8
+++ b/kerberosV/src/kdc/hprop.8
@@ -185,7 +185,7 @@ Deprecated, identical to
.Sh EXAMPLES
The following will propagate a database to another machine (which
should run
-.Xr hpropd 8 ):
+.Xr hpropd 8 ) :
.Bd -literal -offset indent
$ hprop slave-1 slave-2
.Ed
diff --git a/lib/libc/sys/reboot.2 b/lib/libc/sys/reboot.2
index e5a46ea9835..c50033cdc43 100644
--- a/lib/libc/sys/reboot.2
+++ b/lib/libc/sys/reboot.2
@@ -1,4 +1,4 @@
-.\" $OpenBSD: reboot.2,v 1.14 2008/09/12 05:15:54 jmc Exp $
+.\" $OpenBSD: reboot.2,v 1.15 2011/12/03 23:01:21 schwarze Exp $
.\" $NetBSD: reboot.2,v 1.5 1995/02/27 12:36:02 cgd Exp $
.\"
.\" Copyright (c) 1980, 1991, 1993
@@ -30,7 +30,7 @@
.\"
.\" @(#)reboot.2 8.1 (Berkeley) 6/4/93
.\"
-.Dd $Mdocdate: September 12 2008 $
+.Dd $Mdocdate: December 3 2011 $
.Dt REBOOT 2
.Os
.Sh NAME
@@ -92,7 +92,7 @@ even if
.Dv RB_HALT
is not specified.
This is because
-.Xr panic 9 s
+.Xr panic 9 Ns s
during startup will probably just repeat on the next boot.
Use of this option implies that the user has requested the action
specified (for example, using the
diff --git a/libexec/ld.so/ld.so.1 b/libexec/ld.so/ld.so.1
index 5643f53d4ce..0c931ea4bb4 100644
--- a/libexec/ld.so/ld.so.1
+++ b/libexec/ld.so/ld.so.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ld.so.1,v 1.17 2008/08/24 20:43:53 martynas Exp $
+.\" $OpenBSD: ld.so.1,v 1.18 2011/12/03 23:01:21 schwarze Exp $
.\" $NetBSD: rtld.1,v 1.2 1995/10/08 23:43:28 pk Exp $
.\"
.\" Copyright (c) 1995 Paul Kranenburg
@@ -29,7 +29,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: August 24 2008 $
+.Dd $Mdocdate: December 3 2011 $
.Dt LD.SO 1
.Os
.Sh NAME
@@ -123,7 +123,7 @@ the absolute pathnames of all objects, to standard output.
When set, these variables are interpreted as format strings a la
.Xr printf 3
to customize the trace output and are used by
-.Xr ldd 1 's
+.Xr ldd 1 Ns 's
.Fl f
option and allows
.Xr ldd 1
diff --git a/libexec/makewhatis/makewhatis.8 b/libexec/makewhatis/makewhatis.8
index 686a704a96d..3e88e25263b 100644
--- a/libexec/makewhatis/makewhatis.8
+++ b/libexec/makewhatis/makewhatis.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: makewhatis.8,v 1.18 2011/03/02 07:48:22 jmc Exp $
+.\" $OpenBSD: makewhatis.8,v 1.19 2011/12/03 23:01:21 schwarze Exp $
.\" $NetBSD: makewhatis.8,v 1.2.2.1 1997/11/10 19:57:45 thorpej Exp $
.\"
.\" Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd $Mdocdate: March 2 2011 $
+.Dd $Mdocdate: December 3 2011 $
.Dt MAKEWHATIS 8
.Os
.Sh NAME
@@ -60,7 +60,7 @@ for use with
.Xr apropos 1 ,
.Xr whatis 1 ,
and
-.Xr man 1 's
+.Xr man 1 Ns 's
.Fl k
option.
If
diff --git a/regress/usr.bin/mandoc/mdoc/Xr/Makefile b/regress/usr.bin/mandoc/mdoc/Xr/Makefile
index 47de1d1c8b8..fb494d29804 100644
--- a/regress/usr.bin/mandoc/mdoc/Xr/Makefile
+++ b/regress/usr.bin/mandoc/mdoc/Xr/Makefile
@@ -1,9 +1,5 @@
-# $OpenBSD: Makefile,v 1.2 2011/11/17 16:28:46 schwarze Exp $
+# $OpenBSD: Makefile,v 1.3 2011/12/03 23:01:21 schwarze Exp $
REGRESS_TARGETS=args
-# groff 1.21 inserts a space after the second argument
-
-SKIP_GROFF ?= args
-
.include <bsd.regress.mk>
diff --git a/regress/usr.bin/mandoc/mdoc/Xr/args.in b/regress/usr.bin/mandoc/mdoc/Xr/args.in
index e3939ae3991..8dece170483 100644
--- a/regress/usr.bin/mandoc/mdoc/Xr/args.in
+++ b/regress/usr.bin/mandoc/mdoc/Xr/args.in
@@ -1,4 +1,4 @@
-.Dd April 23, 2010
+.Dd December 3, 2011
.Dt XR-ARGS 1
.Os OpenBSD
.Sh NAME
@@ -7,13 +7,11 @@
.Sh DESCRIPTION
One single
.Xr echo 1
-is fine.
+is fine, and so is an
+.Xr echo 1 followed by something else.
.Pp
But listen for multiple
-.Xr echo 1 s .
-.Pp
-Listen for those
-.Xr echo 1 s really hard .
+.Xr echo 1 Ns s .
.Pp
A call, an
.Xr echo 1 , and
diff --git a/regress/usr.bin/mandoc/mdoc/Xr/args.out_ascii b/regress/usr.bin/mandoc/mdoc/Xr/args.out_ascii
index 5d310004cb5..170d5bb7bde 100644
--- a/regress/usr.bin/mandoc/mdoc/Xr/args.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Xr/args.out_ascii
@@ -4,14 +4,13 @@ NNAAMMEE
XXrr--aarrggss - additional arguments to cross references
DDEESSCCRRIIPPTTIIOONN
- One single echo(1) is fine.
+ One single echo(1) is fine, and so is an echo(1) followed by something
+ else.
But listen for multiple echo(1)s.
- Listen for those echo(1)s really hard.
-
A call, an echo(1), and another echo(1).
Finally, half an echo and no echo at all.
-OpenBSD April 23, 2010 OpenBSD
+OpenBSD December 3, 2011 OpenBSD
diff --git a/sbin/fsdb/fsdb.8 b/sbin/fsdb/fsdb.8
index 64de2dc3bcf..3c31b3fe1a7 100644
--- a/sbin/fsdb/fsdb.8
+++ b/sbin/fsdb/fsdb.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: fsdb.8,v 1.17 2008/06/26 05:42:06 ray Exp $
+.\" $OpenBSD: fsdb.8,v 1.18 2011/12/03 23:01:21 schwarze Exp $
.\" $NetBSD: fsdb.8,v 1.5 1997/01/11 05:51:40 lukem Exp $
.\"
.\" Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd $Mdocdate: June 26 2008 $
+.Dd $Mdocdate: December 3 2011 $
.Dt FSDB 8
.Os
.Sh NAME
@@ -61,7 +61,7 @@ The options are as follows:
.Bl -tag -width Ds
.It Fl d
Enables additional debugging output (which comes primarily from
-.Xr fsck 8 -derived
+.Xr fsck 8 Ns -derived
code).
.It Fl f Ar fsname
Open file system
diff --git a/share/man/man4/gif.4 b/share/man/man4/gif.4
index 4e820e63ab2..f27d9a4c9a9 100644
--- a/share/man/man4/gif.4
+++ b/share/man/man4/gif.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: gif.4,v 1.24 2009/11/24 19:13:07 jmc Exp $
+.\" $OpenBSD: gif.4,v 1.25 2011/12/03 23:01:21 schwarze Exp $
.\" $KAME: gif.4,v 1.15 2000/04/19 09:39:42 itojun Exp $
.\"
.\" Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -28,7 +28,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd $Mdocdate: November 24 2009 $
+.Dd $Mdocdate: December 3 2011 $
.Dt GIF 4
.Os
.Sh NAME
@@ -61,7 +61,7 @@ For all six modes the
interface must be configured with the
addresses used for the outer header.
This can be done by using
-.Xr ifconfig 8 's
+.Xr ifconfig 8 Ns 's
.Ic tunnel
command (which uses the
.Dv SIOCSIFPHYADDR
diff --git a/share/man/man4/lc.4 b/share/man/man4/lc.4
index 20b28b511ee..a94a4dc6447 100644
--- a/share/man/man4/lc.4
+++ b/share/man/man4/lc.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: lc.4,v 1.11 2008/06/26 05:42:06 ray Exp $
+.\" $OpenBSD: lc.4,v 1.12 2011/12/03 23:01:21 schwarze Exp $
.\" $NetBSD: lc.4,v 1.4 1999/12/15 22:07:32 abs Exp $
.\"
.\" Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd $Mdocdate: June 26 2008 $
+.Dd $Mdocdate: December 3 2011 $
.Dt LC 4
.Os
.Sh NAME
@@ -49,7 +49,7 @@ The EtherWORKS III series supports various combinations of media, depending
on model.
Some models also support media autoselect.
Media is selected with
-.Xr ifconfig 8 's
+.Xr ifconfig 8 Ns 's
.Sq media
directive.
.Sh SEE ALSO
diff --git a/share/man/man4/man4.sparc/mgx.4 b/share/man/man4/man4.sparc/mgx.4
index dac8dba1c42..579f7a66436 100644
--- a/share/man/man4/man4.sparc/mgx.4
+++ b/share/man/man4/man4.sparc/mgx.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: mgx.4,v 1.12 2011/09/03 22:59:07 jmc Exp $
+.\" $OpenBSD: mgx.4,v 1.13 2011/12/03 23:01:21 schwarze Exp $
.\"
.\" Copyright (c) 2003, 2005 Miodrag Vallat
.\"
@@ -23,7 +23,7 @@
.\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd $Mdocdate: September 3 2011 $
+.Dd $Mdocdate: December 3 2011 $
.Dt MGX 4 sparc
.Os
.Sh NAME
@@ -52,7 +52,7 @@ interface.
The MGX and MGXPlus frame buffers will adapt their resolution to the monitor
they are connected to.
However, when not connected to a Sun monitor, the device will default to the
-.Xr cgthree 4 -compatible
+.Xr cgthree 4 Ns -compatible
1152x900 resolution, with a refresh rate of 66Hz.
A different resolution can be forced using the set of DIP switches
.Pq sometimes covered by metal foil
diff --git a/share/man/man4/man4.sparc/tvtwo.4 b/share/man/man4/man4.sparc/tvtwo.4
index 880e287f285..a6041a6e269 100644
--- a/share/man/man4/man4.sparc/tvtwo.4
+++ b/share/man/man4/man4.sparc/tvtwo.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: tvtwo.4,v 1.17 2011/09/03 22:59:07 jmc Exp $
+.\" $OpenBSD: tvtwo.4,v 1.18 2011/12/03 23:01:21 schwarze Exp $
.\" Copyright (c) 2003 Miodrag Vallat. All rights reserved.
.\"
.\" Redistribution and use in source and binary forms, with or without
@@ -22,7 +22,7 @@
.\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd $Mdocdate: September 3 2011 $
+.Dd $Mdocdate: December 3 2011 $
.Dt TVTWO 4 sparc
.Os
.Sh NAME
@@ -50,7 +50,7 @@ interface.
The XVideo and PowerVideo frame buffers will adapt their resolution and
refresh rate to the monitor they are connected to.
However, when not connected to a Sun monitor, the device will default to the
-.Xr cgthree 4 -compatible
+.Xr cgthree 4 Ns -compatible
1152x900 resolution, with a refresh rate of 67Hz.
A different resolution can be forced using the rotary switch on the edge
of the board.
diff --git a/share/man/man4/man4.sparc64/mgx.4 b/share/man/man4/man4.sparc64/mgx.4
index 3644ec5ad5a..feb2c04ddfa 100644
--- a/share/man/man4/man4.sparc64/mgx.4
+++ b/share/man/man4/man4.sparc64/mgx.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: mgx.4,v 1.13 2011/09/03 22:59:07 jmc Exp $
+.\" $OpenBSD: mgx.4,v 1.14 2011/12/03 23:01:21 schwarze Exp $
.\"
.\" Copyright (c) 2003, 2005 Miodrag Vallat
.\"
@@ -23,7 +23,7 @@
.\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd $Mdocdate: September 3 2011 $
+.Dd $Mdocdate: December 3 2011 $
.Dt MGX 4 sparc64
.Os
.Sh NAME
@@ -52,7 +52,7 @@ interface.
The MGX and MGXPlus frame buffers will adapt their resolution to the monitor
they are connected to.
However, when not connected to a Sun monitor, the device will default to the
-.Xr cgthree 4 -compatible
+.Xr cgthree 4 Ns -compatible
1152x900 resolution, with a refresh rate of 66Hz.
A different resolution can be forced using the set of DIP switches
.Pq sometimes covered by metal foil
diff --git a/share/man/man4/man4.sparc64/tvtwo.4 b/share/man/man4/man4.sparc64/tvtwo.4
index b68ced87e89..1fa3e0027ad 100644
--- a/share/man/man4/man4.sparc64/tvtwo.4
+++ b/share/man/man4/man4.sparc64/tvtwo.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: tvtwo.4,v 1.10 2011/09/03 22:59:07 jmc Exp $
+.\" $OpenBSD: tvtwo.4,v 1.11 2011/12/03 23:01:21 schwarze Exp $
.\" Copyright (c) 2003 Miodrag Vallat. All rights reserved.
.\"
.\" Redistribution and use in source and binary forms, with or without
@@ -22,7 +22,7 @@
.\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd $Mdocdate: September 3 2011 $
+.Dd $Mdocdate: December 3 2011 $
.Dt TVTWO 4 sparc64
.Os
.Sh NAME
@@ -50,7 +50,7 @@ interface.
The XVideo and PowerVideo frame buffers will adapt their resolution and
refresh rate to the monitor they are connected to.
However, when not connected to a Sun monitor, the device will default to the
-.Xr cgthree 4 -compatible
+.Xr cgthree 4 Ns -compatible
1152x900 resolution, with a refresh rate of 67Hz.
A different resolution can be forced using the rotary switch on the edge
of the board.
diff --git a/share/man/man4/netintro.4 b/share/man/man4/netintro.4
index b45ab8c2369..d3330799437 100644
--- a/share/man/man4/netintro.4
+++ b/share/man/man4/netintro.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: netintro.4,v 1.40 2009/01/29 19:35:27 claudio Exp $
+.\" $OpenBSD: netintro.4,v 1.41 2011/12/03 23:01:21 schwarze Exp $
.\" $NetBSD: netintro.4,v 1.4 1995/10/19 08:03:40 jtc Exp $
.\"
.\" Copyright (c) 1983, 1990, 1991, 1993
@@ -30,7 +30,7 @@
.\"
.\" @(#)netintro.4 8.2 (Berkeley) 11/30/93
.\"
-.Dd $Mdocdate: January 29 2009 $
+.Dd $Mdocdate: December 3 2011 $
.Dt NETINTRO 4
.Os
.Sh NAME
@@ -182,7 +182,7 @@ A user process (or possibly multiple co-operating processes)
maintains this database by sending messages over a special kind
of socket.
This supplants fixed-size
-.Xr ioctl 2 's
+.Xr ioctl 2 Ns s
used in earlier releases.
.Pp
This facility is described in
diff --git a/share/man/man4/sm.4 b/share/man/man4/sm.4
index c67358b2949..949750ec532 100644
--- a/share/man/man4/sm.4
+++ b/share/man/man4/sm.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: sm.4,v 1.17 2008/06/26 05:42:07 ray Exp $
+.\" $OpenBSD: sm.4,v 1.18 2011/12/03 23:01:21 schwarze Exp $
.\" $NetBSD: sm.4,v 1.3 1998/08/09 00:39:02 thorpej Exp $
.\"
.\" Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd $Mdocdate: June 26 2008 $
+.Dd $Mdocdate: December 3 2011 $
.Dt SM 4
.Os
.Sh NAME
@@ -96,7 +96,7 @@ To enable the AUI media, select the
or
.Em aui
media type with
-.Xr ifconfig 8 's
+.Xr ifconfig 8 Ns 's
.Sq media
directive.
To select UTP, select the
diff --git a/share/man/man4/we.4 b/share/man/man4/we.4
index 6c8161f974d..fb91de2979c 100644
--- a/share/man/man4/we.4
+++ b/share/man/man4/we.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: we.4,v 1.14 2008/06/26 05:42:07 ray Exp $
+.\" $OpenBSD: we.4,v 1.15 2011/12/03 23:01:21 schwarze Exp $
.\" $NetBSD: we.4,v 1.4 1998/08/09 00:39:02 thorpej Exp $
.\"
.\" Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd $Mdocdate: June 26 2008 $
+.Dd $Mdocdate: December 3 2011 $
.Dt WE 4
.Os
.Sh NAME
@@ -81,7 +81,7 @@ To enable the AUI media, select the
or
.Em aui
media type with
-.Xr ifconfig 8 's
+.Xr ifconfig 8 Ns 's
.Sq media
directive.
To select the other media (transceiver), select the
diff --git a/share/man/man5/bsd.port.mk.5 b/share/man/man5/bsd.port.mk.5
index 6e7a6e60639..de12fb3941a 100644
--- a/share/man/man5/bsd.port.mk.5
+++ b/share/man/man5/bsd.port.mk.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: bsd.port.mk.5,v 1.317 2011/12/03 22:27:57 espie Exp $
+.\" $OpenBSD: bsd.port.mk.5,v 1.318 2011/12/03 23:01:21 schwarze Exp $
.\"
.\" Copyright (c) 2000-2008 Marc Espie
.\"
@@ -167,8 +167,9 @@ using the cryptographic signature utilities listed in ${PREFERRED_CIPHERS}.
All the files needed to recreate a port should be in ${CHECKSUMFILES} and
checksummed.
Invoking
-.Ar checksum
-with REFETCH=true
+.Ic checksum
+with
+.Ev REFETCH Ns = Ns Cm true
will try to fetch a version with the correct checksum from the
.Ox
main archive site in the case of a checksum mismatch.
@@ -2094,8 +2095,9 @@ User-settings.
Defaults to
.Sq Yes .
Forces commands like
-.Xr ftp 1 ,
-.Xr pkg_create 1 ...
+.Xr ftp 1
+and
+.Xr pkg_create 1
to use their progress-meter even in the absence of a terminal.
.It Ev PROPERTIES
List of properties specific to a given machine architecture.
diff --git a/sys/arch/amd64/stand/biosboot/biosboot.8 b/sys/arch/amd64/stand/biosboot/biosboot.8
index 51c4a82af65..3999209af08 100644
--- a/sys/arch/amd64/stand/biosboot/biosboot.8
+++ b/sys/arch/amd64/stand/biosboot/biosboot.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: biosboot.8,v 1.9 2010/08/10 20:34:16 sobrado Exp $
+.\" $OpenBSD: biosboot.8,v 1.10 2011/12/03 23:01:21 schwarze Exp $
.\"
.\" Copyright (c) 2003 Tom Cosgrove <tom.cosgrove@arches-consulting.com>
.\" Copyright (c) 1997 Michael Shalayeff
@@ -25,7 +25,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd $Mdocdate: August 10 2010 $
+.Dd $Mdocdate: December 3 2011 $
.Dt BIOSBOOT 8 amd64
.Os
.Sh NAME
@@ -49,7 +49,7 @@ with information about the location of
.Xr boot 8
on disk.
Specifically, it writes the filesystem block number of
-.Xr boot 8 's
+.Xr boot 8 Ns 's
inode,
the offset within this block of the inode,
and various filesystem parameters (taken from the superblock)
@@ -124,7 +124,7 @@ may fail with any of the following error messages:
Too many indirect blocks.
.Nm
is capable of reading the direct blocks in
-.Xr boot 8 's
+.Xr boot 8 Ns 's
inode (the location of which is patched into
.Nm
by
@@ -155,14 +155,14 @@ On hard disks (default filesystem block size 16 KB)
.Xr boot 8
to be over 64 MB in size!
(Only direct blocks are required for
-.Xr boot 8 s
+.Xr boot 8 Ns s
of up to 192 KB.)
.It Er ERR M
Bad magic.
The ELF
.Dq magic number
\e7fELF in
-.Xr boot 8 's
+.Xr boot 8 Ns 's
header was not found.
This indicates that the first block of
.Xr boot 8
diff --git a/sys/arch/i386/stand/biosboot/biosboot.8 b/sys/arch/i386/stand/biosboot/biosboot.8
index 0b733874139..679b79bc35f 100644
--- a/sys/arch/i386/stand/biosboot/biosboot.8
+++ b/sys/arch/i386/stand/biosboot/biosboot.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: biosboot.8,v 1.23 2010/08/10 20:34:16 sobrado Exp $
+.\" $OpenBSD: biosboot.8,v 1.24 2011/12/03 23:01:21 schwarze Exp $
.\"
.\" Copyright (c) 2003 Tom Cosgrove <tom.cosgrove@arches-consulting.com>
.\" Copyright (c) 1997 Michael Shalayeff
@@ -25,7 +25,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd $Mdocdate: August 10 2010 $
+.Dd $Mdocdate: December 3 2011 $
.Dt BIOSBOOT 8 i386
.Os
.Sh NAME
@@ -49,7 +49,7 @@ with information about the location of
.Xr boot 8
on disk.
Specifically, it writes the filesystem block number of
-.Xr boot 8 's
+.Xr boot 8 Ns 's
inode,
the offset within this block of the inode,
and various filesystem parameters (taken from the superblock)
@@ -124,7 +124,7 @@ may fail with any of the following error messages:
Too many indirect blocks.
.Nm
is capable of reading the direct blocks in
-.Xr boot 8 's
+.Xr boot 8 Ns 's
inode (the location of which is patched into
.Nm
by
@@ -155,14 +155,14 @@ On hard disks (default filesystem block size 16 KB)
.Xr boot 8
to be over 64 MB in size!
(Only direct blocks are required for
-.Xr boot 8 s
+.Xr boot 8 Ns s
of up to 192 KB.)
.It Er ERR M
Bad magic.
The ELF
.Dq magic number
\e7fELF in
-.Xr boot 8 's
+.Xr boot 8 Ns 's
header was not found.
This indicates that the first block of
.Xr boot 8
diff --git a/usr.bin/jot/jot.1 b/usr.bin/jot/jot.1
index 89533a814fa..b9ff5f40123 100644
--- a/usr.bin/jot/jot.1
+++ b/usr.bin/jot/jot.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: jot.1,v 1.16 2007/05/31 19:20:11 jmc Exp $
+.\" $OpenBSD: jot.1,v 1.17 2011/12/03 23:01:21 schwarze Exp $
.\" $NetBSD: jot.1,v 1.2 1994/11/14 20:27:36 jtc Exp $
.\"
.\" Copyright (c) 1993
@@ -30,7 +30,7 @@
.\"
.\" @(#)jot.1 8.1 (Berkeley) 6/6/93
.\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: December 3 2011 $
.Dt JOT 1
.Os
.Sh NAME
@@ -283,7 +283,7 @@ in the ASCII character set):
.Dl "$ jot \-r \-c 160 a { | rs \-g0 0 8"
.Pp
Infinitely many
-.Xr yes 1 's
+.Xr yes 1 Ns 's
may be obtained through:
.Pp
.Dl $ jot \-b yes 0
diff --git a/usr.bin/mandoc/mdoc_macro.c b/usr.bin/mandoc/mdoc_macro.c
index da05e3ac2f0..b8dd1b21f17 100644
--- a/usr.bin/mandoc/mdoc_macro.c
+++ b/usr.bin/mandoc/mdoc_macro.c
@@ -1,4 +1,4 @@
-/* $Id: mdoc_macro.c,v 1.71 2011/12/03 22:47:27 schwarze Exp $ */
+/* $Id: mdoc_macro.c,v 1.72 2011/12/03 23:01:21 schwarze Exp $ */
/*
* Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
@@ -1565,19 +1565,6 @@ in_line_argn(MACRO_PROT_ARGS)
flushed = 1;
}
- /*
- * XXX: this is a hack to work around groff's ugliness
- * as regards `Xr' and extraneous arguments. It should
- * ideally be deprecated behaviour, but because this is
- * code is no here, it's unlikely to be removed.
- */
- if (MDOC_Xr == tok && j == maxargs) {
- if ( ! mdoc_elem_alloc(m, line, la, MDOC_Ns, NULL))
- return(0);
- if ( ! rew_elem(m, MDOC_Ns))
- return(0);
- }
-
if ( ! dword(m, line, la, p, DELIM_MAX))
return(0);
j++;
diff --git a/usr.sbin/sensorsd/sensorsd.conf.5 b/usr.sbin/sensorsd/sensorsd.conf.5
index dbd274254dc..c748063fa31 100644
--- a/usr.sbin/sensorsd/sensorsd.conf.5
+++ b/usr.sbin/sensorsd/sensorsd.conf.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: sensorsd.conf.5,v 1.23 2008/03/15 01:08:08 cnst Exp $
+.\" $OpenBSD: sensorsd.conf.5,v 1.24 2011/12/03 23:01:21 schwarze Exp $
.\"
.\" Copyright (c) 2003 Henning Brauer <henning@openbsd.org>
.\" Copyright (c) 2005 Matthew Gream <matthew.gream@pobox.com>
@@ -16,7 +16,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: March 15 2008 $
+.Dd $Mdocdate: December 3 2011 $
.Dt SENSORSD.CONF 5
.Os
.Sh NAME
@@ -34,7 +34,7 @@ is matched by at most one entry in
which may specify high and low limits,
and whether sensor status changes provided by the driver should be ignored.
If the limits are crossed or if the status provided by the driver changes,
-.Xr sensorsd 8 's
+.Xr sensorsd 8 Ns 's
alert functionality is triggered and a command, if specified, is
executed.
.Pp