BSD 4_3_Net_2 release

[unix-history] / usr / src / usr.bin / comm / comm.1

diff --git a/usr/src/usr.bin/comm/comm.1 b/usr/src/usr.bin/comm/comm.1
index 0f07e2b..3f74346 100644 (file)
--- a/usr/src/usr.bin/comm/comm.1
+++ b/usr/src/usr.bin/comm/comm.1
@@ -1,24 +1,41 @@
 .\" Copyright (c) 1989, 1990 The Regents of the University of California.
 .\" All rights reserved.
 .\"
 .\" Copyright (c) 1989, 1990 The Regents of the University of California.
 .\" All rights reserved.
 .\"

-.\" Redistribution and use in source and binary forms are permitted provided
-.\" that: (1) source distributions retain this entire copyright notice and
-.\" comment, and (2) distributions including binaries display the following
-.\" acknowledgement:  ``This product includes software developed by the
-.\" University of California, Berkeley and its contributors'' in the
-.\" documentation or other materials provided with the distribution and in
-.\" all advertising materials mentioning features or use of this software.
-.\" Neither the name of the University nor the names of its contributors may
-.\" 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.
+.\" This code is derived from software contributed to Berkeley by
+.\" the Institute of Electrical and Electronics Engineers, Inc.

 .\"
 .\"

-.\"     @(#)comm.1     6.4 (Berkeley) 7/24/90
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\" 3. All advertising materials mentioning features or use of this software
+.\"    must display the following acknowledgement:
+.\"    This product includes software developed by the University of
+.\"    California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.

 .\"
 .\"

-.Dd July 24, 1990
-.Os BSD 4.4
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\"     @(#)comm.1     6.7 (Berkeley) 6/27/91
+.\"
+.Dd June 27, 1991
+.Os

 .Dt COMM 1
 .Sh NAME
 .Nm comm
 .Dt COMM 1
 .Sh NAME
 .Nm comm


@@ -42,19 +59,17 @@ lines only in
 .Ar file2 ;
 and lines in both files.
 .Pp
 .Ar file2 ;
 and lines in both files.
 .Pp

-The filename
-.Sq Fl
-means the standard input.
+The filename ``-'' means the standard input.

 .Pp
 The following options are available:
 .Pp
 The following options are available:

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

 Suppress printing of column 1.
 Suppress printing of column 1.

-.Tp Fl 2
+.It Fl 2

 Suppress printing of column 2.
 Suppress printing of column 2.

-.Tp Fl 3
+.It Fl 3

 Suppress printing of column 3.
 Suppress printing of column 3.

-.Tp
+.El

 .Pp
 Each column will have a number of tab characters prepended to it
 equal to the number of lower numbered columns that are being printed.
 .Pp
 Each column will have a number of tab characters prepended to it
 equal to the number of lower numbered columns that are being printed.


@@ -76,4 +91,4 @@ exits 0 on success, >0 if an error occurred.
 .Sh STANDARDS
 The
 .Nm comm
 .Sh STANDARDS
 The
 .Nm comm

-function is expected to be POSIX 1003.2 compatible.
+command is expected to be POSIX 1003.2 compatible.