summaryrefslogtreecommitdiffstats
path: root/usr.bin/join
diff options
context:
space:
mode:
authorpeter <peter@FreeBSD.org>1997-03-11 13:08:12 +0000
committerpeter <peter@FreeBSD.org>1997-03-11 13:08:12 +0000
commitdc74a95b3c87ac7e618302b89dfff6205c05cfc0 (patch)
treefbec41ef52ae0a75c11b7d0680ed9332a01d7335 /usr.bin/join
parent2083e11126e9022e069b7be58976843f8e734a2d (diff)
parent297505f8fa9ec32b558f82504c27404854c3e313 (diff)
downloadFreeBSD-src-dc74a95b3c87ac7e618302b89dfff6205c05cfc0.zip
FreeBSD-src-dc74a95b3c87ac7e618302b89dfff6205c05cfc0.tar.gz
This commit was generated by cvs2svn to compensate for changes in r23690,
which included commits to RCS files with non-trunk default branches.
Diffstat (limited to 'usr.bin/join')
-rw-r--r--usr.bin/join/join.113
1 files changed, 11 insertions, 2 deletions
diff --git a/usr.bin/join/join.1 b/usr.bin/join/join.1
index fa383c6..a1855cf 100644
--- a/usr.bin/join/join.1
+++ b/usr.bin/join/join.1
@@ -32,9 +32,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" @(#)join.1 8.1 (Berkeley) 6/6/93
+.\" @(#)join.1 8.3 (Berkeley) 4/28/95
.\"
-.Dd June 6, 1993
+.Dd April 28, 1995
.Dt JOIN 1
.Os
.Sh NAME
@@ -84,6 +84,11 @@ The following options are available:
In addition to the default output, produce a line for each unpairable
line in file
.Ar file_number .
+(The argument to
+.Fl a
+must not be preceded by a space; see the
+.Sx COMPATIBILITY
+section.)
.It Fl e Ar string
Replace empty output fields with
.Ar string .
@@ -165,6 +170,10 @@ the following options are available:
.It Fl a
In addition to the default output, produce a line for each unpairable line
in both file 1 and file 2.
+(To distinguish between this and
+.Fl a Ar file_number ,
+.Nm join
+currently requires that the latter not include any white space.)
.It Fl j1 Ar field
Join on the
.Ar field Ns 'th
OpenPOWER on IntegriCloud