summaryrefslogtreecommitdiffstats
path: root/ipalib/plugins/user.py
diff options
context:
space:
mode:
authorRob Crittenden <rcritten@redhat.com>2011-03-04 11:08:54 -0500
committerRob Crittenden <rcritten@redhat.com>2011-03-04 11:09:43 -0500
commit4d0e739345fe3039db16e0ee613431e1aa92cf02 (patch)
tree87fe8f94e7b7265cd12b8a78eca89cedb87ad160 /ipalib/plugins/user.py
parentc0ecdd1395e457592407c2d4d622a2758896d8ca (diff)
downloadfreeipa-4d0e739345fe3039db16e0ee613431e1aa92cf02.tar.gz
freeipa-4d0e739345fe3039db16e0ee613431e1aa92cf02.tar.xz
freeipa-4d0e739345fe3039db16e0ee613431e1aa92cf02.zip
Fix style and grammatical issues in built-in command help.
There is a rather large API.txt change but it is only due to changes in the doc string in parameters. ticket 729
Diffstat (limited to 'ipalib/plugins/user.py')
-rw-r--r--ipalib/plugins/user.py14
1 files changed, 8 insertions, 6 deletions
diff --git a/ipalib/plugins/user.py b/ipalib/plugins/user.py
index 4a023ced3..eaf24ce59 100644
--- a/ipalib/plugins/user.py
+++ b/ipalib/plugins/user.py
@@ -24,7 +24,7 @@ Manage user entries. All users are POSIX users.
IPA supports a wide range of username formats, but you need to be aware of any
restrictions that may apply to your particular environment. For example,
-usernames that starts with a digit or usernames that exceed a certain length
+usernames that start with a digit or usernames that exceed a certain length
may cause problems for some UNIX systems.
Use 'ipa config-mod' to change the username format allowed by IPA tools.
@@ -401,7 +401,7 @@ api.register(user_show)
class user_disable(LDAPQuery):
"""
- Disable user account.
+ Disable a user account.
"""
has_output = output.standard_value
@@ -424,7 +424,7 @@ api.register(user_disable)
class user_enable(LDAPQuery):
"""
- Enable user account.
+ Enable a user account.
"""
has_output = output.standard_value
@@ -446,10 +446,12 @@ api.register(user_enable)
class user_unlock(LDAPQuery):
"""
- Lock user account
+ Unlock a user account
- - locked account can't log in against Kerberos and must be unlocked by admin
- - account can be locked e.g. by inputting wrong password too many times
+ An account may become locked if the password is entered incorrectly too
+ many times within a specific time period as controlled by password
+ policy. A locked account is a temporary condition and may be unlocked by
+ an administrator.
"""
has_output = output.standard_value
msg_summary = _('Unlocked account "%(value)s"')