Sort SYNOPSIS and sync usage. From Igor Sobrado.

diff --git a/sudo.c b/sudo.c
index 2f1e65badb23991370646bc72b24504193b3acf7..5ebd6e47cce59cf5dd719ea03f7c94a8b48991c6 100644 (file)
--- a/sudo.c
+++ b/sudo.c
@@ -1309,11 +1309,11 @@ usage(exit_val)
     char **p, **uvec[5];
     int i, linelen, linemax, ulen;
     static char *uvec1[] = {
-       " -K | -L | -V | -h | -k | -v",
+       " -h | -K | -k | -L | -V | -v",
        NULL
     };
     static char *uvec2[] = {
-       " [-U username] [-u username|#uid] -l [command]",
+       " -l [-U username] [-u username|#uid] [command]",
        NULL
     };
     static char *uvec3[] = {
@@ -1328,10 +1328,11 @@ usage(exit_val)
        " [-p prompt]",
        " [-u username|#uid]",
        " [VAR=value]",
-       " { -e file [...] | -i | -s | <command> }",
+       " {-i | -s | <command>}",
        NULL
     };
     static char *uvec4[] = {
+       " -e",
        " [-S]",
 #ifdef HAVE_BSD_AUTH_H
        " [-a auth_type]",
@@ -1342,7 +1343,7 @@ usage(exit_val)
 #endif
        " [-p prompt]",
        " [-u username|#uid]",
-       " file [...]",
+       " file ...",
        NULL
     };
 
@@ -1350,7 +1351,7 @@ usage(exit_val)
      * Use usage vectors appropriate to the progname.
      */
     if (strcmp(getprogname(), "sudoedit") == 0) {
-       uvec[0] = uvec4;
+       uvec[0] = uvec4 + 1;
        uvec[1] = NULL;
     } else {
        uvec[0] = uvec1;

diff --git a/sudo.pod b/sudo.pod
index 64e3c13b88f484f05b17824f3ebf87d91d36a267..81a48cb57a84b62bb09ff5f078e0640ad3c882dc 100644 (file)
--- a/sudo.pod
+++ b/sudo.pod
@@ -28,17 +28,17 @@ sudo, sudoedit - execute a command as another user
 
 =head1 SYNOPSIS
 
-B<sudo> B<-K> | B<-k> | B<-h> | B<-L> | B<-V> | B<-v>
+B<sudo> B<-h> | B<-K> | B<-k> | B<-L> | B<-V> | B<-v>
 
 B<sudo> B<-l> S<[B<-U> I<username>]> S<[B<-u> I<username>|I<#uid>]> [I<command>]
 
 B<sudo> [B<-bEHPS>] S<[B<-a> I<auth_type>]> S<[B<-C> I<fd>]>
 S<[B<-c> I<class>|I<->]> S<[B<-p> I<prompt>]> S<[B<-u> I<username>|I<#uid>]>
-S<[B<VAR>=I<value>]> S<{B<-e> file [...] | B<-i> | B<-s> | I<command>}>
+S<[B<VAR>=I<value>]> S<{B<-i> | B<-s> | I<command>}>
 
-B<sudoedit> S<[B<-a> I<auth_type>]> S<[B<-c> I<class>|I<->]>
-S<[B<-p> I<prompt>]> [B<-S>] S<[B<-u> I<username>|I<#uid>]>
-file [...]
+B<sudoedit> [B<-S>] S<[B<-a> I<auth_type>]> S<[B<-C> I<fd>]>
+S<[B<-c> I<class>|I<->]> S<[B<-p> I<prompt>]> S<[B<-u> I<username>|I<#uid>]>
+file ...
 
 =head1 DESCRIPTION
 
@@ -243,24 +243,24 @@ escapes are supported:
 
 =over 8
 
-=item C<%u>
+=item C<%H>
 
-expanded to the invoking user's login name
+expanded to the local hostname including the domain name
+(on if the machine's hostname is fully qualified or the I<fqdn>
+I<sudoers> option is set)
+
+=item C<%h>
+
+expanded to the local hostname without the domain name
 
 =item C<%U>
 
 expanded to the login name of the user the command will
 be run as (defaults to root)
 
-=item C<%h>
-
-expanded to the local hostname without the domain name
-
-=item C<%H>
+=item C<%u>
 
-expanded to the local hostname including the domain name
-(on if the machine's hostname is fully qualified or the I<fqdn>
-I<sudoers> option is set)
+expanded to the invoking user's login name
 
 =item C<%%>
 
@@ -481,8 +481,8 @@ to make the C<cd> and file redirection work.
 
 =head1 SEE ALSO
 
-L<grep(1)>, L<su(1)>, L<stat(2)>, L<login_cap(3)>, L<sudoers(@mansectform@)>,
-L<passwd(@mansectform@)>, L<visudo(@mansectsu@)>
+L<grep(1)>, L<su(1)>, L<stat(2)>, L<login_cap(3)>, L<passwd(@mansectform@)>,
+L<sudoers(@mansectform@)>, L<visudo(@mansectsu@)>
 
 =head1 AUTHORS
 

diff --git a/visudo.c b/visudo.c
index 5d8b6bae0b178e26b85d013ff7f4fa459571e093..4834365cc3d9c2df2785527ffae26789a6ba2fd9 100644 (file)
--- a/visudo.c
+++ b/visudo.c
@@ -1012,7 +1012,7 @@ quit(signo)
 static void
 usage()
 {
-    (void) fprintf(stderr, "usage: %s [-c] [-f sudoers] [-q] [-s] [-V]\n",
+    (void) fprintf(stderr, "usage: %s [-c] [-q] [-s] [-V] [-f sudoers]\n",
        getprogname());
     exit(1);
 }

diff --git a/visudo.pod b/visudo.pod
index 4668c2b914109d9ebda322b1dd4be07a7f4a3454..4bd518b84512dfa182e51f43d6b92e3e1ac51ec5 100644 (file)
--- a/visudo.pod
+++ b/visudo.pod
@@ -27,7 +27,7 @@ visudo - edit the sudoers file
 
 =head1 SYNOPSIS
 
-B<visudo> [ B<-c> ] [ B<-f> I<sudoers> ] [ B<-q> ] [ B<-s> ] [ B<-V> ]
+B<visudo> [B<-c>] [B<-q>] [B<-s>] [B<-V>] [B<-f> I<sudoers>]
 
 =head1 DESCRIPTION