doc: homologize ch{con,grp,mod,own} option descriptions

* src/chgrp.c (usage): Group associated options together,
to aid users.  Also minimize the differences between
individual messages across these four commands, to
aid translators.
* src/chmod.c: Likewise.
* src/chown.c: Likewise.
* src/chcon.c (usage): Likewise.  Document the
--dereference option.

Suggested by Paul Eggert and Jari Aalto

diff --git a/src/chcon.c b/src/chcon.c
index 5174a46..f1c0018 100644 (file)
--- a/src/chcon.c
+++ b/src/chcon.c
@@ -359,22 +359,30 @@ Usage: %s [OPTION]... CONTEXT FILE...\n\
 Change the security context of each FILE to CONTEXT.\n\
 With --reference, change the security context of each FILE to that of RFILE.\n\
 \n\
-  -h, --no-dereference   affect symbolic links instead of any referenced file\n\
 "), stdout);
       fputs (_("\
-      --reference=RFILE  use RFILE's security context rather than specifying\n\
-                         a CONTEXT value\n\
-  -R, --recursive        operate on files and directories recursively\n\
-  -v, --verbose          output a diagnostic for every file processed\n\
+      --dereference      affect the referent of each symbolic link (this is\n\
+                         the default), rather than the symbolic link itself\n\
+  -h, --no-dereference   affect symbolic links instead of any referenced file\n\
 "), stdout);
       fputs (_("\
   -u, --user=USER        set user USER in the target security context\n\
   -r, --role=ROLE        set role ROLE in the target security context\n\
   -t, --type=TYPE        set type TYPE in the target security context\n\
   -l, --range=RANGE      set range RANGE in the target security context\n\
-\n\
 "), stdout);
       fputs (_("\
+      --reference=RFILE  use RFILE's security context rather than specifying\n\
+                         a CONTEXT value\n\
+"), stdout);
+      fputs (_("\
+  -R, --recursive        operate on files and directories recursively\n\
+"), stdout);
+      fputs (_("\
+  -v, --verbose          output a diagnostic for every file processed\n\
+"), stdout);
+      fputs (_("\
+\n\
 The following options modify how a hierarchy is traversed when the -R\n\
 option is also specified.  If more than one is specified, only the final\n\
 one takes effect.\n\

diff --git a/src/chgrp.c b/src/chgrp.c
index 1b4847d..63dcc63 100644 (file)
--- a/src/chgrp.c
+++ b/src/chgrp.c
@@ -115,13 +115,19 @@ Usage: %s [OPTION]... GROUP FILE...\n\
 Change the group of each FILE to GROUP.\n\
 With --reference, change the group of each FILE to that of RFILE.\n\
 \n\
+"), stdout);
+      fputs (_("\
   -c, --changes          like verbose but report only when a change is made\n\
+  -f, --silent, --quiet  suppress most error messages\n\
+  -v, --verbose          output a diagnostic for every file processed\n\
+"), stdout);
+      fputs (_("\
       --dereference      affect the referent of each symbolic link (this is\n\
                          the default), rather than the symbolic link itself\n\
+  -h, --no-dereference   affect symbolic links instead of any referenced file\n\
 "), stdout);
       fputs (_("\
-  -h, --no-dereference   affect each symbolic link instead of any referenced\n\
-                         file (useful only on systems that can change the\n\
+                         (useful only on systems that can change the\n\
                          ownership of a symlink)\n\
 "), stdout);
       fputs (_("\
@@ -129,14 +135,14 @@ With --reference, change the group of each FILE to that of RFILE.\n\
       --preserve-root    fail to operate recursively on `/'\n\
 "), stdout);
       fputs (_("\
-  -f, --silent, --quiet  suppress most error messages\n\
       --reference=RFILE  use RFILE's group rather than specifying a\n\
                          GROUP value\n\
+"), stdout);
+      fputs (_("\
   -R, --recursive        operate on files and directories recursively\n\
-  -v, --verbose          output a diagnostic for every file processed\n\
-\n\
 "), stdout);
       fputs (_("\
+\n\
 The following options modify how a hierarchy is traversed when the -R\n\
 option is also specified.  If more than one is specified, only the final\n\
 one takes effect.\n\

diff --git a/src/chmod.c b/src/chmod.c
index 6fec84a..70e7aaa 100644 (file)
--- a/src/chmod.c
+++ b/src/chmod.c
@@ -377,18 +377,23 @@ Usage: %s [OPTION]... MODE[,MODE]... FILE...\n\
               program_name, program_name, program_name);
       fputs (_("\
 Change the mode of each FILE to MODE.\n\
+With --reference, change the mode of each FILE to that of RFILE.\n\
 \n\
-  -c, --changes           like verbose but report only when a change is made\n\
+"), stdout);
+      fputs (_("\
+  -c, --changes          like verbose but report only when a change is made\n\
+  -f, --silent, --quiet  suppress most error messages\n\
+  -v, --verbose          output a diagnostic for every file processed\n\
 "), stdout);
       fputs (_("\
       --no-preserve-root  do not treat `/' specially (the default)\n\
-      --preserve-root     fail to operate recursively on `/'\n\
+      --preserve-root    fail to operate recursively on `/'\n\
+"), stdout);
+      fputs (_("\
+      --reference=RFILE  use RFILE's mode instead of MODE values\n\
 "), stdout);
       fputs (_("\
-  -f, --silent, --quiet   suppress most error messages\n\
-  -v, --verbose           output a diagnostic for every file processed\n\
-      --reference=RFILE   use RFILE's mode instead of MODE values\n\
-  -R, --recursive         change files and directories recursively\n\
+  -R, --recursive        change files and directories recursively\n\
 "), stdout);
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);

diff --git a/src/chown.c b/src/chown.c
index 4b0bf86..40340ae 100644 (file)
--- a/src/chown.c
+++ b/src/chown.c
@@ -86,13 +86,19 @@ Usage: %s [OPTION]... [OWNER][:[GROUP]] FILE...\n\
 Change the owner and/or group of each FILE to OWNER and/or GROUP.\n\
 With --reference, change the owner and group of each FILE to those of RFILE.\n\
 \n\
+"), stdout);
+      fputs (_("\
   -c, --changes          like verbose but report only when a change is made\n\
+  -f, --silent, --quiet  suppress most error messages\n\
+  -v, --verbose          output a diagnostic for every file processed\n\
+"), stdout);
+      fputs (_("\
       --dereference      affect the referent of each symbolic link (this is\n\
                          the default), rather than the symbolic link itself\n\
+  -h, --no-dereference   affect symbolic links instead of any referenced file\n\
 "), stdout);
       fputs (_("\
-  -h, --no-dereference   affect each symbolic link instead of any referenced\n\
-                         file (useful only on systems that can change the\n\
+                         (useful only on systems that can change the\n\
                          ownership of a symlink)\n\
 "), stdout);
       fputs (_("\
@@ -107,14 +113,14 @@ With --reference, change the owner and group of each FILE to those of RFILE.\n\
       --preserve-root    fail to operate recursively on `/'\n\
 "), stdout);
       fputs (_("\
-  -f, --silent, --quiet  suppress most error messages\n\
       --reference=RFILE  use RFILE's owner and group rather than\n\
                          specifying OWNER:GROUP values\n\
+"), stdout);
+      fputs (_("\
   -R, --recursive        operate on files and directories recursively\n\
-  -v, --verbose          output a diagnostic for every file processed\n\
-\n\
 "), stdout);
       fputs (_("\
+\n\
 The following options modify how a hierarchy is traversed when the -R\n\
 option is also specified.  If more than one is specified, only the final\n\
 one takes effect.\n\