[Pkg-shadow-commits] r1301 - in upstream/trunk: . src

[bubulle at alioth.debian.org]

Author: bubulle
Date: 2007-10-27 13:01:19 +0000 (Sat, 27 Oct 2007)
New Revision: 1301

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/src/usermod.c
Log:
Merge Debian patch 402: clarify usermod "-a" help


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2007-10-27 12:57:50 UTC (rev 1300)
+++ upstream/trunk/ChangeLog	2007-10-27 13:01:19 UTC (rev 1301)
@@ -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 at centraliens.net>
 

Modified: upstream/trunk/src/usermod.c
===================================================================
--- upstream/trunk/src/usermod.c	2007-10-27 12:57:50 UTC (rev 1300)
+++ upstream/trunk/src/usermod.c	2007-10-27 13:01:19 UTC (rev 1301)
@@ -275,8 +275,6 @@
 	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 @@
 			   "				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"