tidy up synopsis and usage();

2 files changed, 20 insertions, 22 deletions

diff --git a/usr.sbin/cron/crontab.1 b/usr.sbin/cron/crontab.1
index bff14316532..3e7230dbc95 100644
--- a/usr.sbin/cron/crontab.1
+++ b/usr.sbin/cron/crontab.1
@@ -17,7 +17,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
 .\" OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $OpenBSD: crontab.1,v 1.22 2004/06/17 22:11:55 millert Exp $
+.\" $OpenBSD: crontab.1,v 1.23 2007/02/19 00:08:38 jmc Exp $
 .\"
 .Dd June 8, 1999
 .Dt CRONTAB 1
@@ -30,12 +30,10 @@
 .Op Fl u Ar user
 .Ar file
 .Nm crontab
-.Op Fl u Ar user
 .Oo
-.Fl l No \&|
-.Fl r No \&|
-.Fl e
+.Fl e | l | r
 .Oc
+.Op Fl u Ar user
 .Sh DESCRIPTION
 .Nm
 is the program used to install, deinstall, or list the tables
@@ -83,6 +81,20 @@ is unable to read the files, users will not be allowed to use
 .Pp
 The options are as follows:
 .Bl -tag -width "-u userX"
+.It Fl e
+Edit the current crontab using the editor specified by
+the
+.Ev VISUAL
+or
+.Ev EDITOR
+environment variables.
+After you exit from the editor, the modified
+.Xr crontab 5
+will be installed automatically.
+.It Fl l
+Causes the current crontab to be displayed on standard output.
+.It Fl r
+Causes the current crontab to be removed.
 .It Fl u Ar user
 Specifies the name of the user whose
 .Xr crontab 5
@@ -103,20 +115,6 @@ and that if you are running inside of
 you should always use the
 .Fl u
 option for safety's sake.
-.It Fl l
-Causes the current crontab to be displayed on standard output.
-.It Fl r
-Causes the current crontab to be removed.
-.It Fl e
-Edit the current crontab using the editor specified by
-the
-.Ev VISUAL
-or
-.Ev EDITOR
-environment variables.
-After you exit from the editor, the modified
-.Xr crontab 5
-will be installed automatically.
 .El
 .Sh FILES
 .Bl -tag -width "/var/cron/cron.allow" -compact
diff --git a/usr.sbin/cron/crontab.c b/usr.sbin/cron/crontab.c
index 3ba78f66d3a..b95e3a2b79c 100644
--- a/usr.sbin/cron/crontab.c
+++ b/usr.sbin/cron/crontab.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: crontab.c,v 1.50 2007/02/13 18:39:34 mglocker Exp $	*/
+/*	$OpenBSD: crontab.c,v 1.51 2007/02/19 00:08:38 jmc Exp $	*/
 
 /* Copyright 1988,1990,1993,1994 by Paul Vixie
  * All rights reserved
@@ -21,7 +21,7 @@
  * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-static char const rcsid[] = "$OpenBSD: crontab.c,v 1.50 2007/02/13 18:39:34 mglocker Exp $";
+static char const rcsid[] = "$OpenBSD: crontab.c,v 1.51 2007/02/19 00:08:38 jmc Exp $";
 
 /* crontab - install and manage per-user crontab files
  * vix 02may87 [RCS has the rest of the log]
@@ -62,7 +62,7 @@ static void
 usage(const char *msg) {
 	fprintf(stderr, "%s: usage error: %s\n", ProgramName, msg);
 	fprintf(stderr, "usage:\t%s [-u user] file\n", ProgramName);
-	fprintf(stderr, "\t%s [-u user] [ -e | -l | -r ]\n", ProgramName);
+	fprintf(stderr, "\t%s [ -e | -l | -r ] [-u user]\n", ProgramName);
 	fprintf(stderr, "\t\t(default operation is replace, per 1003.2)\n");
 	fprintf(stderr, "\t-e\t(edit user's crontab)\n");
 	fprintf(stderr, "\t-l\t(list user's crontab)\n");