6 files changed, 21 insertions, 40 deletions
diff --git a/usr.bin/file/file.1 b/usr.bin/file/file.1
index 4fb1b23053f..73421cbf9fa 100644
--- a/usr.bin/file/file.1
+++ b/usr.bin/file/file.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: file.1,v 1.32 2010/09/03 11:09:28 jmc Exp $
+.\" $OpenBSD: file.1,v 1.33 2010/10/28 21:32:54 jmc Exp $
 .\" $FreeBSD: src/usr.bin/file/file.1,v 1.16 2000/03/01 12:19:39 sheldonh Exp $
 .\"
 .\" Copyright (c) Ian F. Darwin 1986-1995.
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: September 3 2010 $
+.Dd $Mdocdate: October 28 2010 $
 .Dt FILE 1
 .Os
 .Sh NAME
@@ -159,8 +159,7 @@ that can appear anywhere in the first few blocks of a file.
 For example, the keyword
 .Em .br
 indicates that the file is most likely a
-.Xr troff 1
-input file, just as the keyword
+troff input file, just as the keyword
 .Em struct
 indicates a C program.
 These tests are less reliable than the previous
diff --git a/usr.bin/fmt/fmt.1 b/usr.bin/fmt/fmt.1
index cce1206ec1b..068e9e4a53a 100644
--- a/usr.bin/fmt/fmt.1
+++ b/usr.bin/fmt/fmt.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: fmt.1,v 1.21 2007/05/31 19:20:10 jmc Exp $
+.\" $OpenBSD: fmt.1,v 1.22 2010/10/28 21:32:54 jmc Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\"
 .\"     @(#)fmt.1	8.1 (Berkeley) 6/6/93
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: October 28 2010 $
 .Dt FMT 1
 .Os
 .Sh NAME
@@ -114,10 +114,8 @@ Format lines beginning with a
 (dot) character.
 Normally,
 .Nm
-does not fill these lines, for compatibility with
-.Xr troff 1
-and
-.Xr nroff 1 .
+does not fill these lines,
+for compatibility with troff and nroff.
 .It Fl p
 Allow indented paragraphs.
 Without the
@@ -150,7 +148,6 @@ evening the lines:
 .Sh SEE ALSO
 .Xr indent 1 ,
 .Xr mail 1 ,
-.Xr nroff 1 ,
 .Xr vi 1
 .Sh HISTORY
 The
diff --git a/usr.bin/less/less.1 b/usr.bin/less/less.1
index 80d09cc7dc6..7a6850cb098 100644
--- a/usr.bin/less/less.1
+++ b/usr.bin/less/less.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: less.1,v 1.19 2010/08/09 20:42:32 ray Exp $
+.\"	$OpenBSD: less.1,v 1.20 2010/10/28 21:32:54 jmc Exp $
 .\"
 .\" Copyright (C) 2002  Mark Nudelman
 .\"
@@ -23,7 +23,7 @@
 .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: August 9 2010 $
+.Dd $Mdocdate: October 28 2010 $
 .Dt LESS 1
 .Os
 .Sh NAME
@@ -814,9 +814,6 @@ The default is to fold long lines; that is, display the remainder
 on the next line.
 .It Fl s | -squeeze-blank-lines
 Causes consecutive blank lines to be squeezed into a single blank line.
-This is useful when viewing
-.Xr nroff 1
-output.
 .It Xo
 .Fl T Ns Ar tagsfile |
 .Fl -tag-file Ns = Ns Ar tagsfile
diff --git a/usr.bin/spell/spell.1 b/usr.bin/spell/spell.1
index 017de83da1c..12c5f3b0de3 100644
--- a/usr.bin/spell/spell.1
+++ b/usr.bin/spell/spell.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: spell.1,v 1.10 2007/05/31 19:20:16 jmc Exp $
+.\" $OpenBSD: spell.1,v 1.11 2010/10/28 21:32:54 jmc Exp $
 .\"
 .\" Copyright (C) 1985, 1993, 1994
 .\"	The Regents of the University of California.  All rights reserved.
@@ -61,7 +61,7 @@
 .\"
 .\"	@(#)spell.1	8.2 (Berkeley) 4/18/94
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: October 28 2010 $
 .Dt SPELL 1
 .Os
 .Sh NAME
@@ -88,13 +88,7 @@ are printed on the standard output.
 .Pp
 If no files are named, words are collected from the standard input.
 .Nm
-ignores most
-.Xr troff 1 ,
-.Xr tbl 1 ,
-.Xr eqn 1 ,
-and
-.Xr pic 1
-constructions.
+ignores most troff, tbl, eqn, and pic constructions.
 Copies of all output may be accumulated in the history file,
 if one is specified.
 .Pp
@@ -173,8 +167,7 @@ instead of
 if it is present on the system.
 .It Fl m
 Enable support for common
-.Xr troff 1
-macro packages; this option is passed verbatim to
+troff macro packages; this option is passed verbatim to
 .Xr deroff 1 .
 Refer to the
 .Fl m
@@ -225,8 +218,7 @@ Binary executed by the shell script
 .Xr look 1 ,
 .Xr sed 1 ,
 .Xr sort 1 ,
-.Xr tee 1 ,
-.Xr troff 1
+.Xr tee 1
 .Sh HISTORY
 The
 .Nm spell
diff --git a/usr.bin/talk/talk.1 b/usr.bin/talk/talk.1
index ef920a9fe27..60333d97eaf 100644
--- a/usr.bin/talk/talk.1
+++ b/usr.bin/talk/talk.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: talk.1,v 1.24 2010/10/21 13:20:51 jmc Exp $
+.\"	$OpenBSD: talk.1,v 1.25 2010/10/28 21:32:54 jmc Exp $
 .\"	$NetBSD: talk.1,v 1.3 1994/12/09 02:14:23 jtc Exp $
 .\"
 .\" Copyright (c) 1983, 1990, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)talk.1	8.1 (Berkeley) 6/6/93
 .\"
-.Dd $Mdocdate: October 21 2010 $
+.Dd $Mdocdate: October 28 2010 $
 .Dt TALK 1
 .Os
 .Sh NAME
@@ -111,9 +111,7 @@ Permission to talk may be denied or granted by use of the
 .Xr mesg 1
 command.
 At the outset talking is allowed.
-Certain commands, in particular
-.Xr nroff 1
-and
+Certain commands, such as
 .Xr pr 1 ,
 disallow messages in order to
 prevent messy output.
diff --git a/usr.bin/write/write.1 b/usr.bin/write/write.1
index 563bf454ce9..4d139d62cd6 100644
--- a/usr.bin/write/write.1
+++ b/usr.bin/write/write.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: write.1,v 1.15 2010/09/03 11:09:29 jmc Exp $
+.\"	$OpenBSD: write.1,v 1.16 2010/10/28 21:32:54 jmc Exp $
 .\"
 .\" Copyright (c) 1989, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -32,7 +32,7 @@
 .\"
 .\"     from: @(#)write.1	8.1 (Berkeley) 6/6/93
 .\"
-.Dd $Mdocdate: September 3 2010 $
+.Dd $Mdocdate: October 28 2010 $
 .Dt WRITE 1
 .Os
 .Sh NAME
@@ -68,11 +68,9 @@ You can prevent people (other than the superuser) from writing to you
 with the
 .Xr mesg 1
 command.
-Some commands, for example
-.Xr nroff 1
-and
+Some commands, such as
 .Xr pr 1 ,
-disallow writing automatically, so that your output isn't overwritten.
+disallow writing automatically, so that output isn't overwritten.
 .Pp
 If the user you want to write to is logged in on more than one terminal,
 you can specify which terminal to write to by specifying the terminal