tmac/tmac.an: define .MR in a groff compatible way

groff 1.23.0 added .MR to its -man macro package.  The NEWS file states
that the inclusion of the macro "was prompted by its introduction to
Plan 9 from User Space's troff in August 2020."  From d32deab it seems
that the name for Plan 9 from User Space's implementation was suggested
by groff maintainer G. Brandon Robinson.

Not sure if the intention was to make these definitions compatible, but
it would be nice if they were.

Currently, Plan 9 from User Space's .MR expects its second argument to
be parenthesized.  groff's .MR does not.  This results in extra
parentheses appearing in manual references when viewing Plan 9 from User
Space's manual pages on a system using groff.

118 files changed, 575 insertions, 575 deletions

diff --git a/man/man1/0intro.1 b/man/man1/0intro.1
index ad851a5f..c56f49d9 100644
--- a/man/man1/0intro.1
+++ b/man/man1/0intro.1
@@ -32,15 +32,15 @@ they expect the
 environment variable
 to contain the name of the root of the tree.
 See
-.MR install (1)
+.MR install 1
 for details about installation.
 .PP
 Many of the familiar Unix commands,
 for example
-.MR cat (1) ,
-.MR ls (1) ,
+.MR cat 1 ,
+.MR ls 1 ,
 and
-.MR wc (1) ,
+.MR wc 1 ,
 are present, but in their Plan 9 forms:
 .I cat
 takes no options,
@@ -50,12 +50,12 @@ and
 .I wc
 counts UTF characters.
 In some cases, the differences are quite noticeable:
-.MR grep (1)
+.MR grep 1
 and
-.MR sed (1)
+.MR sed 1
 expect Plan 9 regular expressions
 (see
-.MR regexp (7) ),
+.MR regexp 7 ),
 which are closest to what Unix calls extended regular expressions.
 Because of these differences, it is not recommended to put
 .B $PLAN9/bin
@@ -63,16 +63,16 @@ before the usual system
 .B bin
 directories in your search path.
 Instead, put it at the end of your path and use the
-.MR 9 (1)
+.MR 9 1
 script when you want to invoke the Plan 9 version of a
 traditional Unix command.
 .PP
 Occasionally the Plan 9 programs have been
 changed to adapt to Unix.
-.MR Mk (1)
+.MR Mk 1
 now allows mkfiles to choose their own shell,
 and
-.MR rc (1)
+.MR rc 1
 has a
 .I ulimit
 builtin and manages
@@ -80,14 +80,14 @@ builtin and manages
 .PP
 Many of the graphical programs from Plan 9 are present,
 including
-.MR sam (1)
+.MR sam 1
 and
-.MR acme (1) .
+.MR acme 1 .
 An X11 window manager
-.MR rio (1)
+.MR rio 1
 mimics Plan 9's window system, with command windows
 implemented by the external program
-.MR 9term (1) .
+.MR 9term 1 .
 Following the style of X Windows, these programs run in new
 windows rather than the one in which they are invoked.
 They all take a
@@ -100,16 +100,16 @@ The argument is one of
 \fRor
 \fIxmin\fL,\fIymin\fL,\fIxmax\fL,\fIymax\fR.
 See
-.MR devdraw (1)
+.MR devdraw 1
 and
-.MR keyboard (7)
+.MR keyboard 7
 for details about typing and clicking in graphical applications.
 .PP
 The
-.MR plumber (4)
+.MR plumber 4
 helps to connect the various Plan 9 programs together,
 and fittings like
-.MR web (1)
+.MR web 1
 connect it to external programs such as web browsers;
 one can click on a URL in
 .I acme
@@ -124,17 +124,17 @@ with file servers by reading and writing files.
 This cannot be done directly on Unix.
 Instead the servers listen for 9P connections on Unix domain sockets;
 clients connect to these sockets and speak 9P directly using the
-.MR 9pclient (3)
+.MR 9pclient 3
 library.
-.MR Intro (4)
+.MR Intro 4
 tells more of the story.
 The effect is not as clean as on Plan 9, but it gets the job done
 and still provides a uniform and easy-to-understand mechanism.
 The
-.MR 9p (1)
+.MR 9p 1
 client can be used in shell scripts or by hand to carry out
 simple interactions with servers.
-.MR Netfiles (1)
+.MR Netfiles 1
 is an experimental client for acme.
 .SS External databases
 Some programs rely on large databases that would be
@@ -151,7 +151,7 @@ The shell scripts
 and
 .I 9l
 (see
-.MR 9c (1) )
+.MR 9c 1 )
 provide a simple interface to the underlying system compiler and linker,
 similar to the
 .I 2c
@@ -170,22 +170,22 @@ so that no
 options are needed.
 .PP
 The only way to write multithreaded programs is to use the
-.MR thread (3)
+.MR thread 3
 library.
-.MR Rfork (3)
+.MR Rfork 3
 exists but is not as capable as on Plan 9.
 There are many unfortunate but necessary preprocessor
 diversions to make Plan 9 and Unix libraries coexist.
 See
-.MR intro (3)
+.MR intro 3
 for details.
 .PP
 The debuggers
-.MR acid (1)
+.MR acid 1
 and
-.MR db (1)
+.MR db 1
 and the debugging library
-.MR mach (3)
+.MR mach 3
 are works in progress.
 They are platform-independent, so that x86 Linux core dumps
 can be inspected on PowerPC Mac OS X machines,
@@ -208,22 +208,22 @@ but that it is the extent to which they have been developed and exercised.
 .SS Porting programs
 The vast majority of the familiar Plan 9 programs
 have been ported, including the Unicode-aware
-.MR troff (1) .
+.MR troff 1 .
 .PP
 Of the more recent additions to Plan 9,
-.MR factotum (4) ,
-.MR secstore (1) ,
+.MR factotum 4 ,
+.MR secstore 1 ,
 and
-.MR secstored (1) ,
-.MR vac (1) ,
-.MR vacfs (4) ,
+.MR secstored 1 ,
+.MR vac 1 ,
+.MR vacfs 4 ,
 and
-.MR venti (8)
+.MR venti 8
 are all ported.
 .PP
 A backup system providing a dump file system built atop Venti
 is in progress; see
-.MR vbackup (8) .
+.MR vbackup 8 .
 .SS Porting to new systems
 Porting the tree to new operating systems or architectures
 should be straightforward, as system-specific code has been
@@ -245,9 +245,9 @@ need to write any system specific code at all.
 .PP
 There are other smaller system dependencies,
 such as the terminal handling code in
-.MR 9term (1)
+.MR 9term 1
 and the implementation of
-.MR getcallerpc (3) ,
+.MR getcallerpc 3 ,
 but these are usually simple and are not on the critical
 path for getting the system up and running.
 .SH SEE ALSO
@@ -260,7 +260,7 @@ The manual pages are in a Unix style tree, with names like
 instead of Plan 9's simpler
 .BR  $PLAN9/man/1/cat ,
 so that the Unix
-.MR man (1)
+.MR man 1
 utility can handle it.
 Some systems, for example Debian Linux,
 deduce the man page locations from the search path, so that
@@ -305,52 +305,52 @@ describes the Plan 9 file protocol 9P.
 These pages describe parts of the system
 that are new or different from Plan 9 from Bell Labs:
 .IP
-.MR 9 (1) ,
-.MR 9c (1) ,
-.MR 9p (1) ,
-.MR 9term (1) ,
+.MR 9 1 ,
+.MR 9c 1 ,
+.MR 9p 1 ,
+.MR 9term 1 ,
 .I acidtypes
 in
-.MR acid (1) ,
-.MR dial (1) ,
-.MR git (1) ,
-.MR label (1) ,
+.MR acid 1 ,
+.MR dial 1 ,
+.MR git 1 ,
+.MR label 1 ,
 the
 .B MKSHELL
 variable in
-.MR mk (1) ,
-.MR namespace (1) ,
-.MR netfiles (1) ,
-.MR page (1) ,
-.MR psfonts (1) ,
-.MR rio (1) ,
-.MR web (1) ,
-.MR wintext (1)
+.MR mk 1 ,
+.MR namespace 1 ,
+.MR netfiles 1 ,
+.MR page 1 ,
+.MR psfonts 1 ,
+.MR rio 1 ,
+.MR web 1 ,
+.MR wintext 1
 .IP
-.MR intro (3) ,
-.MR 9pclient (3) ,
+.MR intro 3 ,
+.MR 9pclient 3 ,
 the
 .B unix
 network in
-.MR dial (3) ,
-.MR exits (3) ,
-.MR get9root (3) ,
-.MR getns (3) ,
-.MR notify (3) ,
-.MR post9pservice (3) ,
-.MR rfork (3) ,
-.MR searchpath (3) ,
-.MR sendfd (3) ,
-.MR udpread (3) ,
-.MR venti (3) ,
-.MR wait (3) ,
-.MR wctl (3)
+.MR dial 3 ,
+.MR exits 3 ,
+.MR get9root 3 ,
+.MR getns 3 ,
+.MR notify 3 ,
+.MR post9pservice 3 ,
+.MR rfork 3 ,
+.MR searchpath 3 ,
+.MR sendfd 3 ,
+.MR udpread 3 ,
+.MR venti 3 ,
+.MR wait 3 ,
+.MR wctl 3
 .IP
-.MR intro (4) ,
-.MR 9pserve (4) ,
-.MR import (4) ,
+.MR intro 4 ,
+.MR 9pserve 4 ,
+.MR import 4 ,
 .IP
-.MR vbackup (8)
+.MR vbackup 8
 .IP
 .IR openfd (9p)
 .SH DIAGNOSTICS
@@ -361,4 +361,4 @@ exit with string statuses.  In fact, exiting with an empty status
 corresponds to exiting with status 0,
 and exiting with any non-empty string corresponds to exiting with status 1.
 See
-.MR exits (3) .
+.MR exits 3 .
diff --git a/man/man1/9.1 b/man/man1/9.1
index 34c150d2..21bc8559 100644
--- a/man/man1/9.1
+++ b/man/man1/9.1
@@ -12,7 +12,7 @@
 .B .
 .B 9
 (from
-.MR sh (1) )
+.MR sh 1 )
 .PP
 .B 9.rc
 .I cmd
@@ -24,7 +24,7 @@
 .B .
 .B 9.rc
 (from
-.MR rc (1) )
+.MR rc 1 )
 .PP
 .B u
 .I cmd
@@ -36,7 +36,7 @@
 .B .
 .B u
 (from
-.MR sh (1) )
+.MR sh 1 )
 .PP
 .B u.rc
 .I cmd
@@ -48,7 +48,7 @@
 .B .
 .B u.rc
 (from
-.MR rc (1) )
+.MR rc 1 )
 .SH DESCRIPTION
 Because Plan 9 supplies commands with the same name as but different
 behavior than many basic Unix system commands
@@ -86,7 +86,7 @@ in order to make the current shell start running in the Plan 9 environment.
 is the same as
 .I 9
 but written for use by the shell
-.MR rc (1) .
+.MR rc 1 .
 .PP
 .I U
 and
@@ -106,7 +106,7 @@ $ 9 grep '[α-ζ]' /etc/passwd
 .EE
 .PP
 Start an
-.MR rc (1)
+.MR rc 1
 with the Plan 9 commands in the path before the system commands,
 and then run the Unix
 .IR ls :
@@ -124,7 +124,7 @@ $ 9 rc
 .br
 .B \*9/bin/u.rc
 .SH SEE ALSO
-.MR intro (1)
+.MR intro 1
 .SH BUGS
 Some shell configurations
 (notably, oh-my-zsh)
diff --git a/man/man1/9c.1 b/man/man1/9c.1
index 943df6fb..4b2a7276 100644
--- a/man/man1/9c.1
+++ b/man/man1/9c.1
@@ -154,7 +154,7 @@ With
 .BR t ,
 give a long listing of all information about the files,
 somewhat like a listing by
-.MR ls (1) ,
+.MR ls 1 ,
 showing
 .br
 .ns
diff --git a/man/man1/9p.1 b/man/man1/9p.1
index 4580587d..a3cfe72e 100644
--- a/man/man1/9p.1
+++ b/man/man1/9p.1
@@ -121,11 +121,11 @@ copy a line from standard input to the file.
 Print errors, but don't give up.
 .B Rdwr
 is useful for interacting with servers like
-.MR factotum (4) .
+.MR factotum 4 .
 .TP
 .B ls
 Print a directory listing in the format of
-.MR ls (1) .
+.MR ls 1 .
 The
 .B -d
 and
@@ -150,12 +150,12 @@ it connects to the Unix domain socket
 .I service
 in the name space directory
 (see
-.MR intro (4) )
+.MR intro 4 )
 and then accesses
 .IR subpath .
 .SH EXAMPLE
 To update
-.MR plumber (4) 's
+.MR plumber 4 's
 copy of your plumbing rules after editing
 .BR $HOME/lib/plumbing :
 .IP
@@ -164,7 +164,7 @@ cat $HOME/lib/plumbing | 9p write plumb/rules
 .EE
 .PP
 To display the contents of the current
-.MR acme (4)
+.MR acme 4
 window:
 .IP
 .EX
@@ -173,6 +173,6 @@ window:
 .SH SOURCE
 .B \*9/src/cmd/9p.c
 .SH SEE ALSO
-.MR intro (4) ,
+.MR intro 4 ,
 .IR intro (9p),
-.MR 9pclient (3)
+.MR 9pclient 3
diff --git a/man/man1/9term.1 b/man/man1/9term.1
index 2e042634..cd9e542c 100644
--- a/man/man1/9term.1
+++ b/man/man1/9term.1
@@ -58,7 +58,7 @@ uses the imported value of
 .B $font
 if set; otherwise it uses the graphics system default.
 (See
-.MR font (7)
+.MR font 7
 for a full discussion of font syntaxes.)
 .PP
 .I 9term
@@ -96,7 +96,7 @@ Characters typed on the keyboard replace the selected text;
 if this text is not empty, it is placed in a
 .I snarf buffer
 common to all windows but distinct from that of
-.MR sam (1) .
+.MR sam 1 .
 .PP
 Programs access the text in the window at a single point
 maintained automatically by
@@ -163,7 +163,7 @@ and erases the character before the word.
 .PP
 An ACK character (control-F) or Insert character triggers file name completion
 for the preceding string (see
-.MR complete (3) ).
+.MR complete 3 ).
 .PP
 Text may be moved vertically within the window.
 A scroll bar on the left of the window shows in its clear portion what fragment of the
@@ -201,7 +201,7 @@ EOT, so the terminal must be set up with EOT
 as the ``eof'' character.
 .I 9term
 runs
-.MR stty (1)
+.MR stty 1
 to establish this when the terminal is created.
 .PP
 .I 9term
@@ -231,13 +231,13 @@ are a few common ones where they fall short.
 First, programs using the GNU readline library typically
 disable terminal echo and perform echoing themselves.
 The most common example is the shell
-.MR bash (1) .
+.MR bash 1 .
 Disabling the use of readline with
 .RB `` "set +o emacs" ''
 .RI [ sic ]
 usually restores the desired behavior.
 Second, remote terminal programs such as
-.MR ssh (1)
+.MR ssh 1
 typically run with echo disabled, relying on the
 remote system to echo characters as desired.
 Plan 9's
@@ -279,7 +279,7 @@ The
 menu item sends the contents of the selection (not the snarf buffer) to the
 .I plumber
 (see
-.MR plumb (1) ).
+.MR plumb 1 ).
 If the selection is empty, it sends the white-space-delimited text
 containing the selection (typing cursor).
 A typical use of this feature is to tell the editor to find the source of an error
@@ -323,7 +323,7 @@ Not a
 .IR 9term 
 bug:
 when running
-.MR bash (1)
+.MR bash 1
 in 
 .RB `` "set +o emacs" ''
 mode, its handling of interrupts is broken.
@@ -334,4 +334,4 @@ character typed.
 .PP
 Unix makes everything harder.
 .SH SEE ALSO
-.MR wintext (1)
+.MR wintext 1
diff --git a/man/man1/acid.1 b/man/man1/acid.1
index ec17c00f..1c07ec1e 100644
--- a/man/man1/acid.1
+++ b/man/man1/acid.1
@@ -70,7 +70,7 @@ at startup; see below.
 .BI -m " machine
 Assume instructions are for the given CPU type
 (see
-.MR mach (3) )
+.MR mach 3 )
 instead of using the executable header to select
 the CPU type.
 .TP
@@ -145,7 +145,7 @@ subscripts counted from 0.
 .BI delete " list", " subscript
 .PP
 Format codes are the same as in
-.MR db (1) .
+.MR db 1 .
 Formats may be attached to (unary) expressions with
 .BR \e ,
 e.g.
@@ -230,7 +230,7 @@ Print 10 lines of source around the program address.
 .BI Bsrc( address )
 Get the source line for the program address
 into a window of a running
-.MR sam (1)
+.MR sam 1
 and select it.
 .TP
 .BI line( address )
@@ -323,7 +323,7 @@ Make the given process current.
 .TP
 .BI rc( string )
 Escape to the shell,
-.MR rc (1) ,
+.MR rc 1 ,
 to execute the command string.
 .TP
 .BI include( string )
@@ -449,7 +449,7 @@ notation)
 .BR *array .
 .PP
 Trace the system calls executed by
-.MR ls (1)
+.MR ls 1
 (neither does this one):
 .IP
 .EX
@@ -503,8 +503,8 @@ acid: cont()
 .SH SOURCE
 .B \*9/src/cmd/acid
 .SH "SEE ALSO"
-.MR mk (1) ,
-.MR db (1)
+.MR mk 1 ,
+.MR db 1
 .br
 Phil Winterbottom,
 ``Acid Manual''.
diff --git a/man/man1/acme.1 b/man/man1/acme.1
index bb2c89d6..6ed8050b 100644
--- a/man/man1/acme.1
+++ b/man/man1/acme.1
@@ -45,7 +45,7 @@ The interactive interface uses the keyboard and mouse; external programs
 use a set of files served by
 .IR acme ;
 these are discussed in
-.MR acme (4) .
+.MR acme 4 .
 .PP
 Any named
 .I files
@@ -86,7 +86,7 @@ The
 option instructs
 .I acme
 to use FUSE (see
-.MR 9pfuse (4) )
+.MR 9pfuse 4 )
 to mount itself at
 .IR mtpt .
 (Experimental.)
@@ -98,10 +98,10 @@ windows are in two parts: a one-line
 above a multi-line
 .IR body .
 The body typically contains an image of a file, as in
-.MR sam (1) ,
+.MR sam 1 ,
 or the output of a
 program, as in an
-.MR rio (1)
+.MR rio 1
 window.
 The tag contains a number of
 blank-separated words, followed by a vertical bar character, followed by anything.
@@ -118,9 +118,9 @@ a slash.
 .SS Scrolling
 Each window has a scroll bar to the left of the body.
 The scroll bar behaves much as in
-.MR sam (1)
+.MR sam 1
 or
-.MR rio (1)
+.MR rio 1
 except that scrolling occurs when the button is pressed, rather than released,
 and continues
 as long as the mouse button is held down in the scroll bar.
@@ -131,7 +131,7 @@ down the scroll bar speeds up the rate of scrolling.
 .B -r
 reverses the scrolling behavior of buttons 1 and 3, to behave
 more like
-.MR xterm (1) .)
+.MR xterm 1 .)
 .SS Layout
 .I Acme
 windows are arranged in columns.  By default, it creates two columns when starting;
@@ -164,7 +164,7 @@ pre-loads them with useful commands.
 Also, the tag across the top maintains a list of executing long-running commands.
 .SS Typing
 The behavior of typed text is similar to that in
-.MR rio (1)
+.MR rio 1
 except that the characters are delivered to the tag or body under the mouse; there is no
 `click to type'.
 (The experimental option
@@ -172,7 +172,7 @@ except that the characters are delivered to the tag or body under the mouse; the
 causes typing to go to the most recently clicked-at or made window.)
 The usual backspacing conventions apply.
 As in
-.MR sam (1)
+.MR sam 1
 but not
 .IR rio ,
 the ESC key selects the text typed since the last mouse action,
@@ -249,7 +249,7 @@ is identified by the context of the command.
 These error windows are created when needed.
 .SS "Mouse button 1
 Mouse button 1 selects text just as in
-.MR sam (1)
+.MR sam 1
 or
 .IR rio (1) ,
 including the usual double-clicking conventions.
@@ -305,7 +305,7 @@ by default.
 .TP
 .B Edit
 Treat the argument as a text editing command in the style of
-.MR sam (1) .
+.MR sam 1 .
 The full
 .B Sam
 language is implemented except for the commands
@@ -379,7 +379,7 @@ With no arguments,
 prints the supplementary list.
 This command is largely superseded by plumbing
 (see
-.MR plumb (7) ).
+.MR plumb 7 ).
 .TP
 .B Indent
 Set the autoindent mode according to the argument:
@@ -507,7 +507,7 @@ If the text indicated with button 2 is not a recognized built-in, it is executed
 a shell command.  For example, indicating
 .B date
 with button 2 runs
-.MR date (1) .
+.MR date 1 .
 The standard
 and error outputs of commands are sent to the error window associated with
 the directory from which the command was run, which will be created if
@@ -525,7 +525,7 @@ in a window containing
 executing
 .B mk
 will run
-.MR mk (1)
+.MR mk 1
 in
 .BR /home/rob/sam ,
 producing output in a window labeled
@@ -539,12 +539,12 @@ and
 .B $winid
 set to the window's id number
 (see
-.MR acme (4) ).
+.MR acme 4 ).
 .PP
 The environment variable
 .B $acmeshell
 determines which shell is used to execute such commands; the
-.MR rc (1)
+.MR rc 1
 shell is used by default.
 .SS "Mouse button 3
 Pointing at text with button 3 instructs
@@ -574,7 +574,7 @@ command adds directories to the standard list.)
 .PP
 If the text begins with a colon, it is taken to be an address, in
 the style of
-.MR sam (1) ,
+.MR sam 1 ,
 within the body of the window containing the text.
 The address is evaluated, the resulting text highlighted, and the mouse moved to it.
 Thus, in
@@ -649,7 +649,7 @@ then execute
 clicking button 1 while 2 is held down.
 .PP
 When an external command (e.g.
-.MR echo (1) )
+.MR echo 1 )
 is executed this way, the extra argument is passed as expected and an
 environment variable
 .B $acmeaddr
@@ -682,7 +682,7 @@ window and runs a
 (default
 .BR $SHELL )
 in it, turning the window into something analogous to an
-.MR 9term (1)
+.MR 9term 1
 window.
 Executing text in a
 .I win
@@ -691,7 +691,7 @@ window with button
 .BR Send .
 .I Win
 windows follow the same scrolling heuristic as in
-.MR 9term (1) :
+.MR 9term 1 :
 the window scrolls on output only if the window is displaying the end of the buffer.
 .PP
 .I Awd
@@ -779,7 +779,7 @@ MIPS-specific binaries for applications
 .br
 .B \*9/bin/awd
 .SH SEE ALSO
-.MR acme (4)
+.MR acme 4
 .br
 Rob Pike,
 .I
diff --git a/man/man1/acmeevent.1 b/man/man1/acmeevent.1
index 24fde4f5..5bba8f8d 100644
--- a/man/man1/acmeevent.1
+++ b/man/man1/acmeevent.1
@@ -61,7 +61,7 @@ acmeevent, acme.rc \- shell script support for acme clients
 and
 .I acme.rc
 make it easy to write simple
-.MR acme (1)
+.MR acme 1
 client programs as shell scripts.
 .PP
 .I Acme
@@ -69,14 +69,14 @@ clients read the
 .B event
 files 
 (see
-.MR acme (4) )
+.MR acme 4 )
 for the windows they control, reacting to the events.
 The events are presented in a format that is easy to read with C programs
 but hard to read with shell scripts.
 .PP
 .I Acmeevent
 reads an
-.MR acme (4)
+.MR acme 4
 event stream from standard input, printing a shell-friendly
 version of the events, one per line, on standard output.
 Each output line from
@@ -165,7 +165,7 @@ above);
 below).
 .I Flag
 remains from the
-.MR acme (4)
+.MR acme 4
 event format.
 Because
 .IR eq0 ,
@@ -174,7 +174,7 @@ and
 .I chordarg
 are explicit in each event
 (unlike in
-.MR acme (4)
+.MR acme 4
 events),
 .I flag
 can usually be ignored.
@@ -221,7 +221,7 @@ window.
 .PP
 .I Acme.rc
 is a library of
-.MR rc (1)
+.MR rc 1
 shell functions useful for writing acme clients.
 .PP
 .I Newwindow
@@ -259,14 +259,14 @@ The most commonly-used command is
 .BR clean ,
 which marks the window as clean.
 See
-.MR acme (4)
+.MR acme 4
 for a full list of commands.
 .PP
 .I Windump
 sets the window's dump directory
 and dump command
 (see
-.MR acme (4) ).
+.MR acme 4 ).
 If either argument is omitted or is
 .BR - ,
 that argument is not set.
@@ -381,9 +381,9 @@ for the full implementation.
 .br
 .B \*9/lib/acme.rc
 .SH SEE ALSO
-.MR acme (1) ,
-.MR acme (4) ,
-.MR rc (1)
+.MR acme 1 ,
+.MR acme 4 ,
+.MR rc 1
 .SH BUGS
 There is more that could be done to ease the writing
 of complicated clients.
diff --git a/man/man1/ascii.1 b/man/man1/ascii.1
index 99265f46..9b5f8b4c 100644
--- a/man/man1/ascii.1
+++ b/man/man1/ascii.1
@@ -91,7 +91,7 @@ control characters or insert newlines.
 is similar; it converts between
 .SM UTF
 and character values from the Unicode Standard (see
-.MR utf (7) ).
+.MR utf 7 ).
 If given a range of hexadecimal numbers,
 .I unicode
 prints a table of the specified Unicode characters \(em their values and
@@ -126,7 +126,7 @@ The file
 contains a
 table of characters and descriptions, sorted in hexadecimal order,
 suitable for
-.MR look (1)
+.MR look 1
 on the lower case
 .I hex
 values of characters.
@@ -154,7 +154,7 @@ table of characters and descriptions.
 .br
 .B \*9/src/cmd/unicode.c
 .SH "SEE ALSO"
-.MR look (1) ,
-.MR tcs (1) ,
-.MR utf (7) ,
-.MR font (7)
+.MR look 1 ,
+.MR tcs 1 ,
+.MR utf 7 ,
+.MR font 7
diff --git a/man/man1/astro.1 b/man/man1/astro.1
index b24cfa3f..42da379e 100644
--- a/man/man1/astro.1
+++ b/man/man1/astro.1
@@ -114,7 +114,7 @@ default latitude (N), longitude (W), and elevation (meters)
 .SH SOURCE
 .B \*9/src/cmd/astro
 .SH SEE ALSO
-.MR scat (1)
+.MR scat 1
 .SH BUGS
 The
 .B k
diff --git a/man/man1/awk.1 b/man/man1/awk.1
index 395dfa96..a233d091 100644
--- a/man/man1/awk.1
+++ b/man/man1/awk.1
@@ -377,7 +377,7 @@ Patterns are arbitrary Boolean combinations
 of regular expressions and
 relational expressions.
 Regular expressions are as in
-.MR regexp (7) .
+.MR regexp 7 .
 Isolated regular expressions
 in a pattern apply to the entire line.
 Regular expressions may also occur in
@@ -534,8 +534,8 @@ BEGIN	{	# Simulate echo(1)
 .SH SOURCE
 .B \*9/src/cmd/awk
 .SH SEE ALSO
-.MR sed (1) ,
-.MR regexp (7) ,
+.MR sed 1 ,
+.MR regexp 7 ,
 .br
 A. V. Aho, B. W. Kernighan, P. J. Weinberger,
 .I
diff --git a/man/man1/bc.1 b/man/man1/bc.1
index 49748130..52c1e2aa 100644
--- a/man/man1/bc.1
+++ b/man/man1/bc.1
@@ -218,7 +218,7 @@ Assignment to
 .B scale
 influences the number of digits to be retained on arithmetic
 operations in the manner of
-.MR dc (1) .
+.MR dc 1 .
 Assignments to
 .B ibase
 or
@@ -235,7 +235,7 @@ empty square brackets must follow the array name.
 .PP
 .I Bc
 is actually a preprocessor for
-.MR dc (1) ,
+.MR dc 1 ,
 which it invokes automatically, unless the
 .B -c
 (compile only)
@@ -273,7 +273,7 @@ mathematical library
 .B \*9/src/cmd/bc.y
 .SH "SEE ALSO"
 .IR dc (1), 
-.MR hoc (1)
+.MR hoc 1
 .SH BUGS
 No
 .LR && ,
diff --git a/man/man1/bundle.1 b/man/man1/bundle.1
index b4880343..f2d7eb67 100644
--- a/man/man1/bundle.1
+++ b/man/man1/bundle.1
@@ -7,20 +7,20 @@ bundle \- collect files for distribution
 .SH DESCRIPTION
 .I Bundle
 writes on its standard output a shell script for
-.MR rc (1)
+.MR rc 1
 or a Bourne shell
 which, when executed,
 will recreate the original
 .IR files .
 Its main use is for distributing small numbers of text files by
-.MR mail (1) .
+.MR mail 1 .
 .PP
 Although less refined than standard archives from
 .I 9ar
 (see
-.MR 9c (1) )
+.MR 9c 1 )
 or
-.MR tar (1) ,
+.MR tar 1 ,
 a
 .IR bundle
 file
@@ -49,7 +49,7 @@ cd gift; sh horse; mk
 (in
 .IR 9c (1)), 
 .IR tar (1), 
-.MR mail (1)
+.MR mail 1
 .SH BUGS
 .I Bundle
 will not create directories and is unsatisfactory for non-text files.
diff --git a/man/man1/calendar.1 b/man/man1/calendar.1
index 5a305699..0295b5a7 100644
--- a/man/man1/calendar.1
+++ b/man/man1/calendar.1
@@ -43,7 +43,7 @@ processing at the end of the week.
 On Friday and Saturday, events through Monday are printed.
 .PP
 To have your calendar mailed to you every day, use
-.MR cron (8) .
+.MR cron 8 .
 .SH FILES
 .TF $HOME/lib/calendar
 .TP
diff --git a/man/man1/cat.1 b/man/man1/cat.1
index 7ff12e69..f2173dbc 100644
--- a/man/man1/cat.1
+++ b/man/man1/cat.1
@@ -51,7 +51,7 @@ copies to standard output exactly one line from the named
 .IR file ,
 default standard input.
 It is useful in interactive
-.MR rc (1)
+.MR rc 1
 scripts.
 .PP
 The
@@ -76,11 +76,11 @@ characters and the characters that precede them.
 It is useful to use as
 .B $PAGER
 with the Unix version of
-.MR man (1)
+.MR man 1
 when run inside a
 .I win
 (see
-.MR acme (1) )
+.MR acme 1 )
 window.
 .SH SOURCE
 .B \*9/src/cmd/cat.c
@@ -89,7 +89,7 @@ window.
 .br
 .B \*9/bin/nobs
 .SH SEE ALSO
-.MR cp (1)
+.MR cp 1
 .SH DIAGNOSTICS
 .I Read
 exits with status
diff --git a/man/man1/cleanname.1 b/man/man1/cleanname.1
index 1f59e677..62d18961 100644
--- a/man/man1/cleanname.1
+++ b/man/man1/cleanname.1
@@ -29,4 +29,4 @@ before processing.
 .SH SOURCE
 .B \*9/src/cmd/cleanname.c
 .SH SEE ALSO
-.MR cleanname (3) .
+.MR cleanname 3 .
diff --git a/man/man1/col.1 b/man/man1/col.1
index 77d4d46b..adb172ed 100644
--- a/man/man1/col.1
+++ b/man/man1/col.1
@@ -14,11 +14,11 @@ and half line feeds (ESC-9 and ESC-8)
 as produced by
 .I nroff
 for .2C in
-.MR ms (7)
+.MR ms 7
 or
-.MR man (7)
+.MR man 7
 and for 
-.MR tbl (1) .
+.MR tbl 1 .
 .I Col
 is a pure filter.
 It normally emits only full line feeds;
@@ -47,7 +47,7 @@ paginate the output.
 .SH SOURCE
 .B \*9/src/cmd/col.c
 .SH SEE ALSO
-.MR pr (1)
+.MR pr 1
 .SH BUGS
 .I Col
 can't back up more than 128 lines or
diff --git a/man/man1/colors.1 b/man/man1/colors.1
index b85f3d8b..960a1c07 100644
--- a/man/man1/colors.1
+++ b/man/man1/colors.1
@@ -17,13 +17,13 @@ colors, cmapcube \- display color map
 .I Colors
 presents a grid showing the colors in the RGBV color map
 (see
-.MR color (7) ).
+.MR color 7 ).
 .PP
 Clicking mouse button 1 over a color in the grid will display the map index for that color,
 its
 red, green, and blue components,
 and the 32-bit hexadecimal color value as defined in
-.MR allocimage (3) .
+.MR allocimage 3 .
 If the
 .B -x
 option is specified, the components will also be listed in hexadecimal.
@@ -53,4 +53,4 @@ to black or white.
 .SH SOURCE
 .B \*9/src/cmd/draw/colors.c
 .SH SEE ALSO
-.MR color (7)
+.MR color 7
diff --git a/man/man1/comm.1 b/man/man1/comm.1
index 86d4c34a..4a09ca72 100644
--- a/man/man1/comm.1
+++ b/man/man1/comm.1
@@ -41,7 +41,7 @@ Print lines common to two sorted files.
 .SH SOURCE
 .B \*9/src/cmd/comm.c
 .SH "SEE ALSO"
-.MR sort (1) ,
+.MR sort 1 ,
 .IR cmp (1), 
 .IR diff (1), 
-.MR uniq (1)
+.MR uniq 1
diff --git a/man/man1/core.1 b/man/man1/core.1
index caf6351b..949b7e2e 100644
--- a/man/man1/core.1
+++ b/man/man1/core.1
@@ -35,7 +35,7 @@ The
 command, if run, prints a stack trace of the 
 executing thread at the time of the core dump;
 see
-.MR db (1) .
+.MR db 1 .
 .PP
 If no arguments are given,
 .I core
@@ -50,6 +50,6 @@ searches the current directory.
 .SH SOURCE
 .B \*9/src/cmd/core.c
 .SH "SEE ALSO
-.MR acid (1) ,
-.MR db (1) ,
-.MR core (5)
+.MR acid 1 ,
+.MR db 1 ,
+.MR core 5
diff --git a/man/man1/crop.1 b/man/man1/crop.1
index c47afac6..3fff66e9 100644
--- a/man/man1/crop.1
+++ b/man/man1/crop.1
@@ -53,9 +53,9 @@ crop, iconv \- frame, crop, and convert image
 .SH DESCRIPTION
 .I Crop
 reads an
-.MR image (7)
+.MR image 7
 file (default standard input), crops it, and writes it as a compressed
-.MR image (7)
+.MR image 7
 file to standard output.
 There are two ways to specify a crop, by color value or by geometry.
 They may be combined in a single run of
@@ -65,7 +65,7 @@ in which case the color value crop will be done first.
 The
 .B -c
 option takes a red-green-blue triplet as described in
-.MR color (3) .
+.MR color 3 .
 (For example, white
 is
 .B 255
@@ -118,7 +118,7 @@ changes the format of pixels in the image
 Pixels in the image are converted according to the channel descriptor
 .IR chandesc ,
 (see
-.MR image (7) ).
+.MR image 7 ).
 For example, to convert a 4-bit-per-pixel grey-scale image to an 8-bit-per-pixel
 color-mapped image,
 .I chandesc
@@ -139,8 +139,8 @@ crop -c 255 255 255 -i -10 -b 255 150 150 imagefile > cropped
 .SH SOURCE
 .B \*9/src/cmd/draw/crop.c
 .SH SEE ALSO
-.MR image (7) ,
-.MR color (3)
+.MR image 7 ,
+.MR color 3
 .SH BUGS
 .I Iconv
 should be able to do Floyd-Steinberg error diffusion or dithering
diff --git a/man/man1/date.1 b/man/man1/date.1
index 7d68b94f..62386b0c 100644
--- a/man/man1/date.1
+++ b/man/man1/date.1
@@ -28,7 +28,7 @@ epoch, 00:00:00 GMT, January 1, 1970.
 The conversion from Greenwich Mean Time to local time depends on the
 .B $timezone
 environment variable; see
-.MR ctime (3) .
+.MR ctime 3 .
 .PP
 If the optional argument
 .I seconds
diff --git a/man/man1/db.1 b/man/man1/db.1
index 5c2cc9db..fa612f57 100644
--- a/man/man1/db.1
+++ b/man/man1/db.1
@@ -45,11 +45,11 @@ specifies the memory image of a process.
 A 
 .I pid
 gives the id of an executing process to be accessed via
-.MR ptrace (2) .
+.MR ptrace 2 .
 A
 .I corefile
 specifies the name of a core dump (see
-.MR core (5)
+.MR core 5
 on your system of choice) containing the
 memory image of a terminated process.
 This manual refers to the memory image specified by
@@ -628,7 +628,7 @@ Dot is assigned to the variable or register named.
 .TP
 .B !
 The rest of the line is passed to
-.MR rc (1)
+.MR rc 1
 for execution.
 .TP
 .BI $ modifier
@@ -969,8 +969,8 @@ is one the breakpoint will fire.
 Beware that local variables may be stored in registers; see the
 BUGS section.
 .SH "SEE ALSO"
-.MR acid (1) ,
-.MR core (1)
+.MR acid 1 ,
+.MR core 1
 .SH SOURCE
 .B \*9/src/cmd/db
 .SH DIAGNOSTICS
diff --git a/man/man1/dc.1 b/man/man1/dc.1
index 70597dcc..ce952eed 100644
--- a/man/man1/dc.1
+++ b/man/man1/dc.1
@@ -235,8 +235,8 @@ lyx
 .SH SOURCE
 .B \*9/src/cmd/dc.c
 .SH "SEE ALSO"
-.MR bc (1) ,
-.MR hoc (1)
+.MR bc 1 ,
+.MR hoc 1
 .SH DIAGNOSTICS
 .I x
 .LR "is unimplemented" ,
diff --git a/man/man1/dd.1 b/man/man1/dd.1
index 6e942fd8..330b7267 100644
--- a/man/man1/dd.1
+++ b/man/man1/dd.1
@@ -191,7 +191,7 @@ options become a simple file copy.
 .SH SOURCE
 .B \*9/src/cmd/dd.c
 .SH "SEE ALSO"
-.MR cp (1)
+.MR cp 1
 .SH DIAGNOSTICS
 .I Dd
 reports the number of full + partial input and output
diff --git a/man/man1/deroff.1 b/man/man1/deroff.1
index 1489aadd..8edda34f 100644
--- a/man/man1/deroff.1
+++ b/man/man1/deroff.1
@@ -16,13 +16,13 @@ reads each file in sequence
 and removes all
 .I nroff
 and
-.MR troff (1)
+.MR troff 1
 requests and non-text arguments, backslash constructions,
 and constructs of preprocessors such as
-.MR eqn (1) ,
-.MR pic (1) ,
+.MR eqn 1 ,
+.MR pic 1 ,
 and
-.MR tbl (1) .
+.MR tbl 1 .
 Remaining text is written on the standard output.
 .I Deroff
 follows files included by
@@ -67,7 +67,7 @@ requests.
 Remove titles, attachments, etc., as well as ordinary 
 .IR troff
 constructs, from
-.MR ms (7)
+.MR ms 7
 or
 .I mm
 documents.
@@ -84,7 +84,7 @@ does for
 and
 .I latex
 (see
-.MR tex (1) )
+.MR tex 1 )
 files what
 .B deroff -wi
 does for
@@ -96,8 +96,8 @@ files.
 .B \*9/src/cmd/delatex.lx
 .SH "SEE ALSO"
 .IR troff (1), 
-.MR tex (1) ,
-.MR spell (1)
+.MR tex 1 ,
+.MR spell 1
 .SH BUGS
 These filters are not complete interpreters of
 .I troff
diff --git a/man/man1/devdraw.1 b/man/man1/devdraw.1
index e606b3e2..d6148667 100644
--- a/man/man1/devdraw.1
+++ b/man/man1/devdraw.1
@@ -5,7 +5,7 @@ devdraw \- draw device simulator
 invoked via
 .I initdraw
 (see
-.MR graphics (3) )
+.MR graphics 3 )
 .SH DESCRIPTION
 .I Devdraw
 serves a custom graphics protocol and is the only program
@@ -17,7 +17,7 @@ On macOS, because a laptop trackpad click only has one button (the trackpad itse
 Option-click is button 2, and Command-click is button 3.
 While the main mouse button is held down,
 Control, Option, and Command serve as simulated buttons 1, 2, 3 for chording in
-.MR acme (4) .
+.MR acme 4 .
 For example, the 1-3 pasting chord in acme can be executed by
 highlighting text while holding down the trackpad button
 and then, while still holding down the button, pressing the Command key.
@@ -28,7 +28,7 @@ Two-finger scrolling on the trackpad sends those button events.
 Holding down shift while clicking adds 5 to the button number.
 For example, Command-Click is button 3, so Command-Shift-Click is button 8.
 Most programs do not respond to those buttons; one notable exception is
-.MR acme (1) ,
+.MR acme 1 ,
 which interprets button 8 (shifted button 3) as a reverse search.
 .PP
 Typing Command-F toggles full screen mode.
@@ -53,14 +53,14 @@ On Unix systems, Control-click is mouse button 2,
 and Alt-click is mouse button 3.
 While the main mouse button is held down,
 Control and Alt serve as simulated buttons 2, 3 for chording in
-.MR acme (4) .
+.MR acme 4 .
 For example, the 1-3 pasting chord in acme can be executed by
 highlighting text while holding down the trackpad button
 and then, while still holding down the button, pressing the Alt key.
 .PP
 Because the Control and Alt keys have other meanings
 (see
-.MR keyboard (7)
+.MR keyboard 7
 for the Alt key's meaning)
 and there is no third modifier key like on the Mac,
 there is no way to type
@@ -71,10 +71,10 @@ undo, redo, cut, and paste.
 .SH SOURCE
 .B \*9/src/cmd/devdraw
 .SH "SEE ALSO
-.MR draw (3) ,
-.MR drawfcall (3) ,
-.MR graphics (3) ,
-.MR keyboard (7)
+.MR draw 3 ,
+.MR drawfcall 3 ,
+.MR graphics 3 ,
+.MR keyboard 7
 .SH BUGS
 .I Devdraw
 should probably present a standard 9P server
diff --git a/man/man1/dial.1 b/man/man1/dial.1
index 0245ba16..f8d93926 100644
--- a/man/man1/dial.1
+++ b/man/man1/dial.1
@@ -12,7 +12,7 @@ dial \- connect to a remote service
 connects to the network address
 .I addr
 (see
-.MR dial (3) )
+.MR dial 3 )
 and then copies data from the connection to standard output,
 and from standard input to the connection.
 .PP
@@ -27,4 +27,4 @@ to exit only in response to end of file on the network connection.
 .SH SOURCE
 .B \*9/src/cmd/dial.c
 .SH SEE ALSO
-.MR dial (3)
+.MR dial 3
diff --git a/man/man1/dict.1 b/man/man1/dict.1
index f4654ea3..9d124ea6 100644
--- a/man/man1/dict.1
+++ b/man/man1/dict.1
@@ -53,7 +53,7 @@ Print a pronunciation key.
 .PD
 .PP
 Patterns are regular expressions (see
-.MR regexp (7) ),
+.MR regexp 7 ),
 with an implicit leading
 .L ^
 and trailing
@@ -154,7 +154,7 @@ searches for dictionaries in the directory named by
 .PP
 .I Adict
 is a dictionary browser for
-.MR acme (1) .
+.MR acme 1 .
 When run with no arguments, it creates a new
 .I acme
 window named
@@ -193,7 +193,7 @@ window.
 dictionaries
 .PD
 .SH "SEE ALSO"
-.MR regexp (7)
+.MR regexp 7
 .SH SOURCE
 .B \*9/src/cmd/dict
 .br
diff --git a/man/man1/diff.1 b/man/man1/diff.1
index c92f45ef..f8b16d4b 100644
--- a/man/man1/diff.1
+++ b/man/man1/diff.1
@@ -19,7 +19,7 @@ two directories are compared by the method of
 .I diff
 for text
 files and
-.MR cmp (1)
+.MR cmp 1
 otherwise.
 If more than two file names are given, then each argument is compared
 to the last argument as above.
@@ -140,9 +140,9 @@ differences.
 .SH SOURCE
 .B \*9/src/cmd/diff
 .SH "SEE ALSO"
-.MR cmp (1) ,
-.MR comm (1) ,
-.MR ed (1)
+.MR cmp 1 ,
+.MR comm 1 ,
+.MR ed 1
 .SH DIAGNOSTICS
 Exit status is the empty string
 for no differences,
diff --git a/man/man1/doctype.1 b/man/man1/doctype.1
index 199323f0..b861b5af 100644
--- a/man/man1/doctype.1
+++ b/man/man1/doctype.1
@@ -17,16 +17,16 @@ doctype \- intuit command line for formatting a document
 .SH DESCRIPTION
 .I Doctype
 examines a
-.MR troff (1)
+.MR troff 1
 input file to deduce the appropriate text formatting command
 and prints it on standard output.
 .I Doctype
 recognizes input for
-.MR troff (1) ,
+.MR troff 1 ,
 related preprocessors like
-.MR eqn (1) ,
+.MR eqn 1 ,
 and the 
-.MR ms (7)
+.MR ms 7
 and
 .I mm 
 macro packages.
@@ -56,8 +56,8 @@ Typeset files named
 .IR eqn (1), 
 .IR tbl (1), 
 .IR pic (1), 
-.MR grap (1) ,
-.MR ms (7) ,
-.MR man (7)
+.MR grap 1 ,
+.MR ms 7 ,
+.MR man 7
 .SH BUGS
 In true A.I. style, its best guesses are inspired rather than accurate.
diff --git a/man/man1/ed.1 b/man/man1/ed.1
index 8dd6f535..5188cc95 100644
--- a/man/man1/ed.1
+++ b/man/man1/ed.1
@@ -96,7 +96,7 @@ beginning of a line.
 supports the
 .I "regular expression"
 notation described in
-.MR regexp (7) .
+.MR regexp 7 .
 Regular expressions are used in addresses to specify
 lines and in one command
 (see
@@ -641,7 +641,7 @@ Dot is unchanged.
 Send the remainder of the line after the
 .L !
 to
-.MR rc (1)
+.MR rc 1
 to be interpreted as a command.
 Dot is unchanged.
 .TP
@@ -679,9 +679,9 @@ and all characters after the last newline.
 .SH SOURCE
 .B \*9/src/cmd/ed.c
 .SH "SEE ALSO"
-.MR sam (1) ,
-.MR sed (1) ,
-.MR regexp (7)
+.MR sam 1 ,
+.MR sed 1 ,
+.MR regexp 7
 .SH DIAGNOSTICS
 .BI ? name
 for inaccessible file;
diff --git a/man/man1/eqn.1 b/man/man1/eqn.1
index e50a500d..f374e3d3 100644
--- a/man/man1/eqn.1
+++ b/man/man1/eqn.1
@@ -15,7 +15,7 @@ eqn  \- typeset mathematics
 .SH DESCRIPTION
 .I Eqn
 is a
-.MR troff (1)
+.MR troff 1
 preprocessor
 for typesetting mathematics
 on a typesetter.
@@ -34,7 +34,7 @@ named in the
 option (default
 .BR -Tutf ;
 see
-.MR troff (1) ).
+.MR troff 1 ).
 When run with other preprocessor filters,
 .I eqn
 usually comes last.
@@ -299,7 +299,7 @@ Mathematical words like
 .LR cos ,
 .L log
 are made Roman automatically.
-.MR Troff (1)
+.MR Troff 1
 four-character escapes like
 .L \e(lh
 (\(lh) can be used anywhere.
@@ -319,7 +319,7 @@ font descriptions for PostScript
 .B \*9/src/cmd/eqn
 .SH "SEE ALSO"
 .IR troff (1), 
-.MR tbl (1)
+.MR tbl 1
 .br
 J. F. Ossanna and B. W. Kernighan,
 ``Troff User's Manual''.
diff --git a/man/man1/freq.1 b/man/man1/freq.1
index 4a55130a..05268250 100644
--- a/man/man1/freq.1
+++ b/man/man1/freq.1
@@ -36,5 +36,5 @@ character, respectively.
 .SH SOURCE
 .B \*9/src/cmd/freq.c
 .SH SEE ALSO
-.MR utf (7) ,
-.MR wc (1)
+.MR utf 7 ,
+.MR wc 1
diff --git a/man/man1/git.1 b/man/man1/git.1
index 8387407a..55b2848c 100644
--- a/man/man1/git.1
+++ b/man/man1/git.1
@@ -55,7 +55,7 @@ current file tree.
 .I Git
 .I diff
 runs Unix's
-.MR diff (1)
+.MR diff 1
 to compare the files in the local tree with the corresponding
 files in the revision history.
 The special revision
diff --git a/man/man1/grap.1 b/man/man1/grap.1
index d36916dc..11cb29a4 100644
--- a/man/man1/grap.1
+++ b/man/man1/grap.1
@@ -9,7 +9,7 @@ grap \- pic preprocessor for drawing graphs
 .SH DESCRIPTION
 .I Grap
 is a
-.MR pic (1)
+.MR pic 1
 preprocessor for drawing graphs on a typesetter.
 Graphs are surrounded by the
 .I troff
@@ -407,7 +407,7 @@ definitions of standard plotting characters, e.g., bullet
 .B \*9/src/cmd/grap
 .SH "SEE ALSO"
 .IR pic (1), 
-.MR troff (1)
+.MR troff 1
 .br
 J. L. Bentley and B. W. Kernighan,
 ``GRAP\(emA Language for Typesetting Graphs'',
diff --git a/man/man1/graph.1 b/man/man1/graph.1
index f8a1e088..9c1bda23 100644
--- a/man/man1/graph.1
+++ b/man/man1/graph.1
@@ -89,7 +89,7 @@ The next argument is
 Next argument is one or more of the characters
 .B bcgkmrwy,
 choosing pen colors by their initial letter, as in
-.MR plot (7) .
+.MR plot 7 .
 Successive curves will cycle through the colors in the given order.
 .TP
 .B  -s
@@ -145,7 +145,7 @@ is reversed.
 .B \*9/src/cmd/graph
 .SH "SEE ALSO"
 .IR plot (1), 
-.MR grap (1)
+.MR grap 1
 .SH BUGS
 Segments that run out of bounds are dropped, not windowed.
 Logarithmic axes may not be reversed.
diff --git a/man/man1/grep.1 b/man/man1/grep.1
index 5fe3a9f7..9dc450cc 100644
--- a/man/man1/grep.1
+++ b/man/man1/grep.1
@@ -27,7 +27,7 @@ searches the input
 for lines that match the
 .IR pattern ,
 a regular expression as defined in
-.MR regexp (7)
+.MR regexp 7
 with the addition of a newline character as an alternative
 (substitute for
 .BR | )
@@ -114,11 +114,11 @@ If no files are listed, it searches all files matching
 .br
 .B \*9/bin/g
 .SH SEE ALSO
-.MR ed (1) ,
-.MR awk (1) ,
-.MR sed (1) ,
-.MR sam (1) ,
-.MR regexp (7)
+.MR ed 1 ,
+.MR awk 1 ,
+.MR sed 1 ,
+.MR sam 1 ,
+.MR regexp 7
 .SH DIAGNOSTICS
 Exit status is null if any lines are selected,
 or non-null when no lines are selected or an error occurs.
diff --git a/man/man1/gview.1 b/man/man1/gview.1
index 8961b625..d867e2bb 100644
--- a/man/man1/gview.1
+++ b/man/man1/gview.1
@@ -144,7 +144,7 @@ awk 'BEGIN{for(x=.1;x<500;x+=.1)print x,sin(x)/x}' | gview
 .SH SOURCE
 .B \*9/src/cmd/draw/gview.c
 .SH SEE ALSO
-.MR awk (1)
+.MR awk 1
 .SH BUGS
 The user interface for the
 .I slant
diff --git a/man/man1/gzip.1 b/man/man1/gzip.1
index 2f78c89f..e01bc8d4 100644
--- a/man/man1/gzip.1
+++ b/man/man1/gzip.1
@@ -150,8 +150,8 @@ Produce debugging output.
 .br
 .B \*9/src/cmd/bzip2
 .SH SEE ALSO
-.MR tar (1) ,
-.MR compress (1)
+.MR tar 1 ,
+.MR compress 1
 .SH BUGS
 .I Unzip
 can only extract files which are uncompressed or compressed
diff --git a/man/man1/hist.1 b/man/man1/hist.1
index bec129a8..a965f7da 100644
--- a/man/man1/hist.1
+++ b/man/man1/hist.1
@@ -41,7 +41,7 @@ option enables verbose debugging printout.
 The 
 .B -d
 option causes
-.MR diff (1)
+.MR diff 1
 .B -c
 to be run for each adjacent pair of dump files, while
 .B -b
@@ -73,11 +73,11 @@ by convention, root of dump file system
 .SH SOURCE
 .B \*9/src/cmd/hist.c
 .SH SEE ALSO
-.MR yesterday (1) ,
-.MR vbackup (8)
+.MR yesterday 1 ,
+.MR vbackup 8
 .SH BUGS
 Should be called
 .IR history ,
 but
 that name is taken by
-.MR sh (1) .
+.MR sh 1 .
diff --git a/man/man1/hoc.1 b/man/man1/hoc.1
index 24075b0b..786ee043 100644
--- a/man/man1/hoc.1
+++ b/man/man1/hoc.1
@@ -133,8 +133,8 @@ for(i=1; i<12; i++) print gcd(i,12)
 .SH SOURCE
 .B \*9/src/cmd/hoc
 .SH "SEE ALSO"
-.MR bc (1) ,
-.MR dc (1)
+.MR bc 1 ,
+.MR dc 1
 .br
 B. W. Kernighan and R. Pike,
 .I
diff --git a/man/man1/htmlroff.1 b/man/man1/htmlroff.1
index 197c2f04..92d0c65a 100644
--- a/man/man1/htmlroff.1
+++ b/man/man1/htmlroff.1
@@ -21,7 +21,7 @@ htmlroff \- HTML formatting and typesetting
 .SH DESCRIPTION
 .I Htmlroff
 accepts
-.MR troff (1)
+.MR troff 1
 input in the named 
 .I files
 and formats it as HTML for viewing in a web browser.
@@ -63,7 +63,7 @@ HTML entity sequences
 and so on).
 .I Htmlroff
 invokes
-.MR tcs (1)
+.MR tcs 1
 for the conversion.
 .TP
 .B -v
@@ -73,7 +73,7 @@ Generate debugging output and warnings about suspicious input.
 Most 
 .I troff
 input files, especially those using the
-.MR ms (7)
+.MR ms 7
 macros, can be used unaltered.
 In general, the macro file
 .B tmac.html
@@ -83,10 +83,10 @@ as in
 .B -ms
 .BR -mhtml .
 .PP
-.MR Htmlroff (7)
+.MR Htmlroff 7
 describes the changes to the input language.
 .PP
-.MR Mhtml (7)
+.MR Mhtml 7
 describes the new macros.
 .SH EXAMPLES
 Format the Plan 9 web page:
@@ -113,7 +113,7 @@ to Unicode characters like α.
 .SH SOURCE
 .B \*9/src/cmd/htmlroff
 .SH "SEE ALSO
-.MR tcs (1) ,
-.MR troff (1) ,
-.MR htmlroff (7) ,
-.MR mhtml (7)
+.MR tcs 1 ,
+.MR troff 1 ,
+.MR htmlroff 7 ,
+.MR mhtml 7
diff --git a/man/man1/idiff.1 b/man/man1/idiff.1
index 49a2df6b..530f45d8 100644
--- a/man/man1/idiff.1
+++ b/man/man1/idiff.1
@@ -50,7 +50,7 @@ and prompt again.
 .PP
 .I Idiff
 invokes
-.MR diff (1)
+.MR diff 1
 to compare the files.
 The
 .B -b
@@ -66,7 +66,7 @@ passed to
 .SH SOURCE
 .B \*9/src/cmd/idiff.c
 .SH "SEE ALSO
-.MR diff (1)
+.MR diff 1
 .br
 Kernighan and Pike,
 .IR "The Unix Programming Environment" ,
diff --git a/man/man1/install.1 b/man/man1/install.1
index 66f780c7..4af34f1c 100644
--- a/man/man1/install.1
+++ b/man/man1/install.1
@@ -15,7 +15,7 @@ cd \*9; ./INSTALL
 .SH DESCRIPTION
 To obtain the Plan 9 tree, use Git
 (see
-.MR git (1) )
+.MR git 1 )
 or download a tar file from
 .HR https://9fans.github.io/plan9port "" .
 .PP
@@ -25,7 +25,7 @@ usual place is
 In the root of the tree, run
 .BR ./INSTALL .
 This script builds the Plan 9 build program
-.MR mk (1)
+.MR mk 1
 if necessary,
 cleans all previously built object files and libraries out of the tree,
 rebuilds and installs everything, and then cleans up.
@@ -109,7 +109,7 @@ can safely be repeated to rebuild the system from scratch.
 .PP
 Once the system is built for the first time,
 it can be maintained and rebuilt using
-.MR mk (1) .
+.MR mk 1 .
 To rebuild individual commands or libraries,
 run
 .B mk
@@ -119,7 +119,7 @@ and
 .B clean
 in the appropriate source directory
 (see
-.MR src (1) ).
+.MR src 1 ).
 .SH FILES
 .TP
 .B \*9/lib/moveplan9.files
@@ -132,7 +132,7 @@ the script that edits the files
 .TP
 .B \*9/src/mkmk.sh
 the shell script used to build
-.MR mk (1)
+.MR mk 1
 .TP
 .B \*9/dist/manweb
 the shell script that builds the HTML manual
@@ -148,5 +148,5 @@ logged output from the last run of
 a summary of
 .B install.log
 .SH SEE ALSO
-.MR intro (1) ,
-.MR git (1)
+.MR intro 1 ,
+.MR git 1
diff --git a/man/man1/join.1 b/man/man1/join.1
index f9c9d543..98f87d44 100644
--- a/man/man1/join.1
+++ b/man/man1/join.1
@@ -114,7 +114,7 @@ birthdays empty.
 The layout of 
 .B /adm/users
 is given in
-.MR passwd (5) ;
+.MR passwd 5 ;
 .B bdays
 contains sorted lines like
 .LR "ken:Feb\ 4,\ 1953" .
@@ -132,7 +132,7 @@ Print all pairs of users with identical userids.
 .SH "SEE ALSO"
 .IR sort (1), 
 .IR comm (1), 
-.MR awk (1)
+.MR awk 1
 .SH BUGS
 With default field separation,
 the collating sequence is that of
diff --git a/man/man1/jpg.1 b/man/man1/jpg.1
index 03767221..885d1f1e 100644
--- a/man/man1/jpg.1
+++ b/man/man1/jpg.1
@@ -122,7 +122,7 @@ Typing a
 .BR q ,
 DEL, or control-D exits the program.
 For a more user-friendly interface, use
-.MR page (1) ,
+.MR page 1 ,
 which invokes these programs to convert the images to standard format,
 displays them, and offers scrolling, panning, and menu-driven navigation among the files.
 .PP
@@ -147,7 +147,7 @@ any of the following options:
 .TP
 .B -c
 Convert the image to a Plan 9 representation, as defined by
-.MR image (7) ,
+.MR image 7 ,
 and write it to standard output.
 .TP
 .B -9
@@ -156,7 +156,7 @@ Like
 but produce an uncompressed image.
 This saves processing time, particularly when the output is
 being piped to another program such as
-.MR page (1) ,
+.MR page 1 ,
 since it avoids compression and decompression.
 .TP
 .B -t
@@ -235,8 +235,8 @@ space in the image.  The icon file is written to standard output.
 .SH SOURCE
 .B \*9/src/cmd/jpg
 .SH "SEE ALSO"
-.MR page (1) ,
-.MR image (7) .
+.MR page 1 ,
+.MR image 7 .
 .SH BUGS
 Writing an animated GIF using
 .I togif
diff --git a/man/man1/kill.1 b/man/man1/kill.1
index f82b4877..119a69db 100644
--- a/man/man1/kill.1
+++ b/man/man1/kill.1
@@ -19,18 +19,18 @@ prints commands that will cause all processes with
 .I name
 and owned by the current user to be terminated.
 Each command is commented with an output line from
-.MR ps (1)
+.MR ps 1
 describing the process that would be killed.
 Use the
 .B send
 command of
-.MR 9term (1) ,
+.MR 9term 1 ,
 or pipe the output of
 .I kill
 into
-.MR rc (1)
+.MR rc 1
 or
-.MR sh (1)
+.MR sh 1
 to execute the commands.
 .PP
 .I Kill
@@ -60,8 +60,8 @@ signal.
 .SH SOURCE
 .B \*9/bin
 .SH "SEE ALSO"
-.MR ps (1) ,
-.MR notify (3)
+.MR ps 1 ,
+.MR notify 3
 .SH BUGS
 .I Stop
 and
diff --git a/man/man1/label.1 b/man/man1/label.1
index 6688972d..b1b481a1 100644
--- a/man/man1/label.1
+++ b/man/man1/label.1
@@ -14,12 +14,12 @@ label, awd \- set window label
 sets the label of the current 
 .I win
 (see
-.MR acme (1) )
+.MR acme 1 )
 or X terminal window
 .RI ( e.g.,
-.MR 9term (1)
+.MR 9term 1
 or
-.MR xterm (1) )
+.MR xterm 1 )
 by echoing a special control sequence to standard output.
 .PP
 .I Acme
@@ -38,7 +38,7 @@ sets the window name to the current directory with a
 suffix, using the name of the current system by default.
 .SH EXAMPLE
 One can use the following
-.MR sh (1)
+.MR sh 1
 function to keep the label up-to-date in response to
 .I cd
 commands:
@@ -55,7 +55,7 @@ alias cd=_cd
 cd .
 .EE
 .PP
-.MR Rc (1)
+.MR Rc 1
 installs a similar 
 .B fn
 .B cd
@@ -77,4 +77,4 @@ fn cd {
 .SH BUGS
 .I Awd
 is also documented in
-.MR acme (1) .
+.MR acme 1 .
diff --git a/man/man1/lex.1 b/man/man1/lex.1
index a740c2e8..b9e06572 100644
--- a/man/man1/lex.1
+++ b/man/man1/lex.1
@@ -65,7 +65,7 @@ output
 template
 .SH "SEE ALSO"
 .IR yacc (1), 
-.MR sed (1)
+.MR sed 1
 .br
 M. E. Lesk and E. Schmidt,
 `LEX\(emLexical Analyzer Generator', 
diff --git a/man/man1/look.1 b/man/man1/look.1
index 731d616e..03a3c7de 100644
--- a/man/man1/look.1
+++ b/man/man1/look.1
@@ -74,7 +74,7 @@ is assumed, with collating sequence
 .B \*9/src/cmd/look.c
 .SH "SEE ALSO"
 .IR sort (1), 
-.MR grep (1)
+.MR grep 1
 .SH DIAGNOSTICS
 The exit status is
 .RB `` "not found" ''
diff --git a/man/man1/ls.1 b/man/man1/ls.1
index 863f8e22..b07f09bc 100644
--- a/man/man1/ls.1
+++ b/man/man1/ls.1
@@ -29,7 +29,7 @@ is the same as
 but sets the
 .B -p
 option and pipes the output through
-.MR mc (1) .
+.MR mc 1 .
 .PP
 There are a number of options:
 .TP
@@ -42,7 +42,7 @@ List in long format, giving mode (see below), file system type
 (e.g., for devices, the
 .B #
 code letter that names it; see
-.MR intro (3) ),
+.MR intro 3 ),
 the instance or subdevice number, owner, group,
 size in bytes, and time of last modification
 for each file.
@@ -60,7 +60,7 @@ Print only the final path element of each file name.
 List the
 .I qid
 (see
-.MR stat (3) )
+.MR stat 3 )
 of each file; the printed fields are in the order
 path, version, and type.
 .TP
@@ -99,7 +99,7 @@ otherwise.
 .TP
 .B -Q
 By default, printed file names are quoted if they contain characters special to
-.MR rc (1) .
+.MR rc 1 .
 The
 .B -Q
 flag disables this behavior.
@@ -168,5 +168,5 @@ if none of the above permissions is granted.
 .br
 .B \*9/bin/lc
 .SH SEE ALSO
-.MR stat (3) ,
-.MR mc (1)
+.MR stat 3 ,
+.MR mc 1
diff --git a/man/man1/man.1 b/man/man1/man.1
index 2fc8c1f5..90ad2017 100644
--- a/man/man1/man.1
+++ b/man/man1/man.1
@@ -45,7 +45,7 @@ The options are:
 .TP
 .B -h
 Print the pages to HTML and send to a web browser with
-.MR web (1) .
+.MR web 1 .
 .TP
 .B -n
 (Default)
@@ -54,17 +54,17 @@ Print the pages on the standard output using
 .TP
 .B -p
 Run
-.MR proof (1)
+.MR proof 1
 on the specified man pages.
 .TP
 .B -P
 Run
-.MR page (1)
+.MR page 1
 on the specified man pages.
 .TP
 .B -t
 Run
-.MR troff (1)
+.MR troff 1
 and send its output
 to standard output.
 .TP
@@ -106,8 +106,8 @@ index for
 .br
 .B \*9/bin/lookman
 .SH "SEE ALSO"
-.MR page (1) ,
-.MR proof (1)
+.MR page 1 ,
+.MR proof 1
 .SH BUGS
 The manual was intended to be typeset; some detail is sacrificed on text terminals.
 .PP
diff --git a/man/man1/map.1 b/man/man1/map.1
index d526aa48..c1f2aa0a 100644
--- a/man/man1/map.1
+++ b/man/man1/map.1
@@ -305,7 +305,7 @@ tracks appear as dot-dashed lines if the plotting filter supports them.)
 The
 .I file
 contains 
-.MR plot (7) -style
+.MR plot 7 -style
 data for
 .L :
 or
@@ -640,7 +640,7 @@ Map driver program
 .B \*9/src/cmd/map
 .SH "SEE ALSO"
 .IR map (7), 
-.MR plot (1)
+.MR plot 1
 .SH DIAGNOSTICS
 `Map seems to be empty'\(ema coarse survey found
 zero extent within the 
diff --git a/man/man1/mc.1 b/man/man1/mc.1
index 627202be..64c34ce9 100644
--- a/man/man1/mc.1
+++ b/man/man1/mc.1
@@ -18,10 +18,10 @@ splits the input into as many columns as will fit in
 .I N
 print positions.
 If run in a
-.MR 9term (1) ,
-.MR xterm (1) ,
+.MR 9term 1 ,
+.MR xterm 1 ,
 or
-.MR acme (1)
+.MR acme 1
 window, the default
 .I N
 is the number of blanks that will fit across the window;
@@ -36,14 +36,14 @@ is printed separately.
 .SH SOURCE
 .B \*9/src/cmd/draw/mc.c
 .SH "SEE ALSO"
-.MR 9term (1) ,
-.MR acme (1) ,
-.MR acme (4) ,
-.MR xterm (1) ,
-.MR pr (1) ,
+.MR 9term 1 ,
+.MR acme 1 ,
+.MR acme 4 ,
+.MR xterm 1 ,
+.MR pr 1 ,
 .I lc
 in
-.MR ls (1)
+.MR ls 1
 .SH BUGS
 On systems with high-DPI screens,
 .I 9term
diff --git a/man/man1/mk.1 b/man/man1/mk.1
index 4c3d2b70..4399129b 100644
--- a/man/man1/mk.1
+++ b/man/man1/mk.1
@@ -29,7 +29,7 @@ contains a
 .I rule
 for each target that identifies the files and other
 targets upon which it depends and an
-.MR sh (1)
+.MR sh 1
 script, a
 .IR recipe ,
 to update the target.
@@ -157,7 +157,7 @@ In the recipe of a meta-rule, the environment variable
 contains the string matched by the
 .BR % .
 For example, a meta-rule to compile a C program using
-.MR 9c (1)
+.MR 9c 1
 might be:
 .IP
 .EX
@@ -207,7 +207,7 @@ References to variables are replaced by the variables' values.
 Special characters may be quoted using single quotes
 .BR \&''
 as in
-.MR sh (1) .
+.MR sh 1 .
 .PP
 Assignments and rules are distinguished by
 the first unquoted occurrence of
@@ -246,7 +246,7 @@ A legal reference of the form
 or
 .B ${name}
 is expanded as in
-.MR sh (1) .
+.MR sh 1 .
 A reference of the form
 .BI ${name: A % B = C\fL%\fID\fL}\fR,
 where
@@ -315,9 +315,9 @@ or
 .BR rcsh ,
 .I mk
 uses
-.MR rc (1) 's
+.MR rc 1 's
 quoting rules; otherwise it uses
-.MR sh (1) 's.
+.MR sh 1 's.
 The
 .B MKSHELL
 variable is consulted when the mkfile is read, not when it is executed,
@@ -523,7 +523,7 @@ of the aggregate
 Currently, the only aggregates supported are
 .I 9ar
 (see
-.MR 9c (1) )
+.MR 9c 1 )
 archives.
 .SS Attributes
 The colon separating the target from the prerequisites
@@ -567,12 +567,12 @@ In the rule,
 .B %
 has no special meaning.
 The target is interpreted as a regular expression as defined in
-.MR regexp (7) .
+.MR regexp 7 .
 The prerequisites may contain references
 to subexpressions in form
 .BI \e n\f1,
 as in the substitute command of
-.MR sed (1) .
+.MR sed 1 .
 .TP
 .B U
 The targets are considered to have been updated
@@ -625,7 +625,7 @@ Regular expression meta-rules:
 .EE
 .PP
 A correct way to deal with
-.MR yacc (1)
+.MR yacc 1
 grammars.
 The file
 .B lex.c
@@ -656,8 +656,8 @@ x.tab.h:Pcmp -s:	y.tab.h
 .SH SOURCE
 .B \*9/src/cmd/mk
 .SH SEE ALSO
-.MR sh (1) ,
-.MR regexp (7)
+.MR sh 1 ,
+.MR regexp 7
 .PP
 A. Hume,
 ``Mk: a Successor to Make''
diff --git a/man/man1/mk9660.1 b/man/man1/mk9660.1
index 4f78bd27..8e6c732d 100644
--- a/man/man1/mk9660.1
+++ b/man/man1/mk9660.1
@@ -71,7 +71,7 @@ the current directory).
 The
 .I proto
 file is formatted as described in
-.MR proto (3) .
+.MR proto 3 .
 .PP
 The created CD image will be in ISO-9660
 format, but by default the file names will
@@ -224,7 +224,7 @@ mk9660 -9cj -s /n/bootes -p srcproto cdimage
 .SH SOURCE
 \*9/src/cmd/9660
 .SH "SEE ALSO
-.MR proto (3)
+.MR proto 3
 .\" .SH "SEE ALSO"
 .\" .I 9660srv
 .\" (in
diff --git a/man/man1/mkdir.1 b/man/man1/mkdir.1
index b91ba22e..438e4add 100644
--- a/man/man1/mkdir.1
+++ b/man/man1/mkdir.1
@@ -28,11 +28,11 @@ The
 flag sets the permissions to be used when creating the directory.
 The default is 0777.
 .SH "SEE ALSO"
-.MR rm (1)
+.MR rm 1
 .br
 .IR cd
 in
-.MR rc (1)
+.MR rc 1
 .SH SOURCE
 .B \*9/src/cmd/mkdir.c
 .SH DIAGNOSTICS
diff --git a/man/man1/mount.1 b/man/man1/mount.1
index 123a395a..9cd1c526 100644
--- a/man/man1/mount.1
+++ b/man/man1/mount.1
@@ -15,7 +15,7 @@ mounts a 9P server's files into the file system.
 is typically 
 either the name of a Unix domain socket
 (see
-.MR namespace (1) )
+.MR namespace 1 )
 or the name or IP address of a machine
 serving 9P over TCP port 564.
 .PP
@@ -29,7 +29,7 @@ On Linux,
 .I mount
 uses the native 9P kernel module when present.
 Otherwise it tries to use
-.MR 9pfuse (4)
+.MR 9pfuse 4
 with the FUSE file system module.
 Using the 9P kernel module requires root access.
 FUSE can often be used by regular users.
@@ -45,7 +45,7 @@ should be invoked as
 .BR mount .
 .SH EXAMPLES
 Mount 
-.MR acme (4)
+.MR acme 4
 onto 
 .B /mnt/acme :
 .IP
@@ -64,6 +64,6 @@ cat /mnt/plumb/rules
 .br
 .B \*9/bin/unmount
 .SH SEE ALSO
-.MR intro (4) ,
+.MR intro 4 ,
 .IR intro (9p),
-.MR 9pfuse (4)
+.MR 9pfuse 4
diff --git a/man/man1/namespace.1 b/man/man1/namespace.1
index 7015ca25..5def4783 100644
--- a/man/man1/namespace.1
+++ b/man/man1/namespace.1
@@ -7,9 +7,9 @@ namespace \- print name space directory
 .I Namespace
 prints the directory representing the current name space.
 See
-.MR intro (4) .
+.MR intro 4 .
 .SH SOURCE
 .B \*9/src/cmd/namespace.c
 .SH SEE ALSO
-.MR getns (3) ,
-.MR intro (4)
+.MR getns 3 ,
+.MR intro 4
diff --git a/man/man1/ndb.1 b/man/man1/ndb.1
index 4ce7616b..5490caab 100644
--- a/man/man1/ndb.1
+++ b/man/man1/ndb.1
@@ -24,9 +24,9 @@ ndbquery, ndbmkhash, ndbmkdb, ndbipquery, ndbmkhosts \- network database
 The network database holds administrative information used by
 .I authdial
 (see
-.MR authsrv (3) )
+.MR authsrv 3 )
 and
-.MR secstored (1) .
+.MR secstored 1 .
 .PP
 .I Ndbquery 
 searches the database for an attribute of type
@@ -46,7 +46,7 @@ of all the matched entries is returned.
 uses
 .I ndbipinfo
 (see
-.MR ndb (3) )
+.MR ndb 3 )
 to search for the values of the attributes
 .I rattr
 corresponding to the system
@@ -382,7 +382,7 @@ and by the ndb library routines.
 .PP
 .I Ndbmkdb
 is used in concert with
-.MR awk (1)
+.MR awk 1
 scripts to convert
 uucp systems files and IP host files
 into database files.
@@ -395,7 +395,7 @@ it is necessary to run
 .I ndbmkhash
 whenever the files are modified.
 It may be profitable to control this by a frequent
-.MR cron (8)
+.MR cron 8
 job.
 .PP
 .I Ndbmkhosts
@@ -439,5 +439,5 @@ hash files for
 .SH SOURCE
 .B \*9/src/cmd/ndb
 .SH SEE ALSO
-.MR ndb (3) ,
-.MR ndb (7)
+.MR ndb 3 ,
+.MR ndb 7
diff --git a/man/man1/netfiles.1 b/man/man1/netfiles.1
index 97f72c6f..d64b433f 100644
--- a/man/man1/netfiles.1
+++ b/man/man1/netfiles.1
@@ -21,7 +21,7 @@ Netfiles, netfileget, netfileput, netfilestat \- network file access inside acme
 .SH DESCRIPTION
 .B Netfiles
 presents remote file systems in
-.MR acme (4)
+.MR acme 4
 windows.
 Each window is named
 .BI /n/ system / path
@@ -35,7 +35,7 @@ reads names of windows to create from the
 plumbing channel
 .B netfileedit
 (see
-.MR plumber (4)
+.MR plumber 4
 and the example section below).
 In a
 .IR netfiles -controlled
@@ -60,13 +60,13 @@ The three first check to see if
 .I system
 is a service in the current name space
 (see
-.MR intro (4) ).
+.MR intro 4 ).
 If so, they use
-.MR 9p (1)
+.MR 9p 1
 to access it.
 Otherwise, they assume that the system is a network name
 and use
-.MR ssh (1) 's
+.MR ssh 1 's
 .I sftp
 to access it.
 .PP
@@ -100,7 +100,7 @@ or
 .SH EXAMPLES
 The following plumbing rule 
 (see
-.MR plumb (7) )
+.MR plumb 7 )
 passes 
 .B /n/
 paths to 
@@ -118,17 +118,17 @@ plumb client Netfiles
 .SH SOURCE
 .B \*9/src/cmd/netfiles
 .SH SEE ALSO
-.MR 9p (1) ,
-.MR ssh (1) ,
-.MR ssh-agent (1) ,
-.MR intro (4) ,
-.MR acme (4) ,
-.MR factotum (4) ,
+.MR 9p 1 ,
+.MR ssh 1 ,
+.MR ssh-agent 1 ,
+.MR intro 4 ,
+.MR acme 4 ,
+.MR factotum 4 ,
 .HR http://v9fs.sf.net
 .SH BUGS
 .I Netfiles
 depends on
-.MR sftpcache (1) ,
+.MR sftpcache 1 ,
 which only works with OpenSSH versions 4.3 and earlier;
 later versions do not print the
 .B sftp>
diff --git a/man/man1/page.1 b/man/man1/page.1
index 8edefe26..d3906c88 100644
--- a/man/man1/page.1
+++ b/man/man1/page.1
@@ -25,7 +25,7 @@ of a
 PostScript,
 PDF,
 or
-.MR troff (1)
+.MR troff 1
 or
 Unix's
 .IR tex (1)
@@ -41,7 +41,7 @@ graphics files
 FAX
 page,
 a Plan 9
-.MR image (7)
+.MR image 7
 file, an Inferno bitmap file, or other common format).
 .I Page
 displays these
@@ -108,7 +108,7 @@ it listens to the
 .B image
 plumbing channel
 (see
-.MR plumber (4) )
+.MR plumber 4 )
 for more images to display.
 The
 .B -i
@@ -194,7 +194,7 @@ reverses the order in which pages are displayed.
 Typing a
 .B w
 will write the currently viewed page to a new file as a compressed
-.MR image (7)
+.MR image 7
 file.
 When possible, the filename is of the form
 .IR basename . pagenum . bit .
@@ -217,7 +217,7 @@ and
 PDF
 .IR files .
 It also calls a variety of conversion programs, such as those described in
-.MR jpg (1) ,
+.MR jpg 1 ,
 to convert the various raster graphics formats
 into Inferno bitmap files.
 Pages are converted ``on the fly,'' as needed.
@@ -235,11 +235,11 @@ Browse the Inferno bitmap library.
 man -t page | page -w
 Preview this manual in a new window.
 .SH "SEE ALSO
-.MR gs (1) ,
-.MR jpg (1) ,
-.MR proof (1) ,
-.MR tex (1) ,
-.MR troff (1)
+.MR gs 1 ,
+.MR jpg 1 ,
+.MR proof 1 ,
+.MR tex 1 ,
+.MR troff 1
 .SH SOURCE
 .B \*9/src/cmd/page
 .SH DIAGNOSTICS
@@ -277,7 +277,7 @@ There are too many keyboard commands and menu items.
 Displaying a PostScript or PDF file depends both on having
 GhostScript
 (see
-.MR gs (1) )
+.MR gs 1 )
 installed and on the underlying operating system
 providing a file descriptor device tree at
 .BR /dev/fd .
diff --git a/man/man1/paint.1 b/man/man1/paint.1
index 838535c0..7f1accdf 100644
--- a/man/man1/paint.1
+++ b/man/man1/paint.1
@@ -19,7 +19,7 @@ If the optional
 argument is specified, then it is read and used as the canvas.
 .I Paint
 only recognizes Plan 9 bitmap format (see
-.MR image (6) ).
+.MR image 6 ).
 .PP
 A number of immediate keyboard commands are recognized:
 .TP
@@ -74,12 +74,12 @@ Quits the program.
 .SH SOURCE
 .B /sys/src/cmd/paint.c
 .SH "SEE ALSO"
-.MR resample (1) ,
-.MR rotate (1) ,
-.MR crop (1) ,
-.MR jpg (1) ,
-.MR page (1) ,
-.MR image (6)
+.MR resample 1 ,
+.MR rotate 1 ,
+.MR crop 1 ,
+.MR jpg 1 ,
+.MR page 1 ,
+.MR image 6
 .SH HISTORY
 .I Paint
 first appeared in 9front (October, 2011).
diff --git a/man/man1/passwd.1 b/man/man1/passwd.1
index 9f32497f..97d96c6f 100644
--- a/man/man1/passwd.1
+++ b/man/man1/passwd.1
@@ -36,7 +36,7 @@ It is a substitute for a SecureNet box.
 .br
 .B \*9/src/cmd/auth/passwd.c
 .SH "SEE ALSO"
-.MR encrypt (3)
+.MR encrypt 3
 .PP
 Robert Morris and Ken Thompson,
 ``UNIX Password Security,''
diff --git a/man/man1/pem.1 b/man/man1/pem.1
index 9911af95..a5fa58de 100644
--- a/man/man1/pem.1
+++ b/man/man1/pem.1
@@ -20,7 +20,7 @@ Privacy Enhanced Mail program but now commonly used for
 other applications, notably TLS.
 PEM encodes data in base 64
 (see
-.MR encode (3) )
+.MR encode 3 )
 between lines of the form:
 .IP
 .EX
@@ -33,7 +33,7 @@ where
 may be any string describing the encoded data.
 The most common use of PEM format on Plan 9 is for encoding
 X.509 certificates; see
-.MR rsa (1) .
+.MR rsa 1 .
 .PP
 .I Pemdecode
 extracts the named
@@ -62,4 +62,4 @@ hello world
 .SH SOURCE
 .B \*9/src/cmd/auth
 .SH "SEE ALSO
-.MR rsa (1)
+.MR rsa 1
diff --git a/man/man1/pic.1 b/man/man1/pic.1
index d122ff3b..3140046f 100644
--- a/man/man1/pic.1
+++ b/man/man1/pic.1
@@ -31,7 +31,7 @@ pic, tpic, svgpic \- troff and tex preprocessors for drawing pictures
 .SH DESCRIPTION
 .I Pic
 is a
-.MR troff (1)
+.MR troff 1
 preprocessor for drawing figures on a typesetter.
 .I Pic
 code is contained between
@@ -300,7 +300,7 @@ statement removes the definition of a macro.
 .PP
 .I Tpic
 is a
-.MR tex (1)
+.MR tex 1
 preprocessor that accepts
 .IR pic
 language.
@@ -345,8 +345,8 @@ A: ellipse
 .B \*9/src/cmd/pic
 .SH "SEE ALSO"
 .IR grap (1), 
-.MR doctype (1) ,
-.MR troff (1)
+.MR doctype 1 ,
+.MR troff 1
 .br
 B. W. Kernighan,
 ``PIC\(ema Graphics Language for Typesetting'',
diff --git a/man/man1/plot.1 b/man/man1/plot.1
index 87d6936a..d6b22c14 100644
--- a/man/man1/plot.1
+++ b/man/man1/plot.1
@@ -14,7 +14,7 @@ from the
 .I files
 or standard input,
 drawing the results in a newly created
-.MR rio (1)
+.MR rio 1
 window.
 Plot persists until a newline is typed in the window.
 Various options may be interspersed with the
@@ -31,7 +31,7 @@ Erase the screen.
 .TP
 .BI -c " col"
 Set the foreground color (see
-.MR plot (7)
+.MR plot 7
 for color names).
 .TP
 .BI -f " fill"
@@ -57,5 +57,5 @@ middle of the screen.
 .SH SOURCE
 .B \*9/src/cmd/plot
 .SH "SEE ALSO"
-.MR rio (1) ,
-.MR plot (7)
+.MR rio 1 ,
+.MR plot 7
diff --git a/man/man1/plumb.1 b/man/man1/plumb.1
index 39e4d6c5..6d11a4a7 100644
--- a/man/man1/plumb.1
+++ b/man/man1/plumb.1
@@ -83,6 +83,6 @@ default rules file
 .SH SOURCE
 .B \*9/src/cmd/plumb
 .SH "SEE ALSO"
-.MR plumb (3) ,
-.MR plumber (4) ,
-.MR plumb (7)
+.MR plumb 3 ,
+.MR plumber 4 ,
+.MR plumb 7
diff --git a/man/man1/pr.1 b/man/man1/pr.1
index 624c25fb..d0fc2846 100644
--- a/man/man1/pr.1
+++ b/man/man1/pr.1
@@ -106,5 +106,5 @@ characters instead of the default 72.
 .SH SOURCE
 .B \*9/src/cmd/pr.c
 .SH "SEE ALSO"
-.MR cat (1) ,
-.MR lp (1)
+.MR cat 1 ,
+.MR lp 1
diff --git a/man/man1/proof.1 b/man/man1/proof.1
index 63b70a6b..96235b77 100644
--- a/man/man1/proof.1
+++ b/man/man1/proof.1
@@ -22,7 +22,7 @@ proof \- troff output interpreter
 .SH DESCRIPTION
 .I Proof
 reads
-.MR troff (1)
+.MR troff 1
 intermediate language from
 .I file
 or standard input
@@ -126,8 +126,8 @@ into screen fonts and character numbers
 .B \*9/src/cmd/proof
 .SH SEE ALSO
 .IR lp (1), 
-.MR gs (1) ,
-.MR page (1)
+.MR gs 1 ,
+.MR page 1
 .br
 J. F. Ossanna and B. W. Kernighan,
 ``Troff User's Manual''
diff --git a/man/man1/ps.1 b/man/man1/ps.1
index 5904564a..697003f7 100644
--- a/man/man1/ps.1
+++ b/man/man1/ps.1
@@ -102,6 +102,6 @@ to print the arguments for the process.  Newlines in arguments will be translate
 .br
 .B \*9/bin/psu
 .SH "SEE ALSO"
-.MR acid (1) ,
-.MR db (1) ,
-.MR kill (1)
+.MR acid 1 ,
+.MR db 1 ,
+.MR kill 1
diff --git a/man/man1/psfonts.1 b/man/man1/psfonts.1
index 2c4b0531..d3d75131 100644
--- a/man/man1/psfonts.1
+++ b/man/man1/psfonts.1
@@ -16,9 +16,9 @@ psfonts, psdownload \- add necessary fonts to PostScript document for printing
 ]
 .SH DESCRIPTION
 Plan 9's
-.MR troff (1)
+.MR troff 1
 and
-.MR tr2post (1)
+.MR tr2post 1
 use non-standard PostScript fonts
 (found in
 .BR \*9/postscript/font ).
@@ -114,12 +114,12 @@ Continue running even after fatal errors occur.
 .PD
 .SH EXAMPLE
 See
-.MR tr2post (1)
+.MR tr2post 1
 for an example.
 .SH SOURCE
 .B \*9/bin/psfonts
 .br
 .B \*9/src/cmd/postscript/download
 .SH SEE ALSO
-.MR troff (1) ,
-.MR tr2post (1)
+.MR troff 1 ,
+.MR tr2post 1
diff --git a/man/man1/pwd.1 b/man/man1/pwd.1
index e0a506fb..96386184 100644
--- a/man/man1/pwd.1
+++ b/man/man1/pwd.1
@@ -18,8 +18,8 @@ such as constructing shell prompts.
 .SH SEE ALSO
 .I cd
 in
-.MR rc (1) ,
-.MR getwd (3)
+.MR rc 1 ,
+.MR getwd 3
 .SH BUGS
 .I Pwd
 is not provided.
diff --git a/man/man1/rc.1 b/man/man1/rc.1
index 35670f0f..96c804ef 100644
--- a/man/man1/rc.1
+++ b/man/man1/rc.1
@@ -50,7 +50,7 @@ exits or is terminated, the
 variable
 .B $status
 gets the process's wait message (see
-.MR wait (3) );
+.MR wait 3 );
 it will be the null string if the command was successful.
 .PP
 A long command line may be continued on subsequent lines by typing
@@ -83,7 +83,7 @@ in a directory in
 .B $path
 is the program to be executed.
 To be executable, the user must have execute permission (see
-.MR stat (3) )
+.MR stat 3 )
 and the file must be either an executable binary
 for the current machine's CPU type, or a shell script.
 Shell scripts begin with a line containing the full path name of a shell
@@ -354,7 +354,7 @@ or
 is a previously opened file descriptor and
 .I fd0
 becomes a new copy (in the sense of
-.MR dup (3) )
+.MR dup 3 )
 of it.
 A file descriptor may be closed by writing
 .BI >[ fd0 =]
@@ -547,7 +547,7 @@ function definition.
 A function with a special name will be called when
 .I rc
 receives a corresponding note; see
-.MR notify (3) .
+.MR notify 3 .
 The valid note names (and corresponding notes) are
 .B sighup
 .RB ( hangup ),
@@ -666,7 +666,7 @@ is composed of the bitwise OR of the
 .B rfork
 flags specified by the option letters
 (see
-.MR fork (2) ).
+.MR fork 2 ).
 If no
 .I flags
 are given, they default to
@@ -833,7 +833,7 @@ parsing the
 .B $PATH
 variable
 (as in
-.MR sh (1) )
+.MR sh 1 )
 or by
 .BR "path=(.\ /bin)" .
 The variables
diff --git a/man/man1/readcons.1 b/man/man1/readcons.1
index 6fc56a66..8268526a 100644
--- a/man/man1/readcons.1
+++ b/man/man1/readcons.1
@@ -27,4 +27,4 @@ is printed instead of an empty string.
 .SH SOURCE
 .B \*9/src/cmd/readcons.c
 .SH SEE ALSO
-.MR readcons (3)
+.MR readcons 3
diff --git a/man/man1/resample.1 b/man/man1/resample.1
index 71c3b747..87e08dd9 100755
--- a/man/man1/resample.1
+++ b/man/man1/resample.1
@@ -40,19 +40,19 @@ and
 .PP
 The input should be a Plan 9 image
 as described in 
-.MR image (7) ,
+.MR image 7 ,
 and the output will be a compressed 24-bit
 .B r8g8b8
 image.
 To uncompress the image or change the pixel format, use
 .I iconv
 (see
-.MR crop (1) ).
+.MR crop 1 ).
 .PP
 .SH SOURCE
 .B \*9/src/cmd/resample.c
 .SH "SEE ALSO
-.MR crop (1) ,
-.MR image (7)
+.MR crop 1 ,
+.MR image 7
 .SH BUGS
 Faster algorithms exist, but this implementation produces correct pictures.
diff --git a/man/man1/rio.1 b/man/man1/rio.1
index fb4b5dfb..456c5377 100644
--- a/man/man1/rio.1
+++ b/man/man1/rio.1
@@ -68,15 +68,15 @@ specifies an alternative program to run when the
 .I New
 menu item is selected.
 The default is to try
-.MR 9term (1)
+.MR 9term 1
 and then to fall back to
-.MR xterm (1) .
+.MR xterm 1 .
 The
 .B \-s
 option has no effect.  It formerly set the scrolling mode for
 new windows and is recognized to avoid breaking scripts.
 See
-.MR 9term (1)
+.MR 9term 1
 for a description of scrolling behavior.
 .PP
 The
@@ -137,11 +137,11 @@ Very small windows may not be created.
 The new window is created running
 .IR termprog ,
 by default
-.MR 9term (1)
+.MR 9term 1
 or, if 
 .I 9term
 is not available,
-.MR xterm (1) .
+.MR xterm 1 .
 .TP
 .B Resize
 Change the size and location of a window.
@@ -165,7 +165,7 @@ Deleting a window causes a
 .L hangup
 note to be sent to all processes in the window's process group
 (see
-.MR notify (3) ).
+.MR notify 3 ).
 .TP
 .B Hide
 Hide a window.  Click in the window to be hidden (gunsight cursor);
@@ -241,8 +241,8 @@ starts a particular program.)
 .PP
 There is a currently a compiled-in limit of 128 hidden windows.
 .SH "SEE ALSO"
-.MR 9term (1) ,
-.MR xterm (1)
+.MR 9term 1 ,
+.MR xterm 1
 .PP
 As mentioned above,
 .I rio
diff --git a/man/man1/rm.1 b/man/man1/rm.1
index 104eda93..37a1aad2 100644
--- a/man/man1/rm.1
+++ b/man/man1/rm.1
@@ -25,4 +25,4 @@ and the directory itself.
 .SH SOURCE
 .B \*9/src/cmd/rm.c
 .SH "SEE ALSO"
-.MR remove (3)
+.MR remove 3
diff --git a/man/man1/rsa.1 b/man/man1/rsa.1
index 4d8f286b..9580afa3 100644
--- a/man/man1/rsa.1
+++ b/man/man1/rsa.1
@@ -85,7 +85,7 @@ Plan 9 represents DSA and RSA keys as attribute-value pair lists
 prefixed with the string
 .BR key ;
 this is the generic key format used by
-.MR factotum (4) .
+.MR factotum 4 .
 A full DSA private key has the following attributes:
 .TP
 .B proto
@@ -334,9 +334,9 @@ scp auth.keys unix:.ssh/authorized_keys
 .SH SOURCE
 .B \*9/src/cmd/auth
 .SH "SEE ALSO
-.MR factotum (4) ,
-.MR pem (1) ,
-.MR ssh (1)
+.MR factotum 4 ,
+.MR pem 1 ,
+.MR ssh 1
 .SH BUGS
 There are too many key formats.
 .PP
diff --git a/man/man1/sam.1 b/man/man1/sam.1
index ac9f6e82..fc418c7f 100644
--- a/man/man1/sam.1
+++ b/man/man1/sam.1
@@ -51,7 +51,7 @@ copies leading white space on the current line to the new line.
 Do not `download' the terminal part of
 .IR sam .
 Editing will be done with the command language only, as in
-.MR ed (1) .
+.MR ed 1 .
 .TP
 .BI -r " machine
 Run the host part remotely
@@ -69,7 +69,7 @@ for debugging.
 .PD
 .SS Regular expressions
 Regular expressions are as in
-.MR regexp (7)
+.MR regexp 7
 with the addition of
 .BR \en
 to represent newlines.
@@ -698,7 +698,7 @@ There is usually a `current window',
 marked with a dark border, to which typed text and editing
 commands apply.
 Text may be typed and edited as in
-.MR rio (1) ;
+.MR rio 1 ;
 also the escape key (ESC) selects (sets dot to) text typed
 since the last mouse button hit.
 .PP
@@ -798,7 +798,7 @@ the white-space-delimited block of text is sent as a plumb message
 with a
 .B click
 attribute defining where the selection lies (see
-.MR plumb (7) ).
+.MR plumb 7 ).
 .TP
 .B look
 Search forward for the next occurrence of the literal text in dot.
@@ -909,11 +909,11 @@ source for the separate terminal part
 .TP
 .B \*9/bin/E
 .SH SEE ALSO
-.MR ed (1) ,
-.MR sed (1) ,
-.MR grep (1) ,
-.MR rio (1) ,
-.MR regexp (7) .
+.MR ed 1 ,
+.MR sed 1 ,
+.MR grep 1 ,
+.MR rio 1 ,
+.MR regexp 7 .
 .PP
 Rob Pike,
 ``The text editor sam''.
diff --git a/man/man1/scat.1 b/man/man1/scat.1
index 407b97ef..0f654c33 100644
--- a/man/man1/scat.1
+++ b/man/man1/scat.1
@@ -10,7 +10,7 @@ outside the solar system
 and implements database-like manipulations
 on sets of such objects.
 It also provides an interface to
-.MR astro (1)
+.MR astro 1
 to plot the locations of solar system objects.
 Finally, it displays images from the
 Space Telescope Science Institute's
@@ -119,7 +119,7 @@ The names
 and
 .B comet
 refer to the earth's penumbra at lunar distance and the comet installed in the current
-.MR astro (1) .
+.MR astro 1 .
 The output is the planet's name, right ascension and declination, azimuth and altitude, and phase
 for the moon and sun, as shown by
 .BR astro .
@@ -182,7 +182,7 @@ collects all objects in the patches that cover the current set.
 .TP
 .BI astro " option"
 Run
-.MR astro (1)
+.MR astro 1
 with the specified
 .I options
 (to which will be appended
@@ -324,7 +324,7 @@ Draw a map of the Pleiades.
 .SH SOURCE
 .B \*9/src/cmd/scat
 .SH SEE ALSO
-.MR astro (1)
+.MR astro 1
 .br
 .B \*9/sky/constelnames\ \ 
 the three-letter abbreviations of the constellation names.
diff --git a/man/man1/secstore.1 b/man/man1/secstore.1
index 9374e390..4c864eac 100644
--- a/man/man1/secstore.1
+++ b/man/man1/secstore.1
@@ -97,7 +97,7 @@ Option
 .B -n
 says that the password should be read from NVRAM
 (see
-.MR authsrv (3) )
+.MR authsrv 3 )
 instead of from
 .BR /dev/tty .
 .PP
@@ -107,7 +107,7 @@ or the server specified by option
 .BR -s .
 .PP
 For example, to add a secret to the file read by
-.MR factotum (4) ,
+.MR factotum 4 ,
 run
 .sp
 .EX
@@ -192,8 +192,8 @@ block chaining (CBC) mode.
 .br
 .B \*9/src/cmd/auth/secstore
 .SH SEE ALSO
-.MR factotum (4) ,
-.MR secstored (1)
+.MR factotum 4 ,
+.MR secstored 1
 .SH BUGS
 There is deliberately no backup of files on the secstore, so
 .B -r
diff --git a/man/man1/secstored.1 b/man/man1/secstored.1
index 82eaee3c..8bd39929 100644
--- a/man/man1/secstored.1
+++ b/man/man1/secstored.1
@@ -18,7 +18,7 @@ username
 .PP
 .I Secstored
 serves requests from
-.MR secstore (1) .
+.MR secstore 1 .
 The
 .B -R
 option supplements the password check with a
@@ -61,4 +61,4 @@ for mapping local userid to RADIUS userid
 .SH SOURCE
 .B \*9/src/cmd/auth/secstore
 .SH SEE ALSO
-.MR secstore (1)
+.MR secstore 1
diff --git a/man/man1/sed.1 b/man/man1/sed.1
index 8a892da1..d7142a56 100644
--- a/man/man1/sed.1
+++ b/man/man1/sed.1
@@ -78,7 +78,7 @@ that
 addresses the last line of input, or a context address,
 .BI / regular-expression / \f1,
 in the style of
-.MR regexp (7) ,
+.MR regexp 7 ,
 with the added convention that
 .L \en
 matches a
@@ -235,7 +235,7 @@ in the pattern space.
 Any character may be used instead of 
 .LR / .
 For a fuller description see
-.MR regexp (7) .
+.MR regexp 7 .
 .I Flags
 is zero or more of
 .RS
@@ -374,8 +374,8 @@ formatted manuscript.
 .IR grep (1), 
 .IR awk (1), 
 .IR lex (1), 
-.MR sam (1) ,
-.MR regexp (7)
+.MR sam 1 ,
+.MR regexp 7
 .br
 L. E. McMahon,
 `SED \(em A Non-interactive Text Editor',
diff --git a/man/man1/seq.1 b/man/man1/seq.1
index e181f5be..7e9dbb2a 100644
--- a/man/man1/seq.1
+++ b/man/man1/seq.1
@@ -38,7 +38,7 @@ The options are
 .TP "\w'\fL-f \fIformat\fLXX'u"
 .BI -f format
 Use the 
-.MR print (3) -style
+.MR print 3 -style
 .I format
 .IR print
 for printing each (floating point) number.
diff --git a/man/man1/sftpcache.1 b/man/man1/sftpcache.1
index 8c0a0ad8..9002d743 100644
--- a/man/man1/sftpcache.1
+++ b/man/man1/sftpcache.1
@@ -7,7 +7,7 @@ sftpcache \- cache sftp connections
 .SH DESCRIPTION
 .I Sftpcache
 multiplexes clients onto persistent 
-.MR sftp (1)
+.MR sftp 1
 connections.
 It runs
 .I sftp
@@ -16,7 +16,7 @@ and posts a socket named
 .IB system .sftp
 in the name space directory
 (see
-.MR intro (4) ).
+.MR intro 4 ).
 Clients can connect to the socket, one at a time,
 to interact with the
 .I sftp
@@ -24,13 +24,13 @@ session.
 .PP
 .I Sftpcache
 is used by
-.MR netfiles (1) .
+.MR netfiles 1 .
 .SH SOURCE
 .B \*9/src/cmd/sftpcache.c
 .SH SEE ALSO
-.MR ssh (1) ,
-.MR sftp (1) ,
-.MR netfiles (1)
+.MR ssh 1 ,
+.MR sftp 1 ,
+.MR netfiles 1
 .SH BUGS
 .I Sftpcache
 only works with OpenSSH versions 4.3 and earlier;
diff --git a/man/man1/sleep.1 b/man/man1/sleep.1
index f5f7c4cf..68c02e65 100644
--- a/man/man1/sleep.1
+++ b/man/man1/sleep.1
@@ -28,4 +28,4 @@ while (){
 .SH SOURCE
 .B \*9/src/cmd/sleep.c
 .SH "SEE ALSO"
-.MR sleep (3)
+.MR sleep 3
diff --git a/man/man1/snarfer.1 b/man/man1/snarfer.1
index ef77c951..0e0b28f1 100644
--- a/man/man1/snarfer.1
+++ b/man/man1/snarfer.1
@@ -30,14 +30,14 @@ running
 keeps the X11 snarf buffer in sync with the Carbon snarf buffer,
 working around a bug in the OS X X11 server.
 See
-.MR getsnarf (3)
+.MR getsnarf 3
 for more details.
 .SH SOURCE
 .B \*9/src/cmd/snarfer
 .SH SEE ALSO
 Unix's
 .IR xclipboard (1),
-.MR getsnarf (3)
+.MR getsnarf 3
 .SH BUGS
 Both
 .I xclipboard
diff --git a/man/man1/soelim.1 b/man/man1/soelim.1
index c7324035..545883b7 100755
--- a/man/man1/soelim.1
+++ b/man/man1/soelim.1
@@ -11,19 +11,19 @@ soelim \- preprocess so inclusion commands in troff input
 .I Soelim
 reads the specified files or the standard input and performs
 the textual inclusion implied by
-.MR troff (1)
+.MR troff 1
 directives of the form
 .TP
 .B "\&.so some_file
 .PP
 when they appear at the beginning of input lines.  This is useful when
 using programs such as
-.MR tbl (1)
+.MR tbl 1
 that do not normally do this, allowing
 placement of individual tables or other text objects in separate files
 to be run as a part of a large document.
 .SH SOURCE
 .B \*9/bin/soelim
 .SH "SEE ALSO"
-.MR deroff (1) ,
-.MR troff (1)
+.MR deroff 1 ,
+.MR troff 1
diff --git a/man/man1/sort.1 b/man/man1/sort.1
index 6922114b..f202940b 100644
--- a/man/man1/sort.1
+++ b/man/man1/sort.1
@@ -242,8 +242,8 @@ come out in their original order.
 .SH SOURCE
 .B \*9/src/cmd/sort.c
 .SH SEE ALSO
-.MR uniq (1) ,
-.MR look (1)
+.MR uniq 1 ,
+.MR look 1
 .SH DIAGNOSTICS
 .I Sort
 comments and exits with non-null status for various trouble
diff --git a/man/man1/spell.1 b/man/man1/spell.1
index 27ae6803..87706a30 100644
--- a/man/man1/spell.1
+++ b/man/man1/spell.1
@@ -31,7 +31,7 @@ not sanctioned there\(emon the standard output.
 .PP
 .I Spell
 ignores constructs of
-.MR troff (1)
+.MR troff 1
 and its standard preprocessors.
 It understands these options:
 .TP
@@ -82,10 +82,10 @@ the script
 source for
 .I sprog
 .SH SEE ALSO
-.MR deroff (1)
+.MR deroff 1
 .SH BUGS
 The heuristics of
-.MR deroff (1)
+.MR deroff 1
 used to excise formatting information are imperfect.
 .PP
 The spelling list's coverage is uneven;
diff --git a/man/man1/split.1 b/man/man1/split.1
index b61ef185..5b39436c 100644
--- a/man/man1/split.1
+++ b/man/man1/split.1
@@ -41,7 +41,7 @@ File divisions occur at each line
 that matches a regular
 .IR expression ;
 see 
-.MR regexp (7) .
+.MR regexp 7 .
 Multiple
 .B -e
 options may appear.
@@ -77,6 +77,6 @@ to lower case.
 .B \*9/src/cmd/split.c
 .SH SEE ALSO
 .IR sed (1), 
-.MR awk (1) ,
-.MR grep (1) ,
-.MR regexp (7)
+.MR awk 1 ,
+.MR grep 1 ,
+.MR regexp 7
diff --git a/man/man1/src.1 b/man/man1/src.1
index 7648602b..8ca39313 100644
--- a/man/man1/src.1
+++ b/man/man1/src.1
@@ -19,11 +19,11 @@ examines the named
 to find the corresponding source code, which is then sent to the editor using
 .B B
 (see
-.MR sam (1) ).
+.MR sam 1 ).
 If
 .I file
 is an
-.MR rc (1)
+.MR rc 1
 script, the source is the file itself.
 If
 .I file
@@ -35,7 +35,7 @@ and
 will point the editor at the line that begins the definition.
 .I Src
 uses
-.MR db (1)
+.MR db 1
 to extract the symbol table information that identifies the source.
 .PP
 .I Src
@@ -78,6 +78,6 @@ src -s strcmp rc
 .SH SOURCE
 .B \*9/bin/src
 .SH "SEE ALSO"
-.MR db (1) ,
-.MR plumb (1) ,
-.MR sam (1) .
+.MR db 1 ,
+.MR plumb 1 ,
+.MR sam 1 .
diff --git a/man/man1/ssam.1 b/man/man1/ssam.1
index aa9fc647..89d0e0cd 100755
--- a/man/man1/ssam.1
+++ b/man/man1/ssam.1
@@ -63,8 +63,8 @@ Count frequency of words read from standard input.
 .B \*9/bin/ssam
 .SH SEE ALSO
 .IR sed (1), 
-.MR sam (1) ,
-.MR regexp (7)
+.MR sam 1 ,
+.MR regexp 7
 .PP
 Rob Pike,
 ``The text editor sam''.
diff --git a/man/man1/ssh-agent.1 b/man/man1/ssh-agent.1
index 70ecec64..51badc95 100644
--- a/man/man1/ssh-agent.1
+++ b/man/man1/ssh-agent.1
@@ -10,9 +10,9 @@ ssh-agent \- SSH authentication agent
 .SH DESCRIPTION
 .I Ssh-agent
 presents
-.MR factotum (4)
+.MR factotum 4
 using the interface that
-.MR ssh (1)
+.MR ssh 1
 requires.
 .PP
 Once
@@ -33,7 +33,7 @@ via a Unix socket named
 .B ssh-agent.socket
 in the name space directory
 (see
-.MR intro (4) ).
+.MR intro 4 ).
 Note that although the socket is posted in the name space
 directory, it is not for 9P conversations.
 .I Ssh
@@ -81,10 +81,10 @@ Invoke this one with
 .B 9
 .BR ssh-agent ;
 see
-.MR 9 (1) .
+.MR 9 1 .
 .SH EXAMPLES
 Assume
-.MR factotum (4)
+.MR factotum 4
 is already running and initialized with keys.
 .PP
 Start a new agent, copying the commands by hand:
@@ -103,7 +103,7 @@ $
 .EE
 .PP
 Start the agent from
-.MR sh (1) :
+.MR sh 1 :
 .IP
 .EX
 $ eval `9 ssh-agent -e`
@@ -111,7 +111,7 @@ $
 .EE
 .PP
 Start the agent from
-.MR rc (1) :
+.MR rc 1 :
 .IP
 .EX
 % eval `{9 ssh-agent}
@@ -128,9 +128,9 @@ tux% ^D
 .SH SOURCE
 .B \*9/src/cmd/auth/ssh-agent.c
 .SH SEE ALSO
-.MR ssh (1) ,
-.MR rsa (1) ,
-.MR factotum (4)
+.MR ssh 1 ,
+.MR rsa 1 ,
+.MR factotum 4
 .SH BUGS
 A surprise rather than a bug:
 .I ssh-agent
diff --git a/man/man1/strings.1 b/man/man1/strings.1
index b4070f0f..b93e0855 100644
--- a/man/man1/strings.1
+++ b/man/man1/strings.1
@@ -25,4 +25,4 @@ line with the offset of the continuation line.
 .SH SOURCE
 .B \*9/src/cmd/strings.c
 .SH SEE ALSO
-.MR nm (1)
+.MR nm 1
diff --git a/man/man1/sum.1 b/man/man1/sum.1
index 727f273f..776549be 100644
--- a/man/man1/sum.1
+++ b/man/man1/sum.1
@@ -73,5 +73,5 @@ summed.
 .br
 .B \*9/src/cmd/sha1sum.c
 .SH "SEE ALSO"
-.MR cmp (1) ,
-.MR wc (1)
+.MR cmp 1 ,
+.MR wc 1
diff --git a/man/man1/tar.1 b/man/man1/tar.1
index dc4d666c..9605f995 100644
--- a/man/man1/tar.1
+++ b/man/man1/tar.1
@@ -112,14 +112,14 @@ archive entries.
 .B z
 Operate on compressed tar archives.
 The type of compression is inferred from the file name extension:
-.MR gzip (1)
+.MR gzip 1
 for
 .B .tar.gz
 and
 .BR .tgz ;
 .I bzip2
 (see
-.MR gzip (1) )
+.MR gzip 1 )
 for
 .BR .tar.bz ,
 .BR .tbz ,
@@ -153,8 +153,8 @@ can be used to copy hierarchies thus:
 .SH SEE ALSO
 .I 9ar
 in
-.MR 9c (1) ,
-.MR bundle (1)
+.MR 9c 1 ,
+.MR bundle 1
 .SH BUGS
 There is no way to ask for any but the last
 occurrence of a file.
diff --git a/man/man1/tbl.1 b/man/man1/tbl.1
index c241a0ab..75be2c2a 100644
--- a/man/man1/tbl.1
+++ b/man/man1/tbl.1
@@ -11,7 +11,7 @@ tbl \- format tables for nroff or troff
 is a preprocessor for formatting tables for
 .I nroff
 or
-.MR troff (1) .
+.MR troff 1 .
 The input
 .I files
 are copied to the standard output,
@@ -74,7 +74,7 @@ recognize
 and
 .I y
 as
-.MR eqn (1)
+.MR eqn 1
 delimiters
 .PD
 .RE
@@ -275,8 +275,8 @@ Bernardsville	2018	3.30
 .B \*9/src/cmd/tbl
 .SH SEE ALSO
 .IR troff (1), 
-.MR eqn (1) ,
-.MR doctype (1)
+.MR eqn 1 ,
+.MR doctype 1
 .br
 M. E. Lesk and L. L. Cherry,
 ``TBL\(ema Program to Format Tables'',
diff --git a/man/man1/tcs.1 b/man/man1/tcs.1
index ef871fa4..20c523d7 100644
--- a/man/man1/tcs.1
+++ b/man/man1/tcs.1
@@ -36,7 +36,7 @@ is
 the
 .SM UTF
 encoding described in
-.MR utf (7) .
+.MR utf 7 .
 The
 .B -l
 option lists the character sets known to
@@ -164,4 +164,4 @@ Print an up to date list of the supported character sets.
 .SH SEE ALSO
 .IR ascii (1), 
 .IR rune (3), 
-.MR utf (7) .
+.MR utf 7 .
diff --git a/man/man1/test.1 b/man/man1/test.1
index 0a849913..ab4dd429 100644
--- a/man/man1/test.1
+++ b/man/man1/test.1
@@ -182,7 +182,7 @@ and must be enclosed in quotes.
 .I Test
 is a dubious way to check for specific character strings:
 it uses a process to do what an
-.MR rc (1)
+.MR rc 1
 match or switch statement can do.
 The first example is not only inefficient but wrong, because
 .I test
diff --git a/man/man1/time.1 b/man/man1/time.1
index 25d3dbf2..5698c5db 100644
--- a/man/man1/time.1
+++ b/man/man1/time.1
@@ -18,4 +18,4 @@ followed by the command line.
 .SH SOURCE
 .B \*9/src/cmd/time.c
 .SH "SEE ALSO"
-.MR prof (1)
+.MR prof 1
diff --git a/man/man1/touch.1 b/man/man1/touch.1
index 2a48c3c2..7426c20d 100644
--- a/man/man1/touch.1
+++ b/man/man1/touch.1
@@ -27,9 +27,9 @@ is present.
 .SH SOURCE
 .B \*9/src/cmd/touch.c
 .SH SEE ALSO
-.MR ls (1) ,
-.MR stat (3) ,
-.MR chmod (1)
+.MR ls 1 ,
+.MR stat 3 ,
+.MR chmod 1
 .SH BUGS
 .I Touch
 will not touch directories.
diff --git a/man/man1/tr.1 b/man/man1/tr.1
index 74c512fb..29e0cc4c 100644
--- a/man/man1/tr.1
+++ b/man/man1/tr.1
@@ -94,4 +94,4 @@ tr -cs A-Za-z '
 .SH SOURCE
 .B \*9/src/cmd/tr.c
 .SH "SEE ALSO"
-.MR sed (1)
+.MR sed 1
diff --git a/man/man1/tr2post.1 b/man/man1/tr2post.1
index 29d3e85c..1f8cc865 100644
--- a/man/man1/tr2post.1
+++ b/man/man1/tr2post.1
@@ -15,7 +15,7 @@ converts
 .I files
 (or standard input),
 which should be the device-independent output of
-.MR troff (1) ,
+.MR troff 1 ,
 into the PostScript printer language.
 .PP
 The options are:
@@ -47,11 +47,11 @@ logical pages per physical page
 Using this option emits PostScript with invalid document structuring
 comments.
 It will print fine but will not view correctly in
-.MR gv (1)
+.MR gv 1
 or
 .I psv
 (see
-.MR page (1) ).
+.MR page 1 ).
 .TP
 .BI -o " pagelist
 Print only the pages in the
@@ -110,5 +110,5 @@ psv /tmp/a.ps
 .SH SOURCE
 .B \*9/src/cmd/postscript/tr2post
 .SH SEE ALSO
-.MR troff (1) ,
-.MR psfonts (1)
+.MR troff 1 ,
+.MR psfonts 1
diff --git a/man/man1/troff.1 b/man/man1/troff.1
index 032e8c70..095d3f76 100644
--- a/man/man1/troff.1
+++ b/man/man1/troff.1
@@ -176,18 +176,18 @@ font width tables for
 .SH SOURCE
 .B \*9/src/cmd/troff
 .SH "SEE ALSO"
-.MR lpr (1) ,
-.MR proof (1) ,
-.MR tr2post (1) ,
+.MR lpr 1 ,
+.MR proof 1 ,
+.MR tr2post 1 ,
 .IR eqn (1), 
 .IR tbl (1), 
 .IR pic (1), 
-.MR grap (1) ,
+.MR grap 1 ,
 .IR doctype (1), 
-.MR ms (7) ,
-.MR image (7) ,
-.MR tex (1) ,
-.MR deroff (1)
+.MR ms 7 ,
+.MR image 7 ,
+.MR tex 1 ,
+.MR deroff 1
 .br
 J. F. Ossanna and B. W. Kernighan,
 ``Troff User's Manual''
diff --git a/man/man1/troff2html.1 b/man/man1/troff2html.1
index 06465e9b..1e3d2c79 100644
--- a/man/man1/troff2html.1
+++ b/man/man1/troff2html.1
@@ -13,7 +13,7 @@ troff2html \- convert troff output into HTML
 .SH DESCRIPTION
 .I Troff2html
 reads the
-.MR troff (1)
+.MR troff 1
 output in the named
 .IR files ,
 default standard input,
@@ -28,10 +28,10 @@ Its main use is for
 (see Plan 9's
 .IR httpd (8)),
 which converts
-.MR man (1)
+.MR man 1
 pages into HTML
 and depends on a specially annotated set of
-.MR man (7)
+.MR man 7
 macros, invoked by
 .B troff
 .BR -manhtml .
@@ -58,7 +58,7 @@ x X html manref end cp 1
 .EE
 .PP
 which are used to create HTML hyperlinks around text of the form
-.MR cp (1)
+.MR cp 1
 pointing to
 .BR /magic/man2html/1/cp .
 .PP
@@ -69,14 +69,14 @@ Plan 9's
 On the one hand, because it uses the input,
 .B ms2html
 can handle
-.MR pic (1) ,
-.MR eqn (1) ,
+.MR pic 1 ,
+.MR eqn 1 ,
 etc., which
 .I troff2html
 does not handle at all; on the other hand,
 .B ms2html
 understands only
-.MR ms (7)
+.MR ms 7
 documents and is easily confused by complex
 .B troff
 constructions.
@@ -84,7 +84,7 @@ constructions.
 has the reverse properties: it does not handle the preprocessors but its output
 is reliable and (modulo helper annotations) is independent of macro package.
 .SH SEE ALSO
-.MR troff (1) ,
+.MR troff 1 ,
 Plan 9's
 .IR ms2html (1),
 .I man2html
diff --git a/man/man1/tweak.1 b/man/man1/tweak.1
index 773ec325..c26992da 100644
--- a/man/man1/tweak.1
+++ b/man/man1/tweak.1
@@ -35,14 +35,14 @@ If the file is a subfont, a second line presents a hexadecimal 16-bit
 .B offset
 to be applied to character values from the subfont
 (typically as stored in a font file; see
-.MR font (7) );
+.MR font 7 );
 and the subfont's
 .BR n ,
 .BR height ,
 and
 .B ascent
 as defined in
-.MR cachechars (3) .
+.MR cachechars 3 .
 .PP
 By means described below, magnified views of portions of the images
 may be displayed.
@@ -61,7 +61,7 @@ default font; the character's
 and
 .BR width
 as defined in
-.MR cachechars (3) ;
+.MR cachechars 3 ;
 and
 .BR iwidth ,
 the physical width of the image in the subfont's image.
@@ -158,9 +158,9 @@ The program will complain once about modified but unwritten files.
 .SH SOURCE
 .B \*9/src/cmd/draw/tweak.c
 .SH "SEE ALSO"
-.MR cachechars (3) ,
-.MR image (7) ,
-.MR font (7)
+.MR cachechars 3 ,
+.MR image 7 ,
+.MR font 7
 .SH BUGS
 For a program written to adjust width tables in fonts,
 .I tweak
diff --git a/man/man1/uniq.1 b/man/man1/uniq.1
index 07629ea4..9d70c327 100644
--- a/man/man1/uniq.1
+++ b/man/man1/uniq.1
@@ -56,4 +56,4 @@ Fields are skipped before characters.
 .IR sort (1) 
 .SH BUGS
 Field selection and comparison should be compatible with 
-.MR sort (1) .
+.MR sort 1 .
diff --git a/man/man1/vac.1 b/man/man1/vac.1
index 53f89b2a..fda20877 100644
--- a/man/man1/vac.1
+++ b/man/man1/vac.1
@@ -115,7 +115,7 @@ Do not include the file or directory specified by
 This option may be repeated multiple times.
 .I Exclude
 can be a shell pattern as accepted by
-.MR rc (1) ,
+.MR rc 1 ,
 with one extension:
 .B \&...
 matches any sequence of characters including slashes.
@@ -225,5 +225,5 @@ If listing files, print metadata in addition to the names.
 .SH SOURCE
 .B \*9/src/cmd/vac
 .SH "SEE ALSO"
-.MR vacfs (4) ,
-.MR venti (8)
+.MR vacfs 4 ,
+.MR venti 8
diff --git a/man/man1/venti.1 b/man/man1/venti.1
index b35b2ac1..8f9d4838 100644
--- a/man/man1/venti.1
+++ b/man/man1/venti.1
@@ -40,7 +40,7 @@ read, write, copy \- simple Venti clients
 .SH DESCRIPTION
 Venti is a SHA1-addressed block storage server.
 See 
-.MR venti (7)
+.MR venti 7
 for a full introduction.
 .PP
 .I Read
@@ -167,13 +167,13 @@ messages send/received.
 .SH SOURCE
 .B \*9/src/cmd/venti
 .SH SEE ALSO
-.MR vac (1) ,
-.MR venti (3) ,
-.MR vacfs (4) ,
-.MR venti (7) ,
-.MR vbackup (8) ,
-.MR venti (8) ,
-.MR venti-fmt (8)
+.MR vac 1 ,
+.MR venti 3 ,
+.MR vacfs 4 ,
+.MR venti 7 ,
+.MR vbackup 8 ,
+.MR venti 8 ,
+.MR venti-fmt 8
 .SH BUGS
 There should be programs to read and write
 venti files and directories.
diff --git a/man/man1/web.1 b/man/man1/web.1
index 0d57ad9f..b9b53eba 100644
--- a/man/man1/web.1
+++ b/man/man1/web.1
@@ -81,7 +81,7 @@ URL passed to
 and
 .I wmail
 are invoked as start commands in the
-.MR plumber (4) 's
+.MR plumber 4 's
 rules for opening web pages and writing mail messages.
 .SH FILES
 .TP
@@ -93,4 +93,4 @@ and
 .SH SOURCE
 .B \*9/bin
 .SH SEE ALSO
-.MR plumber (4)
+.MR plumber 4
diff --git a/man/man1/wintext.1 b/man/man1/wintext.1
index b7108e46..44d300ba 100644
--- a/man/man1/wintext.1
+++ b/man/man1/wintext.1
@@ -22,11 +22,11 @@ wintext, ", "" \- access text in current window
 prints the text of the current
 .I win
 (see
-.MR acme (1) ),
-.MR 9term (1) ,
+.MR acme 1 ),
+.MR 9term 1 ,
 or
 (Unix's)
-.MR tmux (1)
+.MR tmux 1
 window to standard output.
 .PP
 .I \*y
@@ -43,7 +43,7 @@ prints the last command executed.
 prints the last command that
 .I \*y
 would print and then executes it by piping it into
-.MR rc (1) .
+.MR rc 1 .
 .PP
 Both
 .I \*y
@@ -61,7 +61,7 @@ or
 .BR # .
 .SH EXAMPLES
 Print the
-.MR ls (1)
+.MR ls 1
 and
 .I lc
 commands executed in this window:
@@ -87,8 +87,8 @@ ramfs   rc      read    rio     rm
 %
 .EE
 .SH SEE ALSO
-.MR 9term (1) ,
-.MR acme (1)
+.MR 9term 1 ,
+.MR acme 1
 .SH SOURCE
 .B \*9/bin
 .SH BUGS
@@ -96,5 +96,5 @@ ramfs   rc      read    rio     rm
 and
 .I \*(yy
 are hard to type in shells other than
-.MR rc (1) .
+.MR rc 1 .
 .\" and in troff!
diff --git a/man/man1/winwatch.1 b/man/man1/winwatch.1
index 98031fbc..c9551133 100644
--- a/man/man1/winwatch.1
+++ b/man/man1/winwatch.1
@@ -17,7 +17,7 @@ winwatch \- monitor rio windows
 .SH DESCRIPTION
 .I Winwatch
 displays the labels of all current
-.MR rio (1)
+.MR rio 1
 windows, refreshing the display every second.
 Right clicking a window's label unhides, raises and gives focus to that window.
 Typing
@@ -53,5 +53,5 @@ Excluding winwatch and stats from being shown.
 .SH SOURCE
 .B \*9/src/cmd/winwatch.c
 .SH SEE ALSO
-.MR rio (1) ,
-.MR regexp (7) .
+.MR rio 1 ,
+.MR regexp 7 .
diff --git a/man/man1/xd.1 b/man/man1/xd.1
index 3a98d936..65b3ee12 100644
--- a/man/man1/xd.1
+++ b/man/man1/xd.1
@@ -91,7 +91,7 @@ followed by an asterisk.
 .SH SOURCE
 .B \*9/src/cmd/xd.c
 .SH "SEE ALSO"
-.MR db (1)
+.MR db 1
 .SH BUGS
 The various output formats don't line up properly in the output of
 .IR xd .
diff --git a/man/man1/yacc.1 b/man/man1/yacc.1
index b291473f..e642e629 100644
--- a/man/man1/yacc.1
+++ b/man/man1/yacc.1
@@ -23,7 +23,7 @@ to produce a program
 This program must be loaded with a lexical analyzer function,
 .B yylex(void)
 (often generated by
-.MR lex (1) ),
+.MR lex 1 ),
 with a
 .B main(int argc, char *argv[])
 program, and with an error handling routine,
@@ -115,7 +115,7 @@ option reverses this.
 The parser accepts
 .SM UTF
 input text (see
-.MR utf (7) ),
+.MR utf 7 ),
 which has a couple of effects.
 First, the return value of
 .B yylex()
@@ -156,7 +156,7 @@ parser prototype using stdio
 .SH SOURCE
 .B \*9/src/cmd/yacc.c
 .SH "SEE ALSO"
-.MR lex (1)
+.MR lex 1
 .br
 S. C. Johnson and R. Sethi,
 ``Yacc: A parser generator'',
diff --git a/man/man1/yesterday.1 b/man/man1/yesterday.1
index eae046e0..180b9acf 100644
--- a/man/man1/yesterday.1
+++ b/man/man1/yesterday.1
@@ -91,8 +91,8 @@ by convention, root of the dump file system
 .SH SOURCE
 .B \*9/bin/yesterday
 .SH SEE ALSO
-.MR diff (1) ,
-.MR hist (1) ,
-.MR vbackup (8)
+.MR diff 1 ,
+.MR hist 1 ,
+.MR vbackup 8
 .SH BUGS
 It's hard to use this command without singing.