BSD 4_3_Net_2 release

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

diff --git a/usr/src/usr.bin/column/column.1 b/usr/src/usr.bin/column/column.1
index 0aa53b9..5a048af 100644 (file)
--- a/usr/src/usr.bin/column/column.1
+++ b/usr/src/usr.bin/column/column.1
@@ -1,37 +1,48 @@
 .\" 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.
+.\" 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.

 .\"
 .\"

-.\"     @(#)column.1   5.6 (Berkeley) 7/24/90
+.\" 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.

 .\"
 .\"

-.Dd July 24, 1990
-.Os BSD 4.4
+.\"     @(#)column.1   5.8 (Berkeley) 3/14/91
+.\"
+.Dd March 14, 1991
+.Os

 .Dt COLUMN 1
 .Sh NAME
 .Nm column
 .Nd columnate lists
 .Sh SYNOPSIS
 .Nm column
 .Dt COLUMN 1
 .Sh NAME
 .Nm column
 .Nd columnate lists
 .Sh SYNOPSIS
 .Nm column

-.Oo
-.Op Fl t Ar x
-.Op Fl s Ar sep
-.Op Fl c Ar columns
-.Oo
-.Cx
-.Ar
+.Op Fl c Ns Ar columns
+.Op Fl s Ns Ar sep
+.Op Fl tx
+.Op Ar

 .Sh DESCRIPTION
 The
 .Nm column
 .Sh DESCRIPTION
 The
 .Nm column


@@ -43,42 +54,46 @@ operands, or, by default, from the standard input.
 Empty lines are ignored.
 .Pp
 The options are as follows:
 Empty lines are ignored.
 .Pp
 The options are as follows:

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

 Output is formatted for a display
 .Ar columns
 wide.
 Output is formatted for a display
 .Ar columns
 wide.

-.Tp Fl s
+.It Fl s

 Specify a set of characters to be used to delimit columns for the
 .Fl t
 option.
 Specify a set of characters to be used to delimit columns for the
 .Fl t
 option.

-.Tp Fl t
+.It Fl t

 Determine the number of columns the input contains and create a table.
 Determine the number of columns the input contains and create a table.

-Columns are delimited by whitespace, by default, or by the characters
+Columns are delimited with whitespace, by default, or with the characters

 supplied using the
 .Fl s
 option.
 Useful for pretty-printing displays.
 supplied using the
 .Fl s
 option.
 Useful for pretty-printing displays.

-.Tp Fl x
+.It Fl x

 Fill columns before filling rows.
 Fill columns before filling rows.

-.Tp
+.El

 .Pp
 .Nm Column
 exits 0 on success, >0 if an error occurred.
 .Sh ENVIRONMENT
 .Pp
 .Nm Column
 exits 0 on success, >0 if an error occurred.
 .Sh ENVIRONMENT

-.Tw Fl
-.Tp Ev COLUMNS
+.Bl -tag -width COLUMNS
+.It Ev COLUMNS

 The environment variable
 .Ev COLUMNS
 is used to determine the size of
 the screen if no other information is available.
 The environment variable
 .Ev COLUMNS
 is used to determine the size of
 the screen if no other information is available.

+.El

 .Sh EXAMPLES
 .Sh EXAMPLES

-.Dl (printf "PERM LINKS OWNER SIZE MONTH DAY HH:MM/YEAR NAME\en" \&;
-.Dl ls -l  sed 1d) \&| column -t
+.Dl (printf \&"PERM LINKS OWNER SIZE MONTH DAY HH:MM/YEAR NAME\en\&"\ \&;
+.Dl ls -l \&| sed 1d) \&| column -t

 .Sh SEE ALSO
 .Xr colrm 1 ,
 .Xr ls 1 ,
 .Xr paste 1 ,
 .Xr sort 1
 .Sh HISTORY
 .Sh SEE ALSO
 .Xr colrm 1 ,
 .Xr ls 1 ,
 .Xr paste 1 ,
 .Xr sort 1
 .Sh HISTORY

-4.3 Reno BSD.
+The
+.Nm
+command appeared in 
+.Bx 4.3 Reno .