[Checkins] SVN: cipher.googlepam/trunk/ add-google-users: --add-to-group alias, improved --help message

[Marius Gedminas]

Log message for revision 127947:
  add-google-users: --add-to-group alias, improved --help message

Changed:
  U   cipher.googlepam/trunk/CHANGES.txt
  U   cipher.googlepam/trunk/src/cipher/googlepam/addusers.py

-=-
Modified: cipher.googlepam/trunk/CHANGES.txt
===================================================================
--- cipher.googlepam/trunk/CHANGES.txt	2012-10-09 08:37:03 UTC (rev 127946)
+++ cipher.googlepam/trunk/CHANGES.txt	2012-10-09 08:37:09 UTC (rev 127947)
@@ -7,7 +7,10 @@
 - Support multiple Google groups.  The authenticating user has to be a member
   of any one of them for access to be allowed.
 
+- Added add-google-users option --add-to-group as a more meaningful alias for
+  the old --admin-group option.
 
+
 1.4.0 (2012-10-08)
 ------------------
 

Modified: cipher.googlepam/trunk/src/cipher/googlepam/addusers.py
===================================================================
--- cipher.googlepam/trunk/src/cipher/googlepam/addusers.py	2012-10-09 08:37:03 UTC (rev 127946)
+++ cipher.googlepam/trunk/src/cipher/googlepam/addusers.py	2012-10-09 08:37:09 UTC (rev 127947)
@@ -131,17 +131,17 @@
 parser.add_option(
     '-g', '--group', action='store',
     dest='group',
-    help='The group all users belong to.')
+    help='The Google group all users belong to.')
 
 parser.add_option(
-    '-a', '--admin-group', action='store',
+    '-a', '--add-to-group', '--admin-group', metavar='GROUP', action='store',
     dest='admin_group',
-    help='The group to which the user will be added.')
+    help='The Unix group to which the user will be added.')
 
 parser.add_option(
     '-c', '--command', action='store',
     dest='command', default=ADDUSER_CMD,
-    help='The command used to create the user.')
+    help='The command used to create the user (default: %default).')
 
 parser.add_option(
     '--dry-run', action='store_true',