- at(1) synopsis: -r expects a `job' arg, not a timespec

- remove description of -v: it is only for use with atq(1), and is
correctly documented there
- sync usage()
- correctly format synopis for atrm(1)

3 files changed, 17 insertions, 19 deletions

diff --git a/usr.bin/at/at.1 b/usr.bin/at/at.1
index 04a1009be0b..5940df27101 100644
--- a/usr.bin/at/at.1
+++ b/usr.bin/at/at.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: at.1,v 1.31 2003/06/10 09:12:09 jmc Exp $
+.\" $OpenBSD: at.1,v 1.32 2005/06/23 14:39:35 jmc Exp $
 .\"
 .\" Copyright (C) 1993, 1994  Thomas Koenig
 .\" Copyright (C) 1993  David Parsons
@@ -33,17 +33,18 @@
 .Nd queue, examine or delete jobs for later execution
 .Sh SYNOPSIS
 .Nm at
-.Op Fl blmr
+.Op Fl blm
 .Op Fl f Ar file
 .Op Fl q Ar queue
 .Fl t Ar time_arg
 .Nm at
-.Op Fl blmr
+.Op Fl blm
 .Op Fl f Ar file
 .Op Fl q Ar queue
 .Ar timespec
 .Nm at
-.Fl c Ar job Op Ar job ...
+.Fl c | r
+.Ar job Op Ar job ...
 .Nm batch
 .Op Fl m
 .Op Fl f Ar file
@@ -159,10 +160,6 @@ year.
 If the
 .Ar SS
 letter pair is not specified, the value defaults to 0.
-.It Fl v
-When used in conjunction with the
-.Fl l
-option, shows completed but not yet deleted jobs in the queue.
 .El
 .Pp
 .Nm at
diff --git a/usr.bin/at/at.c b/usr.bin/at/at.c
index 837c3cf355f..b7cfd0d6c63 100644
--- a/usr.bin/at/at.c
+++ b/usr.bin/at/at.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: at.c,v 1.42 2004/06/17 22:09:11 millert Exp $	*/
+/*	$OpenBSD: at.c,v 1.43 2005/06/23 14:39:35 jmc Exp $	*/
 
 /*
  *  at.c : Put file into atrun queue
@@ -42,7 +42,7 @@
 #define TIMESIZE 50		/* Size of buffer passed to strftime() */
 
 #ifndef lint
-static const char rcsid[] = "$OpenBSD: at.c,v 1.42 2004/06/17 22:09:11 millert Exp $";
+static const char rcsid[] = "$OpenBSD: at.c,v 1.43 2005/06/23 14:39:35 jmc Exp $";
 #endif
 
 /* Variables to remove from the job's environment. */
@@ -887,15 +887,13 @@ usage(void)
 	case AT:
 	case CAT:
 		(void)fprintf(stderr,
-		    "usage: at [-bm] [-f file] [-q queue] -t time_arg\n"
-		    "       at [-bm] [-f file] [-q queue] timespec\n"
-		    "       at -c job [job ...]\n"
-		    "       at -l [-q queue] [job ...]\n"
-		    "       at -r job [job ...]\n");
+		    "usage: at [-blm] [-f file] [-q queue] -t time_arg\n"
+		    "       at [-blm] [-f file] [-q queue] timespec\n"
+		    "       at -c | -r job [job ...]\n");
 		break;
 	case ATQ:
 		(void)fprintf(stderr,
-		    "usage: atq [-cnv] [-q queue] [name...]\n");
+		    "usage: atq [-cnv] [-q queue] [name ...]\n");
 		break;
 	case ATRM:
 		(void)fprintf(stderr,
diff --git a/usr.bin/at/atrm.1 b/usr.bin/at/atrm.1
index 507fb9581ac..0c7bb668b69 100644
--- a/usr.bin/at/atrm.1
+++ b/usr.bin/at/atrm.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: atrm.1,v 1.5 2003/06/10 09:12:09 jmc Exp $
+.\"	$OpenBSD: atrm.1,v 1.6 2005/06/23 14:39:35 jmc Exp $
 .\"
 .\" Copyright (c) 1985, 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -39,8 +39,11 @@
 .Sh SYNOPSIS
 .Nm atrm
 .Op Fl afi
-.Oo Op Ar job
-.Op Ar name ... Oc
+.Oo
+.Op Ar job
+.Op Ar name
+.Ar ...
+.Oc
 .Sh DESCRIPTION
 .Nm atrm
 removes jobs that were created with the