Improve markup and do some minor wordsmithing.
This commit is contained in:
parent
4b4ee018fa
commit
dce95037f4
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=165436
@ -51,8 +51,8 @@
|
|||||||
.Bk -words
|
.Bk -words
|
||||||
.Ek
|
.Ek
|
||||||
.Op Fl t Ar char
|
.Op Fl t Ar char
|
||||||
.Op Fl \&1 Ar field
|
.Op Fl 1 Ar field
|
||||||
.Op Fl \&2 Ar field
|
.Op Fl 2 Ar field
|
||||||
.Ar file1
|
.Ar file1
|
||||||
.Ar file2
|
.Ar file2
|
||||||
.Sh DESCRIPTION
|
.Sh DESCRIPTION
|
||||||
@ -100,8 +100,8 @@ option specifies the fields that will be output from each file for
|
|||||||
each line with matching join fields.
|
each line with matching join fields.
|
||||||
Each element of
|
Each element of
|
||||||
.Ar list
|
.Ar list
|
||||||
has the either the form
|
has either the form
|
||||||
.Ql file_number.field ,
|
.Ar file_number . Ns Ar field ,
|
||||||
where
|
where
|
||||||
.Ar file_number
|
.Ar file_number
|
||||||
is a file number and
|
is a file number and
|
||||||
@ -129,18 +129,20 @@ Do not display the default output, but display a line for each unpairable
|
|||||||
line in file
|
line in file
|
||||||
.Ar file_number .
|
.Ar file_number .
|
||||||
The options
|
The options
|
||||||
.Fl v Ar 1
|
.Fl v Cm 1
|
||||||
and
|
and
|
||||||
.Fl v Ar 2
|
.Fl v Cm 2
|
||||||
may be specified at the same time.
|
may be specified at the same time.
|
||||||
.It Fl 1 Ar field
|
.It Fl 1 Ar field
|
||||||
Join on the
|
Join on the
|
||||||
.Ar field Ns 'th
|
.Ar field Ns 'th
|
||||||
field of file 1.
|
field of
|
||||||
|
.Ar file1 .
|
||||||
.It Fl 2 Ar field
|
.It Fl 2 Ar field
|
||||||
Join on the
|
Join on the
|
||||||
.Ar field Ns 'th
|
.Ar field Ns 'th
|
||||||
field of file 2.
|
field of
|
||||||
|
.Ar file2 .
|
||||||
.El
|
.El
|
||||||
.Pp
|
.Pp
|
||||||
When the default field delimiter characters are used, the files to be joined
|
When the default field delimiter characters are used, the files to be joined
|
||||||
@ -164,7 +166,7 @@ If one of the arguments
|
|||||||
or
|
or
|
||||||
.Ar file2
|
.Ar file2
|
||||||
is
|
is
|
||||||
.Dq - ,
|
.Sq Fl ,
|
||||||
the standard input is used.
|
the standard input is used.
|
||||||
.Sh EXIT STATUS
|
.Sh EXIT STATUS
|
||||||
.Ex -std
|
.Ex -std
|
||||||
@ -175,19 +177,27 @@ the following options are available:
|
|||||||
.Bl -tag -width indent
|
.Bl -tag -width indent
|
||||||
.It Fl a
|
.It Fl a
|
||||||
In addition to the default output, produce a line for each unpairable line
|
In addition to the default output, produce a line for each unpairable line
|
||||||
in both file 1 and file 2.
|
in both
|
||||||
|
.Ar file1
|
||||||
|
and
|
||||||
|
.Ar file2 .
|
||||||
.It Fl j1 Ar field
|
.It Fl j1 Ar field
|
||||||
Join on the
|
Join on the
|
||||||
.Ar field Ns 'th
|
.Ar field Ns 'th
|
||||||
field of file 1.
|
field of
|
||||||
|
.Ar file1 .
|
||||||
.It Fl j2 Ar field
|
.It Fl j2 Ar field
|
||||||
Join on the
|
Join on the
|
||||||
.Ar field Ns 'th
|
.Ar field Ns 'th
|
||||||
field of file 2.
|
field of
|
||||||
|
.Ar file2 .
|
||||||
.It Fl j Ar field
|
.It Fl j Ar field
|
||||||
Join on the
|
Join on the
|
||||||
.Ar field Ns 'th
|
.Ar field Ns 'th
|
||||||
field of both file 1 and file 2.
|
field of both
|
||||||
|
.Ar file1
|
||||||
|
and
|
||||||
|
.Ar file2 .
|
||||||
.It Fl o Ar list ...
|
.It Fl o Ar list ...
|
||||||
Historical implementations of
|
Historical implementations of
|
||||||
.Nm
|
.Nm
|
||||||
@ -195,16 +205,16 @@ permitted multiple arguments to the
|
|||||||
.Fl o
|
.Fl o
|
||||||
option.
|
option.
|
||||||
These arguments were of the form
|
These arguments were of the form
|
||||||
.Ql file_number.field_number
|
.Ar file_number . Ns Ar field_number
|
||||||
as described
|
as described
|
||||||
for the current
|
for the current
|
||||||
.Fl o
|
.Fl o
|
||||||
option.
|
option.
|
||||||
This has obvious difficulties in the presence of files named
|
This has obvious difficulties in the presence of files named
|
||||||
.Ql 1.2 .
|
.Pa 1.2 .
|
||||||
.El
|
.El
|
||||||
.Pp
|
.Pp
|
||||||
These options are available only so historic shellscripts do not require
|
These options are available only so historic shell scripts do not require
|
||||||
modification and should not be used.
|
modification and should not be used.
|
||||||
.Sh SEE ALSO
|
.Sh SEE ALSO
|
||||||
.Xr awk 1 ,
|
.Xr awk 1 ,
|
||||||
|
Loading…
Reference in New Issue
Block a user