mdoc version three

SCCS-vsn: usr.bin/gprof/gprof.1 6.8
SCCS-vsn: usr.bin/fsplit/fsplit.1 6.7
SCCS-vsn: usr.bin/error/error.1 6.7
SCCS-vsn: usr.bin/sccs/sccs.1 2.10
SCCS-vsn: usr.bin/printf/printf.1 5.11
SCCS-vsn: usr.bin/passwd/passwd.1 6.11
SCCS-vsn: usr.bin/fpr/fpr.1 6.9
SCCS-vsn: usr.bin/head/head.1 6.6
SCCS-vsn: old/groups/groups.1 6.5
SCCS-vsn: usr.bin/find/find.1 6.28
SCCS-vsn: usr.bin/false/false.1 6.6

diff --git a/usr/src/old/groups/groups.1 b/usr/src/old/groups/groups.1
index 3b83d7f..efee518 100644 (file)
--- a/usr/src/old/groups/groups.1
+++ b/usr/src/old/groups/groups.1
@@ -1,12 +1,10 @@
 .\" Copyright (c) 1983 1990 The Regents of the University of California.
 .\" All rights reserved.
 .\"
 .\" Copyright (c) 1983 1990 The Regents of the University of California.
 .\" All rights reserved.
 .\"

-.\" %sccs.include.redist.man%
+.\" %sccs.include.redist.roff%

 .\"
 .\"

-.\"     @(#)groups.1   6.4 (Berkeley) %G%
+.\"    @(#)groups.1    6.5 (Berkeley) %G%

 .\"
 .\"

-.Vx
-.Vx

 .Dd 
 .Dt GROUPS 1
 .Os BSD 4.2
 .Dd 
 .Dt GROUPS 1
 .Os BSD 4.2


@@ -34,13 +32,15 @@ the group of the containing directory.
 .Xr group 5 ,
 .Xr setgroups 2
 .Sh FILES
 .Xr group 5 ,
 .Xr setgroups 2
 .Sh FILES

-.Dw /etc/passwd
-.Di L
-.Dp Pa /etc/passwd
-.Dp Pa /etc/group
-.Dp
+.Bl -tag -width /etc/passwd -compact
+.It Pa /etc/passwd
+.It Pa /etc/group
+.El

 .Sh HISTORY
 .Sh HISTORY

-.Nm Group
-appeared in 4.2 BSD.
+The
+.Nm group
+command
+appeared in
+.Bx 4.2 .

 .Sh BUGS
 More groups should be allowed.
 .Sh BUGS
 More groups should be allowed.

diff --git a/usr/src/usr.bin/error/error.1 b/usr/src/usr.bin/error/error.1
index 377ac98..bba3820 100644 (file)
--- a/usr/src/usr.bin/error/error.1
+++ b/usr/src/usr.bin/error/error.1
@@ -1,12 +1,10 @@
 .\" Copyright (c) 1980, 1990 The Regents of the University of California.
 .\" All rights reserved.
 .\"
 .\" Copyright (c) 1980, 1990 The Regents of the University of California.
 .\" All rights reserved.
 .\"

-.\" %sccs.include.redist.man%
+.\" %sccs.include.redist.roff%

 .\"
 .\"

-.\"     @(#)error.1    6.6 (Berkeley) %G%
+.\"    @(#)error.1     6.7 (Berkeley) %G%

 .\"
 .\"

-.Vx
-.Vx

 .Dd 
 .Dt ERROR 1
 .Os BSD 4
 .Dd 
 .Dt ERROR 1
 .Os BSD 4


@@ -32,13 +30,13 @@ permits error messages and source code to be viewed simultaneously
 without machinations of multiple windows in a screen editor.
 .Pp
 Options are:
 without machinations of multiple windows in a screen editor.
 .Pp
 Options are:

-.Tw Ds
-.Tp Fl n
+.Bl -tag -width Ds
+.It Fl n

 Do
 .Em not
 touch any files; all error messages are sent to the
 standard output.
 Do
 .Em not
 touch any files; all error messages are sent to the
 standard output.

-.Tp Fl q
+.It Fl q

 The user is
 .Ar queried
 whether s/he wants to touch the file.
 The user is
 .Ar queried
 whether s/he wants to touch the file.


@@ -48,20 +46,20 @@ Absence of the
 option implies that all referenced files
 (except those referring to discarded error messages)
 are to be touched.
 option implies that all referenced files
 (except those referring to discarded error messages)
 are to be touched.

-.Tp Fl v
+.It Fl v

 After all files have been touched,
 overlay the visual editor
 After all files have been touched,
 overlay the visual editor

-.Xr vi 1
+.Xr \&vi 1

 with it set up to edit all files touched,
 and positioned in the first touched file at the first error.
 If
 with it set up to edit all files touched,
 and positioned in the first touched file at the first error.
 If

-.Xr vi 1
+.Xr \&vi 1

 can't be found, try
 can't be found, try

-.Xr ex 1
+.Xr \&ex 1

 or
 or

-.Xr ed 1
+.Xr \&ed 1

 from standard places.
 from standard places.

-.Tp Fl t
+.It Fl t

 Take the following argument as a suffix list.
 Files whose suffixes do not appear in the suffix list are not touched.
 The suffix list is dot separated, and ``*'' wildcards work.
 Take the following argument as a suffix list.
 Files whose suffixes do not appear in the suffix list are not touched.
 The suffix list is dot separated, and ``*'' wildcards work.


@@ -72,12 +70,12 @@ Thus the suffix list:
 allows
 .Nm error
 to touch files ending with ``.c'', ``.y'', ``.foo*'' and ``.y''.
 allows
 .Nm error
 to touch files ending with ``.c'', ``.y'', ``.foo*'' and ``.y''.

-.Tp Fl s
+.It Fl s

 Print out
 .Em statistics
 regarding the error categorization.
 Not too useful.
 Print out
 .Em statistics
 regarding the error categorization.
 Not too useful.

-.Tp
+.El

 .Pp
 .Nm Error
 looks at the error messages,
 .Pp
 .Nm Error
 looks at the error messages,


@@ -119,14 +117,14 @@ runs when making lint.
 .Nm Error
 knows about the error messages produced by:
 .Xr make 1 ,
 .Nm Error
 knows about the error messages produced by:
 .Xr make 1 ,

-.Xr cc 1 ,
+.Xr \&cc 1 ,

 .Xr cpp 1 ,
 .Xr ccom 1 ,
 .Xr cpp 1 ,
 .Xr ccom 1 ,

-.Xr as 1 ,
-.Xr ld 1 ,
+.Xr \&as 1 ,
+.Xr \&ld 1 ,

 .Xr lint 1 ,
 .Xr lint 1 ,

-.Xr pi 1 ,
-.Xr pc 1 ,
+.Xr \&pi 1 ,
+.Xr \&pc 1 ,

 .Xr f77 1 ,
 and
 .Em DEC Western Research Modula\-2 .
 .Xr f77 1 ,
 and
 .Em DEC Western Research Modula\-2 .


@@ -145,7 +143,8 @@ all of the places referenced.
 .Pp
 .Nm Error
 will do one of six things with error messages.
 .Pp
 .Nm Error
 will do one of six things with error messages.

-.Tp Em synchronize
+.Bl -tag -width Em synchronize
+.It Em synchronize

 Some language processors produce short errors describing
 which file it is processing.
 .Nm Error
 Some language processors produce short errors describing
 which file it is processing.
 .Nm Error


@@ -153,7 +152,7 @@ uses these to determine the file name for languages that
 don't include the file name in each error message.
 These synchronization messages are consumed entirely by
 .Nm error .
 don't include the file name in each error message.
 These synchronization messages are consumed entirely by
 .Nm error .

-.Tp Em discard
+.It Em discard

 Error messages from
 .Xr lint 1
 that refer to one of the two
 Error messages from
 .Xr lint 1
 that refer to one of the two


@@ -166,7 +165,7 @@ are discarded,
 to prevent accidently touching these libraries.
 Again, these error messages are consumed entirely by
 .Nm error .
 to prevent accidently touching these libraries.
 Again, these error messages are consumed entirely by
 .Nm error .

-.Tp Em nullify
+.It Em nullify

 Error messages from
 .Xr lint 1
 can be nullified if they refer to a specific function,
 Error messages from
 .Xr lint 1
 can be nullified if they refer to a specific function,


@@ -184,19 +183,19 @@ If the file does not exist,
 no error messages are nullified.
 If the file does exist, there must be one function
 name per line.
 no error messages are nullified.
 If the file does exist, there must be one function
 name per line.

-.Tp Em not file specific
+.It Em not file specific

 Error messages that can't be intuited are grouped together,
 and written to the standard output before any files are touched.
 They will not be inserted into any source file.
 Error messages that can't be intuited are grouped together,
 and written to the standard output before any files are touched.
 They will not be inserted into any source file.

-.Tp Em file specific
+.It Em file specific

 Error message that refer to a specific file,
 but to no specific line,
 are written to the standard output when
 that file is touched.
 Error message that refer to a specific file,
 but to no specific line,
 are written to the standard output when
 that file is touched.

-.Tp Em true errors
+.It Em true errors

 Error messages that can be intuited are candidates for
 insertion into the file to which they refer.
 Error messages that can be intuited are candidates for
 insertion into the file to which they refer.

-.Tp
+.El

 .Pp
 Only true error messages are candidates for inserting into
 the file they refer to.
 .Pp
 Only true error messages are candidates for inserting into
 the file they refer to.


@@ -232,18 +231,20 @@ catches interrupt and terminate signals,
 and if in the insertion phase,
 will orderly terminate what it is doing.
 .Sh FILES
 and if in the insertion phase,
 will orderly terminate what it is doing.
 .Sh FILES

-.Dw ~/.errorrc
-.Di L
-.Dp Pa ~/.errorrc
+.Bl -tag -width ~/.errorrc -compact
+.It Pa ~/.errorrc

 function names to ignore for
 .Xr lint 1
 error messages
 function names to ignore for
 .Xr lint 1
 error messages

-.Dp Pa /dev/tty
+.It Pa /dev/tty

 user's teletype
 user's teletype

-.Dp
+.El

 .Sh HISTORY
 .Sh HISTORY

-.Nm Error
-appeared in 4.0 BSD.
+The
+.Nm error
+command
+appeared in
+.Bx 4.0 .

 .Sh AUTHOR
 Robert Henry
 .Sh BUGS
 .Sh AUTHOR
 Robert Henry
 .Sh BUGS


@@ -270,6 +271,8 @@ the point of error is also disturbed by
 .Nm error .
 .Pp
 .Nm Error
 .Nm error .
 .Pp
 .Nm Error

-was designed for work on CRT's at reasonably high speed.
+was designed for work on
+.Tn CRT Ns 's
+at reasonably high speed.

 It is less pleasant on slow speed terminals, and has never been
 used on hardcopy terminals.
 It is less pleasant on slow speed terminals, and has never been
 used on hardcopy terminals.

diff --git a/usr/src/usr.bin/false/false.1 b/usr/src/usr.bin/false/false.1
index 011ab05..1f74b43 100644 (file)
--- a/usr/src/usr.bin/false/false.1
+++ b/usr/src/usr.bin/false/false.1
@@ -4,10 +4,10 @@
 .\" This code is derived from software contributed to Berkeley by
 .\" the Institute of Electrical and Electronics Engineers, Inc.
 .\"
 .\" This code is derived from software contributed to Berkeley by
 .\" the Institute of Electrical and Electronics Engineers, Inc.
 .\"

-.\" %sccs.include.redist.man%
+.\" %sccs.include.redist.roff%
+.\"
+.\"    @(#)false.1     6.6 (Berkeley) %G%

 .\"
 .\"

-.\"     @(#)false.1    6.5 (Berkeley) %G%
-.Vx

 .Dd 
 .Dt FALSE 1
 .Os BSD 4.2
 .Dd 
 .Dt FALSE 1
 .Os BSD 4.2


@@ -17,7 +17,7 @@
 .Sh SYNOPSIS
 .Nm false
 .Sh DESCRIPTION
 .Sh SYNOPSIS
 .Nm false
 .Sh DESCRIPTION

-.Nm false
+.Nm False

 is usually used in a Bourne shell script.
 It tests for the appropriate status "false" before running 
 (or failing to run) a list of commands.  
 is usually used in a Bourne shell script.
 It tests for the appropriate status "false" before running 
 (or failing to run) a list of commands.  


@@ -32,4 +32,6 @@ utility always exits with a value other than zero.
 .Sh STANDARDS
 The
 .Nm false
 .Sh STANDARDS
 The
 .Nm false

-function is expected to be POSIX 1003.2 compatible.
+utility is expected to be
+.St -p1003.2
+compatible.

diff --git a/usr/src/usr.bin/find/find.1 b/usr/src/usr.bin/find/find.1
index f168c6f..b3793d7 100644 (file)
--- a/usr/src/usr.bin/find/find.1
+++ b/usr/src/usr.bin/find/find.1
@@ -4,11 +4,10 @@
 .\" This code is derived from software contributed to Berkeley by
 .\" the Institute of Electrical and Electronics Engineers, Inc.
 .\"
 .\" This code is derived from software contributed to Berkeley by
 .\" the Institute of Electrical and Electronics Engineers, Inc.
 .\"

-.\" %sccs.include.redist.man%
+.\" %sccs.include.redist.roff%

 .\"
 .\"

-.\"     @(#)find.1     6.27 (Berkeley) %G%
+.\"    @(#)find.1      6.28 (Berkeley) %G%

 .\"
 .\"

-.Vx

 .Dd 
 .Dt FIND 1
 .Os
 .Dd 
 .Dt FIND 1
 .Os


@@ -37,8 +36,8 @@ referenced by the link is descended instead of the link itself.
 .Pp
 The options are as follows:
 .Pp
 .Pp
 The options are as follows:
 .Pp

-.Tw Ds
-.Tp Fl d
+.Bl -tag -width Ds
+.It Fl d

 The
 .Fl d
 option causes
 The
 .Fl d
 option causes


@@ -52,7 +51,7 @@ visits directories in pre\-order, i.e. before their contents.
 Note, the default is
 .Ar not
 a breadth\-first traversal.
 Note, the default is
 .Ar not
 a breadth\-first traversal.

-.Tp Fl f
+.It Fl f

 The
 .Fl f
 option specifies a file hierarchy for
 The
 .Fl f
 option specifies a file hierarchy for


@@ -60,7 +59,7 @@ option specifies a file hierarchy for
 to traverse.
 File hierarchies may also be specified as the operands immediately
 following the options.
 to traverse.
 File hierarchies may also be specified as the operands immediately
 following the options.

-.Tp Fl s
+.It Fl s

 The
 .Fl s
 option causes the file information and file type (see
 The
 .Fl s
 option causes the file information and file type (see


@@ -69,7 +68,7 @@ returned for each symbolic link to be those of the file referenced by the
 link, not the link itself.
 If the referenced file does not exist, the file information and type will
 be for the link itself.
 link, not the link itself.
 If the referenced file does not exist, the file information and type will
 be for the link itself.

-.Tp Fl X
+.It Fl X

 The
 .Fl X
 option is a modification to permit
 The
 .Fl X
 option is a modification to permit


@@ -82,41 +81,30 @@ a diagnostic message is displayed on standard error, and the file
 is skipped.
 The delimiting characters include single (`` ' '') and double (`` " '')
 quotes, backslash (``\e''), space, tab and newline characters.
 is skipped.
 The delimiting characters include single (`` ' '') and double (`` " '')
 quotes, backslash (``\e''), space, tab and newline characters.

-.Tp Fl x
+.It Fl x

 The
 .Fl x
 option prevents
 .Nm find
 from descending into directories that have a device number different
 than that of the file from which the descent began.
 The
 .Fl x
 option prevents
 .Nm find
 from descending into directories that have a device number different
 than that of the file from which the descent began.

-.Tp
+.El

 .Sh PRIMARIES
 .Sh PRIMARIES

-.Tw Ds
-.Tp Cx Ic -atime
-.Cx \&\ \&
-.Ar n
-.Cx
+.Bl -tag -width Ds
+.It Ic -atime Ar n 

 True if the difference between the file last access time and the time
 .Nm find
 was started, rounded up to the next full 24\-hour period, is
 .Ar n
 24\-hour periods.
 True if the difference between the file last access time and the time
 .Nm find
 was started, rounded up to the next full 24\-hour period, is
 .Ar n
 24\-hour periods.

-.Tp Cx Ic -ctime
-.Cx \&\ \&
-.Ar n
-.Cx
+.It Ic -ctime Ar n 

 True if the difference between the time of last change of file status
 information and the time
 .Nm find
 was started, rounded up to the next full 24\-hour period, is
 .Ar n
 24\-hour periods.
 True if the difference between the time of last change of file status
 information and the time
 .Nm find
 was started, rounded up to the next full 24\-hour period, is
 .Ar n
 24\-hour periods.

-.Tp Cx Ic -exec
-.Cx \&\ \&
-.Ar utility
-.Cx \&\ \&
-.Op argument ... ;
-.Cx
+.It Ic -exec Ar utility Op argument ... ; 

 True if the program named
 .Ar utility
 returns a zero value as its exit status.
 True if the program named
 .Ar utility
 returns a zero value as its exit status.


@@ -128,10 +116,7 @@ arguments it is replaced by the pathname of the current file.
 will be executed from the directory from which
 .Nm find
 was executed.
 will be executed from the directory from which
 .Nm find
 was executed.

-.Tp Cx Ic -fstype
-.Cx \&\ \&
-.Ar type
-.Cx
+.It Ic -fstype Ar type 

 True if the file is contained in a file system of type
 .Ar type .
 Currently supported types are ``local'', ``mfs'', ``nfs'', ``pc'',
 True if the file is contained in a file system of type
 .Ar type .
 Currently supported types are ``local'', ``mfs'', ``nfs'', ``pc'',


@@ -142,10 +127,7 @@ the
 .Nm find
 is being executed and the latter matches any file system which is
 mounted read-only.
 .Nm find
 is being executed and the latter matches any file system which is
 mounted read-only.

-.Tp Cx Ic -group
-.Cx \&\ \&
-.Ar gname
-.Cx
+.It Ic -group Ar gname 

 True if the file belongs to the group
 .Ar gname  .
 If
 True if the file belongs to the group
 .Ar gname  .
 If


@@ -153,20 +135,14 @@ If
 is numeric and there is no such group name, then
 .Ar gname
 is treated as a group id.
 is numeric and there is no such group name, then
 .Ar gname
 is treated as a group id.

-.Tp Cx Ic -inum
-.Cx \&\ \&
-.Ar n
-.Cx
+.It Ic -inum Ar n 

 True if the file has inode number
 .Ar n  .
 True if the file has inode number
 .Ar n  .

-.Tp Cx Ic -links
-.Cx \&\ \&
-.Ar n
-.Cx
+.It Ic -links Ar n 

 True if the file has
 .Ar n
 links.
 True if the file has
 .Ar n
 links.

-.Tp Ic -ls
+.It Ic -ls

 This primary always evaluates to true.
 The following information for the current file is written to standard output:
 its inode number, size in 512\-byte blocks, file permissions, number of hard
 This primary always evaluates to true.
 The following information for the current file is written to standard output:
 its inode number, size in 512\-byte blocks, file permissions, number of hard


@@ -176,21 +152,14 @@ will be displayed instead of the size in bytes.
 If the file is a symbolic link, the pathname of the linked\-to file will be
 displayed preceded by ``\->''.
 The format is identical to that produced by ``ls \-dgils''.
 If the file is a symbolic link, the pathname of the linked\-to file will be
 displayed preceded by ``\->''.
 The format is identical to that produced by ``ls \-dgils''.

-.Tp Cx Ic -mtime
-.Cx \&\ \&
-.Ar n
-.Cx
+.It Ic -mtime Ar n 

 True if the difference between the file last modification time and the time
 .Nm find
 was started, rounded up to the next full 24\-hour period, is
 .Ar n
 24\-hour periods.
 True if the difference between the file last modification time and the time
 .Nm find
 was started, rounded up to the next full 24\-hour period, is
 .Ar n
 24\-hour periods.

-.Tp Cx Ic \&-ok
-.Cx \&\ \&
-.Ar utility
-.Ws
-.Op argument ... ;
-.Cx
+.Tp.Ws
+ Ic \&-ok Ar utility Ns Op argument ... ; 

 The
 .Ic \&-ok
 primary is identical to the
 The
 .Ic \&-ok
 primary is identical to the


@@ -203,10 +172,7 @@ If the response is other than ``y'' the command is not executed and the
 value of the
 .Ar \&ok
 expression is false.
 value of the
 .Ar \&ok
 expression is false.

-.Tp Cx Ic -name
-.Cx \&\ \&
-.Ar pattern
-.Cx
+.It Ic -name Ar pattern 

 True if the last component of the pathname being examined matches
 .Ar pattern  .
 Special shell pattern matching characters (``['', ``]'', ``*'', and ``?'')
 True if the last component of the pathname being examined matches
 .Ar pattern  .
 Special shell pattern matching characters (``['', ``]'', ``*'', and ``?'')


@@ -214,20 +180,14 @@ may be used as part of
 .Ar pattern  .
 These characters may be matched explicitly by escaping them with a
 backslash (``\e'').
 .Ar pattern  .
 These characters may be matched explicitly by escaping them with a
 backslash (``\e'').

-.Tp Cx Ic -newer
-.Cx \&\ \&
-.Ar file
-.Cx
+.It Ic -newer Ar file 

 True if the current file has a more recent last modification time than
 .Ar file  .
 True if the current file has a more recent last modification time than
 .Ar file  .

-.Tp Ic -nouser
+.It Ic -nouser

 True if the file belongs to an unknown user.
 True if the file belongs to an unknown user.

-.Tp Ic -nogroup
+.It Ic -nogroup

 True if the file belongs to an unknown group.
 True if the file belongs to an unknown group.

-.Tp Cx Ic -path
-.Cx \&\ \&
-.Ar pattern
-.Cx
+.It Ic -path Ar pattern 

 True if the pathname being examined matches
 .Ar pattern  .
 Special shell pattern matching characters (``['', ``]'', ``*'', and ``?'')
 True if the pathname being examined matches
 .Ar pattern  .
 Special shell pattern matching characters (``['', ``]'', ``*'', and ``?'')


@@ -237,11 +197,7 @@ These characters may be matched explicitly by escaping them with a
 backslash (``\e'').
 Slashes (``/'') are treated as normal characters and do not have to be
 matched explicitly.
 backslash (``\e'').
 Slashes (``/'') are treated as normal characters and do not have to be
 matched explicitly.

-.Tp Cx Ic -perm
-.Cx \&\ \&
-.Op Fl
-.Ar mode
-.Cx
+.It Ic -perm Op Fl Ns Ar mode 

 The
 .Ar mode
 may be either symbolic (see
 The
 .Ar mode
 may be either symbolic (see


@@ -250,15 +206,26 @@ or an octal number.
 If the mode is symbolic, a starting value of zero is assumed and the
 mode sets or clears permissions without regard to the process' file mode
 creation mask.
 If the mode is symbolic, a starting value of zero is assumed and the
 mode sets or clears permissions without regard to the process' file mode
 creation mask.

-If the mode is octal, only bits 07777 (S_ISUID | S_ISGID | S_ISTXT |
-S_IRWXU | S_IRWXG | S_IRWXO) of the file's mode bits participate
+If the mode is octal, only bits 07777
+.Pf ( Dv S_ISUID
+|
+.Dv S_ISGID
+|
+.Dv S_ISTXT
+|
+.Dv S_IRWXU
+|
+.Dv S_IRWXG
+|
+.Dv S_IRWXO )
+of the file's mode bits participate

 in the comparison.
 If the mode is preceded by a dash (``\-''), this primary evaluates to true
 if at least all of the bits in the mode are set in the file's mode bits.
 If the mode is not preceded by a dash, this primary evaluates to true if
 the bits in the mode exactly match the file's mode bits.
 Note, the first character of a symbolic mode may not be a dash (``\-'').
 in the comparison.
 If the mode is preceded by a dash (``\-''), this primary evaluates to true
 if at least all of the bits in the mode are set in the file's mode bits.
 If the mode is not preceded by a dash, this primary evaluates to true if
 the bits in the mode exactly match the file's mode bits.
 Note, the first character of a symbolic mode may not be a dash (``\-'').

-.Tp Ic -print
+.It Ic -print

 This primary always evaluates to true.
 It prints the pathname of the current file to standard output.
 The expression is appended to the user specified expression if neither
 This primary always evaluates to true.
 It prints the pathname of the current file to standard output.
 The expression is appended to the user specified expression if neither


@@ -267,7 +234,7 @@ The expression is appended to the user specified expression if neither
 or
 .Ic \&-ok
 is specified.
 or
 .Ic \&-ok
 is specified.

-.Tp Ic -prune
+.It Ic -prune

 This primary always evaluates to true.
 It causes
 .Nm find
 This primary always evaluates to true.
 It causes
 .Nm find


@@ -277,11 +244,7 @@ Note, the
 primary has no effect if the
 .Fl d
 option was specified.
 primary has no effect if the
 .Fl d
 option was specified.

-.Tp Cx Ic -size
-.Cx \&\ \&
-.Ar n
-.Op Cm c
-.Cx
+.It Ic -size Ar n Ns Op Cm c 

 True if the file's size, rounded up, in 512\-byte blocks is
 .Ar n  .
 If
 True if the file's size, rounded up, in 512\-byte blocks is
 .Ar n  .
 If


@@ -290,36 +253,28 @@ is followed by a ``c'', then the primary is true if the
 file's size is
 .Ar n
 bytes.
 file's size is
 .Ar n
 bytes.

-.Tp Cx Ic -type
-.Cx \&\ \&
-.Ar t
-.Cx
+.It Ic -type Ar t 

 True if the file is of the specified type.
 Possible file types are as follows:
 .Pp
 True if the file is of the specified type.
 Possible file types are as follows:
 .Pp

-.Df I
-.Tw Ds
-.Tp Cm b
+.Bl -tag -width flag -offset indent -compact
+.It Cm b

 block special
 block special

-.Tp Cm c
+.It Cm c

 character special
 character special

-.Tp Cm d
+.It Cm d

 directory
 directory

-.Tp Cm f
+.It Cm f

 regular file
 regular file

-.Tp Cm l
+.It Cm l

 symbolic link
 symbolic link

-.Tp Cm p
+.It Cm p

 FIFO
 FIFO

-.Tp Cm s
+.It Cm s

 socket
 socket

-.Tp
-.De
+.El

 .Pp
 .Pp

-.Tp Cx Ic -user
-.Cx \&\ \&
-.Ar uname
-.Cx
+.It Ic -user Ar uname 

 True if the file belongs to the user
 .Ar uname  .
 If
 True if the file belongs to the user
 .Ar uname  .
 If


@@ -327,7 +282,7 @@ If
 is numeric and there is no such user name, then
 .Ar uname
 is treated as a user id.
 is numeric and there is no such user name, then
 .Ar uname
 is treated as a user id.

-.Tp
+.El

 .Pp
 All primaries which take a numeric argument allow the number to be
 preceded by a plus sign (``+'') or a minus sign (``\-'').
 .Pp
 All primaries which take a numeric argument allow the number to be
 preceded by a plus sign (``+'') or a minus sign (``\-'').


@@ -336,50 +291,39 @@ A preceding plus sign means ``more than n'', a preceding minus sign means
 .Sh OPERATORS
 The primaries may be combined using the following operators.
 The operators are listed in order of decreasing precedence.
 .Sh OPERATORS
 The primaries may be combined using the following operators.
 The operators are listed in order of decreasing precedence.

-.Di L
-.Dp Cx Ic \&(
-.Ar expression
-.Cx \&)
-.Cx
+.Bl -tag -width (expression) 
+.It Cm \&( Ns Ar expression Ns Cm \&) 

 This evaluates to true if the parenthesized expression evaluates to
 true.
 .Pp
 This evaluates to true if the parenthesized expression evaluates to
 true.
 .Pp

-.Dp Cx Ic \&!
-.Cx \&\ \&
-.Ar expression
-.Cx
-This is the unary NOT operator.
+.It Cm \&! Ns Ar expression 
+This is the unary
+.Tn NOT
+operator.

 It evaluates to true if the expression is false.
 .Pp
 It evaluates to true if the expression is false.
 .Pp

-.Dp Cx Ar expression
-.Cx \&\ \&
-.Ic -and
-.Cx \&\ \&
-.Ar expression
-.Cx
-.Dp Cx Ar expression expression
-.Cx
+.It Ar expression Cm -and Ar expression 
+.It Ar expression expression 

 The
 The

-.Ic -and
-operator is the logical AND operator.
+.Cm -and
+operator is the logical
+.Tn AND
+operator.

 As it is implied by the juxtaposition of two expressions it does not
 have to be specified.
 The expression evaluates to true if both expressions are true.
 The second expression is not evaluated if the first expression is false.
 .Pp
 As it is implied by the juxtaposition of two expressions it does not
 have to be specified.
 The expression evaluates to true if both expressions are true.
 The second expression is not evaluated if the first expression is false.
 .Pp

-.Dp Cx Ar expression
-.Cx \&\ \&
-.Ic -or
-.Cx \&\ \&
-.Ar expression
-.Cx
+.It Ar expression Cm -or Ar expression 

 The
 The

-.Ic -or
-operator is the logical OR operator.
+.Cm -or
+operator is the logical
+.Tn OR
+operator.

 The expression evaluates to true if either the first or the second expression
 is true.
 The second expression is not evaluated if the first expression is true.
 The expression evaluates to true if either the first or the second expression
 is true.
 The second expression is not evaluated if the first expression is true.

-.Dp
+.El

 .Pp
 All operands and primaries must be separate arguments to
 .Nm find  .
 .Pp
 All operands and primaries must be separate arguments to
 .Nm find  .


@@ -389,19 +333,19 @@ to be a separate argument to
 .Sh EXAMPLES
 .Pp
 The following examples are shown as given to the shell:
 .Sh EXAMPLES
 .Pp
 The following examples are shown as given to the shell:

-.Tw findx
-.Tp Li find  /  \e!  -name  "*.c"  -print
+.Bl -tag -width findx
+.It Li "find  /  \e!  -name  \*q*.c\*q  -print"

 Print out a list of all the files whose names do not end in ``.c''.
 Print out a list of all the files whose names do not end in ``.c''.

-.Tp Li find  /  -newer  ttt  -user  wnj  -print
+.It Li "find  /  -newer  ttt  -user  wnj  -print"

 Print out a list of all the files owned by user ``wnj'' that are newer
 than the file ``ttt''.
 Print out a list of all the files owned by user ``wnj'' that are newer
 than the file ``ttt''.

-.Tp Li find  /  \e!  \e(  -newer  ttt  -user  wnj  \e)  -print
+.It Li "find  /  \e!  \e(  -newer  ttt  -user  wnj  \e)  -print"

 Print out a list of all the files which are not both newer than ``ttt''
 and owned by ``wnj''.
 Print out a list of all the files which are not both newer than ``ttt''
 and owned by ``wnj''.

-.Tp Li "find  /  \e(  -newer  ttt  -or  -user wnj  \e)  -print"
+.It Li "find  /  \e(  -newer  ttt  -or  -user wnj  \e)  -print"

 Print out a list of all the files that are either owned by ``wnj'' or
 that are newer than ``ttt''.
 Print out a list of all the files that are either owned by ``wnj'' or
 that are newer than ``ttt''.

-.Tp
+.El

 .Sh SEE ALSO
 .Xr chmod 1 ,
 .Xr sh 1 ,
 .Sh SEE ALSO
 .Xr chmod 1 ,
 .Xr sh 1 ,


@@ -414,8 +358,9 @@ that are newer than ``ttt''.
 .Sh STANDARDS
 The
 .Nm find
 .Sh STANDARDS
 The
 .Nm find

-utility syntax is a superset of the syntax specified by the POSIX
-1003.2 standard.
+utility syntax is a superset of the syntax specified by the
+.St -p1003.2
+standard.

 .Pp
 The
 .Fl s
 .Pp
 The
 .Fl s


@@ -425,7 +370,8 @@ options and the
 .Ic -inum
 and
 .Ic -ls
 .Ic -inum
 and
 .Ic -ls

-primaries are extensions to the POSIX standard.
+primaries are extensions to
+.St -p1003.2 .

 .Pp
 Historically, the
 .Fl d ,
 .Pp
 Historically, the
 .Fl d ,

diff --git a/usr/src/usr.bin/fpr/fpr.1 b/usr/src/usr.bin/fpr/fpr.1
index f2b208e..568ae95 100644 (file)
--- a/usr/src/usr.bin/fpr/fpr.1
+++ b/usr/src/usr.bin/fpr/fpr.1
@@ -3,13 +3,10 @@
 .\"
 .\" This code is derived from software contributed to Berkeley by
 .\" Robert Corbett.
 .\"
 .\" This code is derived from software contributed to Berkeley by
 .\" Robert Corbett.

+.\" %sccs.include.redist.roff%

 .\"
 .\"

-.\" %sccs.include.redist.man%
+.\"    @(#)fpr.1       6.9 (Berkeley) %G%

 .\"
 .\"

-.\"     @(#)fpr.1      6.8 (Berkeley) %G%
-.\"
-.Vx
-.Vx

 .Dd 
 .Dt FPR 1
 .Os BSD 4.2
 .Dd 
 .Dt FPR 1
 .Os BSD 4.2


@@ -22,7 +19,9 @@
 .Nm Fpr
 is a filter that transforms files formatted according to
 Fortran's carriage control conventions into files formatted
 .Nm Fpr
 is a filter that transforms files formatted according to
 Fortran's carriage control conventions into files formatted

-according to UNIX line printer conventions.
+according to
+.Ux
+line printer conventions.

 .Pp
 .Nm Fpr
 copies its input onto its output, replacing the carriage
 .Pp
 .Nm Fpr
 copies its input onto its output, replacing the carriage


@@ -30,15 +29,14 @@ control characters with characters that will produce the intended
 effects when printed using
 .Xr lpr  1  .
 The first character of each line determines the vertical spacing as follows:
 effects when printed using
 .Xr lpr  1  .
 The first character of each line determines the vertical spacing as follows:

-.Ds I
-.Cw Character
-.Cl Blank      One line
-.Pp
-.Cl 0  Two lines
-.Cl 1  To first line of next page
-.Cl +  No advance
-.Cw
-.De
+.Bd -ragged -offset indent -compact
+.Bl -column Character
+.It Blank      One line
+.It 0  Two lines
+.It 1  To first line of next page
+.It +  No advance
+.El
+.Ed

 .Pp
 A blank line is treated as if its first
 character is a blank. A blank that appears as a carriage control
 .Pp
 A blank line is treated as if its first
 character is a blank. A blank that appears as a carriage control


@@ -50,7 +48,10 @@ backspaces.
 .Pp
 .Dl fpr \&< f77.output \&| lpr
 .Sh HISTORY
 .Pp
 .Dl fpr \&< f77.output \&| lpr
 .Sh HISTORY

-.Nm Fpr
-appeared in 4.2 BSD.
+The
+.Nm fpr
+command
+appeared in
+.Bx 4.2 .

 .Sh BUGS
 Results are undefined for input lines longer than 170 characters.
 .Sh BUGS
 Results are undefined for input lines longer than 170 characters.

diff --git a/usr/src/usr.bin/fsplit/fsplit.1 b/usr/src/usr.bin/fsplit/fsplit.1
index 92e7da8..29a1cd9 100644 (file)
--- a/usr/src/usr.bin/fsplit/fsplit.1
+++ b/usr/src/usr.bin/fsplit/fsplit.1
@@ -3,13 +3,10 @@
 .\"
 .\" This code is derived from software contributed to Berkeley by
 .\" Asa Romberger and Jerry Berkman.
 .\"
 .\" This code is derived from software contributed to Berkeley by
 .\" Asa Romberger and Jerry Berkman.

+.\" %sccs.include.redist.roff%

 .\"
 .\"

-.\" %sccs.include.redist.man%
+.\"    @(#)fsplit.1    6.7 (Berkeley) %G%

 .\"
 .\"

-.\"     @(#)fsplit.1   6.6 (Berkeley) %G%
-.\"
-.Vx
-.Vx

 .Dd 
 .Dt FSPLIT 1
 .Os BSD 4.2
 .Dd 
 .Dt FSPLIT 1
 .Os BSD 4.2


@@ -44,11 +41,8 @@ where
 .Ar zzzNNN.f
 does not already exist.
 .Pp
 .Ar zzzNNN.f
 does not already exist.
 .Pp

-.Tw Ar
-.Tc Fl e
-.Ws
-.Ar efile
-.Cx
+.Bl -tag -width Fl
+.It Fl e Ar efile 

 Normally each subprogram unit is split into a separate file.  When the
 .Fl e
 option is used, only the specified subprogram units are split into separate
 Normally each subprogram unit is split into a separate file.  When the
 .Fl e
 option is used, only the specified subprogram units are split into separate


@@ -57,15 +51,18 @@ files.  E.g.:
 .Dl fsplit -e readit -e doit prog.f
 .Pp
 will split readit and doit into separate files.
 .Dl fsplit -e readit -e doit prog.f
 .Pp
 will split readit and doit into separate files.

-.Tp
+.El

 .Sh DIAGNOSTICS
 If names specified via the
 .Fl e
 option are not found, a diagnostic is written to
 standard error.
 .Sh HISTORY
 .Sh DIAGNOSTICS
 If names specified via the
 .Fl e
 option are not found, a diagnostic is written to
 standard error.
 .Sh HISTORY

-.Nm Fsplit
-appeared in 4.2 BSD.
+The
+.Nm fsplit
+command
+appeared in
+.Bx 4.2 .

 .Sh AUTHORS
 Asa Romberger and Jerry Berkman
 .Sh BUGS
 .Sh AUTHORS
 Asa Romberger and Jerry Berkman
 .Sh BUGS

diff --git a/usr/src/usr.bin/gprof/gprof.1 b/usr/src/usr.bin/gprof/gprof.1
index 0b5adda..bf0f378 100644 (file)
--- a/usr/src/usr.bin/gprof/gprof.1
+++ b/usr/src/usr.bin/gprof/gprof.1
@@ -1,12 +1,10 @@
 .\" Copyright (c) 1983, 1990 The Regents of the University of California.
 .\" All rights reserved.
 .\"
 .\" Copyright (c) 1983, 1990 The Regents of the University of California.
 .\" All rights reserved.
 .\"

-.\" %sccs.include.redist.man%
+.\" %sccs.include.redist.roff%

 .\"
 .\"

-.\"     @(#)gprof.1    6.7 (Berkeley) %G%
+.\"    @(#)gprof.1     6.8 (Berkeley) %G%

 .\"
 .\"

-.Vx
-.Vx

 .Dd 
 .Dt GPROF 1
 .Os BSD 4.2
 .Dd 
 .Dt GPROF 1
 .Os BSD 4.2


@@ -18,11 +16,11 @@
 .Op options
 .Op Ar a.out Op Ar gmon.out ...
 .Sh DESCRIPTION
 .Op options
 .Op Ar a.out Op Ar gmon.out ...
 .Sh DESCRIPTION

-.Nm gprof
+.Nm Gprof

 produces an execution profile of C, Pascal, or Fortran77 programs.
 The effect of called routines is incorporated in the profile of each caller.
 The profile data is taken from the call graph profile file
 produces an execution profile of C, Pascal, or Fortran77 programs.
 The effect of called routines is incorporated in the profile of each caller.
 The profile data is taken from the call graph profile file

-.Pf \&( Pa gmon.out
+.Pf ( Pa gmon.out

 default) which is created by programs
 that are compiled with the
 .Fl pg
 default) which is created by programs
 that are compiled with the
 .Fl pg


@@ -74,26 +72,23 @@ its descendents.
 Finally, an index of the function names is provided.
 .Pp
 The following options are available:
 Finally, an index of the function names is provided.
 .Pp
 The following options are available:

-.Tw Fl
-.Tp Fl a
-suppresses the printing of statically declared functions.
+.Bl -tag -width Fl
+.It Fl a
+Suppresses the printing of statically declared functions.

 If this option is given, all relevant information about the static function
 (e.g., time samples, calls to other functions, calls from other functions)
 belongs to the function loaded just before the static function in the
 .Pa a.out
 file.
 If this option is given, all relevant information about the static function
 (e.g., time samples, calls to other functions, calls from other functions)
 belongs to the function loaded just before the static function in the
 .Pa a.out
 file.

-.Tp Fl b
-suppresses the printing of a description of each field in the profile.
-.Tp Fl c
-the static call graph of the program is discovered by a heuristic
+.It Fl b
+Suppresses the printing of a description of each field in the profile.
+.It Fl c
+The static call graph of the program is discovered by a heuristic

 that examines the text space of the object file.
 Static-only parents or children are shown
 with call counts of 0.
 that examines the text space of the object file.
 Static-only parents or children are shown
 with call counts of 0.

-.Tc Fl e
-.Ws
-.Ar name
-.Cx
-suppresses the printing of the graph profile entry for routine
+.It Fl e Ar name 
+Suppresses the printing of the graph profile entry for routine

 .Ar name
 and all its descendants
 (unless they have other ancestors that aren't suppressed).
 .Ar name
 and all its descendants
 (unless they have other ancestors that aren't suppressed).


@@ -105,11 +100,8 @@ Only one
 may be given with each
 .Fl e
 option.
 may be given with each
 .Fl e
 option.

-.Tc Fl E
-.Ws
-.Ar name
-.Cx
-suppresses the printing of the graph profile entry for routine
+.It Fl E Ar name 
+Suppresses the printing of the graph profile entry for routine

 .Ar name
 (and its descendants) as
 .Fl e  ,
 .Ar name
 (and its descendants) as
 .Fl e  ,


@@ -122,11 +114,8 @@ above, and also excludes the time spent in
 .Fl E
 .Ar mcleanup
 is the default.)
 .Fl E
 .Ar mcleanup
 is the default.)

-.Tc Fl f
-.Ws
-.Ar name
-.Cx
-prints the graph profile entry of only the specified routine
+.It Fl f Ar name 
+Prints the graph profile entry of only the specified routine

 .Ar name
 and its descendants.
 More than one
 .Ar name
 and its descendants.
 More than one


@@ -137,11 +126,8 @@ Only one
 may be given with each
 .Fl f
 option.
 may be given with each
 .Fl f
 option.

-.Tc Fl F
-.Ws
-.Ar name
-.Cx
-prints the graph profile entry of only the routine
+.It Fl F Ar name 
+Prints the graph profile entry of only the routine

 .Ar name
 and its descendants (as
 .Fl f ,
 .Ar name
 and its descendants (as
 .Fl f ,


@@ -162,16 +148,11 @@ overrides
 the
 .Fl E
 option.
 the
 .Fl E
 option.

-.Tc Fl k
-.Ws
-.Ar fromname
-.Ws
-.Ar toname
-.Cx
-will delete any arcs from routine
+.It Fl k Ar fromname Ar toname 
+Will delete any arcs from routine

 .Ar fromname
 to routine
 .Ar fromname
 to routine

-.Ar toname  .
+.Ar toname .

 This can be used to break undesired cycles.
 More than one
 .Fl k
 This can be used to break undesired cycles.
 More than one
 .Fl k


@@ -179,53 +160,65 @@ option may be given.
 Only one pair of routine names may be given with each
 .Fl k
 option.
 Only one pair of routine names may be given with each
 .Fl k
 option.

-.Tp Fl s
-a profile file
+.It Fl s
+A profile file

 .Pa gmon.sum
 is produced that represents
 the sum of the profile information in all the specified profile files.
 This summary profile file may be given to later
 executions of gprof (probably also with a
 .Pa gmon.sum
 is produced that represents
 the sum of the profile information in all the specified profile files.
 This summary profile file may be given to later
 executions of gprof (probably also with a

-.Fl s  )
+.Fl s )

 to accumulate profile data across several runs of an
 .Pa a.out
 file.
 to accumulate profile data across several runs of an
 .Pa a.out
 file.

-.Tp Fl z
-displays routines that have zero usage (as shown by call counts
+.It Fl z
+Displays routines that have zero usage (as shown by call counts

 and accumulated time).
 This is useful with the
 .Fl c
 option for discovering which routines were never called.
 and accumulated time).
 This is useful with the
 .Fl c
 option for discovering which routines were never called.

-.Tp
+.El

 .Sh FILES
 .Sh FILES

-.Dw gmon.sum
-.Di L
-.Dp Pa a.out
-the namelist and text space.
-.Dp Pa gmon.out
-dynamic call graph and profile.
-.Dp Pa gmon.sum
-summarized dynamic call graph and profile.
-.Dp
+.Bl -tag -width gmon.sum -compact
+.It Pa a.out
+The namelist and text space.
+.It Pa gmon.out
+Dynamic call graph and profile.
+.It Pa gmon.sum
+Summarized dynamic call graph and profile.
+.El

 .Sh SEE ALSO
 .Xr monitor 3 ,
 .Xr profil 2 ,
 .Xr cc 1 ,
 .Xr prof 1
 .Sh SEE ALSO
 .Xr monitor 3 ,
 .Xr profil 2 ,
 .Xr cc 1 ,
 .Xr prof 1

-.br
-.Em An Execution Profiler for Modular Programs ,
-by
-S. Graham, P. Kessler, M. McKusick;
-Software  - Practice and Experience,
-Vol. 13, pp. 671-685, 1983.
-.br
-.Em gprof: A Call Graph Execution Profiler ,
-by S. Graham, P. Kessler, M. McKusick;
-Proceedings of the SIGPLAN '82 Symposium on Compiler Construction,
-SIGPLAN Notices, Vol. 17, No  6, pp. 120-126, June 1982.
+.Rs
+.%T "An Execution Profiler for Modular Programs"
+.%A S. Graham
+.%A P. Kessler
+.%A M. McKusick
+.%J "Software - Practice and Experience"
+.%V 13
+.%P pp. 671-685
+.%D 1983
+.Re
+.Rs
+.%T "gprof: A Call Graph Execution Profiler"
+.%A S. Graham
+.%A P. Kessler
+.%A M. McKusick
+.%J "Proceedings of the SIGPLAN '82 Symposium on Compiler Construction, SIGPLAN Notices"
+.%V 17
+.%N 6
+.%P pp. 120-126
+.%D June 1982
+.Re

 .Sh HISTORY
 .Sh HISTORY

-.Nm Gprof
-appeared in 4.2 BSD.
+The
+.Nm gprof
+profiler
+appeared in
+.Bx 4.2 .

 .Sh BUGS
 The granularity of the sampling is shown, but remains
 statistical at best.
 .Sh BUGS
 The granularity of the sampling is shown, but remains
 statistical at best.

diff --git a/usr/src/usr.bin/head/head.1 b/usr/src/usr.bin/head/head.1
index 852e11f..9b188e8 100644 (file)
--- a/usr/src/usr.bin/head/head.1
+++ b/usr/src/usr.bin/head/head.1
@@ -1,24 +1,20 @@
 .\" Copyright (c) 1980, 1990 The Regents of the University of California.
 .\" All rights reserved.
 .\"
 .\" Copyright (c) 1980, 1990 The Regents of the University of California.
 .\" All rights reserved.
 .\"

-.\" %sccs.include.redist.man%
+.\" %sccs.include.redist.roff%

 .\"
 .\"

-.\"     @(#)head.1     6.5 (Berkeley) %G%
+.\"    @(#)head.1      6.6 (Berkeley) %G%

 .\"
 .\"

-.Vx
-.Vx

 .Dd 
 .Dd 

-.Os

 .Dt HEAD 1
 .Dt HEAD 1

+.Os BSD 3

 .Sh NAME
 .Nm head
 .Nd give first few lines
 .Sh SYNOPSIS
 .Nm head
 .Sh NAME
 .Nm head
 .Nd give first few lines
 .Sh SYNOPSIS
 .Nm head

-.Oo
-.Op Fl Ar count
-.Oo
-.Ar
+.Op Fl Ns Ar count
+.Op Ar

 .Sh DESCRIPTION
 This filter gives the first
 .Ar count
 .Sh DESCRIPTION
 This filter gives the first
 .Ar count


@@ -30,5 +26,7 @@ is omitted it defaults to
 .Sh SEE ALSO
 .Xr tail 1
 .Sh HISTORY
 .Sh SEE ALSO
 .Xr tail 1
 .Sh HISTORY

+The

 .Nm head
 .Nm head

-appeared in 3 BSD.
+command appeared in
+.Bx 3.0 .

diff --git a/usr/src/usr.bin/passwd/passwd.1 b/usr/src/usr.bin/passwd/passwd.1
index 22c8e05..6014718 100644 (file)
--- a/usr/src/usr.bin/passwd/passwd.1
+++ b/usr/src/usr.bin/passwd/passwd.1
@@ -1,12 +1,10 @@
 .\" Copyright (c) 1990 The Regents of the University of California.
 .\" All rights reserved.
 .\"
 .\" Copyright (c) 1990 The Regents of the University of California.
 .\" All rights reserved.
 .\"

-.\" %sccs.include.redist.man%
+.\" %sccs.include.redist.roff%

 .\"
 .\"

-.\"     @(#)passwd.1   6.10 (Berkeley) %G%
+.\"    @(#)passwd.1    6.11 (Berkeley) %G%

 .\"
 .\"

-.Vx
-.Vx

 .Dd 
 .Dt PASSWD 1
 .Os BSD 4
 .Dd 
 .Dt PASSWD 1
 .Os BSD 4


@@ -27,7 +25,9 @@ The new password must be entered twice to avoid typing errors.
 .Pp
 The new password should be at least six characters long and not
 purely alphabetic.
 .Pp
 The new password should be at least six characters long and not
 purely alphabetic.

-Its total length must be less than _PASSWORD_LEN (currently 128 characters).
+Its total length must be less than
+.Dv _PASSWORD_LEN
+(currently 128 characters).

 Numbers, upper case letters and meta characters
 are encouraged.
 .Pp
 Numbers, upper case letters and meta characters
 are encouraged.
 .Pp


@@ -35,13 +35,14 @@ Once the password has been verified,
 .Nm passwd
 communicates the new password information to
 the Kerberos authenticating host.
 .Nm passwd
 communicates the new password information to
 the Kerberos authenticating host.

-.Tp Fl l
+.Bl -tag -width flag
+.It Fl l

 This option causes the password to be updated only in the local
 password file, and not with the Kerberos database.
 When changing only the local password,
 .Xr pwd_mkdb  8
 is used to update the password databases.
 This option causes the password to be updated only in the local
 password file, and not with the Kerberos database.
 When changing only the local password,
 .Xr pwd_mkdb  8
 is used to update the password databases.

-.Tp
+.El

 .Pp
 To change another user's Kerberos password, one must first
 run
 .Pp
 To change another user's Kerberos password, one must first
 run


@@ -51,15 +52,14 @@ followed by
 The super-user is not required to provide a user's current password
 if only the local password is modified.
 .Sh FILES
 The super-user is not required to provide a user's current password
 if only the local password is modified.
 .Sh FILES

-.Dw /etc/master.passwd
-.Di L
-.Dp Pa /etc/master.passwd
+.Bl -tag -width /etc/master.passwd -compact
+.It Pa /etc/master.passwd

 The user database
 The user database

-.Dp Pa /etc/passwd 
+.It Pa /etc/passwd 

 A Version 7 format password file
 A Version 7 format password file

-.Dp Pa /etc/passwd.XXXXXX
+.It Pa /etc/passwd.XXXXXX

 Temporary copy of the password file
 Temporary copy of the password file

-.Dp
+.El

 .Sh SEE ALSO
 .Xr chpass 1 ,
 .Xr kerberos 1 ,
 .Sh SEE ALSO
 .Xr chpass 1 ,
 .Xr kerberos 1 ,


@@ -69,10 +69,13 @@ Temporary copy of the password file
 .Xr kpasswdd 8 ,
 .Xr pwd_mkdb 8 ,
 .Xr vipw 8
 .Xr kpasswdd 8 ,
 .Xr pwd_mkdb 8 ,
 .Xr vipw 8

-.br
-Robert Morris and Ken Thompson,
-.Em UNIX password security
+.Rs
+.%A Robert Morris
+.%A Ken Thompson
+.%T "UNIX password security"
+.Re

 .Sh HISTORY
 A
 .Nm passwd
 .Sh HISTORY
 A
 .Nm passwd

-command appeared in Version 6 AT&T UNIX.
+command appeared in
+.At v6 .

diff --git a/usr/src/usr.bin/printf/printf.1 b/usr/src/usr.bin/printf/printf.1
index e6b08b1..b4bdbf4 100644 (file)
--- a/usr/src/usr.bin/printf/printf.1
+++ b/usr/src/usr.bin/printf/printf.1
@@ -4,21 +4,19 @@
 .\" This code is derived from software contributed to Berkeley by
 .\" the Institute of Electrical and Electronics Engineers, Inc.
 .\"
 .\" This code is derived from software contributed to Berkeley by
 .\" the Institute of Electrical and Electronics Engineers, Inc.
 .\"

-.\" %sccs.include.redist.man%
+.\" %sccs.include.redist.roff%

 .\"
 .\"

-.\"     @(#)printf.1   5.10 (Berkeley) %G%
+.\"    @(#)printf.1    5.11 (Berkeley) %G%

 .\"
 .\"

-.Vx

 .Dd 
 .Dt PRINTF 1
 .Dd 
 .Dt PRINTF 1

-.AT 1
+.Os

 .Sh NAME
 .Nm printf
 .Nd formatted output
 .Sh SYNOPSIS
 .Sh NAME
 .Nm printf
 .Nd formatted output
 .Sh SYNOPSIS

-.Pp

 .Nm printf format
 .Nm printf format

-.Op  arguments  ...
+.Op arguments  ...

 .Sh DESCRIPTION
 .Nm Printf
 formats and prints its arguments, after the first, under control
 .Sh DESCRIPTION
 .Nm Printf
 formats and prints its arguments, after the first, under control


@@ -38,15 +36,16 @@ after the first are treated as strings if the corresponding format is
 either
 .Cm c
 or
 either
 .Cm c
 or

-.Cm s  ;
+.Cm s ;

 otherwise it is evaluated as a C constant, with the following extensions:
 .Pp
 otherwise it is evaluated as a C constant, with the following extensions:
 .Pp

-.Df I
+.Bl -bullet -offset indent -compact
+.It

 A leading plus or minus sign is allowed.
 A leading plus or minus sign is allowed.

-.br
+.It

 If the leading character is a single or double quote, or not a digit,
 plus, or minus sign, the value is the ASCII code of the next character.
 If the leading character is a single or double quote, or not a digit,
 plus, or minus sign, the value is the ASCII code of the next character.

-.De
+.El

 .Pp
 The format string is reused as often as necessary to satisfy the
 .Ar arguments  .
 .Pp
 The format string is reused as often as necessary to satisfy the
 .Ar arguments  .


@@ -54,45 +53,47 @@ Any extra format specifications are evaluated with zero or the null
 string.
 .Pp
 Character escape sequences are in backslash notation as defined in the
 string.
 .Pp
 Character escape sequences are in backslash notation as defined in the

-draft proposed ANSI C Standard X3J11.  The characters and their meanings
+draft proposed
+.Tn ANSI C
+Standard
+.Tn X3J11 .
+The characters and their meanings

 are as follows:
 are as follows:

-.Tw Ds
-.Tp Cm \ea
+.Bl -tag -width Ds -offset indent
+.It Cm \ea

 Write a <bell> character.
 Write a <bell> character.

-.Tp Cm \eb
+.It Cm \eb

 Write a <backspace> character.
 Write a <backspace> character.

-.Tp Cm \ef
+.It Cm \ef

 Write a <form-feed> character.
 Write a <form-feed> character.

-.Tp Cm \en
+.It Cm \en

 Write a <new-line> character.
 Write a <new-line> character.

-.Tp Cm \er
+.It Cm \er

 Write a <carriage return> character.
 Write a <carriage return> character.

-.Tp Cm \et
+.It Cm \et

 Write a <tab> character.
 Write a <tab> character.

-.Tp Cm \ev
+.It Cm \ev

 Write a <vertical tab> character.
 Write a <vertical tab> character.

-.Tp Cm \e\'
+.It Cm \e\'

 Write a <single quote> character.
 Write a <single quote> character.

-.Tp Cm \e\e
+.It Cm \e\e

 Write a backslash character.
 Write a backslash character.

-.Tp Cx Cm \e
-.Ar num
-.Cx
-Write an 8-bit character whose ASCII value is the 1-, 2-, or 3-digit
+.It Cm \e Ns Ar num 
+Write an 8-bit character whose
+.Tn ASCII
+value is the 1-, 2-, or 3-digit

 octal number
 octal number

-.Ar num  .
-.Tp
+.Ar num .
+.El

 .Pp
 Each format specification is introduced by the percent character
 (``%'').
 .Pp
 Each format specification is introduced by the percent character
 (``%'').

-The remainder of the format specification includes, in the
-following order:
-.Pp
-Zero or more of the following flags:
-.Pp
-.Ds I
-.Tw Ds
-.Tp Cm #
+The remainder of the format specification includes,
+in the following order:
+.Bl -tag -width Ds
+.It "Zero or more of the following flags:"
+.Bl -tag -width Ds
+.It Cm #

 A `#' character
 specifying that the value should be printed in an ``alternate form''.
 For
 A `#' character
 specifying that the value should be printed in an ``alternate form''.
 For


@@ -124,31 +125,28 @@ and
 .Cm G
 formats, trailing zeros are not removed from the result as they
 would otherwise be;
 .Cm G
 formats, trailing zeros are not removed from the result as they
 would otherwise be;

-.Tp Cm \&\-
+.It Cm \&\-

 A minus sign `\-' which specifies
 .Em left adjustment
 of the output in the indicated field;
 A minus sign `\-' which specifies
 .Em left adjustment
 of the output in the indicated field;

-.Tp Cm \&+
+.It Cm \&+

 A `+' character specifying that there should always be
 a sign placed before the number when using signed formats.
 A `+' character specifying that there should always be
 a sign placed before the number when using signed formats.

-.Tp Sq \&\ \&
+.It Sq \&\ \&

 A space specifying that a blank should be left before a positive number
 for a signed format.  A `+' overrides a space if both are used;
 A space specifying that a blank should be left before a positive number
 for a signed format.  A `+' overrides a space if both are used;

-.Tp Cm \&0
+.It Cm \&0

 A zero `0' character indicating that zero-padding should be used
 rather than blank-padding.  A `\-' overrides a `0' if both are used;
 A zero `0' character indicating that zero-padding should be used
 rather than blank-padding.  A `\-' overrides a `0' if both are used;

-.Tp
-.De
-.Pp 
-.Tw Ds
-.Tp Field Width:
+.El
+.It "Field Width:"

 An optional digit string specifying a
 .Em field width ;
 if the output string has fewer characters than the field width it will
 be blank-padded on the left (or right, if the left-adjustment indicator
 has been given) to make up the field width (note that a leading zero
 is a flag, but an embedded zero is part of a field width);
 An optional digit string specifying a
 .Em field width ;
 if the output string has fewer characters than the field width it will
 be blank-padded on the left (or right, if the left-adjustment indicator
 has been given) to make up the field width (note that a leading zero
 is a flag, but an embedded zero is part of a field width);

-.Tp Precision:
+.It Precision:

 An optional period,
 .Sq Cm \&.\& ,
 followed by an optional digit string giving a
 An optional period,
 .Sq Cm \&.\& ,
 followed by an optional digit string giving a


@@ -161,10 +159,10 @@ and
 formats, or the maximum number of characters to be printed
 from a string; if the digit string is missing, the precision is treated
 as zero;
 formats, or the maximum number of characters to be printed
 from a string; if the digit string is missing, the precision is treated
 as zero;

-.Tp Format:
+.It Format:

 A character which indicates the type of format to use (one of
 .Cm diouxXfwEgGcs ) .
 A character which indicates the type of format to use (one of
 .Cm diouxXfwEgGcs ) .

-.Tp
+.El

 .Pp
 A field width or precision may be
 .Sq Cm \&*
 .Pp
 A field width or precision may be
 .Sq Cm \&*


@@ -174,13 +172,13 @@ In this case an
 supplies the field width or precision.
 .Pp
 The format characters and their meanings are:
 supplies the field width or precision.
 .Pp
 The format characters and their meanings are:

-.Tw Fl
-.Tp Cm diouXx
+.Bl -tag -width Fl
+.It Cm diouXx

 The
 .Ar argument
 is printed as a signed decimal (d or i), unsigned decimal, unsigned octal,
 or unsigned hexadecimal (X or x), respectively.
 The
 .Ar argument
 is printed as a signed decimal (d or i), unsigned decimal, unsigned octal,
 or unsigned hexadecimal (X or x), respectively.

-.Tp Cm f
+.It Cm f

 The
 .Ar argument
 is printed in the style `[\-]ddd.ddd' where the number of d's
 The
 .Ar argument
 is printed in the style `[\-]ddd.ddd' where the number of d's


@@ -188,20 +186,18 @@ after the decimal point is equal to the precision specification for
 the argument.
 If the precision is missing, 6 digits are given; if the precision
 is explicitly 0, no digits and no decimal point are printed.
 the argument.
 If the precision is missing, 6 digits are given; if the precision
 is explicitly 0, no digits and no decimal point are printed.

-.Tp Cm eE
+.It Cm eE

 The
 .Ar argument
 is printed in the style
 The
 .Ar argument
 is printed in the style

-.Cx `[-]d.ddd

 .Cm e
 .Cm e

-.Cx \(+-dd\'
-.Cx
+.`[-]d.ddd Ns \(+-dd\' 

 where there
 is one digit before the decimal point and the number after is equal to
 the precision specification for the argument; when the precision is
 missing, 6 digits are produced.
 An upper-case E is used for an `E' format.
 where there
 is one digit before the decimal point and the number after is equal to
 the precision specification for the argument; when the precision is
 missing, 6 digits are produced.
 An upper-case E is used for an `E' format.

-.Tp Cm gG
+.It Cm gG

 The
 .Ar argument
 is printed in style
 The
 .Ar argument
 is printed in style


@@ -210,35 +206,41 @@ or in style
 .Cm e
 .Pq Cm E
 whichever gives full precision in minimum space.
 .Cm e
 .Pq Cm E
 whichever gives full precision in minimum space.

-.Tp Cm c
+.It Cm c

 The first character of
 .Ar argument
 is printed.
 The first character of
 .Ar argument
 is printed.

-.Tp Cm s
+.It Cm s

 Characters from the string
 .Ar argument
 are printed until the end is reached or until the number of characters
 indicated by the precision specification is reached; however if the
 precision is 0 or missing, all characters in the string are printed.
 Characters from the string
 .Ar argument
 are printed until the end is reached or until the number of characters
 indicated by the precision specification is reached; however if the
 precision is 0 or missing, all characters in the string are printed.

-.Tp Cm \&%
+.It Cm \&%

 Print a `%'; no argument is used.
 Print a `%'; no argument is used.

-.Tp
+.El

 .Pp
 In no case does a non-existent or small field width cause truncation of
 a field; padding takes place only if the specified field width exceeds
 the actual width.
 .Pp
 In no case does a non-existent or small field width cause truncation of
 a field; padding takes place only if the specified field width exceeds
 the actual width.

-.Sh RETURN VALUE
+.Sh RETURN VALUES

 .Nm Printf
 exits 0 on success, 1 on failure.
 .Sh SEE ALSO
 .Xr printf 3
 .Sh HISTORY
 .Nm Printf
 exits 0 on success, 1 on failure.
 .Sh SEE ALSO
 .Xr printf 3
 .Sh HISTORY

-.Nm Printf
-as a command, appears in 4.3+Reno BSD.  It is modeled
+The
+.Nm printf
+command appeared in
+.Bx 4.3 Reno .
+It is modeled

 after the standard library function,
 .Xr printf 3 .
 .Sh BUGS
 after the standard library function,
 .Xr printf 3 .
 .Sh BUGS

-Since the number is translated from ASCII to floating-point, and
+Since the floating point numbers are translated from
+.Tn ASCII
+to floating-point and

 then back again, floating-point precision may be lost.
 .Pp
 then back again, floating-point precision may be lost.
 .Pp

-ANSI hexadecimal character constants were deliberately not provided.
+.Tn ANSI
+hexadecimal character constants were deliberately not provided.

diff --git a/usr/src/usr.bin/sccs/sccs.1 b/usr/src/usr.bin/sccs/sccs.1
index eb426dd..5bb800e 100644 (file)
--- a/usr/src/usr.bin/sccs/sccs.1
+++ b/usr/src/usr.bin/sccs/sccs.1
@@ -1,14 +1,11 @@
 .\" Copyright (c) 1983, 1990 The Regents of the University of California.
 .\" All rights reserved.
 .\"
 .\" Copyright (c) 1983, 1990 The Regents of the University of California.
 .\" All rights reserved.
 .\"

-.\" %sccs.include.redist.man%
+.\" %sccs.include.redist.roff%

 .\"
 .\"

-.\"     @(#)sccs.1     2.9 (Berkeley) %G%
+.\"    @(#)sccs.1      2.10 (Berkeley) %G%

 .\"
 .\"

-.Vx
-.Vx

 .Dd 
 .Dd 

-.Os

 .Dt SCCS 1
 .Os BSD 4.2
 .Sh NAME
 .Dt SCCS 1
 .Os BSD 4.2
 .Sh NAME


@@ -22,8 +19,8 @@ subsystem
 .Op Fl d Ar path
 .Op Fl p Ar path
 .Ar command
 .Op Fl d Ar path
 .Op Fl p Ar path
 .Ar command

-.Op  flags
-.Ar
+.Op flags
+.Op Ar

 .Sh DESCRIPTION
 .Nm Sccs
 is a front end to the
 .Sh DESCRIPTION
 .Nm Sccs
 is a front end to the


@@ -69,12 +66,12 @@ several
 .Dq pseudo-commands
 can be issued.
 These are:
 .Dq pseudo-commands
 can be issued.
 These are:

-.Tw Fl
-.Tp Ic edit
+.Bl -tag -width deledit
+.It Cm edit

 Equivalent
 to 
 .Dq Li get \-e .
 Equivalent
 to 
 .Dq Li get \-e .

-.Tp Ic delget
+.It Cm delget

 Perform a delta on the named files and
 then get new versions.
 The new versions will have id keywords expanded, and
 Perform a delta on the named files and
 then get new versions.
 The new versions will have id keywords expanded, and


@@ -97,13 +94,10 @@ and the
 .Fl l ,
 .Fl s ,
 .\" anybody who has a bad xterm which is almost anyone
 .Fl l ,
 .Fl s ,
 .\" anybody who has a bad xterm which is almost anyone

-.if n \{\
-.      br
-.\}

 and
 .Fl x
 flags will be passed to get.
 and
 .Fl x
 flags will be passed to get.

-.Tp Ic deledit
+.It Cm deledit

 Equivalent
 to
 .Nm delget
 Equivalent
 to
 .Nm delget


@@ -126,7 +120,7 @@ and
 are
 passed to
 .Nm edit .
 are
 passed to
 .Nm edit .

-.Tp Ic create
+.It Cm create

 Creates
 an
 .Li SCCS
 Creates
 an
 .Li SCCS


@@ -142,7 +136,7 @@ These should be removed when you are convinced that the
 .Li SCCS
 files
 have been created successfully.
 .Li SCCS
 files
 have been created successfully.

-.Tp Ic fix
+.It Cm fix

 Must
 be followed by a
 .Fl r
 Must
 be followed by a
 .Fl r


@@ -152,7 +146,7 @@ leaves you with a copy of the delta
 with the changes that were in it.  It
 is useful for fixing small compiler bugs, etc.
 Since it doesn't leave audit trails, it should be used carefully.
 with the changes that were in it.  It
 is useful for fixing small compiler bugs, etc.
 Since it doesn't leave audit trails, it should be used carefully.

-.Tp Ic clean
+.It Cm clean

 This routine removes everything from the current directory
 that can be recreated from SCCS files.
 It will not remove any files being edited.
 This routine removes everything from the current directory
 that can be recreated from SCCS files.
 It will not remove any files being edited.


@@ -162,7 +156,7 @@ flag is given, branches are ignored in the determination of
 whether they are being edited; this
 is dangerous if you are keeping the branches in the
 same directory.
 whether they are being edited; this
 is dangerous if you are keeping the branches in the
 same directory.

-.Tp Ic unedit
+.It Cm unedit

 This
 is the opposite of an
 .Nm edit
 This
 is the opposite of an
 .Nm edit


@@ -171,21 +165,19 @@ a
 .Dq Li get \-e .
 It should be used with extreme caution, since
 any changes you made since the get will be irretrievably lost.
 .Dq Li get \-e .
 It should be used with extreme caution, since
 any changes you made since the get will be irretrievably lost.

-.Tp Ic info
+.It Cm info

 Gives a listing of all files being edited.
 If the
 .Fl b
 flag
 is given, branches (i.e.,
 Gives a listing of all files being edited.
 If the
 .Fl b
 flag
 is given, branches (i.e.,

-.Cx Li SID
-.Cx \&\'s
-.Cx
+.Li SID Ns \&\'s 

 with two or fewer components)
 are ignored.  If the
 .Fl u
 flag is given (with an optional argument) then
 only files being edited by you (or the named user) are listed.
 with two or fewer components)
 are ignored.  If the
 .Fl u
 flag is given (with an optional argument) then
 only files being edited by you (or the named user) are listed.

-.Tp Ic check
+.It Cm check

 Like
 .Nm info
 except that nothing is printed if nothing is being edited, and
 Like
 .Nm info
 except that nothing is printed if nothing is being edited, and


@@ -195,7 +187,7 @@ The intent is to have this included in an
 entry in a makefile to insure that everything is included into the
 .Li SCCS
 file before a version is installed.
 entry in a makefile to insure that everything is included into the
 .Li SCCS
 file before a version is installed.

-.Tp Ic tell
+.It Cm tell

 Gives a newline-separated list of the files being edited
 on the standard output.  Takes the
 .Fl b
 Gives a newline-separated list of the files being edited
 on the standard output.  Takes the
 .Fl b


@@ -205,7 +197,7 @@ flags like
 .Nm info
 and
 .Nm check .
 .Nm info
 and
 .Nm check .

-.Tp Ic diffs
+.It Cm diffs

 Gives a
 .Nm diff
 listing between the current version of the
 Gives a
 .Nm diff
 listing between the current version of the


@@ -243,11 +235,11 @@ flag is passed to
 .Nm diff
 as
 .Fl c .
 .Nm diff
 as
 .Fl c .

-.Tp Ic print
+.It Cm print

 This command prints out verbose information
 about the named files.
 .Pp
 This command prints out verbose information
 about the named files.
 .Pp

-.Tp Fl r
+.It Fl r

 Runs
 .Nm sccs
 as the real user rather than as whatever effective user
 Runs
 .Nm sccs
 as the real user rather than as whatever effective user


@@ -255,7 +247,7 @@ as the real user rather than as whatever effective user
 is
 .Dq Li set user id
 to.
 is
 .Dq Li set user id
 to.

-.Tp Fl d
+.It Fl d

 Specifies a root directory for the
 .Li SCCS
 files.
 Specifies a root directory for the
 .Li SCCS
 files.


@@ -266,8 +258,8 @@ is set,
 it will be used to determine the 
 .Fl d
 flag.
 it will be used to determine the 
 .Fl d
 flag.

-.Tp Fl p
-flag defines the pathname of the directory in which the
+.It Fl p
+Defines the pathname of the directory in which the

 .Li SCCS
 files will be found;
 .Dq Li SCCS
 .Li SCCS
 files will be found;
 .Dq Li SCCS


@@ -339,8 +331,8 @@ file if it does not already exist:
 .Dl $(SRCS):
 .Dl \&\tsccs get $(REL) $@
 .Sh ENVIRONMENT
 .Dl $(SRCS):
 .Dl \&\tsccs get $(REL) $@
 .Sh ENVIRONMENT

-.Tw Ar
-.Tp Ev PROJECT
+.Bl -tag -width Ar
+.It Ev PROJECT

 The PROJECT environment variable is checked by the
 .Fl d
 flag.  If
 The PROJECT environment variable is checked by the
 .Fl d
 flag.  If


@@ -351,7 +343,7 @@ examined for a subdirectory
 or
 .Dq Li source .
 If such a directory is found, it is used.
 or
 .Dq Li source .
 If such a directory is found, it is used.

-.Tp
+.El

 .Sh SEE ALSO
 .Xr what 1
 .Xr admin SCCS ,
 .Sh SEE ALSO
 .Xr what 1
 .Xr admin SCCS ,


@@ -363,12 +355,16 @@ If such a directory is found, it is used.
 .Xr prt SCCS ,
 .Xr rmdel SCCS ,
 .Xr sccsdiff SCCS ,
 .Xr prt SCCS ,
 .Xr rmdel SCCS ,
 .Xr sccsdiff SCCS ,

-.br
-Eric Allman,
-.Em An Introduction to the Source Code Control System
+.Rs
+.%A Eric Allman
+.%T "An Introduction to the Source Code Control System"
+.Re

 .Sh HISTORY
 .Sh HISTORY

-.Nm Sccs
-appeared in 4.3 BSD.
+The
+.Nm sccs
+command
+appeared in
+.Bx 4.3 .

 .Sh BUGS
 It should be able to take directory arguments on pseudo-commands
 like the
 .Sh BUGS
 It should be able to take directory arguments on pseudo-commands
 like the