From 9d455d451b20f666c6b5a997c45248ade2ec3a8f Mon Sep 17 00:00:00 2001
From: Maxim Konovalov <maxim@FreeBSD.org>
Date: Thu, 26 Aug 2004 06:28:05 +0000
Subject: [PATCH] Backout recent -j changes, the flags is deprecated.

Requested by:	tjr
---
 usr.bin/join/join.1 | 1 -
 usr.bin/join/join.c | 9 ++++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/usr.bin/join/join.1 b/usr.bin/join/join.1
index d7d115ee5ca..aa6f73903a9 100644
--- a/usr.bin/join/join.1
+++ b/usr.bin/join/join.1
@@ -47,7 +47,6 @@
 .Fl a Ar file_number | Fl v Ar file_number
 .Oc
 .Op Fl e Ar string
-.Op Fl j Ar fileno field
 .Op Fl o Ar list
 .Bk -words
 .Ek
diff --git a/usr.bin/join/join.c b/usr.bin/join/join.c
index 5e458501018..097ecbe743f 100644
--- a/usr.bin/join/join.c
+++ b/usr.bin/join/join.c
@@ -661,10 +661,9 @@ jbad:				errx(1, "illegal option -- %s", ap);
 void
 usage(void)
 {
-	(void)fprintf(stderr, "%s %s\n%s %s\n",
-	    "usage: join [-a fileno | -v fileno ]",
-	    "[-e string] [-j fileno field]",
-	    "            [-1 field] [-2 field]",
-	    "[-o list] [-t char] file1 file2");
+	(void)fprintf(stderr, "%s %s\n%s\n",
+	    "usage: join [-a fileno | -v fileno ] [-e string] [-1 field]",
+	    "[-2 field]",
+		"            [-o list] [-t char] file1 file2");
 	exit(1);
 }