diff -ru 5.3_RC2/man1/builtin.1 5.3_stable_20050225/man1/builtin.1
--- 5.3_RC2/man1/builtin.1	Sun Oct 31 14:31:34 2004
+++ 5.3_stable_20050225/man1/builtin.1	Fri Feb 25 09:55:14 2005
@@ -24,9 +24,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	%FreeBSD: src/share/man/man1/builtin.1,v 1.20 2002/07/23 14:38:07 tjr Exp %
+.\"	%FreeBSD: src/share/man/man1/builtin.1,v 1.20.8.1 2005/02/23 07:11:42 trhodes Exp %
 .\"
-.Dd September 1, 1999
+.Dd February 23, 2005
 .Dt BUILTIN 1
 .Os
 .Sh NAME
@@ -164,26 +164,34 @@
 and
 .Xr sh 1
 shells are listed here.
-Consult the appropriate manual page for
-details on the operation of any given builtin command under those shells.
-Users of other shells will need to consult the documentation supplied
-with the other shells.
+Commands marked
+.Dq Li No**
+under
+.Em External
+do exist externally,
+but are implemented as scripts using a builtin command of the same name.
+Consult a shell's manual page for
+details on the operation its builtin commands.
+Users of other shells may need to consult an
+.Xr info 1
+page or other sources of documentation.
 .Bl -column ".Ic uncomplete" ".Em External" ".Xr csh 1" ".Xr sh 1" -offset indent
 .It Xo
 .Em "Command	External" Ta Xr csh 1 Ta Xr sh 1
 .Xc
 .It Ic alias Ta Yes Ta Yes Ta Yes
 .It Ic alloc Ta \&No Ta Yes Ta \&No
-.It Ic bg Ta Yes Ta Yes Ta Yes
+.It Ic bg Ta No** Ta Yes Ta Yes
 .It Ic bind Ta \&No Ta \&No Ta Yes
 .It Ic bindkey Ta \&No Ta Yes Ta \&No
 .It Ic break Ta \&No Ta Yes Ta \&Yes
 .It Ic breaksw Ta \&No Ta Yes Ta \&No
+.It Ic builtin Ta \&No Ta \&No Ta Yes
 .It Ic builtins Ta \&No Ta Yes Ta \&No
 .It Ic case Ta \&No Ta Yes Ta Yes
-.It Ic cd Ta Yes Ta Yes Ta Yes
+.It Ic cd Ta \&No** Ta Yes Ta Yes
 .It Ic chdir Ta \&No Ta Yes Ta \&Yes
-.It Ic command Ta Yes Ta \&No Ta Yes
+.It Ic Ta \&No Ta \&No Ta Yes
 .It Ic complete Ta \&No Ta Yes Ta \&No
 .It Ic continue Ta \&No Ta Yes Ta \&Yes
 .It Ic default Ta \&No Ta Yes Ta \&No
@@ -203,13 +211,13 @@
 .It Ic exit Ta \&No Ta Yes Ta Yes
 .It Ic export Ta \&No Ta \&No Ta Yes
 .It Ic false Ta Yes Ta \&No Ta Yes
-.It Ic fc Ta Yes Ta \&No Ta Yes
-.It Ic fg Ta Yes Ta Yes Ta Yes
+.It Ic fc Ta \&No** Ta \&No Ta Yes
+.It Ic fg Ta \&No** Ta Yes Ta Yes
 .It Ic filetest Ta \&No Ta Yes Ta \&No
 .It Ic fi Ta \&No Ta \&No Ta Yes
 .It Ic for Ta \&No Ta \&No Ta Yes
 .It Ic foreach Ta \&No Ta Yes Ta \&No
-.It Ic getopts Ta Yes Ta \&No Ta Yes
+.It Ic getopts Ta \&No** Ta \&No Ta Yes
 .It Ic glob Ta \&No Ta Yes Ta \&No
 .It Ic goto Ta \&No Ta Yes Ta \&No
 .It Ic hash Ta \&No Ta \&No Ta Yes
@@ -218,7 +226,7 @@
 .It Ic hup Ta \&No Ta Yes Ta \&No
 .It Ic if Ta \&No Ta Yes Ta \&Yes
 .It Ic jobid Ta \&No Ta \&No Ta Yes
-.It Ic jobs Ta Yes Ta Yes Ta Yes
+.It Ic jobs Ta \&No** Ta Yes Ta Yes
 .It Ic kill Ta Yes Ta Yes Ta \&No
 .It Ic limit Ta \&No Ta Yes Ta \&No
 .It Ic log Ta \&No Ta Yes Ta \&No
@@ -233,7 +241,7 @@
 .It Ic printenv Ta Yes Ta Yes Ta \&No
 .It Ic pushd Ta \&No Ta Yes Ta \&No
 .It Ic pwd Ta Yes Ta \&No Ta Yes
-.It Ic read Ta Yes Ta \&No Ta Yes
+.It Ic read Ta \&No** Ta \&No Ta Yes
 .It Ic readonly Ta \&No Ta \&No Ta Yes
 .It Ic rehash Ta \&No Ta Yes Ta \&No
 .It Ic repeat Ta \&No Ta Yes Ta \&No
@@ -256,15 +264,15 @@
 .It Ic true Ta Yes Ta \&No Ta Yes
 .It Ic type Ta \&No Ta \&No Ta Yes
 .It Ic ulimit Ta \&No Ta \&No Ta Yes
-.It Ic umask Ta Yes Ta Yes Ta Yes
-.It Ic unalias Ta Yes Ta Yes Ta Yes
+.It Ic umask Ta \&No** Ta Yes Ta Yes
+.It Ic unalias Ta \&No** Ta Yes Ta Yes
 .It Ic uncomplete Ta \&No Ta Yes Ta \&No
 .It Ic unhash Ta \&No Ta Yes Ta \&No
 .It Ic unlimit Ta \&No Ta Yes Ta \&No
 .It Ic unset Ta \&No Ta Yes Ta Yes
 .It Ic unsetenv Ta \&No Ta Yes Ta \&No
 .It Ic until Ta \&No Ta \&No Ta Yes
-.It Ic wait Ta Yes Ta Yes Ta Yes
+.It Ic wait Ta \&No** Ta Yes Ta Yes
 .It Ic where Ta \&No Ta Yes Ta \&No
 .It Ic which Ta Yes Ta Yes Ta \&No
 .It Ic while Ta \&No Ta Yes Ta \&Yes
@@ -273,6 +281,7 @@
 .Xr csh 1 ,
 .Xr echo 1 ,
 .Xr false 1 ,
+.Xr info 1 ,
 .Xr kill 1 ,
 .Xr login 1 ,
 .Xr nice 1 ,
diff -ru 5.3_RC2/man1/catman.1 5.3_stable_20050225/man1/catman.1
--- 5.3_RC2/man1/catman.1	Sun Oct 31 14:32:06 2004
+++ 5.3_stable_20050225/man1/catman.1	Fri Feb 25 09:56:27 2005
@@ -22,9 +22,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.bin/catman/catman.1,v 1.3 2002/12/13 16:53:51 ru Exp %
+.\" %FreeBSD: src/usr.bin/catman/catman.1,v 1.3.6.1 2005/01/12 15:28:42 ru Exp %
 .\"
-.Dd May 11, 2002
+.Dd December 22, 2004
 .Dt CATMAN 1
 .Os
 .Sh NAME
@@ -32,7 +32,7 @@
 .Nd "preformat man pages"
 .Sh SYNOPSIS
 .Nm
-.Op Fl fnrvL
+.Op Fl fLnrv
 .Op Ar directories ...
 .Sh DESCRIPTION
 The
@@ -72,11 +72,14 @@
 to be more verbose about what it is doing.
 .El
 .Sh ENVIRONMENT
-.Bl -tag -width ".Ev MANPATH" -compact
+.Bl -tag -width ".Ev MANPATH"
 .It Ev LC_ALL , LC_CTYPE , LANG
 These variables control what subdirectories will be processed if the
 .Fl L
 option is used.
+.It Ev MACHINE
+If set, overrides the current machine type when searching for
+machine specific man page subdirectories.
 .It Ev MANPATH
 Determines the set of directories to be processed if none are given on
 the command line.
@@ -100,4 +103,4 @@
 command appeared in
 .Fx 2.1 .
 .Sh AUTHORS
-.An John Rochester .
+.An John Rochester
diff -ru 5.3_RC2/man1/chflags.1 5.3_stable_20050225/man1/chflags.1
--- 5.3_RC2/man1/chflags.1	Sun Oct 31 14:30:25 2004
+++ 5.3_stable_20050225/man1/chflags.1	Fri Feb 25 09:51:18 2005
@@ -29,7 +29,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)chflags.1	8.4 (Berkeley) 5/2/95
-.\" %FreeBSD: src/bin/chflags/chflags.1,v 1.18 2004/04/06 20:06:44 markm Exp %
+.\" %FreeBSD: src/bin/chflags/chflags.1,v 1.18.2.1 2004/12/21 22:29:35 keramida Exp %
 .\"
 .Dd March 24, 2003
 .Dt CHFLAGS 1
@@ -78,30 +78,25 @@
 of keywords.
 The following keywords are currently defined:
 .Pp
-.Bl -tag -offset indent -width "opaque" -compact
-.It Ar arch
+.Bl -tag -offset indent -width ".Ar opaque"
+.It Ar arch , archived
 set the archived flag (super-user only)
 .It Ar opaque
 set the opaque flag (owner or super-user only)
 .It Ar nodump
 set the nodump flag (owner or super-user only)
-.It Ar sappnd
+.It Ar sappnd , sappend
 set the system append-only flag (super-user only)
-.It Ar schg
+.It Ar schg , schange , simmutable
 set the system immutable flag (super-user only)
-.It Ar sunlnk
+.It Ar sunlnk , sunlink
 set the system undeletable flag (super-user only)
-.It Ar uappnd
+.It Ar uappnd , uappend
 set the user append-only flag (owner or super-user only)
-.It Ar uchg
+.It Ar uchg , uchange , uimmutable
 set the user immutable flag (owner or super-user only)
-.It Ar uunlnk
+.It Ar uunlnk , uunlink
 set the user undeletable flag (owner or super-user only)
-.It Ar archived , sappend , schange , Xo
-.Ar simmutable , uappend , uchange , uimmutable ,
-.Ar sunlink , uunlink
-.Xc
-aliases for the above
 .El
 .Pp
 Putting the letters
diff -ru 5.3_RC2/man1/date.1 5.3_stable_20050225/man1/date.1
--- 5.3_RC2/man1/date.1	Sun Oct 31 14:30:26 2004
+++ 5.3_stable_20050225/man1/date.1	Fri Feb 25 09:51:22 2005
@@ -29,7 +29,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)date.1	8.3 (Berkeley) 4/28/95
-.\" %FreeBSD: src/bin/date/date.1,v 1.68 2004/08/09 13:43:39 yar Exp %
+.\" %FreeBSD: src/bin/date/date.1,v 1.68.2.1 2005/02/08 14:23:40 brueffer Exp %
 .\"
 .Dd August 9, 2004
 .Dt DATE 1
@@ -355,9 +355,9 @@
 .Pp
 .Dl "date -j -f ""%a %b %d %T %Z %Y"" ""`date`"" ""+%s"""
 .Pp
-can be used to parse the ouput from
+can be used to parse the output from
 .Nm
-and express it in epoch time.
+and express it in Epoch time.
 .Sh ENVIRONMENT
 The following environment variables affect the execution of
 .Nm :
diff -ru 5.3_RC2/man1/dd.1 5.3_stable_20050225/man1/dd.1
--- 5.3_RC2/man1/dd.1	Sun Oct 31 14:30:26 2004
+++ 5.3_stable_20050225/man1/dd.1	Fri Feb 25 09:51:22 2005
@@ -29,9 +29,9 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)dd.1	8.2 (Berkeley) 1/13/94
-.\" %FreeBSD: src/bin/dd/dd.1,v 1.25 2004/08/15 19:10:05 rwatson Exp %
+.\" %FreeBSD: src/bin/dd/dd.1,v 1.25.2.1 2005/02/08 14:23:40 brueffer Exp %
 .\"
-.Dd March 5, 2004
+.Dd August 15, 2004
 .Dt DD 1
 .Os
 .Sh NAME
@@ -89,8 +89,10 @@
 .Cm noerror
 and
 .Cm sync
-modes, fill with the specified ASCII character, rather than using a space
-or nul.
+modes, fill with the specified
+.Tn ASCII
+character, rather than using a space or
+.Dv NUL .
 .It Cm ibs Ns = Ns Ar n
 Set the input block size to
 .Ar n
@@ -255,8 +257,9 @@
 specified) and processed as a normal input buffer.
 If the
 .Cm fillchar
-option is specified, the fill char provided on the command line will override
-the automatic selection of fill character.
+option is specified, the fill character provided on the command line
+will override
+the automatic selection of the fill character.
 If the
 .Cm sync
 conversion is not specified, the input block is omitted from the output.
diff -ru 5.3_RC2/man1/df.1 5.3_stable_20050225/man1/df.1
--- 5.3_RC2/man1/df.1	Sun Oct 31 14:30:26 2004
+++ 5.3_stable_20050225/man1/df.1	Fri Feb 25 09:51:22 2005
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)df.1	8.3 (Berkeley) 5/8/95
-.\" %FreeBSD: src/bin/df/df.1,v 1.36 2004/07/20 18:24:47 csjp Exp %
+.\" %FreeBSD: src/bin/df/df.1,v 1.36.2.1 2005/02/08 14:23:41 brueffer Exp %
 .\"
 .Dd April 22, 2004
 .Dt DF 1
@@ -149,7 +149,8 @@
 .Sh BUGS
 The
 .Fl n
-flag is ignored if a file or file system is specified. Also, if a mount
+flag is ignored if a file or file system is specified.
+Also, if a mount
 point is not accessible by the user, it is possible that the file system
 information could be stale.
 .Sh SEE ALSO
diff -ru 5.3_RC2/man1/fsync.1 5.3_stable_20050225/man1/fsync.1
--- 5.3_RC2/man1/fsync.1	Sun Oct 31 14:32:09 2004
+++ 5.3_stable_20050225/man1/fsync.1	Fri Feb 25 09:56:37 2005
@@ -22,9 +22,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.bin/fsync/fsync.1,v 1.6 2001/08/01 12:15:18 sheldonh Exp %
+.\" %FreeBSD: src/usr.bin/fsync/fsync.1,v 1.6.8.1 2005/02/18 16:15:35 delphij Exp %
 .\"
-.Dd June 15, 2000
+.Dd January 25, 2005
 .Dt FSYNC 1
 .Os
 .Sh NAME
@@ -45,6 +45,11 @@
 utility uses the
 .Xr fsync 2
 function call.
+.Sh EXIT STATUS
+If an error occurs, the
+.Nm
+utility proceeds to the next file, and exits >0.
+Otherwise, it exits 0.
 .Sh SEE ALSO
 .Xr fsync 2 ,
 .Xr sync 2 ,
diff -ru 5.3_RC2/man1/grep.1 5.3_stable_20050225/man1/grep.1
--- 5.3_RC2/man1/grep.1	Sun Oct 31 14:30:44 2004
+++ 5.3_stable_20050225/man1/grep.1	Fri Feb 25 09:52:36 2005
@@ -1,5 +1,5 @@
 .\" grep man page
-.\" %FreeBSD: src/gnu/usr.bin/grep/grep.1,v 1.25 2004/07/04 10:02:03 tjr Exp %
+.\" %FreeBSD: src/gnu/usr.bin/grep/grep.1,v 1.25.2.1 2004/11/16 10:47:15 keramida Exp %
 .if !\n(.g \{\
 .	if !\w|\*(lq| \{\
 .		ds lq ``
@@ -312,8 +312,9 @@
 This is especially useful for tools like zgrep, e.g.
 .B "gzip -cd foo.gz |grep --label=foo something"
 .TP
-.BR \-\^\-line-buffering
-Use line buffering, it can be a performance penality.
+.BR \-\^\-line-buffered
+Flush output on every line.
+Note that this incurs a performance penalty.
 .TP
 .BR \-q ", " \-\^\-quiet ", " \-\^\-silent
 Quiet; do not write anything to standard output.
diff -ru 5.3_RC2/man1/indent.1 5.3_stable_20050225/man1/indent.1
--- 5.3_RC2/man1/indent.1	Sun Oct 31 14:32:10 2004
+++ 5.3_stable_20050225/man1/indent.1	Fri Feb 25 09:56:42 2005
@@ -32,7 +32,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)indent.1	8.1 (Berkeley) 7/1/93
-.\" %FreeBSD: src/usr.bin/indent/indent.1,v 1.22 2004/07/03 00:24:41 ru Exp %
+.\" %FreeBSD: src/usr.bin/indent/indent.1,v 1.22.2.1 2005/02/22 13:09:13 keramida Exp %
 .\"
 .Dd June 29, 2004
 .Dt INDENT 1
@@ -113,13 +113,13 @@
 is named
 .Sq Pa /blah/blah/file ,
 the backup file is named
-.Pa file.BAK .
+.Sq Pa file.BAK .
 .Pp
 If
 .Ar output-file
 is specified,
 .Nm
-checks to make sure it is different from
+checks to make sure that it is different from
 .Ar input-file .
 .Pp
 The options listed below control the formatting style imposed by
@@ -257,7 +257,7 @@
 Enables (disables) special
 .Ic else-if
 processing.
-If it's enabled, an
+If it is enabled, an
 .Ic if
 following an
 .Ic else
@@ -388,15 +388,15 @@
 appear in your program that are defined by
 .Ic typedef
 \- nothing will be
-harmed if you miss a few, but the program won't be formatted as nicely as
+harmed if you miss a few, but the program will not be formatted as nicely as
 it should.
-This sounds like a painful thing to have to do, but it's really
+This sounds like a painful thing to have to do, but it is really
 a symptom of a problem in C:
 .Ic typedef
 causes a syntactic change in the
 language and
 .Nm
-can't find all
+cannot find all
 instances of
 .Ic typedef .
 .It Fl troff
@@ -530,11 +530,10 @@
 utility has even more switches than
 .Xr ls 1 .
 .Pp
-A common mistake that often causes grief is typing:
+A common mistake is to try to indent all the
+.Em C
+programs in a directory by typing:
 .Pp
 .Dl indent *.c
 .Pp
-to the shell in an attempt to indent all the
-.Em C
-programs in a directory.
 This is probably a bug, not a feature.
diff -ru 5.3_RC2/man1/ls.1 5.3_stable_20050225/man1/ls.1
--- 5.3_RC2/man1/ls.1	Sun Oct 31 14:30:26 2004
+++ 5.3_stable_20050225/man1/ls.1	Fri Feb 25 09:51:24 2005
@@ -29,9 +29,9 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ls.1	8.7 (Berkeley) 7/29/94
-.\" %FreeBSD: src/bin/ls/ls.1,v 1.82 2004/07/02 21:04:18 ru Exp %
+.\" %FreeBSD: src/bin/ls/ls.1,v 1.82.2.1 2005/01/18 10:51:41 joerg Exp %
 .\"
-.Dd May 2, 2004
+.Dd January 11, 2005
 .Dt LS 1
 .Os
 .Sh NAME
@@ -195,7 +195,9 @@
 .Dq ell . )
 List in long format.
 (See below.)
-If the output is to a terminal, a total sum for all the file
+A total sum (in blocks, see the
+.Fl s
+option for the block size unit) for all the file
 sizes is output on a line before the long listing.
 .It Fl m
 Stream output format; list files across the page, separated by commas.
@@ -223,7 +225,7 @@
 .It Fl s
 Display the number of file system blocks actually used by each file, in units
 of 512 bytes, where partial units are rounded up to the next integer value.
-If the output is to a terminal, a total sum for all the file
+A total sum for all the file
 sizes is output on a line before the listing.
 The environment variable
 .Ev BLOCKSIZE
Only in 5.3_stable_20050225/man1: nc.1
diff -ru 5.3_RC2/man1/ncal.1 5.3_stable_20050225/man1/ncal.1
--- 5.3_RC2/man1/ncal.1	Sun Oct 31 14:32:14 2004
+++ 5.3_stable_20050225/man1/ncal.1	Fri Feb 25 09:56:55 2005
@@ -22,9 +22,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.bin/ncal/ncal.1,v 1.16 2004/07/02 22:22:29 ru Exp %
+.\" %FreeBSD: src/usr.bin/ncal/ncal.1,v 1.16.2.1 2004/11/30 16:47:27 wollman Exp %
 .\"
-.Dd December 16, 1997
+.Dd November 23, 2004
 .Dt CAL 1
 .Os
 .Sh NAME
@@ -38,6 +38,10 @@
 .Op Ar month
 .Ar year
 .Oc
+.Nm
+.Op Fl j
+.Fl m Ar month
+.Op Ar year
 .Nm ncal
 .Op Fl jJpwy
 .Op Fl s Ar country_code
@@ -69,6 +73,9 @@
 Display date of easter (for western churches).
 .It Fl j
 Display Julian days (days one-based, numbered from January 1).
+.It Fl m Ar month
+Display the specified
+.Ar month .
 .It Fl o
 Display date of orthodox easter (Greek and Russian
 Orthodox Churches).
@@ -91,7 +98,7 @@
 .It Fl w
 Print the number of the week below each week column.
 .It Fl y
-Display a calendar for the current year.
+Display a calendar for the specified year.
 .El
 .Pp
 A single parameter specifies the year (1 - 9999) to be displayed;
@@ -102,6 +109,9 @@
 display a calendar for 1989.
 Two parameters denote the month and year; the month is either a number between
 1 and 12, or a full or abbreviated name as specified by the current locale.
+Month and year default to those of the current system clock and time zone (so
+.Dq Li cal -m 8
+will display a calendar for the month of August in the current year).
 .Pp
 A year starts on Jan 1.
 .Sh SEE ALSO
@@ -122,5 +132,5 @@
 command and manual were written by
 .An Wolfgang Helbig Aq helbig@FreeBSD.org .
 .Sh BUGS
-The assignment of Julian - Gregorian switching dates to
+The assignment of Julian\(EmGregorian switching dates to
 country codes is historically naive for many countries.
diff -ru 5.3_RC2/man1/ps.1 5.3_stable_20050225/man1/ps.1
--- 5.3_RC2/man1/ps.1	Sun Oct 31 14:30:27 2004
+++ 5.3_stable_20050225/man1/ps.1	Fri Feb 25 09:51:25 2005
@@ -1,3 +1,4 @@
+.\"-
 .\" Copyright (c) 1980, 1990, 1991, 1993, 1994
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -26,7 +27,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ps.1	8.3 (Berkeley) 4/18/94
-.\" %FreeBSD: src/bin/ps/ps.1,v 1.79 2004/06/22 01:59:54 gad Exp %
+.\" %FreeBSD: src/bin/ps/ps.1,v 1.79.2.2 2005/02/22 06:50:54 delphij Exp %
 .\"
 .Dd March 27, 2004
 .Dt PS 1
@@ -37,14 +38,13 @@
 .Sh SYNOPSIS
 .Nm
 .Op Fl aCcefHhjlmrSTuvwXxZ
+.Op Fl O Ar fmt | Fl o Ar fmt
 .Op Fl G Ar gid Ns Op , Ns Ar gid Ns Ar ...
 .Op Fl M Ar core
 .Op Fl N Ar system
-.Op Fl O Ar fmt
-.Op Fl o Ar fmt
 .Op Fl p Ar pid Ns Op , Ns Ar pid Ns Ar ...
 .Op Fl t Ar tty Ns Op , Ns Ar tty Ns Ar ...
-.Op Fl U Ar username Ns Op , Ns Ar username Ns Ar ...
+.Op Fl U Ar user Ns Op , Ns Ar user Ns Ar ...
 .Nm
 .Op Fl L
 .Sh DESCRIPTION
@@ -249,7 +249,9 @@
 .Nm
 will use the one which was specified last.
 .It Fl Z
-Add label to the list of keywords for which
+Add
+.Xr mac 4
+label to the list of keywords for which
 .Nm
 will display information.
 .El
@@ -601,10 +603,6 @@
 .El
 .Sh FILES
 .Bl -tag -width ".Pa /boot/kernel/kernel" -compact
-.It Pa /dev/lomac
-interface used to query the
-.Xr lomac 4
-KLD
 .It Pa /boot/kernel/kernel
 default system namelist
 .It Pa /proc
@@ -618,7 +616,7 @@
 .Xr w 1 ,
 .Xr kvm 3 ,
 .Xr strftime 3 ,
-.Xr lomac 4 ,
+.Xr mac 4 ,
 .Xr procfs 5 ,
 .Xr pstat 8 ,
 .Xr sysctl 8 ,
diff -ru 5.3_RC2/man1/rm.1 5.3_stable_20050225/man1/rm.1
--- 5.3_RC2/man1/rm.1	Sun Oct 31 14:30:27 2004
+++ 5.3_stable_20050225/man1/rm.1	Fri Feb 25 09:51:26 2005
@@ -29,7 +29,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)rm.1	8.5 (Berkeley) 12/5/94
-.\" %FreeBSD: src/bin/rm/rm.1,v 1.29 2004/07/02 21:04:19 ru Exp %
+.\" %FreeBSD: src/bin/rm/rm.1,v 1.29.2.1 2004/11/28 14:19:20 delphij Exp %
 .\"
 .Dd January 28, 1999
 .Dt RM 1
@@ -40,7 +40,7 @@
 .Nd remove directory entries
 .Sh SYNOPSIS
 .Nm
-.Op Fl dfiPRrvW
+.Op Fl dfiIPRrvW
 .Ar
 .Nm unlink
 .Ar file
@@ -76,6 +76,12 @@
 option overrides any previous
 .Fl f
 options.
+.It Fl I
+Request confirmation once if more than three files are being removed or if a
+directory is being recursively removed.
+This is a far less intrusive option than
+.Fl i
+yet provides almost the same level of protection against mistakes.
 .It Fl P
 Overwrite regular files before deleting them.
 Files are overwritten three times, first with the byte pattern 0xff,
diff -ru 5.3_RC2/man1/sh.1 5.3_stable_20050225/man1/sh.1
--- 5.3_RC2/man1/sh.1	Sun Oct 31 14:30:27 2004
+++ 5.3_stable_20050225/man1/sh.1	Fri Feb 25 09:51:27 2005
@@ -29,7 +29,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	from: @(#)sh.1	8.6 (Berkeley) 5/4/95
-.\" %FreeBSD: src/bin/sh/sh.1,v 1.92 2004/07/03 02:03:44 tjr Exp %
+.\" %FreeBSD: src/bin/sh/sh.1,v 1.92.2.3 2005/02/08 14:23:41 brueffer Exp %
 .\"
 .Dd July 3, 2004
 .Dt SH 1
@@ -269,7 +269,7 @@
 If this option is not set,
 traps are executed after the child exits,
 as specified in
-.St -p1003.2
+.St -p1003.2 .
 This nonstandard option is useful for putting guarding shells around
 children that block signals.
 The surrounding shell may kill the child
@@ -296,7 +296,7 @@
 .It Fl x Li xtrace
 Write each command
 (preceded by
-.Dq Li +\  )
+.Dq Li "+ " )
 to standard error before it is executed.
 Useful for debugging.
 .El
@@ -900,7 +900,7 @@
 not to the global variable named
 .Em x .
 .Pp
-The only special parameter than can be made local is
+The only special parameter that can be made local is
 .Dq Li - .
 Making
 .Dq Li -
diff -ru 5.3_RC2/man1/wc.1 5.3_stable_20050225/man1/wc.1
--- 5.3_RC2/man1/wc.1	Sun Oct 31 14:32:21 2004
+++ 5.3_stable_20050225/man1/wc.1	Fri Feb 25 09:57:19 2005
@@ -33,9 +33,9 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)wc.1	8.2 (Berkeley) 4/19/94
-.\" %FreeBSD: src/usr.bin/wc/wc.1,v 1.17 2004/07/03 00:24:44 ru Exp %
+.\" %FreeBSD: src/usr.bin/wc/wc.1,v 1.17.2.1 2005/02/23 06:17:56 trhodes Exp %
 .\"
-.Dd June 13, 2002
+.Dd February 23, 2005
 .Dt WC 1
 .Os
 .Sh NAME
@@ -50,11 +50,17 @@
 .Nm
 utility displays the number of lines, words, and bytes contained in each
 input
-.Ar file
-(or standard input, by default) to the standard output.
-A line is defined as a string of characters delimited by a <newline>
-character,
-and a word is defined as a string of characters delimited by white space
+.Ar file ,
+or standard input (if no file is specified) to the standard output.
+A line is defined as a string of characters delimited by a
+.Aq newline
+character.
+Characters beyond the final
+.Aq newline
+character will not be included
+in the line count.
+.Pp
+A word is defined as a string of characters delimited by white space
 characters.
 White space characters are the set of characters for which the
 .Xr iswspace 3
@@ -68,6 +74,9 @@
 .It Fl c
 The number of bytes in each input file
 is written to the standard output.
+This will cancel out any prior usage of the
+.Fl w
+option.
 .It Fl l
 The number of lines in each input file
 is written to the standard output.
@@ -77,6 +86,9 @@
 is equivalent to the
 .Fl c
 option.
+This will cancel out any prior usage of the
+.Fl c
+option.
 .It Fl w
 The number of words in each input file
 is written to the standard output.
@@ -85,6 +97,8 @@
 When an option is specified,
 .Nm
 only reports the information requested by that option.
+The order of output always takes the form of line, word,
+byte, and file name.
 The default action is equivalent to specifying the
 .Fl c , l
 and
@@ -93,6 +107,9 @@
 .Pp
 If no files are specified, the standard input is used and no
 file name is displayed.
+The prompt will accept input until receiving EOF, or
+.Bq ^D
+in most environments.
 .Sh ENVIRONMENT
 The
 .Ev LANG , LC_ALL
diff -ru 5.3_RC2/man1/whois.1 5.3_stable_20050225/man1/whois.1
--- 5.3_RC2/man1/whois.1	Sun Oct 31 14:32:22 2004
+++ 5.3_stable_20050225/man1/whois.1	Fri Feb 25 09:57:20 2005
@@ -30,9 +30,9 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)whois.1	8.1 (Berkeley) 6/6/93
-.\" %FreeBSD: src/usr.bin/whois/whois.1,v 1.32 2004/06/14 17:30:46 bms Exp %
+.\" %FreeBSD: src/usr.bin/whois/whois.1,v 1.32.2.1 2004/12/12 23:52:00 marius Exp %
 .\"
-.Dd June 14, 2004
+.Dd December 11, 2004
 .Dt WHOIS 1
 .Os
 .Sh NAME
@@ -40,7 +40,7 @@
 .Nd "Internet domain name and network number directory service"
 .Sh SYNOPSIS
 .Nm
-.Op Fl aAbdgiIlmQrR6
+.Op Fl aAbdgiIklmQrR6
 .Op Fl c Ar country-code | Fl h Ar host
 .Op Fl p Ar port
 .Ar name ...
@@ -157,6 +157,12 @@
 .Pq Tn IANA
 database.
 It contains network information for top-level domains.
+.It Fl k
+Use the National Internet Development Agency of Korea's
+.Pq Tn KRNIC
+database.
+It contains network numbers and domain contact information
+for Korea.
 .It Fl l
 Use the Latin American and Caribbean IP address Regional Registry
 .Pq Tn LACNIC