fix the remaining cases of .Xr with only one argument

7 files changed, 35 insertions, 37 deletions

diff --git a/libexec/tradcpp/tradcpp.1 b/libexec/tradcpp/tradcpp.1
index a8fc1e2d3a9..c726dc44370 100644
--- a/libexec/tradcpp/tradcpp.1
+++ b/libexec/tradcpp/tradcpp.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: tradcpp.1,v 1.3 2014/12/02 10:21:44 jmc Exp $
+.\"	$OpenBSD: tradcpp.1,v 1.4 2016/12/28 22:47:11 schwarze Exp $
 .\"
 .\" Copyright (c) 2013 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -27,7 +27,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: December 2 2014 $
+.Dd $Mdocdate: December 28 2016 $
 .Dt TRADCPP 1
 .Os
 .Sh NAME
@@ -43,7 +43,7 @@ The
 command provides a traditional K&R-style C macro preprocessor.
 It is intended to be suitable for historical Unix uses of the
 preprocessor, such as
-.Xr imake ,
+.Sy imake ,
 particularly those that depend on preservation of whitespace.
 .Pp
 The chief ways in which traditional cpp differs from
diff --git a/share/termtypes/termcap.5 b/share/termtypes/termcap.5
index ffa63952ac1..01cdb2dad40 100644
--- a/share/termtypes/termcap.5
+++ b/share/termtypes/termcap.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: termcap.5,v 1.29 2016/01/08 20:26:54 zhuk Exp $
+.\"	$OpenBSD: termcap.5,v 1.30 2016/12/28 22:47:11 schwarze Exp $
 .\"
 .\" Copyright (c) 1985, 1991 The Regents of the University of California.
 .\" All rights reserved.
@@ -29,7 +29,7 @@
 .\"
 .\"     from: @(#)termcap.5	6.11 (Berkeley) 3/6/93
 .\"
-.Dd $Mdocdate: January 8 2016 $
+.Dd $Mdocdate: December 28 2016 $
 .Dt TERMCAP 5
 .Os
 .Sh NAME
@@ -40,7 +40,7 @@ The
 .Nm
 file
 is a database describing terminals, used, for example, by
-.Xr \&vi 1
+.Xr vi 1
 and
 .Xr curses 3 .
 Terminals are described in
@@ -260,7 +260,7 @@ section below).
 .It lm Ta num Ta "" Ta "Lines of memory if >" Sy \&li
 (0 means varies).
 .It ma Ta str Ta (o) Ta "Arrow key map (used by"
-.Xr \&vi 1
+.Xr vi 1
 version 2 only).
 .It mb Ta str Ta "" Ta "Turn on blinking attribute."
 .It md Ta str Ta "" Ta "Turn on bold (extra bright) attribute."
@@ -541,14 +541,14 @@ the description of a similar terminal in
 .Nm
 and to build up a description gradually, using partial descriptions
 with
-.Xr \&vi 1
+.Xr vi 1
 to check that they are correct.
 Be aware that a very unusual terminal may expose deficiencies in
 the ability of the
 .Nm
 file to describe it
 or bugs in
-.Xr \&vi 1 .
+.Xr vi 1 .
 To easily test a new terminal description you are working on
 you can put it in your home directory in a file called
 .Pa .termcap
@@ -571,7 +571,7 @@ to avoid reading files when starting up a program.
 To get the padding for insert-line right
 (if the terminal manufacturer did not document it),
 a severe test is to use
-.Xr \&vi 1
+.Xr vi 1
 to edit
 .Pa /etc/passwd
 at 9600 baud, delete roughly 16 lines from the middle of the screen,
@@ -1386,7 +1386,7 @@ and
 .Sy \&st ;
 and finally
 .Sy \&if .
-.Pf ( Xr Terminfo
+.Pf ( Xr terminfo 5
 uses
 .Sy \&i\&1-i2
 instead of
@@ -1404,7 +1404,7 @@ and
 These strings are output by the
 .Xr reset 1
 program, which is used when the terminal gets into a wedged state.
-.Pf ( Xr Terminfo
+.Pf ( Xr terminfo 5
 uses
 .Sy "\&r1-r3"
 instead of
@@ -1793,10 +1793,10 @@ Hash database file containing terminal descriptions (see
 .El
 .Sh SEE ALSO
 .Xr cap_mkdb 1 ,
-.Xr \&ex 1 ,
+.Xr ex 1 ,
 .Xr more 1 ,
 .Xr tset 1 ,
-.Xr \&ul 1 ,
+.Xr ul 1 ,
 .Xr vi 1 ,
 .Xr curses 3 ,
 .Xr printf 3 ,
@@ -1827,7 +1827,7 @@ entry.
 Most programs now use the kernel information primarily; the information
 in this file is used only if the kernel does not have any information.
 .Pp
-.Xr \&vi 1
+.Xr vi 1
 allows only 256 characters for string capabilities, and the routines
 in
 .Xr termcap 3
diff --git a/usr.bin/make/make.1 b/usr.bin/make/make.1
index 3faae3fbf2b..067a957814d 100644
--- a/usr.bin/make/make.1
+++ b/usr.bin/make/make.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: make.1,v 1.122 2016/10/23 17:27:01 jmc Exp $
+.\"	$OpenBSD: make.1,v 1.123 2016/12/28 22:47:11 schwarze Exp $
 .\"	$NetBSD: make.1,v 1.18 1997/03/10 21:19:53 christos Exp $
 .\"
 .\" Copyright (c) 1990, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"	from: @(#)make.1	8.4 (Berkeley) 3/19/94
 .\"
-.Dd $Mdocdate: October 23 2016 $
+.Dd $Mdocdate: December 28 2016 $
 .Dt MAKE 1
 .Os
 .Sh NAME
@@ -335,7 +335,7 @@ The
 .Ic \&::
 operator is a fairly standard extension,
 popularized by
-.Xr imake .
+.Sy imake .
 The
 .Ic !\&
 operator is a
diff --git a/usr.bin/mandoc/man.conf.5 b/usr.bin/mandoc/man.conf.5
index 2ce6ff558f1..96c16263096 100644
--- a/usr.bin/mandoc/man.conf.5
+++ b/usr.bin/mandoc/man.conf.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: man.conf.5,v 1.3 2015/03/27 21:17:16 schwarze Exp $
+.\"	$OpenBSD: man.conf.5,v 1.4 2016/12/28 22:47:11 schwarze Exp $
 .\"
 .\" Copyright (c) 2015 Ingo Schwarze <schwarze@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: March 27 2015 $
+.Dd $Mdocdate: December 28 2016 $
 .Dt MAN.CONF 5
 .Os
 .Sh NAME
@@ -91,7 +91,7 @@ manual.
 .It Ic fragment Ta none     Ta Cm html Ta print only body
 .It Ic includes Ta string   Ta Cm html Ta path to header files
 .It Ic indent   Ta integer  Ta Cm ascii , utf8 Ta left margin
-.It Ic man      Ta string   Ta Cm html Ta path for Xr links
+.It Ic man      Ta string   Ta Cm html Ta path for \&Xr links
 .It Ic paper    Ta string   Ta Cm ps , pdf Ta paper size
 .It Ic style    Ta string   Ta Cm html Ta CSS file
 .It Ic width    Ta integer  Ta Cm ascii , utf8 Ta right margin
diff --git a/usr.bin/spell/spell.1 b/usr.bin/spell/spell.1
index fc48d3d51c2..3dcc6af81d6 100644
--- a/usr.bin/spell/spell.1
+++ b/usr.bin/spell/spell.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: spell.1,v 1.12 2014/01/30 17:18:46 sobrado Exp $
+.\" $OpenBSD: spell.1,v 1.13 2016/12/28 22:47:11 schwarze Exp $
 .\"
 .\" Copyright (C) 1985, 1993, 1994
 .\"	The Regents of the University of California.  All rights reserved.
@@ -61,7 +61,7 @@
 .\"
 .\"	@(#)spell.1	8.2 (Berkeley) 4/18/94
 .\"
-.Dd $Mdocdate: January 30 2014 $
+.Dd $Mdocdate: December 28 2016 $
 .Dt SPELL 1
 .Os
 .Sh NAME
@@ -161,7 +161,7 @@ and
 commands.
 .It Fl l
 Use
-.Xr delatex
+.Sy delatex
 instead of
 .Xr deroff 1
 if it is present on the system.
@@ -179,7 +179,7 @@ Use the specified stop list instead of the default system stop list.
 The stop list must be sorted as specified above.
 .It Fl t
 Use
-.Xr detex
+.Sy detex
 instead of
 .Xr deroff 1
 if it is present on the system.
diff --git a/usr.bin/tput/tput.1 b/usr.bin/tput/tput.1
index 26ed68259b8..ac5ff65dbe8 100644
--- a/usr.bin/tput/tput.1
+++ b/usr.bin/tput/tput.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: tput.1,v 1.22 2015/08/24 19:25:09 jca Exp $
+.\"	$OpenBSD: tput.1,v 1.23 2016/12/28 22:47:11 schwarze Exp $
 .\"	$NetBSD: tput.1,v 1.4 1994/12/07 08:49:10 jtc Exp $
 .\"
 .\" Copyright (c) 1989, 1990, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)tput.1	8.2 (Berkeley) 3/19/94
 .\"
-.Dd $Mdocdate: August 24 2015 $
+.Dd $Mdocdate: December 28 2016 $
 .Dt TPUT 1
 .Os
 .Sh NAME
@@ -64,7 +64,7 @@ The options are as follows:
 The attributes are read from stdin instead of the command line.
 .It Fl T
 The terminal name as found in the
-.Xr terminfo
+.Xr terminfo 5
 database; for example,
 .Dq vt100
 or
@@ -97,7 +97,7 @@ If the
 .Ar attribute
 is of type string and takes arguments (e.g., cursor movement,
 the
-.Xr terminfo
+.Xr terminfo 5
 .Dq cup
 sequence) the arguments are taken from the command line immediately
 following the attribute.
@@ -106,18 +106,18 @@ The following special attributes are available:
 .Bl -tag -width Ar
 .It clear
 Clear the screen (the
-.Xr terminfo
+.Xr terminfo 5
 .Dq clear
 sequence).
 .It init
 Print the
-.Xr terminfo
+.Xr terminfo 5
 initialization strings for the specified terminal.
 .It longname
 Print the descriptive name of the user's terminal type.
 .It reset
 Reset the terminal (using the
-.Xr terminfo
+.Xr terminfo 5
 reset sequences).
 .El
 .Sh ENVIRONMENT
diff --git a/usr.sbin/lpr/lpr/lpr.1 b/usr.sbin/lpr/lpr/lpr.1
index cab54a36424..20cf8b11abb 100644
--- a/usr.sbin/lpr/lpr/lpr.1
+++ b/usr.sbin/lpr/lpr/lpr.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: lpr.1,v 1.14 2011/05/02 11:14:11 jmc Exp $
+.\"	$OpenBSD: lpr.1,v 1.15 2016/12/28 22:47:11 schwarze Exp $
 .\"	$NetBSD: lpr.1,v 1.10 2002/01/19 03:23:26 wiz Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)lpr.1	8.1 (Berkeley) 6/6/93
 .\"
-.Dd $Mdocdate: May 2 2011 $
+.Dd $Mdocdate: December 28 2016 $
 .Dt LPR 1
 .Os
 .Sh NAME
@@ -78,9 +78,7 @@ carriage control character.
 .It Fl g
 The files are assumed to contain standard plot data as produced by the
 .Ic plot
-routines (see also
-.Xr plot
-for the filters used by the printer spooler).
+routines.
 .It Fl l
 Use a filter which allows control characters to be printed and suppresses
 page breaks.