From 94a3a5c038534452930b6ddeb5a67240f867542c Mon Sep 17 00:00:00 2001
From: Rob Crittenden <rcritten@redhat.com>
Date: Fri, 25 Jan 2008 13:49:08 -0500
Subject: Fix discrepencies between built-in help and the man page. Resolves bz
 429814

---
 ipa-admintools/ipa-moduser       |  2 +-
 ipa-admintools/man/ipa-moduser.1 | 32 ++++++++++++++++++--------------
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/ipa-admintools/ipa-moduser b/ipa-admintools/ipa-moduser
index 81ad71987..babdea6c4 100644
--- a/ipa-admintools/ipa-moduser
+++ b/ipa-admintools/ipa-moduser
@@ -32,7 +32,7 @@ import ldap
 import errno
 
 def usage():
-    print "ipa-moduser [-a|--activate] [-c|--gecos STRING] [-d|--directory STRING] [-f|--firstname STRING] [-l|--lastname STRING] [-s|--shell STRING] [--add attribute=value] [--del attribute] [--set attribute=value] user"
+    print "ipa-moduser [-a|--activate] [-c|--gecos STRING] [-d|--directory STRING] [-f|--firstname STRING] [-l|--lastname STRING] [-s|--shell STRING] [--addattr attribute=value] [--delattr attribute] [--setattr attribute=value] user"
     sys.exit(1)
 
 def set_add_usage(which):
diff --git a/ipa-admintools/man/ipa-moduser.1 b/ipa-admintools/man/ipa-moduser.1
index 616cb9b2d..53f479c43 100644
--- a/ipa-admintools/man/ipa-moduser.1
+++ b/ipa-admintools/man/ipa-moduser.1
@@ -27,27 +27,31 @@ ipa\-moduser [\fIOPTION\fR]... \fIname\fR
 Updates the user \fIname\fR.
 .SH "OPTIONS"
 .TP 
-\fB\-a\fR, \fB\-\-add\fR=\fIuser1,user2,...usern\fR
-Add one or more users to the group
-
+\fB\-a\fR, \fB\-\-activate\fR
+Activate a user that was previously inactivated
 .TP 
-\fB\-d\fR, \fB\-\-description\fR=\fIdescription\fR
-Modify the description of the group
-
+\fB\-c\fR, \fB\-\-gecos\fR=\fIGECOS\fR
+Set the gecos field of the user. This is traditionally the user's full name.
 .TP 
-\fB\-r\fR, \fB\-\-remove\fR=\fIuser1,user2,...usern\fR
-Remove one or more users from the group
-
+\fB\-d\fR, \fB\-\-directory\fR=\fIdirectory\fR
+Set user's home directory
+.TP 
+\fB\-f\fR, \fB\-\-firstname\fR=\fINAME\fR
+Set user's first name
 .TP 
-\fB\-\-addattr\fR=\fIattr=value\fR
+\fB\-l\fR, \fB\-\-lastname\fR=\fINAME\fR
+Set user's last name
+.TP 
+\fB\-s\fR, \fB\-\-shell\fR=\fIshell\fR
+Set user's login shell
+.TP 
+\fB\-\-addattr\fR \fIattr=value\fR
 Add a new attribute, or value to an existing attribute
-
 .TP 
-\fB\-\-delattr\fR=\fIattr=value\fR
+\fB\-\-delattr\fR \fIattr=value\fR
 Remove an attribute and all values
-
 .TP 
-\fB\-\-setattr\fR=\fIattr=value\fR
+\fB\-\-setattr\fR \fIattr=value\fR
 Set an attribute to a new value, removing all old ones
 .SH "EXIT STATUS"
 The exit status is 0 on success, nonzero on error.
-- 
cgit