3 files changed, 18 insertions, 98 deletions
diff --git a/games/bcd/Makefile b/games/bcd/Makefile
index d05058e0f5d..2636b8cbb9c 100644
--- a/games/bcd/Makefile
+++ b/games/bcd/Makefile
@@ -1,7 +1,6 @@
-#	$OpenBSD: Makefile,v 1.4 2014/07/16 20:00:14 okan Exp $
+#	$OpenBSD: Makefile,v 1.5 2014/11/07 22:17:49 schwarze Exp $
 
 PROG=	bcd
 MAN=	bcd.6
-MLINKS=	bcd.6 morse.6 bcd.6 ppt.6
 
 .include <bsd.prog.mk>
diff --git a/games/bcd/bcd.6 b/games/bcd/bcd.6
index 5548861068b..d94f8212a8a 100644
--- a/games/bcd/bcd.6
+++ b/games/bcd/bcd.6
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: bcd.6,v 1.19 2014/11/06 19:42:06 tedu Exp $
+.\"	$OpenBSD: bcd.6,v 1.20 2014/11/07 22:17:49 schwarze Exp $
 .\"
 .\" Copyright (c) 1988, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -29,106 +29,35 @@
 .\"
 .\"	@(#)bcd.6	8.1 (Berkeley) 5/31/93
 .\"
-.Dd $Mdocdate: November 6 2014 $
+.Dd $Mdocdate: November 7 2014 $
 .Dt BCD 6
 .Os
 .Sh NAME
-.Nm bcd ,
-.Nm ppt ,
-.Nm morse
-.Nd reformat input as punch cards, paper tape or morse code
-.Sh SYNOPSIS
 .Nm bcd
+.Nd reformat input as punch cards
+.Sh SYNOPSIS
+.Nm
 .Op Fl l
-.Oo
-.Fl d Oc \*(Ba
-.Ar string ...
-.Oc
-.Nm ppt
-.Oo
-.Fl d Oo Fl b Oc \*(Ba
-.Ar string ...
-.Oc
-.Nm morse
-.Op Fl d | s
 .Op Ar string ...
+.Nm
+.Fl d
+.Op Fl l
 .Sh DESCRIPTION
 The
-.Nm bcd ,
-.Nm ppt ,
-and
-.Nm morse
-commands read the given input and reformat it in the form of
-punched cards, paper tape, or morse code, respectively.
+.Nm bcd
+command reads the given input and reformats it in the form of punched cards.
 Acceptable input are command line arguments or the standard input.
 .Pp
-Available options for
-.Nm bcd :
+The options are as follows:
 .Bl -tag -width Ds
 .It Fl d
-The
-.Fl d
-option for
-.Nm bcd
-decodes punch cards on the standard input back to ASCII.
+Decode punch cards on the standard input back to ASCII.
 .It Fl l
-The
-.Fl l
-option for
-.Nm bcd
-creates 80 column punch cards.
+Create 80 column punch cards.
 The default is 48 columns.
 .El
-.Pp
-Available options for
-.Nm ppt :
-.Bl -tag -width Ds
-.It Fl d Op Fl b
-The
-.Fl d
-option for
-.Nm ppt
-decodes paper tape on the standard input back to ASCII.
-Unprintable characters are visually encoded with
-.Xr vis 3
-unless the
-.Fl b
-flag (binary) is also specified.
-A lowercase
-.Sq x
-is printed for undecipherable input lines.
-.El
-.Pp
-Available options for
-.Nm morse :
-.Bl -tag -width Ds
-.It Fl d
-The
-.Fl d
-option for
-.Nm morse
-decodes dot-dash morse
-.Po
-as generated by using the
-.Fl s
-option
-.Pc
-back into text.
-A lowercase
-.Sq x
-is printed for undecipherable input; otherwise, text is returned uppercase.
-If the morse to be translated is given on the command line, it should be
-preceded by
-.Sq --
-to keep it from being mistaken for options.
-.It Fl s
-The
-.Fl s
-option for
-.Nm morse
-produces dots and dashes rather than words.
-.El
 .Sh SEE ALSO
+.Xr ppt 6
 .Rs
 .%I ISO 1681:1973
 .%R "Information processing--Unpunched paper cards--Specification"
@@ -137,12 +66,3 @@ produces dots and dashes rather than words.
 .%I ISO 1682:1973
 .%R "Information processing--80 columns punched paper cards--Dimensions and location of rectangular punched holes"
 .Re
-.Rs
-.%I ECMA-10
-.%R "ECMA Standard for Data Interchange on Punched Tape"
-.Re
-.Rs
-.%I ITU-T Recommendation F.1
-.%R "Operational provisions for the international public telegram service"
-.%O Division B, I. Morse code
-.Re
diff --git a/games/bcd/bcd.c b/games/bcd/bcd.c
index 42aba7832bf..0cc64d2364b 100644
--- a/games/bcd/bcd.c
+++ b/games/bcd/bcd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bcd.c,v 1.19 2014/11/06 19:54:10 tedu Exp $	*/
+/*	$OpenBSD: bcd.c,v 1.20 2014/11/07 22:17:49 schwarze Exp $	*/
 /*	$NetBSD: bcd.c,v 1.6 1995/04/24 12:22:23 cgd Exp $	*/
 
 /*
@@ -133,7 +133,8 @@ main(int argc, char *argv[])
 			columns = 80;
 			break;
 		default:
-			fprintf(stderr, "unknown option");
+			fprintf(stderr, "usage: bcd [-l] [string ...]\n");
+			fprintf(stderr, "usage: bcd -d [-l]\n");
 			exit(1);
 		}
 	}