Merge Debian patch 402: clarify usermod "-a" help

diff --git a/ChangeLog b/ChangeLog
index e6ec0a91169b4497c67d77a47a578feb9a459da9..0c2993f761fffd7d9ed194b42d19ce6cfaa5120b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,8 @@
        * man/de/de.po: (nearly) complete German translation of man pages
        Imported from Debian's patch 203_de-man-update. Thanks to 
        Simon Brandmair
+       * src/usermod.c: Clarify the online help of usermod for "-a"
+       Imported from Debian's patch 402-clarify_usermod_usage
 
 2007-10-13  Nicolas François  <nicolas.francois@centraliens.net>
 

diff --git a/src/usermod.c b/src/usermod.c
index 17d2b1f2240848c94dbf5fa3a2104657ee458fc5..e905b8cd8db3ea1d595b78f9ecd3ed54fa7923af 100644 (file)
--- a/src/usermod.c
+++ b/src/usermod.c
@@ -275,8 +275,6 @@ static void usage (void)
        fprintf (stderr, _("Usage: usermod [options] LOGIN\n"
                           "\n"
                           "Options:\n"
-                          "  -a, --append                      append the user to the supplemental GROUPS\n"
-                          "                            (use only with -G)\n"
                           "  -c, --comment COMMENT             new value of the GECOS field\n"
                           "  -d, --home HOME_DIR               new home directory for the user account\n"
                           "  -e, --expiredate EXPIRE_DATE      set account expiration date to EXPIRE_DATE\n"
@@ -284,6 +282,9 @@ static void usage (void)
                           "                            to INACTIVE\n"
                           "  -g, --gid GROUP           force use GROUP as new primary group\n"
                           "  -G, --groups GROUPS               new list of supplementary GROUPS\n"
+                          "  -a, --append              append the user to the supplemental GROUPS\n"
+                          "                            mentioned by the -G option without removing\n"
+                          "                            him/her from other groups\n"
                           "  -h, --help                        display this help message and exit\n"
                           "  -l, --login NEW_LOGIN             new value of the login name\n"
                           "  -L, --lock                        lock the user account\n"