BSD 4_3_Net_2 release

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

diff --git a/usr/src/usr.bin/paste/paste.1 b/usr/src/usr.bin/paste/paste.1
index 622f54c..70a8aef 100644 (file)
--- a/usr/src/usr.bin/paste/paste.1
+++ b/usr/src/usr.bin/paste/paste.1
@@ -1,29 +1,43 @@
 .\" 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.
 .\"

-.\"

 .\" This code is derived from software contributed to Berkeley by
 .\" This code is derived from software contributed to Berkeley by

-.\" Adam S. Moskowitz.
+.\" Adam S. Moskowitz and the Institute of Electrical and Electronics
+.\" Engineers, Inc.
+.\"
+.\" 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.

 .\"
 .\"

-.\" 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 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.

 .\"
 .\"

-.\"     @(#)paste.1    5.3 (Berkeley) 7/24/90
+.\"    @(#)paste.1     5.6 (Berkeley) 7/27/91

 .\"
 .\"

-.Dd July 24, 1990
+.Dd July 27, 1991

 .Dt PASTE 1
 .Dt PASTE 1

-.Os BSD 4.4
+.Os

 .Sh NAME
 .Nm paste
 .Nd merge corresponding or subsequent lines of files
 .Sh NAME
 .Nm paste
 .Nd merge corresponding or subsequent lines of files


@@ -43,10 +57,8 @@ still contain data, the file is treated as if it were an endless source
 of empty lines.
 .Pp
 The options are as follows:
 of empty lines.
 .Pp
 The options are as follows:

-.Tw Fl
-.Tp Cx Fl d 
-.Ar list
-.Cx
+.Bl -tag -width Fl
+.It Fl d  Ar list 

 Use one or more of the provided characters to replace the newline
 characters instead of the default tab.
 The characters in
 Use one or more of the provided characters to replace the newline
 characters instead of the default tab.
 The characters in


@@ -65,33 +77,34 @@ begins selecting characters from the beginning of
 again.
 .Pp
 The following special characters can also be used in list:
 again.
 .Pp
 The following special characters can also be used in list:

-.Tw Ds
-.Tp Li \en
+.Pp
+.Bl -tag -width flag -compact
+.It Li \en

 newline character
 newline character

-.br
-.Tp Li \et
+.It Li \et

 tab character
 tab character

-.br
-.Tp Li \e\e
+.It Li \e\e

 backslash character
 backslash character

-.br
-.Tp Li \e0
+.It Li \e0

 Empty string (not a null character).
 Empty string (not a null character).

+.El

 .Pp
 Any other character preceded by a backslash is equivalent to the
 character itself.
 .Pp
 Any other character preceded by a backslash is equivalent to the
 character itself.

-.Tp
-.Tp Fl s
+.It Fl s

 Concatenate all of the lines of each separate input file in command line
 order.
 The newline character of every line except the last line in each input
 file is replaced with the tab character, unless otherwise specified by
 the -d option.
 Concatenate all of the lines of each separate input file in command line
 order.
 The newline character of every line except the last line in each input
 file is replaced with the tab character, unless otherwise specified by
 the -d option.

-.Tp
+.El

 .Pp
 .Pp

-If ``-'' is specified for one or more of the input files, the standard
+If
+.Ql Fl
+is specified for one or more of the input files, the standard

 input is used; standard input is read one line at a time, circularly,
 input is used; standard input is read one line at a time, circularly,

-for each instance of ``-''.
+for each instance of
+.Ql Fl .

 .Pp
 The
 .Nm paste
 .Pp
 The
 .Nm paste


@@ -101,4 +114,6 @@ utility exits 0 on success, and >0 if an error occurs.
 .Sh STANDARDS
 The
 .Nm paste
 .Sh STANDARDS
 The
 .Nm paste

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