===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/join/join.1,v
retrieving revision 1.5
retrieving revision 1.6
diff -c -r1.5 -r1.6
*** src/usr.bin/join/join.1	1998/09/26 19:54:55	1.5
--- src/usr.bin/join/join.1	1999/07/04 11:53:55	1.6
***************
*** 56,64 ****
  .Ar file1
  .Ar file2
  .Sh DESCRIPTION
! The join utility performs an ``equality join'' on the specified files
  and writes the result to the standard output.
! The ``join field'' is the field in each file by which the files are compared.
  The first field in each line is used by default.
  There is one line in the output for each pair of lines in
  .Ar file1
--- 56,70 ----
  .Ar file1
  .Ar file2
  .Sh DESCRIPTION
! The
! .Nm
! utility performs an
! .Dq equality join
! on the specified files
  and writes the result to the standard output.
! The
! .Dq join field
! is the field in each file by which the files are compared.
  The first field in each line is used by default.
  There is one line in the output for each pair of lines in
  .Ar file1
***************
*** 76,82 ****
  The default output field separator is a single space character.
  .Pp
  Many of the options use file and field numbers.
! Both file numbers and field numbers are 1 based, i.e. the first file on
  the command line is file number 1 and the first field is field number 1.
  The following options are available:
  .Bl -tag -width Fl
--- 82,88 ----
  The default output field separator is a single space character.
  .Pp
  Many of the options use file and field numbers.
! Both file numbers and field numbers are 1 based, i.e., the first file on
  the command line is file number 1 and the first field is field number 1.
  The following options are available:
  .Bl -tag -width Fl
***************
*** 104,110 ****
  is a file number and
  .Ar field
  is a field number.
! The elements of list must be either comma (``,'') or whitespace separated.
  (The latter requires quoting to protect it from the shell, or, a simpler
  approach is to use multiple
  .Fl o
--- 110,118 ----
  is a file number and
  .Ar field
  is a field number.
! The elements of list must be either comma
! .Pq Ql \&,
! or whitespace separated.
  (The latter requires quoting to protect it from the shell, or, a simpler
  approach is to use multiple
  .Fl o
***************
*** 141,147 ****
  using the
  .Fl b
  option, on the fields on which they are to be joined, otherwise
! .Nm join
  may not report all field matches.
  When the field delimiter characters are specified by the
  .Fl t
--- 149,155 ----
  using the
  .Fl b
  option, on the fields on which they are to be joined, otherwise
! .Nm
  may not report all field matches.
  When the field delimiter characters are specified by the
  .Fl t
***************
*** 155,164 ****
  .Ar file1
  or
  .Ar file2
! is ``-'', the standard input is used.
  .Pp
  The
! .Nm join
  utility exits 0 on success or >0 if an error occurred.
  .Sh COMPATIBILITY
  For compatibility with historic versions of
--- 163,174 ----
  .Ar file1
  or
  .Ar file2
! is
! .Ql \&- ,
! the standard input is used.
  .Pp
  The
! .Nm
  utility exits 0 on success or >0 if an error occurred.
  .Sh COMPATIBILITY
  For compatibility with historic versions of
***************
*** 170,176 ****
  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
--- 180,186 ----
  in both file 1 and file 2.
  (To distinguish between this and
  .Fl a Ar file_number ,
! .Nm
  currently requires that the latter not include any white space.)
  .It Fl j1 Ar field
  Join on the
***************
*** 186,207 ****
  field of both file 1 and file 2.
  .It Fl o Ar list ...
  Historical implementations of
! .Nm join
  permitted multiple arguments to the
  .Fl o
  option.
! These arguments were of the form ``file_number.field_number'' as described
! for the current
  .Fl o
  option.
! This has obvious difficulties in the presence of files named ``1.2''.
  .El
  .Pp
  These options are available only so historic shell scripts don't require
  modification and should not be used.
  .Sh STANDARDS
  The
! .Nm join
  command is expected to be
  .St -p1003.2
  compatible.
--- 196,219 ----
  field of both file 1 and file 2.
  .It Fl o Ar list ...
  Historical implementations of
! .Nm
  permitted multiple arguments to the
  .Fl o
  option.
! These arguments were of the form
! .Dq file_number.field_number
! as described for the current
  .Fl o
  option.
! This has obvious difficulties in the presence of files named
! .Dq 1.2 .
  .El
  .Pp
  These options are available only so historic shell scripts don't require
  modification and should not be used.
  .Sh STANDARDS
  The
! .Nm
  command is expected to be
  .St -p1003.2
  compatible.