converted man page

SCCS-vsn: share/man/man7/ascii.7 6.3
SCCS-vsn: usr.bin/dc/dc.1 6.2
SCCS-vsn: bin/dd/dd.1 6.2
SCCS-vsn: usr.bin/deroff/deroff.1 6.2
SCCS-vsn: bin/df/df.1 6.6
SCCS-vsn: usr.bin/diction/diction/diction.1 4.4
SCCS-vsn: usr.bin/diff/diff/diff.1 6.5
SCCS-vsn: usr.bin/diff/diff3/diff3.1 6.3
SCCS-vsn: usr.bin/du/du.1 6.5
SCCS-vsn: bin/echo/echo.1 6.3
SCCS-vsn: share/man/man7/environ.7 6.5
SCCS-vsn: old/eqn/eqn/eqn.1 6.3
SCCS-vsn: share/man/man7/eqnchar.7 6.2
SCCS-vsn: usr.bin/error/error.1 6.4
SCCS-vsn: usr.bin/ex/ex.1 6.5
SCCS-vsn: usr.bin/expand/expand.1 6.4

diff --git a/usr/src/bin/dd/dd.1 b/usr/src/bin/dd/dd.1
index adbca11..aa62d5e 100644 (file)
--- a/usr/src/bin/dd/dd.1
+++ b/usr/src/bin/dd/dd.1
@@ -1,227 +1,187 @@
-.\" Copyright (c) 1980 Regents of the University of California.
-.\" All rights reserved.  The Berkeley software License Agreement
-.\" specifies the terms and conditions for redistribution.
+.\" Copyright (c) 1990 The Regents of the University of California.
+.\" All rights reserved.

 .\"
 .\"

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

 .\"
 .\"

-.TH DD 1 ""
-.UC 4
-.SH NAME
-dd \- convert and copy a file
-.SH SYNOPSIS
-.B dd
-[option=value] ...
-.SH DESCRIPTION
-.I Dd
-copies the specified input file
-to the specified output with
-possible conversions.
-The standard input and output are used by default.
-The input and output block size may be
-specified to take advantage of raw physical I/O.
-.PP
-.br
-.ns
-.TP 15
-.I option
-.I values
-.br
-.ns
-.TP 
-if=
-input file name; standard input is default
-.br
-.ns
-.TP 
-of=
-output file name; standard output is default
-.br
-.ns
-.TP 
-.RI ibs= n
-input block size
-.I n
-bytes (default 512)
-.br
-.ns
-.TP 
-.RI obs= n
-output block size (default 512)
-.br
-.ns
-.TP 
-.RI bs= n
-set both input and output block size,
+.\"     @(#)dd.1       6.2 (Berkeley) %G%
+.\"
+.Dd 
+.Dt DD 1
+.Os BSD 4.4
+.Sh NAME
+.Nm dd
+.Nd convert and copy a file
+.Sh SYNOPSIS
+.Nm dd
+.Op options \&...
+.Sh DESCRIPTION
+The dd utility copies the specified input file to the specified
+output with possible conversions.
+.Pp
+The following options are available:
+.Tw Fl
+.Tc Ic if=
+.Ar file
+.Cx
+Input pathname; standard input is
+default.
+.Tc Ic of=
+.Ar file
+.Cx
+Output pathname; standard output is
+default.
+.Tc Ic ibs=
+.Ar n
+.Cx
+Input block size.
+.Va n
+bytes (default is
+512 bytes).
+.Tc Ic obs=
+.Ar n
+.Cx
+Output block size (default is 512 bytes).
+.Tc Ic bs=
+.Ar n
+.Cx
+Set both input and output block size,

 superseding
 superseding

-.I ibs
+.Ic ibs
+and
+.Ic obs .
+.Tc Ic cbs=
+.Ar n
+.Cx
+Conversion buffer size
+.Tc Ic skip=
+.Ar n
+.Cx
+Skip
+.Va n
+input blocks (each block is the
+size of
+.Ic ibs )
+before starting copy.
+.Tc Ic seek=
+.Ar n
+.Cx
+Seek n blocks (each block is the size of
+obs) from beginning of output file before
+copying.
+.Tc Ic count=
+.Ar n
+.Cx
+Copy only
+.Va n
+input blocks.
+.Tc Ic conv=
+.Ar value
+.Oo
+.Op \&, Ar value \&...
+.Cx
+.Oo
+Where values are comma-separated symbols
+from the following list.
+.Tw Fl
+.Tp Ic block
+Convert variable length records to fixed
+length.
+Read characters into the
+.Ic cbs
+buffer, delete a trailing <newline>, and
+pad to the length of the
+.Ic cbs
+buffer with
+<space>s.
+.Ic block
+and
+.Ic unblock
+are mutually
+exclusive.
+.Tp Ic unblock
+Convert fixed length records to variable
+length.
+Read a number of characters
+equal to the size of the
+.Ic cbs
+buffer,
+delete all trailing <blank>s, and append
+a <newline>.
+.Tp Ic lcase
+Map characters in the alpha character
+classification from class upper to the
+corresponding value in class lower.
+.Ic lcase

 and
 and

-.I obs;
-also, if no conversion is specified,
-it is particularly efficient since no copy need be done
-.br
-.ns
-.TP 
-.RI cbs= n
-conversion buffer size
-.br
-.ns
-.TP 
-.RI skip= n
-skip
-.IR n ""
-input records before starting copy
-.br
-.ns
-.TP
-.RI files= n
-copy
-.I n
-input files before terminating (makes sense only
-where input is a magtape or similar device).
-.br
-.ns
-.TP 
-.RI seek= n
-seek
-.I n
-records from beginning of output file before copying
-.br
-.ns
-.TP 
-count=\fIn\fR
-copy only
-.IR n ""
-input records
-.br
-.ns
-.TP 
-conv=ascii
-.ds h \h'\w'conv='u'
-convert EBCDIC to ASCII
-.br
-.ns
-.IP \*hebcdic
-convert ASCII to EBCDIC
-.br
-.ns
-.IP \*hibm
-slightly different map of ASCII to EBCDIC
-.br
-.ns
-.IP \*hblock
-convert variable length records to fixed length
-.br
-.ns
-.IP \*hunblock
-convert fixed length records to variable length
-.br
-.ns
-.IP \*hlcase
-map alphabetics to lower case
-.br
-.ns
-.IP \*hucase
-map alphabetics to upper case
-.br
-.ns
-.IP \*hswab
-swap every pair of bytes
-.br
-.ns
-.IP \*hnoerror
-do not stop processing on an error
-.br
-.ns
-.IP \*hsync
-pad every input record to
-.I  ibs
-.br
-.ns
-.IP "\*h... , ..."
-several comma-separated conversions
-.PP
-.fi
-Where sizes are specified,
-a number of bytes is expected.
-A number may end with
-.B "k, b"
+.Ic ucase
+are mutually exclusive.
+.Tp Ic ucase
+Map characters in the alpha character
+classification from class lower to the
+corresponding value in class upper.
+.Tp Ic swab
+Swap every pair of bytes
+.Tp Ic noerror
+Do not stop processing on an error.
+.Tp Ic sync
+Pad every input block to the size of
+.Ic ibs
+buffer, appending <space> characters.
+.Tp
+.Tp
+.Pp
+Where sizes are specified, a decimal number of bytes is
+expected.
+A size can end with
+.Cm k

 or
 or

-.B w
-to specify multiplication by
-1024, 512, or 2 respectively;
-a pair of numbers may be separated by
-.B x
+.Cm b
+to specify multiplication
+by 1024 or 512, respectively.
+A pair of sizes can be
+separated by
+.Cm x

 to indicate a product.
 to indicate a product.

-.PP
-.I Cbs
-is used only if
-.I ascii,
-.I unblock,
-.I ebcdic,
-.I ibm,
-or
-.I block
-conversion is specified.
-In the first two cases,
-.I cbs
-characters are placed into the conversion buffer, any specified
-character mapping is done,
-trailing blanks trimmed and new-line added
-before sending the line to the output.
-In the latter three cases, characters are read into the
-conversion buffer, and blanks added
-to make up an
-output record of size
-.IR cbs .
-.PP
-After completion,
-.I dd
-reports the number of whole and partial input and output
-blocks.
-.PP
-For example, to read an EBCDIC tape blocked ten 80-byte
-EBCDIC card images per record into the ASCII file
-.I x:
-.IP
-.nf
-dd if=/dev/rmt0 of=x ibs=800 cbs=80 conv=ascii,lcase
-.fi
-.PP
-Note the use of raw magtape.
-.I Dd
-is especially suited to I/O on the raw
-physical devices because it allows reading
-and writing in arbitrary record sizes.
-.SH "SEE ALSO"
-cp(1), tr(1)
-.SH DIAGNOSTICS
-f+p records in(out): numbers of full and partial records read(written)
-.SH BUGS
-The ASCII/EBCDIC conversion tables are
-taken
-from the 256 character standard in
-the CACM Nov, 1968.
-The `ibm' conversion, while less blessed as a standard,
-corresponds better to certain IBM print train conventions.
-There is no universal solution.
-.br
-One must specify ``conv=noerror,sync'' when copying
-raw disks with bad sectors to insure 
-.I dd
-stays synchronized.
-.PP
-Certain combinations of arguments to 
-.I conv=
-are permitted.
-However, the
-.I block
-or
-.I unblock
-option cannot be combined with
-.IR ascii ,
-.IR ebcdic ""
-or
-.IR ibm .
-Invalid combinations
-.I "silently ignore"
-all but the last mutually-exclusive keyword.
+.Pp
+If the option
+.Ic if=
+is not specified, the standard input is used.
+.Pp
+The input files can be any file type and
+on completion, dd writes the number of input and output
+blocks, full and partial counts, to the standard error.
+.Pp
+A partial block may be caused by a read or write operation
+transferring less than
+.Ic ibs
+bytes.
+Only bytes read
+have conversions, as specified by the options, applied to
+them.
+.Pp
+For
+.Li SIGINT ,
+the dd utility writes status information to
+standard error before exiting.
+It takes the default action
+for all other signals.
+.Pp
+The
+.Nm dd
+utility exits 0 on success, and >0 if an error occurs.
+.Pp
+If an error is detected, and the noerror opption has not
+been supplied, the cause is reported and the dd utility
+aborts the copy of the file.
+.\" .Pp
+.\" The following environment variables affect the execution of
+.\" dd:
+.\" .Tp
+.\" LC_TYPE
+.\" The locale for character classification.
+.Sh SEE ALSO
+.Xr tr 1
+.Sh STANDARDS
+The
+.Nm dd
+function is expected to be POSIX 1003.2 compatible.

diff --git a/usr/src/bin/df/df.1 b/usr/src/bin/df/df.1
index 93727be..78dc7dc 100644 (file)
--- a/usr/src/bin/df/df.1
+++ b/usr/src/bin/df/df.1
@@ -1,56 +1,64 @@
-.\" Copyright (c) 1989 The Regents of the University of California.
+.\" Copyright (c) 1989, 1990 The Regents of the University of California.

 .\" All rights reserved.
 .\"
 .\" %sccs.include.redist.man%
 .\"
 .\" All rights reserved.
 .\"
 .\" %sccs.include.redist.man%
 .\"

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

 .\"
 .\"

-.TH DF 1 ""
-.UC 4
-.SH NAME
-df \- disk free
-.SH SYNOPSIS
-.B df
-[
-.B \-ikn
-] [ file | filesystem ... ]
-.SH DESCRIPTION
-.I Df
-displays statistics on the amount of free disk space on the
+.Dd 
+.Dt DF 1
+.Os BSD 4
+.Sh NAME
+.Nm df
+.Nd display free disk space
+.Sh SYNOPSIS
+.Nm df
+.Op Fl ikn
+.Op Ar file Li \&| Ar filesystem \&...
+.Sh DESCRIPTION
+.Nm Df
+displays statistics about the amount of free disk space on the

 filesystem
 filesystem

-.I filesystem
+.Ar filesystem

 or on the filesystem of which
 or on the filesystem of which

-.I file
+.Ar file

 is a part.
 is a part.

-If neither a file or a filesystem is specified,
-statistics for all mounted filesystems are displayed.
+If neither a file or a filesystem argument is given,
+statistics for every filesystem mounted is displayed.

 The following options are available:
 The following options are available:

-.TP
--i
+.Tp Fl i

 Include statistics on the number of free inodes.
 Include statistics on the number of free inodes.

-.TP
--k
+.Tp Fl k

 By default, all reported numbers are in 512-byte blocks.
 This causes the numbers to be reported in kilobytes.
 By default, all reported numbers are in 512-byte blocks.
 This causes the numbers to be reported in kilobytes.

-.TP
--n
+.Tp Fl n

 Print out the previously obtained statistics from the filesystems.
 This option should be used
 if it is possible that one or more filesystems are
 in a state such that they will not be able
 to provide statistics without a long delay.
 When this option is specified,
 Print out the previously obtained statistics from the filesystems.
 This option should be used
 if it is possible that one or more filesystems are
 in a state such that they will not be able
 to provide statistics without a long delay.
 When this option is specified,

-.I df
+.Nm df

 will not request new statistics from the filesystems,
 but will respond with the possibly stale statistics
 that were previously obtained.
 will not request new statistics from the filesystems,
 but will respond with the possibly stale statistics
 that were previously obtained.

-.SH BUGS
+.Sh BUGS

 The
 The

-.I -n
+.Fl n

 flag is ignored if a file or filesystem is specified.
 flag is ignored if a file or filesystem is specified.

-.SH "SEE ALSO"
-quota(1),
-statfs(2), fstatfs(2), getfsstat(2),
-getmntinfo(3),
-fstab(5),
-mount(8), quot(8)
+.Sh SEE ALSO
+.Xr quota 1 ,
+.Xr statfs 2 ,
+.Xr fstatfs 2 ,
+.Xr getfsstat 2 ,
+.Xr getmntinfo 3 ,
+.Xr fstab 5 ,
+.Xr mount 8 ,
+.Xr quot 8
+.Sh HISTORY
+A
+.Nm df
+command appeared in Version 6 AT&T Unix as
+df(8) and in Version 7 AT&T Unix as df(1m).
+.\" Just for posterity and perspective, the date on the Version 6
+.\" release manual page was 1/20/73.

diff --git a/usr/src/bin/echo/echo.1 b/usr/src/bin/echo/echo.1
index 0105561..6d3776e 100644 (file)
--- a/usr/src/bin/echo/echo.1
+++ b/usr/src/bin/echo/echo.1
@@ -1,23 +1,39 @@
-.\"    @(#)echo.1      6.2 (Berkeley) %G%
+.\" Copyright (c) 1990 The Regents of the University of California.
+.\" All rights reserved.

 .\"
 .\"

-.TH ECHO 1 ""
-.AT 3
-.SH NAME
-echo \- echo arguments
-.SH SYNOPSIS
-.B echo
-[
-.B \-n
-]
-[ arg ] ...
-.SH DESCRIPTION
-.I Echo
-writes its arguments separated by blanks and terminated by
-a newline on the standard output.  If the flag
-.B \-n
-is used, no newline is added to the output.
-.PP
-.I Echo
-is useful for producing diagnostics in shell programs and for writing
-constant data on pipes.  If using the Bourne Shell, to send diagnostics
-to the standard error file, do `echo ... 1>&2'.
+.\" %sccs.include.redist.man%
+.\"
+.\"     @(#)echo.1     6.3 (Berkeley) %G%
+.\"
+.Dd 
+.Dt ECHO 1
+.Os 4.4
+.Sh NAME
+.Nm echo
+.Nd write arguments to the standard output
+.Sh SYNOPSIS
+.Nm echo
+.Op Fl n
+.Op string\& ...
+.Sh DESCRIPTION
+The echo utility writes its arguments to standard output,
+followed by a <newline> character.
+If there are no arguments,
+only the <newline> character is written.
+.Pp
+The following option is available:
+.Tw Fl
+.Tp Fl n
+The output is not terminated with a newline.
+.Tp
+.Pp
+The argument
+.Ar string
+defines a string to be written to standard output.
+.Pp
+.Nm Echo
+utility exits 0 on success, and >0 if an error occurs.
+.Sh STANDARDS
+The
+.Nm echo
+function is expected to be POSIX 1003.2 compatible.

diff --git a/usr/src/old/eqn/eqn/eqn.1 b/usr/src/old/eqn/eqn/eqn.1
index 90f3e7e..69c8a9c 100644 (file)
--- a/usr/src/old/eqn/eqn/eqn.1
+++ b/usr/src/old/eqn/eqn/eqn.1
@@ -1,43 +1,47 @@
-.\"    @(#)eqn.1       6.2 (Berkeley) %G%
+.\" Copyright (c) 1990 The Regents of the University of California.
+.\" All rights reserved.

 .\"
 .\"

-.TH EQN 1 ""
-.AT 3
+.\" %sccs.include.redist.man%
+.\"
+.\"     @(#)eqn.1      6.3 (Berkeley) %G%
+.\"
+.Dd 
+.Dt EQN 1
+.Os ATT 7th

 .EQ
 delim $$
 .EN
 .EQ
 delim $$
 .EN

-.SH NAME
-eqn, neqn, checkeq \- typeset mathematics
-.SH SYNOPSIS
-.B eqn
-[
-.BR \-d xy
-] [
-.BR \-p n
-] [
-.BR \-s n
-] [
-.BR \-f n
-] 
-[ file ] ...
-.br
-.B checkeq
-[ file ] ...
-.SH DESCRIPTION
-.I Eqn
+.Sh NAME
+.Nm eqn, neqn , checkeq
+.Nd typeset mathematics
+.Sh SYNOPSIS
+.Nm eqn
+.Oo
+.Op Fl d Ar xy
+.Op Fl p Ar n
+.Op Fl s Ar n
+.Op Fl f Ar n
+.Op  file
+\&...
+.Nm checkeq
+.Op  file
+\&...
+.Sh DESCRIPTION
+.Nm Eqn

 is a
 is a

-troff(1)
+.Xr troff 1

 preprocessor
 for typesetting mathematics
 on a Graphic Systems phototypesetter,
 preprocessor
 for typesetting mathematics
 on a Graphic Systems phototypesetter,

-.I neqn
+.Xr neqn

 on terminals.
 Usage is almost always
 on terminals.
 Usage is almost always

-.PP
-       eqn file ... | troff
-.br
-       neqn file ... | nroff
-.PP
-If no files are specified, 
+.Pp
+.Dl eqn file ... | troff
+.Pp
+.Dl neqn file ... | nroff
+.Pp
+If no files are specified,

 these programs
 read from the standard input.
 A line beginning with `.EQ' marks the start of an equation;
 these programs
 read from the standard input.
 A line beginning with `.EQ' marks the start of an equation;


@@ -49,212 +53,227 @@ to get
 centering, numbering, etc.
 It is also possible to set two characters as `delimiters';
 subsequent text between delimiters is also treated as
 centering, numbering, etc.
 It is also possible to set two characters as `delimiters';
 subsequent text between delimiters is also treated as

-.ul
-eqn
+.Nm eqn

 input.
 Delimiters may be set to characters
 input.
 Delimiters may be set to characters

-.I x
+.Ar x

 and
 and

-.I y
+.Ar y

 with the command-line argument
 with the command-line argument

-.BI \-d xy
+.Fl d xy

 or (more commonly) with
 `delim
 or (more commonly) with
 `delim

-.IR xy '
+.Ar xy  '

 between .EQ and .EN.
 The left and right delimiters may be identical.
 Delimiters are turned off by `delim off'.
 All text that is neither between delimiters nor between .EQ and .EN
 is passed through untouched.
 between .EQ and .EN.
 The left and right delimiters may be identical.
 Delimiters are turned off by `delim off'.
 All text that is neither between delimiters nor between .EQ and .EN
 is passed through untouched.

-.PP
+.Pp

 The program
 The program

-.I checkeq
+.Nm checkeq

 reports missing or unbalanced delimiters and .EQ/.EN pairs.
 reports missing or unbalanced delimiters and .EQ/.EN pairs.

-.PP
+.Pp

 Tokens within
 Tokens within

-.I eqn
+.Nm eqn

 are separated by
 spaces, tabs, newlines, braces, double quotes,
 tildes or circumflexes.
 Braces {} are used for grouping;
 generally speaking,
 anywhere a single character like
 are separated by
 spaces, tabs, newlines, braces, double quotes,
 tildes or circumflexes.
 Braces {} are used for grouping;
 generally speaking,
 anywhere a single character like

-.I x
+.Ar x

 could appear, a complicated construction
 enclosed in braces may be used instead.
 Tilde ~ represents a full space in the output,
 circumflex ^ half as much.
 could appear, a complicated construction
 enclosed in braces may be used instead.
 Tilde ~ represents a full space in the output,
 circumflex ^ half as much.

-.PP
+.Pp

 .vs 13p
 Subscripts and superscripts are produced with the keywords
 .vs 13p
 Subscripts and superscripts are produced with the keywords

-.B sub
+.Ic sub

 and
 and

-.B sup.
+.Ic sup .

 Thus
 Thus

-.I "x sub i" 
+.Ar "x sub i"

 makes
 makes

-$x sub i$, 
-.I "a sub i sup 2"
+$x sub i$,
+.Ar "a sub i sup 2"

 produces
 $a sub i sup 2$,
 and
 produces
 $a sub i sup 2$,
 and

-.I "e sup {x sup 2 + y sup 2}"
+.Ar "e sup {x sup 2 +
+.Ar y sup 2}"

 gives
 $e sup {x sup 2 + y sup 2}$.
 gives
 $e sup {x sup 2 + y sup 2}$.

-.PP
+.Pp

 Fractions are made with
 Fractions are made with

-.BR over :
-.I "a over b"
+.Ic over :
+.Ar "a over b"

 yields $a over b$.
 yields $a over b$.

-.PP
-.B sqrt
+.Pp
+.Ic sqrt

 makes square roots:
 makes square roots:

-.I "1 over sqrt {ax sup 2 +bx+c}"
+.Ar "1 over sqrt
+.Ar {ax sup 2 +bx+c}"

 results in
 $1 over sqrt {ax sup 2 +bx+c}$ .
 results in
 $1 over sqrt {ax sup 2 +bx+c}$ .

-.PP
+.Pp

 The keywords
 The keywords

-.B from
+.Ic from

 and
 and

-.B to
-introduce lower and upper
-limits on arbitrary things:
+.Ic to
+introduce lower and upper limits on arbitrary things:

 $lim from {n-> inf} sum from 0 to n x sub i$
 is made with
 $lim from {n-> inf} sum from 0 to n x sub i$
 is made with

-.I "lim from {n\-> inf } sum from 0 to n x sub i."
-.PP
+.Ar "lim from {n\-> inf }
+.Ar sum from 0 to n x
+.Ar sub i."
+.Pp

 Left and right brackets, braces, etc., of the right height are made with
 Left and right brackets, braces, etc., of the right height are made with

-.B left
+.Ic left

 and
 and

-.B right:
-.I "left [ x sup 2 + y sup 2 over alpha right ] ~=~1"
+.Ic right :
+.Op Ar "left
+.Ar  x sup 2 + y sup 2
+.AR over alpha right
+.Ar \&~=~1"

 produces
 $left [ x sup 2 + y sup 2 over alpha right ] ~=~1$.
 The
 produces
 $left [ x sup 2 + y sup 2 over alpha right ] ~=~1$.
 The

-.B right
+.Ic right

 clause is optional.
 clause is optional.

-Legal characters after 
-.B left
+Legal characters after
+.Ic left

 and
 and

-.B right
+.Ic right

 are braces, brackets, bars,
 are braces, brackets, bars,

-.B c
+.Ic c

 and
 and

-.B f
+.Ic f

 for ceiling and floor,
 and "" for nothing at all (useful for a right-side-only bracket).
 for ceiling and floor,
 and "" for nothing at all (useful for a right-side-only bracket).

-.PP
-Vertical piles of things are made with 
-.BR pile ,
-.BR lpile ,
-.BR cpile ,
+.Pp
+Vertical piles of things are made with
+.Ic pile  ,
+.Ic lpile ,
+.Ic cpile  ,

 and
 and

-.BR rpile :
-.I "pile {a above b above c}"
+.Ic rpile  :
+.Ar "pile {a above b above c}"

 produces
 $pile {a above b above c}$.
 There can be an arbitrary number of elements in a pile.
 produces
 $pile {a above b above c}$.
 There can be an arbitrary number of elements in a pile.

-.B lpile
+.Ic lpile

 left-justifies,
 left-justifies,

-.B pile
+.Ic pile

 and
 and

-.B cpile
+.Ic cpile

 center, with different vertical spacing,
 center, with different vertical spacing,

-and 
-.B rpile
+and
+.Ic rpile

 right justifies.
 right justifies.

-.PP
+.Pp

 Matrices are made with
 Matrices are made with

-.BR matrix :
-.I "matrix { lcol { x sub i above y sub 2 } ccol { 1 above 2 } }"
+.Ic matrix  :
+.Ar "matrix { lcol { x sub i
+.Ar above y sub 2 } ccol {
+.Ar 1 above 2 } }"

 produces
 $matrix { lcol { x sub i above y sub 2 } ccol { 1 above 2 } }$.
 In addition, there is
 produces
 $matrix { lcol { x sub i above y sub 2 } ccol { 1 above 2 } }$.
 In addition, there is

-.B rcol
+.Ic rcol

 for a right-justified column.
 for a right-justified column.

-.PP
+.Pp

 .vs 12p
 Diacritical marks are made with
 .vs 12p
 Diacritical marks are made with

-.BR dot ,
-.BR dotdot ,
-.BR hat ,
-.BR tilde ,
-.BR bar ,
-.BR vec ,
-.BR dyad ,
+.Ic dot  ,
+.Ic dotdot ,
+.Ic hat  ,
+.Ic tilde ,
+.Ic bar  ,
+.Ic vec ,
+.Ic dyad  ,

 and
 and

-.BR under :
-.I "x dot = f(t) bar"
+.Ic under  :
+.Ar "x dot \&= f(t) bar"

 is
 $x dot = f(t) bar$,
 is
 $x dot = f(t) bar$,

-.I "y dotdot bar ~=~ n under"
+.Ar "y dotdot bar \&~=~
+.Ar n under"

 is
 $y dotdot bar ~=~ n under$,
 and
 is
 $y dotdot bar ~=~ n under$,
 and

-.I "x vec ~=~ y dyad"
+.Ar "x vec \&~=~ y dyad"

 is
 $x vec ~=~ y dyad$.
 is
 $x vec ~=~ y dyad$.

-.PP
+.Pp

 Sizes and font can be changed with
 Sizes and font can be changed with

-.B size
-.I n
+.Ic size
+.Op Ar n

 or
 or

-.B size
-.BI \(+- n,
-.BR roman ,
-.BR italic ,
-.BR bold ,
+.Ic size
+.Sf Sy \(+- n,
+.Ic roman  ,
+.Ic italic ,
+.Ic bold  ,

 and
 and

-.BR font
-.I n.
+.Ic font
+.Ar n.

 Size and fonts can be changed globally in a document by
 Size and fonts can be changed globally in a document by

-.B gsize
-.I n
+.Ic gsize
+.Ar n

 and
 and

-.B gfont
-.IR n ,
+.Ic gfont
+.Ar n ,

 or by the command-line arguments
 or by the command-line arguments

-.BI \-s n
+.Cx Fl s
+.Ar n
+.Cx

 and
 and

-.BI \-f n.
-.PP
+.Cx Fl f
+.Ar n
+.Cx .
+.Cx
+.Pp

 Normally subscripts and superscripts are reduced by
 3 point sizes from the previous size;
 this may be changed by the command-line argument
 Normally subscripts and superscripts are reduced by
 3 point sizes from the previous size;
 this may be changed by the command-line argument

-.BI \-p n.
-.PP
+.Cx Fl p
+.Ar n .
+.Cx
+.Pp

 Successive display arguments can be lined up.
 Place
 Successive display arguments can be lined up.
 Place

-.B mark
+.Ic mark

 before the desired lineup point in the first equation;
 place
 before the desired lineup point in the first equation;
 place

-.B lineup
+.Ic lineup

 at the place that is to line up vertically in subsequent equations.
 at the place that is to line up vertically in subsequent equations.

-.PP
+.Pp

 Shorthands may be defined
 or existing keywords redefined with
 Shorthands may be defined
 or existing keywords redefined with

-.BI define :
-.I "define thing % replacement %"
+.Ic define  :
+.Ar "define thing \&% replacement \&%"

 defines a new token called
 defines a new token called

-.I thing
+.Ar thing

 which will be replaced by
 which will be replaced by

-.I replacement
+.Ar replacement

 whenever it appears thereafter.
 whenever it appears thereafter.

-The 
-.I %
+The
+.Ic \&%

 may be any character that does not occur in
 may be any character that does not occur in

-.I replacement.
-.PP
-Keywords like 
-.I sum
+.Ar replacement .
+.Pp
+Keywords like
+.Ar sum

 .EQ
 ( sum )
 .EN
 .EQ
 ( sum )
 .EN

-.I int
+.Ar int

 .EQ
 ( int )
 .EN
 .EQ
 ( int )
 .EN

-.I inf
+.Ar inf

 .EQ
 ( inf )
 .EN
 .EQ
 ( inf )
 .EN


@@ -274,33 +293,36 @@ and
 .EN
 are recognized.
 Greek letters are spelled out in the desired case, as in
 .EN
 are recognized.
 Greek letters are spelled out in the desired case, as in

-.I alpha
+.Ar alpha

 or
 or

-.I GAMMA.
+.Ar GAMMA .

 Mathematical words like sin, cos, log are made Roman automatically.
 Mathematical words like sin, cos, log are made Roman automatically.

-.IR Troff (1)
+.Xr Troff  1

 four-character escapes like \e(bs (\(bs)
 can be used anywhere.
 Strings enclosed in double quotes "..."
 are passed through untouched;
 this permits keywords to be entered as text,
 and can be used to communicate
 four-character escapes like \e(bs (\(bs)
 can be used anywhere.
 Strings enclosed in double quotes "..."
 are passed through untouched;
 this permits keywords to be entered as text,
 and can be used to communicate

-with 
-.I troff
+with
+.Xr troff 1

 when all else fails.
 when all else fails.

-.SH "SEE ALSO"
-.PP
-troff(1), tbl(1), ms(7), eqnchar(7)
+.Sh SEE ALSO
+.Xr troff 1 ,
+.Xr tbl 1 ,
+.Xr ms 7 ,
+.Xr eqnchar 7

 .br
 B. W. Kernighan and L. L. Cherry,
 .br
 B. W. Kernighan and L. L. Cherry,

-.ul
-Typesetting Mathematics\(emUser's Guide
-.br
+.Em Typesetting Mathematics\-User's Guide
+.Br

 J. F. Ossanna,
 J. F. Ossanna,

-.ul
-NROFF/TROFF User's Manual
-.SH BUGS
-.PP
+.Em NROFF/TROFF User's Manual
+.Sh HISTORY
+.Nm Eqn
+appeared in Version 6 AT&T Unix.
+.Sh BUGS
+.Pp

 To embolden digits, parens, etc.,
 it is necessary to quote them,
 as in `bold "12.3"'.
 To embolden digits, parens, etc.,
 it is necessary to quote them,
 as in `bold "12.3"'.

diff --git a/usr/src/share/man/man7/ascii.7 b/usr/src/share/man/man7/ascii.7
index ac2919a..627c7fc 100644 (file)
--- a/usr/src/share/man/man7/ascii.7
+++ b/usr/src/share/man/man7/ascii.7
@@ -1,76 +1,90 @@
-.\" Copyright (c) 1989 The Regents of the University of California.
+.\" Copyright (c) 1989, 1990 The Regents of the University of California.

 .\" All rights reserved.
 .\"
 .\" All rights reserved.
 .\"

-.\" Redistribution and use in source and binary forms are permitted
-.\" provided that the above copyright notice and this paragraph are
-.\" duplicated in all such forms and that any documentation,
-.\" advertising materials, and other materials related to such
-.\" distribution and use acknowledge that the software was developed
-.\" by the University of California, Berkeley.  The name of the
-.\" University may not be used to endorse or promote products derived
-.\" from this software without specific prior written permission.
-.\" THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
-.\" IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-.\" WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+.\" %sccs.include.redist.man%

 .\"
 .\"

-.\"    @(#)ascii.7     6.2 (Berkeley) %G%
+.\"     @(#)ascii.7    6.3 (Berkeley) %G%

 .\"
 .\"

-.TH ASCII 7 ""
-.AT 3
-.SH NAME
-ascii \- octal, hexidecimal and decimal ASCII character sets
-.SH DESCRIPTION
-.nf
-|000 nul|001 soh|002 stx|003 etx|004 eot|005 enq|006 ack|007 bel|
-|010 bs |011 ht |012 nl |013 vt |014 np |015 cr |016 so |017 si |
-|020 dle|021 dc1|022 dc2|023 dc3|024 dc4|025 nak|026 syn|027 etb|
-|030 can|031 em |032 sub|033 esc|034 fs |035 gs |036 rs |037 us |
-|040 sp |041  ! |042  " |043  # |044  $ |045  % |046  & |047  ' |
-|050  ( |051  ) |052  * |053  + |054  , |055  - |056  . |057  / |
-|060  0 |061  1 |062  2 |063  3 |064  4 |065  5 |066  6 |067  7 |
-|070  8 |071  9 |072  : |073  ; |074  < |075  = |076  > |077  ? |
-|100  @ |101  A |102  B |103  C |104  D |105  E |106  F |107  G |
-|110  H |111  I |112  J |113  K |114  L |115  M |116  N |117  O |
-|120  P |121  Q |122  R |123  S |124  T |125  U |126  V |127  W |
-|130  X |131  Y |132  Z |133  [ |134  \e\ |135  ] |136  ^ |137  _ |
-|140  ` |141  a |142  b |143  c |144  d |145  e |146  f |147  g |
-|150  h |151  i |152  j |153  k |154  l |155  m |156  n |157  o |
-|160  p |161  q |162  r |163  s |164  t |165  u |166  v |167  w |
-|170  x |171  y |172  z |173  { |174  | |175  } |176  ~ |177 del|
-
-| 00 nul| 01 soh| 02 stx| 03 etx| 04 eot| 05 enq| 06 ack| 07 bel|
-| 08 bs | 09 ht | 0a nl | 0b vt | 0c np | 0d cr | 0e so | 0f si |
-| 10 dle| 11 dc1| 12 dc2| 13 dc3| 14 dc4| 15 nak| 16 syn| 17 etb|
-| 18 can| 19 em | 1a sub| 1b esc| 1c fs | 1d gs | 1e rs | 1f us |
-| 20 sp | 21  ! | 22  " | 23  # | 24  $ | 25  % | 26  & | 27  ' |
-| 28  ( | 29  ) | 2a  * | 2b  + | 2c  , | 2d  - | 2e  . | 2f  / |
-| 30  0 | 31  1 | 32  2 | 33  3 | 34  4 | 35  5 | 36  6 | 37  7 |
-| 38  8 | 39  9 | 3a  : | 3b  ; | 3c  < | 3d  = | 3e  > | 3f  ? |
-| 40  @ | 41  A | 42  B | 43  C | 44  D | 45  E | 46  F | 47  G |
-| 48  H | 49  I | 4a  J | 4b  K | 4c  L | 4d  M | 4e  N | 4f  O |
-| 50  P | 51  Q | 52  R | 53  S | 54  T | 55  U | 56  V | 57  W |
-| 58  X | 59  Y | 5a  Z | 5b  [ | 5c  \e\ | 5d  ] | 5e  ^ | 5f  _ |
-| 60  \` | 61  a | 62  b | 63  c | 64  d | 65  e | 66  f | 67  g |
-| 68  h | 69  i | 6a  j | 6b  k | 6c  l | 6d  m | 6e  n | 6f  o |
-| 70  p | 71  q | 72  r | 73  s | 74  t | 75  u | 76  v | 77  w |
-| 78  x | 79  y | 7a  z | 7b  { | 7c  | | 7d  } | 7e  ~ | 7f del|
-
-|  0 nul|  1 soh|  2 stx|  3 etx|  4 eot|  5 enq|  6 ack|  7 bel|
-|  8 bs |  9 ht | 10 nl | 11 vt | 12 np | 13 cr | 14 so | 15 si |
-| 16 dle| 17 dc1| 18 dc2| 19 dc3| 20 dc4| 21 nak| 22 syn| 23 etb|
-| 24 can| 25 em | 26 sub| 27 esc| 28 fs | 29 gs | 30 rs | 31 us |
-| 32 sp | 33  ! | 34  " | 35  # | 36  $ | 37  % | 38  & | 39  ' |
-| 40  ( | 41  ) | 42  * | 43  + | 44  , | 45  - | 46  . | 47  / |
-| 48  0 | 49  1 | 50  2 | 51  3 | 52  4 | 53  5 | 54  6 | 55  7 |
-| 56  8 | 57  9 | 58  : | 59  ; | 60  < | 61  = | 62  > | 63  ? |
-| 64  @ | 65  A | 66  B | 67  C | 68  D | 69  E | 70  F | 71  G |
-| 72  H | 73  I | 74  J | 75  K | 76  L | 77  M | 78  N | 79  O |
-| 80  P | 81  Q | 82  R | 83  S | 84  T | 85  U | 86  V | 87  W |
-| 88  X | 89  Y | 90  Z | 91  [ | 92  \e\ | 93  ] | 94  ^ | 95  _ |
-| 96  ` | 97  a | 98  b | 99  c |100  d |101  e |102  f |103  g |
-|104  h |105  i |106  j |107  k |108  l |109  m |110  n |111  o |
-|112  p |113  q |114  r |115  s |116  t |117  u |118  v |119  w |
-|120  x |121  y |122  z |123  { |124  | |125  } |126  ~ |127 del|
-.fi
-.SH FILES
-/usr/share/misc/ascii
+.Dd 
+.Dt ASCII 7
+.Os BSD 4.4
+.Sh NAME
+.Nm ascii
+.Nd octal, hexidecimal and decimal ASCII character sets
+.Sh DESCRIPTION
+The
+.Nm octal
+set:
+.Pp
+.Ds L
+000 nul  001 soh  002 stx  003 etx  004 eot  005 enq  006 ack  007 bel
+010 bs   011 ht   012 nl   013 vt   014 np   015 cr   016 so   017 si
+020 dle  021 dc1  022 dc2  023 dc3  024 dc4  025 nak  026 syn  027 etb
+030 can  031 em   032 sub  033 esc  034 fs   035 gs   036 rs   037 us 
+040 sp   041  !   042  "   043  #   044  $   045  %   046  &   047  ' 
+050  (   051  )   052  *   053  +   054  ,   055  -   056  .   057  / 
+060  0   061  1   062  2   063  3   064  4   065  5   066  6   067  7 
+070  8   071  9   072  :   073  ;   074  <   075  =   076  >   077  ? 
+100  @   101  A   102  B   103  C   104  D   105  E   106  F   107  G 
+110  H   111  I   112  J   113  K   114  L   115  M   116  N   117  O 
+120  P   121  Q   122  R   123  S   124  T   125  U   126  V   127  W 
+130  X   131  Y   132  Z   133  [   134  \e\   135  ]   136  ^   137  _ 
+140  `   141  a   142  b   143  c   144  d   145  e   146  f   147  g 
+150  h   151  i   152  j   153  k   154  l   155  m   156  n   157  o 
+160  p   161  q   162  r   163  s   164  t   165  u   166  v   167  w 
+170  x   171  y   172  z   173  {   174  |   175  }   176  ~   177 del
+.De
+.Pp
+The
+.Nm hexidecimal
+set:
+.Pp
+.Ds L
+00 nul   01 soh   02 stx   03 etx   04 eot   05 enq   06 ack   07 bel
+08 bs    09 ht    0a nl    0b vt    0c np    0d cr    0e so    0f si 
+10 dle   11 dc1   12 dc2   13 dc3   14 dc4   15 nak   16 syn   17 etb
+18 can   19 em    1a sub   1b esc   1c fs    1d gs    1e rs    1f us 
+20 sp    21  !    22  "    23  #    24  $    25  %    26  &    27  ' 
+28  (    29  )    2a  *    2b  +    2c  ,    2d  -    2e  .    2f  / 
+30  0    31  1    32  2    33  3    34  4    35  5    36  6    37  7 
+38  8    39  9    3a  :    3b  ;    3c  <    3d  =    3e  >    3f  ? 
+40  @    41  A    42  B    43  C    44  D    45  E    46  F    47  G 
+48  H    49  I    4a  J    4b  K    4c  L    4d  M    4e  N    4f  O 
+50  P    51  Q    52  R    53  S    54  T    55  U    56  V    57  W 
+58  X    59  Y    5a  Z    5b  [    5c  \e\    5d  ]    5e  ^    5f  _ 
+60  \`    61  a    62  b    63  c    64  d    65  e    66  f    67  g 
+68  h    69  i    6a  j    6b  k    6c  l    6d  m    6e  n    6f  o 
+70  p    71  q    72  r    73  s    74  t    75  u    76  v    77  w 
+78  x    79  y    7a  z    7b  {    7c  |    7d  }    7e  ~    7f del
+.De
+.Pp
+The
+.Nm decimal
+set:
+.Pp
+.Ds L
+  0 nul    1 soh    2 stx    3 etx    4 eot    5 enq    6 ack    7 bel
+  8 bs     9 ht    10 nl    11 vt    12 np    13 cr    14 so    15 si 
+ 16 dle   17 dc1   18 dc2   19 dc3   20 dc4   21 nak   22 syn   23 etb
+ 24 can   25 em    26 sub   27 esc   28 fs    29 gs    30 rs    31 us 
+ 32 sp    33  !    34  "    35  #    36  $    37  %    38  &    39  ' 
+ 40  (    41  )    42  *    43  +    44  ,    45  -    46  .    47  / 
+ 48  0    49  1    50  2    51  3    52  4    53  5    54  6    55  7 
+ 56  8    57  9    58  :    59  ;    60  <    61  =    62  >    63  ? 
+ 64  @    65  A    66  B    67  C    68  D    69  E    70  F    71  G 
+ 72  H    73  I    74  J    75  K    76  L    77  M    78  N    79  O 
+ 80  P    81  Q    82  R    83  S    84  T    85  U    86  V    87  W 
+ 88  X    89  Y    90  Z    91  [    92  \e\    93  ]    94  ^    95  _ 
+ 96  `    97  a    98  b    99  c   100  d   101  e   102  f   103  g 
+104  h   105  i   106  j   107  k   108  l   109  m   110  n   111  o 
+112  p   113  q   114  r   115  s   116  t   117  u   118  v   119  w 
+120  x   121  y   122  z   123  {   124  |   125  }   126  ~   127 del
+.De
+.Sh FILES
+.Dw /usr/share/misc/ascii
+.Di L
+.Dp Pa /usr/share/misc/ascii
+.Dp
+.Sh HISTORY
+.Nm Ascii
+appeared in Version 7 AT&T Unix.

diff --git a/usr/src/share/man/man7/environ.7 b/usr/src/share/man/man7/environ.7
index be916ff..b068ee3 100644 (file)
--- a/usr/src/share/man/man7/environ.7
+++ b/usr/src/share/man/man7/environ.7
@@ -1,100 +1,122 @@
-.\" Copyright (c) 1983 Regents of the University of California.
-.\" All rights reserved.  The Berkeley software License Agreement
-.\" specifies the terms and conditions for redistribution.
+.\" Copyright (c) 1983, 1990 The Regents of the University of California.
+.\" All rights reserved.

 .\"
 .\"

-.\"    @(#)environ.7   6.4 (Berkeley) %G%
+.\" %sccs.include.redist.man%

 .\"
 .\"

-.TH ENVIRON 7 ""
-.UC 5
-.SH NAME
-environ \- user environment
-.SH SYNOPSIS
-.B extern char **environ;
-.SH DESCRIPTION
+.\"     @(#)environ.7  6.5 (Berkeley) %G%
+.\"
+.Dd 
+.Dt ENVIRON 7
+.Os BSD 4.2
+.Sh NAME
+.Nm environ
+.Nd user environment
+.Sh SYNOPSIS
+.Ar extern char **environ ;
+.Sh DESCRIPTION

 An array of strings called the
 An array of strings called the

-.I environment
+.Ar environment

 is made available by
 is made available by

-.IR execve (2)
+.Xr execve  2

 when a process begins.  By convention these strings have the form
 when a process begins.  By convention these strings have the form

-``\fIname=value\fP''.  The following names are used by various commands:
-.TP "\w'TERMPATH 'u"
-EXINIT
+.Dq Ar name=value .
+The following names are used by various commands:
+.Tw Fl
+.Tp Ev EXINIT

 A startup list of commands read by
 A startup list of commands read by

-.IR ex (1),
-.IR edit (1),
+.Xr ex  1  ,
+.Xr edit  1 ,

 and
 and

-.IR vi (1).
-.TP
-HOME
+.Xr vi  1  .
+.Tp Ev HOME

 A user's login directory, set by
 A user's login directory, set by

-.IR login (1)
+.Xr login  1

 from the password file
 from the password file

-.IR passwd (5).
-.TP
-PATH
+.Xr passwd  5  .
+.Tp Ev PATH

 The sequence of directories, separated by colons, searched by
 The sequence of directories, separated by colons, searched by

-.IR csh (1),
-.IR sh (1),
-.IR system (3),
-.IR execvp (3),
+.Xr csh  1  ,
+.Xr sh  1 ,
+.Xr system  3  ,
+.Xr execvp  3 ,

 etc, when looking for an executable file.
 PATH is set to ``:/usr/ucb:/bin:/usr/bin'' initially by
 etc, when looking for an executable file.
 PATH is set to ``:/usr/ucb:/bin:/usr/bin'' initially by

-.IR login (1).
-.TP
-PRINTER
+.Xr login  1  .
+.Tp Ev PRINTER

 The name of the default printer to be used by
 The name of the default printer to be used by

-.IR lpr (1),
-.IR lpq (1),
+.Xr lpr  1  ,
+.Xr lpq  1 ,

 and
 and

-.IR lprm (1).
-.TP
-SHELL
+.Xr lprm  1  .
+.Tp Ev SHELL

 The full pathname of the user's login shell.
 The full pathname of the user's login shell.

-.TP
-TERM
+.Tp Ev TERM

 The kind of terminal for which output is to be prepared.
 This information is used by commands, such as
 The kind of terminal for which output is to be prepared.
 This information is used by commands, such as

-.IR nroff (1)
+.Xr nroff  1

 or
 or

-.IR plot (1G),
+.Xr plot 1

 which may exploit special terminal capabilities.  See
 which may exploit special terminal capabilities.  See

-.I /etc/termcap
-.RI ( termcap (5))
+.Pa /usr/share/misc/termcap
+.Pq Xr tmercap 5

 for a list of terminal types.
 for a list of terminal types.

-.TP
-TERMCAP
+.Tp Ev TERMCAP

 The string describing the terminal in TERM, or, if
 it begins with a '/', the name of the termcap file.
 The string describing the terminal in TERM, or, if
 it begins with a '/', the name of the termcap file.

-See TERMPATH below, 
-.IR termcap (5),
+See
+.Ev TERMPATH
+below,
+.Xr termcap  5  ,

 and
 and

-.IR termcap (3X).
-.TP
-TERMPATH
+.Xr termcap  .
+.Tp Ev TERMPATH

 A sequence of pathnames of termcap files, separated by colons or spaces,
 which are searched for terminal descriptions in the order listed.  Having
 A sequence of pathnames of termcap files, separated by colons or spaces,
 which are searched for terminal descriptions in the order listed.  Having

-no TERMPATH is equivalent to a TERMPATH of ``$HOME/.termcap:/etc/termcap''.
-TERMPATH is ignored if TERMCAP contains a full pathname.
-.TP
-USER
+no
+.Ev TERMPATH
+is equivalent to a
+.Ev TERMPATH
+of
+.Dq Pa $HOME/.termcap:/etc/termcap .
+.Ev TERMPATH
+is ignored if
+.Ev TERMCAP
+contains a full pathname.
+.Tp Ev USER

 The login name of the user.
 The login name of the user.

-.PP
+.Tp
+.Pp

 Further names may be placed in the environment by the
 Further names may be placed in the environment by the

-.I export
+.Xr export

 command and
 command and

-.IR name = value
+.Ar name=value

 arguments in
 arguments in

-.IR sh (1),
+.Xr sh  1  ,

 or by the
 or by the

-.I setenv
+.Xr setenv

 command if you use
 command if you use

-.IR csh (1).
-It is unwise to change certain 
-.IR sh (1)
+.Xr csh  1  .
+It is unwise to change certain
+.Xr sh  1

 variables that are frequently exported by
 variables that are frequently exported by

-.I .profile
-files, such as MAIL, PS1, PS2, and IFS,
+.Pa .profile
+files, such as
+.Ev MAIL ,
+.Ev PS1 ,
+.Ev PS2 ,
+and
+.Ev IFS ,

 unless you know what you are doing.
 unless you know what you are doing.

-.SH SEE ALSO
-csh(1), ex(1), login(1), sh(1), execve(2), execle(3),
-system(3), termcap(3), termcap(5)
+.Sh SEE ALSO
+.Xr csh 1 ,
+.Xr ex 1 ,
+.Xr login 1 ,
+.Xr sh 1 ,
+.Xr execve 2 ,
+.Xr execle 3 ,
+.Xr system 3 ,
+.Xr termcap 3 ,
+.Xr termcap 5
+.Sh HISTORY
+.Nm Environ
+appeared in 4.2 BSD.

diff --git a/usr/src/share/man/man7/eqnchar.7 b/usr/src/share/man/man7/eqnchar.7
index 272aadf..77abc31 100644 (file)
--- a/usr/src/share/man/man7/eqnchar.7
+++ b/usr/src/share/man/man7/eqnchar.7
@@ -2,9 +2,9 @@
 .\" All rights reserved.  The Berkeley software License Agreement
 .\" specifies the terms and conditions for redistribution.
 .\"
 .\" All rights reserved.  The Berkeley software License Agreement
 .\" specifies the terms and conditions for redistribution.
 .\"

-.\"    @(#)eqnchar.7   6.1 (Berkeley) %G%
+.\"    @(#)eqnchar.7   6.1 (Berkeley) 5/20/85

 .\"
 .\"

-.TH EQNCHAR 7 ""
+.TH EQNCHAR 7 "May 20, 1985"

 .UC 3
 .EQ
 tdefine ciplus % "\o'\(pl\(ci'" %
 .UC 3
 .EQ
 tdefine ciplus % "\o'\(pl\(ci'" %


@@ -99,7 +99,7 @@ define !supset % \(ip %
 .SH NAME
 eqnchar \- special character definitions for eqn
 .SH SYNOPSIS
 .SH NAME
 eqnchar \- special character definitions for eqn
 .SH SYNOPSIS

-.B eqn /usr/pub/eqnchar
+.B eqn /usr/share/misc/eqnchar

 [ files ]
 .B \(bv troff
 [ options ]
 [ files ]
 .B \(bv troff
 [ options ]

diff --git a/usr/src/usr.bin/dc/dc.1 b/usr/src/usr.bin/dc/dc.1
index 5dff598..23a844f 100644 (file)
--- a/usr/src/usr.bin/dc/dc.1
+++ b/usr/src/usr.bin/dc/dc.1
@@ -1,37 +1,41 @@
-.\"    @(#)dc.1        6.1 (Berkeley) %G%
+.\" Copyright (c) 1990 The Regents of the University of California.
+.\" All rights reserved.

 .\"
 .\"

-.TH DC 1 ""
-.AT 3
-.SH NAME
-dc \- desk calculator
-.SH SYNOPSIS
-.B dc
-[ file ]
-.SH DESCRIPTION
-.I Dc
+.\" %sccs.include.redist.man%
+.\"
+.\"     @(#)dc.1       6.2 (Berkeley) %G%
+.\"
+.Dd 
+.Dt DC 1
+.Os ATT 7th
+.Sh NAME
+.Nm dc
+.Nd desk calculator
+.Sh SYNOPSIS
+.Nm dc
+.Op  file
+.Sh DESCRIPTION
+.Nm Dc

 is an arbitrary precision arithmetic package.
 Ordinarily it operates on decimal integers,
 but one may specify an input base, output base,
 and a number of fractional digits to be maintained.
 The overall structure of
 is an arbitrary precision arithmetic package.
 Ordinarily it operates on decimal integers,
 but one may specify an input base, output base,
 and a number of fractional digits to be maintained.
 The overall structure of

-.I dc
+.Nm dc

 is
 a stacking (reverse Polish) calculator.
 If an argument is given,
 input is taken from that file until its end,
 then from the standard input.
 The following constructions are recognized:
 is
 a stacking (reverse Polish) calculator.
 If an argument is given,
 input is taken from that file until its end,
 then from the standard input.
 The following constructions are recognized:

-.HP 6
-number
-.br
+.Tw Fl
+.Tp Va number

 The value of the number is pushed on the stack.
 A number is an unbroken string of the digits 0-9.
 It may be preceded by an underscore _ to input a
 negative number.
 Numbers may contain decimal points.
 The value of the number is pushed on the stack.
 A number is an unbroken string of the digits 0-9.
 It may be preceded by an underscore _ to input a
 negative number.
 Numbers may contain decimal points.

-.HP 6
-+  \- /  *  %  ^
-.br
+.Tp Li \&+  \&\- \&/  \&*  \&%  \&^

 The
 top two values on the stack are added
 (+),
 The
 top two values on the stack are added
 (+),


@@ -44,107 +48,92 @@ or exponentiated (^).
 The two entries are popped off the stack;
 the result is pushed on the stack in their place.
 Any fractional part of an exponent is ignored.
 The two entries are popped off the stack;
 the result is pushed on the stack in their place.
 Any fractional part of an exponent is ignored.

-.TP
-.BI s x
+.Tc Ic s
+.Ar x
+.Cx

 The
 top of the stack is popped and stored into
 a register named
 The
 top of the stack is popped and stored into
 a register named

-.I x,
+.Ar x ,

 where
 where

-.I x
+.Ar x

 may be any character.
 If
 the
 may be any character.
 If
 the

-.B s
+.Ar s

 is capitalized,
 is capitalized,

-.I x
+.Ar x

 is treated as a stack and the value is pushed on it.
 is treated as a stack and the value is pushed on it.

-.TP
-.BI l x
+.Tc Ic l
+.Ar x
+.Cx

 The
 value in register
 The
 value in register

-.I x
+.Ar x

 is pushed on the stack.
 The register
 is pushed on the stack.
 The register

-.I x
+.Ar x

 is not altered.
 All registers start with zero value.
 If the
 is not altered.
 All registers start with zero value.
 If the

-.B l
+.Ar l

 is capitalized,
 register
 is capitalized,
 register

-.I x
+.Ar x

 is treated as a stack and its top value is popped onto the main stack.
 is treated as a stack and its top value is popped onto the main stack.

-.TP
-.B  d
+.Tp Ic d

 The
 top value on the stack is duplicated.
 The
 top value on the stack is duplicated.

-.TP
-.B  p
+.Tp Ic p

 The top value on the stack is printed.
 The top value remains unchanged.
 The top value on the stack is printed.
 The top value remains unchanged.

-.B P
+.Ar P

 interprets the top of the stack as an ascii string,
 removes it, and prints it.
 interprets the top of the stack as an ascii string,
 removes it, and prints it.

-.TP
-.B  f
+.Tp Ic f

 All values on the stack and in registers are printed.
 All values on the stack and in registers are printed.

-.TP
-.B  q
+.Tp Ic q

 exits the program.
 If executing a string, the recursion level is
 popped by two.
 If
 exits the program.
 If executing a string, the recursion level is
 popped by two.
 If

-.B q
+.Ar q

 is capitalized,
 the top value on the stack is popped and the string execution level is popped
 by that value.
 is capitalized,
 the top value on the stack is popped and the string execution level is popped
 by that value.

-.TP
-.B  x
+.Tp Ic x

 treats the top element of the stack as a character string
 and executes it as a string of dc commands.
 treats the top element of the stack as a character string
 and executes it as a string of dc commands.

-.TP
-.B  X
+.Tp Ic X

 replaces the number on the top of the stack with its scale factor.
 replaces the number on the top of the stack with its scale factor.

-.TP
-.B  "[ ... ]"
+.Tp Op \&...

 puts the bracketed ascii string onto the top of the stack.
 puts the bracketed ascii string onto the top of the stack.

-.HP 6
-.I  "<x  >x  =x"
-.br
+.Tp Va \&<x  \&>x  \&=x

 The
 top two elements of the stack are popped and compared.
 Register
 The
 top two elements of the stack are popped and compared.
 Register

-.I x
+.Ar x

 is executed if they obey the stated
 relation.
 is executed if they obey the stated
 relation.

-.TP
-.B  v
+.Tp Ic v

 replaces the top element on the stack by its square root.
 Any existing fractional part of the argument is taken
 into account, but otherwise the scale factor is ignored.
 replaces the top element on the stack by its square root.
 Any existing fractional part of the argument is taken
 into account, but otherwise the scale factor is ignored.

-.TP
-.B  !
+.Tp Ic \&!

 interprets the rest of the line as a UNIX command.
 interprets the rest of the line as a UNIX command.

-.TP
-.B  c
+.Tp Ic c

 All values on the stack are popped.
 All values on the stack are popped.

-.TP
-.B  i
+.Tp Ic i

 The top value on the stack is popped and used as the
 number radix for further input.
 The top value on the stack is popped and used as the
 number radix for further input.

-.B I
+.Ic I

 pushes the input base on the top of the stack.
 pushes the input base on the top of the stack.

-.TP
-.B  o
+.Tp Ic o

 The top value on the stack is popped and used as the
 number radix for further output.
 The top value on the stack is popped and used as the
 number radix for further output.

-.TP
-.SM
-.B O
+.Tp Ic O

 pushes the output base on the top of the stack.
 pushes the output base on the top of the stack.

-.TP
-.B  k
+.Tp Ic k

 the top of the stack is popped, and that value is used as
 a non-negative scale factor:
 the appropriate number of places
 the top of the stack is popped, and that value is used as
 a non-negative scale factor:
 the appropriate number of places


@@ -153,49 +142,56 @@ and maintained during multiplication, division, and exponentiation.
 The interaction of scale factor,
 input base, and output base will be reasonable if all are changed
 together.
 The interaction of scale factor,
 input base, and output base will be reasonable if all are changed
 together.

-.TP
-.B  z
+.Tp Ic z

 The stack level is pushed onto the stack.
 The stack level is pushed onto the stack.

-.TP
-.SM
-.B  Z
+.Tp Ic Z

 replaces the number on the top of the stack with its length.
 replaces the number on the top of the stack with its length.

-.TP
-.B  ?
+.Tp Ic \&?

 A line of input is taken from the input source (usually the terminal)
 and executed.
 A line of input is taken from the input source (usually the terminal)
 and executed.

-.TP
-.B "; :"
-are used by 
-.I bc
+.Tp Ic \&; \&:
+are used by
+.Ar bc

 for array operations.
 for array operations.

-.PP
-An example which prints the first ten values of n! is
-.nf
-.PP
-.in +3
-[la1+dsa*pla10>y]sy
-.br
-0sa1
-.br
-lyx
-.fi
-.SH "SEE ALSO"
-bc(1),
+.Tp
+.Pp
+An example which prints the first ten values of
+.Ic n\&! :
+.Pp
+.Df I
+.Cx Op Li la1+dsa*pla10>y
+.Cx sy
+.Cx
+.De
+.Ds I
+.Li 0sa1
+.De
+.Ds I
+.Li lyx
+.De
+.Sh SEE ALSO
+.Xr bc 1 ,

 which is a preprocessor for
 which is a preprocessor for

-.I dc
-providing infix notation and a C-like syntax
+.Nm dc
+providing infix notation and a C- like syntax

 which implements functions and reasonable control
 structures for programs.
 which implements functions and reasonable control
 structures for programs.

-.SH DIAGNOSTICS
-`x is unimplemented' where x is an octal number.
-.br
-`stack empty' for not enough elements on the stack to do what was asked.
-.br
-`Out of space' when the free list is exhausted (too many digits).
-.br
-`Out of headers' for too many numbers being kept around.
-.br
-`Out of pushdown' for too many items on the stack.
-.br
-`Nesting Depth' for too many levels of nested execution.
+.Sh HISTORY
+.Nm Dc
+appeared in Version 6 AT&T Unix.
+.Sh DIAGNOSTICS
+.Tp Ar
+.\" .Tw x\ is\ unimplemented
+.Tp Li x is unimplemented
+where x is an octal number.
+.Tp Li stack empty
+for not enough elements on the stack to do what was asked.
+.Tp Li Out of space
+when the free list is exhausted (too many digits).
+.Tp Li Out of headers
+for too many numbers being kept around.
+.Tp Li Out of pushdown
+for too many items on the stack.
+.Tp Li Nesting Depth
+for too many levels of nested execution.
+.Tp

diff --git a/usr/src/usr.bin/deroff/deroff.1 b/usr/src/usr.bin/deroff/deroff.1
index 5ef2cce..6142d30 100644 (file)
--- a/usr/src/usr.bin/deroff/deroff.1
+++ b/usr/src/usr.bin/deroff/deroff.1
@@ -1,43 +1,53 @@
-.\"    @(#)deroff.1    6.1 (Berkeley) %G%
+.\" Copyright (c) 1990 The Regents of the University of California.
+.\" All rights reserved.

 .\"
 .\"

-.TH DEROFF 1 ""
-.AT 3
-.SH NAME
-deroff \- remove nroff, troff, tbl and eqn constructs
-.SH SYNOPSIS
-.B deroff
-[
-.B \-w
-]
-file ...
-.SH DESCRIPTION
-.I Deroff
+.\" %sccs.include.redist.man%
+.\"
+.\"     @(#)deroff.1   6.2 (Berkeley) %G%
+.\"
+.Dd 
+.Dt DEROFF 1
+.Os ATT 7th
+.Sh NAME
+.Nm deroff
+.Nd remove nroff, troff, tbl and eqn constructs
+.Sh SYNOPSIS
+.Nm deroff
+.Op Fl w
+.Ar file \&...
+.Sh DESCRIPTION
+.Nm Deroff

 reads each file in sequence and removes all
 reads each file in sequence and removes all

-.I nroff
+.Xr nroff 1

 and
 and

-.I troff
+.Xr troff 1

 command lines, backslash constructions, macro definitions,
 command lines, backslash constructions, macro definitions,

-.I eqn
+.Xr eqn 1

 constructs (between `.EQ' and `.EN' lines or between delimiters),
 and table descriptions and writes the remainder on the standard output.
 constructs (between `.EQ' and `.EN' lines or between delimiters),
 and table descriptions and writes the remainder on the standard output.

-.I Deroff
+.Nm Deroff

 follows chains of included files (`.so' and `.nx' commands);
 if a file has already been included, a `.so' is ignored and a `.nx'
 terminates execution.  If no input file is given,
 follows chains of included files (`.so' and `.nx' commands);
 if a file has already been included, a `.so' is ignored and a `.nx'
 terminates execution.  If no input file is given,

-.I deroff
+.Nm deroff

 reads from the standard input.
 reads from the standard input.

-.PP
+.Pp

 If the
 If the

-.B \-w
+.Fl w

 flag is given, the output is a word list, one `word' (string of letters,
 digits, and apostrophes, beginning with a letter; apostrophes are removed)
 per line, and all other characters ignored.
 Otherwise, the output follows the original, with the deletions mentioned above.
 flag is given, the output is a word list, one `word' (string of letters,
 digits, and apostrophes, beginning with a letter; apostrophes are removed)
 per line, and all other characters ignored.
 Otherwise, the output follows the original, with the deletions mentioned above.

-.SH "SEE ALSO"
-troff(1), eqn(1), tbl(1)
-.SH BUGS
-.I Deroff
+.Sh SEE ALSO
+.Xr troff 1 ,
+.Xr eqn 1 ,
+.Xr tbl 1
+.Sh HISTORY
+.Nm Deroff
+appeared in Version 7 AT&T Unix.
+.Sh BUGS
+.Nm Deroff

 is not a complete
 is not a complete

-.I troff
+.Xr troff 1

 interpreter, so it can be confused by subtle constructs.
 Most errors result in too much rather than too little output.
 interpreter, so it can be confused by subtle constructs.
 Most errors result in too much rather than too little output.

diff --git a/usr/src/usr.bin/diction/diction/diction.1 b/usr/src/usr.bin/diction/diction/diction.1
index 776638c..fc7bd41 100644 (file)
--- a/usr/src/usr.bin/diction/diction/diction.1
+++ b/usr/src/usr.bin/diction/diction/diction.1
@@ -1,65 +1,70 @@
-.\" Copyright (c) 1988 Regents of the University of California.
-.\" All rights reserved.  The Berkeley software License Agreement
-.\" specifies the terms and conditions for redistribution.
+.\" Copyright (c) 1988, 1990 The Regents of the University of California.
+.\" All rights reserved.

 .\"
 .\"

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

 .\"
 .\"

-.TH DICTION 1 ""
-.AT 3
-.SH NAME
-diction, explain \- print wordy sentences; thesaurus for diction
-.SH SYNOPSIS
-.B diction
-[
-.B \-ml
-] [
-.B \-mm
-] [
-.B \-n
-] [
-.B \-f
-pfile ]
-file ...
-.br
-.B explain
-.LP
-.SH DESCRIPTION
-.I Diction
+.\"     @(#)diction.1  4.4 (Berkeley) %G%
+.\"
+.Dd 
+.Dt DICTION 1
+.Os BSD 4.4
+.Sh NAME
+.Nm diction , explain
+.Nd print wordy sentences; thesaurus for diction
+.Sh SYNOPSIS
+.Nm diction
+.Op Fl ml
+.Op Fl mm
+.Op Fl n
+.Op Fl f Ar pfile
+.Ar file \&...
+.Nm explain
+.Pp
+.Sh DESCRIPTION
+.Nm Diction

 finds all sentences in a document that contain phrases
 from a data base of bad or wordy diction.
 finds all sentences in a document that contain phrases
 from a data base of bad or wordy diction.

-Each phrase is bracketed with [ ].
+Each phrase is bracketed with
+.Op .

 Because
 Because

-.I diction
+.Nm diction

 runs
 runs

-.I deroff
+.Xr deroff 1

 before looking at the text, formatting
 header files should be included as part of the input.
 before looking at the text, formatting
 header files should be included as part of the input.

+.Tw Fl
+.Tp Fl mm

 The default macro package
 The default macro package

-.B \-ms
+.Fl ms

 may be overridden with the flag
 may be overridden with the flag

-.B \-mm.
-The flag
-.B \-ml
-which causes 
-.B deroff
+.Fl mm .
+.Tp Fl ml
+causes
+.Xr deroff 1

 to skip lists, should be used if the document contains many lists of
 non-sentences.
 to skip lists, should be used if the document contains many lists of
 non-sentences.

-The user may supply her/his own pattern file to be used in addition to the default file
-with
-.B \-f
-.I pfile.
-If the flag
-.B \-n
-is also supplied the default file will be suppressed.
-.PP
-.I Explain
+.Tc Fl f
+.Ws
+.Ar pfile.
+.Cx
+Use
+.Ar pfile
+as a pattern file in addition to the default file.
+.Tp Fl n
+Suppress usage of default file.
+.Tp
+.Pp
+.Nm Explain

 is an interactive thesaurus for the phrases found by diction.
 is an interactive thesaurus for the phrases found by diction.

-.SH "SEE ALSO"
-deroff(1)
-.SH BUGS
+.Sh SEE ALSO
+.Xr deroff 1
+.Sh HISTORY
+.Nm Diction
+appeared in 4.0 BSD.
+.Sh BUGS

 Use of non-standard formatting macros may cause
 incorrect sentence breaks.
 In particular,
 Use of non-standard formatting macros may cause
 incorrect sentence breaks.
 In particular,

-.I diction
+.Nm diction

 doesn't grok
 doesn't grok

-.B \-me.
+.Fl me .

diff --git a/usr/src/usr.bin/diff/diff/diff.1 b/usr/src/usr.bin/diff/diff/diff.1
index 0975f44..ad775d1 100644 (file)
--- a/usr/src/usr.bin/diff/diff/diff.1
+++ b/usr/src/usr.bin/diff/diff/diff.1
@@ -1,290 +1,397 @@
-.\" Copyright (c) 1980 Regents of the University of California.
-.\" All rights reserved.  The Berkeley software License Agreement
-.\" specifies the terms and conditions for redistribution.
+.\" Copyright (c) 1980, 1990 The Regents of the University of California.
+.\" All rights reserved.

 .\"
 .\"

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

 .\"
 .\"

-.TH DIFF 1 ""
-.UC 4
-.SH NAME
-diff \- differential file and directory comparator
-.SH SYNOPSIS
-.B diff
-[
-.B \-l
-] [
-.B \-r
-] [
-.B \-s
-] [
-\fB\-cefhn\fR
-] [
-.B \-biwt
-] dir1 dir2
-.br
-.B diff
-[
-\fB\-cefhn
-] [
-\fB\-biwt\fR
-] file1 file2
-.br
-.B diff
-[
-.BI \-D string
-] [
-.B \-biw
-]
-file1 file2
-.SH DESCRIPTION
+.\"     @(#)diff.1     6.5 (Berkeley) %G%
+.\"
+.Dd 
+.Dt DIFF 1
+.Os BSD 4
+.Sh NAME
+.Nm diff
+.Nd differential file and directory comparator
+.Sh SYNOPSIS
+.Nm diff
+.Op Fl l
+.Op Fl r
+.Op Fl s
+.Op Fl cefhn
+.Op Fl biwt
+.Ar dir1 dir2
+.Nm diff
+.Op Fl cefhn
+.Op Fl biwt
+.Ar file1 file2
+.Nm diff
+.Op Fl D Ar string
+.Op Fl biw
+.Ar file1 file2
+.Sh DESCRIPTION
+The
+.Nm diff
+utility compares the contents of
+.Ar file1
+and
+.Ar file2
+and writes to the standard output a minimal list of changes necessary to
+convert one of the files into the other.
+No output is produced if the files are identical.
+.Pp

 If both arguments are directories,
 If both arguments are directories,

-.I diff
+.Nm diff

 sorts the contents of the directories by name, and then runs the
 regular file
 sorts the contents of the directories by name, and then runs the
 regular file

-.I diff
-algorithm (described below)
+.Nm diff
+algorithm, producing a change list,

 on text files which are different.
 Binary files which differ,
 common subdirectories, and files which appear in only one directory
 on text files which are different.
 Binary files which differ,
 common subdirectories, and files which appear in only one directory

-are listed.
+are described as such.
+.Pp
+If only one of
+.Ar file1
+and
+.Ar file2
+is a directory,
+.Nm diff
+is applied to the non-directory file and the file contained in
+the directory file with a filename that is the same as the
+last component of the non-directory file.
+.Pp
+If either the
+.Ar file1
+or
+.Ar file2
+is
+.Fl ,
+the standard input is
+used in its place.
+.Pp

 Options when comparing directories are:
 Options when comparing directories are:

-.TP
-.B \-l
+.Tw Fl
+.Tp Fl l

 long output format; each text file
 long output format; each text file

-.I diff
+.Sf Nm diff \'d

 is piped through
 is piped through

-.IR pr (1)
+.Xr pr  1

 to paginate it,
 other differences are remembered and summarized
 after all text file differences are reported.
 to paginate it,
 other differences are remembered and summarized
 after all text file differences are reported.

-.TP
-.B \-r
+.Tp Fl r

 causes application of
 causes application of

-.I diff
+.Nm diff

 recursively to common subdirectories encountered.
 recursively to common subdirectories encountered.

-.TP
-.B \-s
-causes 
-.I diff
+.Tp Fl s
+causes
+.Nm diff

 to report files which are the same, which are otherwise not mentioned.
 to report files which are the same, which are otherwise not mentioned.

-.TP
-.B \-Sname
+.Tc Fl S
+.Ar name
+.Cx

 starts a directory
 starts a directory

-.I diff
+.Nm diff

 in the middle beginning with file
 in the middle beginning with file

-.I name.
-.PP
-When run on regular files, and when comparing text files which differ
-during directory comparison,
-.I diff
-tells what lines must be changed in the files to bring them into agreement.
-Except in rare circumstances,
-.I diff
-finds a smallest sufficient set of file differences.
-If neither
-.I file1
-nor
-.I file2
-is a directory, then either
-may be given as `\-', in which case the standard input is used.
-If
-.I file1
-is a directory,
-then a file in that directory whose file-name is the same as the file-name of
-.I file2
-is used (and vice versa).
-.PP
-There are several options for output format;
-the default output format contains lines of these forms:
-.IP "" 5
-.I n1
-a
-.I n3,n4
-.br
-.I n1,n2
-d
-.I n3
-.br
-.I n1,n2
-c
-.I n3,n4
-.PP
-These lines resemble
-.I ed
-commands to convert
-.I file1
-into
-.IR file2 .
-The numbers after the letters pertain to
-.IR file2 .
-In fact, by exchanging `a' for `d' and reading backward
-one may ascertain equally how to convert 
-.I file2
-into
-.IR file1 .
-As in 
-.I ed,
-identical pairs where
-.I n1
-=
-.I n2
+.Ar name .
+.Tp
+.Pp
+Output options. Except for
+.Fl b ,
+.Fl w ,
+.Fl i

 or
 or

-.I n3
-=
-.I n4
-are abbreviated as a single number.
-.PP
-Following each of these lines come all the lines that are
-affected in the first file flagged by `<', 
-then all the lines that are affected in the second file
-flagged by `>'.
-.PP
-Except for
-\fB\-b, -w, -i\fP or \fB-t\fP
+.Fl t

 which may be given with any of the others,
 the following options are mutually exclusive:
 which may be given with any of the others,
 the following options are mutually exclusive:

-.TP 9
-.B \-e
-produces a script of
-.I "a, c"
-and 
-.I d
-commands for the editor
-.I ed,
-which will recreate
-.I file2
-from
-.IR file1 .
-In connection with
-.BR \-e ,
-the following shell program may help maintain
-multiple versions of a file.
-Only an ancestral file ($1) and a chain of 
-version-to-version
-.I ed
-scripts ($2,$3,...) made by
-.I diff
-need be on hand.
-A `latest version' appears on
-the standard output.
-.IP
-\ \ \ \ \ \ \ \ (shift; cat $*; echo \'1,$p\') \(bv ed \- $1
-.IP
-Extra commands are added to the output when comparing directories with
-.B \-e,
-so that the result is a
-.IR sh (1)
-script for converting text files which are common to the two directories
-from their state in
-.I dir1
-to their state in
-.I dir2.
-.TP 9
-.B \-f
-produces a script similar to that of
-.B \-e,
-not useful with
-.I ed,
-and in the opposite order.
-.TP 9
-.B \-n
-produces a script similar to that of
-.B \-e,
-but in the opposite order and with a count of changed lines on each
-insert or delete command.  This is the form used by
-.IR rcsdiff (1).
-.TP 9
-.B \-c
+.Tw Fl
+.Tp Fl c

 produces a diff with lines of context.
 The default is to present 3 lines of context and may be changed, e.g to 10, by
 produces a diff with lines of context.
 The default is to present 3 lines of context and may be changed, e.g to 10, by

-.BR \-c10 \&.
+.Fl c10 .

 With
 With

-.B \-c
+.Fl c

 the output format is modified slightly:
 the output beginning with identification of the files involved and
 their creation dates and then each change is separated
 by a line with a dozen *'s.
 The lines removed from
 the output format is modified slightly:
 the output beginning with identification of the files involved and
 their creation dates and then each change is separated
 by a line with a dozen *'s.
 The lines removed from

-.I file1
+.Ar file1

 are marked with `\(mi '; those added to
 are marked with `\(mi '; those added to

-.I file2
+.Ar file2

 are marked `+ '.  Lines which are changed from one
 file to the other are marked in both files with with `! '.
 are marked `+ '.  Lines which are changed from one
 file to the other are marked in both files with with `! '.

-

 Changes which lie within <context> lines of each other are grouped
 together on output.  (This is a change from the previous ``diff -c''
 but the resulting output is usually much easier to interpret.)
 Changes which lie within <context> lines of each other are grouped
 together on output.  (This is a change from the previous ``diff -c''
 but the resulting output is usually much easier to interpret.)

-.TP 9
-.B \-h
-does a fast, half-hearted job.
-It works only when changed stretches are short
-and well separated,
-but does work on files of unlimited length.
-.TP
-.B \-Dstring
+.Tp Fl e
+produces output in a form suitable as input for the editor utility,
+.Xr ed 1 ,
+which can then be used to convert file1 into file2.
+.Pp
+Extra commands are added to the output when comparing directories with
+.Fl e ,
+so that the result is a
+.Xr sh  1
+script for converting text files which are common to the two directories
+from their state in
+.Ar dir1
+to their state in
+.Ar dir2 .
+.Tp Fl f
+identical output of the
+.Fl e
+flag, but in reverse order.  It cannot
+be digested by
+.Xr ed 1 .
+.Tp Fl h
+Invokes an alternate algorithm which can handle files of very long lengths.
+There is a trade off. The algorithm can only deal with changes which are
+clearly delimited and brief. Long sections of changes and overlaps will
+confuse it.
+.Tp Fl n
+produces a script similar to that of
+.Fl e ,
+but in the opposite order and with a count of changed lines on each
+insert or delete command.  This is the form used by
+.Xr rcsdiff  1  .
+.Tc Fl D
+.Ar string
+.Cx

 causes
 causes

-.I diff
+.Nm diff

 to create a merged version of
 to create a merged version of

-.I file1
+.Ar file1

 and
 and

-.I file2
+.Ar file2

 on the standard output, with C preprocessor controls included so that
 on the standard output, with C preprocessor controls included so that

-a compilation of the result without defining \fIstring\fR is equivalent
+a compilation of the result without defining
+.Ar string
+is equivalent

 to compiling
 to compiling

-.I file1,
+.Ar file1 ,

 while defining
 while defining

-.I string
+.Ar string

 will yield
 will yield

-.I file2.
-.TP 9
-.B \-b
+.Ar file2 .
+.Tp Fl b

 causes trailing blanks (spaces and tabs) to be ignored, and other
 strings of blanks to compare equal.
 causes trailing blanks (spaces and tabs) to be ignored, and other
 strings of blanks to compare equal.

-.TP 9
-.B \-w
-is similar to
-.B \-b
-but causes whitespace (blanks and tabs) to be totally ignored.  E.g.,
-``if\ (\ a\ ==\ b\ )'' will compare equal to ``if(a==b)''.
-.TP 9
-.B \-i
+.Tp Fl i

 ignores the case of letters.  E.g., ``A'' will compare equal to ``a''.
 ignores the case of letters.  E.g., ``A'' will compare equal to ``a''.

-.TP 9
-.B \-t
+.Tp Fl t

 will expand tabs in output lines.  Normal or
 will expand tabs in output lines.  Normal or

-.B \-c
+.Fl c

 output adds character(s) to the front of each line which may screw up
 the indentation of the original source lines and make the output listing
 difficult to interpret.  This option will preserve the original source's
 indentation.
 output adds character(s) to the front of each line which may screw up
 the indentation of the original source lines and make the output listing
 difficult to interpret.  This option will preserve the original source's
 indentation.

-.SH FILES
-/tmp/d?????
-.br
-/usr/lib/diffh for 
-.B \-h
-.br
-/bin/diff for directory diffs
+.Tp Fl w
+is similar to
+.Fl b
+but causes whitespace (blanks and tabs) to be totally ignored.  E.g.,
+``if\ (\ a\ ==\ b\ )'' will compare equal to ``if(a==b)''.
+.Tp
+.Ss Output Style
+The default (without
+.Fl e ,
+.Fl c ,
+.Fl n ,
+or
+.Fl t
+.\"  -C
+options) diff utility
+output contains lines of these forms, where
+.Va XX , YY , ZZ , QQ
+are line numbers respective of file order.
+.Pp
+.Dp Cx Li XX
+.Ic a
+.Li YY
+.Cx
+At (the end of) line
+.Va XX
+of
+.Ar file1 ,
+append the contents
+of line
+.Va YY
+of
+.Ar file2
+to make them equal.
+.Dp Cx Li XX
+.Ic a
+.Li YY ,
+.Li ZZ
+.Cx
+Same as above, but append the range of lines,
+.Va YY
+through
+.Va ZZ
+of
+.Ar file2
+to line
+.Va XX
+of file1.
+.Dp Cx Li XX
+.Ic d
+.Li YY
+.Cx
+At line
+.Va XX
+delete
+the line. The value
+.Va YY
+tells to which line the change
+would bring
+.Ar file1
+in line with
+.Ar file1 .
+.Dp Cx Li XX ,
+.Li YY
+.Ic d
+.Li ZZ
+.Cx
+Delete the range of lines
+.Va XX
+through
+.Va YY
+in
+.Ar file1 .
+.Dp Cx Li XX
+.Ic c
+.Li YY
+.Cx
+Change the line
+.Va XX
+in
+.Ar file1
+to the line
+.Va YY
+in
+.Ar file2.
+.Dp Cx Li XX ,
+.Li YY
+.Ic c
+.Li ZZ
+.Cx
+Replace the range of specified lines with the line
+.Va ZZ .
+.Dp Cx Li XX ,
+.Li YY
+.Ic c
+.Li ZZ ,
+.Li QQ
+.Cx
+Replace the range
+.Cx Va XX ,
+.Va YY
+.Cx
+from
+.Ar file1
+with the range
+.Cx Va ZZ ,
+.Va QQ
+.Cx
+from
+.Ar file2 .
+.Dp
+.Pp
+These lines resemble
+.Xr ed 1
+subcommands to convert
+.Ar file1
+into
+.Ar file2 .
+The line numbers before the action letters pertain to
+.Ar file1 ;
+those after pertain to
+.Ar file2 .
+Thus, by exchanging
+.Ic a
+for
+.Ic d
+and reading the line in reverse order, one can also
+determine how to convert
+.Ar file2
+into
+.Ar file1 .
+As in
+.Xr ed 1 ,
+identical
+pairs (where num1 = num2) are abbreviated as a single
+number.
+.Sh ENVIRONMENT
+.Tw Fl
+.Tp Ev TMPDIR
+If the environment variable
+.Ev TMPDIR
+exists,
+.Nm Diff
+will use the name specified by
+.Ev TMPDIR
+as an alternate temporary directory.
+.Tp
+.Sh FILES
+.Dw /usr/bin/diffh
+.Di L
+.Dp Pa /tmp/d?????

 .br
 .br

-/bin/pr
-.SH "SEE ALSO"
-cmp(1), cc(1), comm(1), ed(1), diff3(1)
-.SH DIAGNOSTICS
-Exit status is 0 for no differences, 1 for some, 2 for trouble.
-.SH BUGS
-Editing scripts produced under the
-.BR \-e " or"
-.BR \-f " option are naive about"
-creating lines consisting of a single `\fB.\fR'.
-.PP
+.Dp Pa /usr/bin/diffh
+Alternate algorithm version (used by option
+.Fl h ) .
+.Dp Pa /usr/bin/diff
+for directory diffs
+.Dp Pa /usr/bin/pr
+used by the
+.Fl l
+option.
+.Dp
+.Sh SEE ALSO
+.Xr cmp 1 ,
+.Xr cc 1 ,
+.Xr comm 1 ,
+.Xr ed 1 ,
+.Xr diff3 1
+.Sh HISTORY
+.Nm Diff
+appeared in Version 6 AT&T Unix.
+.Sh DIAGNOSTICS
+The
+.Nm diff
+utility exits with one of the following values:
+.Dw Ds
+.Dp \&0
+No differences were found.
+.Dp \&1
+Differences were found.
+.Dp \&>\&1
+An error occurred.
+.Dp
+.Sh BUGS
+The
+.Fl f
+and
+.Fl e
+options
+have difficulties producing lines with the
+first and only character
+.Dq Li \&. ,
+as this is a command character for
+.Xr ed 1 .
+.Pp

 When comparing directories with the
 When comparing directories with the

-\fB\-b, -w\fP or \fB-i\fP
+.Fl b ,
+.Fl w
+or
+.Fl i

 options specified,
 options specified,

-.I diff
+.Nm diff

 first compares the files ala
 first compares the files ala

-.I cmp,
+.Ar cmp ,

 and then decides to run the
 and then decides to run the

-.I diff
+.Nm diff

 algorithm if they are not equal.
 This may cause a small amount of spurious output if the files
 then turn out to be identical because the only differences are
 insignificant blank string or case differences.
 algorithm if they are not equal.
 This may cause a small amount of spurious output if the files
 then turn out to be identical because the only differences are
 insignificant blank string or case differences.

+.\" .Sh STANDARDS

diff --git a/usr/src/usr.bin/diff/diff3/diff3.1 b/usr/src/usr.bin/diff/diff3/diff3.1
index 94a66aa..c5ff0af 100644 (file)
--- a/usr/src/usr.bin/diff/diff3/diff3.1
+++ b/usr/src/usr.bin/diff/diff3/diff3.1
@@ -1,114 +1,84 @@
-.\"    @(#)diff3.1     6.2 (Berkeley) %G%
+.\" Copyright (c) 1990 The Regents of the University of California.
+.\" All rights reserved.

 .\"
 .\"

-.TH DIFF3 1 ""
-.AT 3
-.SH NAME
-diff3 \- 3-way differential file comparison
-.SH SYNOPSIS
-.B diff3
-[
-.B \-exEX3
-]
-file1 file2 file3
-.SH DESCRIPTION
-.I Diff3
-compares three versions of a file,
-and publishes disagreeing ranges of text
-flagged with these codes:
-.TP 16
-====
-all three files differ
-.TP 16
-====1
-.IR file1 " is different"
-.TP 16
-====2
-.IR file2 " is different"
-.TP 16
-====3
-.IR file3 " is different"
-.PP
-The type of change suffered in converting a given range
-of a given file to some other is
-indicated in one of these ways:
-.TP 16
-.IB f " : " n1 " a"
-Text is to be appended after line number
-.I n1
-in file
-.I f,
-where
-.I f
-= 1, 2, or 3.
-.TP 16
-.IB f " : " n1 " , " n2 " c"
-Text is to be
-changed in the range line
-.I n1
-to line
-.IR n2 .
-If 
-.I n1
-=
-.I n2,
-the range may be abbreviated to
-.IR n1 .
-.PP
-The original contents of the range follows immediately
-after a
-.B c
-indication.
-When the contents of two
-files are identical, the contents of the lower-numbered
-file is suppressed.
-.PP
-Under the
-.B \-e
-option,
-.I diff3
-publishes a script for the editor
-.I ed
-that will incorporate into
-.I file1
-all changes between
-.I file2
-and
-.I file3,
-.IR i.e .
-the changes that normally would be flagged ==== and ====3.
-Option
-.B \-x
-(\fB\-3\fR)
-produces a script to incorporate
-only changes flagged ==== (====3).
-The following command will apply the resulting script to
-`file1'.
-.PP
-.ti 16n
-(cat script; echo \'1,$p\') \(bv ed \- file1
-.PP
+.\" %sccs.include.redist.man%
+.\"
+.\"     @(#)diff3.1    6.3 (Berkeley) %G%
+.\"
+.Dd 
+.Dt DIFF3 1
+.Os BSD 4.4
+.Sh NAME
+.Nm diff3
+.Nd 3-way differential file comparison
+.Sh SYNOPSIS
+.Nm diff3
+.Op Fl exEX3
+.Ar file1 file2 file3
+.Sh DESCRIPTION

 The
 The

-.B \-E
+.Nm diff3
+utility compares the contents of three different versions of a file,
+.Ar file1 ,
+.Ar file2

 and
 and

-.B \-X
-are similar to
-.B \-e
+.Ar file3 ,
+writing the result to the standard output.
+The options describe different methods of merging and
+purging
+the separate versions into a new file.
+.Nm Diff3
+is used by
+.Xr RCS 1
+to merge specific versions or create
+new versions.
+.Pp
+Options are:
+.Tp Fl e
+Produces output in a form suitable as an input script for the
+.Xr ed 1
+utility.  The script may then be used to merge differences common
+between all three files and differences specific to file1 and file3.
+In other words, the
+.Fl e
+option ignores differences specific to file1 and file2, and those
+specific to file2 and file3.  It is useful for backing out changes
+specific to file2 only.
+.Tp Fl x
+Produces an output script suitable for
+.Xr ed 1
+with changes
+specific only to all three versions.
+.Tp Fl 3
+Produces an output script suitable for
+.Xr ed 1
+with changes
+specific only to file3.
+.Tp Fl E , X
+Similar to
+.Fl e

 and
 and

-.BR \-x ,
+.Fl x  ,

 respectively, but treat overlapping changes (i.e., changes that would
 respectively, but treat overlapping changes (i.e., changes that would

-be flagged with ==== in the normal listing) differently.  The overlapping
+be noted with ==== in the normal listing) differently.  The overlapping

 lines from both files will be inserted by the edit script, bracketed
 by "<<<<<<" and ">>>>>>" lines.
 lines from both files will be inserted by the edit script, bracketed
 by "<<<<<<" and ">>>>>>" lines.

-.PP
+.Tp
+.Pp
+The
+.Fl E
+option is used by RCS
+.Xr merge  1
+to insure that overlapping changes in the merged files are preserved
+and brought to someone's attention.
+.Pp

 For example, suppose lines 7-8 are changed in both file1 and file2.
 Applying the edit script generated by the command
 For example, suppose lines 7-8 are changed in both file1 and file2.
 Applying the edit script generated by the command

-.ce
-"diff3 -E file1 file2 file3" 
-.br
+.Pp
+.Dl diff3 -E file1 file2 file3
+.Pp

 to file1 results in the file:
 to file1 results in the file:

-.RS
-.nf
-
+.Ds I

 lines 1-6
 of file1
 <<<<<<< file1
 lines 1-6
 of file1
 <<<<<<< file1


@@ -119,22 +89,101 @@ lines 7-8
 of file3
 >>>>>>> file3
 rest of file1
 of file3
 >>>>>>> file3
 rest of file1

-.fi
-.RE
-.PP
+.De
+.Pp
+The default output of
+.Nm diff3
+makes notation of the differences between all files, and those differences
+specific to each pair of files. The
+changes are described by
+the commands neccessary for
+.Xr ed 1 
+to create the desired target from the different versions.
+See
+.Xr diff 1
+for a description of the commands.
+.Tw Fl
+.Tp Li \&====
+The lines beneath this notation are ranges of lines which are different
+between all files.
+.Tc Li \&====
+.Va n
+.Cx
+The lines beneath this notation are ranges of lines which are exclusively
+different in file
+.Va n .
+.Tp
+.Sh EXAMPLES
+.Pp
+If three files were to contain:
+.Ds I
+.Cw  mooxthree mooxthree mooxthree
+.Cl file1      file2   file3
+.Cl moo        moo     moo
+.Cl moo too    moon    moon
+.Cl moo three  moo moo moo moo
+.Cl tangent    beam    milk
+.Cl moo moo    sun     butter
+.Cl \tcloud    beam
+.Cl \tmoo moo
+.Cl \tmoo moo
+.Cw
+.De
+.Pp
+The command line
+.Pp
+.Dl diff3 -e file1 file2 file3
+.Pp
+produces the following ed script:
+.Pp
+.Ds C
+====1
+1:2,4c
+  moo two
+  moo three
+  tangent
+2:2c
+3:2c
+  moon
+====
+1:5a
+2:4,8c
+  beam
+  sun
+  cloud
+  moo moo
+  moo moo
+3:4,6c
+  milk
+  butter
+  beam
+.De
+.Sh FILES
+.Dw /usr/bin/diff3
+.Di L
+.Dp Pa /tmp/d3?????
+temporary files.
+.Dp Pa /usr/bin/diff3
+the executable.
+.Dp
+.Sh SEE ALSO
+.Xr diff 1
+.Xr ed 1
+.Xr rcs 1
+.Sh HISTORY
+.Nm Diff3
+appeared in Version 7 AT&T Unix.
+.Sh BUGS

 The
 The

-.B \-E
-option is used by RCS
-.IR merge (1)
-to insure that overlapping changes in the merged files are preserved
-and brought to someone's attention.
-.SH FILES
-/tmp/d3?????
-.br
-/usr/lib/diff3
-.SH "SEE ALSO"
-diff(1)
-.SH BUGS
-Text lines that consist of a single `.' will
-defeat
-.B \-e.
+.Fl e
+option
+cannot catch and change
+lines which have
+.Sq Li \&.
+as the first ans only character on the line.
+The resulting script will fail on that line
+as the
+.Sq Li \&.
+is an
+.Xr ed 1
+editing command.

diff --git a/usr/src/usr.bin/du/du.1 b/usr/src/usr.bin/du/du.1
index 9eda984..bf665ba 100644 (file)
--- a/usr/src/usr.bin/du/du.1
+++ b/usr/src/usr.bin/du/du.1
@@ -1,52 +1,58 @@
-.\"    @(#)du.1        6.4 (Berkeley) %G%
+.\" Copyright (c) 1990 The Regents of the University of California.
+.\" All rights reserved.

 .\"
 .\"

-.TH DU 1 ""
-.AT 3
-.SH NAME
-du \- summarize disk usage
-.SH SYNOPSIS
-.B du
-[
-.B \-aksx
-] [ name ... ]
-.SH DESCRIPTION
-.I Du
-gives the number of 512-byte blocks contained in all files and,
-recursively, directories within each specified directory or file
-.IR name .
-If
-.I name
-is missing, the current directory is used.
+.\" %sccs.include.redist.man%
+.\"
+.\"     @(#)du.1       6.5 (Berkeley) %G%
+.\"
+.Dd 
+.Dt DU 1
+.Os BSD 4.4
+.Sh NAME
+.Nm du
+.Nd display disk usage statistics
+.Sh SYNOPSIS
+.Nm du
+.Op Fl aksx
+.Op Ar pathname ...
+.Sh DESCRIPTION
+.Nm Du
+utility displays the block usage of files in the current directory
+or for the entire tree of a given pathname.
+.Pp

 The options are as follows:
 The options are as follows:

-.TP
--a
+.Tp Fl a

 Generate an entry for each file.
 Generate an entry for each file.

-.TP
--k
+.Tp Fl k

 By default,
 By default,

-.I du
+.Nm du

 displays the number of blocks as returned by the
 displays the number of blocks as returned by the

-.IR stat (2)
+.Xr stat  2

 system call, i.e. 512-byte blocks.
 If the
 system call, i.e. 512-byte blocks.
 If the

-.I -k
+.Fl k

 flag is specified, the number displayed is the number of 1024-byte
 blocks with partial blocks rounded up.
 flag is specified, the number displayed is the number of 1024-byte
 blocks with partial blocks rounded up.

-.TP
--s
+.Tp Fl s

 Generate only the grand total.
 If neither
 Generate only the grand total.
 If neither

-.I -a
+.Fl a

 or
 or

-.I -s
+.Fl s

 are specified, an entry is generated for each directory only.
 are specified, an entry is generated for each directory only.

-.TP
--x
+.Tp Fl x

 Don't traverse any mount points.
 Don't traverse any mount points.

-.PP
-A file which has multiple hard links to it is only counted
-(and displayed) once per
-.I du
+.Tp
+.Pp
+Files having multiple hard links are counted
+(and displayed) a single time per
+.Nm du

 execution.
 execution.

-.SH "SEE ALSO"
-df(1), quot(8)
+.Dp
+.Sh SEE ALSO
+.Xr df 1 ,
+.Xr quot 8
+.Sh HISTORY
+A
+.Nm du
+command appeared in Version 6 AT&T Unix.

diff --git a/usr/src/usr.bin/error/error.1 b/usr/src/usr.bin/error/error.1
index e410b6b..25f0a0d 100644 (file)
--- a/usr/src/usr.bin/error/error.1
+++ b/usr/src/usr.bin/error/error.1
@@ -1,53 +1,85 @@
-.\" Copyright (c) 1980 The Regents of the University of California.
+.\" Copyright (c) 1980, 1990 The Regents of the University of California.

 .\" All rights reserved.
 .\"
 .\" All rights reserved.
 .\"

-.\" Redistribution and use in source and binary forms are permitted
-.\" provided that the above copyright notice and this paragraph are
-.\" duplicated in all such forms and that any documentation,
-.\" advertising materials, and other materials related to such
-.\" distribution and use acknowledge that the software was developed
-.\" by the University of California, Berkeley.  The name of the
-.\" University may not be used to endorse or promote products derived
-.\" from this software without specific prior written permission.
-.\" THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
-.\" IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-.\" WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+.\" %sccs.include.redist.man%

 .\"
 .\"

-.\"    @(#)error.1     6.3 (Berkeley) %G%
+.\"     @(#)error.1    6.4 (Berkeley) %G%

 .\"
 .\"

-.TH ERROR 1 ""
-.UC 4
-.SH NAME
-error \- analyze and disperse compiler error messages
-.SH SYNOPSIS
-.B error
-[
-.B \-n
-] [
-.B \-s
-] [
-.B \-q
-] [
-.B \-v
-] [
-.B \-t
-suffixlist
-] [
-.B \-I
-ignorefile
-] [ name ]
-.SH DESCRIPTION
-.I Error
+.Dd 
+.Dt ERROR 1
+.Os BSD 4
+.Sh NAME
+.Nm error
+.Nd analyze and disperse compiler error messages
+.Sh SYNOPSIS
+.Nm error
+.Op Fl n
+.Op Fl s
+.Op Fl q
+.Op Fl v
+.Op Fl t Ar suffixlist
+.Op Fl I Ar ignorefile
+.Op name
+.Sh DESCRIPTION
+.Nm Error

 analyzes and optionally disperses the diagnostic error messages
 produced by a number of compilers and language processors to the source
 file and line where the errors occurred.  It can replace the painful,
 traditional methods of scribbling abbreviations of errors on paper, and
 permits error messages and source code to be viewed simultaneously
 without machinations of multiple windows in a screen editor.
 analyzes and optionally disperses the diagnostic error messages
 produced by a number of compilers and language processors to the source
 file and line where the errors occurred.  It can replace the painful,
 traditional methods of scribbling abbreviations of errors on paper, and
 permits error messages and source code to be viewed simultaneously
 without machinations of multiple windows in a screen editor.

-.PP
-.I Error
+.Pp
+Options are:
+.Tp Fl n
+Do
+.Em not
+touch any files; all error messages are sent to the
+standard output.
+.Tp Fl q
+The user is
+.Ar queried
+whether s/he wants to touch the file.
+A ``y'' or ``n'' to the question is necessary to continue.
+Absence of the
+.Fl q
+option implies that all referenced files
+(except those referring to discarded error messages)
+are to be touched.
+.Tp Fl v
+After all files have been touched,
+overlay the visual editor
+.Xr vi
+with it set up to edit all files touched,
+and positioned in the first touched file at the first error.
+If
+.Xr vi
+can't be found, try
+.Xr ex
+or
+.Xr ed
+from standard places.
+.Tp 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.
+Thus the suffix list:
+.Pp
+.Dl ".c.y.foo*.h"
+.Pp
+allows
+.Nm error
+to touch files ending with ``.c'', ``.y'', ``.foo*'' and ``.y''.
+.Tp Fl s
+Print out
+.Em statistics
+regarding the error categorization.
+Not too useful.
+.Tp
+.Pp
+.Nm Error

 looks at the error messages,
 looks at the error messages,

-either from the specified file \fIname\fR
+either from the specified file
+.Ar name

 or from the standard input,
 and attempts to determine which
 language processor produced each error message,
 or from the standard input,
 and attempts to determine which
 language processor produced each error message,


@@ -59,139 +91,116 @@ line the error message refers.
 Error messages which can't be categorized by language processor
 or content are not inserted into any file,
 but are sent to the standard output.
 Error messages which can't be categorized by language processor
 or content are not inserted into any file,
 but are sent to the standard output.

-.I Error
+.Nm Error

 touches source files only after all input has been read.
 touches source files only after all input has been read.

-By specifying the
-.B \-q
-query option,
-the user is asked to confirm any potentially
-dangerous (such as touching a file) or verbose action.
-Otherwise
-.I error
-proceeds on its merry business.
-If the
-.B \-t
-touch option and associated suffix list is given, 
-.I error
-will restrict itself to touch only those files with suffices
-in the suffix list.
-Error also can be asked (by specifying
-.B \-v)
-to invoke
-.IR vi (1)
-on the files in which error messages were inserted; this obviates
-the need to remember the names of the files with errors.
-.PP
-.I Error
+.Pp
+.Nm Error

 is intended to be run
 with its standard input
 connected via a pipe to the error message source.
 Some language processors put error messages on their standard error file;
 others put their messages on the standard output.
 Hence, both error sources should be piped together into
 is intended to be run
 with its standard input
 connected via a pipe to the error message source.
 Some language processors put error messages on their standard error file;
 others put their messages on the standard output.
 Hence, both error sources should be piped together into

-.I error.
-For example, when using the \fIcsh\fP syntax,
-.IP
-make \-s lint |\|& error \-q \-v
-.LP
+.Nm error .
+For example, when using the
+.Xr csh 1
+syntax,
+.Pp
+.Dl make \-s lint \& error \-q \-v
+.Pp

 will analyze all the error messages produced
 by whatever programs
 will analyze all the error messages produced
 by whatever programs

-.I make
+.Xr make 1

 runs when making lint.
 runs when making lint.

-.PP
-.I Error
+.Pp
+.Nm Error

 knows about the error messages produced by:
 knows about the error messages produced by:

-.I make,
-.I cc,
-.I cpp,
-.I ccom,
-.I as,
-.I ld,
-.I lint,
-.I pi,
-.I pc,
-.I f77,
+.Xr make 1 ,
+.Xr cc 1 ,
+.Xr cpp 1 ,
+.Xr ccom 1 ,
+.Xr as 1 ,
+.Xr ld 1 ,
+.Xr lint 1 ,
+.Xr pi 1 ,
+.Xr pc 1 ,
+.Xr f77 1 ,

 and
 and

-.I DEC Western Research Modula-2.
-.I Error
+.Em DEC Western Research Modula\-2 .
+.Nm Error

 knows a standard format for error messages produced by
 the language processors,
 so is sensitive to changes in these formats.
 knows a standard format for error messages produced by
 the language processors,
 so is sensitive to changes in these formats.

-For all languages except 
-.I Pascal,
+For all languages except
+.Em Pascal ,

 error messages are restricted to be on one line.
 Some error messages refer to more than one line in more than
 one files;
 error messages are restricted to be on one line.
 Some error messages refer to more than one line in more than
 one files;

-.I error
+.Nm error

 will duplicate the error message and insert it at
 all of the places referenced.
 will duplicate the error message and insert it at
 all of the places referenced.

-.PP
-.I Error
+.Pp
+.Nm Error

 will do one of six things with error messages.
 will do one of six things with error messages.

-.TP 10
-.I synchronize
+.Tp Em synchronize

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

-.I Error 
+.Nm Error

 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
 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

-.I error.
-.TP 10
-.I discard
+.Nm error .
+.Tp Em discard

 Error messages from
 Error messages from

-.I lint
+.Xr lint 1

 that refer to one of the two
 that refer to one of the two

-.I lint
+.Xr lint 1

 libraries,
 libraries,

-.I /usr/lib/llib-lc
+.Pa /usr/libdata/lint/llib-lc

 and
 and

-.I /usr/lib/llib-port
+.Pa /usr/libdata/lint/llib-port

 are discarded,
 to prevent accidently touching these libraries.
 Again, these error messages are consumed entirely by
 are discarded,
 to prevent accidently touching these libraries.
 Again, these error messages are consumed entirely by

-.I error.
-.TP 10
-.I nullify
+.Nm error .
+.Tp Em nullify

 Error messages from
 Error messages from

-.I lint
+.Xr lint 1

 can be nullified if they refer to a specific function,
 which is known to generate diagnostics which are not interesting.
 Nullified error messages are not inserted into the source file,
 but are written to the standard output.
 The names of functions to ignore are taken from
 either the file named
 can be nullified if they refer to a specific function,
 which is known to generate diagnostics which are not interesting.
 Nullified error messages are not inserted into the source file,
 but are written to the standard output.
 The names of functions to ignore are taken from
 either the file named

-.I .errorrc
-in the users's home directory, 
+.Pa .errorrc
+in the users's home directory,

 or from the file named by the
 or from the file named by the

-.B \-I
+.Fl I

 option.
 If the file does not exist,
 no error messages are nullified.
 If the file does exist, there must be one function
 name per line.
 option.
 If the file does not exist,
 no error messages are nullified.
 If the file does exist, there must be one function
 name per line.

-.TP 10
-.I not file specific
+.Tp 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 10
-.I file specific
+.Tp 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 10
-.I true errors
+.Tp 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.

-.PP
+.Tp
+.Pp

 Only true error messages are candidates for inserting into
 the file they refer to.
 Other error messages are consumed entirely by
 Only true error messages are candidates for inserting into
 the file they refer to.
 Other error messages are consumed entirely by

-.I error
+.Nm error

 or are written to the standard output.
 or are written to the standard output.

-.I Error
+.Nm Error

 inserts the error messages into the source file on the line
 preceding the line the language processor found in error.
 Each error message is turned into a one line comment for the
 inserts the error messages into the source file on the line
 preceding the line the language processor found in error.
 Each error message is turned into a one line comment for the


@@ -214,95 +223,50 @@ which can wreak havoc with a future compilation.
 To avoid this, programs with comments and source
 on the same line should be formatted
 so that language statements appear before comments.
 To avoid this, programs with comments and source
 on the same line should be formatted
 so that language statements appear before comments.

-.PP
-Options available with
-.I error
-are:
-.TP 5
-.B \-n
-Do
-.I not
-touch any files; all error messages are sent to the
-standard output.
-.TP 5
-.B \-q
-The user is
-.I queried
-whether s/he wants to touch the file.
-A ``y'' or ``n'' to the question is necessary to continue.
-Absence of the
-.B \-q
-option implies that all referenced files
-(except those referring to discarded error messages)
-are to be touched.
-.TP 5
-.B \-v
-After all files have been touched,
-overlay the visual editor
-.I vi
-with it set up to edit all files touched,
-and positioned in the first touched file at the first error.
-If
-.I vi 
-can't be found, try
-.I ex
-or
-.I ed
-from standard places.
-.TP 5
-.B \-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.
-Thus the suffix list:
-.IP
-\&     ".c.y.foo*.h"
-.IP
-allows
-.I error
-to touch files ending with ``.c'', ``.y'', ``.foo*'' and ``.y''.
-.TP 5
-.B \-s
-Print out 
-.I statistics
-regarding the error categorization.
-Not too useful.
-.PP
-.I Error
+.Pp
+.Nm Error

 catches interrupt and terminate signals,
 and if in the insertion phase,
 will orderly terminate what it is doing.
 catches interrupt and terminate signals,
 and if in the insertion phase,
 will orderly terminate what it is doing.

-.SH AUTHOR
+.Sh FILES
+.Dw ~/.errorrc
+.Di L
+.Dp ~/.errorrc
+function names to ignore for
+.Xr lint 1
+error messages
+.Dp Pa /dev/tty
+user's teletype
+.Dp
+.Sh HISTORY
+.Nm Error
+appeared in 4.0 BSD.
+.Sh AUTHOR

 Robert Henry
 Robert Henry

-.SH FILES
-.ta 2i
-~/.errorrc     function names to ignore for \fIlint\fP error messages
-.br
-/dev/tty       user's teletype
-.SH BUGS
-.PP
+.Sh BUGS
+.Pp

 Opens the teletype directly to do user querying.
 Opens the teletype directly to do user querying.

-.PP
+.Pp

 Source files with links make a new copy of the file with
 only one link to it.
 Source files with links make a new copy of the file with
 only one link to it.

-.PP
+.Pp

 Changing a language processor's format of error messages
 Changing a language processor's format of error messages

-may cause 
-.I error
+may cause
+.Nm error

 to not understand the error message.
 to not understand the error message.

-.PP
-.I Error,
+.Pp
+.Nm Error ,

 since it is purely mechanical,
 will not filter out subsequent errors caused by `floodgating'
 initiated by one syntactically trivial error.
 Humans are still much better at discarding these related errors.
 since it is purely mechanical,
 will not filter out subsequent errors caused by `floodgating'
 initiated by one syntactically trivial error.
 Humans are still much better at discarding these related errors.

-.PP
+.Pp

 Pascal error messages belong after the lines affected
 Pascal error messages belong after the lines affected

-(error puts them before).  The alignment of the `\||\|' marking
+(error puts them before).  The alignment of the `\\' marking

 the point of error is also disturbed by
 the point of error is also disturbed by

-.I error.
-.PP
-.I Error
+.Nm error .
+.Pp
+.Nm Error

 was designed for work on CRT's at reasonably high speed.
 It is less pleasant on slow speed terminals, and has never been
 used on hardcopy terminals.
 was designed for work on CRT's at reasonably high speed.
 It is less pleasant on slow speed terminals, and has never been
 used on hardcopy terminals.

diff --git a/usr/src/usr.bin/ex/ex.1 b/usr/src/usr.bin/ex/ex.1
index 7fe4239..f8b8d3a 100644 (file)
--- a/usr/src/usr.bin/ex/ex.1
+++ b/usr/src/usr.bin/ex/ex.1
@@ -1,146 +1,185 @@
-.\" Copyright (c) 1980 Regents of the University of California.
-.\" All rights reserved.  The Berkeley software License Agreement
-.\" specifies the terms and conditions for redistribution.
+.\" Copyright (c) 1980, 1990 The Regents of the University of California.
+.\" All rights reserved.

 .\"
 .\"

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

 .\"
 .\"

-.TH EX 1 ""
-.UC 4
-.SH NAME
-ex, edit \- text editor
-.SH SYNOPSIS
-.B ex
-[
-.B \-
-] [
-.B \-v
-] [
-.B \-t 
-tag
-] [
-.B \-r
-] [
-\fB+\fIcommand\fR
-] [
-.B \-l
-]
-name ...
-.br
-.B edit
-[
-ex options
-]
-.SH DESCRIPTION
-.I Ex
+.\"     @(#)ex.1       6.5 (Berkeley) %G%
+.\"
+.Dd 
+.Dt EX 1
+.Os BSD 4
+.Sh NAME
+.Nm ex , edit
+.Nd text editor
+.Sh SYNOPSIS
+.Nm ex
+.Op Fl
+.Op Fl v
+.Op Fl t Ar tag
+.Op Fl r
+.Oo
+.Op Cm + Ar command
+.Oo
+.Op Fl l
+.Ar name
+\&...
+.Nm edit
+.Op ex options
+.Sh DESCRIPTION
+.Nm Ex

 is the root of a family of editors:
 is the root of a family of editors:

-.I edit,
-.I ex
+.Nm edit ,
+.Nm ex

 and
 and

-.I vi.
-.I Ex
+.Nm vi .
+.Nm Ex

 is a superset of
 is a superset of

-.I ed,
+.Xr ed ,

 with the most notable extension being a display editing facility.
 Display based editing is the focus of
 with the most notable extension being a display editing facility.
 Display based editing is the focus of

-.I vi.
-.PP
+.Xr vi 1 .
+.Pp

 If you have not used
 If you have not used

-.I ed,
+.Xr ed 1 ,

 or are a casual user, you will find that the editor
 or are a casual user, you will find that the editor

-.I edit
+.Nm edit

 is convenient for you.
 It avoids some of the complexities of
 is convenient for you.
 It avoids some of the complexities of

-.I ex
+.Nm ex

 used mostly by systems programmers and persons very familiar with
 used mostly by systems programmers and persons very familiar with

-.I ed.
-.PP
-If you have a \s-2CRT\s0 terminal, you may wish to use a display
+.Xr ed 1 .
+.Pp
+If you have a
+.Li CRT
+terminal, you may wish to use a display

 based editor; in this case
 see
 based editor; in this case
 see

-.IR vi (1),
+.Xr vi  1  ,

 which is a command which focuses on the display editing portion of
 which is a command which focuses on the display editing portion of

-.I ex.
-.SH DOCUMENTATION
+.Nm ex .
+.Sh DOCUMENTATION

 The document
 The document

-.I "Edit: A tutorial"
+.Em Edit: A tutorial

 (USD:14) provides a comprehensive introduction to
 (USD:14) provides a comprehensive introduction to

-.I edit
-assuming no previous knowledge of computers or the \s-2UNIX\s0 system.
-.PP
+.Nm edit
+assuming no previous knowledge of computers or the UNIX
+system.
+.Pp

 The
 The

-.I "Ex Reference Manual \- Version 3.7"
+.Em Ex Reference Manual \- Version 3.7

 (USD:16)
 is a comprehensive and complete manual for the command mode features
 of
 (USD:16)
 is a comprehensive and complete manual for the command mode features
 of

-.I ex,
+.Nm ex ,

 but you cannot learn to use the editor by reading it.
 For an introduction to
 more advanced forms of editing using the command mode of
 but you cannot learn to use the editor by reading it.
 For an introduction to
 more advanced forms of editing using the command mode of

-.I ex
+.Nm ex

 see the editing documents written by Brian Kernighan for the editor
 see the editing documents written by Brian Kernighan for the editor

-.I ed;
+.Xr ed 1 ;

 the material in the introductory and advanced documents works also with
 the material in the introductory and advanced documents works also with

-.I ex.
-.PP
-.I "An Introduction to Display Editing with Vi"
+.Nm ex .
+.Pp
+.Em An Introduction to Display Editing with Vi

 (USD:15)
 introduces the display editor
 (USD:15)
 introduces the display editor

-.I vi
+.Xr vi 1

 and provides reference material on
 and provides reference material on

-.I vi.
+.Xr vi 1 .

 In addition, the
 In addition, the

-.I "Vi Quick Reference"
+.Em Vi Quick Reference

 card summarizes the commands
 of
 card summarizes the commands
 of

-.I vi
+.Xr vi 1

 in a useful, functional way, and is useful with the
 in a useful, functional way, and is useful with the

-.I Introduction.
-.SH FILES
-.DT
-/usr/lib/ex?.?strings          error messages
-.br
-/usr/lib/ex?.?recover          recover command
-.br
-/usr/lib/ex?.?preserve         preserve command
-.br
-/etc/termcap                   describes capabilities of terminals
-.br
-~/.exrc                                editor startup file
-.br
-/tmp/Ex\fInnnnn\fR                     editor temporary
-.br
-/tmp/Rx\fInnnnn\fR                     named buffer temporary
-.br
-/usr/preserve                  preservation directory
-.SH SEE ALSO
-awk(1), ed(1), grep(1), sed(1), grep(1), vi(1), termcap(5), environ(7)
-.SH AUTHOR
+.Em Introduction .
+.Sh ENVIRONMENT
+The
+.Nm
+command uses the following environment variables.
+.Tw Ar
+.Tp Ev EXINIT
+User specified startup values for
+.Nm ex .
+.Tp Ev HOME
+Default directory to search for
+the file
+.Pa ~/.exrc
+.Tp Ev SHELL
+Shell used for
+.Em escaped
+commands (with the
+.Ic \&!
+command).
+.Tp Ev TERM
+Terminal type.
+.Tp Ev TERMCAP
+Alternate termcap file.
+.Tp
+.Sh FILES
+.Dw /usr/libexec/ex?.?preserve
+.Di L
+.Dp Pa  /usr/libexec/ex?.?strings
+error messages
+.Dp Pa  /usr/libexec/ex?.?recover
+recover command
+.Dp Pa  /usr/libexec/ex?.?preserve
+preserve command
+.Dp Pa  /usr/share/misc/termcap
+describes capabilities of terminals
+.Dp Pa  ~/.exrc
+editor startup file
+.Dc Pa /tmp/Ex
+.Ar nnnnn
+.Cx
+editor temporary
+.Dc Pa /tmp/Rx
+.Ar nnnnn
+.Cx
+named buffer temporary
+.Dp Pa /var/preserve
+preservation directory
+.Dp
+.Sh SEE ALSO
+.Xr awk 1 ,
+.Xr ed 1 ,
+.Xr grep 1 ,
+.Xr sed 1 ,
+.Xr grep 1 ,
+.Xr vi 1 ,
+.Xr termcap 5 ,
+.Xr environ 7
+.Sh HISTORY
+.Nm Ex
+appeared in 3 BSD.
+.Sh AUTHOR

 Originally written by William Joy
 .br
 Mark Horton has maintained the editor since version 2.7, adding macros,
 support for many unusual terminals,
 and other features such as word abbreviation mode.
 Originally written by William Joy
 .br
 Mark Horton has maintained the editor since version 2.7, adding macros,
 support for many unusual terminals,
 and other features such as word abbreviation mode.

-.SH BUGS
+.Sh BUGS

 The
 The

-.I undo
+.Ic undo

 command causes all marks to be lost on lines changed and then restored
 if the marked lines were changed.
 command causes all marks to be lost on lines changed and then restored
 if the marked lines were changed.

-.PP
-.I Undo
+.Pp
+.Ic Undo

 never clears the buffer modified condition.
 never clears the buffer modified condition.

-.PP
+.Pp

 The
 The

-.I z
+.Ic z

 command prints a number of logical rather than physical lines.
 More than a screen full of output may result if long lines are present.
 command prints a number of logical rather than physical lines.
 More than a screen full of output may result if long lines are present.

-.PP
-File input/output errors don't print a name if the command line \fB`\-'\fR
+.Pp
+File input/output errors don't print a name if the command line
+.Sq Fl

 option is used.
 option is used.

-.PP
+.Pp

 There is no easy way to do a single scan ignoring case.
 There is no easy way to do a single scan ignoring case.

-.PP
+.Pp

 The editor does not warn if text is placed in named buffers and not used
 before exiting the editor.
 The editor does not warn if text is placed in named buffers and not used
 before exiting the editor.

-.PP
+.Pp

 Null characters are discarded in input files, and cannot appear in resultant
 files.
 Null characters are discarded in input files, and cannot appear in resultant
 files.

diff --git a/usr/src/usr.bin/expand/expand.1 b/usr/src/usr.bin/expand/expand.1
index 06c2aa3..681f95c 100644 (file)
--- a/usr/src/usr.bin/expand/expand.1
+++ b/usr/src/usr.bin/expand/expand.1
@@ -1,64 +1,58 @@
-.\" Copyright (c) 1980 The Regents of the University of California.
+.\" Copyright (c) 1980, 1990 The Regents of the University of California.

 .\" All rights reserved.
 .\"
 .\" All rights reserved.
 .\"

-.\" Redistribution and use in source and binary forms are permitted
-.\" provided that the above copyright notice and this paragraph are
-.\" duplicated in all such forms and that any documentation,
-.\" advertising materials, and other materials related to such
-.\" distribution and use acknowledge that the software was developed
-.\" by the University of California, Berkeley.  The name of the
-.\" University may not be used to endorse or promote products derived
-.\" from this software without specific prior written permission.
-.\" THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
-.\" IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-.\" WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+.\" %sccs.include.redist.man%

 .\"
 .\"

-.\"    @(#)expand.1    6.3 (Berkeley) %G%
+.\"     @(#)expand.1   6.4 (Berkeley) %G%

 .\"
 .\"

-.TH EXPAND 1 ""
-.UC 4
-.SH NAME
-expand, unexpand \- expand tabs to spaces, and vice versa
-.SH SYNOPSIS
-.B expand
-[
-\-tabstop
-] [
-\-tab1,tab2,...,tabn
-] [
-file ...
-]
-.br
-.B unexpand
-[
-.B \-a
-] [
-file ...
-]
-.SH DESCRIPTION
-.I Expand
+.Dd 
+.Dt EXPAND 1
+.Os BSD 4
+.Sh NAME
+.Nm expand ,
+.Nm unexpand
+.Nd expand tabs to spaces, and vice versa
+.Sh SYNOPSIS
+.Nm expand
+.Op \-tabstop
+.Op \-tab1,tab2,...,tabn
+.Ar
+.Nm unexpand
+.Op Fl a
+.Ar
+.Sh DESCRIPTION
+.Nm Expand

 processes the named files or the standard input writing
 the standard output with tabs changed into blanks.
 Backspace characters are preserved into the output and decrement
 the column count for tab calculations.
 processes the named files or the standard input writing
 the standard output with tabs changed into blanks.
 Backspace characters are preserved into the output and decrement
 the column count for tab calculations.

-.I Expand
+.Nm Expand

 is useful for pre-processing character files
 (before sorting, looking at specific columns, etc.) that
 contain tabs.
 is useful for pre-processing character files
 (before sorting, looking at specific columns, etc.) that
 contain tabs.

-.PP
+.Pp

 If a single
 If a single

-.I tabstop
+.Ar tabstop

 argument is given, then tabs are set
 argument is given, then tabs are set

-.I tabstop
+.Ar tabstop

 spaces apart instead of the default 8.
 If multiple tabstops are given then the tabs are set at those
 specific columns.
 spaces apart instead of the default 8.
 If multiple tabstops are given then the tabs are set at those
 specific columns.

-.PP
-.I Unexpand
+.Pp
+.Nm Unexpand

 puts tabs back into the data from the standard input or the named
 files and writes the result on the standard output.
 puts tabs back into the data from the standard input or the named
 files and writes the result on the standard output.

+.Pp
+Option (with
+.Nm unexpand
+only):
+.Tp Fl a

 By default, only leading blanks and tabs
 are reconverted to maximal strings of tabs.  If the
 By default, only leading blanks and tabs
 are reconverted to maximal strings of tabs.  If the

-.B \-a
+.Fl a

 option is given, then tabs are inserted whenever they would compress the
 resultant file by replacing two or more characters.
 option is given, then tabs are inserted whenever they would compress the
 resultant file by replacing two or more characters.

+.Tp
+.Sh HISTORY
+.Nm Expand
+appeared in 3 BSD.