options w/o args go first in SYNOPSIS, and add -C to usage();

diff --git a/doas.1 b/doas.1
index 3e616198f0ce1e670250ef9f5b866075f9cd6f8a..5220eb59e8e4b1002e8e07c8404db2e1af5b2001 100644 (file)
--- a/doas.1
+++ b/doas.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: doas.1,v 1.8 2015/07/21 11:04:06 zhuk Exp $
+.\" $OpenBSD: doas.1,v 1.9 2015/07/21 16:12:04 tedu Exp $
 .\"
 .\"Copyright (c) 2015 Ted Unangst <tedu@openbsd.org>
 .\"
@@ -21,8 +21,8 @@
 .Nd execute commands as another user
 .Sh SYNOPSIS
 .Nm doas
-.Op Fl C Ar config
 .Op Fl s
+.Op Fl C Ar config
 .Op Fl u Ar user
 .Ar command
 .Op Ar args

diff --git a/doas.c b/doas.c
index 8899d788af3089507aa86968d38a6a0780b4855e..7ede27384eb50bf9c702ce34fc47ad8edcd40d5d 100644 (file)
--- a/doas.c
+++ b/doas.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: doas.c,v 1.16 2015/07/21 16:12:04 tedu Exp $ */
+/* $OpenBSD: doas.c,v 1.17 2015/07/21 16:15:20 tedu Exp $ */
 /*
  * Copyright (c) 2015 Ted Unangst <tedu@openbsd.org>
  *
@@ -36,7 +36,7 @@
 static void __dead
 usage(void)
 {
-       fprintf(stderr, "usage: doas [-s] [-u user] command [args]\n");
+       fprintf(stderr, "usage: doas [-s] [-C config] [-u user] command [args]\n");
        exit(1);
 }