===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/join/join.1,v
retrieving revision 1.2
retrieving revision 1.3
diff -c -r1.2 -r1.3
*** src/usr.bin/join/join.1	1996/06/26 05:34:39	1.2
--- src/usr.bin/join/join.1	1996/08/12 02:32:32	1.3
***************
*** 1,6 ****
! .\"	$OpenBSD: join.1,v 1.2 1996/06/26 05:34:39 deraadt Exp $
! .\" Copyright (c) 1990 The Regents of the University of California.
! .\" All rights reserved.
  .\"
  .\" This code is derived from software contributed to Berkeley by
  .\" the Institute of Electrical and Electronics Engineers, Inc.
--- 1,5 ----
! .\" Copyright (c) 1990, 1993
! .\"	The Regents of the University of California.  All rights reserved.
  .\"
  .\" This code is derived from software contributed to Berkeley by
  .\" the Institute of Electrical and Electronics Engineers, Inc.
***************
*** 33,41 ****
  .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  .\" SUCH DAMAGE.
  .\"
! .\"	from: @(#)join.1	6.8 (Berkeley) 11/18/91
  .\"
! .Dd November 18, 1991
  .Dt JOIN 1
  .Os
  .Sh NAME
--- 32,40 ----
  .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  .\" SUCH DAMAGE.
  .\"
! .\"	@(#)join.1	8.3 (Berkeley) 4/28/95
  .\"
! .Dd April 28, 1995
  .Dt JOIN 1
  .Os
  .Sh NAME
***************
*** 66,74 ****
  and
  .Ar file2
  which have identical join fields.
! Each output line consists of the join field, the remaining fields from
  .Ar file1
! and then the remaining fields from
  .Ar file2 .
  .Pp
  The default field separators are tab and space characters.
--- 65,73 ----
  and
  .Ar file2
  which have identical join fields.
! Each output line consists of the join field, the other fields from
  .Ar file1
! and then the other fields from
  .Ar file2 .
  .Pp
  The default field separators are tab and space characters.
***************
*** 85,90 ****
--- 84,94 ----
  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 .
***************
*** 103,109 ****
  .Ar field
  is a field number.
  The elements of list must be either comma (``,'') or whitespace separated.
! (This will require quoting to protect it from the shell, or, a simpler
  approach is to use multiple
  .Fl o
  options.)
--- 107,113 ----
  .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
  options.)
***************
*** 166,171 ****
--- 170,179 ----
  .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