Remove redundant information from API.txt

Some Param or Output attributes do not cause API incompatibility
(e.g. doc, label or callables) and does not need to be included
in API.txt. When these attributes are modified, a lot of bogus
changes may get in API.txt - making the real API changes less
detectable.

https://fedorahosted.org/freeipa/ticket/2107

2 files changed, 2383 insertions, 2343 deletions

diff --git a/API.txt b/API.txt
index 7a7cb008..135b0790 100644
--- a/API.txt
+++ b/API.txt
@@ -1,2901 +1,2901 @@
 command: aci_add
 args: 1,15,3
-arg: Str('aciname', attribute=True, cli_name='name', flags=('virtual_attribute',), label=Gettext('ACI name', domain='ipa', localedir=None), multivalue=False, primary_key=True, required=True)
-option: Str('permission', attribute=False, cli_name='permission', flags=('virtual_attribute',), label=Gettext('Permission', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Str('group', attribute=False, cli_name='group', flags=('virtual_attribute',), label=Gettext('User group', domain='ipa', localedir=None), multivalue=False, required=False)
-option: List('permissions', validate_permissions, attribute=False, cli_name='permissions', flags=('virtual_attribute',), label=Gettext('Permissions', domain='ipa', localedir=None), multivalue=True, normalizer=_normalize_permissions, required=True)
-option: List('attrs', attribute=False, cli_name='attrs', flags=('virtual_attribute',), label=Gettext('Attributes', domain='ipa', localedir=None), multivalue=True, required=False)
-option: StrEnum('type', attribute=False, cli_name='type', flags=('virtual_attribute',), label=Gettext('Type', domain='ipa', localedir=None), multivalue=False, required=False, values=(u'user', u'group', u'host', u'service', u'hostgroup', u'netgroup', u'dnsrecord'))
-option: Str('memberof', attribute=False, cli_name='memberof', flags=('virtual_attribute',), label=Gettext('Member of', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Str('filter', attribute=False, cli_name='filter', flags=('virtual_attribute',), label=Gettext('Filter', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Str('subtree', attribute=False, cli_name='subtree', flags=('virtual_attribute',), label=Gettext('Subtree', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Str('targetgroup', attribute=False, cli_name='targetgroup', flags=('virtual_attribute',), label=Gettext('Target group', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Flag('selfaci', attribute=False, autofill=True, cli_name='self', default=False, flags=('virtual_attribute',), label=Gettext('Target your own entry (self)', domain='ipa', localedir=None), multivalue=False, required=False)
-option: StrEnum('aciprefix', cli_name='prefix', label=Gettext('ACI prefix', domain='ipa', localedir=None), values=(u'permission', u'delegation', u'selfservice', u'none'))
+arg: Str('aciname', attribute=True, cli_name='name', multivalue=False, primary_key=True, required=True)
+option: Str('permission', attribute=False, cli_name='permission', multivalue=False, required=False)
+option: Str('group', attribute=False, cli_name='group', multivalue=False, required=False)
+option: List('permissions', attribute=False, cli_name='permissions', multivalue=True, required=True)
+option: List('attrs', attribute=False, cli_name='attrs', multivalue=True, required=False)
+option: StrEnum('type', attribute=False, cli_name='type', multivalue=False, required=False, values=(u'user', u'group', u'host', u'service', u'hostgroup', u'netgroup', u'dnsrecord'))
+option: Str('memberof', attribute=False, cli_name='memberof', multivalue=False, required=False)
+option: Str('filter', attribute=False, cli_name='filter', multivalue=False, required=False)
+option: Str('subtree', attribute=False, cli_name='subtree', multivalue=False, required=False)
+option: Str('targetgroup', attribute=False, cli_name='targetgroup', multivalue=False, required=False)
+option: Flag('selfaci', attribute=False, autofill=True, cli_name='self', default=False, multivalue=False, required=False)
+option: StrEnum('aciprefix', cli_name='prefix', values=(u'permission', u'delegation', u'selfservice', u'none'))
 option: Flag('test?', autofill=True, default=False)
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
 output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+output: Output('value', <type 'unicode'>, None)
 command: aci_del
 args: 1,1,3
-arg: Str('aciname', attribute=True, cli_name='name', flags=('virtual_attribute',), label=Gettext('ACI name', domain='ipa', localedir=None), multivalue=False, primary_key=True, query=True, required=True)
-option: StrEnum('aciprefix', cli_name='prefix', label=Gettext('ACI prefix', domain='ipa', localedir=None), values=(u'permission', u'delegation', u'selfservice', u'none'))
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Output('result', <type 'bool'>, 'True means the operation was successful')
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+arg: Str('aciname', attribute=True, cli_name='name', multivalue=False, primary_key=True, query=True, required=True)
+option: StrEnum('aciprefix', cli_name='prefix', values=(u'permission', u'delegation', u'selfservice', u'none'))
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Output('result', <type 'bool'>, None)
+output: Output('value', <type 'unicode'>, None)
 command: aci_find
 args: 1,15,4
 arg: Str('criteria?')
-option: Str('aciname', attribute=False, autofill=False, cli_name='name', flags=('virtual_attribute',), label=Gettext('ACI name', domain='ipa', localedir=None), multivalue=False, primary_key=True, query=True, required=False)
-option: Str('permission', attribute=False, autofill=False, cli_name='permission', flags=('virtual_attribute',), label=Gettext('Permission', domain='ipa', localedir=None), multivalue=False, query=True, required=False)
-option: Str('group', attribute=False, autofill=False, cli_name='group', flags=('virtual_attribute',), label=Gettext('User group', domain='ipa', localedir=None), multivalue=False, query=True, required=False)
-option: List('permissions', validate_permissions, attribute=False, autofill=False, cli_name='permissions', flags=('virtual_attribute',), label=Gettext('Permissions', domain='ipa', localedir=None), multivalue=True, normalizer=_normalize_permissions, query=True, required=False)
-option: List('attrs', attribute=False, autofill=False, cli_name='attrs', flags=('virtual_attribute',), label=Gettext('Attributes', domain='ipa', localedir=None), multivalue=True, query=True, required=False)
-option: StrEnum('type', attribute=False, autofill=False, cli_name='type', flags=('virtual_attribute',), label=Gettext('Type', domain='ipa', localedir=None), multivalue=False, query=True, required=False, values=(u'user', u'group', u'host', u'service', u'hostgroup', u'netgroup', u'dnsrecord'))
-option: Str('memberof', attribute=False, autofill=False, cli_name='memberof', flags=('virtual_attribute',), label=Gettext('Member of', domain='ipa', localedir=None), multivalue=False, query=True, required=False)
-option: Str('filter', attribute=False, autofill=False, cli_name='filter', flags=('virtual_attribute',), label=Gettext('Filter', domain='ipa', localedir=None), multivalue=False, query=True, required=False)
-option: Str('subtree', attribute=False, autofill=False, cli_name='subtree', flags=('virtual_attribute',), label=Gettext('Subtree', domain='ipa', localedir=None), multivalue=False, query=True, required=False)
-option: Str('targetgroup', attribute=False, autofill=False, cli_name='targetgroup', flags=('virtual_attribute',), label=Gettext('Target group', domain='ipa', localedir=None), multivalue=False, query=True, required=False)
-option: Bool('selfaci', attribute=False, autofill=False, cli_name='self', default=False, flags=('virtual_attribute',), label=Gettext('Target your own entry (self)', domain='ipa', localedir=None), multivalue=False, query=True, required=False)
-option: StrEnum('aciprefix?', cli_name='prefix', label=Gettext('ACI prefix', domain='ipa', localedir=None), multivalue=False, required=False, values=(u'permission', u'delegation', u'selfservice', u'none'))
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
+option: Str('aciname', attribute=False, autofill=False, cli_name='name', multivalue=False, primary_key=True, query=True, required=False)
+option: Str('permission', attribute=False, autofill=False, cli_name='permission', multivalue=False, query=True, required=False)
+option: Str('group', attribute=False, autofill=False, cli_name='group', multivalue=False, query=True, required=False)
+option: List('permissions', attribute=False, autofill=False, cli_name='permissions', multivalue=True, query=True, required=False)
+option: List('attrs', attribute=False, autofill=False, cli_name='attrs', multivalue=True, query=True, required=False)
+option: StrEnum('type', attribute=False, autofill=False, cli_name='type', multivalue=False, query=True, required=False, values=(u'user', u'group', u'host', u'service', u'hostgroup', u'netgroup', u'dnsrecord'))
+option: Str('memberof', attribute=False, autofill=False, cli_name='memberof', multivalue=False, query=True, required=False)
+option: Str('filter', attribute=False, autofill=False, cli_name='filter', multivalue=False, query=True, required=False)
+option: Str('subtree', attribute=False, autofill=False, cli_name='subtree', multivalue=False, query=True, required=False)
+option: Str('targetgroup', attribute=False, autofill=False, cli_name='targetgroup', multivalue=False, query=True, required=False)
+option: Bool('selfaci', attribute=False, autofill=False, cli_name='self', default=False, multivalue=False, query=True, required=False)
+option: StrEnum('aciprefix?', cli_name='prefix', multivalue=False, required=False, values=(u'permission', u'delegation', u'selfservice', u'none'))
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
 output: ListOfEntries('result', (<type 'list'>, <type 'tuple'>), Gettext('A list of LDAP entries', domain='ipa', localedir=None))
-output: Output('count', <type 'int'>, 'Number of entries returned')
-output: Output('truncated', <type 'bool'>, 'True if not all results were returned')
+output: Output('count', <type 'int'>, None)
+output: Output('truncated', <type 'bool'>, None)
 command: aci_mod
 args: 1,14,3
-arg: Str('aciname', attribute=True, cli_name='name', flags=('virtual_attribute',), label=Gettext('ACI name', domain='ipa', localedir=None), multivalue=False, primary_key=True, query=True, required=True)
-option: Str('permission', attribute=False, autofill=False, cli_name='permission', flags=('virtual_attribute',), label=Gettext('Permission', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Str('group', attribute=False, autofill=False, cli_name='group', flags=('virtual_attribute',), label=Gettext('User group', domain='ipa', localedir=None), multivalue=False, required=False)
-option: List('permissions', validate_permissions, attribute=False, autofill=False, cli_name='permissions', flags=('virtual_attribute',), label=Gettext('Permissions', domain='ipa', localedir=None), multivalue=True, normalizer=_normalize_permissions, required=False)
-option: List('attrs', attribute=False, autofill=False, cli_name='attrs', flags=('virtual_attribute',), label=Gettext('Attributes', domain='ipa', localedir=None), multivalue=True, required=False)
-option: StrEnum('type', attribute=False, autofill=False, cli_name='type', flags=('virtual_attribute',), label=Gettext('Type', domain='ipa', localedir=None), multivalue=False, required=False, values=(u'user', u'group', u'host', u'service', u'hostgroup', u'netgroup', u'dnsrecord'))
-option: Str('memberof', attribute=False, autofill=False, cli_name='memberof', flags=('virtual_attribute',), label=Gettext('Member of', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Str('filter', attribute=False, autofill=False, cli_name='filter', flags=('virtual_attribute',), label=Gettext('Filter', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Str('subtree', attribute=False, autofill=False, cli_name='subtree', flags=('virtual_attribute',), label=Gettext('Subtree', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Str('targetgroup', attribute=False, autofill=False, cli_name='targetgroup', flags=('virtual_attribute',), label=Gettext('Target group', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Flag('selfaci', attribute=False, autofill=True, cli_name='self', default=False, flags=('virtual_attribute',), label=Gettext('Target your own entry (self)', domain='ipa', localedir=None), multivalue=False, required=False)
-option: StrEnum('aciprefix', cli_name='prefix', label=Gettext('ACI prefix', domain='ipa', localedir=None), values=(u'permission', u'delegation', u'selfservice', u'none'))
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+arg: Str('aciname', attribute=True, cli_name='name', multivalue=False, primary_key=True, query=True, required=True)
+option: Str('permission', attribute=False, autofill=False, cli_name='permission', multivalue=False, required=False)
+option: Str('group', attribute=False, autofill=False, cli_name='group', multivalue=False, required=False)
+option: List('permissions', attribute=False, autofill=False, cli_name='permissions', multivalue=True, required=False)
+option: List('attrs', attribute=False, autofill=False, cli_name='attrs', multivalue=True, required=False)
+option: StrEnum('type', attribute=False, autofill=False, cli_name='type', multivalue=False, required=False, values=(u'user', u'group', u'host', u'service', u'hostgroup', u'netgroup', u'dnsrecord'))
+option: Str('memberof', attribute=False, autofill=False, cli_name='memberof', multivalue=False, required=False)
+option: Str('filter', attribute=False, autofill=False, cli_name='filter', multivalue=False, required=False)
+option: Str('subtree', attribute=False, autofill=False, cli_name='subtree', multivalue=False, required=False)
+option: Str('targetgroup', attribute=False, autofill=False, cli_name='targetgroup', multivalue=False, required=False)
+option: Flag('selfaci', attribute=False, autofill=True, cli_name='self', default=False, multivalue=False, required=False)
+option: StrEnum('aciprefix', cli_name='prefix', values=(u'permission', u'delegation', u'selfservice', u'none'))
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('value', <type 'unicode'>, None)
 command: aci_rename
 args: 1,15,3
-arg: Str('aciname', attribute=True, cli_name='name', flags=('virtual_attribute',), label=Gettext('ACI name', domain='ipa', localedir=None), multivalue=False, primary_key=True, query=True, required=True)
-option: Str('permission', attribute=False, autofill=False, cli_name='permission', flags=('virtual_attribute',), label=Gettext('Permission', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Str('group', attribute=False, autofill=False, cli_name='group', flags=('virtual_attribute',), label=Gettext('User group', domain='ipa', localedir=None), multivalue=False, required=False)
-option: List('permissions', validate_permissions, attribute=False, autofill=False, cli_name='permissions', flags=('virtual_attribute',), label=Gettext('Permissions', domain='ipa', localedir=None), multivalue=True, normalizer=_normalize_permissions, required=False)
-option: List('attrs', attribute=False, autofill=False, cli_name='attrs', flags=('virtual_attribute',), label=Gettext('Attributes', domain='ipa', localedir=None), multivalue=True, required=False)
-option: StrEnum('type', attribute=False, autofill=False, cli_name='type', flags=('virtual_attribute',), label=Gettext('Type', domain='ipa', localedir=None), multivalue=False, required=False, values=(u'user', u'group', u'host', u'service', u'hostgroup', u'netgroup', u'dnsrecord'))
-option: Str('memberof', attribute=False, autofill=False, cli_name='memberof', flags=('virtual_attribute',), label=Gettext('Member of', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Str('filter', attribute=False, autofill=False, cli_name='filter', flags=('virtual_attribute',), label=Gettext('Filter', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Str('subtree', attribute=False, autofill=False, cli_name='subtree', flags=('virtual_attribute',), label=Gettext('Subtree', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Str('targetgroup', attribute=False, autofill=False, cli_name='targetgroup', flags=('virtual_attribute',), label=Gettext('Target group', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Flag('selfaci', attribute=False, autofill=True, cli_name='self', default=False, flags=('virtual_attribute',), label=Gettext('Target your own entry (self)', domain='ipa', localedir=None), multivalue=False, required=False)
-option: StrEnum('aciprefix', cli_name='prefix', label=Gettext('ACI prefix', domain='ipa', localedir=None), values=(u'permission', u'delegation', u'selfservice', u'none'))
+arg: Str('aciname', attribute=True, cli_name='name', multivalue=False, primary_key=True, query=True, required=True)
+option: Str('permission', attribute=False, autofill=False, cli_name='permission', multivalue=False, required=False)
+option: Str('group', attribute=False, autofill=False, cli_name='group', multivalue=False, required=False)
+option: List('permissions', attribute=False, autofill=False, cli_name='permissions', multivalue=True, required=False)
+option: List('attrs', attribute=False, autofill=False, cli_name='attrs', multivalue=True, required=False)
+option: StrEnum('type', attribute=False, autofill=False, cli_name='type', multivalue=False, required=False, values=(u'user', u'group', u'host', u'service', u'hostgroup', u'netgroup', u'dnsrecord'))
+option: Str('memberof', attribute=False, autofill=False, cli_name='memberof', multivalue=False, required=False)
+option: Str('filter', attribute=False, autofill=False, cli_name='filter', multivalue=False, required=False)
+option: Str('subtree', attribute=False, autofill=False, cli_name='subtree', multivalue=False, required=False)
+option: Str('targetgroup', attribute=False, autofill=False, cli_name='targetgroup', multivalue=False, required=False)
+option: Flag('selfaci', attribute=False, autofill=True, cli_name='self', default=False, multivalue=False, required=False)
+option: StrEnum('aciprefix', cli_name='prefix', values=(u'permission', u'delegation', u'selfservice', u'none'))
 option: Str('newname')
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
 output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+output: Output('value', <type 'unicode'>, None)
 command: aci_show
 args: 1,4,3
-arg: Str('aciname', attribute=True, cli_name='name', flags=('virtual_attribute',), label=Gettext('ACI name', domain='ipa', localedir=None), multivalue=False, primary_key=True, query=True, required=True)
-option: StrEnum('aciprefix', cli_name='prefix', label=Gettext('ACI prefix', domain='ipa', localedir=None), values=(u'permission', u'delegation', u'selfservice', u'none'))
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+arg: Str('aciname', attribute=True, cli_name='name', multivalue=False, primary_key=True, query=True, required=True)
+option: StrEnum('aciprefix', cli_name='prefix', values=(u'permission', u'delegation', u'selfservice', u'none'))
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('value', <type 'unicode'>, None)
 command: automember_add
 args: 1,5,3
-arg: Str('cn', cli_name='automember_rule', label=Gettext('Automember Rule', domain='ipa', localedir=None), normalizer=<lambda>)
-option: Str('description', attribute=True, cli_name='desc', label=Gettext('Description', domain='ipa', localedir=None), multivalue=False, required=False)
-option: StrEnum('type', label=Gettext('Grouping Type', domain='ipa', localedir=None), values=(u'group', u'hostgroup'))
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+arg: Str('cn', cli_name='automember_rule')
+option: Str('description', attribute=True, cli_name='desc', multivalue=False, required=False)
+option: StrEnum('type', values=(u'group', u'hostgroup'))
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('value', <type 'unicode'>, None)
 command: automember_add_condition
 args: 1,8,5
-arg: Str('cn', cli_name='automember_rule', label=Gettext('Automember Rule', domain='ipa', localedir=None), normalizer=<lambda>)
-option: Str('description', attribute=True, autofill=False, cli_name='desc', label=Gettext('Description', domain='ipa', localedir=None), multivalue=False, required=False)
-option: List('automemberinclusiveregex?', alwaysask=True, cli_name='inclusive_regex', label=Gettext('Inclusive Regex', domain='ipa', localedir=None), multivalue=True)
-option: List('automemberexclusiveregex?', alwaysask=True, cli_name='exclusive_regex', label=Gettext('Exclusive Regex', domain='ipa', localedir=None), multivalue=True)
-option: Str('key', flags=['no_create', 'no_update', 'no_search'], label=Gettext('Attribute Key', domain='ipa', localedir=None))
-option: StrEnum('type', label=Gettext('Grouping Type', domain='ipa', localedir=None), values=(u'group', u'hostgroup'))
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
-output: Output('failed', <type 'dict'>, Gettext('Conditions that could not be added', domain='ipa', localedir=None))
-output: Output('completed', <type 'int'>, Gettext('Number of conditions added', domain='ipa', localedir=None))
+arg: Str('cn', cli_name='automember_rule')
+option: Str('description', attribute=True, autofill=False, cli_name='desc', multivalue=False, required=False)
+option: List('automemberinclusiveregex?', alwaysask=True, cli_name='inclusive_regex', multivalue=True)
+option: List('automemberexclusiveregex?', alwaysask=True, cli_name='exclusive_regex', multivalue=True)
+option: Str('key')
+option: StrEnum('type', values=(u'group', u'hostgroup'))
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('value', <type 'unicode'>, None)
+output: Output('failed', <type 'dict'>, None)
+output: Output('completed', <type 'int'>, None)
 command: automember_default_group_remove
 args: 0,5,3
-option: Str('description', attribute=True, autofill=False, cli_name='desc', label=Gettext('Description', domain='ipa', localedir=None), multivalue=False, required=False)
-option: StrEnum('type', label=Gettext('Grouping Type', domain='ipa', localedir=None), values=(u'group', u'hostgroup'))
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+option: Str('description', attribute=True, autofill=False, cli_name='desc', multivalue=False, required=False)
+option: StrEnum('type', values=(u'group', u'hostgroup'))
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('value', <type 'unicode'>, None)
 command: automember_default_group_set
 args: 0,6,3
-option: Str('description', attribute=True, autofill=False, cli_name='desc', label=Gettext('Description', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Str('automemberdefaultgroup', cli_name='default_group', flags=['no_create', 'no_update'], label=Gettext('Default Group', domain='ipa', localedir=None))
-option: StrEnum('type', label=Gettext('Grouping Type', domain='ipa', localedir=None), values=(u'group', u'hostgroup'))
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+option: Str('description', attribute=True, autofill=False, cli_name='desc', multivalue=False, required=False)
+option: Str('automemberdefaultgroup', cli_name='default_group')
+option: StrEnum('type', values=(u'group', u'hostgroup'))
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('value', <type 'unicode'>, None)
 command: automember_default_group_show
 args: 0,4,3
-option: StrEnum('type', label=Gettext('Grouping Type', domain='ipa', localedir=None), values=(u'group', u'hostgroup'))
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
+option: StrEnum('type', values=(u'group', u'hostgroup'))
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
 output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+output: Output('value', <type 'unicode'>, None)
 command: automember_del
 args: 1,1,3
-arg: Str('cn', cli_name='automember_rule', label=Gettext('Automember Rule', domain='ipa', localedir=None), normalizer=<lambda>)
-option: StrEnum('type', label=Gettext('Grouping Type', domain='ipa', localedir=None), values=(u'group', u'hostgroup'))
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Output('result', <type 'dict'>, 'list of deletions that failed')
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+arg: Str('cn', cli_name='automember_rule')
+option: StrEnum('type', values=(u'group', u'hostgroup'))
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Output('result', <type 'dict'>, None)
+output: Output('value', <type 'unicode'>, None)
 command: automember_find
 args: 1,5,4
 arg: Str('criteria?', noextrawhitespace=False)
-option: Str('description', attribute=True, autofill=False, cli_name='desc', label=Gettext('Description', domain='ipa', localedir=None), multivalue=False, query=True, required=False)
-option: StrEnum('type', label=Gettext('Grouping Type', domain='ipa', localedir=None), values=(u'group', u'hostgroup'))
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
+option: Str('description', attribute=True, autofill=False, cli_name='desc', multivalue=False, query=True, required=False)
+option: StrEnum('type', values=(u'group', u'hostgroup'))
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
 output: ListOfEntries('result', (<type 'list'>, <type 'tuple'>), Gettext('A list of LDAP entries', domain='ipa', localedir=None))
-output: Output('count', <type 'int'>, 'Number of entries returned')
-output: Output('truncated', <type 'bool'>, 'True if not all results were returned')
+output: Output('count', <type 'int'>, None)
+output: Output('truncated', <type 'bool'>, None)
 command: automember_mod
 args: 1,5,3
-arg: Str('cn', cli_name='automember_rule', label=Gettext('Automember Rule', domain='ipa', localedir=None), normalizer=<lambda>)
-option: Str('description', attribute=True, autofill=False, cli_name='desc', label=Gettext('Description', domain='ipa', localedir=None), multivalue=False, required=False)
-option: StrEnum('type', label=Gettext('Grouping Type', domain='ipa', localedir=None), values=(u'group', u'hostgroup'))
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+arg: Str('cn', cli_name='automember_rule')
+option: Str('description', attribute=True, autofill=False, cli_name='desc', multivalue=False, required=False)
+option: StrEnum('type', values=(u'group', u'hostgroup'))
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('value', <type 'unicode'>, None)
 command: automember_remove_condition
 args: 1,8,5
-arg: Str('cn', cli_name='automember_rule', label=Gettext('Automember Rule', domain='ipa', localedir=None), normalizer=<lambda>)
-option: Str('description', attribute=True, autofill=False, cli_name='desc', label=Gettext('Description', domain='ipa', localedir=None), multivalue=False, required=False)
-option: List('automemberinclusiveregex?', alwaysask=True, cli_name='inclusive_regex', label=Gettext('Inclusive Regex', domain='ipa', localedir=None), multivalue=True)
-option: List('automemberexclusiveregex?', alwaysask=True, cli_name='exclusive_regex', label=Gettext('Exclusive Regex', domain='ipa', localedir=None), multivalue=True)
-option: Str('key', flags=['no_create', 'no_update', 'no_search'], label=Gettext('Attribute Key', domain='ipa', localedir=None))
-option: StrEnum('type', label=Gettext('Grouping Type', domain='ipa', localedir=None), values=(u'group', u'hostgroup'))
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
-output: Output('failed', <type 'dict'>, Gettext('Conditions that could not be removed', domain='ipa', localedir=None))
-output: Output('completed', <type 'int'>, Gettext('Number of conditions removed', domain='ipa', localedir=None))
+arg: Str('cn', cli_name='automember_rule')
+option: Str('description', attribute=True, autofill=False, cli_name='desc', multivalue=False, required=False)
+option: List('automemberinclusiveregex?', alwaysask=True, cli_name='inclusive_regex', multivalue=True)
+option: List('automemberexclusiveregex?', alwaysask=True, cli_name='exclusive_regex', multivalue=True)
+option: Str('key')
+option: StrEnum('type', values=(u'group', u'hostgroup'))
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('value', <type 'unicode'>, None)
+output: Output('failed', <type 'dict'>, None)
+output: Output('completed', <type 'int'>, None)
 command: automember_show
 args: 1,4,3
-arg: Str('cn', cli_name='automember_rule', label=Gettext('Automember Rule', domain='ipa', localedir=None), normalizer=<lambda>)
-option: StrEnum('type', label=Gettext('Grouping Type', domain='ipa', localedir=None), values=(u'group', u'hostgroup'))
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+arg: Str('cn', cli_name='automember_rule')
+option: StrEnum('type', values=(u'group', u'hostgroup'))
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('value', <type 'unicode'>, None)
 command: automountkey_add
 args: 2,7,3
-arg: Str('automountlocationcn', cli_name='automountlocation', label=Gettext('Location', domain='ipa', localedir=None), query=True, required=True)
-arg: IA5Str('automountmapautomountmapname', cli_name='automountmap', label=Gettext('Map', domain='ipa', localedir=None), query=True, required=True)
-option: IA5Str('automountkey', attribute=True, cli_name='key', flags=('req_update',), label=Gettext('Key', domain='ipa', localedir=None), multivalue=False, required=True)
-option: IA5Str('automountinformation', attribute=True, cli_name='info', label=Gettext('Mount information', domain='ipa', localedir=None), multivalue=False, required=True)
-option: Str('addattr*', validate_add_attribute, cli_name='addattr', exclude='webui')
-option: Str('setattr*', validate_set_attribute, cli_name='setattr', exclude='webui')
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+arg: Str('automountlocationcn', cli_name='automountlocation', query=True, required=True)
+arg: IA5Str('automountmapautomountmapname', cli_name='automountmap', query=True, required=True)
+option: IA5Str('automountkey', attribute=True, cli_name='key', multivalue=False, required=True)
+option: IA5Str('automountinformation', attribute=True, cli_name='info', multivalue=False, required=True)
+option: Str('addattr*', cli_name='addattr', exclude='webui')
+option: Str('setattr*', cli_name='setattr', exclude='webui')
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('value', <type 'unicode'>, None)
 command: automountkey_del
 args: 2,3,3
-arg: Str('automountlocationcn', cli_name='automountlocation', label=Gettext('Location', domain='ipa', localedir=None), query=True, required=True)
-arg: IA5Str('automountmapautomountmapname', cli_name='automountmap', label=Gettext('Map', domain='ipa', localedir=None), query=True, required=True)
-option: Flag('continue', autofill=True, cli_name='continue', default=False, exclude='webui', flags=['no_option', 'no_output'], label=FixMe('continue'), multivalue=False, required=True)
-option: IA5Str('automountkey', cli_name='key', label=Gettext('Key', domain='ipa', localedir=None))
-option: IA5Str('automountinformation?', cli_name='info', label=Gettext('Mount information', domain='ipa', localedir=None))
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Output('result', <type 'dict'>, 'list of deletions that failed')
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+arg: Str('automountlocationcn', cli_name='automountlocation', query=True, required=True)
+arg: IA5Str('automountmapautomountmapname', cli_name='automountmap', query=True, required=True)
+option: Flag('continue', autofill=True, cli_name='continue', default=False, exclude='webui', multivalue=False, required=True)
+option: IA5Str('automountkey', cli_name='key')
+option: IA5Str('automountinformation?', cli_name='info')
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Output('result', <type 'dict'>, None)
+output: Output('value', <type 'unicode'>, None)
 command: automountkey_find
 args: 3,7,4
-arg: Str('automountlocationcn', cli_name='automountlocation', label=Gettext('Location', domain='ipa', localedir=None), query=True, required=True)
-arg: IA5Str('automountmapautomountmapname', cli_name='automountmap', label=Gettext('Map', domain='ipa', localedir=None), query=True, required=True)
+arg: Str('automountlocationcn', cli_name='automountlocation', query=True, required=True)
+arg: IA5Str('automountmapautomountmapname', cli_name='automountmap', query=True, required=True)
 arg: Str('criteria?', noextrawhitespace=False)
-option: IA5Str('automountkey', attribute=True, autofill=False, cli_name='key', flags=('req_update',), label=Gettext('Key', domain='ipa', localedir=None), multivalue=False, query=True, required=False)
-option: IA5Str('automountinformation', attribute=True, autofill=False, cli_name='info', label=Gettext('Mount information', domain='ipa', localedir=None), multivalue=False, query=True, required=False)
-option: Int('timelimit?', autofill=False, flags=['no_display'], label=Gettext('Time Limit', domain='ipa', localedir=None), minvalue=0)
-option: Int('sizelimit?', autofill=False, flags=['no_display'], label=Gettext('Size Limit', domain='ipa', localedir=None), minvalue=0)
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
+option: IA5Str('automountkey', attribute=True, autofill=False, cli_name='key', multivalue=False, query=True, required=False)
+option: IA5Str('automountinformation', attribute=True, autofill=False, cli_name='info', multivalue=False, query=True, required=False)
+option: Int('timelimit?', autofill=False, minvalue=0)
+option: Int('sizelimit?', autofill=False, minvalue=0)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
 output: ListOfEntries('result', (<type 'list'>, <type 'tuple'>), Gettext('A list of LDAP entries', domain='ipa', localedir=None))
-output: Output('count', <type 'int'>, 'Number of entries returned')
-output: Output('truncated', <type 'bool'>, 'True if not all results were returned')
+output: Output('count', <type 'int'>, None)
+output: Output('truncated', <type 'bool'>, None)
 command: automountkey_mod
 args: 2,10,3
-arg: Str('automountlocationcn', cli_name='automountlocation', label=Gettext('Location', domain='ipa', localedir=None), query=True, required=True)
-arg: IA5Str('automountmapautomountmapname', cli_name='automountmap', label=Gettext('Map', domain='ipa', localedir=None), query=True, required=True)
-option: IA5Str('automountkey', alwaysask=False, attribute=True, cli_name='key', flags=('req_update',), label=Gettext('Key', domain='ipa', localedir=None), multivalue=False, required=True)
-option: IA5Str('automountinformation', attribute=True, autofill=False, cli_name='info', label=Gettext('Mount information', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Str('addattr*', validate_add_attribute, cli_name='addattr', exclude='webui')
-option: Str('setattr*', validate_set_attribute, cli_name='setattr', exclude='webui')
-option: Flag('rights', autofill=True, default=False, label=Gettext('Rights', domain='ipa', localedir=None))
-option: IA5Str('newautomountinformation?', cli_name='newinfo', label=Gettext('New mount information', domain='ipa', localedir=None))
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-option: Str('rename', cli_name='rename', exclude='webui', flags=['no_create', 'no_update', 'no_search', 'no_output'], label=Gettext('Rename', domain='ipa', localedir=None), multivalue=False, primary_key=True, required=False)
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+arg: Str('automountlocationcn', cli_name='automountlocation', query=True, required=True)
+arg: IA5Str('automountmapautomountmapname', cli_name='automountmap', query=True, required=True)
+option: IA5Str('automountkey', alwaysask=False, attribute=True, cli_name='key', multivalue=False, required=True)
+option: IA5Str('automountinformation', attribute=True, autofill=False, cli_name='info', multivalue=False, required=False)
+option: Str('addattr*', cli_name='addattr', exclude='webui')
+option: Str('setattr*', cli_name='setattr', exclude='webui')
+option: Flag('rights', autofill=True, default=False)
+option: IA5Str('newautomountinformation?', cli_name='newinfo')
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+option: Str('rename', cli_name='rename', exclude='webui', multivalue=False, primary_key=True, required=False)
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('value', <type 'unicode'>, None)
 command: automountkey_show
 args: 2,6,3
-arg: Str('automountlocationcn', cli_name='automountlocation', label=Gettext('Location', domain='ipa', localedir=None), query=True, required=True)
-arg: IA5Str('automountmapautomountmapname', cli_name='automountmap', label=Gettext('Map', domain='ipa', localedir=None), query=True, required=True)
-option: Flag('rights', autofill=True, default=False, label=Gettext('Rights', domain='ipa', localedir=None))
-option: IA5Str('automountkey', cli_name='key', label=Gettext('Key', domain='ipa', localedir=None))
-option: IA5Str('automountinformation?', cli_name='info', label=Gettext('Mount information', domain='ipa', localedir=None))
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+arg: Str('automountlocationcn', cli_name='automountlocation', query=True, required=True)
+arg: IA5Str('automountmapautomountmapname', cli_name='automountmap', query=True, required=True)
+option: Flag('rights', autofill=True, default=False)
+option: IA5Str('automountkey', cli_name='key')
+option: IA5Str('automountinformation?', cli_name='info')
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('value', <type 'unicode'>, None)
 command: automountlocation_add
 args: 1,5,3
-arg: Str('cn', attribute=True, cli_name='location', label=Gettext('Location', domain='ipa', localedir=None), multivalue=False, primary_key=True, required=True)
-option: Str('addattr*', validate_add_attribute, cli_name='addattr', exclude='webui')
-option: Str('setattr*', validate_set_attribute, cli_name='setattr', exclude='webui')
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+arg: Str('cn', attribute=True, cli_name='location', multivalue=False, primary_key=True, required=True)
+option: Str('addattr*', cli_name='addattr', exclude='webui')
+option: Str('setattr*', cli_name='setattr', exclude='webui')
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('value', <type 'unicode'>, None)
 command: automountlocation_del
 args: 1,1,3
-arg: Str('cn', attribute=True, cli_name='location', label=Gettext('Location', domain='ipa', localedir=None), multivalue=True, primary_key=True, query=True, required=True)
+arg: Str('cn', attribute=True, cli_name='location', multivalue=True, primary_key=True, query=True, required=True)
 option: Flag('continue', autofill=True, cli_name='continue', default=False)
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Output('result', <type 'dict'>, 'list of deletions that failed')
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Output('result', <type 'dict'>, None)
+output: Output('value', <type 'unicode'>, None)
 command: automountlocation_find
 args: 1,7,4
 arg: Str('criteria?', noextrawhitespace=False)
-option: Str('cn', attribute=True, autofill=False, cli_name='location', label=Gettext('Location', domain='ipa', localedir=None), multivalue=False, primary_key=True, query=True, required=False)
-option: Int('timelimit?', autofill=False, flags=['no_display'], label=Gettext('Time Limit', domain='ipa', localedir=None), minvalue=0)
-option: Int('sizelimit?', autofill=False, flags=['no_display'], label=Gettext('Size Limit', domain='ipa', localedir=None), minvalue=0)
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-option: Flag('pkey_only?', autofill=True, default=False', label=Gettext('Primary key only', domain='ipa', localedir=None))
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
+option: Str('cn', attribute=True, autofill=False, cli_name='location', multivalue=False, primary_key=True, query=True, required=False)
+option: Int('timelimit?', autofill=False, minvalue=0)
+option: Int('sizelimit?', autofill=False, minvalue=0)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+option: Flag('pkey_only?', autofill=True, default=False)
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
 output: ListOfEntries('result', (<type 'list'>, <type 'tuple'>), Gettext('A list of LDAP entries', domain='ipa', localedir=None))
-output: Output('count', <type 'int'>, 'Number of entries returned')
-output: Output('truncated', <type 'bool'>, 'True if not all results were returned')
+output: Output('count', <type 'int'>, None)
+output: Output('truncated', <type 'bool'>, None)
 command: automountlocation_import
 args: 2,1,1
-arg: Str('cn', attribute=True, cli_name='location', label=Gettext('Location', domain='ipa', localedir=None), multivalue=False, primary_key=True, query=True, required=True)
-arg: Str('masterfile', label=Gettext('Master file', domain='ipa', localedir=None))
+arg: Str('cn', attribute=True, cli_name='location', multivalue=False, primary_key=True, query=True, required=True)
+arg: Str('masterfile')
 option: Flag('continue?', autofill=True, cli_name='continue', default=False)
 output: Output('result', None, None)
 command: automountlocation_show
 args: 1,4,3
-arg: Str('cn', attribute=True, cli_name='location', label=Gettext('Location', domain='ipa', localedir=None), multivalue=False, primary_key=True, query=True, required=True)
-option: Flag('rights', autofill=True, default=False, label=Gettext('Rights', domain='ipa', localedir=None))
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+arg: Str('cn', attribute=True, cli_name='location', multivalue=False, primary_key=True, query=True, required=True)
+option: Flag('rights', autofill=True, default=False)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('value', <type 'unicode'>, None)
 command: automountlocation_tofiles
 args: 1,0,1
-arg: Str('cn', attribute=True, cli_name='location', label=Gettext('Location', domain='ipa', localedir=None), multivalue=False, primary_key=True, query=True, required=True)
+arg: Str('cn', attribute=True, cli_name='location', multivalue=False, primary_key=True, query=True, required=True)
 output: Output('result', None, None)
 command: automountmap_add
 args: 2,6,3
-arg: Str('automountlocationcn', cli_name='automountlocation', label=Gettext('Location', domain='ipa', localedir=None), query=True, required=True)
-arg: IA5Str('automountmapname', attribute=True, cli_name='map', label=Gettext('Map', domain='ipa', localedir=None), multivalue=False, primary_key=True, required=True)
-option: Str('description', attribute=True, cli_name='desc', label=Gettext('Description', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Str('addattr*', validate_add_attribute, cli_name='addattr', exclude='webui')
-option: Str('setattr*', validate_set_attribute, cli_name='setattr', exclude='webui')
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+arg: Str('automountlocationcn', cli_name='automountlocation', query=True, required=True)
+arg: IA5Str('automountmapname', attribute=True, cli_name='map', multivalue=False, primary_key=True, required=True)
+option: Str('description', attribute=True, cli_name='desc', multivalue=False, required=False)
+option: Str('addattr*', cli_name='addattr', exclude='webui')
+option: Str('setattr*', cli_name='setattr', exclude='webui')
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('value', <type 'unicode'>, None)
 command: automountmap_add_indirect
 args: 2,8,3
-arg: Str('automountlocationcn', cli_name='automountlocation', label=Gettext('Location', domain='ipa', localedir=None), query=True, required=True)
-arg: IA5Str('automountmapname', attribute=True, cli_name='map', label=Gettext('Map', domain='ipa', localedir=None), multivalue=False, primary_key=True, required=True)
-option: Str('description', attribute=True, cli_name='desc', label=Gettext('Description', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Str('addattr*', validate_add_attribute, cli_name='addattr', exclude='webui')
-option: Str('setattr*', validate_set_attribute, cli_name='setattr', exclude='webui')
-option: Str('key', cli_name='mount', label=Gettext('Mount point', domain='ipa', localedir=None))
-option: Str('parentmap?', autofill=True, cli_name='parentmap', default=u'auto.master', label=Gettext('Parent map', domain='ipa', localedir=None))
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+arg: Str('automountlocationcn', cli_name='automountlocation', query=True, required=True)
+arg: IA5Str('automountmapname', attribute=True, cli_name='map', multivalue=False, primary_key=True, required=True)
+option: Str('description', attribute=True, cli_name='desc', multivalue=False, required=False)
+option: Str('addattr*', cli_name='addattr', exclude='webui')
+option: Str('setattr*', cli_name='setattr', exclude='webui')
+option: Str('key', cli_name='mount')
+option: Str('parentmap?', autofill=True, cli_name='parentmap', default=u'auto.master')
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('value', <type 'unicode'>, None)
 command: automountmap_del
 args: 2,1,3
-arg: Str('automountlocationcn', cli_name='automountlocation', label=Gettext('Location', domain='ipa', localedir=None), query=True, required=True)
-arg: IA5Str('automountmapname', attribute=True, cli_name='map', label=Gettext('Map', domain='ipa', localedir=None), multivalue=True, primary_key=True, query=True, required=True)
+arg: Str('automountlocationcn', cli_name='automountlocation', query=True, required=True)
+arg: IA5Str('automountmapname', attribute=True, cli_name='map', multivalue=True, primary_key=True, query=True, required=True)
 option: Flag('continue', autofill=True, cli_name='continue', default=False)
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Output('result', <type 'dict'>, 'list of deletions that failed')
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Output('result', <type 'dict'>, None)
+output: Output('value', <type 'unicode'>, None)
 command: automountmap_find
 args: 2,8,4
-arg: Str('automountlocationcn', cli_name='automountlocation', label=Gettext('Location', domain='ipa', localedir=None), query=True, required=True)
+arg: Str('automountlocationcn', cli_name='automountlocation', query=True, required=True)
 arg: Str('criteria?', noextrawhitespace=False)
-option: IA5Str('automountmapname', attribute=True, autofill=False, cli_name='map', label=Gettext('Map', domain='ipa', localedir=None), multivalue=False, primary_key=True, query=True, required=False)
-option: Str('description', attribute=True, autofill=False, cli_name='desc', label=Gettext('Description', domain='ipa', localedir=None), multivalue=False, query=True, required=False)
-option: Int('timelimit?', autofill=False, flags=['no_display'], label=Gettext('Time Limit', domain='ipa', localedir=None), minvalue=0)
-option: Int('sizelimit?', autofill=False, flags=['no_display'], label=Gettext('Size Limit', domain='ipa', localedir=None), minvalue=0)
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-option: Flag('pkey_only?', autofill=True, default=False', label=Gettext('Primary key only', domain='ipa', localedir=None))
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
+option: IA5Str('automountmapname', attribute=True, autofill=False, cli_name='map', multivalue=False, primary_key=True, query=True, required=False)
+option: Str('description', attribute=True, autofill=False, cli_name='desc', multivalue=False, query=True, required=False)
+option: Int('timelimit?', autofill=False, minvalue=0)
+option: Int('sizelimit?', autofill=False, minvalue=0)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+option: Flag('pkey_only?', autofill=True, default=False)
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
 output: ListOfEntries('result', (<type 'list'>, <type 'tuple'>), Gettext('A list of LDAP entries', domain='ipa', localedir=None))
-output: Output('count', <type 'int'>, 'Number of entries returned')
-output: Output('truncated', <type 'bool'>, 'True if not all results were returned')
+output: Output('count', <type 'int'>, None)
+output: Output('truncated', <type 'bool'>, None)
 command: automountmap_mod
 args: 2,7,3
-arg: Str('automountlocationcn', cli_name='automountlocation', label=Gettext('Location', domain='ipa', localedir=None), query=True, required=True)
-arg: IA5Str('automountmapname', attribute=True, cli_name='map', label=Gettext('Map', domain='ipa', localedir=None), multivalue=False, primary_key=True, query=True, required=True)
-option: Str('description', attribute=True, autofill=False, cli_name='desc', label=Gettext('Description', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Str('addattr*', validate_add_attribute, cli_name='addattr', exclude='webui')
-option: Str('setattr*', validate_set_attribute, cli_name='setattr', exclude='webui')
-option: Flag('rights', autofill=True, default=False, label=Gettext('Rights', domain='ipa', localedir=None))
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+arg: Str('automountlocationcn', cli_name='automountlocation', query=True, required=True)
+arg: IA5Str('automountmapname', attribute=True, cli_name='map', multivalue=False, primary_key=True, query=True, required=True)
+option: Str('description', attribute=True, autofill=False, cli_name='desc', multivalue=False, required=False)
+option: Str('addattr*', cli_name='addattr', exclude='webui')
+option: Str('setattr*', cli_name='setattr', exclude='webui')
+option: Flag('rights', autofill=True, default=False)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('value', <type 'unicode'>, None)
 command: automountmap_show
 args: 2,4,3
-arg: Str('automountlocationcn', cli_name='automountlocation', label=Gettext('Location', domain='ipa', localedir=None), query=True, required=True)
-arg: IA5Str('automountmapname', attribute=True, cli_name='map', label=Gettext('Map', domain='ipa', localedir=None), multivalue=False, primary_key=True, query=True, required=True)
-option: Flag('rights', autofill=True, default=False, label=Gettext('Rights', domain='ipa', localedir=None))
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+arg: Str('automountlocationcn', cli_name='automountlocation', query=True, required=True)
+arg: IA5Str('automountmapname', attribute=True, cli_name='map', multivalue=False, primary_key=True, query=True, required=True)
+option: Flag('rights', autofill=True, default=False)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('value', <type 'unicode'>, None)
 command: batch
 args: 1,0,2
 arg: List('methods?', multivalue=True)
-output: Output('count', <type 'int'>, '')
-output: Output('results', <type 'list'>, '')
+output: Output('count', <type 'int'>, None)
+output: Output('results', <type 'list'>, None)
 command: cert_remove_hold
 args: 1,0,1
-arg: Str('serial_number', validate_serial_number, label=Gettext('Serial number', domain='ipa', localedir=None), normalizer=normalize_serial_number)
+arg: Str('serial_number')
 output: Output('result', None, None)
 command: cert_request
 args: 1,3,1
-arg: File('csr', validate_csr, cli_name='csr_file', label=Gettext('CSR', domain='ipa', localedir=None), normalizer=normalize_csr)
-option: Str('principal', label=Gettext('Principal', domain='ipa', localedir=None))
+arg: File('csr', cli_name='csr_file')
+option: Str('principal')
 option: Str('request_type', autofill=True, default=u'pkcs10')
 option: Flag('add', autofill=True, default=False)
-output: Output('result', <type 'dict'>, Gettext('Dictionary mapping variable name to value', domain='ipa', localedir=None))
+output: Output('result', <type 'dict'>, None)
 command: cert_revoke
 args: 1,1,1
-arg: Str('serial_number', validate_serial_number, label=Gettext('Serial number', domain='ipa', localedir=None), normalizer=normalize_serial_number)
-option: Int('revocation_reason?', autofill=True, default=0, label=Gettext('Reason', domain='ipa', localedir=None), maxvalue=10, minvalue=0)
+arg: Str('serial_number')
+option: Int('revocation_reason?', autofill=True, default=0, maxvalue=10, minvalue=0)
 output: Output('result', None, None)
 command: cert_show
 args: 1,1,1
-arg: Str('serial_number', validate_serial_number, label=Gettext('Serial number', domain='ipa', localedir=None), normalizer=normalize_serial_number)
-option: Str('out?', exclude='webui', label=Gettext('Output filename', domain='ipa', localedir=None))
+arg: Str('serial_number')
+option: Str('out?', exclude='webui')
 output: Output('result', None, None)
 command: cert_status
 args: 1,0,1
-arg: Str('request_id', flags=['no_create', 'no_update', 'no_search'], label=Gettext('Request id', domain='ipa', localedir=None))
+arg: Str('request_id')
 output: Output('result', None, None)
 command: config_mod
 args: 0,19,3
-option: Int('ipamaxusernamelength', attribute=True, autofill=False, cli_name='maxusername', label=Gettext('Maximum username length', domain='ipa', localedir=None), minvalue=1, multivalue=False, required=False)
-option: IA5Str('ipahomesrootdir', attribute=True, autofill=False, cli_name='homedirectory', label=Gettext('Home directory base', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Str('ipadefaultloginshell', attribute=True, autofill=False, cli_name='defaultshell', label=Gettext('Default shell', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Str('ipadefaultprimarygroup', attribute=True, autofill=False, cli_name='defaultgroup', label=Gettext('Default users group', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Str('ipadefaultemaildomain', attribute=True, autofill=False, cli_name='emaildomain', label=Gettext('Default e-mail domain', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Int('ipasearchtimelimit', validate_searchtimelimit, attribute=True, autofill=False, cli_name='searchtimelimit'('Maximum amount of time (seconds) for a search (> 0, or -1 for unlimited)', domain='ipa', localedir=None), label=Gettext('Search time limit', domain='ipa', localedir=None), minvalue=-1, multivalue=False, required=False)
-option: Int('ipasearchrecordslimit', attribute=True, autofill=False, cli_name='searchrecordslimit', label=Gettext('Search size limit', domain='ipa', localedir=None), minvalue=-1, multivalue=False, required=False)
-option: IA5Str('ipausersearchfields', attribute=True, autofill=False, cli_name='usersearch', label=Gettext('User search fields', domain='ipa', localedir=None), multivalue=False, required=False)
-option: IA5Str('ipagroupsearchfields', attribute=True, autofill=False, cli_name='groupsearch', label='Group search fields', multivalue=False, required=False)
-option: Bool('ipamigrationenabled', attribute=True, autofill=False, cli_name='enable_migration', label=Gettext('Enable migration mode', domain='ipa', localedir=None), multivalue=False, required=False)
-option: List('ipagroupobjectclasses', attribute=True, autofill=False, cli_name='groupobjectclasses', label=Gettext('Default group objectclasses', domain='ipa', localedir=None), multivalue=True, required=False)
-option: List('ipauserobjectclasses', attribute=True, autofill=False, cli_name='userobjectclasses', label=Gettext('Default user objectclasses', domain='ipa', localedir=None), multivalue=True, required=False)
-option: Int('ipapwdexpadvnotify', attribute=True, autofill=False, cli_name='pwdexpnotify', label=Gettext('Password Expiration Notification (days)', domain='ipa', localedir=None), minvalue=0, multivalue=False, required=False)
-option: Str('addattr*', validate_add_attribute, cli_name='addattr', exclude='webui')
-option: Str('setattr*', validate_set_attribute, cli_name='setattr', exclude='webui')
-option: Flag('rights', autofill=True, default=False, label=Gettext('Rights', domain='ipa', localedir=None))
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+option: Int('ipamaxusernamelength', attribute=True, autofill=False, cli_name='maxusername', minvalue=1, multivalue=False, required=False)
+option: IA5Str('ipahomesrootdir', attribute=True, autofill=False, cli_name='homedirectory', multivalue=False, required=False)
+option: Str('ipadefaultloginshell', attribute=True, autofill=False, cli_name='defaultshell', multivalue=False, required=False)
+option: Str('ipadefaultprimarygroup', attribute=True, autofill=False, cli_name='defaultgroup', multivalue=False, required=False)
+option: Str('ipadefaultemaildomain', attribute=True, autofill=False, cli_name='emaildomain', multivalue=False, required=False)
+option: Int('ipasearchtimelimit', attribute=True, autofill=False, cli_name='searchtimelimit', minvalue=-1, multivalue=False, required=False)
+option: Int('ipasearchrecordslimit', attribute=True, autofill=False, cli_name='searchrecordslimit', minvalue=-1, multivalue=False, required=False)
+option: IA5Str('ipausersearchfields', attribute=True, autofill=False, cli_name='usersearch', multivalue=False, required=False)
+option: IA5Str('ipagroupsearchfields', attribute=True, autofill=False, cli_name='groupsearch', multivalue=False, required=False)
+option: Bool('ipamigrationenabled', attribute=True, autofill=False, cli_name='enable_migration', multivalue=False, required=False)
+option: List('ipagroupobjectclasses', attribute=True, autofill=False, cli_name='groupobjectclasses', multivalue=True, required=False)
+option: List('ipauserobjectclasses', attribute=True, autofill=False, cli_name='userobjectclasses', multivalue=True, required=False)
+option: Int('ipapwdexpadvnotify', attribute=True, autofill=False, cli_name='pwdexpnotify', minvalue=0, multivalue=False, required=False)
+option: Str('addattr*', cli_name='addattr', exclude='webui')
+option: Str('setattr*', cli_name='setattr', exclude='webui')
+option: Flag('rights', autofill=True, default=False)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('value', <type 'unicode'>, None)
 command: config_show
 args: 0,4,3
-option: Flag('rights', autofill=True, default=False, label=Gettext('Rights', domain='ipa', localedir=None))
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
+option: Flag('rights', autofill=True, default=False)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
 output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+output: Output('value', <type 'unicode'>, None)
 command: cosentry_add
 args: 1,7,3
-arg: Str('cn', attribute=True, cli_name='cn', label=FixMe('cn'), multivalue=False, primary_key=True, required=True)
-option: Str('krbpwdpolicyreference', attribute=True, cli_name='krbpwdpolicyreference', label=FixMe('krbpwdpolicyreference'), multivalue=False, required=True)
-option: Int('cospriority', attribute=True, cli_name='cospriority', label=FixMe('cospriority'), minvalue=0, multivalue=False, required=True)
-option: Str('addattr*', validate_add_attribute, cli_name='addattr', exclude='webui')
-option: Str('setattr*', validate_set_attribute, cli_name='setattr', exclude='webui')
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+arg: Str('cn', attribute=True, cli_name='cn', multivalue=False, primary_key=True, required=True)
+option: Str('krbpwdpolicyreference', attribute=True, cli_name='krbpwdpolicyreference', multivalue=False, required=True)
+option: Int('cospriority', attribute=True, cli_name='cospriority', minvalue=0, multivalue=False, required=True)
+option: Str('addattr*', cli_name='addattr', exclude='webui')
+option: Str('setattr*', cli_name='setattr', exclude='webui')
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('value', <type 'unicode'>, None)
 command: cosentry_del
 args: 1,1,3
-arg: Str('cn', attribute=True, cli_name='cn', label=FixMe('cn'), multivalue=True, primary_key=True, query=True, required=True)
+arg: Str('cn', attribute=True, cli_name='cn', multivalue=True, primary_key=True, query=True, required=True)
 option: Flag('continue', autofill=True, cli_name='continue', default=False)
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Output('result', <type 'dict'>, 'list of deletions that failed')
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Output('result', <type 'dict'>, None)
+output: Output('value', <type 'unicode'>, None)
 command: cosentry_find
 args: 1,9,4
 arg: Str('criteria?', noextrawhitespace=False)
-option: Str('cn', attribute=True, autofill=False, cli_name='cn', label=FixMe('cn'), multivalue=False, primary_key=True, query=True, required=False)
-option: Str('krbpwdpolicyreference', attribute=True, autofill=False, cli_name='krbpwdpolicyreference', label=FixMe('krbpwdpolicyreference'), multivalue=False, query=True, required=False)
-option: Int('cospriority', attribute=True, autofill=False, cli_name='cospriority', label=FixMe('cospriority'), minvalue=0, multivalue=False, query=True, required=False)
-option: Int('timelimit?', autofill=False, flags=['no_display'], label=Gettext('Time Limit', domain='ipa', localedir=None), minvalue=0)
-option: Int('sizelimit?', autofill=False, flags=['no_display'], label=Gettext('Size Limit', domain='ipa', localedir=None), minvalue=0)
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-option: Flag('pkey_only?', autofill=True, default=False', label=Gettext('Primary key only', domain='ipa', localedir=None))
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
+option: Str('cn', attribute=True, autofill=False, cli_name='cn', multivalue=False, primary_key=True, query=True, required=False)
+option: Str('krbpwdpolicyreference', attribute=True, autofill=False, cli_name='krbpwdpolicyreference', multivalue=False, query=True, required=False)
+option: Int('cospriority', attribute=True, autofill=False, cli_name='cospriority', minvalue=0, multivalue=False, query=True, required=False)
+option: Int('timelimit?', autofill=False, minvalue=0)
+option: Int('sizelimit?', autofill=False, minvalue=0)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+option: Flag('pkey_only?', autofill=True, default=False)
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
 output: ListOfEntries('result', (<type 'list'>, <type 'tuple'>), Gettext('A list of LDAP entries', domain='ipa', localedir=None))
-output: Output('count', <type 'int'>, 'Number of entries returned')
-output: Output('truncated', <type 'bool'>, 'True if not all results were returned')
+output: Output('count', <type 'int'>, None)
+output: Output('truncated', <type 'bool'>, None)
 command: cosentry_mod
 args: 1,8,3
-arg: Str('cn', attribute=True, cli_name='cn', label=FixMe('cn'), multivalue=False, primary_key=True, query=True, required=True)
-option: Str('krbpwdpolicyreference', attribute=True, autofill=False, cli_name='krbpwdpolicyreference', label=FixMe('krbpwdpolicyreference'), multivalue=False, required=False)
-option: Int('cospriority', attribute=True, autofill=False, cli_name='cospriority', label=FixMe('cospriority'), minvalue=0, multivalue=False, required=False)
-option: Str('addattr*', validate_add_attribute, cli_name='addattr', exclude='webui')
-option: Str('setattr*', validate_set_attribute, cli_name='setattr', exclude='webui')
-option: Flag('rights', autofill=True, default=False, label=Gettext('Rights', domain='ipa', localedir=None))
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+arg: Str('cn', attribute=True, cli_name='cn', multivalue=False, primary_key=True, query=True, required=True)
+option: Str('krbpwdpolicyreference', attribute=True, autofill=False, cli_name='krbpwdpolicyreference', multivalue=False, required=False)
+option: Int('cospriority', attribute=True, autofill=False, cli_name='cospriority', minvalue=0, multivalue=False, required=False)
+option: Str('addattr*', cli_name='addattr', exclude='webui')
+option: Str('setattr*', cli_name='setattr', exclude='webui')
+option: Flag('rights', autofill=True, default=False)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('value', <type 'unicode'>, None)
 command: cosentry_show
 args: 1,4,3
-arg: Str('cn', attribute=True, cli_name='cn', label=FixMe('cn'), multivalue=False, primary_key=True, query=True, required=True)
-option: Flag('rights', autofill=True, default=False, label=Gettext('Rights', domain='ipa', localedir=None))
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+arg: Str('cn', attribute=True, cli_name='cn', multivalue=False, primary_key=True, query=True, required=True)
+option: Flag('rights', autofill=True, default=False)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('value', <type 'unicode'>, None)
 command: delegation_add
 args: 1,7,3
-arg: Str('aciname', attribute=True, cli_name='name', label=Gettext('Delegation name', domain='ipa', localedir=None), multivalue=False, primary_key=True, required=True)
-option: List('permissions', attribute=True, cli_name='permissions', label=Gettext('Permissions', domain='ipa', localedir=None), multivalue=True, required=False)
-option: List('attrs', attribute=True, cli_name='attrs', label=Gettext('Attributes', domain='ipa', localedir=None), multivalue=True, normalizer=<lambda>, required=True)
-option: Str('memberof', attribute=True, cli_name='membergroup', label=Gettext('Member user group', domain='ipa', localedir=None), multivalue=False, required=True)
-option: Str('group', attribute=True, cli_name='group', label=Gettext('User group', domain='ipa', localedir=None), multivalue=False, required=True)
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+arg: Str('aciname', attribute=True, cli_name='name', multivalue=False, primary_key=True, required=True)
+option: List('permissions', attribute=True, cli_name='permissions', multivalue=True, required=False)
+option: List('attrs', attribute=True, cli_name='attrs', multivalue=True, required=True)
+option: Str('memberof', attribute=True, cli_name='membergroup', multivalue=False, required=True)
+option: Str('group', attribute=True, cli_name='group', multivalue=False, required=True)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('value', <type 'unicode'>, None)
 command: delegation_del
 args: 1,0,3
-arg: Str('aciname', attribute=True, cli_name='name', label=Gettext('Delegation name', domain='ipa', localedir=None), multivalue=False, primary_key=True, query=True, required=True)
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Output('result', <type 'bool'>, 'True means the operation was successful')
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+arg: Str('aciname', attribute=True, cli_name='name', multivalue=False, primary_key=True, query=True, required=True)
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Output('result', <type 'bool'>, None)
+output: Output('value', <type 'unicode'>, None)
 command: delegation_find
 args: 1,8,4
 arg: Str('criteria?')
-option: Str('aciname', attribute=True, autofill=False, cli_name='name', label=Gettext('Delegation name', domain='ipa', localedir=None), multivalue=False, primary_key=True, query=True, required=False)
-option: List('permissions', attribute=True, autofill=False, cli_name='permissions', label=Gettext('Permissions', domain='ipa', localedir=None), multivalue=True, query=True, required=False)
-option: List('attrs', attribute=True, autofill=False, cli_name='attrs', label=Gettext('Attributes', domain='ipa', localedir=None), multivalue=True, normalizer=<lambda>, query=True, required=False)
-option: Str('memberof', attribute=True, autofill=False, cli_name='membergroup', label=Gettext('Member user group', domain='ipa', localedir=None), multivalue=False, query=True, required=False)
-option: Str('group', attribute=True, autofill=False, cli_name='group', label=Gettext('User group', domain='ipa', localedir=None), multivalue=False, query=True, required=False)
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
+option: Str('aciname', attribute=True, autofill=False, cli_name='name', multivalue=False, primary_key=True, query=True, required=False)
+option: List('permissions', attribute=True, autofill=False, cli_name='permissions', multivalue=True, query=True, required=False)
+option: List('attrs', attribute=True, autofill=False, cli_name='attrs', multivalue=True, query=True, required=False)
+option: Str('memberof', attribute=True, autofill=False, cli_name='membergroup', multivalue=False, query=True, required=False)
+option: Str('group', attribute=True, autofill=False, cli_name='group', multivalue=False, query=True, required=False)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
 output: ListOfEntries('result', (<type 'list'>, <type 'tuple'>), Gettext('A list of LDAP entries', domain='ipa', localedir=None))
-output: Output('count', <type 'int'>, 'Number of entries returned')
-output: Output('truncated', <type 'bool'>, 'True if not all results were returned')
+output: Output('count', <type 'int'>, None)
+output: Output('truncated', <type 'bool'>, None)
 command: delegation_mod
 args: 1,7,3
-arg: Str('aciname', attribute=True, cli_name='name', label=Gettext('Delegation name', domain='ipa', localedir=None), multivalue=False, primary_key=True, query=True, required=True)
-option: List('permissions', attribute=True, autofill=False, cli_name='permissions', label=Gettext('Permissions', domain='ipa', localedir=None), multivalue=True, required=False)
-option: List('attrs', attribute=True, autofill=False, cli_name='attrs', label=Gettext('Attributes', domain='ipa', localedir=None), multivalue=True, normalizer=<lambda>, required=False)
-option: Str('memberof', attribute=True, autofill=False, cli_name='membergroup', label=Gettext('Member user group', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Str('group', attribute=True, autofill=False, cli_name='group', label=Gettext('User group', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+arg: Str('aciname', attribute=True, cli_name='name', multivalue=False, primary_key=True, query=True, required=True)
+option: List('permissions', attribute=True, autofill=False, cli_name='permissions', multivalue=True, required=False)
+option: List('attrs', attribute=True, autofill=False, cli_name='attrs', multivalue=True, required=False)
+option: Str('memberof', attribute=True, autofill=False, cli_name='membergroup', multivalue=False, required=False)
+option: Str('group', attribute=True, autofill=False, cli_name='group', multivalue=False, required=False)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('value', <type 'unicode'>, None)
 command: delegation_show
 args: 1,3,3
-arg: Str('aciname', attribute=True, cli_name='name', label=Gettext('Delegation name', domain='ipa', localedir=None), multivalue=False, primary_key=True, query=True, required=True)
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
+arg: Str('aciname', attribute=True, cli_name='name', multivalue=False, primary_key=True, query=True, required=True)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
 output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+output: Output('value', <type 'unicode'>, None)
 command: dns_is_enabled
 args: 0,0,3
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Output('result', <type 'bool'>, 'True means the operation was successful')
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Output('result', <type 'bool'>, None)
+output: Output('value', <type 'unicode'>, None)
 command: dns_resolve
 args: 1,0,3
-arg: Str('hostname', label=Gettext('Hostname', domain='ipa', localedir=None))
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Output('result', <type 'bool'>, 'True means the operation was successful')
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+arg: Str('hostname')
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Output('result', <type 'bool'>, None)
+output: Output('value', <type 'unicode'>, None)
 command: dnsrecord_add
 args: 2,42,3
-arg: Str('dnszoneidnsname', cli_name='dnszone', label=Gettext('Zone name', domain='ipa', localedir=None), query=True, required=True)
-arg: Str('idnsname', attribute=True, cli_name='name', label=Gettext('Record name', domain='ipa', localedir=None), multivalue=False, primary_key=True, required=True)
-option: Int('dnsttl', attribute=True, cli_name='ttl', label=Gettext('Time to live', domain='ipa', localedir=None), multivalue=False, required=False)
-option: StrEnum('dnsclass', attribute=True, cli_name='class', label=Gettext('Class', domain='ipa', localedir=None), multivalue=False, required=False, values=(u'IN', u'CS', u'CH', u'HS'))
-option: Str('addattr*', validate_add_attribute, cli_name='addattr', exclude='webui')
-option: Str('setattr*', validate_set_attribute, cli_name='setattr', exclude='webui')
-option: Flag('force', autofill=True, default=False, flags=['no_option', 'no_output'], label=Gettext('Force', domain='ipa', localedir=None))
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-option: List('arecord?', _validate_ipaddr, attribute=True, cli_name='a_rec', label='A record', multivalue=True, normalizer=None)
-option: List('aaaarecord?', _validate_ipaddr, attribute=True, cli_name='aaaa_rec', label='AAAA record', multivalue=True, normalizer=None)
-option: List('a6record?', attribute=True, cli_name='a6_rec', label='A6 record', multivalue=True, normalizer=None)
-option: List('afsdbrecord?', _validate_afsdb, attribute=True, cli_name='afsdb_rec', label='AFSDB record', multivalue=True, normalizer=None)
-option: List('aplrecord?', _validate_unsupported, attribute=True, cli_name='apl_rec', label='APL record', multivalue=True, normalizer=None)
-option: List('certrecord?', _validate_cert, attribute=True, cli_name='cert_rec', label='CERT record', multivalue=True, normalizer=None)
-option: List('cnamerecord?', _validate_cname, attribute=True, cli_name='cname_rec', label='CNAME record', multivalue=True, normalizer=_normalize_domain_name)
-option: List('dhcidrecord?', _validate_unsupported, attribute=True, cli_name='dhcid_rec', label='DHCID record', multivalue=True, normalizer=None)
-option: List('dlvrecord?', _validate_unsupported, attribute=True, cli_name='dlv_rec', label='DLV record', multivalue=True, normalizer=None)
-option: List('dnamerecord?', _validate_dname, attribute=True, cli_name='dname_rec', label='DNAME record', multivalue=True, normalizer=_normalize_domain_name)
-option: List('dnskeyrecord?', _validate_unsupported, attribute=True, cli_name='dnskey_rec', label='DNSKEY record', multivalue=True, normalizer=None)
-option: List('dsrecord?', _validate_ds, attribute=True, cli_name='ds_rec', label='DS record', multivalue=True, normalizer=None)
-option: List('hiprecord?', _validate_unsupported, attribute=True, cli_name='hip_rec', label='HIP record', multivalue=True, normalizer=None)
-option: List('ipseckeyrecord?', _validate_unsupported, attribute=True, cli_name='ipseckey_rec', label='IPSECKEY record', multivalue=True, normalizer=None)
-option: List('keyrecord?', _validate_key, attribute=True, cli_name='key_rec', label='KEY record', multivalue=True, normalizer=None)
-option: List('kxrecord?', _validate_kx, attribute=True, cli_name='kx_rec', label='KX record', multivalue=True, normalizer=None)
-option: List('locrecord?', _validate_loc, attribute=True, cli_name='loc_rec', label='LOC record', multivalue=True, normalizer=None)
-option: List('mxrecord?', _validate_mx, attribute=True, cli_name='mx_rec', label='MX record', multivalue=True, normalizer=None)
-option: List('naptrrecord?', _validate_naptr, attribute=True, cli_name='naptr_rec', label='NAPTR record', multivalue=True, normalizer=None)
-option: List('nsrecord?', _validate_ns, attribute=True, cli_name='ns_rec', label='NS record', multivalue=True, normalizer=_normalize_domain_name)
-option: List('nsecrecord?', _validate_nsec, attribute=True, cli_name='nsec_rec', label='NSEC record', multivalue=True, normalizer=None)
-option: List('nsec3record?', _validate_unsupported, attribute=True, cli_name='nsec3_rec', label='NSEC3 record', multivalue=True, normalizer=None)
-option: List('nsec3paramrecord?', _validate_unsupported, attribute=True, cli_name='nsec3param_rec', label='NSEC3PARAM record', multivalue=True, normalizer=None)
-option: List('ptrrecord?', _validate_ptr, attribute=True, cli_name='ptr_rec', label='PTR record', multivalue=True, normalizer=_normalize_domain_name)
-option: List('rrsigrecord?', _validate_sig, attribute=True, cli_name='rrsig_rec', label='RRSIG record', multivalue=True, normalizer=None)
-option: List('rprecord?', _validate_unsupported, attribute=True, cli_name='rp_rec', label='RP record', multivalue=True, normalizer=None)
-option: List('sigrecord?', _validate_sig, attribute=True, cli_name='sig_rec', label='SIG record', multivalue=True, normalizer=None)
-option: List('spfrecord?', attribute=True, cli_name='spf_rec', label='SPF record', multivalue=True, normalizer=None)
-option: List('srvrecord?', _validate_srv, attribute=True, cli_name='srv_rec', label='SRV record', multivalue=True, normalizer=None)
-option: List('sshfprecord?', _validate_sshfp, attribute=True, cli_name='sshfp_rec', label='SSHFP record', multivalue=True, normalizer=None)
-option: List('tarecord?', _validate_unsupported, attribute=True, cli_name='ta_rec', label='TA record', multivalue=True, normalizer=None)
-option: List('tkeyrecord?', _validate_unsupported, attribute=True, cli_name='tkey_rec', label='TKEY record', multivalue=True, normalizer=None)
-option: List('tsigrecord?', _validate_unsupported, attribute=True, cli_name='tsig_rec', label='TSIG record', multivalue=True, normalizer=None)
-option: List('txtrecord?', attribute=True, cli_name='txt_rec', label='TXT record', multivalue=True, normalizer=None)
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+arg: Str('dnszoneidnsname', cli_name='dnszone', query=True, required=True)
+arg: Str('idnsname', attribute=True, cli_name='name', multivalue=False, primary_key=True, required=True)
+option: Int('dnsttl', attribute=True, cli_name='ttl', multivalue=False, required=False)
+option: StrEnum('dnsclass', attribute=True, cli_name='class', multivalue=False, required=False, values=(u'IN', u'CS', u'CH', u'HS'))
+option: Str('addattr*', cli_name='addattr', exclude='webui')
+option: Str('setattr*', cli_name='setattr', exclude='webui')
+option: Flag('force', autofill=True, default=False)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+option: List('arecord?', attribute=True, cli_name='a_rec', multivalue=True)
+option: List('aaaarecord?', attribute=True, cli_name='aaaa_rec', multivalue=True)
+option: List('a6record?', attribute=True, cli_name='a6_rec', multivalue=True)
+option: List('afsdbrecord?', attribute=True, cli_name='afsdb_rec', multivalue=True)
+option: List('aplrecord?', attribute=True, cli_name='apl_rec', multivalue=True)
+option: List('certrecord?', attribute=True, cli_name='cert_rec', multivalue=True)
+option: List('cnamerecord?', attribute=True, cli_name='cname_rec', multivalue=True)
+option: List('dhcidrecord?', attribute=True, cli_name='dhcid_rec', multivalue=True)
+option: List('dlvrecord?', attribute=True, cli_name='dlv_rec', multivalue=True)
+option: List('dnamerecord?', attribute=True, cli_name='dname_rec', multivalue=True)
+option: List('dnskeyrecord?', attribute=True, cli_name='dnskey_rec', multivalue=True)
+option: List('dsrecord?', attribute=True, cli_name='ds_rec', multivalue=True)
+option: List('hiprecord?', attribute=True, cli_name='hip_rec', multivalue=True)
+option: List('ipseckeyrecord?', attribute=True, cli_name='ipseckey_rec', multivalue=True)
+option: List('keyrecord?', attribute=True, cli_name='key_rec', multivalue=True)
+option: List('kxrecord?', attribute=True, cli_name='kx_rec', multivalue=True)
+option: List('locrecord?', attribute=True, cli_name='loc_rec', multivalue=True)
+option: List('mxrecord?', attribute=True, cli_name='mx_rec', multivalue=True)
+option: List('naptrrecord?', attribute=True, cli_name='naptr_rec', multivalue=True)
+option: List('nsrecord?', attribute=True, cli_name='ns_rec', multivalue=True)
+option: List('nsecrecord?', attribute=True, cli_name='nsec_rec', multivalue=True)
+option: List('nsec3record?', attribute=True, cli_name='nsec3_rec', multivalue=True)
+option: List('nsec3paramrecord?', attribute=True, cli_name='nsec3param_rec', multivalue=True)
+option: List('ptrrecord?', attribute=True, cli_name='ptr_rec', multivalue=True)
+option: List('rrsigrecord?', attribute=True, cli_name='rrsig_rec', multivalue=True)
+option: List('rprecord?', attribute=True, cli_name='rp_rec', multivalue=True)
+option: List('sigrecord?', attribute=True, cli_name='sig_rec', multivalue=True)
+option: List('spfrecord?', attribute=True, cli_name='spf_rec', multivalue=True)
+option: List('srvrecord?', attribute=True, cli_name='srv_rec', multivalue=True)
+option: List('sshfprecord?', attribute=True, cli_name='sshfp_rec', multivalue=True)
+option: List('tarecord?', attribute=True, cli_name='ta_rec', multivalue=True)
+option: List('tkeyrecord?', attribute=True, cli_name='tkey_rec', multivalue=True)
+option: List('tsigrecord?', attribute=True, cli_name='tsig_rec', multivalue=True)
+option: List('txtrecord?', attribute=True, cli_name='txt_rec', multivalue=True)
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('value', <type 'unicode'>, None)
 command: dnsrecord_add_record
 args: 2,37,3
-arg: Str('dnszoneidnsname', cli_name='dnszone', label=Gettext('Zone name', domain='ipa', localedir=None), query=True, required=True)
-arg: Str('idnsname', attribute=True, cli_name='name', label=Gettext('Record name', domain='ipa', localedir=None), multivalue=False, primary_key=True, query=True, required=True)
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-option: List('arecord?', _validate_ipaddr, attribute=True, cli_name='a_rec', label='A record', multivalue=True, normalizer=None)
-option: List('aaaarecord?', _validate_ipaddr, attribute=True, cli_name='aaaa_rec', label='AAAA record', multivalue=True, normalizer=None)
-option: List('a6record?', attribute=True, cli_name='a6_rec', label='A6 record', multivalue=True, normalizer=None)
-option: List('afsdbrecord?', _validate_afsdb, attribute=True, cli_name='afsdb_rec', label='AFSDB record', multivalue=True, normalizer=None)
-option: List('aplrecord?', _validate_unsupported, attribute=True, cli_name='apl_rec', label='APL record', multivalue=True, normalizer=None)
-option: List('certrecord?', _validate_cert, attribute=True, cli_name='cert_rec', label='CERT record', multivalue=True, normalizer=None)
-option: List('cnamerecord?', _validate_cname, attribute=True, cli_name='cname_rec', label='CNAME record', multivalue=True, normalizer=_normalize_domain_name)
-option: List('dhcidrecord?', _validate_unsupported, attribute=True, cli_name='dhcid_rec', label='DHCID record', multivalue=True, normalizer=None)
-option: List('dlvrecord?', _validate_unsupported, attribute=True, cli_name='dlv_rec', label='DLV record', multivalue=True, normalizer=None)
-option: List('dnamerecord?', _validate_dname, attribute=True, cli_name='dname_rec', label='DNAME record', multivalue=True, normalizer=_normalize_domain_name)
-option: List('dnskeyrecord?', _validate_unsupported, attribute=True, cli_name='dnskey_rec', label='DNSKEY record', multivalue=True, normalizer=None)
-option: List('dsrecord?', _validate_ds, attribute=True, cli_name='ds_rec', label='DS record', multivalue=True, normalizer=None)
-option: List('hiprecord?', _validate_unsupported, attribute=True, cli_name='hip_rec', label='HIP record', multivalue=True, normalizer=None)
-option: List('ipseckeyrecord?', _validate_unsupported, attribute=True, cli_name='ipseckey_rec', label='IPSECKEY record', multivalue=True, normalizer=None)
-option: List('keyrecord?', _validate_key, attribute=True, cli_name='key_rec', label='KEY record', multivalue=True, normalizer=None)
-option: List('kxrecord?', _validate_kx, attribute=True, cli_name='kx_rec', label='KX record', multivalue=True, normalizer=None)
-option: List('locrecord?', _validate_loc, attribute=True, cli_name='loc_rec', label='LOC record', multivalue=True, normalizer=None)
-option: List('mxrecord?', _validate_mx, attribute=True, cli_name='mx_rec', label='MX record', multivalue=True, normalizer=None)
-option: List('naptrrecord?', _validate_naptr, attribute=True, cli_name='naptr_rec', label='NAPTR record', multivalue=True, normalizer=None)
-option: List('nsrecord?', _validate_ns, attribute=True, cli_name='ns_rec', label='NS record', multivalue=True, normalizer=_normalize_domain_name)
-option: List('nsecrecord?', _validate_nsec, attribute=True, cli_name='nsec_rec', label='NSEC record', multivalue=True, normalizer=None)
-option: List('nsec3record?', _validate_unsupported, attribute=True, cli_name='nsec3_rec', label='NSEC3 record', multivalue=True, normalizer=None)
-option: List('nsec3paramrecord?', _validate_unsupported, attribute=True, cli_name='nsec3param_rec', label='NSEC3PARAM record', multivalue=True, normalizer=None)
-option: List('ptrrecord?', _validate_ptr, attribute=True, cli_name='ptr_rec', label='PTR record', multivalue=True, normalizer=_normalize_domain_name)
-option: List('rrsigrecord?', _validate_sig, attribute=True, cli_name='rrsig_rec', label='RRSIG record', multivalue=True, normalizer=None)
-option: List('rprecord?', _validate_unsupported, attribute=True, cli_name='rp_rec', label='RP record', multivalue=True, normalizer=None)
-option: List('sigrecord?', _validate_sig, attribute=True, cli_name='sig_rec', label='SIG record', multivalue=True, normalizer=None)
-option: List('spfrecord?', attribute=True, cli_name='spf_rec', label='SPF record', multivalue=True, normalizer=None)
-option: List('srvrecord?', _validate_srv, attribute=True, cli_name='srv_rec', label='SRV record', multivalue=True, normalizer=None)
-option: List('sshfprecord?', _validate_sshfp, attribute=True, cli_name='sshfp_rec', label='SSHFP record', multivalue=True, normalizer=None)
-option: List('tarecord?', _validate_unsupported, attribute=True, cli_name='ta_rec', label='TA record', multivalue=True, normalizer=None)
-option: List('tkeyrecord?', _validate_unsupported, attribute=True, cli_name='tkey_rec', label='TKEY record', multivalue=True, normalizer=None)
-option: List('tsigrecord?', _validate_unsupported, attribute=True, cli_name='tsig_rec', label='TSIG record', multivalue=True, normalizer=None)
-option: List('txtrecord?', attribute=True, cli_name='txt_rec', label='TXT record', multivalue=True, normalizer=None)
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+arg: Str('dnszoneidnsname', cli_name='dnszone', query=True, required=True)
+arg: Str('idnsname', attribute=True, cli_name='name', multivalue=False, primary_key=True, query=True, required=True)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+option: List('arecord?', attribute=True, cli_name='a_rec', multivalue=True)
+option: List('aaaarecord?', attribute=True, cli_name='aaaa_rec', multivalue=True)
+option: List('a6record?', attribute=True, cli_name='a6_rec', multivalue=True)
+option: List('afsdbrecord?', attribute=True, cli_name='afsdb_rec', multivalue=True)
+option: List('aplrecord?', attribute=True, cli_name='apl_rec', multivalue=True)
+option: List('certrecord?', attribute=True, cli_name='cert_rec', multivalue=True)
+option: List('cnamerecord?', attribute=True, cli_name='cname_rec', multivalue=True)
+option: List('dhcidrecord?', attribute=True, cli_name='dhcid_rec', multivalue=True)
+option: List('dlvrecord?', attribute=True, cli_name='dlv_rec', multivalue=True)
+option: List('dnamerecord?', attribute=True, cli_name='dname_rec', multivalue=True)
+option: List('dnskeyrecord?', attribute=True, cli_name='dnskey_rec', multivalue=True)
+option: List('dsrecord?', attribute=True, cli_name='ds_rec', multivalue=True)
+option: List('hiprecord?', attribute=True, cli_name='hip_rec', multivalue=True)
+option: List('ipseckeyrecord?', attribute=True, cli_name='ipseckey_rec', multivalue=True)
+option: List('keyrecord?', attribute=True, cli_name='key_rec', multivalue=True)
+option: List('kxrecord?', attribute=True, cli_name='kx_rec', multivalue=True)
+option: List('locrecord?', attribute=True, cli_name='loc_rec', multivalue=True)
+option: List('mxrecord?', attribute=True, cli_name='mx_rec', multivalue=True)
+option: List('naptrrecord?', attribute=True, cli_name='naptr_rec', multivalue=True)
+option: List('nsrecord?', attribute=True, cli_name='ns_rec', multivalue=True)
+option: List('nsecrecord?', attribute=True, cli_name='nsec_rec', multivalue=True)
+option: List('nsec3record?', attribute=True, cli_name='nsec3_rec', multivalue=True)
+option: List('nsec3paramrecord?', attribute=True, cli_name='nsec3param_rec', multivalue=True)
+option: List('ptrrecord?', attribute=True, cli_name='ptr_rec', multivalue=True)
+option: List('rrsigrecord?', attribute=True, cli_name='rrsig_rec', multivalue=True)
+option: List('rprecord?', attribute=True, cli_name='rp_rec', multivalue=True)
+option: List('sigrecord?', attribute=True, cli_name='sig_rec', multivalue=True)
+option: List('spfrecord?', attribute=True, cli_name='spf_rec', multivalue=True)
+option: List('srvrecord?', attribute=True, cli_name='srv_rec', multivalue=True)
+option: List('sshfprecord?', attribute=True, cli_name='sshfp_rec', multivalue=True)
+option: List('tarecord?', attribute=True, cli_name='ta_rec', multivalue=True)
+option: List('tkeyrecord?', attribute=True, cli_name='tkey_rec', multivalue=True)
+option: List('tsigrecord?', attribute=True, cli_name='tsig_rec', multivalue=True)
+option: List('txtrecord?', attribute=True, cli_name='txt_rec', multivalue=True)
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('value', <type 'unicode'>, None)
 command: dnsrecord_del
 args: 2,38,3
-arg: Str('dnszoneidnsname', cli_name='dnszone', label=Gettext('Zone name', domain='ipa', localedir=None), query=True, required=True)
-arg: Str('idnsname', attribute=True, cli_name='name', label=Gettext('Record name', domain='ipa', localedir=None), multivalue=False, primary_key=True, query=True, required=True)
-option: Flag('del_all', autofill=True, default=False, label=Gettext('Delete all associated records', domain='ipa', localedir=None))
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-option: List('arecord?', _validate_ipaddr, attribute=True, cli_name='a_rec', label='A record', multivalue=True, normalizer=None)
-option: List('aaaarecord?', _validate_ipaddr, attribute=True, cli_name='aaaa_rec', label='AAAA record', multivalue=True, normalizer=None)
-option: List('a6record?', attribute=True, cli_name='a6_rec', label='A6 record', multivalue=True, normalizer=None)
-option: List('afsdbrecord?', _validate_afsdb, attribute=True, cli_name='afsdb_rec', label='AFSDB record', multivalue=True, normalizer=None)
-option: List('aplrecord?', _validate_unsupported, attribute=True, cli_name='apl_rec', label='APL record', multivalue=True, normalizer=None)
-option: List('certrecord?', _validate_cert, attribute=True, cli_name='cert_rec', label='CERT record', multivalue=True, normalizer=None)
-option: List('cnamerecord?', _validate_cname, attribute=True, cli_name='cname_rec', label='CNAME record', multivalue=True, normalizer=_normalize_domain_name)
-option: List('dhcidrecord?', _validate_unsupported, attribute=True, cli_name='dhcid_rec', label='DHCID record', multivalue=True, normalizer=None)
-option: List('dlvrecord?', _validate_unsupported, attribute=True, cli_name='dlv_rec', label='DLV record', multivalue=True, normalizer=None)
-option: List('dnamerecord?', _validate_dname, attribute=True, cli_name='dname_rec', label='DNAME record', multivalue=True, normalizer=_normalize_domain_name)
-option: List('dnskeyrecord?', _validate_unsupported, attribute=True, cli_name='dnskey_rec', label='DNSKEY record', multivalue=True, normalizer=None)
-option: List('dsrecord?', _validate_ds, attribute=True, cli_name='ds_rec', label='DS record', multivalue=True, normalizer=None)
-option: List('hiprecord?', _validate_unsupported, attribute=True, cli_name='hip_rec', label='HIP record', multivalue=True, normalizer=None)
-option: List('ipseckeyrecord?', _validate_unsupported, attribute=True, cli_name='ipseckey_rec', label='IPSECKEY record', multivalue=True, normalizer=None)
-option: List('keyrecord?', _validate_key, attribute=True, cli_name='key_rec', label='KEY record', multivalue=True, normalizer=None)
-option: List('kxrecord?', _validate_kx, attribute=True, cli_name='kx_rec', label='KX record', multivalue=True, normalizer=None)
-option: List('locrecord?', _validate_loc, attribute=True, cli_name='loc_rec', label='LOC record', multivalue=True, normalizer=None)
-option: List('mxrecord?', _validate_mx, attribute=True, cli_name='mx_rec', label='MX record', multivalue=True, normalizer=None)
-option: List('naptrrecord?', _validate_naptr, attribute=True, cli_name='naptr_rec', label='NAPTR record', multivalue=True, normalizer=None)
-option: List('nsrecord?', _validate_ns, attribute=True, cli_name='ns_rec', label='NS record', multivalue=True, normalizer=_normalize_domain_name)
-option: List('nsecrecord?', _validate_nsec, attribute=True, cli_name='nsec_rec', label='NSEC record', multivalue=True, normalizer=None)
-option: List('nsec3record?', _validate_unsupported, attribute=True, cli_name='nsec3_rec', label='NSEC3 record', multivalue=True, normalizer=None)
-option: List('nsec3paramrecord?', _validate_unsupported, attribute=True, cli_name='nsec3param_rec', label='NSEC3PARAM record', multivalue=True, normalizer=None)
-option: List('ptrrecord?', _validate_ptr, attribute=True, cli_name='ptr_rec', label='PTR record', multivalue=True, normalizer=_normalize_domain_name)
-option: List('rrsigrecord?', _validate_sig, attribute=True, cli_name='rrsig_rec', label='RRSIG record', multivalue=True, normalizer=None)
-option: List('rprecord?', _validate_unsupported, attribute=True, cli_name='rp_rec', label='RP record', multivalue=True, normalizer=None)
-option: List('sigrecord?', _validate_sig, attribute=True, cli_name='sig_rec', label='SIG record', multivalue=True, normalizer=None)
-option: List('spfrecord?', attribute=True, cli_name='spf_rec', label='SPF record', multivalue=True, normalizer=None)
-option: List('srvrecord?', _validate_srv, attribute=True, cli_name='srv_rec', label='SRV record', multivalue=True, normalizer=None)
-option: List('sshfprecord?', _validate_sshfp, attribute=True, cli_name='sshfp_rec', label='SSHFP record', multivalue=True, normalizer=None)
-option: List('tarecord?', _validate_unsupported, attribute=True, cli_name='ta_rec', label='TA record', multivalue=True, normalizer=None)
-option: List('tkeyrecord?', _validate_unsupported, attribute=True, cli_name='tkey_rec', label='TKEY record', multivalue=True, normalizer=None)
-option: List('tsigrecord?', _validate_unsupported, attribute=True, cli_name='tsig_rec', label='TSIG record', multivalue=True, normalizer=None)
-option: List('txtrecord?', attribute=True, cli_name='txt_rec', label='TXT record', multivalue=True, normalizer=None)
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+arg: Str('dnszoneidnsname', cli_name='dnszone', query=True, required=True)
+arg: Str('idnsname', attribute=True, cli_name='name', multivalue=False, primary_key=True, query=True, required=True)
+option: Flag('del_all', autofill=True, default=False)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+option: List('arecord?', attribute=True, cli_name='a_rec', multivalue=True)
+option: List('aaaarecord?', attribute=True, cli_name='aaaa_rec', multivalue=True)
+option: List('a6record?', attribute=True, cli_name='a6_rec', multivalue=True)
+option: List('afsdbrecord?', attribute=True, cli_name='afsdb_rec', multivalue=True)
+option: List('aplrecord?', attribute=True, cli_name='apl_rec', multivalue=True)
+option: List('certrecord?', attribute=True, cli_name='cert_rec', multivalue=True)
+option: List('cnamerecord?', attribute=True, cli_name='cname_rec', multivalue=True)
+option: List('dhcidrecord?', attribute=True, cli_name='dhcid_rec', multivalue=True)
+option: List('dlvrecord?', attribute=True, cli_name='dlv_rec', multivalue=True)
+option: List('dnamerecord?', attribute=True, cli_name='dname_rec', multivalue=True)
+option: List('dnskeyrecord?', attribute=True, cli_name='dnskey_rec', multivalue=True)
+option: List('dsrecord?', attribute=True, cli_name='ds_rec', multivalue=True)
+option: List('hiprecord?', attribute=True, cli_name='hip_rec', multivalue=True)
+option: List('ipseckeyrecord?', attribute=True, cli_name='ipseckey_rec', multivalue=True)
+option: List('keyrecord?', attribute=True, cli_name='key_rec', multivalue=True)
+option: List('kxrecord?', attribute=True, cli_name='kx_rec', multivalue=True)
+option: List('locrecord?', attribute=True, cli_name='loc_rec', multivalue=True)
+option: List('mxrecord?', attribute=True, cli_name='mx_rec', multivalue=True)
+option: List('naptrrecord?', attribute=True, cli_name='naptr_rec', multivalue=True)
+option: List('nsrecord?', attribute=True, cli_name='ns_rec', multivalue=True)
+option: List('nsecrecord?', attribute=True, cli_name='nsec_rec', multivalue=True)
+option: List('nsec3record?', attribute=True, cli_name='nsec3_rec', multivalue=True)
+option: List('nsec3paramrecord?', attribute=True, cli_name='nsec3param_rec', multivalue=True)
+option: List('ptrrecord?', attribute=True, cli_name='ptr_rec', multivalue=True)
+option: List('rrsigrecord?', attribute=True, cli_name='rrsig_rec', multivalue=True)
+option: List('rprecord?', attribute=True, cli_name='rp_rec', multivalue=True)
+option: List('sigrecord?', attribute=True, cli_name='sig_rec', multivalue=True)
+option: List('spfrecord?', attribute=True, cli_name='spf_rec', multivalue=True)
+option: List('srvrecord?', attribute=True, cli_name='srv_rec', multivalue=True)
+option: List('sshfprecord?', attribute=True, cli_name='sshfp_rec', multivalue=True)
+option: List('tarecord?', attribute=True, cli_name='ta_rec', multivalue=True)
+option: List('tkeyrecord?', attribute=True, cli_name='tkey_rec', multivalue=True)
+option: List('tsigrecord?', attribute=True, cli_name='tsig_rec', multivalue=True)
+option: List('txtrecord?', attribute=True, cli_name='txt_rec', multivalue=True)
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('value', <type 'unicode'>, None)
 command: dnsrecord_delentry
 args: 2,1,3
-arg: Str('dnszoneidnsname', cli_name='dnszone', label=Gettext('Zone name', domain='ipa', localedir=None), query=True, required=True)
-arg: Str('idnsname', attribute=True, cli_name='name', label=Gettext('Record name', domain='ipa', localedir=None), multivalue=True, primary_key=True, query=True, required=True)
+arg: Str('dnszoneidnsname', cli_name='dnszone', query=True, required=True)
+arg: Str('idnsname', attribute=True, cli_name='name', multivalue=True, primary_key=True, query=True, required=True)
 option: Flag('continue', autofill=True, cli_name='continue', default=False)
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Output('result', <type 'dict'>, 'list of deletions that failed')
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Output('result', <type 'dict'>, None)
+output: Output('value', <type 'unicode'>, None)
 command: dnsrecord_find
 args: 2,43,4
-arg: Str('dnszoneidnsname', cli_name='dnszone', label=Gettext('Zone name', domain='ipa', localedir=None), query=True, required=True)
+arg: Str('dnszoneidnsname', cli_name='dnszone', query=True, required=True)
 arg: Str('criteria?', noextrawhitespace=False)
-option: Str('idnsname', attribute=True, autofill=False, cli_name='name', label=Gettext('Record name', domain='ipa', localedir=None), multivalue=False, primary_key=True, query=True, required=False)
-option: Int('dnsttl', attribute=True, autofill=False, cli_name='ttl', label=Gettext('Time to live', domain='ipa', localedir=None), multivalue=False, query=True, required=False)
-option: StrEnum('dnsclass', attribute=True, autofill=False, cli_name='class', label=Gettext('Class', domain='ipa', localedir=None), multivalue=False, query=True, required=False, values=(u'IN', u'CS', u'CH', u'HS'))
-option: Int('timelimit?', autofill=False, flags=['no_display'], label=Gettext('Time Limit', domain='ipa', localedir=None), minvalue=0)
-option: Int('sizelimit?', autofill=False, flags=['no_display'], label=Gettext('Size Limit', domain='ipa', localedir=None), minvalue=0)
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-option: Flag('pkey_only?', autofill=True, default=False', label=Gettext('Primary key only', domain='ipa', localedir=None))
-option: List('arecord', _validate_ipaddr, attribute=True, cli_name='a_rec', label='A record', multivalue=True, normalizer=None, query=True, required=False)
-option: List('aaaarecord', _validate_ipaddr, attribute=True, cli_name='aaaa_rec', label='AAAA record', multivalue=True, normalizer=None, query=True, required=False)
-option: List('a6record', attribute=True, cli_name='a6_rec', label='A6 record', multivalue=True, normalizer=None, query=True, required=False)
-option: List('afsdbrecord', _validate_afsdb, attribute=True, cli_name='afsdb_rec', label='AFSDB record', multivalue=True, normalizer=None, query=True, required=False)
-option: List('aplrecord', _validate_unsupported, attribute=True, cli_name='apl_rec', label='APL record', multivalue=True, normalizer=None, query=True, required=False)
-option: List('certrecord', _validate_cert, attribute=True, cli_name='cert_rec', label='CERT record', multivalue=True, normalizer=None, query=True, required=False)
-option: List('cnamerecord', _validate_cname, attribute=True, cli_name='cname_rec', label='CNAME record', multivalue=True, normalizer=_normalize_domain_name, query=True, required=False)
-option: List('dhcidrecord', _validate_unsupported, attribute=True, cli_name='dhcid_rec', label='DHCID record', multivalue=True, normalizer=None, query=True, required=False)
-option: List('dlvrecord', _validate_unsupported, attribute=True, cli_name='dlv_rec', label='DLV record', multivalue=True, normalizer=None, query=True, required=False)
-option: List('dnamerecord', _validate_dname, attribute=True, cli_name='dname_rec', label='DNAME record', multivalue=True, normalizer=_normalize_domain_name, query=True, required=False)
-option: List('dnskeyrecord', _validate_unsupported, attribute=True, cli_name='dnskey_rec', label='DNSKEY record', multivalue=True, normalizer=None, query=True, required=False)
-option: List('dsrecord', _validate_ds, attribute=True, cli_name='ds_rec', label='DS record', multivalue=True, normalizer=None, query=True, required=False)
-option: List('hiprecord', _validate_unsupported, attribute=True, cli_name='hip_rec', label='HIP record', multivalue=True, normalizer=None, query=True, required=False)
-option: List('ipseckeyrecord', _validate_unsupported, attribute=True, cli_name='ipseckey_rec', label='IPSECKEY record', multivalue=True, normalizer=None, query=True, required=False)
-option: List('keyrecord', _validate_key, attribute=True, cli_name='key_rec', label='KEY record', multivalue=True, normalizer=None, query=True, required=False)
-option: List('kxrecord', _validate_kx, attribute=True, cli_name='kx_rec', label='KX record', multivalue=True, normalizer=None, query=True, required=False)
-option: List('locrecord', _validate_loc, attribute=True, cli_name='loc_rec', label='LOC record', multivalue=True, normalizer=None, query=True, required=False)
-option: List('mxrecord', _validate_mx, attribute=True, cli_name='mx_rec', label='MX record', multivalue=True, normalizer=None, query=True, required=False)
-option: List('naptrrecord', _validate_naptr, attribute=True, cli_name='naptr_rec', label='NAPTR record', multivalue=True, normalizer=None, query=True, required=False)
-option: List('nsrecord', _validate_ns, attribute=True, cli_name='ns_rec', label='NS record', multivalue=True, normalizer=_normalize_domain_name, query=True, required=False)
-option: List('nsecrecord', _validate_nsec, attribute=True, cli_name='nsec_rec', label='NSEC record', multivalue=True, normalizer=None, query=True, required=False)
-option: List('nsec3record', _validate_unsupported, attribute=True, cli_name='nsec3_rec', label='NSEC3 record', multivalue=True, normalizer=None, query=True, required=False)
-option: List('nsec3paramrecord', _validate_unsupported, attribute=True, cli_name='nsec3param_rec', label='NSEC3PARAM record', multivalue=True, normalizer=None, query=True, required=False)
-option: List('ptrrecord', _validate_ptr, attribute=True, cli_name='ptr_rec', label='PTR record', multivalue=True, normalizer=_normalize_domain_name, query=True, required=False)
-option: List('rrsigrecord', _validate_sig, attribute=True, cli_name='rrsig_rec', label='RRSIG record', multivalue=True, normalizer=None, query=True, required=False)
-option: List('rprecord', _validate_unsupported, attribute=True, cli_name='rp_rec', label='RP record', multivalue=True, normalizer=None, query=True, required=False)
-option: List('sigrecord', _validate_sig, attribute=True, cli_name='sig_rec', label='SIG record', multivalue=True, normalizer=None, query=True, required=False)
-option: List('spfrecord', attribute=True, cli_name='spf_rec', label='SPF record', multivalue=True, normalizer=None, query=True, required=False)
-option: List('srvrecord', _validate_srv, attribute=True, cli_name='srv_rec', label='SRV record', multivalue=True, normalizer=None, query=True, required=False)
-option: List('sshfprecord', _validate_sshfp, attribute=True, cli_name='sshfp_rec', label='SSHFP record', multivalue=True, normalizer=None, query=True, required=False)
-option: List('tarecord', _validate_unsupported, attribute=True, cli_name='ta_rec', label='TA record', multivalue=True, normalizer=None, query=True, required=False)
-option: List('tkeyrecord', _validate_unsupported, attribute=True, cli_name='tkey_rec', label='TKEY record', multivalue=True, normalizer=None, query=True, required=False)
-option: List('tsigrecord', _validate_unsupported, attribute=True, cli_name='tsig_rec', label='TSIG record', multivalue=True, normalizer=None, query=True, required=False)
-option: List('txtrecord', attribute=True, cli_name='txt_rec', label='TXT record', multivalue=True, normalizer=None, query=True, required=False)
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
+option: Str('idnsname', attribute=True, autofill=False, cli_name='name', multivalue=False, primary_key=True, query=True, required=False)
+option: Int('dnsttl', attribute=True, autofill=False, cli_name='ttl', multivalue=False, query=True, required=False)
+option: StrEnum('dnsclass', attribute=True, autofill=False, cli_name='class', multivalue=False, query=True, required=False, values=(u'IN', u'CS', u'CH', u'HS'))
+option: Int('timelimit?', autofill=False, minvalue=0)
+option: Int('sizelimit?', autofill=False, minvalue=0)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+option: Flag('pkey_only?', autofill=True, default=False)
+option: List('arecord', attribute=True, cli_name='a_rec', multivalue=True, query=True, required=False)
+option: List('aaaarecord', attribute=True, cli_name='aaaa_rec', multivalue=True, query=True, required=False)
+option: List('a6record', attribute=True, cli_name='a6_rec', multivalue=True, query=True, required=False)
+option: List('afsdbrecord', attribute=True, cli_name='afsdb_rec', multivalue=True, query=True, required=False)
+option: List('aplrecord', attribute=True, cli_name='apl_rec', multivalue=True, query=True, required=False)
+option: List('certrecord', attribute=True, cli_name='cert_rec', multivalue=True, query=True, required=False)
+option: List('cnamerecord', attribute=True, cli_name='cname_rec', multivalue=True, query=True, required=False)
+option: List('dhcidrecord', attribute=True, cli_name='dhcid_rec', multivalue=True, query=True, required=False)
+option: List('dlvrecord', attribute=True, cli_name='dlv_rec', multivalue=True, query=True, required=False)
+option: List('dnamerecord', attribute=True, cli_name='dname_rec', multivalue=True, query=True, required=False)
+option: List('dnskeyrecord', attribute=True, cli_name='dnskey_rec', multivalue=True, query=True, required=False)
+option: List('dsrecord', attribute=True, cli_name='ds_rec', multivalue=True, query=True, required=False)
+option: List('hiprecord', attribute=True, cli_name='hip_rec', multivalue=True, query=True, required=False)
+option: List('ipseckeyrecord', attribute=True, cli_name='ipseckey_rec', multivalue=True, query=True, required=False)
+option: List('keyrecord', attribute=True, cli_name='key_rec', multivalue=True, query=True, required=False)
+option: List('kxrecord', attribute=True, cli_name='kx_rec', multivalue=True, query=True, required=False)
+option: List('locrecord', attribute=True, cli_name='loc_rec', multivalue=True, query=True, required=False)
+option: List('mxrecord', attribute=True, cli_name='mx_rec', multivalue=True, query=True, required=False)
+option: List('naptrrecord', attribute=True, cli_name='naptr_rec', multivalue=True, query=True, required=False)
+option: List('nsrecord', attribute=True, cli_name='ns_rec', multivalue=True, query=True, required=False)
+option: List('nsecrecord', attribute=True, cli_name='nsec_rec', multivalue=True, query=True, required=False)
+option: List('nsec3record', attribute=True, cli_name='nsec3_rec', multivalue=True, query=True, required=False)
+option: List('nsec3paramrecord', attribute=True, cli_name='nsec3param_rec', multivalue=True, query=True, required=False)
+option: List('ptrrecord', attribute=True, cli_name='ptr_rec', multivalue=True, query=True, required=False)
+option: List('rrsigrecord', attribute=True, cli_name='rrsig_rec', multivalue=True, query=True, required=False)
+option: List('rprecord', attribute=True, cli_name='rp_rec', multivalue=True, query=True, required=False)
+option: List('sigrecord', attribute=True, cli_name='sig_rec', multivalue=True, query=True, required=False)
+option: List('spfrecord', attribute=True, cli_name='spf_rec', multivalue=True, query=True, required=False)
+option: List('srvrecord', attribute=True, cli_name='srv_rec', multivalue=True, query=True, required=False)
+option: List('sshfprecord', attribute=True, cli_name='sshfp_rec', multivalue=True, query=True, required=False)
+option: List('tarecord', attribute=True, cli_name='ta_rec', multivalue=True, query=True, required=False)
+option: List('tkeyrecord', attribute=True, cli_name='tkey_rec', multivalue=True, query=True, required=False)
+option: List('tsigrecord', attribute=True, cli_name='tsig_rec', multivalue=True, query=True, required=False)
+option: List('txtrecord', attribute=True, cli_name='txt_rec', multivalue=True, query=True, required=False)
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
 output: ListOfEntries('result', (<type 'list'>, <type 'tuple'>), Gettext('A list of LDAP entries', domain='ipa', localedir=None))
-output: Output('count', <type 'int'>, 'Number of entries returned')
-output: Output('truncated', <type 'bool'>, 'True if not all results were returned')
+output: Output('count', <type 'int'>, None)
+output: Output('truncated', <type 'bool'>, None)
 command: dnsrecord_mod
 args: 2,37,3
-arg: Str('dnszoneidnsname', cli_name='dnszone', label=Gettext('Zone name', domain='ipa', localedir=None), query=True, required=True)
-arg: Str('idnsname', attribute=True, cli_name='name', label=Gettext('Record name', domain='ipa', localedir=None), multivalue=False, primary_key=True, query=True, required=True)
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-option: List('arecord?', _validate_ipaddr, attribute=True, cli_name='a_rec', label='A record', multivalue=True, normalizer=None)
-option: List('aaaarecord?', _validate_ipaddr, attribute=True, cli_name='aaaa_rec', label='AAAA record', multivalue=True, normalizer=None)
-option: List('a6record?', attribute=True, cli_name='a6_rec', label='A6 record', multivalue=True, normalizer=None)
-option: List('afsdbrecord?', _validate_afsdb, attribute=True, cli_name='afsdb_rec', label='AFSDB record', multivalue=True, normalizer=None)
-option: List('aplrecord?', _validate_unsupported, attribute=True, cli_name='apl_rec', label='APL record', multivalue=True, normalizer=None)
-option: List('certrecord?', _validate_cert, attribute=True, cli_name='cert_rec', label='CERT record', multivalue=True, normalizer=None)
-option: List('cnamerecord?', _validate_cname, attribute=True, cli_name='cname_rec', label='CNAME record', multivalue=True, normalizer=_normalize_domain_name)
-option: List('dhcidrecord?', _validate_unsupported, attribute=True, cli_name='dhcid_rec', label='DHCID record', multivalue=True, normalizer=None)
-option: List('dlvrecord?', _validate_unsupported, attribute=True, cli_name='dlv_rec', label='DLV record', multivalue=True, normalizer=None)
-option: List('dnamerecord?', _validate_dname, attribute=True, cli_name='dname_rec', label='DNAME record', multivalue=True, normalizer=_normalize_domain_name)
-option: List('dnskeyrecord?', _validate_unsupported, attribute=True, cli_name='dnskey_rec', label='DNSKEY record', multivalue=True, normalizer=None)
-option: List('dsrecord?', _validate_ds, attribute=True, cli_name='ds_rec', label='DS record', multivalue=True, normalizer=None)
-option: List('hiprecord?', _validate_unsupported, attribute=True, cli_name='hip_rec', label='HIP record', multivalue=True, normalizer=None)
-option: List('ipseckeyrecord?', _validate_unsupported, attribute=True, cli_name='ipseckey_rec', label='IPSECKEY record', multivalue=True, normalizer=None)
-option: List('keyrecord?', _validate_key, attribute=True, cli_name='key_rec', label='KEY record', multivalue=True, normalizer=None)
-option: List('kxrecord?', _validate_kx, attribute=True, cli_name='kx_rec', label='KX record', multivalue=True, normalizer=None)
-option: List('locrecord?', _validate_loc, attribute=True, cli_name='loc_rec', label='LOC record', multivalue=True, normalizer=None)
-option: List('mxrecord?', _validate_mx, attribute=True, cli_name='mx_rec', label='MX record', multivalue=True, normalizer=None)
-option: List('naptrrecord?', _validate_naptr, attribute=True, cli_name='naptr_rec', label='NAPTR record', multivalue=True, normalizer=None)
-option: List('nsrecord?', _validate_ns, attribute=True, cli_name='ns_rec', label='NS record', multivalue=True, normalizer=_normalize_domain_name)
-option: List('nsecrecord?', _validate_nsec, attribute=True, cli_name='nsec_rec', label='NSEC record', multivalue=True, normalizer=None)
-option: List('nsec3record?', _validate_unsupported, attribute=True, cli_name='nsec3_rec', label='NSEC3 record', multivalue=True, normalizer=None)
-option: List('nsec3paramrecord?', _validate_unsupported, attribute=True, cli_name='nsec3param_rec', label='NSEC3PARAM record', multivalue=True, normalizer=None)
-option: List('ptrrecord?', _validate_ptr, attribute=True, cli_name='ptr_rec', label='PTR record', multivalue=True, normalizer=_normalize_domain_name)
-option: List('rrsigrecord?', _validate_sig, attribute=True, cli_name='rrsig_rec', label='RRSIG record', multivalue=True, normalizer=None)
-option: List('rprecord?', _validate_unsupported, attribute=True, cli_name='rp_rec', label='RP record', multivalue=True, normalizer=None)
-option: List('sigrecord?', _validate_sig, attribute=True, cli_name='sig_rec', label='SIG record', multivalue=True, normalizer=None)
-option: List('spfrecord?', attribute=True, cli_name='spf_rec', label='SPF record', multivalue=True, normalizer=None)
-option: List('srvrecord?', _validate_srv, attribute=True, cli_name='srv_rec', label='SRV record', multivalue=True, normalizer=None)
-option: List('sshfprecord?', _validate_sshfp, attribute=True, cli_name='sshfp_rec', label='SSHFP record', multivalue=True, normalizer=None)
-option: List('tarecord?', _validate_unsupported, attribute=True, cli_name='ta_rec', label='TA record', multivalue=True, normalizer=None)
-option: List('tkeyrecord?', _validate_unsupported, attribute=True, cli_name='tkey_rec', label='TKEY record', multivalue=True, normalizer=None)
-option: List('tsigrecord?', _validate_unsupported, attribute=True, cli_name='tsig_rec', label='TSIG record', multivalue=True, normalizer=None)
-option: List('txtrecord?', attribute=True, cli_name='txt_rec', label='TXT record', multivalue=True, normalizer=None)
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+arg: Str('dnszoneidnsname', cli_name='dnszone', query=True, required=True)
+arg: Str('idnsname', attribute=True, cli_name='name', multivalue=False, primary_key=True, query=True, required=True)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+option: List('arecord?', attribute=True, cli_name='a_rec', multivalue=True)
+option: List('aaaarecord?', attribute=True, cli_name='aaaa_rec', multivalue=True)
+option: List('a6record?', attribute=True, cli_name='a6_rec', multivalue=True)
+option: List('afsdbrecord?', attribute=True, cli_name='afsdb_rec', multivalue=True)
+option: List('aplrecord?', attribute=True, cli_name='apl_rec', multivalue=True)
+option: List('certrecord?', attribute=True, cli_name='cert_rec', multivalue=True)
+option: List('cnamerecord?', attribute=True, cli_name='cname_rec', multivalue=True)
+option: List('dhcidrecord?', attribute=True, cli_name='dhcid_rec', multivalue=True)
+option: List('dlvrecord?', attribute=True, cli_name='dlv_rec', multivalue=True)
+option: List('dnamerecord?', attribute=True, cli_name='dname_rec', multivalue=True)
+option: List('dnskeyrecord?', attribute=True, cli_name='dnskey_rec', multivalue=True)
+option: List('dsrecord?', attribute=True, cli_name='ds_rec', multivalue=True)
+option: List('hiprecord?', attribute=True, cli_name='hip_rec', multivalue=True)
+option: List('ipseckeyrecord?', attribute=True, cli_name='ipseckey_rec', multivalue=True)
+option: List('keyrecord?', attribute=True, cli_name='key_rec', multivalue=True)
+option: List('kxrecord?', attribute=True, cli_name='kx_rec', multivalue=True)
+option: List('locrecord?', attribute=True, cli_name='loc_rec', multivalue=True)
+option: List('mxrecord?', attribute=True, cli_name='mx_rec', multivalue=True)
+option: List('naptrrecord?', attribute=True, cli_name='naptr_rec', multivalue=True)
+option: List('nsrecord?', attribute=True, cli_name='ns_rec', multivalue=True)
+option: List('nsecrecord?', attribute=True, cli_name='nsec_rec', multivalue=True)
+option: List('nsec3record?', attribute=True, cli_name='nsec3_rec', multivalue=True)
+option: List('nsec3paramrecord?', attribute=True, cli_name='nsec3param_rec', multivalue=True)
+option: List('ptrrecord?', attribute=True, cli_name='ptr_rec', multivalue=True)
+option: List('rrsigrecord?', attribute=True, cli_name='rrsig_rec', multivalue=True)
+option: List('rprecord?', attribute=True, cli_name='rp_rec', multivalue=True)
+option: List('sigrecord?', attribute=True, cli_name='sig_rec', multivalue=True)
+option: List('spfrecord?', attribute=True, cli_name='spf_rec', multivalue=True)
+option: List('srvrecord?', attribute=True, cli_name='srv_rec', multivalue=True)
+option: List('sshfprecord?', attribute=True, cli_name='sshfp_rec', multivalue=True)
+option: List('tarecord?', attribute=True, cli_name='ta_rec', multivalue=True)
+option: List('tkeyrecord?', attribute=True, cli_name='tkey_rec', multivalue=True)
+option: List('tsigrecord?', attribute=True, cli_name='tsig_rec', multivalue=True)
+option: List('txtrecord?', attribute=True, cli_name='txt_rec', multivalue=True)
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('value', <type 'unicode'>, None)
 command: dnsrecord_show
 args: 2,4,3
-arg: Str('dnszoneidnsname', cli_name='dnszone', label=Gettext('Zone name', domain='ipa', localedir=None), query=True, required=True)
-arg: Str('idnsname', attribute=True, cli_name='name', label=Gettext('Record name', domain='ipa', localedir=None), multivalue=False, primary_key=True, query=True, required=True)
-option: Flag('rights', autofill=True, default=False, label=Gettext('Rights', domain='ipa', localedir=None))
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+arg: Str('dnszoneidnsname', cli_name='dnszone', query=True, required=True)
+arg: Str('idnsname', attribute=True, cli_name='name', multivalue=False, primary_key=True, query=True, required=True)
+option: Flag('rights', autofill=True, default=False)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('value', <type 'unicode'>, None)
 command: dnszone_add
 args: 1,19,3
-arg: Str('idnsname', attribute=True, cli_name='name', default_from=DefaultFrom(<lambda>, 'name_from_ip'), label=Gettext('Zone name', domain='ipa', localedir=None), multivalue=False, normalizer=<lambda>, primary_key=True, required=True)
-option: Str('name_from_ip', _validate_ipnet, attribute=False, cli_name='name_from_ip', flags=('virtual_attribute',), label=Gettext('Reverse zone IP network', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Str('idnssoamname', attribute=True, cli_name='name_server', label=Gettext('Authoritative nameserver', domain='ipa', localedir=None), multivalue=False, required=True)
-option: Str('idnssoarname', _rname_validator, attribute=True, cli_name='admin_email', default_from=DefaultFrom(<lambda>, 'idnsname'), label=Gettext('Administrator e-mail address', domain='ipa', localedir=None), multivalue=False, normalizer=_rname_normalizer, required=True)
-option: Int('idnssoaserial', attribute=True, autofill=True, cli_name='serial', create_default=_create_zone_serial, label=Gettext('SOA serial', domain='ipa', localedir=None), minvalue=1, multivalue=False, required=False)
-option: Int('idnssoarefresh', attribute=True, autofill=True, cli_name='refresh', default=3600, label=Gettext('SOA refresh', domain='ipa', localedir=None), minvalue=0, multivalue=False, required=False)
-option: Int('idnssoaretry', attribute=True, autofill=True, cli_name='retry', default=900, label=Gettext('SOA retry', domain='ipa', localedir=None), minvalue=0, multivalue=False, required=False)
-option: Int('idnssoaexpire', attribute=True, autofill=True, cli_name='expire', default=1209600, label=Gettext('SOA expire', domain='ipa', localedir=None), minvalue=0, multivalue=False, required=False)
-option: Int('idnssoaminimum', attribute=True, autofill=True, cli_name='minimum', default=3600, label=Gettext('SOA minimum', domain='ipa', localedir=None), maxvalue=10800, minvalue=0, multivalue=False, required=False)
-option: Int('dnsttl', attribute=True, cli_name='ttl', label=Gettext('SOA time to live', domain='ipa', localedir=None), multivalue=False, required=False)
-option: StrEnum('dnsclass', attribute=True, cli_name='class', label=Gettext('SOA class', domain='ipa', localedir=None), multivalue=False, required=False, values=(u'IN', u'CS', u'CH', u'HS'))
-option: Str('idnsupdatepolicy', attribute=True, cli_name='update_policy', label=Gettext('BIND update policy', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Bool('idnsallowdynupdate', attribute=True, autofill=True, cli_name='dynamic_update', default=False, label=Gettext('Dynamic update', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Str('addattr*', validate_add_attribute, cli_name='addattr', exclude='webui')
-option: Str('setattr*', validate_set_attribute, cli_name='setattr', exclude='webui')
-option: Flag('force', autofill=True, default=False, label=Gettext('Force', domain='ipa', localedir=None))
-option: Str('ip_address?', _validate_ipaddr)
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+arg: Str('idnsname', attribute=True, cli_name='name', multivalue=False, primary_key=True, required=True)
+option: Str('name_from_ip', attribute=False, cli_name='name_from_ip', multivalue=False, required=False)
+option: Str('idnssoamname', attribute=True, cli_name='name_server', multivalue=False, required=True)
+option: Str('idnssoarname', attribute=True, cli_name='admin_email', multivalue=False, required=True)
+option: Int('idnssoaserial', attribute=True, autofill=True, cli_name='serial', minvalue=1, multivalue=False, required=False)
+option: Int('idnssoarefresh', attribute=True, autofill=True, cli_name='refresh', default=3600, minvalue=0, multivalue=False, required=False)
+option: Int('idnssoaretry', attribute=True, autofill=True, cli_name='retry', default=900, minvalue=0, multivalue=False, required=False)
+option: Int('idnssoaexpire', attribute=True, autofill=True, cli_name='expire', default=1209600, minvalue=0, multivalue=False, required=False)
+option: Int('idnssoaminimum', attribute=True, autofill=True, cli_name='minimum', default=3600, maxvalue=10800, minvalue=0, multivalue=False, required=False)
+option: Int('dnsttl', attribute=True, cli_name='ttl', multivalue=False, required=False)
+option: StrEnum('dnsclass', attribute=True, cli_name='class', multivalue=False, required=False, values=(u'IN', u'CS', u'CH', u'HS'))
+option: Str('idnsupdatepolicy', attribute=True, cli_name='update_policy', multivalue=False, required=False)
+option: Bool('idnsallowdynupdate', attribute=True, autofill=True, cli_name='dynamic_update', default=False, multivalue=False, required=False)
+option: Str('addattr*', cli_name='addattr', exclude='webui')
+option: Str('setattr*', cli_name='setattr', exclude='webui')
+option: Flag('force', autofill=True, default=False)
+option: Str('ip_address?')
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('value', <type 'unicode'>, None)
 command: dnszone_del
 args: 1,1,3
-arg: Str('idnsname', attribute=True, cli_name='name', default_from=DefaultFrom(<lambda>, 'name_from_ip'), label=Gettext('Zone name', domain='ipa', localedir=None), multivalue=True, normalizer=<lambda>, primary_key=True, query=True, required=True)
+arg: Str('idnsname', attribute=True, cli_name='name', multivalue=True, primary_key=True, query=True, required=True)
 option: Flag('continue', autofill=True, cli_name='continue', default=False)
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Output('result', <type 'dict'>, 'list of deletions that failed')
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Output('result', <type 'dict'>, None)
+output: Output('value', <type 'unicode'>, None)
 command: dnszone_disable
 args: 1,0,3
-arg: Str('idnsname', attribute=True, cli_name='name', default_from=DefaultFrom(<lambda>, 'name_from_ip'), label=Gettext('Zone name', domain='ipa', localedir=None), multivalue=False, normalizer=<lambda>, primary_key=True, query=True, required=True)
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Output('result', <type 'bool'>, 'True means the operation was successful')
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+arg: Str('idnsname', attribute=True, cli_name='name', multivalue=False, primary_key=True, query=True, required=True)
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Output('result', <type 'bool'>, None)
+output: Output('value', <type 'unicode'>, None)
 command: dnszone_enable
 args: 1,0,3
-arg: Str('idnsname', attribute=True, cli_name='name', default_from=DefaultFrom(<lambda>, 'name_from_ip'), label=Gettext('Zone name', domain='ipa', localedir=None), multivalue=False, normalizer=<lambda>, primary_key=True, query=True, required=True)
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Output('result', <type 'bool'>, 'True means the operation was successful')
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+arg: Str('idnsname', attribute=True, cli_name='name', multivalue=False, primary_key=True, query=True, required=True)
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Output('result', <type 'bool'>, None)
+output: Output('value', <type 'unicode'>, None)
 command: dnszone_find
 args: 1,21,4
 arg: Str('criteria?', noextrawhitespace=False)
-option: Str('idnsname', attribute=True, autofill=False, cli_name='name', default_from=DefaultFrom(<lambda>, 'name_from_ip'), label=Gettext('Zone name', domain='ipa', localedir=None), multivalue=False, normalizer=<lambda>, primary_key=True, query=True, required=False)
-option: Str('name_from_ip', _validate_ipnet, attribute=False, autofill=False, cli_name='name_from_ip', flags=('virtual_attribute',), label=Gettext('Reverse zone IP network', domain='ipa', localedir=None), multivalue=False, query=True, required=False)
-option: Str('idnssoamname', attribute=True, autofill=False, cli_name='name_server', label=Gettext('Authoritative nameserver', domain='ipa', localedir=None), multivalue=False, query=True, required=False)
-option: Str('idnssoarname', _rname_validator, attribute=True, autofill=False, cli_name='admin_email', default_from=DefaultFrom(<lambda>, 'idnsname'), label=Gettext('Administrator e-mail address', domain='ipa', localedir=None), multivalue=False, normalizer=_rname_normalizer, query=True, required=False)
-option: Int('idnssoaserial', attribute=True, autofill=False, cli_name='serial', create_default=_create_zone_serial, label=Gettext('SOA serial', domain='ipa', localedir=None), minvalue=1, multivalue=False, query=True, required=False)
-option: Int('idnssoarefresh', attribute=True, autofill=False, cli_name='refresh', default=3600, label=Gettext('SOA refresh', domain='ipa', localedir=None), minvalue=0, multivalue=False, query=True, required=False)
-option: Int('idnssoaretry', attribute=True, autofill=False, cli_name='retry', default=900, label=Gettext('SOA retry', domain='ipa', localedir=None), minvalue=0, multivalue=False, query=True, required=False)
-option: Int('idnssoaexpire', attribute=True, autofill=False, cli_name='expire', default=1209600, label=Gettext('SOA expire', domain='ipa', localedir=None), minvalue=0, multivalue=False, query=True, required=False)
-option: Int('idnssoaminimum', attribute=True, autofill=False, cli_name='minimum', default=3600, label=Gettext('SOA minimum', domain='ipa', localedir=None), maxvalue=10800, minvalue=0, multivalue=False, query=True, required=False)
-option: Int('dnsttl', attribute=True, autofill=False, cli_name='ttl', label=Gettext('SOA time to live', domain='ipa', localedir=None), multivalue=False, query=True, required=False)
-option: StrEnum('dnsclass', attribute=True, autofill=False, cli_name='class', label=Gettext('SOA class', domain='ipa', localedir=None), multivalue=False, query=True, required=False, values=(u'IN', u'CS', u'CH', u'HS'))
-option: Str('idnsupdatepolicy', attribute=True, autofill=False, cli_name='update_policy', label=Gettext('BIND update policy', domain='ipa', localedir=None), multivalue=False, query=True, required=False)
-option: Bool('idnszoneactive', attribute=True, autofill=False, cli_name='zone_active', flags=['no_create', 'no_update'], label=Gettext('Active zone', domain='ipa', localedir=None), multivalue=False, query=True, required=False)
-option: Bool('idnsallowdynupdate', attribute=True, autofill=False, cli_name='dynamic_update', default=False, label=Gettext('Dynamic update', domain='ipa', localedir=None), multivalue=False, query=True, required=False)
-option: Int('timelimit?', autofill=False, flags=['no_display'], label=Gettext('Time Limit', domain='ipa', localedir=None), minvalue=0)
-option: Int('sizelimit?', autofill=False, flags=['no_display'], label=Gettext('Size Limit', domain='ipa', localedir=None), minvalue=0)
-option: Flag('forward_only', autofill=True, cli_name='forward_only', default=False, label=Gettext('Forward zones only', domain='ipa', localedir=None))
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-option: Flag('pkey_only?', autofill=True, default=False', label=Gettext('Primary key only', domain='ipa', localedir=None))
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
+option: Str('idnsname', attribute=True, autofill=False, cli_name='name', multivalue=False, primary_key=True, query=True, required=False)
+option: Str('name_from_ip', attribute=False, autofill=False, cli_name='name_from_ip', multivalue=False, query=True, required=False)
+option: Str('idnssoamname', attribute=True, autofill=False, cli_name='name_server', multivalue=False, query=True, required=False)
+option: Str('idnssoarname', attribute=True, autofill=False, cli_name='admin_email', multivalue=False, query=True, required=False)
+option: Int('idnssoaserial', attribute=True, autofill=False, cli_name='serial', minvalue=1, multivalue=False, query=True, required=False)
+option: Int('idnssoarefresh', attribute=True, autofill=False, cli_name='refresh', default=3600, minvalue=0, multivalue=False, query=True, required=False)
+option: Int('idnssoaretry', attribute=True, autofill=False, cli_name='retry', default=900, minvalue=0, multivalue=False, query=True, required=False)
+option: Int('idnssoaexpire', attribute=True, autofill=False, cli_name='expire', default=1209600, minvalue=0, multivalue=False, query=True, required=False)
+option: Int('idnssoaminimum', attribute=True, autofill=False, cli_name='minimum', default=3600, maxvalue=10800, minvalue=0, multivalue=False, query=True, required=False)
+option: Int('dnsttl', attribute=True, autofill=False, cli_name='ttl', multivalue=False, query=True, required=False)
+option: StrEnum('dnsclass', attribute=True, autofill=False, cli_name='class', multivalue=False, query=True, required=False, values=(u'IN', u'CS', u'CH', u'HS'))
+option: Str('idnsupdatepolicy', attribute=True, autofill=False, cli_name='update_policy', multivalue=False, query=True, required=False)
+option: Bool('idnszoneactive', attribute=True, autofill=False, cli_name='zone_active', multivalue=False, query=True, required=False)
+option: Bool('idnsallowdynupdate', attribute=True, autofill=False, cli_name='dynamic_update', default=False, multivalue=False, query=True, required=False)
+option: Int('timelimit?', autofill=False, minvalue=0)
+option: Int('sizelimit?', autofill=False, minvalue=0)
+option: Flag('forward_only', autofill=True, cli_name='forward_only', default=False)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+option: Flag('pkey_only?', autofill=True, default=False)
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
 output: ListOfEntries('result', (<type 'list'>, <type 'tuple'>), Gettext('A list of LDAP entries', domain='ipa', localedir=None))
-output: Output('count', <type 'int'>, 'Number of entries returned')
-output: Output('truncated', <type 'bool'>, 'True if not all results were returned')
+output: Output('count', <type 'int'>, None)
+output: Output('truncated', <type 'bool'>, None)
 command: dnszone_mod
 args: 1,18,3
-arg: Str('idnsname', attribute=True, cli_name='name', default_from=DefaultFrom(<lambda>, 'name_from_ip'), label=Gettext('Zone name', domain='ipa', localedir=None), multivalue=False, normalizer=<lambda>, primary_key=True, query=True, required=True)
-option: Str('name_from_ip', _validate_ipnet, attribute=False, autofill=False, cli_name='name_from_ip', flags=('virtual_attribute',), label=Gettext('Reverse zone IP network', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Str('idnssoamname', attribute=True, autofill=False, cli_name='name_server', label=Gettext('Authoritative nameserver', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Str('idnssoarname', _rname_validator, attribute=True, autofill=False, cli_name='admin_email', default_from=DefaultFrom(<lambda>, 'idnsname'), label=Gettext('Administrator e-mail address', domain='ipa', localedir=None), multivalue=False, normalizer=_rname_normalizer, required=False)
-option: Int('idnssoaserial', attribute=True, autofill=False, cli_name='serial', create_default=_create_zone_serial, label=Gettext('SOA serial', domain='ipa', localedir=None), minvalue=1, multivalue=False, required=False)
-option: Int('idnssoarefresh', attribute=True, autofill=False, cli_name='refresh', default=3600, label=Gettext('SOA refresh', domain='ipa', localedir=None), minvalue=0, multivalue=False, required=False)
-option: Int('idnssoaretry', attribute=True, autofill=False, cli_name='retry', default=900, label=Gettext('SOA retry', domain='ipa', localedir=None), minvalue=0, multivalue=False, required=False)
-option: Int('idnssoaexpire', attribute=True, autofill=False, cli_name='expire', default=1209600, label=Gettext('SOA expire', domain='ipa', localedir=None), minvalue=0, multivalue=False, required=False)
-option: Int('idnssoaminimum', attribute=True, autofill=False, cli_name='minimum', default=3600, label=Gettext('SOA minimum', domain='ipa', localedir=None), maxvalue=10800, minvalue=0, multivalue=False, required=False)
-option: Int('dnsttl', attribute=True, autofill=False, cli_name='ttl', label=Gettext('SOA time to live', domain='ipa', localedir=None), multivalue=False, required=False)
-option: StrEnum('dnsclass', attribute=True, autofill=False, cli_name='class', label=Gettext('SOA class', domain='ipa', localedir=None), multivalue=False, required=False, values=(u'IN', u'CS', u'CH', u'HS'))
-option: Str('idnsupdatepolicy', attribute=True, autofill=False, cli_name='update_policy', label=Gettext('BIND update policy', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Bool('idnsallowdynupdate', attribute=True, autofill=False, cli_name='dynamic_update', default=False, label=Gettext('Dynamic update', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Str('addattr*', validate_add_attribute, cli_name='addattr', exclude='webui')
-option: Str('setattr*', validate_set_attribute, cli_name='setattr', exclude='webui')
-option: Flag('rights', autofill=True, default=False, label=Gettext('Rights', domain='ipa', localedir=None))
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+arg: Str('idnsname', attribute=True, cli_name='name', multivalue=False, primary_key=True, query=True, required=True)
+option: Str('name_from_ip', attribute=False, autofill=False, cli_name='name_from_ip', multivalue=False, required=False)
+option: Str('idnssoamname', attribute=True, autofill=False, cli_name='name_server', multivalue=False, required=False)
+option: Str('idnssoarname', attribute=True, autofill=False, cli_name='admin_email', multivalue=False, required=False)
+option: Int('idnssoaserial', attribute=True, autofill=False, cli_name='serial', minvalue=1, multivalue=False, required=False)
+option: Int('idnssoarefresh', attribute=True, autofill=False, cli_name='refresh', default=3600, minvalue=0, multivalue=False, required=False)
+option: Int('idnssoaretry', attribute=True, autofill=False, cli_name='retry', default=900, minvalue=0, multivalue=False, required=False)
+option: Int('idnssoaexpire', attribute=True, autofill=False, cli_name='expire', default=1209600, minvalue=0, multivalue=False, required=False)
+option: Int('idnssoaminimum', attribute=True, autofill=False, cli_name='minimum', default=3600, maxvalue=10800, minvalue=0, multivalue=False, required=False)
+option: Int('dnsttl', attribute=True, autofill=False, cli_name='ttl', multivalue=False, required=False)
+option: StrEnum('dnsclass', attribute=True, autofill=False, cli_name='class', multivalue=False, required=False, values=(u'IN', u'CS', u'CH', u'HS'))
+option: Str('idnsupdatepolicy', attribute=True, autofill=False, cli_name='update_policy', multivalue=False, required=False)
+option: Bool('idnsallowdynupdate', attribute=True, autofill=False, cli_name='dynamic_update', default=False, multivalue=False, required=False)
+option: Str('addattr*', cli_name='addattr', exclude='webui')
+option: Str('setattr*', cli_name='setattr', exclude='webui')
+option: Flag('rights', autofill=True, default=False)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('value', <type 'unicode'>, None)
 command: dnszone_show
 args: 1,4,3
-arg: Str('idnsname', attribute=True, cli_name='name', default_from=DefaultFrom(<lambda>, 'name_from_ip'), label=Gettext('Zone name', domain='ipa', localedir=None), multivalue=False, normalizer=<lambda>, primary_key=True, query=True, required=True)
-option: Flag('rights', autofill=True, default=False, label=Gettext('Rights', domain='ipa', localedir=None))
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+arg: Str('idnsname', attribute=True, cli_name='name', multivalue=False, primary_key=True, query=True, required=True)
+option: Flag('rights', autofill=True, default=False)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('value', <type 'unicode'>, None)
 command: entitle_consume
 args: 1,4,3
-arg: Int('quantity', label=Gettext('Quantity', domain='ipa', localedir=None), minvalue=1)
-option: Int('hidden', autofill=True, default=1, flags=['no_option', 'no_output'], label=Gettext('Quantity', domain='ipa', localedir=None), minvalue=1)
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+arg: Int('quantity', minvalue=1)
+option: Int('hidden', autofill=True, default=1, minvalue=1)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('value', <type 'unicode'>, None)
 command: entitle_find
 args: 1,5,4
 arg: Str('criteria?', noextrawhitespace=False)
-option: Int('timelimit?', autofill=False, flags=['no_display'], label=Gettext('Time Limit', domain='ipa', localedir=None), minvalue=0)
-option: Int('sizelimit?', autofill=False, flags=['no_display'], label=Gettext('Size Limit', domain='ipa', localedir=None), minvalue=0)
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
+option: Int('timelimit?', autofill=False, minvalue=0)
+option: Int('sizelimit?', autofill=False, minvalue=0)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
 output: ListOfEntries('result', (<type 'list'>, <type 'tuple'>), Gettext('A list of LDAP entries', domain='ipa', localedir=None))
-output: Output('count', <type 'int'>, 'Number of entries returned')
-output: Output('truncated', <type 'bool'>, 'True if not all results were returned')
+output: Output('count', <type 'int'>, None)
+output: Output('truncated', <type 'bool'>, None)
 command: entitle_get
 args: 0,3,4
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
 output: ListOfEntries('result', (<type 'list'>, <type 'tuple'>), Gettext('A list of LDAP entries', domain='ipa', localedir=None))
-output: Output('count', <type 'int'>, 'Number of entries returned')
-output: Output('truncated', <type 'bool'>, 'True if not all results were returned')
+output: Output('count', <type 'int'>, None)
+output: Output('truncated', <type 'bool'>, None)
 command: entitle_import
 args: 1,3,1
-arg: File('usercertificate*', validate_certificate, cli_name='certificate_file')
-option: Str('addattr*', validate_add_attribute, cli_name='addattr', exclude='webui')
-option: Str('setattr*', validate_set_attribute, cli_name='setattr', exclude='webui')
-option: Str('uuid?', autofill=True, default=u'IMPORTED', flags=['no_create', 'no_update'], label=Gettext('UUID', domain='ipa', localedir=None))
-output: Output('result', <type 'dict'>, Gettext('Dictionary mapping variable name to value', domain='ipa', localedir=None))
+arg: File('usercertificate*', cli_name='certificate_file')
+option: Str('addattr*', cli_name='addattr', exclude='webui')
+option: Str('setattr*', cli_name='setattr', exclude='webui')
+option: Str('uuid?', autofill=True, default=u'IMPORTED')
+output: Output('result', <type 'dict'>, None)
 command: entitle_register
 args: 1,7,3
-arg: Str('username', label=Gettext('Username', domain='ipa', localedir=None))
-option: Str('addattr*', validate_add_attribute, cli_name='addattr', exclude='webui')
-option: Str('setattr*', validate_set_attribute, cli_name='setattr', exclude='webui')
-option: Str('ipaentitlementid?', flags=['no_create', 'no_update'], label='UUID')
-option: Password('password', confirm=False, label=Gettext('Password', domain='ipa', localedir=None))
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+arg: Str('username')
+option: Str('addattr*', cli_name='addattr', exclude='webui')
+option: Str('setattr*', cli_name='setattr', exclude='webui')
+option: Str('ipaentitlementid?')
+option: Password('password', confirm=False)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('value', <type 'unicode'>, None)
 command: entitle_status
 args: 0,0,1
-output: Output('result', <type 'dict'>, Gettext('Dictionary mapping variable name to value', domain='ipa', localedir=None))
+output: Output('result', <type 'dict'>, None)
 command: entitle_sync
 args: 0,4,3
-option: Int('hidden', autofill=True, default=1, flags=['no_option', 'no_output'], label=Gettext('Quantity', domain='ipa', localedir=None), minvalue=1)
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
+option: Int('hidden', autofill=True, default=1, minvalue=1)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
 output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+output: Output('value', <type 'unicode'>, None)
 command: env
 args: 1,2,4
 arg: Str('variables*')
 option: Flag('server?', autofill=True, default=False)
-option: Flag('all', autofill=True, cli_name='all', default=True, exclude='webui', flags=['no_output'])
-output: Output('result', <type 'dict'>, Gettext('Dictionary mapping variable name to value', domain='ipa', localedir=None))
-output: Output('total', <type 'int'>, Gettext('Total number of variables env (>= count)', domain='ipa', localedir=None))
-output: Output('count', <type 'int'>, Gettext('Number of variables returned (<= total)', domain='ipa', localedir=None))
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
+option: Flag('all', autofill=True, cli_name='all', default=True, exclude='webui')
+output: Output('result', <type 'dict'>, None)
+output: Output('total', <type 'int'>, None)
+output: Output('count', <type 'int'>, None)
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
 command: group_add
 args: 1,8,3
-arg: Str('cn', attribute=True, cli_name='group_name', label=Gettext('Group name', domain='ipa', localedir=None), maxlength=255, multivalue=False, normalizer=<lambda>, pattern='^[a-zA-Z0-9_.][a-zA-Z0-9_.-]{0,252}[a-zA-Z0-9_.$-]?$', pattern_errmsg='may only include letters, numbers, _, -, . and $', primary_key=True, required=True)
-option: Str('description', attribute=True, cli_name='desc', label=Gettext('Description', domain='ipa', localedir=None), multivalue=False, required=True)
-option: Int('gidnumber', attribute=True, cli_name='gid', label=Gettext('GID', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Str('addattr*', validate_add_attribute, cli_name='addattr', exclude='webui')
-option: Str('setattr*', validate_set_attribute, cli_name='setattr', exclude='webui')
+arg: Str('cn', attribute=True, cli_name='group_name', maxlength=255, multivalue=False, pattern='^[a-zA-Z0-9_.][a-zA-Z0-9_.-]{0,252}[a-zA-Z0-9_.$-]?$', pattern_errmsg='may only include letters, numbers, _, -, . and $', primary_key=True, required=True)
+option: Str('description', attribute=True, cli_name='desc', multivalue=False, required=True)
+option: Int('gidnumber', attribute=True, cli_name='gid', multivalue=False, required=False)
+option: Str('addattr*', cli_name='addattr', exclude='webui')
+option: Str('setattr*', cli_name='setattr', exclude='webui')
 option: Flag('nonposix', autofill=True, cli_name='nonposix', default=False)
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
 output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+output: Output('value', <type 'unicode'>, None)
 command: group_add_member
 args: 1,5,3
-arg: Str('cn', attribute=True, cli_name='group_name', label=Gettext('Group name', domain='ipa', localedir=None), maxlength=255, multivalue=False, normalizer=<lambda>, pattern='^[a-zA-Z0-9_.][a-zA-Z0-9_.-]{0,252}[a-zA-Z0-9_.$-]?$', pattern_errmsg='may only include letters, numbers, _, -, . and $', primary_key=True, query=True, required=True)
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-option: List('user?', alwaysask=True, cli_name='users', label=u'member user', multivalue=True)
-option: List('group?', alwaysask=True, cli_name='groups', label=u'member group', multivalue=True)
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('failed', <type 'dict'>, Gettext('Members that could not be added', domain='ipa', localedir=None))
-output: Output('completed', <type 'int'>, Gettext('Number of members added', domain='ipa', localedir=None))
+arg: Str('cn', attribute=True, cli_name='group_name', maxlength=255, multivalue=False, pattern='^[a-zA-Z0-9_.][a-zA-Z0-9_.-]{0,252}[a-zA-Z0-9_.$-]?$', pattern_errmsg='may only include letters, numbers, _, -, . and $', primary_key=True, query=True, required=True)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+option: List('user?', alwaysask=True, cli_name='users', multivalue=True)
+option: List('group?', alwaysask=True, cli_name='groups', multivalue=True)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('failed', <type 'dict'>, None)
+output: Output('completed', <type 'int'>, None)
 command: group_del
 args: 1,1,3
-arg: Str('cn', attribute=True, cli_name='group_name', label=Gettext('Group name', domain='ipa', localedir=None), maxlength=255, multivalue=True, normalizer=<lambda>, pattern='^[a-zA-Z0-9_.][a-zA-Z0-9_.-]{0,252}[a-zA-Z0-9_.$-]?$', pattern_errmsg='may only include letters, numbers, _, -, . and $', primary_key=True, query=True, required=True)
+arg: Str('cn', attribute=True, cli_name='group_name', maxlength=255, multivalue=True, pattern='^[a-zA-Z0-9_.][a-zA-Z0-9_.-]{0,252}[a-zA-Z0-9_.$-]?$', pattern_errmsg='may only include letters, numbers, _, -, . and $', primary_key=True, query=True, required=True)
 option: Flag('continue', autofill=True, cli_name='continue', default=False)
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Output('result', <type 'dict'>, 'list of deletions that failed')
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Output('result', <type 'dict'>, None)
+output: Output('value', <type 'unicode'>, None)
 command: group_detach
 args: 1,0,3
-arg: Str('cn', attribute=True, cli_name='group_name', label=Gettext('Group name', domain='ipa', localedir=None), maxlength=255, multivalue=False, normalizer=<lambda>, pattern='^[a-zA-Z0-9_.][a-zA-Z0-9_.-]{0,252}[a-zA-Z0-9_.$-]?$', pattern_errmsg='may only include letters, numbers, _, -, . and $', primary_key=True, query=True, required=True)
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Output('result', <type 'bool'>, 'True means the operation was successful')
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+arg: Str('cn', attribute=True, cli_name='group_name', maxlength=255, multivalue=False, pattern='^[a-zA-Z0-9_.][a-zA-Z0-9_.-]{0,252}[a-zA-Z0-9_.$-]?$', pattern_errmsg='may only include letters, numbers, _, -, . and $', primary_key=True, query=True, required=True)
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Output('result', <type 'bool'>, None)
+output: Output('value', <type 'unicode'>, None)
 command: group_find
 args: 1,24,4
 arg: Str('criteria?', noextrawhitespace=False)
-option: Str('cn', attribute=True, autofill=False, cli_name='group_name', label=Gettext('Group name', domain='ipa', localedir=None), maxlength=255, multivalue=False, normalizer=<lambda>, pattern='^[a-zA-Z0-9_.][a-zA-Z0-9_.-]{0,252}[a-zA-Z0-9_.$-]?$', pattern_errmsg='may only include letters, numbers, _, -, . and $', primary_key=True, query=True, required=False)
-option: Str('description', attribute=True, autofill=False, cli_name='desc', label=Gettext('Description', domain='ipa', localedir=None), multivalue=False, query=True, required=False)
-option: Int('gidnumber', attribute=True, autofill=False, cli_name='gid', label=Gettext('GID', domain='ipa', localedir=None), multivalue=False, query=True, required=False)
-option: Int('timelimit?', autofill=False, flags=['no_display'], label=Gettext('Time Limit', domain='ipa', localedir=None), minvalue=0)
-option: Int('sizelimit?', autofill=False, flags=['no_display'], label=Gettext('Size Limit', domain='ipa', localedir=None), minvalue=0)
+option: Str('cn', attribute=True, autofill=False, cli_name='group_name', maxlength=255, multivalue=False, pattern='^[a-zA-Z0-9_.][a-zA-Z0-9_.-]{0,252}[a-zA-Z0-9_.$-]?$', pattern_errmsg='may only include letters, numbers, _, -, . and $', primary_key=True, query=True, required=False)
+option: Str('description', attribute=True, autofill=False, cli_name='desc', multivalue=False, query=True, required=False)
+option: Int('gidnumber', attribute=True, autofill=False, cli_name='gid', multivalue=False, query=True, required=False)
+option: Int('timelimit?', autofill=False, minvalue=0)
+option: Int('sizelimit?', autofill=False, minvalue=0)
 option: Flag('private', autofill=True, cli_name='private', default=False)
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-option: Flag('pkey_only?', autofill=True, default=False', label=Gettext('Primary key only', domain='ipa', localedir=None))
-option: List('user?', cli_name='users', label=Gettext('user', domain='ipa', localedir=None), multivalue=True)
-option: List('no_user?', cli_name='no_users', label=Gettext('user', domain='ipa', localedir=None), multivalue=True)
-option: List('group?', cli_name='groups', label=Gettext('group', domain='ipa', localedir=None), multivalue=True)
-option: List('no_group?', cli_name='no_groups', label=Gettext('group', domain='ipa', localedir=None), multivalue=True)
-option: List('in_group?', cli_name='in_groups', label=Gettext('group', domain='ipa', localedir=None), multivalue=True)
-option: List('not_in_group?', cli_name='not_in_groups', label=Gettext('group', domain='ipa', localedir=None), multivalue=True)
-option: List('in_netgroup?', cli_name='in_netgroups', label=Gettext('netgroup', domain='ipa', localedir=None), multivalue=True)
-option: List('not_in_netgroup?', cli_name='not_in_netgroups', label=Gettext('netgroup', domain='ipa', localedir=None), multivalue=True)
-option: List('in_role?', cli_name='in_roles', label=Gettext('role', domain='ipa', localedir=None), multivalue=True)
-option: List('not_in_role?', cli_name='not_in_roles', label=Gettext('role', domain='ipa', localedir=None), multivalue=True)
-option: List('in_hbacrule?', cli_name='in_hbacrules', label=Gettext('HBAC rule', domain='ipa', localedir=None), multivalue=True)
-option: List('not_in_hbacrule?', cli_name='not_in_hbacrules', label=Gettext('HBAC rule', domain='ipa', localedir=None), multivalue=True)
-option: List('in_sudorule?', cli_name='in_sudorules', label=Gettext('sudo rule', domain='ipa', localedir=None), multivalue=True)
-option: List('not_in_sudorule?', cli_name='not_in_sudorules', label=Gettext('sudo rule', domain='ipa', localedir=None), multivalue=True)
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+option: Flag('pkey_only?', autofill=True, default=False)
+option: List('user?', cli_name='users', multivalue=True)
+option: List('no_user?', cli_name='no_users', multivalue=True)
+option: List('group?', cli_name='groups', multivalue=True)
+option: List('no_group?', cli_name='no_groups', multivalue=True)
+option: List('in_group?', cli_name='in_groups', multivalue=True)
+option: List('not_in_group?', cli_name='not_in_groups', multivalue=True)
+option: List('in_netgroup?', cli_name='in_netgroups', multivalue=True)
+option: List('not_in_netgroup?', cli_name='not_in_netgroups', multivalue=True)
+option: List('in_role?', cli_name='in_roles', multivalue=True)
+option: List('not_in_role?', cli_name='not_in_roles', multivalue=True)
+option: List('in_hbacrule?', cli_name='in_hbacrules', multivalue=True)
+option: List('not_in_hbacrule?', cli_name='not_in_hbacrules', multivalue=True)
+option: List('in_sudorule?', cli_name='in_sudorules', multivalue=True)
+option: List('not_in_sudorule?', cli_name='not_in_sudorules', multivalue=True)
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
 output: ListOfEntries('result', (<type 'list'>, <type 'tuple'>), Gettext('A list of LDAP entries', domain='ipa', localedir=None))
-output: Output('count', <type 'int'>, 'Number of entries returned')
-output: Output('truncated', <type 'bool'>, 'True if not all results were returned')
+output: Output('count', <type 'int'>, None)
+output: Output('truncated', <type 'bool'>, None)
 command: group_mod
 args: 1,10,3
-arg: Str('cn', attribute=True, cli_name='group_name', label=Gettext('Group name', domain='ipa', localedir=None), maxlength=255, multivalue=False, normalizer=<lambda>, pattern='^[a-zA-Z0-9_.][a-zA-Z0-9_.-]{0,252}[a-zA-Z0-9_.$-]?$', pattern_errmsg='may only include letters, numbers, _, -, . and $', primary_key=True, query=True, required=True)
-option: Str('description', attribute=True, autofill=False, cli_name='desc', label=Gettext('Description', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Int('gidnumber', attribute=True, autofill=False, cli_name='gid', label=Gettext('GID', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Str('addattr*', validate_add_attribute, cli_name='addattr', exclude='webui')
-option: Str('setattr*', validate_set_attribute, cli_name='setattr', exclude='webui')
-option: Flag('rights', autofill=True, default=False, label=Gettext('Rights', domain='ipa', localedir=None))
+arg: Str('cn', attribute=True, cli_name='group_name', maxlength=255, multivalue=False, pattern='^[a-zA-Z0-9_.][a-zA-Z0-9_.-]{0,252}[a-zA-Z0-9_.$-]?$', pattern_errmsg='may only include letters, numbers, _, -, . and $', primary_key=True, query=True, required=True)
+option: Str('description', attribute=True, autofill=False, cli_name='desc', multivalue=False, required=False)
+option: Int('gidnumber', attribute=True, autofill=False, cli_name='gid', multivalue=False, required=False)
+option: Str('addattr*', cli_name='addattr', exclude='webui')
+option: Str('setattr*', cli_name='setattr', exclude='webui')
+option: Flag('rights', autofill=True, default=False)
 option: Flag('posix', autofill=True, cli_name='posix', default=False)
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-option: Str('rename', cli_name='rename', label=Gettext('Rename', domain='ipa', localedir=None), maxlength=255, multivalue=False, normalizer=<lambda>, pattern='^[a-zA-Z0-9_.][a-zA-Z0-9_.-]{0,252}[a-zA-Z0-9_.$-]?$', pattern_errmsg='may only include letters, numbers, _, -, . and $', primary_key=True, required=False)
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+option: Str('rename', cli_name='rename', maxlength=255, multivalue=False, pattern='^[a-zA-Z0-9_.][a-zA-Z0-9_.-]{0,252}[a-zA-Z0-9_.$-]?$', pattern_errmsg='may only include letters, numbers, _, -, . and $', primary_key=True, required=False)
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
 output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+output: Output('value', <type 'unicode'>, None)
 command: group_remove_member
 args: 1,5,3
-arg: Str('cn', attribute=True, cli_name='group_name', label=Gettext('Group name', domain='ipa', localedir=None), maxlength=255, multivalue=False, normalizer=<lambda>, pattern='^[a-zA-Z0-9_.][a-zA-Z0-9_.-]{0,252}[a-zA-Z0-9_.$-]?$', pattern_errmsg='may only include letters, numbers, _, -, . and $', primary_key=True, query=True, required=True)
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-option: List('user?', alwaysask=True, cli_name='users', label=u'member user', multivalue=True)
-option: List('group?', alwaysask=True, cli_name='groups', label=u'member group', multivalue=True)
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('failed', <type 'dict'>, Gettext('Members that could not be removed', domain='ipa', localedir=None))
-output: Output('completed', <type 'int'>, Gettext('Number of members removed', domain='ipa', localedir=None))
+arg: Str('cn', attribute=True, cli_name='group_name', maxlength=255, multivalue=False, pattern='^[a-zA-Z0-9_.][a-zA-Z0-9_.-]{0,252}[a-zA-Z0-9_.$-]?$', pattern_errmsg='may only include letters, numbers, _, -, . and $', primary_key=True, query=True, required=True)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+option: List('user?', alwaysask=True, cli_name='users', multivalue=True)
+option: List('group?', alwaysask=True, cli_name='groups', multivalue=True)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('failed', <type 'dict'>, None)
+output: Output('completed', <type 'int'>, None)
 command: group_show
 args: 1,4,3
-arg: Str('cn', attribute=True, cli_name='group_name', label=Gettext('Group name', domain='ipa', localedir=None), maxlength=255, multivalue=False, normalizer=<lambda>, pattern='^[a-zA-Z0-9_.][a-zA-Z0-9_.-]{0,252}[a-zA-Z0-9_.$-]?$', pattern_errmsg='may only include letters, numbers, _, -, . and $', primary_key=True, query=True, required=True)
-option: Flag('rights', autofill=True, default=False, label=Gettext('Rights', domain='ipa', localedir=None))
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+arg: Str('cn', attribute=True, cli_name='group_name', maxlength=255, multivalue=False, pattern='^[a-zA-Z0-9_.][a-zA-Z0-9_.-]{0,252}[a-zA-Z0-9_.$-]?$', pattern_errmsg='may only include letters, numbers, _, -, . and $', primary_key=True, query=True, required=True)
+option: Flag('rights', autofill=True, default=False)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('value', <type 'unicode'>, None)
 command: hbacrule_add
 args: 1,11,3
-arg: Str('cn', attribute=True, cli_name='name', label=Gettext('Rule name', domain='ipa', localedir=None), multivalue=False, primary_key=True, required=True)
-option: StrEnum('accessruletype', validate_type, attribute=True, autofill=True, cli_name='type', default=u'allow', exclude='webui', flags=['no_option', 'no_output'], label=Gettext('Rule type', domain='ipa', localedir=None), multivalue=False, required=True, values=(u'allow', u'deny'))
-option: StrEnum('usercategory', attribute=True, cli_name='usercat', label=Gettext('User category', domain='ipa', localedir=None), multivalue=False, required=False, values=(u'all',))
-option: StrEnum('hostcategory', attribute=True, cli_name='hostcat', label=Gettext('Host category', domain='ipa', localedir=None), multivalue=False, required=False, values=(u'all',))
-option: StrEnum('sourcehostcategory', attribute=True, cli_name='srchostcat', label=Gettext('Source host category', domain='ipa', localedir=None), multivalue=False, required=False, values=(u'all',))
-option: StrEnum('servicecategory', attribute=True, cli_name='servicecat', label=Gettext('Service category', domain='ipa', localedir=None), multivalue=False, required=False, values=(u'all',))
-option: Str('description', attribute=True, cli_name='desc', label=Gettext('Description', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Str('addattr*', validate_add_attribute, cli_name='addattr', exclude='webui')
-option: Str('setattr*', validate_set_attribute, cli_name='setattr', exclude='webui')
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+arg: Str('cn', attribute=True, cli_name='name', multivalue=False, primary_key=True, required=True)
+option: StrEnum('accessruletype', attribute=True, autofill=True, cli_name='type', default=u'allow', exclude='webui', multivalue=False, required=True, values=(u'allow', u'deny'))
+option: StrEnum('usercategory', attribute=True, cli_name='usercat', multivalue=False, required=False, values=(u'all',))
+option: StrEnum('hostcategory', attribute=True, cli_name='hostcat', multivalue=False, required=False, values=(u'all',))
+option: StrEnum('sourcehostcategory', attribute=True, cli_name='srchostcat', multivalue=False, required=False, values=(u'all',))
+option: StrEnum('servicecategory', attribute=True, cli_name='servicecat', multivalue=False, required=False, values=(u'all',))
+option: Str('description', attribute=True, cli_name='desc', multivalue=False, required=False)
+option: Str('addattr*', cli_name='addattr', exclude='webui')
+option: Str('setattr*', cli_name='setattr', exclude='webui')
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('value', <type 'unicode'>, None)
 command: hbacrule_add_host
 args: 1,5,3
-arg: Str('cn', attribute=True, cli_name='name', label=Gettext('Rule name', domain='ipa', localedir=None), multivalue=False, primary_key=True, query=True, required=True)
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-option: List('host?', alwaysask=True, cli_name='hosts', label=u'member host', multivalue=True)
-option: List('hostgroup?', alwaysask=True, cli_name='hostgroups', label=u'member host group', multivalue=True)
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('failed', <type 'dict'>, Gettext('Members that could not be added', domain='ipa', localedir=None))
-output: Output('completed', <type 'int'>, Gettext('Number of members added', domain='ipa', localedir=None))
+arg: Str('cn', attribute=True, cli_name='name', multivalue=False, primary_key=True, query=True, required=True)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+option: List('host?', alwaysask=True, cli_name='hosts', multivalue=True)
+option: List('hostgroup?', alwaysask=True, cli_name='hostgroups', multivalue=True)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('failed', <type 'dict'>, None)
+output: Output('completed', <type 'int'>, None)
 command: hbacrule_add_service
 args: 1,5,3
-arg: Str('cn', attribute=True, cli_name='name', label=Gettext('Rule name', domain='ipa', localedir=None), multivalue=False, primary_key=True, query=True, required=True)
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-option: List('hbacsvc?', alwaysask=True, cli_name='hbacsvcs', label=u'member HBAC service', multivalue=True)
-option: List('hbacsvcgroup?', alwaysask=True, cli_name='hbacsvcgroups', label=u'member HBAC service group', multivalue=True)
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('failed', <type 'dict'>, Gettext('Members that could not be added', domain='ipa', localedir=None))
-output: Output('completed', <type 'int'>, Gettext('Number of members added', domain='ipa', localedir=None))
+arg: Str('cn', attribute=True, cli_name='name', multivalue=False, primary_key=True, query=True, required=True)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+option: List('hbacsvc?', alwaysask=True, cli_name='hbacsvcs', multivalue=True)
+option: List('hbacsvcgroup?', alwaysask=True, cli_name='hbacsvcgroups', multivalue=True)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('failed', <type 'dict'>, None)
+output: Output('completed', <type 'int'>, None)
 command: hbacrule_add_sourcehost
 args: 1,5,3
-arg: Str('cn', attribute=True, cli_name='name', label=Gettext('Rule name', domain='ipa', localedir=None), multivalue=False, primary_key=True, query=True, required=True)
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-option: List('host?', alwaysask=True, cli_name='hosts', label=u'member host', multivalue=True)
-option: List('hostgroup?', alwaysask=True, cli_name='hostgroups', label=u'member host group', multivalue=True)
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('failed', <type 'dict'>, Gettext('Members that could not be added', domain='ipa', localedir=None))
-output: Output('completed', <type 'int'>, Gettext('Number of members added', domain='ipa', localedir=None))
+arg: Str('cn', attribute=True, cli_name='name', multivalue=False, primary_key=True, query=True, required=True)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+option: List('host?', alwaysask=True, cli_name='hosts', multivalue=True)
+option: List('hostgroup?', alwaysask=True, cli_name='hostgroups', multivalue=True)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('failed', <type 'dict'>, None)
+output: Output('completed', <type 'int'>, None)
 command: hbacrule_add_user
 args: 1,5,3
-arg: Str('cn', attribute=True, cli_name='name', label=Gettext('Rule name', domain='ipa', localedir=None), multivalue=False, primary_key=True, query=True, required=True)
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-option: List('user?', alwaysask=True, cli_name='users', label=u'member user', multivalue=True)
-option: List('group?', alwaysask=True, cli_name='groups', label=u'member group', multivalue=True)
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('failed', <type 'dict'>, Gettext('Members that could not be added', domain='ipa', localedir=None))
-output: Output('completed', <type 'int'>, Gettext('Number of members added', domain='ipa', localedir=None))
+arg: Str('cn', attribute=True, cli_name='name', multivalue=False, primary_key=True, query=True, required=True)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+option: List('user?', alwaysask=True, cli_name='users', multivalue=True)
+option: List('group?', alwaysask=True, cli_name='groups', multivalue=True)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('failed', <type 'dict'>, None)
+output: Output('completed', <type 'int'>, None)
 command: hbacrule_del
 args: 1,1,3
-arg: Str('cn', attribute=True, cli_name='name', label=Gettext('Rule name', domain='ipa', localedir=None), multivalue=True, primary_key=True, query=True, required=True)
+arg: Str('cn', attribute=True, cli_name='name', multivalue=True, primary_key=True, query=True, required=True)
 option: Flag('continue', autofill=True, cli_name='continue', default=False)
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Output('result', <type 'dict'>, 'list of deletions that failed')
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Output('result', <type 'dict'>, None)
+output: Output('value', <type 'unicode'>, None)
 command: hbacrule_disable
 args: 1,0,3
-arg: Str('cn', attribute=True, cli_name='name', label=Gettext('Rule name', domain='ipa', localedir=None), multivalue=False, primary_key=True, query=True, required=True)
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Output('result', <type 'bool'>, 'True means the operation was successful')
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+arg: Str('cn', attribute=True, cli_name='name', multivalue=False, primary_key=True, query=True, required=True)
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Output('result', <type 'bool'>, None)
+output: Output('value', <type 'unicode'>, None)
 command: hbacrule_enable
 args: 1,0,3
-arg: Str('cn', attribute=True, cli_name='name', label=Gettext('Rule name', domain='ipa', localedir=None), multivalue=False, primary_key=True, query=True, required=True)
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Output('result', <type 'bool'>, 'True means the operation was successful')
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+arg: Str('cn', attribute=True, cli_name='name', multivalue=False, primary_key=True, query=True, required=True)
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Output('result', <type 'bool'>, None)
+output: Output('value', <type 'unicode'>, None)
 command: hbacrule_find
 args: 1,13,4
 arg: Str('criteria?', noextrawhitespace=False)
-option: Str('cn', attribute=True, autofill=False, cli_name='name', label=Gettext('Rule name', domain='ipa', localedir=None), multivalue=False, primary_key=True, query=True, required=False)
-option: StrEnum('accessruletype', validate_type, attribute=True, autofill=False, cli_name='type', default=u'allow', exclude='webui', flags=['no_option', 'no_output'], label=Gettext('Rule type', domain='ipa', localedir=None), multivalue=False, query=True, required=False, values=(u'allow', u'deny'))
-option: StrEnum('usercategory', attribute=True, autofill=False, cli_name='usercat', label=Gettext('User category', domain='ipa', localedir=None), multivalue=False, query=True, required=False, values=(u'all',))
-option: StrEnum('hostcategory', attribute=True, autofill=False, cli_name='hostcat', label=Gettext('Host category', domain='ipa', localedir=None), multivalue=False, query=True, required=False, values=(u'all',))
-option: StrEnum('sourcehostcategory', attribute=True, autofill=False, cli_name='srchostcat', label=Gettext('Source host category', domain='ipa', localedir=None), multivalue=False, query=True, required=False, values=(u'all',))
-option: StrEnum('servicecategory', attribute=True, autofill=False, cli_name='servicecat', label=Gettext('Service category', domain='ipa', localedir=None), multivalue=False, query=True, required=False, values=(u'all',))
-option: Str('description', attribute=True, autofill=False, cli_name='desc', label=Gettext('Description', domain='ipa', localedir=None), multivalue=False, query=True, required=False)
-option: Int('timelimit?', autofill=False, flags=['no_display'], label=Gettext('Time Limit', domain='ipa', localedir=None), minvalue=0)
-option: Int('sizelimit?', autofill=False, flags=['no_display'], label=Gettext('Size Limit', domain='ipa', localedir=None), minvalue=0)
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-option: Flag('pkey_only?', autofill=True, default=False', label=Gettext('Primary key only', domain='ipa', localedir=None))
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
+option: Str('cn', attribute=True, autofill=False, cli_name='name', multivalue=False, primary_key=True, query=True, required=False)
+option: StrEnum('accessruletype', attribute=True, autofill=False, cli_name='type', default=u'allow', exclude='webui', multivalue=False, query=True, required=False, values=(u'allow', u'deny'))
+option: StrEnum('usercategory', attribute=True, autofill=False, cli_name='usercat', multivalue=False, query=True, required=False, values=(u'all',))
+option: StrEnum('hostcategory', attribute=True, autofill=False, cli_name='hostcat', multivalue=False, query=True, required=False, values=(u'all',))
+option: StrEnum('sourcehostcategory', attribute=True, autofill=False, cli_name='srchostcat', multivalue=False, query=True, required=False, values=(u'all',))
+option: StrEnum('servicecategory', attribute=True, autofill=False, cli_name='servicecat', multivalue=False, query=True, required=False, values=(u'all',))
+option: Str('description', attribute=True, autofill=False, cli_name='desc', multivalue=False, query=True, required=False)
+option: Int('timelimit?', autofill=False, minvalue=0)
+option: Int('sizelimit?', autofill=False, minvalue=0)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+option: Flag('pkey_only?', autofill=True, default=False)
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
 output: ListOfEntries('result', (<type 'list'>, <type 'tuple'>), Gettext('A list of LDAP entries', domain='ipa', localedir=None))
-output: Output('count', <type 'int'>, 'Number of entries returned')
-output: Output('truncated', <type 'bool'>, 'True if not all results were returned')
+output: Output('count', <type 'int'>, None)
+output: Output('truncated', <type 'bool'>, None)
 command: hbacrule_mod
 args: 1,12,3
-arg: Str('cn', attribute=True, cli_name='name', label=Gettext('Rule name', domain='ipa', localedir=None), multivalue=False, primary_key=True, query=True, required=True)
-option: StrEnum('accessruletype', validate_type, attribute=True, autofill=False, cli_name='type', default=u'allow', exclude='webui', flags=['no_option', 'no_output'], label=Gettext('Rule type', domain='ipa', localedir=None), multivalue=False, required=False, values=(u'allow', u'deny'))
-option: StrEnum('usercategory', attribute=True, autofill=False, cli_name='usercat', label=Gettext('User category', domain='ipa', localedir=None), multivalue=False, required=False, values=(u'all',))
-option: StrEnum('hostcategory', attribute=True, autofill=False, cli_name='hostcat', label=Gettext('Host category', domain='ipa', localedir=None), multivalue=False, required=False, values=(u'all',))
-option: StrEnum('sourcehostcategory', attribute=True, autofill=False, cli_name='srchostcat', label=Gettext('Source host category', domain='ipa', localedir=None), multivalue=False, required=False, values=(u'all',))
-option: StrEnum('servicecategory', attribute=True, autofill=False, cli_name='servicecat', label=Gettext('Service category', domain='ipa', localedir=None), multivalue=False, required=False, values=(u'all',))
-option: Str('description', attribute=True, autofill=False, cli_name='desc', label=Gettext('Description', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Str('addattr*', validate_add_attribute, cli_name='addattr', exclude='webui')
-option: Str('setattr*', validate_set_attribute, cli_name='setattr', exclude='webui')
-option: Flag('rights', autofill=True, default=False, label=Gettext('Rights', domain='ipa', localedir=None))
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+arg: Str('cn', attribute=True, cli_name='name', multivalue=False, primary_key=True, query=True, required=True)
+option: StrEnum('accessruletype', attribute=True, autofill=False, cli_name='type', default=u'allow', exclude='webui', multivalue=False, required=False, values=(u'allow', u'deny'))
+option: StrEnum('usercategory', attribute=True, autofill=False, cli_name='usercat', multivalue=False, required=False, values=(u'all',))
+option: StrEnum('hostcategory', attribute=True, autofill=False, cli_name='hostcat', multivalue=False, required=False, values=(u'all',))
+option: StrEnum('sourcehostcategory', attribute=True, autofill=False, cli_name='srchostcat', multivalue=False, required=False, values=(u'all',))
+option: StrEnum('servicecategory', attribute=True, autofill=False, cli_name='servicecat', multivalue=False, required=False, values=(u'all',))
+option: Str('description', attribute=True, autofill=False, cli_name='desc', multivalue=False, required=False)
+option: Str('addattr*', cli_name='addattr', exclude='webui')
+option: Str('setattr*', cli_name='setattr', exclude='webui')
+option: Flag('rights', autofill=True, default=False)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('value', <type 'unicode'>, None)
 command: hbacrule_remove_host
 args: 1,5,3
-arg: Str('cn', attribute=True, cli_name='name', label=Gettext('Rule name', domain='ipa', localedir=None), multivalue=False, primary_key=True, query=True, required=True)
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-option: List('host?', alwaysask=True, cli_name='hosts', label=u'member host', multivalue=True)
-option: List('hostgroup?', alwaysask=True, cli_name='hostgroups', label=u'member host group', multivalue=True)
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('failed', <type 'dict'>, Gettext('Members that could not be removed', domain='ipa', localedir=None))
-output: Output('completed', <type 'int'>, Gettext('Number of members removed', domain='ipa', localedir=None))
+arg: Str('cn', attribute=True, cli_name='name', multivalue=False, primary_key=True, query=True, required=True)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+option: List('host?', alwaysask=True, cli_name='hosts', multivalue=True)
+option: List('hostgroup?', alwaysask=True, cli_name='hostgroups', multivalue=True)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('failed', <type 'dict'>, None)
+output: Output('completed', <type 'int'>, None)
 command: hbacrule_remove_service
 args: 1,5,3
-arg: Str('cn', attribute=True, cli_name='name', label=Gettext('Rule name', domain='ipa', localedir=None), multivalue=False, primary_key=True, query=True, required=True)
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-option: List('hbacsvc?', alwaysask=True, cli_name='hbacsvcs', label=u'member HBAC service', multivalue=True)
-option: List('hbacsvcgroup?', alwaysask=True, cli_name='hbacsvcgroups', label=u'member HBAC service group', multivalue=True)
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('failed', <type 'dict'>, Gettext('Members that could not be removed', domain='ipa', localedir=None))
-output: Output('completed', <type 'int'>, Gettext('Number of members removed', domain='ipa', localedir=None))
+arg: Str('cn', attribute=True, cli_name='name', multivalue=False, primary_key=True, query=True, required=True)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+option: List('hbacsvc?', alwaysask=True, cli_name='hbacsvcs', multivalue=True)
+option: List('hbacsvcgroup?', alwaysask=True, cli_name='hbacsvcgroups', multivalue=True)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('failed', <type 'dict'>, None)
+output: Output('completed', <type 'int'>, None)
 command: hbacrule_remove_sourcehost
 args: 1,5,3
-arg: Str('cn', attribute=True, cli_name='name', label=Gettext('Rule name', domain='ipa', localedir=None), multivalue=False, primary_key=True, query=True, required=True)
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-option: List('host?', alwaysask=True, cli_name='hosts', label=u'member host', multivalue=True)
-option: List('hostgroup?', alwaysask=True, cli_name='hostgroups', label=u'member host group', multivalue=True)
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('failed', <type 'dict'>, Gettext('Members that could not be removed', domain='ipa', localedir=None))
-output: Output('completed', <type 'int'>, Gettext('Number of members removed', domain='ipa', localedir=None))
+arg: Str('cn', attribute=True, cli_name='name', multivalue=False, primary_key=True, query=True, required=True)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+option: List('host?', alwaysask=True, cli_name='hosts', multivalue=True)
+option: List('hostgroup?', alwaysask=True, cli_name='hostgroups', multivalue=True)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('failed', <type 'dict'>, None)
+output: Output('completed', <type 'int'>, None)
 command: hbacrule_remove_user
 args: 1,5,3
-arg: Str('cn', attribute=True, cli_name='name', label=Gettext('Rule name', domain='ipa', localedir=None), multivalue=False, primary_key=True, query=True, required=True)
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-option: List('user?', alwaysask=True, cli_name='users', label=u'member user', multivalue=True)
-option: List('group?', alwaysask=True, cli_name='groups', label=u'member group', multivalue=True)
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('failed', <type 'dict'>, Gettext('Members that could not be removed', domain='ipa', localedir=None))
-output: Output('completed', <type 'int'>, Gettext('Number of members removed', domain='ipa', localedir=None))
+arg: Str('cn', attribute=True, cli_name='name', multivalue=False, primary_key=True, query=True, required=True)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+option: List('user?', alwaysask=True, cli_name='users', multivalue=True)
+option: List('group?', alwaysask=True, cli_name='groups', multivalue=True)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('failed', <type 'dict'>, None)
+output: Output('completed', <type 'int'>, None)
 command: hbacrule_show
 args: 1,4,3
-arg: Str('cn', attribute=True, cli_name='name', label=Gettext('Rule name', domain='ipa', localedir=None), multivalue=False, primary_key=True, query=True, required=True)
-option: Flag('rights', autofill=True, default=False, label=Gettext('Rights', domain='ipa', localedir=None))
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+arg: Str('cn', attribute=True, cli_name='name', multivalue=False, primary_key=True, query=True, required=True)
+option: Flag('rights', autofill=True, default=False)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('value', <type 'unicode'>, None)
 command: hbacsvc_add
 args: 1,6,3
-arg: Str('cn', attribute=True, cli_name='service', label=Gettext('Service name', domain='ipa', localedir=None), multivalue=False, normalizer=<lambda>, primary_key=True, required=True)
-option: Str('description', attribute=True, cli_name='desc', label=Gettext('Description', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Str('addattr*', validate_add_attribute, cli_name='addattr', exclude='webui')
-option: Str('setattr*', validate_set_attribute, cli_name='setattr', exclude='webui')
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+arg: Str('cn', attribute=True, cli_name='service', multivalue=False, primary_key=True, required=True)
+option: Str('description', attribute=True, cli_name='desc', multivalue=False, required=False)
+option: Str('addattr*', cli_name='addattr', exclude='webui')
+option: Str('setattr*', cli_name='setattr', exclude='webui')
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('value', <type 'unicode'>, None)
 command: hbacsvc_del
 args: 1,1,3
-arg: Str('cn', attribute=True, cli_name='service', label=Gettext('Service name', domain='ipa', localedir=None), multivalue=True, normalizer=<lambda>, primary_key=True, query=True, required=True)
+arg: Str('cn', attribute=True, cli_name='service', multivalue=True, primary_key=True, query=True, required=True)
 option: Flag('continue', autofill=True, cli_name='continue', default=False)
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Output('result', <type 'dict'>, 'list of deletions that failed')
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Output('result', <type 'dict'>, None)
+output: Output('value', <type 'unicode'>, None)
 command: hbacsvc_find
 args: 1,8,4
 arg: Str('criteria?', noextrawhitespace=False)
-option: Str('cn', attribute=True, autofill=False, cli_name='service', label=Gettext('Service name', domain='ipa', localedir=None), multivalue=False, normalizer=<lambda>, primary_key=True, query=True, required=False)
-option: Str('description', attribute=True, autofill=False, cli_name='desc', label=Gettext('Description', domain='ipa', localedir=None), multivalue=False, query=True, required=False)
-option: Int('timelimit?', autofill=False, flags=['no_display'], label=Gettext('Time Limit', domain='ipa', localedir=None), minvalue=0)
-option: Int('sizelimit?', autofill=False, flags=['no_display'], label=Gettext('Size Limit', domain='ipa', localedir=None), minvalue=0)
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-option: Flag('pkey_only?', autofill=True, default=False', label=Gettext('Primary key only', domain='ipa', localedir=None))
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
+option: Str('cn', attribute=True, autofill=False, cli_name='service', multivalue=False, primary_key=True, query=True, required=False)
+option: Str('description', attribute=True, autofill=False, cli_name='desc', multivalue=False, query=True, required=False)
+option: Int('timelimit?', autofill=False, minvalue=0)
+option: Int('sizelimit?', autofill=False, minvalue=0)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+option: Flag('pkey_only?', autofill=True, default=False)
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
 output: ListOfEntries('result', (<type 'list'>, <type 'tuple'>), Gettext('A list of LDAP entries', domain='ipa', localedir=None))
-output: Output('count', <type 'int'>, 'Number of entries returned')
-output: Output('truncated', <type 'bool'>, 'True if not all results were returned')
+output: Output('count', <type 'int'>, None)
+output: Output('truncated', <type 'bool'>, None)
 command: hbacsvc_mod
 args: 1,7,3
-arg: Str('cn', attribute=True, cli_name='service', label=Gettext('Service name', domain='ipa', localedir=None), multivalue=False, normalizer=<lambda>, primary_key=True, query=True, required=True)
-option: Str('description', attribute=True, autofill=False, cli_name='desc', label=Gettext('Description', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Str('addattr*', validate_add_attribute, cli_name='addattr', exclude='webui')
-option: Str('setattr*', validate_set_attribute, cli_name='setattr', exclude='webui')
-option: Flag('rights', autofill=True, default=False, label=Gettext('Rights', domain='ipa', localedir=None))
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+arg: Str('cn', attribute=True, cli_name='service', multivalue=False, primary_key=True, query=True, required=True)
+option: Str('description', attribute=True, autofill=False, cli_name='desc', multivalue=False, required=False)
+option: Str('addattr*', cli_name='addattr', exclude='webui')
+option: Str('setattr*', cli_name='setattr', exclude='webui')
+option: Flag('rights', autofill=True, default=False)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('value', <type 'unicode'>, None)
 command: hbacsvc_show
 args: 1,4,3
-arg: Str('cn', attribute=True, cli_name='service', label=Gettext('Service name', domain='ipa', localedir=None), multivalue=False, normalizer=<lambda>, primary_key=True, query=True, required=True)
-option: Flag('rights', autofill=True, default=False, label=Gettext('Rights', domain='ipa', localedir=None))
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+arg: Str('cn', attribute=True, cli_name='service', multivalue=False, primary_key=True, query=True, required=True)
+option: Flag('rights', autofill=True, default=False)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('value', <type 'unicode'>, None)
 command: hbacsvcgroup_add
 args: 1,6,3
-arg: Str('cn', attribute=True, cli_name='name', label=Gettext('Service group name', domain='ipa', localedir=None), multivalue=False, normalizer=<lambda>, primary_key=True, required=True)
-option: Str('description', attribute=True, cli_name='desc', label=Gettext('Description', domain='ipa', localedir=None), multivalue=False, required=True)
-option: Str('addattr*', validate_add_attribute, cli_name='addattr', exclude='webui')
-option: Str('setattr*', validate_set_attribute, cli_name='setattr', exclude='webui')
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+arg: Str('cn', attribute=True, cli_name='name', multivalue=False, primary_key=True, required=True)
+option: Str('description', attribute=True, cli_name='desc', multivalue=False, required=True)
+option: Str('addattr*', cli_name='addattr', exclude='webui')
+option: Str('setattr*', cli_name='setattr', exclude='webui')
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('value', <type 'unicode'>, None)
 command: hbacsvcgroup_add_member
 args: 1,4,3
-arg: Str('cn', attribute=True, cli_name='name', label=Gettext('Service group name', domain='ipa', localedir=None), multivalue=False, normalizer=<lambda>, primary_key=True, query=True, required=True)
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-option: List('hbacsvc?', alwaysask=True, cli_name='hbacsvcs', label=u'member HBAC service', multivalue=True)
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('failed', <type 'dict'>, Gettext('Members that could not be added', domain='ipa', localedir=None))
-output: Output('completed', <type 'int'>, Gettext('Number of members added', domain='ipa', localedir=None))
+arg: Str('cn', attribute=True, cli_name='name', multivalue=False, primary_key=True, query=True, required=True)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+option: List('hbacsvc?', alwaysask=True, cli_name='hbacsvcs', multivalue=True)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('failed', <type 'dict'>, None)
+output: Output('completed', <type 'int'>, None)
 command: hbacsvcgroup_del
 args: 1,1,3
-arg: Str('cn', attribute=True, cli_name='name', label=Gettext('Service group name', domain='ipa', localedir=None), multivalue=True, normalizer=<lambda>, primary_key=True, query=True, required=True)
+arg: Str('cn', attribute=True, cli_name='name', multivalue=True, primary_key=True, query=True, required=True)
 option: Flag('continue', autofill=True, cli_name='continue', default=False)
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Output('result', <type 'dict'>, 'list of deletions that failed')
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Output('result', <type 'dict'>, None)
+output: Output('value', <type 'unicode'>, None)
 command: hbacsvcgroup_find
 args: 1,8,4
 arg: Str('criteria?', noextrawhitespace=False)
-option: Str('cn', attribute=True, autofill=False, cli_name='name', label=Gettext('Service group name', domain='ipa', localedir=None), multivalue=False, normalizer=<lambda>, primary_key=True, query=True, required=False)
-option: Str('description', attribute=True, autofill=False, cli_name='desc', label=Gettext('Description', domain='ipa', localedir=None), multivalue=False, query=True, required=False)
-option: Int('timelimit?', autofill=False, flags=['no_display'], label=Gettext('Time Limit', domain='ipa', localedir=None), minvalue=0)
-option: Int('sizelimit?', autofill=False, flags=['no_display'], label=Gettext('Size Limit', domain='ipa', localedir=None), minvalue=0)
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-option: Flag('pkey_only?', autofill=True, default=False', label=Gettext('Primary key only', domain='ipa', localedir=None))
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
+option: Str('cn', attribute=True, autofill=False, cli_name='name', multivalue=False, primary_key=True, query=True, required=False)
+option: Str('description', attribute=True, autofill=False, cli_name='desc', multivalue=False, query=True, required=False)
+option: Int('timelimit?', autofill=False, minvalue=0)
+option: Int('sizelimit?', autofill=False, minvalue=0)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+option: Flag('pkey_only?', autofill=True, default=False)
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
 output: ListOfEntries('result', (<type 'list'>, <type 'tuple'>), Gettext('A list of LDAP entries', domain='ipa', localedir=None))
-output: Output('count', <type 'int'>, 'Number of entries returned')
-output: Output('truncated', <type 'bool'>, 'True if not all results were returned')
+output: Output('count', <type 'int'>, None)
+output: Output('truncated', <type 'bool'>, None)
 command: hbacsvcgroup_mod
 args: 1,7,3
-arg: Str('cn', attribute=True, cli_name='name', label=Gettext('Service group name', domain='ipa', localedir=None), multivalue=False, normalizer=<lambda>, primary_key=True, query=True, required=True)
-option: Str('description', attribute=True, autofill=False, cli_name='desc', label=Gettext('Description', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Str('addattr*', validate_add_attribute, cli_name='addattr', exclude='webui')
-option: Str('setattr*', validate_set_attribute, cli_name='setattr', exclude='webui')
-option: Flag('rights', autofill=True, default=False, label=Gettext('Rights', domain='ipa', localedir=None))
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+arg: Str('cn', attribute=True, cli_name='name', multivalue=False, primary_key=True, query=True, required=True)
+option: Str('description', attribute=True, autofill=False, cli_name='desc', multivalue=False, required=False)
+option: Str('addattr*', cli_name='addattr', exclude='webui')
+option: Str('setattr*', cli_name='setattr', exclude='webui')
+option: Flag('rights', autofill=True, default=False)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('value', <type 'unicode'>, None)
 command: hbacsvcgroup_remove_member
 args: 1,4,3
-arg: Str('cn', attribute=True, cli_name='name', label=Gettext('Service group name', domain='ipa', localedir=None), multivalue=False, normalizer=<lambda>, primary_key=True, query=True, required=True)
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-option: List('hbacsvc?', alwaysask=True, cli_name='hbacsvcs', label=u'member HBAC service', multivalue=True)
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('failed', <type 'dict'>, Gettext('Members that could not be removed', domain='ipa', localedir=None))
-output: Output('completed', <type 'int'>, Gettext('Number of members removed', domain='ipa', localedir=None))
+arg: Str('cn', attribute=True, cli_name='name', multivalue=False, primary_key=True, query=True, required=True)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+option: List('hbacsvc?', alwaysask=True, cli_name='hbacsvcs', multivalue=True)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('failed', <type 'dict'>, None)
+output: Output('completed', <type 'int'>, None)
 command: hbacsvcgroup_show
 args: 1,4,3
-arg: Str('cn', attribute=True, cli_name='name', label=Gettext('Service group name', domain='ipa', localedir=None), multivalue=False, normalizer=<lambda>, primary_key=True, query=True, required=True)
-option: Flag('rights', autofill=True, default=False, label=Gettext('Rights', domain='ipa', localedir=None))
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+arg: Str('cn', attribute=True, cli_name='name', multivalue=False, primary_key=True, query=True, required=True)
+option: Flag('rights', autofill=True, default=False)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('value', <type 'unicode'>, None)
 command: hbactest
 args: 0,8,5
-option: Str('user', cli_name='user', label=Gettext('User name', domain='ipa', localedir=None), primary_key=True)
-option: Str('sourcehost', cli_name='srchost', label=Gettext('Source host', domain='ipa', localedir=None))
-option: Str('targethost', cli_name='host', label=Gettext('Target host', domain='ipa', localedir=None))
-option: Str('service', cli_name='service', label=Gettext('Service', domain='ipa', localedir=None))
-option: List('rules?', cli_name='rules', label=Gettext('Rules to test. If not specified, --enabled is assumed', domain='ipa', localedir=None), multivalue=True)
-option: Flag('nodetail?', autofill=True, cli_name='nodetail', default=False, label=Gettext('Hide details which rules are matched, not matched, or invalid', domain='ipa', localedir=None))
-option: Flag('enabled?', autofill=True, cli_name='enabled', default=False, label=Gettext('Include all enabled IPA rules into test [default]', domain='ipa', localedir=None))
-option: Flag('disabled?', autofill=True, cli_name='disabled', default=False, label=Gettext('Include all disabled IPA rules into test', domain='ipa', localedir=None))
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Output('matched', (<type 'list'>, <type 'tuple'>, <type 'NoneType'>), Gettext('Matched rules', domain='ipa', localedir=None))
-output: Output('notmatched', (<type 'list'>, <type 'tuple'>, <type 'NoneType'>), Gettext('Not matched rules', domain='ipa', localedir=None))
-output: Output('error', (<type 'list'>, <type 'tuple'>, <type 'NoneType'>), Gettext('Non-existent or invalid rules', domain='ipa', localedir=None))
-output: Output('value', <type 'bool'>, Gettext('Result of simulation', domain='ipa', localedir=None))
+option: Str('user', cli_name='user', primary_key=True)
+option: Str('sourcehost', cli_name='srchost')
+option: Str('targethost', cli_name='host')
+option: Str('service', cli_name='service')
+option: List('rules?', cli_name='rules', multivalue=True)
+option: Flag('nodetail?', autofill=True, cli_name='nodetail', default=False)
+option: Flag('enabled?', autofill=True, cli_name='enabled', default=False)
+option: Flag('disabled?', autofill=True, cli_name='disabled', default=False)
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Output('matched', (<type 'list'>, <type 'tuple'>, <type 'NoneType'>), None)
+output: Output('notmatched', (<type 'list'>, <type 'tuple'>, <type 'NoneType'>), None)
+output: Output('error', (<type 'list'>, <type 'tuple'>, <type 'NoneType'>), None)
+output: Output('value', <type 'bool'>, None)
 command: host_add
 args: 1,14,3
-arg: Str('fqdn', validate_host, attribute=True, cli_name='hostname', label=Gettext('Host name', domain='ipa', localedir=None), maxlength=255, multivalue=False, normalizer=<lambda>, pattern='^[a-zA-Z0-9][a-zA-Z0-9-\\.]{0,254}$', pattern_errmsg='may only include letters, numbers, and -', primary_key=True, required=True)
-option: Str('description', attribute=True, cli_name='desc', label=Gettext('Description', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Str('l', attribute=True, cli_name='locality', label=Gettext('Locality', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Str('nshostlocation', attribute=True, cli_name='location', label=Gettext('Location', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Str('nshardwareplatform', attribute=True, cli_name='platform', label=Gettext('Platform', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Str('nsosversion', attribute=True, cli_name='os', label=Gettext('Operating system', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Str('userpassword', attribute=True, cli_name='password', label=Gettext('User password', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Flag('random', attribute=False, autofill=True, cli_name='random', default=False, flags=('no_search', 'virtual_attribute'), label=FixMe('random'), multivalue=False, required=False)
-option: Bytes('usercertificate', validate_certificate, attribute=True, cli_name='certificate', label=Gettext('Certificate', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Flag('force', autofill=True, default=False, label=Gettext('Force', domain='ipa', localedir=None))
+arg: Str('fqdn', attribute=True, cli_name='hostname', maxlength=255, multivalue=False, pattern='^[a-zA-Z0-9][a-zA-Z0-9-\\.]{0,254}$', pattern_errmsg='may only include letters, numbers, and -', primary_key=True, required=True)
+option: Str('description', attribute=True, cli_name='desc', multivalue=False, required=False)
+option: Str('l', attribute=True, cli_name='locality', multivalue=False, required=False)
+option: Str('nshostlocation', attribute=True, cli_name='location', multivalue=False, required=False)
+option: Str('nshardwareplatform', attribute=True, cli_name='platform', multivalue=False, required=False)
+option: Str('nsosversion', attribute=True, cli_name='os', multivalue=False, required=False)
+option: Str('userpassword', attribute=True, cli_name='password', multivalue=False, required=False)
+option: Flag('random', attribute=False, autofill=True, cli_name='random', default=False, multivalue=False, required=False)
+option: Bytes('usercertificate', attribute=True, cli_name='certificate', multivalue=False, required=False)
+option: Flag('force', autofill=True, default=False)
 option: Flag('no_reverse', autofill=True, default=False)
-option: Str('ip_address?', validate_ipaddr, label=Gettext('IP Address', domain='ipa', localedir=None))
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
+option: Str('ip_address?')
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
 output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+output: Output('value', <type 'unicode'>, None)
 command: host_add_managedby
 args: 1,4,3
-arg: Str('fqdn', validate_host, attribute=True, cli_name='hostname', label=Gettext('Host name', domain='ipa', localedir=None), maxlength=255, multivalue=False, normalizer=<lambda>, pattern='^[a-zA-Z0-9][a-zA-Z0-9-\\.]{0,254}$', pattern_errmsg='may only include letters, numbers, and -', primary_key=True, query=True, required=True)
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-option: List('host?', alwaysask=True, cli_name='hosts', label=u'member host', multivalue=True)
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('failed', <type 'dict'>, Gettext('Members that could not be added', domain='ipa', localedir=None))
-output: Output('completed', <type 'int'>, Gettext('Number of members added', domain='ipa', localedir=None))
+arg: Str('fqdn', attribute=True, cli_name='hostname', maxlength=255, multivalue=False, pattern='^[a-zA-Z0-9][a-zA-Z0-9-\\.]{0,254}$', pattern_errmsg='may only include letters, numbers, and -', primary_key=True, query=True, required=True)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+option: List('host?', alwaysask=True, cli_name='hosts', multivalue=True)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('failed', <type 'dict'>, None)
+output: Output('completed', <type 'int'>, None)
 command: host_del
 args: 1,1,3
-arg: Str('fqdn', validate_host, attribute=True, cli_name='hostname', label=Gettext('Host name', domain='ipa', localedir=None), maxlength=255, multivalue=True, normalizer=<lambda>, pattern='^[a-zA-Z0-9][a-zA-Z0-9-\\.]{0,254}$', pattern_errmsg='may only include letters, numbers, and -', primary_key=True, query=True, required=True)
+arg: Str('fqdn', attribute=True, cli_name='hostname', maxlength=255, multivalue=True, pattern='^[a-zA-Z0-9][a-zA-Z0-9-\\.]{0,254}$', pattern_errmsg='may only include letters, numbers, and -', primary_key=True, query=True, required=True)
 option: Flag('updatedns?', autofill=True, default=False)
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Output('result', <type 'dict'>, 'list of deletions that failed')
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Output('result', <type 'dict'>, None)
+output: Output('value', <type 'unicode'>, None)
 command: host_disable
 args: 1,0,3
-arg: Str('fqdn', validate_host, attribute=True, cli_name='hostname', label=Gettext('Host name', domain='ipa', localedir=None), maxlength=255, multivalue=False, normalizer=<lambda>, pattern='^[a-zA-Z0-9][a-zA-Z0-9-\\.]{0,254}$', pattern_errmsg='may only include letters, numbers, and -', primary_key=True, query=True, required=True)
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Output('result', <type 'bool'>, 'True means the operation was successful')
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+arg: Str('fqdn', attribute=True, cli_name='hostname', maxlength=255, multivalue=False, pattern='^[a-zA-Z0-9][a-zA-Z0-9-\\.]{0,254}$', pattern_errmsg='may only include letters, numbers, and -', primary_key=True, query=True, required=True)
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Output('result', <type 'bool'>, None)
+output: Output('value', <type 'unicode'>, None)
 command: host_find
 args: 1,28,4
 arg: Str('criteria?', noextrawhitespace=False)
-option: Str('fqdn', validate_host, attribute=True, autofill=False, cli_name='hostname', label=Gettext('Host name', domain='ipa', localedir=None), maxlength=255, multivalue=False, normalizer=<lambda>, pattern='^[a-zA-Z0-9][a-zA-Z0-9-\\.]{0,254}$', pattern_errmsg='may only include letters, numbers, and -', primary_key=True, query=True, required=False)
-option: Str('description', attribute=True, autofill=False, cli_name='desc', label=Gettext('Description', domain='ipa', localedir=None), multivalue=False, query=True, required=False)
-option: Str('l', attribute=True, autofill=False, cli_name='locality', label=Gettext('Locality', domain='ipa', localedir=None), multivalue=False, query=True, required=False)
-option: Str('nshostlocation', attribute=True, autofill=False, cli_name='location', label=Gettext('Location', domain='ipa', localedir=None), multivalue=False, query=True, required=False)
-option: Str('nshardwareplatform', attribute=True, autofill=False, cli_name='platform', label=Gettext('Platform', domain='ipa', localedir=None), multivalue=False, query=True, required=False)
-option: Str('nsosversion', attribute=True, autofill=False, cli_name='os', label=Gettext('Operating system', domain='ipa', localedir=None), multivalue=False, query=True, required=False)
-option: Str('userpassword', attribute=True, autofill=False, cli_name='password', label=Gettext('User password', domain='ipa', localedir=None), multivalue=False, query=True, required=False)
-option: Bytes('usercertificate', validate_certificate, attribute=True, autofill=False, cli_name='certificate', label=Gettext('Certificate', domain='ipa', localedir=None), multivalue=False, query=True, required=False)
-option: Int('timelimit?', autofill=False, flags=['no_display'], label=Gettext('Time Limit', domain='ipa', localedir=None), minvalue=0)
-option: Int('sizelimit?', autofill=False, flags=['no_display'], label=Gettext('Size Limit', domain='ipa', localedir=None), minvalue=0)
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-option: Flag('pkey_only?', autofill=True, default=False', label=Gettext('Primary key only', domain='ipa', localedir=None))
-option: List('in_hostgroup?', cli_name='in_hostgroups', label=Gettext('host group', domain='ipa', localedir=None), multivalue=True)
-option: List('not_in_hostgroup?', cli_name='not_in_hostgroups', label=Gettext('host group', domain='ipa', localedir=None), multivalue=True)
-option: List('in_netgroup?', cli_name='in_netgroups', label=Gettext('netgroup', domain='ipa', localedir=None), multivalue=True)
-option: List('not_in_netgroup?', cli_name='not_in_netgroups', label=Gettext('netgroup', domain='ipa', localedir=None), multivalue=True)
-option: List('in_role?', cli_name='in_roles', label=Gettext('role', domain='ipa', localedir=None), multivalue=True)
-option: List('not_in_role?', cli_name='not_in_roles', label=Gettext('role', domain='ipa', localedir=None), multivalue=True)
-option: List('in_hbacrule?', cli_name='in_hbacrules', label=Gettext('HBAC rule', domain='ipa', localedir=None), multivalue=True)
-option: List('not_in_hbacrule?', cli_name='not_in_hbacrules', label=Gettext('HBAC rule', domain='ipa', localedir=None), multivalue=True)
-option: List('in_sudorule?', cli_name='in_sudorules', label=Gettext('sudo rule', domain='ipa', localedir=None), multivalue=True)
-option: List('not_in_sudorule?', cli_name='not_in_sudorules', label=Gettext('sudo rule', domain='ipa', localedir=None), multivalue=True)
-option: List('enroll_by_user?', cli_name='enroll_by_users', label=Gettext('user', domain='ipa', localedir=None), multivalue=True)
-option: List('not_enroll_by_user?', cli_name='not_enroll_by_users', label=Gettext('user', domain='ipa', localedir=None), multivalue=True)
-option: List('man_by_host?', cli_name='man_by_hosts', label=Gettext('host', domain='ipa', localedir=None), multivalue=True)
-option: List('not_man_by_host?', cli_name='not_man_by_hosts', label=Gettext('host', domain='ipa', localedir=None), multivalue=True)
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
+option: Str('fqdn', attribute=True, autofill=False, cli_name='hostname', maxlength=255, multivalue=False, pattern='^[a-zA-Z0-9][a-zA-Z0-9-\\.]{0,254}$', pattern_errmsg='may only include letters, numbers, and -', primary_key=True, query=True, required=False)
+option: Str('description', attribute=True, autofill=False, cli_name='desc', multivalue=False, query=True, required=False)
+option: Str('l', attribute=True, autofill=False, cli_name='locality', multivalue=False, query=True, required=False)
+option: Str('nshostlocation', attribute=True, autofill=False, cli_name='location', multivalue=False, query=True, required=False)
+option: Str('nshardwareplatform', attribute=True, autofill=False, cli_name='platform', multivalue=False, query=True, required=False)
+option: Str('nsosversion', attribute=True, autofill=False, cli_name='os', multivalue=False, query=True, required=False)
+option: Str('userpassword', attribute=True, autofill=False, cli_name='password', multivalue=False, query=True, required=False)
+option: Bytes('usercertificate', attribute=True, autofill=False, cli_name='certificate', multivalue=False, query=True, required=False)
+option: Int('timelimit?', autofill=False, minvalue=0)
+option: Int('sizelimit?', autofill=False, minvalue=0)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+option: Flag('pkey_only?', autofill=True, default=False)
+option: List('in_hostgroup?', cli_name='in_hostgroups', multivalue=True)
+option: List('not_in_hostgroup?', cli_name='not_in_hostgroups', multivalue=True)
+option: List('in_netgroup?', cli_name='in_netgroups', multivalue=True)
+option: List('not_in_netgroup?', cli_name='not_in_netgroups', multivalue=True)
+option: List('in_role?', cli_name='in_roles', multivalue=True)
+option: List('not_in_role?', cli_name='not_in_roles', multivalue=True)
+option: List('in_hbacrule?', cli_name='in_hbacrules', multivalue=True)
+option: List('not_in_hbacrule?', cli_name='not_in_hbacrules', multivalue=True)
+option: List('in_sudorule?', cli_name='in_sudorules', multivalue=True)
+option: List('not_in_sudorule?', cli_name='not_in_sudorules', multivalue=True)
+option: List('enroll_by_user?', cli_name='enroll_by_users', multivalue=True)
+option: List('not_enroll_by_user?', cli_name='not_enroll_by_users', multivalue=True)
+option: List('man_by_host?', cli_name='man_by_hosts', multivalue=True)
+option: List('not_man_by_host?', cli_name='not_man_by_hosts', multivalue=True)
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
 output: ListOfEntries('result', (<type 'list'>, <type 'tuple'>), Gettext('A list of LDAP entries', domain='ipa', localedir=None))
-output: Output('count', <type 'int'>, 'Number of entries returned')
-output: Output('truncated', <type 'bool'>, 'True if not all results were returned')
+output: Output('count', <type 'int'>, None)
+output: Output('truncated', <type 'bool'>, None)
 command: host_mod
 args: 1,15,3
-arg: Str('fqdn', validate_host, attribute=True, cli_name='hostname', label=Gettext('Host name', domain='ipa', localedir=None), maxlength=255, multivalue=False, normalizer=<lambda>, pattern='^[a-zA-Z0-9][a-zA-Z0-9-\\.]{0,254}$', pattern_errmsg='may only include letters, numbers, and -', primary_key=True, query=True, required=True)
-option: Str('description', attribute=True, autofill=False, cli_name='desc', label=Gettext('Description', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Str('l', attribute=True, autofill=False, cli_name='locality', label=Gettext('Locality', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Str('nshostlocation', attribute=True, autofill=False, cli_name='location', label=Gettext('Location', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Str('nshardwareplatform', attribute=True, autofill=False, cli_name='platform', label=Gettext('Platform', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Str('nsosversion', attribute=True, autofill=False, cli_name='os', label=Gettext('Operating system', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Str('userpassword', attribute=True, autofill=False, cli_name='password', label=Gettext('User password', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Flag('random', attribute=False, autofill=True, cli_name='random', default=False, flags=('no_search', 'virtual_attribute'), label=FixMe('random'), multivalue=False, required=False)
-option: Bytes('usercertificate', validate_certificate, attribute=True, autofill=False, cli_name='certificate', label=Gettext('Certificate', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Str('addattr*', validate_add_attribute, cli_name='addattr', exclude='webui')
-option: Str('setattr*', validate_set_attribute, cli_name='setattr', exclude='webui')
-option: Flag('rights', autofill=True, default=False, label=Gettext('Rights', domain='ipa', localedir=None))
-option: Str('krbprincipalname?', attribute=True, cli_name='principalname', label=Gettext('Principal name', domain='ipa', localedir=None))
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+arg: Str('fqdn', attribute=True, cli_name='hostname', maxlength=255, multivalue=False, pattern='^[a-zA-Z0-9][a-zA-Z0-9-\\.]{0,254}$', pattern_errmsg='may only include letters, numbers, and -', primary_key=True, query=True, required=True)
+option: Str('description', attribute=True, autofill=False, cli_name='desc', multivalue=False, required=False)
+option: Str('l', attribute=True, autofill=False, cli_name='locality', multivalue=False, required=False)
+option: Str('nshostlocation', attribute=True, autofill=False, cli_name='location', multivalue=False, required=False)
+option: Str('nshardwareplatform', attribute=True, autofill=False, cli_name='platform', multivalue=False, required=False)
+option: Str('nsosversion', attribute=True, autofill=False, cli_name='os', multivalue=False, required=False)
+option: Str('userpassword', attribute=True, autofill=False, cli_name='password', multivalue=False, required=False)
+option: Flag('random', attribute=False, autofill=True, cli_name='random', default=False, multivalue=False, required=False)
+option: Bytes('usercertificate', attribute=True, autofill=False, cli_name='certificate', multivalue=False, required=False)
+option: Str('addattr*', cli_name='addattr', exclude='webui')
+option: Str('setattr*', cli_name='setattr', exclude='webui')
+option: Flag('rights', autofill=True, default=False)
+option: Str('krbprincipalname?', attribute=True, cli_name='principalname')
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('value', <type 'unicode'>, None)
 command: host_remove_managedby
 args: 1,4,3
-arg: Str('fqdn', validate_host, attribute=True, cli_name='hostname', label=Gettext('Host name', domain='ipa', localedir=None), maxlength=255, multivalue=False, normalizer=<lambda>, pattern='^[a-zA-Z0-9][a-zA-Z0-9-\\.]{0,254}$', pattern_errmsg='may only include letters, numbers, and -', primary_key=True, query=True, required=True)
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-option: List('host?', alwaysask=True, cli_name='hosts', label=u'member host', multivalue=True)
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('failed', <type 'dict'>, Gettext('Members that could not be removed', domain='ipa', localedir=None))
-output: Output('completed', <type 'int'>, Gettext('Number of members removed', domain='ipa', localedir=None))
+arg: Str('fqdn', attribute=True, cli_name='hostname', maxlength=255, multivalue=False, pattern='^[a-zA-Z0-9][a-zA-Z0-9-\\.]{0,254}$', pattern_errmsg='may only include letters, numbers, and -', primary_key=True, query=True, required=True)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+option: List('host?', alwaysask=True, cli_name='hosts', multivalue=True)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('failed', <type 'dict'>, None)
+output: Output('completed', <type 'int'>, None)
 command: host_show
 args: 1,5,3
-arg: Str('fqdn', validate_host, attribute=True, cli_name='hostname', label=Gettext('Host name', domain='ipa', localedir=None), maxlength=255, multivalue=False, normalizer=<lambda>, pattern='^[a-zA-Z0-9][a-zA-Z0-9-\\.]{0,254}$', pattern_errmsg='may only include letters, numbers, and -', primary_key=True, query=True, required=True)
-option: Flag('rights', autofill=True, default=False, label=Gettext('Rights', domain='ipa', localedir=None))
+arg: Str('fqdn', attribute=True, cli_name='hostname', maxlength=255, multivalue=False, pattern='^[a-zA-Z0-9][a-zA-Z0-9-\\.]{0,254}$', pattern_errmsg='may only include letters, numbers, and -', primary_key=True, query=True, required=True)
+option: Flag('rights', autofill=True, default=False)
 option: Str('out?')
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
 output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+output: Output('value', <type 'unicode'>, None)
 command: hostgroup_add
 args: 1,6,3
-arg: Str('cn', attribute=True, cli_name='hostgroup_name', label=Gettext('Host-group', domain='ipa', localedir=None), multivalue=False, normalizer=<lambda>, primary_key=True, required=True)
-option: Str('description', attribute=True, cli_name='desc', label=Gettext('Description', domain='ipa', localedir=None), multivalue=False, required=True)
-option: Str('addattr*', validate_add_attribute, cli_name='addattr', exclude='webui')
-option: Str('setattr*', validate_set_attribute, cli_name='setattr', exclude='webui')
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+arg: Str('cn', attribute=True, cli_name='hostgroup_name', multivalue=False, primary_key=True, required=True)
+option: Str('description', attribute=True, cli_name='desc', multivalue=False, required=True)
+option: Str('addattr*', cli_name='addattr', exclude='webui')
+option: Str('setattr*', cli_name='setattr', exclude='webui')
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('value', <type 'unicode'>, None)
 command: hostgroup_add_member
 args: 1,5,3
-arg: Str('cn', attribute=True, cli_name='hostgroup_name', label=Gettext('Host-group', domain='ipa', localedir=None), multivalue=False, normalizer=<lambda>, primary_key=True, query=True, required=True)
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-option: List('host?', alwaysask=True, cli_name='hosts', label=u'member host', multivalue=True)
-option: List('hostgroup?', alwaysask=True, cli_name='hostgroups', label=u'member host group', multivalue=True)
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('failed', <type 'dict'>, Gettext('Members that could not be added', domain='ipa', localedir=None))
-output: Output('completed', <type 'int'>, Gettext('Number of members added', domain='ipa', localedir=None))
+arg: Str('cn', attribute=True, cli_name='hostgroup_name', multivalue=False, primary_key=True, query=True, required=True)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+option: List('host?', alwaysask=True, cli_name='hosts', multivalue=True)
+option: List('hostgroup?', alwaysask=True, cli_name='hostgroups', multivalue=True)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('failed', <type 'dict'>, None)
+output: Output('completed', <type 'int'>, None)
 command: hostgroup_del
 args: 1,1,3
-arg: Str('cn', attribute=True, cli_name='hostgroup_name', label=Gettext('Host-group', domain='ipa', localedir=None), multivalue=True, normalizer=<lambda>, primary_key=True, query=True, required=True)
+arg: Str('cn', attribute=True, cli_name='hostgroup_name', multivalue=True, primary_key=True, query=True, required=True)
 option: Flag('continue', autofill=True, cli_name='continue', default=False)
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Output('result', <type 'dict'>, 'list of deletions that failed')
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Output('result', <type 'dict'>, None)
+output: Output('value', <type 'unicode'>, None)
 command: hostgroup_find
 args: 1,20,4
 arg: Str('criteria?', noextrawhitespace=False)
-option: Str('cn', attribute=True, autofill=False, cli_name='hostgroup_name', label=Gettext('Host-group', domain='ipa', localedir=None), multivalue=False, normalizer=<lambda>, primary_key=True, query=True, required=False)
-option: Str('description', attribute=True, autofill=False, cli_name='desc', label=Gettext('Description', domain='ipa', localedir=None), multivalue=False, query=True, required=False)
-option: Int('timelimit?', autofill=False, flags=['no_display'], label=Gettext('Time Limit', domain='ipa', localedir=None), minvalue=0)
-option: Int('sizelimit?', autofill=False, flags=['no_display'], label=Gettext('Size Limit', domain='ipa', localedir=None), minvalue=0)
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-option: Flag('pkey_only?', autofill=True, default=False', label=Gettext('Primary key only', domain='ipa', localedir=None))
-option: List('host?', cli_name='hosts', label=Gettext('host', domain='ipa', localedir=None), multivalue=True)
-option: List('no_host?', cli_name='no_hosts', label=Gettext('host', domain='ipa', localedir=None), multivalue=True)
-option: List('hostgroup?', cli_name='hostgroups', label=Gettext('host group', domain='ipa', localedir=None), multivalue=True)
-option: List('no_hostgroup?', cli_name='no_hostgroups', label=Gettext('host group', domain='ipa', localedir=None), multivalue=True)
-option: List('in_hostgroup?', cli_name='in_hostgroups', label=Gettext('host group', domain='ipa', localedir=None), multivalue=True)
-option: List('not_in_hostgroup?', cli_name='not_in_hostgroups', label=Gettext('host group', domain='ipa', localedir=None), multivalue=True)
-option: List('in_netgroup?', cli_name='in_netgroups', label=Gettext('netgroup', domain='ipa', localedir=None), multivalue=True)
-option: List('not_in_netgroup?', cli_name='not_in_netgroups', label=Gettext('netgroup', domain='ipa', localedir=None), multivalue=True)
-option: List('in_hbacrule?', cli_name='in_hbacrules', label=Gettext('HBAC rule', domain='ipa', localedir=None), multivalue=True)
-option: List('not_in_hbacrule?', cli_name='not_in_hbacrules', label=Gettext('HBAC rule', domain='ipa', localedir=None), multivalue=True)
-option: List('in_sudorule?', cli_name='in_sudorules', label=Gettext('sudo rule', domain='ipa', localedir=None), multivalue=True)
-option: List('not_in_sudorule?', cli_name='not_in_sudorules', label=Gettext('sudo rule', domain='ipa', localedir=None), multivalue=True)
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
+option: Str('cn', attribute=True, autofill=False, cli_name='hostgroup_name', multivalue=False, primary_key=True, query=True, required=False)
+option: Str('description', attribute=True, autofill=False, cli_name='desc', multivalue=False, query=True, required=False)
+option: Int('timelimit?', autofill=False, minvalue=0)
+option: Int('sizelimit?', autofill=False, minvalue=0)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+option: Flag('pkey_only?', autofill=True, default=False)
+option: List('host?', cli_name='hosts', multivalue=True)
+option: List('no_host?', cli_name='no_hosts', multivalue=True)
+option: List('hostgroup?', cli_name='hostgroups', multivalue=True)
+option: List('no_hostgroup?', cli_name='no_hostgroups', multivalue=True)
+option: List('in_hostgroup?', cli_name='in_hostgroups', multivalue=True)
+option: List('not_in_hostgroup?', cli_name='not_in_hostgroups', multivalue=True)
+option: List('in_netgroup?', cli_name='in_netgroups', multivalue=True)
+option: List('not_in_netgroup?', cli_name='not_in_netgroups', multivalue=True)
+option: List('in_hbacrule?', cli_name='in_hbacrules', multivalue=True)
+option: List('not_in_hbacrule?', cli_name='not_in_hbacrules', multivalue=True)
+option: List('in_sudorule?', cli_name='in_sudorules', multivalue=True)
+option: List('not_in_sudorule?', cli_name='not_in_sudorules', multivalue=True)
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
 output: ListOfEntries('result', (<type 'list'>, <type 'tuple'>), Gettext('A list of LDAP entries', domain='ipa', localedir=None))
-output: Output('count', <type 'int'>, 'Number of entries returned')
-output: Output('truncated', <type 'bool'>, 'True if not all results were returned')
+output: Output('count', <type 'int'>, None)
+output: Output('truncated', <type 'bool'>, None)
 command: hostgroup_mod
 args: 1,7,3
-arg: Str('cn', attribute=True, cli_name='hostgroup_name', label=Gettext('Host-group', domain='ipa', localedir=None), multivalue=False, normalizer=<lambda>, primary_key=True, query=True, required=True)
-option: Str('description', attribute=True, autofill=False, cli_name='desc', label=Gettext('Description', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Str('addattr*', validate_add_attribute, cli_name='addattr', exclude='webui')
-option: Str('setattr*', validate_set_attribute, cli_name='setattr', exclude='webui')
-option: Flag('rights', autofill=True, default=False, label=Gettext('Rights', domain='ipa', localedir=None))
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+arg: Str('cn', attribute=True, cli_name='hostgroup_name', multivalue=False, primary_key=True, query=True, required=True)
+option: Str('description', attribute=True, autofill=False, cli_name='desc', multivalue=False, required=False)
+option: Str('addattr*', cli_name='addattr', exclude='webui')
+option: Str('setattr*', cli_name='setattr', exclude='webui')
+option: Flag('rights', autofill=True, default=False)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('value', <type 'unicode'>, None)
 command: hostgroup_remove_member
 args: 1,5,3
-arg: Str('cn', attribute=True, cli_name='hostgroup_name', label=Gettext('Host-group', domain='ipa', localedir=None), multivalue=False, normalizer=<lambda>, primary_key=True, query=True, required=True)
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-option: List('host?', alwaysask=True, cli_name='hosts', label=u'member host', multivalue=True)
-option: List('hostgroup?', alwaysask=True, cli_name='hostgroups', label=u'member host group', multivalue=True)
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('failed', <type 'dict'>, Gettext('Members that could not be removed', domain='ipa', localedir=None))
-output: Output('completed', <type 'int'>, Gettext('Number of members removed', domain='ipa', localedir=None))
+arg: Str('cn', attribute=True, cli_name='hostgroup_name', multivalue=False, primary_key=True, query=True, required=True)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+option: List('host?', alwaysask=True, cli_name='hosts', multivalue=True)
+option: List('hostgroup?', alwaysask=True, cli_name='hostgroups', multivalue=True)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('failed', <type 'dict'>, None)
+output: Output('completed', <type 'int'>, None)
 command: hostgroup_show
 args: 1,4,3
-arg: Str('cn', attribute=True, cli_name='hostgroup_name', label=Gettext('Host-group', domain='ipa', localedir=None), multivalue=False, normalizer=<lambda>, primary_key=True, query=True, required=True)
-option: Flag('rights', autofill=True, default=False, label=Gettext('Rights', domain='ipa', localedir=None))
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+arg: Str('cn', attribute=True, cli_name='hostgroup_name', multivalue=False, primary_key=True, query=True, required=True)
+option: Flag('rights', autofill=True, default=False)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('value', <type 'unicode'>, None)
 command: i18n_messages
 args: 0,0,1
-output: Output('messages', <type 'dict'>, Gettext('Dict of I18N messages', domain='ipa', localedir=None))
+output: Output('messages', <type 'dict'>, None)
 command: json_metadata
 args: 2,0,2
 arg: Str('objname?')
 arg: Str('methodname?')
-output: Output('objects', <type 'dict'>, Gettext('Dict of JSON encoded IPA Objects', domain='ipa', localedir=None))
-output: Output('methods', <type 'dict'>, Gettext('Dict of JSON encoded IPA Methods', domain='ipa', localedir=None))
+output: Output('objects', <type 'dict'>, None)
+output: Output('methods', <type 'dict'>, None)
 command: krbtpolicy_mod
 args: 1,8,3
-arg: Str('uid', attribute=True, cli_name='user', label=Gettext('User name', domain='ipa', localedir=None), multivalue=False, primary_key=True, query=True, required=False)
-option: Int('krbmaxticketlife', attribute=True, autofill=False, cli_name='maxlife', label=Gettext('Max life', domain='ipa', localedir=None), minvalue=1, multivalue=False, required=False)
-option: Int('krbmaxrenewableage', attribute=True, autofill=False, cli_name='maxrenew', label=Gettext('Max renew', domain='ipa', localedir=None), minvalue=1, multivalue=False, required=False)
-option: Str('addattr*', validate_add_attribute, cli_name='addattr', exclude='webui')
-option: Str('setattr*', validate_set_attribute, cli_name='setattr', exclude='webui')
-option: Flag('rights', autofill=True, default=False, label=Gettext('Rights', domain='ipa', localedir=None))
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+arg: Str('uid', attribute=True, cli_name='user', multivalue=False, primary_key=True, query=True, required=False)
+option: Int('krbmaxticketlife', attribute=True, autofill=False, cli_name='maxlife', minvalue=1, multivalue=False, required=False)
+option: Int('krbmaxrenewableage', attribute=True, autofill=False, cli_name='maxrenew', minvalue=1, multivalue=False, required=False)
+option: Str('addattr*', cli_name='addattr', exclude='webui')
+option: Str('setattr*', cli_name='setattr', exclude='webui')
+option: Flag('rights', autofill=True, default=False)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('value', <type 'unicode'>, None)
 command: krbtpolicy_reset
 args: 1,3,3
-arg: Str('uid', attribute=True, cli_name='user', label=Gettext('User name', domain='ipa', localedir=None), multivalue=False, primary_key=True, query=True, required=False)
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
+arg: Str('uid', attribute=True, cli_name='user', multivalue=False, primary_key=True, query=True, required=False)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
 output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+output: Output('value', <type 'unicode'>, None)
 command: krbtpolicy_show
 args: 1,4,3
-arg: Str('uid', attribute=True, cli_name='user', label=Gettext('User name', domain='ipa', localedir=None), multivalue=False, primary_key=True, query=True, required=False)
-option: Flag('rights', autofill=True, default=False, label=Gettext('Rights', domain='ipa', localedir=None))
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+arg: Str('uid', attribute=True, cli_name='user', multivalue=False, primary_key=True, query=True, required=False)
+option: Flag('rights', autofill=True, default=False)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('value', <type 'unicode'>, None)
 command: migrate_ds
 args: 2,14,3
-arg: Str('ldapuri', validate_ldapuri, cli_name='ldap_uri', label=Gettext('LDAP URI', domain='ipa', localedir=None))
-arg: Password('bindpw', cli_name='password', confirm=False, label=Gettext('Password', domain='ipa', localedir=None))
-option: Str('binddn?', autofill=True, cli_name='bind_dn', default=u'cn=directory manager', label=Gettext('Bind DN', domain='ipa', localedir=None))
-option: Str('usercontainer?', autofill=True, cli_name='user_container', default=u'ou=people', label=Gettext('User container', domain='ipa', localedir=None))
-option: Str('groupcontainer?', autofill=True, cli_name='group_container', default=u'ou=groups', label=Gettext('Group container', domain='ipa', localedir=None))
-option: List('userobjectclass?', autofill=True, cli_name='user_objectclass', default=(u'person',), label=Gettext('User object class', domain='ipa', localedir=None), multivalue=True)
-option: List('groupobjectclass?', autofill=True, cli_name='group_objectclass', default=(u'groupOfUniqueNames', u'groupOfNames'), label=Gettext('Group object class', domain='ipa', localedir=None), multivalue=True)
-option: List('userignoreobjectclass?', autofill=True, cli_name='user_ignore_objectclass', default=(), label=Gettext('Ignore user object class', domain='ipa', localedir=None), multivalue=True)
-option: List('userignoreattribute?', autofill=True, cli_name='user_ignore_attribute', default=(), label=Gettext('Ignore user attribute', domain='ipa', localedir=None), multivalue=True)
-option: List('groupignoreobjectclass?', autofill=True, cli_name='group_ignore_objectclass', default=(), label=Gettext('Ignore group object class', domain='ipa', localedir=None), multivalue=True)
-option: List('groupignoreattribute?', autofill=True, cli_name='group_ignore_attribute', default=(), label=Gettext('Ignore group attribute', domain='ipa', localedir=None), multivalue=True)
-option: Flag('groupoverwritegid', autofill=True, cli_name='group_overwrite_gid', default=False, label=Gettext('Overwrite GID', domain='ipa', localedir=None))
-option: StrEnum('schema?', autofill=True, cli_name='schema', default=u'RFC2307bis', label=Gettext('LDAP schema', domain='ipa', localedir=None), values=(u'RFC2307bis', u'RFC2307'))
-option: Flag('continue?', autofill=True, default=False, label=Gettext('Continue', domain='ipa', localedir=None))
+arg: Str('ldapuri', cli_name='ldap_uri')
+arg: Password('bindpw', cli_name='password', confirm=False)
+option: Str('binddn?', autofill=True, cli_name='bind_dn', default=u'cn=directory manager')
+option: Str('usercontainer?', autofill=True, cli_name='user_container', default=u'ou=people')
+option: Str('groupcontainer?', autofill=True, cli_name='group_container', default=u'ou=groups')
+option: List('userobjectclass?', autofill=True, cli_name='user_objectclass', default=(u'person',), multivalue=True)
+option: List('groupobjectclass?', autofill=True, cli_name='group_objectclass', default=(u'groupOfUniqueNames', u'groupOfNames'), multivalue=True)
+option: List('userignoreobjectclass?', autofill=True, cli_name='user_ignore_objectclass', default=(), multivalue=True)
+option: List('userignoreattribute?', autofill=True, cli_name='user_ignore_attribute', default=(), multivalue=True)
+option: List('groupignoreobjectclass?', autofill=True, cli_name='group_ignore_objectclass', default=(), multivalue=True)
+option: List('groupignoreattribute?', autofill=True, cli_name='group_ignore_attribute', default=(), multivalue=True)
+option: Flag('groupoverwritegid', autofill=True, cli_name='group_overwrite_gid', default=False)
+option: StrEnum('schema?', autofill=True, cli_name='schema', default=u'RFC2307bis', values=(u'RFC2307bis', u'RFC2307'))
+option: Flag('continue?', autofill=True, default=False)
 option: List('exclude_groups?', autofill=True, cli_name='exclude_groups', default=(), multivalue=True)
 option: List('exclude_users?', autofill=True, cli_name='exclude_users', default=(), multivalue=True)
-output: Output('result', <type 'dict'>, Gettext('Lists of objects migrated; categorized by type.', domain='ipa', localedir=None))
-output: Output('failed', <type 'dict'>, Gettext('Lists of objects that could not be migrated; categorized by type.', domain='ipa', localedir=None))
-output: Output('enabled', <type 'bool'>, Gettext('False if migration mode was disabled.', domain='ipa', localedir=None))
+output: Output('result', <type 'dict'>, None)
+output: Output('failed', <type 'dict'>, None)
+output: Output('enabled', <type 'bool'>, None)
 command: netgroup_add
 args: 1,9,3
-arg: Str('cn', attribute=True, cli_name='name', label=Gettext('Netgroup name', domain='ipa', localedir=None), multivalue=False, normalizer=<lambda>, primary_key=True, required=True)
-option: Str('description', attribute=True, cli_name='desc', label=Gettext('Description', domain='ipa', localedir=None), multivalue=False, required=True)
-option: Str('nisdomainname', attribute=True, cli_name='nisdomain', label=Gettext('NIS domain name', domain='ipa', localedir=None), multivalue=False, required=False)
-option: StrEnum('usercategory', attribute=True, cli_name='usercat', label=Gettext('User category', domain='ipa', localedir=None), multivalue=False, required=False, values=(u'all',))
-option: StrEnum('hostcategory', attribute=True, cli_name='hostcat', label=Gettext('Host category', domain='ipa', localedir=None), multivalue=False, required=False, values=(u'all',))
-option: Str('addattr*', validate_add_attribute, cli_name='addattr', exclude='webui')
-option: Str('setattr*', validate_set_attribute, cli_name='setattr', exclude='webui')
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+arg: Str('cn', attribute=True, cli_name='name', multivalue=False, primary_key=True, required=True)
+option: Str('description', attribute=True, cli_name='desc', multivalue=False, required=True)
+option: Str('nisdomainname', attribute=True, cli_name='nisdomain', multivalue=False, required=False)
+option: StrEnum('usercategory', attribute=True, cli_name='usercat', multivalue=False, required=False, values=(u'all',))
+option: StrEnum('hostcategory', attribute=True, cli_name='hostcat', multivalue=False, required=False, values=(u'all',))
+option: Str('addattr*', cli_name='addattr', exclude='webui')
+option: Str('setattr*', cli_name='setattr', exclude='webui')
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('value', <type 'unicode'>, None)
 command: netgroup_add_member
 args: 1,8,3
-arg: Str('cn', attribute=True, cli_name='name', label=Gettext('Netgroup name', domain='ipa', localedir=None), multivalue=False, normalizer=<lambda>, primary_key=True, query=True, required=True)
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-option: List('user?', alwaysask=True, cli_name='users', label=u'member user', multivalue=True)
-option: List('group?', alwaysask=True, cli_name='groups', label=u'member group', multivalue=True)
-option: List('host?', alwaysask=True, cli_name='hosts', label=u'member host', multivalue=True)
-option: List('hostgroup?', alwaysask=True, cli_name='hostgroups', label=u'member host group', multivalue=True)
-option: List('netgroup?', alwaysask=True, cli_name='netgroups', label=u'member netgroup', multivalue=True)
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('failed', <type 'dict'>, Gettext('Members that could not be added', domain='ipa', localedir=None))
-output: Output('completed', <type 'int'>, Gettext('Number of members added', domain='ipa', localedir=None))
+arg: Str('cn', attribute=True, cli_name='name', multivalue=False, primary_key=True, query=True, required=True)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+option: List('user?', alwaysask=True, cli_name='users', multivalue=True)
+option: List('group?', alwaysask=True, cli_name='groups', multivalue=True)
+option: List('host?', alwaysask=True, cli_name='hosts', multivalue=True)
+option: List('hostgroup?', alwaysask=True, cli_name='hostgroups', multivalue=True)
+option: List('netgroup?', alwaysask=True, cli_name='netgroups', multivalue=True)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('failed', <type 'dict'>, None)
+output: Output('completed', <type 'int'>, None)
 command: netgroup_del
 args: 1,1,3
-arg: Str('cn', attribute=True, cli_name='name', label=Gettext('Netgroup name', domain='ipa', localedir=None), multivalue=True, normalizer=<lambda>, primary_key=True, query=True, required=True)
+arg: Str('cn', attribute=True, cli_name='name', multivalue=True, primary_key=True, query=True, required=True)
 option: Flag('continue', autofill=True, cli_name='continue', default=False)
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Output('result', <type 'dict'>, 'list of deletions that failed')
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Output('result', <type 'dict'>, None)
+output: Output('value', <type 'unicode'>, None)
 command: netgroup_find
 args: 1,26,4
 arg: Str('criteria?', noextrawhitespace=False)
-option: Str('cn', attribute=True, autofill=False, cli_name='name', label=Gettext('Netgroup name', domain='ipa', localedir=None), multivalue=False, normalizer=<lambda>, primary_key=True, query=True, required=False)
-option: Str('description', attribute=True, autofill=False, cli_name='desc', label=Gettext('Description', domain='ipa', localedir=None), multivalue=False, query=True, required=False)
-option: Str('nisdomainname', attribute=True, autofill=False, cli_name='nisdomain', label=Gettext('NIS domain name', domain='ipa', localedir=None), multivalue=False, query=True, required=False)
-option: Str('ipauniqueid', attribute=True, autofill=False, cli_name='uuid', flags=['no_create', 'no_update'], label='IPA unique ID', multivalue=False, query=True, required=False)
-option: StrEnum('usercategory', attribute=True, autofill=False, cli_name='usercat', label=Gettext('User category', domain='ipa', localedir=None), multivalue=False, query=True, required=False, values=(u'all',))
-option: StrEnum('hostcategory', attribute=True, autofill=False, cli_name='hostcat', label=Gettext('Host category', domain='ipa', localedir=None), multivalue=False, query=True, required=False, values=(u'all',))
-option: Int('timelimit?', autofill=False, flags=['no_display'], label=Gettext('Time Limit', domain='ipa', localedir=None), minvalue=0)
-option: Int('sizelimit?', autofill=False, flags=['no_display'], label=Gettext('Size Limit', domain='ipa', localedir=None), minvalue=0)
-option: Flag('private', autofill=True, default=False, exclude='webui', flags=['no_option', 'no_output'])
-option: Flag('managed', autofill=True, cli_name='managed', default=False, default_from=<lambda>)
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-option: Flag('pkey_only?', autofill=True, default=False', label=Gettext('Primary key only', domain='ipa', localedir=None))
-option: List('netgroup?', cli_name='netgroups', label=Gettext('netgroup', domain='ipa', localedir=None), multivalue=True)
-option: List('no_netgroup?', cli_name='no_netgroups', label=Gettext('netgroup', domain='ipa', localedir=None), multivalue=True)
-option: List('user?', cli_name='users', label=Gettext('user', domain='ipa', localedir=None), multivalue=True)
-option: List('no_user?', cli_name='no_users', label=Gettext('user', domain='ipa', localedir=None), multivalue=True)
-option: List('group?', cli_name='groups', label=Gettext('group', domain='ipa', localedir=None), multivalue=True)
-option: List('no_group?', cli_name='no_groups', label=Gettext('group', domain='ipa', localedir=None), multivalue=True)
-option: List('host?', cli_name='hosts', label=Gettext('host', domain='ipa', localedir=None), multivalue=True)
-option: List('no_host?', cli_name='no_hosts', label=Gettext('host', domain='ipa', localedir=None), multivalue=True)
-option: List('hostgroup?', cli_name='hostgroups', label=Gettext('host group', domain='ipa', localedir=None), multivalue=True)
-option: List('no_hostgroup?', cli_name='no_hostgroups', label=Gettext('host group', domain='ipa', localedir=None), multivalue=True)
-option: List('in_netgroup?', cli_name='in_netgroups', label=Gettext('netgroup', domain='ipa', localedir=None), multivalue=True)
-option: List('not_in_netgroup?', cli_name='not_in_netgroups', label=Gettext('netgroup', domain='ipa', localedir=None), multivalue=True)
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
+option: Str('cn', attribute=True, autofill=False, cli_name='name', multivalue=False, primary_key=True, query=True, required=False)
+option: Str('description', attribute=True, autofill=False, cli_name='desc', multivalue=False, query=True, required=False)
+option: Str('nisdomainname', attribute=True, autofill=False, cli_name='nisdomain', multivalue=False, query=True, required=False)
+option: Str('ipauniqueid', attribute=True, autofill=False, cli_name='uuid', multivalue=False, query=True, required=False)
+option: StrEnum('usercategory', attribute=True, autofill=False, cli_name='usercat', multivalue=False, query=True, required=False, values=(u'all',))
+option: StrEnum('hostcategory', attribute=True, autofill=False, cli_name='hostcat', multivalue=False, query=True, required=False, values=(u'all',))
+option: Int('timelimit?', autofill=False, minvalue=0)
+option: Int('sizelimit?', autofill=False, minvalue=0)
+option: Flag('private', autofill=True, default=False, exclude='webui')
+option: Flag('managed', autofill=True, cli_name='managed', default=False)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+option: Flag('pkey_only?', autofill=True, default=False)
+option: List('netgroup?', cli_name='netgroups', multivalue=True)
+option: List('no_netgroup?', cli_name='no_netgroups', multivalue=True)
+option: List('user?', cli_name='users', multivalue=True)
+option: List('no_user?', cli_name='no_users', multivalue=True)
+option: List('group?', cli_name='groups', multivalue=True)
+option: List('no_group?', cli_name='no_groups', multivalue=True)
+option: List('host?', cli_name='hosts', multivalue=True)
+option: List('no_host?', cli_name='no_hosts', multivalue=True)
+option: List('hostgroup?', cli_name='hostgroups', multivalue=True)
+option: List('no_hostgroup?', cli_name='no_hostgroups', multivalue=True)
+option: List('in_netgroup?', cli_name='in_netgroups', multivalue=True)
+option: List('not_in_netgroup?', cli_name='not_in_netgroups', multivalue=True)
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
 output: ListOfEntries('result', (<type 'list'>, <type 'tuple'>), Gettext('A list of LDAP entries', domain='ipa', localedir=None))
-output: Output('count', <type 'int'>, 'Number of entries returned')
-output: Output('truncated', <type 'bool'>, 'True if not all results were returned')
+output: Output('count', <type 'int'>, None)
+output: Output('truncated', <type 'bool'>, None)
 command: netgroup_mod
 args: 1,10,3
-arg: Str('cn', attribute=True, cli_name='name', label=Gettext('Netgroup name', domain='ipa', localedir=None), multivalue=False, normalizer=<lambda>, primary_key=True, query=True, required=True)
-option: Str('description', attribute=True, autofill=False, cli_name='desc', label=Gettext('Description', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Str('nisdomainname', attribute=True, autofill=False, cli_name='nisdomain', label=Gettext('NIS domain name', domain='ipa', localedir=None), multivalue=False, required=False)
-option: StrEnum('usercategory', attribute=True, autofill=False, cli_name='usercat', label=Gettext('User category', domain='ipa', localedir=None), multivalue=False, required=False, values=(u'all',))
-option: StrEnum('hostcategory', attribute=True, autofill=False, cli_name='hostcat', label=Gettext('Host category', domain='ipa', localedir=None), multivalue=False, required=False, values=(u'all',))
-option: Str('addattr*', validate_add_attribute, cli_name='addattr', exclude='webui')
-option: Str('setattr*', validate_set_attribute, cli_name='setattr', exclude='webui')
-option: Flag('rights', autofill=True, default=False, label=Gettext('Rights', domain='ipa', localedir=None))
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+arg: Str('cn', attribute=True, cli_name='name', multivalue=False, primary_key=True, query=True, required=True)
+option: Str('description', attribute=True, autofill=False, cli_name='desc', multivalue=False, required=False)
+option: Str('nisdomainname', attribute=True, autofill=False, cli_name='nisdomain', multivalue=False, required=False)
+option: StrEnum('usercategory', attribute=True, autofill=False, cli_name='usercat', multivalue=False, required=False, values=(u'all',))
+option: StrEnum('hostcategory', attribute=True, autofill=False, cli_name='hostcat', multivalue=False, required=False, values=(u'all',))
+option: Str('addattr*', cli_name='addattr', exclude='webui')
+option: Str('setattr*', cli_name='setattr', exclude='webui')
+option: Flag('rights', autofill=True, default=False)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('value', <type 'unicode'>, None)
 command: netgroup_remove_member
 args: 1,8,3
-arg: Str('cn', attribute=True, cli_name='name', label=Gettext('Netgroup name', domain='ipa', localedir=None), multivalue=False, normalizer=<lambda>, primary_key=True, query=True, required=True)
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-option: List('user?', alwaysask=True, cli_name='users', label=u'member user', multivalue=True)
-option: List('group?', alwaysask=True, cli_name='groups', label=u'member group', multivalue=True)
-option: List('host?', alwaysask=True, cli_name='hosts', label=u'member host', multivalue=True)
-option: List('hostgroup?', alwaysask=True, cli_name='hostgroups', label=u'member host group', multivalue=True)
-option: List('netgroup?', alwaysask=True, cli_name='netgroups', label=u'member netgroup', multivalue=True)
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('failed', <type 'dict'>, Gettext('Members that could not be removed', domain='ipa', localedir=None))
-output: Output('completed', <type 'int'>, Gettext('Number of members removed', domain='ipa', localedir=None))
+arg: Str('cn', attribute=True, cli_name='name', multivalue=False, primary_key=True, query=True, required=True)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+option: List('user?', alwaysask=True, cli_name='users', multivalue=True)
+option: List('group?', alwaysask=True, cli_name='groups', multivalue=True)
+option: List('host?', alwaysask=True, cli_name='hosts', multivalue=True)
+option: List('hostgroup?', alwaysask=True, cli_name='hostgroups', multivalue=True)
+option: List('netgroup?', alwaysask=True, cli_name='netgroups', multivalue=True)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('failed', <type 'dict'>, None)
+output: Output('completed', <type 'int'>, None)
 command: netgroup_show
 args: 1,4,3
-arg: Str('cn', attribute=True, cli_name='name', label=Gettext('Netgroup name', domain='ipa', localedir=None), multivalue=False, normalizer=<lambda>, primary_key=True, query=True, required=True)
-option: Flag('rights', autofill=True, default=False, label=Gettext('Rights', domain='ipa', localedir=None))
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+arg: Str('cn', attribute=True, cli_name='name', multivalue=False, primary_key=True, query=True, required=True)
+option: Flag('rights', autofill=True, default=False)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('value', <type 'unicode'>, None)
 command: passwd
 args: 3,0,3
-arg: Str('principal', validate_principal, autofill=True, cli_name='user', create_default=<lambda>, label=Gettext('User name', domain='ipa', localedir=None), normalizer=<lambda>, primary_key=True)
-arg: Password('password', label=Gettext('New Password', domain='ipa', localedir=None))
-arg: Password('current_password', autofill=True, confirm=False, default_from=<lambda>, label=Gettext('Current Password', domain='ipa', localedir=None), sortorder=-1)
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Output('result', <type 'bool'>, 'True means the operation was successful')
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+arg: Str('principal', autofill=True, cli_name='user', primary_key=True)
+arg: Password('password')
+arg: Password('current_password', autofill=True, confirm=False)
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Output('result', <type 'bool'>, None)
+output: Output('value', <type 'unicode'>, None)
 command: permission_add
 args: 1,12,3
-arg: Str('cn', attribute=True, cli_name='name', label=Gettext('Permission name', domain='ipa', localedir=None), multivalue=False, primary_key=True, required=True)
-option: List('permissions', attribute=True, cli_name='permissions', label=Gettext('Permissions', domain='ipa', localedir=None), multivalue=True, required=True)
-option: List('attrs', alwaysask=True, attribute=True, autofill=False, cli_name='attrs', flags=('ask_create', 'ask_update'), label=Gettext('Attributes', domain='ipa', localedir=None), multivalue=True, normalizer=<lambda>, query=True, required=False)
-option: StrEnum('type', alwaysask=True, attribute=True, autofill=False, cli_name='type', flags=('ask_create', 'ask_update'), label=Gettext('Type', domain='ipa', localedir=None), multivalue=False, query=True, required=False, values=(u'user', u'group', u'host', u'service', u'hostgroup', u'netgroup', u'dnsrecord'))
-option: Str('memberof', alwaysask=True, attribute=True, autofill=False, cli_name='memberof', flags=('ask_create', 'ask_update'), label=Gettext('Member of group', domain='ipa', localedir=None), multivalue=False, query=True, required=False)
-option: Str('filter', alwaysask=True, attribute=True, autofill=False, cli_name='filter', flags=('ask_create', 'ask_update'), label=Gettext('Filter', domain='ipa', localedir=None), multivalue=False, query=True, required=False)
-option: Str('subtree', alwaysask=True, attribute=True, autofill=False, cli_name='subtree', flags=('ask_create', 'ask_update'), label=Gettext('Subtree', domain='ipa', localedir=None), multivalue=False, query=True, required=False)
-option: Str('targetgroup', alwaysask=True, attribute=True, autofill=False, cli_name='targetgroup', flags=('ask_create', 'ask_update'), label=Gettext('Target group', domain='ipa', localedir=None), multivalue=False, query=True, required=False)
-option: Str('addattr*', validate_add_attribute, cli_name='addattr', exclude='webui')
-option: Str('setattr*', validate_set_attribute, cli_name='setattr', exclude='webui')
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+arg: Str('cn', attribute=True, cli_name='name', multivalue=False, primary_key=True, required=True)
+option: List('permissions', attribute=True, cli_name='permissions', multivalue=True, required=True)
+option: List('attrs', alwaysask=True, attribute=True, autofill=False, cli_name='attrs', multivalue=True, query=True, required=False)
+option: StrEnum('type', alwaysask=True, attribute=True, autofill=False, cli_name='type', multivalue=False, query=True, required=False, values=(u'user', u'group', u'host', u'service', u'hostgroup', u'netgroup', u'dnsrecord'))
+option: Str('memberof', alwaysask=True, attribute=True, autofill=False, cli_name='memberof', multivalue=False, query=True, required=False)
+option: Str('filter', alwaysask=True, attribute=True, autofill=False, cli_name='filter', multivalue=False, query=True, required=False)
+option: Str('subtree', alwaysask=True, attribute=True, autofill=False, cli_name='subtree', multivalue=False, query=True, required=False)
+option: Str('targetgroup', alwaysask=True, attribute=True, autofill=False, cli_name='targetgroup', multivalue=False, query=True, required=False)
+option: Str('addattr*', cli_name='addattr', exclude='webui')
+option: Str('setattr*', cli_name='setattr', exclude='webui')
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('value', <type 'unicode'>, None)
 command: permission_add_member
 args: 1,4,3
-arg: Str('cn', attribute=True, cli_name='name', label=Gettext('Permission name', domain='ipa', localedir=None), multivalue=False, primary_key=True, query=True, required=True)
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-option: List('privilege?', alwaysask=True, cli_name='privileges', label=u'member privilege', multivalue=True)
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('failed', <type 'dict'>, Gettext('Members that could not be added', domain='ipa', localedir=None))
-output: Output('completed', <type 'int'>, Gettext('Number of members added', domain='ipa', localedir=None))
+arg: Str('cn', attribute=True, cli_name='name', multivalue=False, primary_key=True, query=True, required=True)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+option: List('privilege?', alwaysask=True, cli_name='privileges', multivalue=True)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('failed', <type 'dict'>, None)
+output: Output('completed', <type 'int'>, None)
 command: permission_del
 args: 1,1,3
-arg: Str('cn', attribute=True, cli_name='name', label=Gettext('Permission name', domain='ipa', localedir=None), multivalue=True, primary_key=True, query=True, required=True)
+arg: Str('cn', attribute=True, cli_name='name', multivalue=True, primary_key=True, query=True, required=True)
 option: Flag('continue', autofill=True, cli_name='continue', default=False)
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Output('result', <type 'dict'>, 'list of deletions that failed')
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Output('result', <type 'dict'>, None)
+output: Output('value', <type 'unicode'>, None)
 command: permission_find
 args: 1,14,4
 arg: Str('criteria?', noextrawhitespace=False)
-option: Str('cn', attribute=True, autofill=False, cli_name='name', label=Gettext('Permission name', domain='ipa', localedir=None), multivalue=False, primary_key=True, query=True, required=False)
-option: List('permissions', attribute=True, autofill=False, cli_name='permissions', label=Gettext('Permissions', domain='ipa', localedir=None), multivalue=True, query=True, required=False)
-option: List('attrs', attribute=True, autofill=False, cli_name='attrs', flags=('ask_create', 'ask_update'), label=Gettext('Attributes', domain='ipa', localedir=None), multivalue=True, normalizer=<lambda>, query=True, required=False)
-option: StrEnum('type', attribute=True, autofill=False, cli_name='type', flags=('ask_create', 'ask_update'), label=Gettext('Type', domain='ipa', localedir=None), multivalue=False, query=True, required=False, values=(u'user', u'group', u'host', u'service', u'hostgroup', u'netgroup', u'dnsrecord'))
-option: Str('memberof', attribute=True, autofill=False, cli_name='memberof', flags=('ask_create', 'ask_update'), label=Gettext('Member of group', domain='ipa', localedir=None), multivalue=False, query=True, required=False)
-option: Str('filter', attribute=True, autofill=False, cli_name='filter', flags=('ask_create', 'ask_update'), label=Gettext('Filter', domain='ipa', localedir=None), multivalue=False, query=True, required=False)
-option: Str('subtree', attribute=True, autofill=False, cli_name='subtree', flags=('ask_create', 'ask_update'), label=Gettext('Subtree', domain='ipa', localedir=None), multivalue=False, query=True, required=False)
-option: Str('targetgroup', attribute=True, autofill=False, cli_name='targetgroup', flags=('ask_create', 'ask_update'), label=Gettext('Target group', domain='ipa', localedir=None), multivalue=False, query=True, required=False)
-option: Int('timelimit?', autofill=False, flags=['no_display'], label=Gettext('Time Limit', domain='ipa', localedir=None), minvalue=0)
-option: Int('sizelimit?', autofill=False, flags=['no_display'], label=Gettext('Size Limit', domain='ipa', localedir=None), minvalue=0)
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-option: Flag('pkey_only?', autofill=True, default=False', label=Gettext('Primary key only', domain='ipa', localedir=None))
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
+option: Str('cn', attribute=True, autofill=False, cli_name='name', multivalue=False, primary_key=True, query=True, required=False)
+option: List('permissions', attribute=True, autofill=False, cli_name='permissions', multivalue=True, query=True, required=False)
+option: List('attrs', attribute=True, autofill=False, cli_name='attrs', multivalue=True, query=True, required=False)
+option: StrEnum('type', attribute=True, autofill=False, cli_name='type', multivalue=False, query=True, required=False, values=(u'user', u'group', u'host', u'service', u'hostgroup', u'netgroup', u'dnsrecord'))
+option: Str('memberof', attribute=True, autofill=False, cli_name='memberof', multivalue=False, query=True, required=False)
+option: Str('filter', attribute=True, autofill=False, cli_name='filter', multivalue=False, query=True, required=False)
+option: Str('subtree', attribute=True, autofill=False, cli_name='subtree', multivalue=False, query=True, required=False)
+option: Str('targetgroup', attribute=True, autofill=False, cli_name='targetgroup', multivalue=False, query=True, required=False)
+option: Int('timelimit?', autofill=False, minvalue=0)
+option: Int('sizelimit?', autofill=False, minvalue=0)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+option: Flag('pkey_only?', autofill=True, default=False)
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
 output: ListOfEntries('result', (<type 'list'>, <type 'tuple'>), Gettext('A list of LDAP entries', domain='ipa', localedir=None))
-output: Output('count', <type 'int'>, 'Number of entries returned')
-output: Output('truncated', <type 'bool'>, 'True if not all results were returned')
+output: Output('count', <type 'int'>, None)
+output: Output('truncated', <type 'bool'>, None)
 command: permission_mod
 args: 1,14,3
-arg: Str('cn', attribute=True, cli_name='name', label=Gettext('Permission name', domain='ipa', localedir=None), multivalue=False, primary_key=True, query=True, required=True)
-option: List('permissions', attribute=True, autofill=False, cli_name='permissions', label=Gettext('Permissions', domain='ipa', localedir=None), multivalue=True, required=False)
-option: List('attrs', alwaysask=True, attribute=True, autofill=False, cli_name='attrs', flags=('ask_create', 'ask_update'), label=Gettext('Attributes', domain='ipa', localedir=None), multivalue=True, normalizer=<lambda>, query=True, required=False)
-option: StrEnum('type', alwaysask=True, attribute=True, autofill=False, cli_name='type', flags=('ask_create', 'ask_update'), label=Gettext('Type', domain='ipa', localedir=None), multivalue=False, query=True, required=False, values=(u'user', u'group', u'host', u'service', u'hostgroup', u'netgroup', u'dnsrecord'))
-option: Str('memberof', alwaysask=True, attribute=True, autofill=False, cli_name='memberof', flags=('ask_create', 'ask_update'), label=Gettext('Member of group', domain='ipa', localedir=None), multivalue=False, query=True, required=False)
-option: Str('filter', alwaysask=True, attribute=True, autofill=False, cli_name='filter', flags=('ask_create', 'ask_update'), label=Gettext('Filter', domain='ipa', localedir=None), multivalue=False, query=True, required=False)
-option: Str('subtree', alwaysask=True, attribute=True, autofill=False, cli_name='subtree', flags=('ask_create', 'ask_update'), label=Gettext('Subtree', domain='ipa', localedir=None), multivalue=False, query=True, required=False)
-option: Str('targetgroup', alwaysask=True, attribute=True, autofill=False, cli_name='targetgroup', flags=('ask_create', 'ask_update'), label=Gettext('Target group', domain='ipa', localedir=None), multivalue=False, query=True, required=False)
-option: Str('addattr*', validate_add_attribute, cli_name='addattr', exclude='webui')
-option: Str('setattr*', validate_set_attribute, cli_name='setattr', exclude='webui')
-option: Flag('rights', autofill=True, default=False, label=Gettext('Rights', domain='ipa', localedir=None))
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-option: Str('rename', cli_name='rename', label=Gettext('Rename', domain='ipa', localedir=None), multivalue=False, primary_key=True, required=False)
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+arg: Str('cn', attribute=True, cli_name='name', multivalue=False, primary_key=True, query=True, required=True)
+option: List('permissions', attribute=True, autofill=False, cli_name='permissions', multivalue=True, required=False)
+option: List('attrs', alwaysask=True, attribute=True, autofill=False, cli_name='attrs', multivalue=True, query=True, required=False)
+option: StrEnum('type', alwaysask=True, attribute=True, autofill=False, cli_name='type', multivalue=False, query=True, required=False, values=(u'user', u'group', u'host', u'service', u'hostgroup', u'netgroup', u'dnsrecord'))
+option: Str('memberof', alwaysask=True, attribute=True, autofill=False, cli_name='memberof', multivalue=False, query=True, required=False)
+option: Str('filter', alwaysask=True, attribute=True, autofill=False, cli_name='filter', multivalue=False, query=True, required=False)
+option: Str('subtree', alwaysask=True, attribute=True, autofill=False, cli_name='subtree', multivalue=False, query=True, required=False)
+option: Str('targetgroup', alwaysask=True, attribute=True, autofill=False, cli_name='targetgroup', multivalue=False, query=True, required=False)
+option: Str('addattr*', cli_name='addattr', exclude='webui')
+option: Str('setattr*', cli_name='setattr', exclude='webui')
+option: Flag('rights', autofill=True, default=False)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+option: Str('rename', cli_name='rename', multivalue=False, primary_key=True, required=False)
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('value', <type 'unicode'>, None)
 command: permission_remove_member
 args: 1,4,3
-arg: Str('cn', attribute=True, cli_name='name', label=Gettext('Permission name', domain='ipa', localedir=None), multivalue=False, primary_key=True, query=True, required=True)
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-option: List('privilege?', alwaysask=True, cli_name='privileges', label=u'member privilege', multivalue=True)
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('failed', <type 'dict'>, Gettext('Members that could not be removed', domain='ipa', localedir=None))
-output: Output('completed', <type 'int'>, Gettext('Number of members removed', domain='ipa', localedir=None))
+arg: Str('cn', attribute=True, cli_name='name', multivalue=False, primary_key=True, query=True, required=True)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+option: List('privilege?', alwaysask=True, cli_name='privileges', multivalue=True)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('failed', <type 'dict'>, None)
+output: Output('completed', <type 'int'>, None)
 command: permission_show
 args: 1,4,3
-arg: Str('cn', attribute=True, cli_name='name', label=Gettext('Permission name', domain='ipa', localedir=None), multivalue=False, primary_key=True, query=True, required=True)
-option: Flag('rights', autofill=True, default=False, label=Gettext('Rights', domain='ipa', localedir=None))
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+arg: Str('cn', attribute=True, cli_name='name', multivalue=False, primary_key=True, query=True, required=True)
+option: Flag('rights', autofill=True, default=False)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('value', <type 'unicode'>, None)
 command: ping
 args: 0,0,1
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
 command: pkinit_anonymous
 args: 1,0,1
-arg: Str('action', valid_arg)
+arg: Str('action')
 output: Output('result', None, None)
 command: plugins
 args: 0,2,3
 option: Flag('server?', autofill=True, default=False)
-option: Flag('all', autofill=True, cli_name='all', default=True, exclude='webui', flags=['no_output'])
-output: Output('result', <type 'dict'>, 'Dictionary mapping plugin names to bases')
-output: Output('count', <type 'int'>, Gettext('Number of plugins loaded', domain='ipa', localedir=None))
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
+option: Flag('all', autofill=True, cli_name='all', default=True, exclude='webui')
+output: Output('result', <type 'dict'>, None)
+output: Output('count', <type 'int'>, None)
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
 command: privilege_add
 args: 1,6,3
-arg: Str('cn', attribute=True, cli_name='name', label=Gettext('Privilege name', domain='ipa', localedir=None), multivalue=False, primary_key=True, required=True)
-option: Str('description', attribute=True, cli_name='desc', label=Gettext('Description', domain='ipa', localedir=None), multivalue=False, required=True)
-option: Str('addattr*', validate_add_attribute, cli_name='addattr', exclude='webui')
-option: Str('setattr*', validate_set_attribute, cli_name='setattr', exclude='webui')
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+arg: Str('cn', attribute=True, cli_name='name', multivalue=False, primary_key=True, required=True)
+option: Str('description', attribute=True, cli_name='desc', multivalue=False, required=True)
+option: Str('addattr*', cli_name='addattr', exclude='webui')
+option: Str('setattr*', cli_name='setattr', exclude='webui')
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('value', <type 'unicode'>, None)
 command: privilege_add_member
 args: 1,4,3
-arg: Str('cn', attribute=True, cli_name='name', label=Gettext('Privilege name', domain='ipa', localedir=None), multivalue=False, primary_key=True, query=True, required=True)
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-option: List('role?', alwaysask=True, cli_name='roles', label=u'member role', multivalue=True)
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('failed', <type 'dict'>, Gettext('Members that could not be added', domain='ipa', localedir=None))
-output: Output('completed', <type 'int'>, Gettext('Number of members added', domain='ipa', localedir=None))
+arg: Str('cn', attribute=True, cli_name='name', multivalue=False, primary_key=True, query=True, required=True)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+option: List('role?', alwaysask=True, cli_name='roles', multivalue=True)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('failed', <type 'dict'>, None)
+output: Output('completed', <type 'int'>, None)
 command: privilege_add_permission
 args: 1,4,3
-arg: Str('cn', attribute=True, cli_name='name', label=Gettext('Privilege name', domain='ipa', localedir=None), multivalue=False, primary_key=True, query=True, required=True)
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-option: List('permission?', alwaysask=True, cli_name='permissions', label=Gettext('permission', domain='ipa', localedir=None), multivalue=True)
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('failed', <type 'dict'>, Gettext('Members that could not be added', domain='ipa', localedir=None))
-output: Output('completed', <type 'int'>, Gettext('Number of permissions added', domain='ipa', localedir=None))
+arg: Str('cn', attribute=True, cli_name='name', multivalue=False, primary_key=True, query=True, required=True)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+option: List('permission?', alwaysask=True, cli_name='permissions', multivalue=True)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('failed', <type 'dict'>, None)
+output: Output('completed', <type 'int'>, None)
 command: privilege_del
 args: 1,1,3
-arg: Str('cn', attribute=True, cli_name='name', label=Gettext('Privilege name', domain='ipa', localedir=None), multivalue=True, primary_key=True, query=True, required=True)
+arg: Str('cn', attribute=True, cli_name='name', multivalue=True, primary_key=True, query=True, required=True)
 option: Flag('continue', autofill=True, cli_name='continue', default=False)
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Output('result', <type 'dict'>, 'list of deletions that failed')
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Output('result', <type 'dict'>, None)
+output: Output('value', <type 'unicode'>, None)
 command: privilege_find
 args: 1,8,4
 arg: Str('criteria?', noextrawhitespace=False)
-option: Str('cn', attribute=True, autofill=False, cli_name='name', label=Gettext('Privilege name', domain='ipa', localedir=None), multivalue=False, primary_key=True, query=True, required=False)
-option: Str('description', attribute=True, autofill=False, cli_name='desc', label=Gettext('Description', domain='ipa', localedir=None), multivalue=False, query=True, required=False)
-option: Int('timelimit?', autofill=False, flags=['no_display'], label=Gettext('Time Limit', domain='ipa', localedir=None), minvalue=0)
-option: Int('sizelimit?', autofill=False, flags=['no_display'], label=Gettext('Size Limit', domain='ipa', localedir=None), minvalue=0)
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-option: Flag('pkey_only?', autofill=True, default=False', label=Gettext('Primary key only', domain='ipa', localedir=None))
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
+option: Str('cn', attribute=True, autofill=False, cli_name='name', multivalue=False, primary_key=True, query=True, required=False)
+option: Str('description', attribute=True, autofill=False, cli_name='desc', multivalue=False, query=True, required=False)
+option: Int('timelimit?', autofill=False, minvalue=0)
+option: Int('sizelimit?', autofill=False, minvalue=0)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+option: Flag('pkey_only?', autofill=True, default=False)
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
 output: ListOfEntries('result', (<type 'list'>, <type 'tuple'>), Gettext('A list of LDAP entries', domain='ipa', localedir=None))
-output: Output('count', <type 'int'>, 'Number of entries returned')
-output: Output('truncated', <type 'bool'>, 'True if not all results were returned')
+output: Output('count', <type 'int'>, None)
+output: Output('truncated', <type 'bool'>, None)
 command: privilege_mod
 args: 1,8,3
-arg: Str('cn', attribute=True, cli_name='name', label=Gettext('Privilege name', domain='ipa', localedir=None), multivalue=False, primary_key=True, query=True, required=True)
-option: Str('description', attribute=True, autofill=False, cli_name='desc', label=Gettext('Description', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Str('addattr*', validate_add_attribute, cli_name='addattr', exclude='webui')
-option: Str('setattr*', validate_set_attribute, cli_name='setattr', exclude='webui')
-option: Flag('rights', autofill=True, default=False, label=Gettext('Rights', domain='ipa', localedir=None))
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-option: Str('rename', cli_name='rename', label=Gettext('Rename', domain='ipa', localedir=None), multivalue=False, primary_key=True, required=False)
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+arg: Str('cn', attribute=True, cli_name='name', multivalue=False, primary_key=True, query=True, required=True)
+option: Str('description', attribute=True, autofill=False, cli_name='desc', multivalue=False, required=False)
+option: Str('addattr*', cli_name='addattr', exclude='webui')
+option: Str('setattr*', cli_name='setattr', exclude='webui')
+option: Flag('rights', autofill=True, default=False)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+option: Str('rename', cli_name='rename', multivalue=False, primary_key=True, required=False)
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('value', <type 'unicode'>, None)
 command: privilege_remove_member
 args: 1,4,3
-arg: Str('cn', attribute=True, cli_name='name', label=Gettext('Privilege name', domain='ipa', localedir=None), multivalue=False, primary_key=True, query=True, required=True)
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-option: List('role?', alwaysask=True, cli_name='roles', label=u'member role', multivalue=True)
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('failed', <type 'dict'>, Gettext('Members that could not be removed', domain='ipa', localedir=None))
-output: Output('completed', <type 'int'>, Gettext('Number of members removed', domain='ipa', localedir=None))
+arg: Str('cn', attribute=True, cli_name='name', multivalue=False, primary_key=True, query=True, required=True)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+option: List('role?', alwaysask=True, cli_name='roles', multivalue=True)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('failed', <type 'dict'>, None)
+output: Output('completed', <type 'int'>, None)
 command: privilege_remove_permission
 args: 1,4,3
-arg: Str('cn', attribute=True, cli_name='name', label=Gettext('Privilege name', domain='ipa', localedir=None), multivalue=False, primary_key=True, query=True, required=True)
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-option: List('permission?', alwaysask=True, cli_name='permissions', label=Gettext('permission', domain='ipa', localedir=None), multivalue=True)
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('failed', <type 'dict'>, Gettext('Members that could not be added', domain='ipa', localedir=None))
-output: Output('completed', <type 'int'>, Gettext('Number of permissions removed', domain='ipa', localedir=None))
+arg: Str('cn', attribute=True, cli_name='name', multivalue=False, primary_key=True, query=True, required=True)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+option: List('permission?', alwaysask=True, cli_name='permissions', multivalue=True)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('failed', <type 'dict'>, None)
+output: Output('completed', <type 'int'>, None)
 command: privilege_show
 args: 1,4,3
-arg: Str('cn', attribute=True, cli_name='name', label=Gettext('Privilege name', domain='ipa', localedir=None), multivalue=False, primary_key=True, query=True, required=True)
-option: Flag('rights', autofill=True, default=False, label=Gettext('Rights', domain='ipa', localedir=None))
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+arg: Str('cn', attribute=True, cli_name='name', multivalue=False, primary_key=True, query=True, required=True)
+option: Flag('rights', autofill=True, default=False)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('value', <type 'unicode'>, None)
 command: pwpolicy_add
 args: 1,14,3
-arg: Str('cn', attribute=True, cli_name='group', label=Gettext('Group', domain='ipa', localedir=None), multivalue=False, primary_key=True, required=True)
-option: Int('krbmaxpwdlife', attribute=True, cli_name='maxlife', label=Gettext('Max lifetime (days)', domain='ipa', localedir=None), minvalue=0, multivalue=False, required=False)
-option: Int('krbminpwdlife', attribute=True, cli_name='minlife', label=Gettext('Min lifetime (hours)', domain='ipa', localedir=None), minvalue=0, multivalue=False, required=False)
-option: Int('krbpwdhistorylength', attribute=True, cli_name='history', label=Gettext('History size', domain='ipa', localedir=None), minvalue=0, multivalue=False, required=False)
-option: Int('krbpwdmindiffchars', attribute=True, cli_name='minclasses', label=Gettext('Character classes', domain='ipa', localedir=None), maxvalue=5, minvalue=0, multivalue=False, required=False)
-option: Int('krbpwdminlength', attribute=True, cli_name='minlength', label=Gettext('Min length', domain='ipa', localedir=None), minvalue=0, multivalue=False, required=False)
-option: Int('cospriority', attribute=False, cli_name='priority'('Priority of the policy (higher number means lower priority', domain='ipa', localedir=None), flags=('virtual_attribute',), label=Gettext('Priority', domain='ipa', localedir=None), minvalue=0, multivalue=False, required=True)
-option: Int('krbpwdmaxfailure', attribute=True, cli_name='maxfail', label=Gettext('Max failures', domain='ipa', localedir=None), minvalue=0, multivalue=False, required=False)
-option: Int('krbpwdfailurecountinterval', attribute=True, cli_name='failinterval', label=Gettext('Failure reset interval', domain='ipa', localedir=None), minvalue=0, multivalue=False, required=False)
-option: Int('krbpwdlockoutduration', attribute=True, cli_name='lockouttime', label=Gettext('Lockout duration', domain='ipa', localedir=None), minvalue=0, multivalue=False, required=False)
-option: Str('addattr*', validate_add_attribute, cli_name='addattr', exclude='webui')
-option: Str('setattr*', validate_set_attribute, cli_name='setattr', exclude='webui')
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+arg: Str('cn', attribute=True, cli_name='group', multivalue=False, primary_key=True, required=True)
+option: Int('krbmaxpwdlife', attribute=True, cli_name='maxlife', minvalue=0, multivalue=False, required=False)
+option: Int('krbminpwdlife', attribute=True, cli_name='minlife', minvalue=0, multivalue=False, required=False)
+option: Int('krbpwdhistorylength', attribute=True, cli_name='history', minvalue=0, multivalue=False, required=False)
+option: Int('krbpwdmindiffchars', attribute=True, cli_name='minclasses', maxvalue=5, minvalue=0, multivalue=False, required=False)
+option: Int('krbpwdminlength', attribute=True, cli_name='minlength', minvalue=0, multivalue=False, required=False)
+option: Int('cospriority', attribute=False, cli_name='priority', minvalue=0, multivalue=False, required=True)
+option: Int('krbpwdmaxfailure', attribute=True, cli_name='maxfail', minvalue=0, multivalue=False, required=False)
+option: Int('krbpwdfailurecountinterval', attribute=True, cli_name='failinterval', minvalue=0, multivalue=False, required=False)
+option: Int('krbpwdlockoutduration', attribute=True, cli_name='lockouttime', minvalue=0, multivalue=False, required=False)
+option: Str('addattr*', cli_name='addattr', exclude='webui')
+option: Str('setattr*', cli_name='setattr', exclude='webui')
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('value', <type 'unicode'>, None)
 command: pwpolicy_del
 args: 1,1,3
-arg: Str('cn', attribute=True, cli_name='group', label=Gettext('Group', domain='ipa', localedir=None), multivalue=True, primary_key=True, required=True)
+arg: Str('cn', attribute=True, cli_name='group', multivalue=True, primary_key=True, required=True)
 option: Flag('continue', autofill=True, cli_name='continue', default=False)
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Output('result', <type 'dict'>, 'list of deletions that failed')
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Output('result', <type 'dict'>, None)
+output: Output('value', <type 'unicode'>, None)
 command: pwpolicy_find
 args: 1,16,4
 arg: Str('criteria?', noextrawhitespace=False)
-option: Str('cn', attribute=True, autofill=False, cli_name='group', label=Gettext('Group', domain='ipa', localedir=None), multivalue=False, primary_key=True, query=True, required=False)
-option: Int('krbmaxpwdlife', attribute=True, autofill=False, cli_name='maxlife', label=Gettext('Max lifetime (days)', domain='ipa', localedir=None), minvalue=0, multivalue=False, query=True, required=False)
-option: Int('krbminpwdlife', attribute=True, autofill=False, cli_name='minlife', label=Gettext('Min lifetime (hours)', domain='ipa', localedir=None), minvalue=0, multivalue=False, query=True, required=False)
-option: Int('krbpwdhistorylength', attribute=True, autofill=False, cli_name='history', label=Gettext('History size', domain='ipa', localedir=None), minvalue=0, multivalue=False, query=True, required=False)
-option: Int('krbpwdmindiffchars', attribute=True, autofill=False, cli_name='minclasses', label=Gettext('Character classes', domain='ipa', localedir=None), maxvalue=5, minvalue=0, multivalue=False, query=True, required=False)
-option: Int('krbpwdminlength', attribute=True, autofill=False, cli_name='minlength', label=Gettext('Min length', domain='ipa', localedir=None), minvalue=0, multivalue=False, query=True, required=False)
-option: Int('cospriority', attribute=False, autofill=False, cli_name='priority'('Priority of the policy (higher number means lower priority', domain='ipa', localedir=None), flags=('virtual_attribute',), label=Gettext('Priority', domain='ipa', localedir=None), minvalue=0, multivalue=False, query=True, required=False)
-option: Int('krbpwdmaxfailure', attribute=True, autofill=False, cli_name='maxfail', label=Gettext('Max failures', domain='ipa', localedir=None), minvalue=0, multivalue=False, query=True, required=False)
-option: Int('krbpwdfailurecountinterval', attribute=True, autofill=False, cli_name='failinterval', label=Gettext('Failure reset interval', domain='ipa', localedir=None), minvalue=0, multivalue=False, query=True, required=False)
-option: Int('krbpwdlockoutduration', attribute=True, autofill=False, cli_name='lockouttime', label=Gettext('Lockout duration', domain='ipa', localedir=None), minvalue=0, multivalue=False, query=True, required=False)
-option: Int('timelimit?', autofill=False, flags=['no_display'], label=Gettext('Time Limit', domain='ipa', localedir=None), minvalue=0)
-option: Int('sizelimit?', autofill=False, flags=['no_display'], label=Gettext('Size Limit', domain='ipa', localedir=None), minvalue=0)
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-option: Flag('pkey_only?', autofill=True, default=False', label=Gettext('Primary key only', domain='ipa', localedir=None))
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
+option: Str('cn', attribute=True, autofill=False, cli_name='group', multivalue=False, primary_key=True, query=True, required=False)
+option: Int('krbmaxpwdlife', attribute=True, autofill=False, cli_name='maxlife', minvalue=0, multivalue=False, query=True, required=False)
+option: Int('krbminpwdlife', attribute=True, autofill=False, cli_name='minlife', minvalue=0, multivalue=False, query=True, required=False)
+option: Int('krbpwdhistorylength', attribute=True, autofill=False, cli_name='history', minvalue=0, multivalue=False, query=True, required=False)
+option: Int('krbpwdmindiffchars', attribute=True, autofill=False, cli_name='minclasses', maxvalue=5, minvalue=0, multivalue=False, query=True, required=False)
+option: Int('krbpwdminlength', attribute=True, autofill=False, cli_name='minlength', minvalue=0, multivalue=False, query=True, required=False)
+option: Int('cospriority', attribute=False, autofill=False, cli_name='priority', minvalue=0, multivalue=False, query=True, required=False)
+option: Int('krbpwdmaxfailure', attribute=True, autofill=False, cli_name='maxfail', minvalue=0, multivalue=False, query=True, required=False)
+option: Int('krbpwdfailurecountinterval', attribute=True, autofill=False, cli_name='failinterval', minvalue=0, multivalue=False, query=True, required=False)
+option: Int('krbpwdlockoutduration', attribute=True, autofill=False, cli_name='lockouttime', minvalue=0, multivalue=False, query=True, required=False)
+option: Int('timelimit?', autofill=False, minvalue=0)
+option: Int('sizelimit?', autofill=False, minvalue=0)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+option: Flag('pkey_only?', autofill=True, default=False)
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
 output: ListOfEntries('result', (<type 'list'>, <type 'tuple'>), Gettext('A list of LDAP entries', domain='ipa', localedir=None))
-output: Output('count', <type 'int'>, 'Number of entries returned')
-output: Output('truncated', <type 'bool'>, 'True if not all results were returned')
+output: Output('count', <type 'int'>, None)
+output: Output('truncated', <type 'bool'>, None)
 command: pwpolicy_mod
 args: 1,15,3
-arg: Str('cn', attribute=True, cli_name='group', label=Gettext('Group', domain='ipa', localedir=None), multivalue=False, primary_key=True, query=True, required=False)
-option: Int('krbmaxpwdlife', attribute=True, autofill=False, cli_name='maxlife', label=Gettext('Max lifetime (days)', domain='ipa', localedir=None), minvalue=0, multivalue=False, required=False)
-option: Int('krbminpwdlife', attribute=True, autofill=False, cli_name='minlife', label=Gettext('Min lifetime (hours)', domain='ipa', localedir=None), minvalue=0, multivalue=False, required=False)
-option: Int('krbpwdhistorylength', attribute=True, autofill=False, cli_name='history', label=Gettext('History size', domain='ipa', localedir=None), minvalue=0, multivalue=False, required=False)
-option: Int('krbpwdmindiffchars', attribute=True, autofill=False, cli_name='minclasses', label=Gettext('Character classes', domain='ipa', localedir=None), maxvalue=5, minvalue=0, multivalue=False, required=False)
-option: Int('krbpwdminlength', attribute=True, autofill=False, cli_name='minlength', label=Gettext('Min length', domain='ipa', localedir=None), minvalue=0, multivalue=False, required=False)
-option: Int('cospriority', attribute=False, autofill=False, cli_name='priority'('Priority of the policy (higher number means lower priority', domain='ipa', localedir=None), flags=('virtual_attribute',), label=Gettext('Priority', domain='ipa', localedir=None), minvalue=0, multivalue=False, required=False)
-option: Int('krbpwdmaxfailure', attribute=True, autofill=False, cli_name='maxfail', label=Gettext('Max failures', domain='ipa', localedir=None), minvalue=0, multivalue=False, required=False)
-option: Int('krbpwdfailurecountinterval', attribute=True, autofill=False, cli_name='failinterval', label=Gettext('Failure reset interval', domain='ipa', localedir=None), minvalue=0, multivalue=False, required=False)
-option: Int('krbpwdlockoutduration', attribute=True, autofill=False, cli_name='lockouttime', label=Gettext('Lockout duration', domain='ipa', localedir=None), minvalue=0, multivalue=False, required=False)
-option: Str('addattr*', validate_add_attribute, cli_name='addattr', exclude='webui')
-option: Str('setattr*', validate_set_attribute, cli_name='setattr', exclude='webui')
-option: Flag('rights', autofill=True, default=False, label=Gettext('Rights', domain='ipa', localedir=None))
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+arg: Str('cn', attribute=True, cli_name='group', multivalue=False, primary_key=True, query=True, required=False)
+option: Int('krbmaxpwdlife', attribute=True, autofill=False, cli_name='maxlife', minvalue=0, multivalue=False, required=False)
+option: Int('krbminpwdlife', attribute=True, autofill=False, cli_name='minlife', minvalue=0, multivalue=False, required=False)
+option: Int('krbpwdhistorylength', attribute=True, autofill=False, cli_name='history', minvalue=0, multivalue=False, required=False)
+option: Int('krbpwdmindiffchars', attribute=True, autofill=False, cli_name='minclasses', maxvalue=5, minvalue=0, multivalue=False, required=False)
+option: Int('krbpwdminlength', attribute=True, autofill=False, cli_name='minlength', minvalue=0, multivalue=False, required=False)
+option: Int('cospriority', attribute=False, autofill=False, cli_name='priority', minvalue=0, multivalue=False, required=False)
+option: Int('krbpwdmaxfailure', attribute=True, autofill=False, cli_name='maxfail', minvalue=0, multivalue=False, required=False)
+option: Int('krbpwdfailurecountinterval', attribute=True, autofill=False, cli_name='failinterval', minvalue=0, multivalue=False, required=False)
+option: Int('krbpwdlockoutduration', attribute=True, autofill=False, cli_name='lockouttime', minvalue=0, multivalue=False, required=False)
+option: Str('addattr*', cli_name='addattr', exclude='webui')
+option: Str('setattr*', cli_name='setattr', exclude='webui')
+option: Flag('rights', autofill=True, default=False)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('value', <type 'unicode'>, None)
 command: pwpolicy_show
 args: 1,5,3
-arg: Str('cn', attribute=True, cli_name='group', label=Gettext('Group', domain='ipa', localedir=None), multivalue=False, primary_key=True, query=True, required=False)
-option: Flag('rights', autofill=True, default=False, label=Gettext('Rights', domain='ipa', localedir=None))
-option: Str('user?', label=Gettext('User', domain='ipa', localedir=None))
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+arg: Str('cn', attribute=True, cli_name='group', multivalue=False, primary_key=True, query=True, required=False)
+option: Flag('rights', autofill=True, default=False)
+option: Str('user?')
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('value', <type 'unicode'>, None)
 command: role_add
 args: 1,6,3
-arg: Str('cn', attribute=True, cli_name='name', label=Gettext('Role name', domain='ipa', localedir=None), multivalue=False, primary_key=True, required=True)
-option: Str('description', attribute=True, cli_name='desc', label=Gettext('Description', domain='ipa', localedir=None), multivalue=False, required=True)
-option: Str('addattr*', validate_add_attribute, cli_name='addattr', exclude='webui')
-option: Str('setattr*', validate_set_attribute, cli_name='setattr', exclude='webui')
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+arg: Str('cn', attribute=True, cli_name='name', multivalue=False, primary_key=True, required=True)
+option: Str('description', attribute=True, cli_name='desc', multivalue=False, required=True)
+option: Str('addattr*', cli_name='addattr', exclude='webui')
+option: Str('setattr*', cli_name='setattr', exclude='webui')
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('value', <type 'unicode'>, None)
 command: role_add_member
 args: 1,7,3
-arg: Str('cn', attribute=True, cli_name='name', label=Gettext('Role name', domain='ipa', localedir=None), multivalue=False, primary_key=True, query=True, required=True)
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-option: List('user?', alwaysask=True, cli_name='users', label=u'member user', multivalue=True)
-option: List('group?', alwaysask=True, cli_name='groups', label=u'member group', multivalue=True)
-option: List('host?', alwaysask=True, cli_name='hosts', label=u'member host', multivalue=True)
-option: List('hostgroup?', alwaysask=True, cli_name='hostgroups', label=u'member host group', multivalue=True)
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('failed', <type 'dict'>, Gettext('Members that could not be added', domain='ipa', localedir=None))
-output: Output('completed', <type 'int'>, Gettext('Number of members added', domain='ipa', localedir=None))
+arg: Str('cn', attribute=True, cli_name='name', multivalue=False, primary_key=True, query=True, required=True)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+option: List('user?', alwaysask=True, cli_name='users', multivalue=True)
+option: List('group?', alwaysask=True, cli_name='groups', multivalue=True)
+option: List('host?', alwaysask=True, cli_name='hosts', multivalue=True)
+option: List('hostgroup?', alwaysask=True, cli_name='hostgroups', multivalue=True)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('failed', <type 'dict'>, None)
+output: Output('completed', <type 'int'>, None)
 command: role_add_privilege
 args: 1,4,3
-arg: Str('cn', attribute=True, cli_name='name', label=Gettext('Role name', domain='ipa', localedir=None), multivalue=False, primary_key=True, query=True, required=True)
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-option: List('privilege?', alwaysask=True, cli_name='privileges', label=Gettext('privilege', domain='ipa', localedir=None), multivalue=True)
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('failed', <type 'dict'>, Gettext('Members that could not be added', domain='ipa', localedir=None))
-output: Output('completed', <type 'int'>, Gettext('Number of privileges added', domain='ipa', localedir=None))
+arg: Str('cn', attribute=True, cli_name='name', multivalue=False, primary_key=True, query=True, required=True)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+option: List('privilege?', alwaysask=True, cli_name='privileges', multivalue=True)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('failed', <type 'dict'>, None)
+output: Output('completed', <type 'int'>, None)
 command: role_del
 args: 1,1,3
-arg: Str('cn', attribute=True, cli_name='name', label=Gettext('Role name', domain='ipa', localedir=None), multivalue=True, primary_key=True, query=True, required=True)
+arg: Str('cn', attribute=True, cli_name='name', multivalue=True, primary_key=True, query=True, required=True)
 option: Flag('continue', autofill=True, cli_name='continue', default=False)
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Output('result', <type 'dict'>, 'list of deletions that failed')
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Output('result', <type 'dict'>, None)
+output: Output('value', <type 'unicode'>, None)
 command: role_find
 args: 1,8,4
 arg: Str('criteria?', noextrawhitespace=False)
-option: Str('cn', attribute=True, autofill=False, cli_name='name', label=Gettext('Role name', domain='ipa', localedir=None), multivalue=False, primary_key=True, query=True, required=False)
-option: Str('description', attribute=True, autofill=False, cli_name='desc', label=Gettext('Description', domain='ipa', localedir=None), multivalue=False, query=True, required=False)
-option: Int('timelimit?', autofill=False, flags=['no_display'], label=Gettext('Time Limit', domain='ipa', localedir=None), minvalue=0)
-option: Int('sizelimit?', autofill=False, flags=['no_display'], label=Gettext('Size Limit', domain='ipa', localedir=None), minvalue=0)
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-option: Flag('pkey_only?', autofill=True, default=False', label=Gettext('Primary key only', domain='ipa', localedir=None))
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
+option: Str('cn', attribute=True, autofill=False, cli_name='name', multivalue=False, primary_key=True, query=True, required=False)
+option: Str('description', attribute=True, autofill=False, cli_name='desc', multivalue=False, query=True, required=False)
+option: Int('timelimit?', autofill=False, minvalue=0)
+option: Int('sizelimit?', autofill=False, minvalue=0)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+option: Flag('pkey_only?', autofill=True, default=False)
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
 output: ListOfEntries('result', (<type 'list'>, <type 'tuple'>), Gettext('A list of LDAP entries', domain='ipa', localedir=None))
-output: Output('count', <type 'int'>, 'Number of entries returned')
-output: Output('truncated', <type 'bool'>, 'True if not all results were returned')
+output: Output('count', <type 'int'>, None)
+output: Output('truncated', <type 'bool'>, None)
 command: role_mod
 args: 1,8,3
-arg: Str('cn', attribute=True, cli_name='name', label=Gettext('Role name', domain='ipa', localedir=None), multivalue=False, primary_key=True, query=True, required=True)
-option: Str('description', attribute=True, autofill=False, cli_name='desc', label=Gettext('Description', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Str('addattr*', validate_add_attribute, cli_name='addattr', exclude='webui')
-option: Str('setattr*', validate_set_attribute, cli_name='setattr', exclude='webui')
-option: Flag('rights', autofill=True, default=False, label=Gettext('Rights', domain='ipa', localedir=None))
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-option: Str('rename', cli_name='rename', label=Gettext('Rename', domain='ipa', localedir=None), multivalue=False, primary_key=True, required=False)
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+arg: Str('cn', attribute=True, cli_name='name', multivalue=False, primary_key=True, query=True, required=True)
+option: Str('description', attribute=True, autofill=False, cli_name='desc', multivalue=False, required=False)
+option: Str('addattr*', cli_name='addattr', exclude='webui')
+option: Str('setattr*', cli_name='setattr', exclude='webui')
+option: Flag('rights', autofill=True, default=False)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+option: Str('rename', cli_name='rename', multivalue=False, primary_key=True, required=False)
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('value', <type 'unicode'>, None)
 command: role_remove_member
 args: 1,7,3
-arg: Str('cn', attribute=True, cli_name='name', label=Gettext('Role name', domain='ipa', localedir=None), multivalue=False, primary_key=True, query=True, required=True)
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-option: List('user?', alwaysask=True, cli_name='users', label=u'member user', multivalue=True)
-option: List('group?', alwaysask=True, cli_name='groups', label=u'member group', multivalue=True)
-option: List('host?', alwaysask=True, cli_name='hosts', label=u'member host', multivalue=True)
-option: List('hostgroup?', alwaysask=True, cli_name='hostgroups', label=u'member host group', multivalue=True)
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('failed', <type 'dict'>, Gettext('Members that could not be removed', domain='ipa', localedir=None))
-output: Output('completed', <type 'int'>, Gettext('Number of members removed', domain='ipa', localedir=None))
+arg: Str('cn', attribute=True, cli_name='name', multivalue=False, primary_key=True, query=True, required=True)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+option: List('user?', alwaysask=True, cli_name='users', multivalue=True)
+option: List('group?', alwaysask=True, cli_name='groups', multivalue=True)
+option: List('host?', alwaysask=True, cli_name='hosts', multivalue=True)
+option: List('hostgroup?', alwaysask=True, cli_name='hostgroups', multivalue=True)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('failed', <type 'dict'>, None)
+output: Output('completed', <type 'int'>, None)
 command: role_remove_privilege
 args: 1,4,3
-arg: Str('cn', attribute=True, cli_name='name', label=Gettext('Role name', domain='ipa', localedir=None), multivalue=False, primary_key=True, query=True, required=True)
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-option: List('privilege?', alwaysask=True, cli_name='privileges', label=Gettext('privilege', domain='ipa', localedir=None), multivalue=True)
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('failed', <type 'dict'>, Gettext('Members that could not be added', domain='ipa', localedir=None))
-output: Output('completed', <type 'int'>, Gettext('Number of privileges removed', domain='ipa', localedir=None))
+arg: Str('cn', attribute=True, cli_name='name', multivalue=False, primary_key=True, query=True, required=True)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+option: List('privilege?', alwaysask=True, cli_name='privileges', multivalue=True)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('failed', <type 'dict'>, None)
+output: Output('completed', <type 'int'>, None)
 command: role_show
 args: 1,4,3
-arg: Str('cn', attribute=True, cli_name='name', label=Gettext('Role name', domain='ipa', localedir=None), multivalue=False, primary_key=True, query=True, required=True)
-option: Flag('rights', autofill=True, default=False, label=Gettext('Rights', domain='ipa', localedir=None))
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+arg: Str('cn', attribute=True, cli_name='name', multivalue=False, primary_key=True, query=True, required=True)
+option: Flag('rights', autofill=True, default=False)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('value', <type 'unicode'>, None)
 command: selfservice_add
 args: 1,5,3
-arg: Str('aciname', attribute=True, cli_name='name', label=Gettext('Self-service name', domain='ipa', localedir=None), multivalue=False, primary_key=True, required=True)
-option: List('permissions', attribute=True, cli_name='permissions', label=Gettext('Permissions', domain='ipa', localedir=None), multivalue=True, required=False)
-option: List('attrs', attribute=True, cli_name='attrs', label=Gettext('Attributes', domain='ipa', localedir=None), multivalue=True, normalizer=<lambda>, required=True)
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+arg: Str('aciname', attribute=True, cli_name='name', multivalue=False, primary_key=True, required=True)
+option: List('permissions', attribute=True, cli_name='permissions', multivalue=True, required=False)
+option: List('attrs', attribute=True, cli_name='attrs', multivalue=True, required=True)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('value', <type 'unicode'>, None)
 command: selfservice_del
 args: 1,0,3
-arg: Str('aciname', attribute=True, cli_name='name', label=Gettext('Self-service name', domain='ipa', localedir=None), multivalue=False, primary_key=True, query=True, required=True)
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Output('result', <type 'bool'>, 'True means the operation was successful')
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+arg: Str('aciname', attribute=True, cli_name='name', multivalue=False, primary_key=True, query=True, required=True)
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Output('result', <type 'bool'>, None)
+output: Output('value', <type 'unicode'>, None)
 command: selfservice_find
 args: 1,6,4
 arg: Str('criteria?')
-option: Str('aciname', attribute=True, autofill=False, cli_name='name', label=Gettext('Self-service name', domain='ipa', localedir=None), multivalue=False, primary_key=True, query=True, required=False)
-option: List('permissions', attribute=True, autofill=False, cli_name='permissions', label=Gettext('Permissions', domain='ipa', localedir=None), multivalue=True, query=True, required=False)
-option: List('attrs', attribute=True, autofill=False, cli_name='attrs', label=Gettext('Attributes', domain='ipa', localedir=None), multivalue=True, normalizer=<lambda>, query=True, required=False)
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
+option: Str('aciname', attribute=True, autofill=False, cli_name='name', multivalue=False, primary_key=True, query=True, required=False)
+option: List('permissions', attribute=True, autofill=False, cli_name='permissions', multivalue=True, query=True, required=False)
+option: List('attrs', attribute=True, autofill=False, cli_name='attrs', multivalue=True, query=True, required=False)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
 output: ListOfEntries('result', (<type 'list'>, <type 'tuple'>), Gettext('A list of LDAP entries', domain='ipa', localedir=None))
-output: Output('count', <type 'int'>, 'Number of entries returned')
-output: Output('truncated', <type 'bool'>, 'True if not all results were returned')
+output: Output('count', <type 'int'>, None)
+output: Output('truncated', <type 'bool'>, None)
 command: selfservice_mod
 args: 1,5,3
-arg: Str('aciname', attribute=True, cli_name='name', label=Gettext('Self-service name', domain='ipa', localedir=None), multivalue=False, primary_key=True, query=True, required=True)
-option: List('permissions', attribute=True, autofill=False, cli_name='permissions', label=Gettext('Permissions', domain='ipa', localedir=None), multivalue=True, required=False)
-option: List('attrs', attribute=True, autofill=False, cli_name='attrs', label=Gettext('Attributes', domain='ipa', localedir=None), multivalue=True, normalizer=<lambda>, required=False)
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+arg: Str('aciname', attribute=True, cli_name='name', multivalue=False, primary_key=True, query=True, required=True)
+option: List('permissions', attribute=True, autofill=False, cli_name='permissions', multivalue=True, required=False)
+option: List('attrs', attribute=True, autofill=False, cli_name='attrs', multivalue=True, required=False)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('value', <type 'unicode'>, None)
 command: selfservice_show
 args: 1,3,3
-arg: Str('aciname', attribute=True, cli_name='name', label=Gettext('Self-service name', domain='ipa', localedir=None), multivalue=False, primary_key=True, query=True, required=True)
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
+arg: Str('aciname', attribute=True, cli_name='name', multivalue=False, primary_key=True, query=True, required=True)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
 output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+output: Output('value', <type 'unicode'>, None)
 command: service_add
 args: 1,5,3
-arg: Str('krbprincipalname', validate_principal, attribute=True, cli_name='principal', label=Gettext('Principal', domain='ipa', localedir=None), multivalue=False, normalizer=<lambda>, primary_key=True, required=True)
-option: Bytes('usercertificate', validate_certificate, attribute=True, cli_name='certificate', flags=['no_search'], label=Gettext('Certificate', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Flag('force', autofill=True, default=False, label=Gettext('Force', domain='ipa', localedir=None))
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+arg: Str('krbprincipalname', attribute=True, cli_name='principal', multivalue=False, primary_key=True, required=True)
+option: Bytes('usercertificate', attribute=True, cli_name='certificate', multivalue=False, required=False)
+option: Flag('force', autofill=True, default=False)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('value', <type 'unicode'>, None)
 command: service_add_host
 args: 1,4,3
-arg: Str('krbprincipalname', validate_principal, attribute=True, cli_name='principal', label=Gettext('Principal', domain='ipa', localedir=None), multivalue=False, normalizer=<lambda>, primary_key=True, query=True, required=True)
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-option: List('host?', alwaysask=True, cli_name='hosts', label=u'member host', multivalue=True)
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('failed', <type 'dict'>, Gettext('Members that could not be added', domain='ipa', localedir=None))
-output: Output('completed', <type 'int'>, Gettext('Number of members added', domain='ipa', localedir=None))
+arg: Str('krbprincipalname', attribute=True, cli_name='principal', multivalue=False, primary_key=True, query=True, required=True)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+option: List('host?', alwaysask=True, cli_name='hosts', multivalue=True)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('failed', <type 'dict'>, None)
+output: Output('completed', <type 'int'>, None)
 command: service_del
 args: 1,1,3
-arg: Str('krbprincipalname', validate_principal, attribute=True, cli_name='principal', label=Gettext('Principal', domain='ipa', localedir=None), multivalue=True, normalizer=<lambda>, primary_key=True, query=True, required=True)
+arg: Str('krbprincipalname', attribute=True, cli_name='principal', multivalue=True, primary_key=True, query=True, required=True)
 option: Flag('continue', autofill=True, cli_name='continue', default=False)
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Output('result', <type 'dict'>, 'list of deletions that failed')
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Output('result', <type 'dict'>, None)
+output: Output('value', <type 'unicode'>, None)
 command: service_disable
 args: 1,0,3
-arg: Str('krbprincipalname', validate_principal, attribute=True, cli_name='principal', label=Gettext('Principal', domain='ipa', localedir=None), multivalue=False, normalizer=<lambda>, primary_key=True, query=True, required=True)
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Output('result', <type 'bool'>, 'True means the operation was successful')
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+arg: Str('krbprincipalname', attribute=True, cli_name='principal', multivalue=False, primary_key=True, query=True, required=True)
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Output('result', <type 'bool'>, None)
+output: Output('value', <type 'unicode'>, None)
 command: service_find
 args: 1,9,4
 arg: Str('criteria?', noextrawhitespace=False)
-option: Str('krbprincipalname', validate_principal, attribute=True, autofill=False, cli_name='principal', label=Gettext('Principal', domain='ipa', localedir=None), multivalue=False, normalizer=<lambda>, primary_key=True, query=True, required=False)
-option: Int('timelimit?', autofill=False, flags=['no_display'], label=Gettext('Time Limit', domain='ipa', localedir=None), minvalue=0)
-option: Int('sizelimit?', autofill=False, flags=['no_display'], label=Gettext('Size Limit', domain='ipa', localedir=None), minvalue=0)
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-option: Flag('pkey_only?', autofill=True, default=False', label=Gettext('Primary key only', domain='ipa', localedir=None))
-option: List('man_by_host?', cli_name='man_by_hosts', label=Gettext('host', domain='ipa', localedir=None), multivalue=True)
-option: List('not_man_by_host?', cli_name='not_man_by_hosts', label=Gettext('host', domain='ipa', localedir=None), multivalue=True)
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
+option: Str('krbprincipalname', attribute=True, autofill=False, cli_name='principal', multivalue=False, primary_key=True, query=True, required=False)
+option: Int('timelimit?', autofill=False, minvalue=0)
+option: Int('sizelimit?', autofill=False, minvalue=0)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+option: Flag('pkey_only?', autofill=True, default=False)
+option: List('man_by_host?', cli_name='man_by_hosts', multivalue=True)
+option: List('not_man_by_host?', cli_name='not_man_by_hosts', multivalue=True)
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
 output: ListOfEntries('result', (<type 'list'>, <type 'tuple'>), Gettext('A list of LDAP entries', domain='ipa', localedir=None))
-output: Output('count', <type 'int'>, 'Number of entries returned')
-output: Output('truncated', <type 'bool'>, 'True if not all results were returned')
+output: Output('count', <type 'int'>, None)
+output: Output('truncated', <type 'bool'>, None)
 command: service_mod
 args: 1,7,3
-arg: Str('krbprincipalname', validate_principal, attribute=True, cli_name='principal', label=Gettext('Principal', domain='ipa', localedir=None), multivalue=False, normalizer=<lambda>, primary_key=True, query=True, required=True)
-option: Bytes('usercertificate', validate_certificate, attribute=True, autofill=False, cli_name='certificate', flags=['no_search'], label=Gettext('Certificate', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Str('addattr*', validate_add_attribute, cli_name='addattr', exclude='webui')
-option: Str('setattr*', validate_set_attribute, cli_name='setattr', exclude='webui')
-option: Flag('rights', autofill=True, default=False, label=Gettext('Rights', domain='ipa', localedir=None))
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+arg: Str('krbprincipalname', attribute=True, cli_name='principal', multivalue=False, primary_key=True, query=True, required=True)
+option: Bytes('usercertificate', attribute=True, autofill=False, cli_name='certificate', multivalue=False, required=False)
+option: Str('addattr*', cli_name='addattr', exclude='webui')
+option: Str('setattr*', cli_name='setattr', exclude='webui')
+option: Flag('rights', autofill=True, default=False)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('value', <type 'unicode'>, None)
 command: service_remove_host
 args: 1,4,3
-arg: Str('krbprincipalname', validate_principal, attribute=True, cli_name='principal', label=Gettext('Principal', domain='ipa', localedir=None), multivalue=False, normalizer=<lambda>, primary_key=True, query=True, required=True)
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-option: List('host?', alwaysask=True, cli_name='hosts', label=u'member host', multivalue=True)
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('failed', <type 'dict'>, Gettext('Members that could not be removed', domain='ipa', localedir=None))
-output: Output('completed', <type 'int'>, Gettext('Number of members removed', domain='ipa', localedir=None))
+arg: Str('krbprincipalname', attribute=True, cli_name='principal', multivalue=False, primary_key=True, query=True, required=True)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+option: List('host?', alwaysask=True, cli_name='hosts', multivalue=True)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('failed', <type 'dict'>, None)
+output: Output('completed', <type 'int'>, None)
 command: service_show
 args: 1,5,3
-arg: Str('krbprincipalname', validate_principal, attribute=True, cli_name='principal', label=Gettext('Principal', domain='ipa', localedir=None), multivalue=False, normalizer=<lambda>, primary_key=True, query=True, required=True)
-option: Flag('rights', autofill=True, default=False, label=Gettext('Rights', domain='ipa', localedir=None))
+arg: Str('krbprincipalname', attribute=True, cli_name='principal', multivalue=False, primary_key=True, query=True, required=True)
+option: Flag('rights', autofill=True, default=False)
 option: Str('out?')
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
 output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+output: Output('value', <type 'unicode'>, None)
 command: sudocmd_add
 args: 1,6,3
-arg: Str('sudocmd', attribute=True, cli_name='command', label=Gettext('Sudo Command', domain='ipa', localedir=None), multivalue=False, primary_key=True, required=True)
-option: Str('description', attribute=True, cli_name='desc', label=Gettext('Description', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Str('addattr*', validate_add_attribute, cli_name='addattr', exclude='webui')
-option: Str('setattr*', validate_set_attribute, cli_name='setattr', exclude='webui')
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+arg: Str('sudocmd', attribute=True, cli_name='command', multivalue=False, primary_key=True, required=True)
+option: Str('description', attribute=True, cli_name='desc', multivalue=False, required=False)
+option: Str('addattr*', cli_name='addattr', exclude='webui')
+option: Str('setattr*', cli_name='setattr', exclude='webui')
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('value', <type 'unicode'>, None)
 command: sudocmd_del
 args: 1,1,3
-arg: Str('sudocmd', attribute=True, cli_name='command', label=Gettext('Sudo Command', domain='ipa', localedir=None), multivalue=True, primary_key=True, query=True, required=True)
+arg: Str('sudocmd', attribute=True, cli_name='command', multivalue=True, primary_key=True, query=True, required=True)
 option: Flag('continue', autofill=True, cli_name='continue', default=False)
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Output('result', <type 'dict'>, 'list of deletions that failed')
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Output('result', <type 'dict'>, None)
+output: Output('value', <type 'unicode'>, None)
 command: sudocmd_find
 args: 1,8,4
 arg: Str('criteria?', noextrawhitespace=False)
-option: Str('sudocmd', attribute=True, autofill=False, cli_name='command', label=Gettext('Sudo Command', domain='ipa', localedir=None), multivalue=False, primary_key=True, query=True, required=False)
-option: Str('description', attribute=True, autofill=False, cli_name='desc', label=Gettext('Description', domain='ipa', localedir=None), multivalue=False, query=True, required=False)
-option: Int('timelimit?', autofill=False, flags=['no_display'], label=Gettext('Time Limit', domain='ipa', localedir=None), minvalue=0)
-option: Int('sizelimit?', autofill=False, flags=['no_display'], label=Gettext('Size Limit', domain='ipa', localedir=None), minvalue=0)
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-option: Flag('pkey_only?', autofill=True, default=False', label=Gettext('Primary key only', domain='ipa', localedir=None))
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
+option: Str('sudocmd', attribute=True, autofill=False, cli_name='command', multivalue=False, primary_key=True, query=True, required=False)
+option: Str('description', attribute=True, autofill=False, cli_name='desc', multivalue=False, query=True, required=False)
+option: Int('timelimit?', autofill=False, minvalue=0)
+option: Int('sizelimit?', autofill=False, minvalue=0)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+option: Flag('pkey_only?', autofill=True, default=False)
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
 output: ListOfEntries('result', (<type 'list'>, <type 'tuple'>), Gettext('A list of LDAP entries', domain='ipa', localedir=None))
-output: Output('count', <type 'int'>, 'Number of entries returned')
-output: Output('truncated', <type 'bool'>, 'True if not all results were returned')
+output: Output('count', <type 'int'>, None)
+output: Output('truncated', <type 'bool'>, None)
 command: sudocmd_mod
 args: 1,7,3
-arg: Str('sudocmd', attribute=True, cli_name='command', label=Gettext('Sudo Command', domain='ipa', localedir=None), multivalue=False, primary_key=True, query=True, required=True)
-option: Str('description', attribute=True, autofill=False, cli_name='desc', label=Gettext('Description', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Str('addattr*', validate_add_attribute, cli_name='addattr', exclude='webui')
-option: Str('setattr*', validate_set_attribute, cli_name='setattr', exclude='webui')
-option: Flag('rights', autofill=True, default=False, label=Gettext('Rights', domain='ipa', localedir=None))
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+arg: Str('sudocmd', attribute=True, cli_name='command', multivalue=False, primary_key=True, query=True, required=True)
+option: Str('description', attribute=True, autofill=False, cli_name='desc', multivalue=False, required=False)
+option: Str('addattr*', cli_name='addattr', exclude='webui')
+option: Str('setattr*', cli_name='setattr', exclude='webui')
+option: Flag('rights', autofill=True, default=False)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('value', <type 'unicode'>, None)
 command: sudocmd_show
 args: 1,4,3
-arg: Str('sudocmd', attribute=True, cli_name='command', label=Gettext('Sudo Command', domain='ipa', localedir=None), multivalue=False, primary_key=True, query=True, required=True)
-option: Flag('rights', autofill=True, default=False, label=Gettext('Rights', domain='ipa', localedir=None))
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+arg: Str('sudocmd', attribute=True, cli_name='command', multivalue=False, primary_key=True, query=True, required=True)
+option: Flag('rights', autofill=True, default=False)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('value', <type 'unicode'>, None)
 command: sudocmdgroup_add
 args: 1,6,3
-arg: Str('cn', attribute=True, cli_name='sudocmdgroup_name', label=Gettext('Sudo Command Group', domain='ipa', localedir=None), multivalue=False, normalizer=<lambda>, primary_key=True, required=True)
-option: Str('description', attribute=True, cli_name='desc', label=Gettext('Description', domain='ipa', localedir=None), multivalue=False, required=True)
-option: Str('addattr*', validate_add_attribute, cli_name='addattr', exclude='webui')
-option: Str('setattr*', validate_set_attribute, cli_name='setattr', exclude='webui')
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+arg: Str('cn', attribute=True, cli_name='sudocmdgroup_name', multivalue=False, primary_key=True, required=True)
+option: Str('description', attribute=True, cli_name='desc', multivalue=False, required=True)
+option: Str('addattr*', cli_name='addattr', exclude='webui')
+option: Str('setattr*', cli_name='setattr', exclude='webui')
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('value', <type 'unicode'>, None)
 command: sudocmdgroup_add_member
 args: 1,4,3
-arg: Str('cn', attribute=True, cli_name='sudocmdgroup_name', label=Gettext('Sudo Command Group', domain='ipa', localedir=None), multivalue=False, normalizer=<lambda>, primary_key=True, query=True, required=True)
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-option: List('sudocmd?', alwaysask=True, cli_name='sudocmds', label=u'member sudo command', multivalue=True)
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('failed', <type 'dict'>, Gettext('Members that could not be added', domain='ipa', localedir=None))
-output: Output('completed', <type 'int'>, Gettext('Number of members added', domain='ipa', localedir=None))
+arg: Str('cn', attribute=True, cli_name='sudocmdgroup_name', multivalue=False, primary_key=True, query=True, required=True)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+option: List('sudocmd?', alwaysask=True, cli_name='sudocmds', multivalue=True)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('failed', <type 'dict'>, None)
+output: Output('completed', <type 'int'>, None)
 command: sudocmdgroup_del
 args: 1,1,3
-arg: Str('cn', attribute=True, cli_name='sudocmdgroup_name', label=Gettext('Sudo Command Group', domain='ipa', localedir=None), multivalue=True, normalizer=<lambda>, primary_key=True, query=True, required=True)
+arg: Str('cn', attribute=True, cli_name='sudocmdgroup_name', multivalue=True, primary_key=True, query=True, required=True)
 option: Flag('continue', autofill=True, cli_name='continue', default=False)
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Output('result', <type 'dict'>, 'list of deletions that failed')
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Output('result', <type 'dict'>, None)
+output: Output('value', <type 'unicode'>, None)
 command: sudocmdgroup_find
 args: 1,8,4
 arg: Str('criteria?', noextrawhitespace=False)
-option: Str('cn', attribute=True, autofill=False, cli_name='sudocmdgroup_name', label=Gettext('Sudo Command Group', domain='ipa', localedir=None), multivalue=False, normalizer=<lambda>, primary_key=True, query=True, required=False)
-option: Str('description', attribute=True, autofill=False, cli_name='desc', label=Gettext('Description', domain='ipa', localedir=None), multivalue=False, query=True, required=False)
-option: Int('timelimit?', autofill=False, flags=['no_display'], label=Gettext('Time Limit', domain='ipa', localedir=None), minvalue=0)
-option: Int('sizelimit?', autofill=False, flags=['no_display'], label=Gettext('Size Limit', domain='ipa', localedir=None), minvalue=0)
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-option: Flag('pkey_only?', autofill=True, default=False', label=Gettext('Primary key only', domain='ipa', localedir=None))
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
+option: Str('cn', attribute=True, autofill=False, cli_name='sudocmdgroup_name', multivalue=False, primary_key=True, query=True, required=False)
+option: Str('description', attribute=True, autofill=False, cli_name='desc', multivalue=False, query=True, required=False)
+option: Int('timelimit?', autofill=False, minvalue=0)
+option: Int('sizelimit?', autofill=False, minvalue=0)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+option: Flag('pkey_only?', autofill=True, default=False)
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
 output: ListOfEntries('result', (<type 'list'>, <type 'tuple'>), Gettext('A list of LDAP entries', domain='ipa', localedir=None))
-output: Output('count', <type 'int'>, 'Number of entries returned')
-output: Output('truncated', <type 'bool'>, 'True if not all results were returned')
+output: Output('count', <type 'int'>, None)
+output: Output('truncated', <type 'bool'>, None)
 command: sudocmdgroup_mod
 args: 1,7,3
-arg: Str('cn', attribute=True, cli_name='sudocmdgroup_name', label=Gettext('Sudo Command Group', domain='ipa', localedir=None), multivalue=False, normalizer=<lambda>, primary_key=True, query=True, required=True)
-option: Str('description', attribute=True, autofill=False, cli_name='desc', label=Gettext('Description', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Str('addattr*', validate_add_attribute, cli_name='addattr', exclude='webui')
-option: Str('setattr*', validate_set_attribute, cli_name='setattr', exclude='webui')
-option: Flag('rights', autofill=True, default=False, label=Gettext('Rights', domain='ipa', localedir=None))
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+arg: Str('cn', attribute=True, cli_name='sudocmdgroup_name', multivalue=False, primary_key=True, query=True, required=True)
+option: Str('description', attribute=True, autofill=False, cli_name='desc', multivalue=False, required=False)
+option: Str('addattr*', cli_name='addattr', exclude='webui')
+option: Str('setattr*', cli_name='setattr', exclude='webui')
+option: Flag('rights', autofill=True, default=False)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('value', <type 'unicode'>, None)
 command: sudocmdgroup_remove_member
 args: 1,4,3
-arg: Str('cn', attribute=True, cli_name='sudocmdgroup_name', label=Gettext('Sudo Command Group', domain='ipa', localedir=None), multivalue=False, normalizer=<lambda>, primary_key=True, query=True, required=True)
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-option: List('sudocmd?', alwaysask=True, cli_name='sudocmds', label=u'member sudo command', multivalue=True)
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('failed', <type 'dict'>, Gettext('Members that could not be removed', domain='ipa', localedir=None))
-output: Output('completed', <type 'int'>, Gettext('Number of members removed', domain='ipa', localedir=None))
+arg: Str('cn', attribute=True, cli_name='sudocmdgroup_name', multivalue=False, primary_key=True, query=True, required=True)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+option: List('sudocmd?', alwaysask=True, cli_name='sudocmds', multivalue=True)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('failed', <type 'dict'>, None)
+output: Output('completed', <type 'int'>, None)
 command: sudocmdgroup_show
 args: 1,4,3
-arg: Str('cn', attribute=True, cli_name='sudocmdgroup_name', label=Gettext('Sudo Command Group', domain='ipa', localedir=None), multivalue=False, normalizer=<lambda>, primary_key=True, query=True, required=True)
-option: Flag('rights', autofill=True, default=False, label=Gettext('Rights', domain='ipa', localedir=None))
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+arg: Str('cn', attribute=True, cli_name='sudocmdgroup_name', multivalue=False, primary_key=True, query=True, required=True)
+option: Flag('rights', autofill=True, default=False)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('value', <type 'unicode'>, None)
 command: sudorule_add
 args: 1,14,3
-arg: Str('cn', attribute=True, cli_name='sudorule_name', label=Gettext('Rule name', domain='ipa', localedir=None), multivalue=False, primary_key=True, required=True)
-option: Str('description', attribute=True, cli_name='desc', label=Gettext('Description', domain='ipa', localedir=None), multivalue=False, required=False)
-option: StrEnum('usercategory', attribute=True, cli_name='usercat', label=Gettext('User category', domain='ipa', localedir=None), multivalue=False, required=False, values=(u'all',))
-option: StrEnum('hostcategory', attribute=True, cli_name='hostcat', label=Gettext('Host category', domain='ipa', localedir=None), multivalue=False, required=False, values=(u'all',))
-option: StrEnum('cmdcategory', attribute=True, cli_name='cmdcat', label=Gettext('Command category', domain='ipa', localedir=None), multivalue=False, required=False, values=(u'all',))
-option: StrEnum('ipasudorunasusercategory', attribute=True, cli_name='runasusercat', label=Gettext('RunAs User category', domain='ipa', localedir=None), multivalue=False, required=False, values=(u'all',))
-option: StrEnum('ipasudorunasgroupcategory', attribute=True, cli_name='runasgroupcat', label=Gettext('RunAs Group category', domain='ipa', localedir=None), multivalue=False, required=False, values=(u'all',))
-option: Str('externaluser', validate_externaluser, attribute=True, cli_name='externaluser', label=Gettext('External User', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Str('ipasudorunasextuser', validate_runasextuser, attribute=True, cli_name='runasexternaluser', label=Gettext('RunAs External User', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Str('ipasudorunasextgroup', validate_runasextgroup, attribute=True, cli_name='runasexternalgroup', label=Gettext('RunAs External Group', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Str('addattr*', validate_add_attribute, cli_name='addattr', exclude='webui')
-option: Str('setattr*', validate_set_attribute, cli_name='setattr', exclude='webui')
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+arg: Str('cn', attribute=True, cli_name='sudorule_name', multivalue=False, primary_key=True, required=True)
+option: Str('description', attribute=True, cli_name='desc', multivalue=False, required=False)
+option: StrEnum('usercategory', attribute=True, cli_name='usercat', multivalue=False, required=False, values=(u'all',))
+option: StrEnum('hostcategory', attribute=True, cli_name='hostcat', multivalue=False, required=False, values=(u'all',))
+option: StrEnum('cmdcategory', attribute=True, cli_name='cmdcat', multivalue=False, required=False, values=(u'all',))
+option: StrEnum('ipasudorunasusercategory', attribute=True, cli_name='runasusercat', multivalue=False, required=False, values=(u'all',))
+option: StrEnum('ipasudorunasgroupcategory', attribute=True, cli_name='runasgroupcat', multivalue=False, required=False, values=(u'all',))
+option: Str('externaluser', attribute=True, cli_name='externaluser', multivalue=False, required=False)
+option: Str('ipasudorunasextuser', attribute=True, cli_name='runasexternaluser', multivalue=False, required=False)
+option: Str('ipasudorunasextgroup', attribute=True, cli_name='runasexternalgroup', multivalue=False, required=False)
+option: Str('addattr*', cli_name='addattr', exclude='webui')
+option: Str('setattr*', cli_name='setattr', exclude='webui')
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('value', <type 'unicode'>, None)
 command: sudorule_add_allow_command
 args: 1,5,3
-arg: Str('cn', attribute=True, cli_name='sudorule_name', label=Gettext('Rule name', domain='ipa', localedir=None), multivalue=False, primary_key=True, query=True, required=True)
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-option: List('sudocmd?', alwaysask=True, cli_name='sudocmds', label=u'member sudo command', multivalue=True)
-option: List('sudocmdgroup?', alwaysask=True, cli_name='sudocmdgroups', label=u'member sudo command group', multivalue=True)
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('failed', <type 'dict'>, Gettext('Members that could not be added', domain='ipa', localedir=None))
-output: Output('completed', <type 'int'>, Gettext('Number of members added', domain='ipa', localedir=None))
+arg: Str('cn', attribute=True, cli_name='sudorule_name', multivalue=False, primary_key=True, query=True, required=True)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+option: List('sudocmd?', alwaysask=True, cli_name='sudocmds', multivalue=True)
+option: List('sudocmdgroup?', alwaysask=True, cli_name='sudocmdgroups', multivalue=True)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('failed', <type 'dict'>, None)
+output: Output('completed', <type 'int'>, None)
 command: sudorule_add_deny_command
 args: 1,5,3
-arg: Str('cn', attribute=True, cli_name='sudorule_name', label=Gettext('Rule name', domain='ipa', localedir=None), multivalue=False, primary_key=True, query=True, required=True)
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-option: List('sudocmd?', alwaysask=True, cli_name='sudocmds', label=u'member sudo command', multivalue=True)
-option: List('sudocmdgroup?', alwaysask=True, cli_name='sudocmdgroups', label=u'member sudo command group', multivalue=True)
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('failed', <type 'dict'>, Gettext('Members that could not be added', domain='ipa', localedir=None))
-output: Output('completed', <type 'int'>, Gettext('Number of members added', domain='ipa', localedir=None))
+arg: Str('cn', attribute=True, cli_name='sudorule_name', multivalue=False, primary_key=True, query=True, required=True)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+option: List('sudocmd?', alwaysask=True, cli_name='sudocmds', multivalue=True)
+option: List('sudocmdgroup?', alwaysask=True, cli_name='sudocmdgroups', multivalue=True)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('failed', <type 'dict'>, None)
+output: Output('completed', <type 'int'>, None)
 command: sudorule_add_host
 args: 1,5,3
-arg: Str('cn', attribute=True, cli_name='sudorule_name', label=Gettext('Rule name', domain='ipa', localedir=None), multivalue=False, primary_key=True, query=True, required=True)
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-option: List('host?', alwaysask=True, cli_name='hosts', label=u'member host', multivalue=True)
-option: List('hostgroup?', alwaysask=True, cli_name='hostgroups', label=u'member host group', multivalue=True)
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('failed', <type 'dict'>, Gettext('Members that could not be added', domain='ipa', localedir=None))
-output: Output('completed', <type 'int'>, Gettext('Number of members added', domain='ipa', localedir=None))
+arg: Str('cn', attribute=True, cli_name='sudorule_name', multivalue=False, primary_key=True, query=True, required=True)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+option: List('host?', alwaysask=True, cli_name='hosts', multivalue=True)
+option: List('hostgroup?', alwaysask=True, cli_name='hostgroups', multivalue=True)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('failed', <type 'dict'>, None)
+output: Output('completed', <type 'int'>, None)
 command: sudorule_add_option
 args: 1,1,1
-arg: Str('cn', attribute=True, cli_name='sudorule_name', label=Gettext('Rule name', domain='ipa', localedir=None), multivalue=False, primary_key=True, query=True, required=True)
-option: Str('ipasudoopt', cli_name='sudooption', label=Gettext('Sudo Option', domain='ipa', localedir=None))
+arg: Str('cn', attribute=True, cli_name='sudorule_name', multivalue=False, primary_key=True, query=True, required=True)
+option: Str('ipasudoopt', cli_name='sudooption')
 output: Output('result', None, None)
 command: sudorule_add_runasgroup
 args: 1,4,3
-arg: Str('cn', attribute=True, cli_name='sudorule_name', label=Gettext('Rule name', domain='ipa', localedir=None), multivalue=False, primary_key=True, query=True, required=True)
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-option: List('group?', alwaysask=True, cli_name='groups', label=u'member group', multivalue=True)
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('failed', <type 'dict'>, Gettext('Members that could not be added', domain='ipa', localedir=None))
-output: Output('completed', <type 'int'>, Gettext('Number of members added', domain='ipa', localedir=None))
+arg: Str('cn', attribute=True, cli_name='sudorule_name', multivalue=False, primary_key=True, query=True, required=True)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+option: List('group?', alwaysask=True, cli_name='groups', multivalue=True)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('failed', <type 'dict'>, None)
+output: Output('completed', <type 'int'>, None)
 command: sudorule_add_runasuser
 args: 1,5,3
-arg: Str('cn', attribute=True, cli_name='sudorule_name', label=Gettext('Rule name', domain='ipa', localedir=None), multivalue=False, primary_key=True, query=True, required=True)
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-option: List('user?', alwaysask=True, cli_name='users', label=u'member user', multivalue=True)
-option: List('group?', alwaysask=True, cli_name='groups', label=u'member group', multivalue=True)
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('failed', <type 'dict'>, Gettext('Members that could not be added', domain='ipa', localedir=None))
-output: Output('completed', <type 'int'>, Gettext('Number of members added', domain='ipa', localedir=None))
+arg: Str('cn', attribute=True, cli_name='sudorule_name', multivalue=False, primary_key=True, query=True, required=True)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+option: List('user?', alwaysask=True, cli_name='users', multivalue=True)
+option: List('group?', alwaysask=True, cli_name='groups', multivalue=True)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('failed', <type 'dict'>, None)
+output: Output('completed', <type 'int'>, None)
 command: sudorule_add_user
 args: 1,5,3
-arg: Str('cn', attribute=True, cli_name='sudorule_name', label=Gettext('Rule name', domain='ipa', localedir=None), multivalue=False, primary_key=True, query=True, required=True)
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-option: List('user?', alwaysask=True, cli_name='users', label=u'member user', multivalue=True)
-option: List('group?', alwaysask=True, cli_name='groups', label=u'member group', multivalue=True)
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('failed', <type 'dict'>, Gettext('Members that could not be added', domain='ipa', localedir=None))
-output: Output('completed', <type 'int'>, Gettext('Number of members added', domain='ipa', localedir=None))
+arg: Str('cn', attribute=True, cli_name='sudorule_name', multivalue=False, primary_key=True, query=True, required=True)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+option: List('user?', alwaysask=True, cli_name='users', multivalue=True)
+option: List('group?', alwaysask=True, cli_name='groups', multivalue=True)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('failed', <type 'dict'>, None)
+output: Output('completed', <type 'int'>, None)
 command: sudorule_del
 args: 1,1,3
-arg: Str('cn', attribute=True, cli_name='sudorule_name', label=Gettext('Rule name', domain='ipa', localedir=None), multivalue=True, primary_key=True, query=True, required=True)
+arg: Str('cn', attribute=True, cli_name='sudorule_name', multivalue=True, primary_key=True, query=True, required=True)
 option: Flag('continue', autofill=True, cli_name='continue', default=False)
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Output('result', <type 'dict'>, 'list of deletions that failed')
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Output('result', <type 'dict'>, None)
+output: Output('value', <type 'unicode'>, None)
 command: sudorule_disable
 args: 1,0,1
-arg: Str('cn', attribute=True, cli_name='sudorule_name', label=Gettext('Rule name', domain='ipa', localedir=None), multivalue=False, primary_key=True, query=True, required=True)
+arg: Str('cn', attribute=True, cli_name='sudorule_name', multivalue=False, primary_key=True, query=True, required=True)
 output: Output('result', None, None)
 command: sudorule_enable
 args: 1,0,1
-arg: Str('cn', attribute=True, cli_name='sudorule_name', label=Gettext('Rule name', domain='ipa', localedir=None), multivalue=False, primary_key=True, query=True, required=True)
+arg: Str('cn', attribute=True, cli_name='sudorule_name', multivalue=False, primary_key=True, query=True, required=True)
 output: Output('result', None, None)
 command: sudorule_find
 args: 1,16,4
 arg: Str('criteria?', noextrawhitespace=False)
-option: Str('cn', attribute=True, autofill=False, cli_name='sudorule_name', label=Gettext('Rule name', domain='ipa', localedir=None), multivalue=False, primary_key=True, query=True, required=False)
-option: Str('description', attribute=True, autofill=False, cli_name='desc', label=Gettext('Description', domain='ipa', localedir=None), multivalue=False, query=True, required=False)
-option: StrEnum('usercategory', attribute=True, autofill=False, cli_name='usercat', label=Gettext('User category', domain='ipa', localedir=None), multivalue=False, query=True, required=False, values=(u'all',))
-option: StrEnum('hostcategory', attribute=True, autofill=False, cli_name='hostcat', label=Gettext('Host category', domain='ipa', localedir=None), multivalue=False, query=True, required=False, values=(u'all',))
-option: StrEnum('cmdcategory', attribute=True, autofill=False, cli_name='cmdcat', label=Gettext('Command category', domain='ipa', localedir=None), multivalue=False, query=True, required=False, values=(u'all',))
-option: StrEnum('ipasudorunasusercategory', attribute=True, autofill=False, cli_name='runasusercat', label=Gettext('RunAs User category', domain='ipa', localedir=None), multivalue=False, query=True, required=False, values=(u'all',))
-option: StrEnum('ipasudorunasgroupcategory', attribute=True, autofill=False, cli_name='runasgroupcat', label=Gettext('RunAs Group category', domain='ipa', localedir=None), multivalue=False, query=True, required=False, values=(u'all',))
-option: Str('externaluser', validate_externaluser, attribute=True, autofill=False, cli_name='externaluser', label=Gettext('External User', domain='ipa', localedir=None), multivalue=False, query=True, required=False)
-option: Str('ipasudorunasextuser', validate_runasextuser, attribute=True, autofill=False, cli_name='runasexternaluser', label=Gettext('RunAs External User', domain='ipa', localedir=None), multivalue=False, query=True, required=False)
-option: Str('ipasudorunasextgroup', validate_runasextgroup, attribute=True, autofill=False, cli_name='runasexternalgroup', label=Gettext('RunAs External Group', domain='ipa', localedir=None), multivalue=False, query=True, required=False)
-option: Int('timelimit?', autofill=False, flags=['no_display'], label=Gettext('Time Limit', domain='ipa', localedir=None), minvalue=0)
-option: Int('sizelimit?', autofill=False, flags=['no_display'], label=Gettext('Size Limit', domain='ipa', localedir=None), minvalue=0)
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-option: Flag('pkey_only?', autofill=True, default=False', label=Gettext('Primary key only', domain='ipa', localedir=None))
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
+option: Str('cn', attribute=True, autofill=False, cli_name='sudorule_name', multivalue=False, primary_key=True, query=True, required=False)
+option: Str('description', attribute=True, autofill=False, cli_name='desc', multivalue=False, query=True, required=False)
+option: StrEnum('usercategory', attribute=True, autofill=False, cli_name='usercat', multivalue=False, query=True, required=False, values=(u'all',))
+option: StrEnum('hostcategory', attribute=True, autofill=False, cli_name='hostcat', multivalue=False, query=True, required=False, values=(u'all',))
+option: StrEnum('cmdcategory', attribute=True, autofill=False, cli_name='cmdcat', multivalue=False, query=True, required=False, values=(u'all',))
+option: StrEnum('ipasudorunasusercategory', attribute=True, autofill=False, cli_name='runasusercat', multivalue=False, query=True, required=False, values=(u'all',))
+option: StrEnum('ipasudorunasgroupcategory', attribute=True, autofill=False, cli_name='runasgroupcat', multivalue=False, query=True, required=False, values=(u'all',))
+option: Str('externaluser', attribute=True, autofill=False, cli_name='externaluser', multivalue=False, query=True, required=False)
+option: Str('ipasudorunasextuser', attribute=True, autofill=False, cli_name='runasexternaluser', multivalue=False, query=True, required=False)
+option: Str('ipasudorunasextgroup', attribute=True, autofill=False, cli_name='runasexternalgroup', multivalue=False, query=True, required=False)
+option: Int('timelimit?', autofill=False, minvalue=0)
+option: Int('sizelimit?', autofill=False, minvalue=0)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+option: Flag('pkey_only?', autofill=True, default=False)
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
 output: ListOfEntries('result', (<type 'list'>, <type 'tuple'>), Gettext('A list of LDAP entries', domain='ipa', localedir=None))
-output: Output('count', <type 'int'>, 'Number of entries returned')
-output: Output('truncated', <type 'bool'>, 'True if not all results were returned')
+output: Output('count', <type 'int'>, None)
+output: Output('truncated', <type 'bool'>, None)
 command: sudorule_mod
 args: 1,15,3
-arg: Str('cn', attribute=True, cli_name='sudorule_name', label=Gettext('Rule name', domain='ipa', localedir=None), multivalue=False, primary_key=True, query=True, required=True)
-option: Str('description', attribute=True, autofill=False, cli_name='desc', label=Gettext('Description', domain='ipa', localedir=None), multivalue=False, required=False)
-option: StrEnum('usercategory', attribute=True, autofill=False, cli_name='usercat', label=Gettext('User category', domain='ipa', localedir=None), multivalue=False, required=False, values=(u'all',))
-option: StrEnum('hostcategory', attribute=True, autofill=False, cli_name='hostcat', label=Gettext('Host category', domain='ipa', localedir=None), multivalue=False, required=False, values=(u'all',))
-option: StrEnum('cmdcategory', attribute=True, autofill=False, cli_name='cmdcat', label=Gettext('Command category', domain='ipa', localedir=None), multivalue=False, required=False, values=(u'all',))
-option: StrEnum('ipasudorunasusercategory', attribute=True, autofill=False, cli_name='runasusercat', label=Gettext('RunAs User category', domain='ipa', localedir=None), multivalue=False, required=False, values=(u'all',))
-option: StrEnum('ipasudorunasgroupcategory', attribute=True, autofill=False, cli_name='runasgroupcat', label=Gettext('RunAs Group category', domain='ipa', localedir=None), multivalue=False, required=False, values=(u'all',))
-option: Str('externaluser', validate_externaluser, attribute=True, autofill=False, cli_name='externaluser', label=Gettext('External User', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Str('ipasudorunasextuser', validate_runasextuser, attribute=True, autofill=False, cli_name='runasexternaluser', label=Gettext('RunAs External User', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Str('ipasudorunasextgroup', validate_runasextgroup, attribute=True, autofill=False, cli_name='runasexternalgroup', label=Gettext('RunAs External Group', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Str('addattr*', validate_add_attribute, cli_name='addattr', exclude='webui')
-option: Str('setattr*', validate_set_attribute, cli_name='setattr', exclude='webui')
-option: Flag('rights', autofill=True, default=False, label=Gettext('Rights', domain='ipa', localedir=None))
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+arg: Str('cn', attribute=True, cli_name='sudorule_name', multivalue=False, primary_key=True, query=True, required=True)
+option: Str('description', attribute=True, autofill=False, cli_name='desc', multivalue=False, required=False)
+option: StrEnum('usercategory', attribute=True, autofill=False, cli_name='usercat', multivalue=False, required=False, values=(u'all',))
+option: StrEnum('hostcategory', attribute=True, autofill=False, cli_name='hostcat', multivalue=False, required=False, values=(u'all',))
+option: StrEnum('cmdcategory', attribute=True, autofill=False, cli_name='cmdcat', multivalue=False, required=False, values=(u'all',))
+option: StrEnum('ipasudorunasusercategory', attribute=True, autofill=False, cli_name='runasusercat', multivalue=False, required=False, values=(u'all',))
+option: StrEnum('ipasudorunasgroupcategory', attribute=True, autofill=False, cli_name='runasgroupcat', multivalue=False, required=False, values=(u'all',))
+option: Str('externaluser', attribute=True, autofill=False, cli_name='externaluser', multivalue=False, required=False)
+option: Str('ipasudorunasextuser', attribute=True, autofill=False, cli_name='runasexternaluser', multivalue=False, required=False)
+option: Str('ipasudorunasextgroup', attribute=True, autofill=False, cli_name='runasexternalgroup', multivalue=False, required=False)
+option: Str('addattr*', cli_name='addattr', exclude='webui')
+option: Str('setattr*', cli_name='setattr', exclude='webui')
+option: Flag('rights', autofill=True, default=False)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('value', <type 'unicode'>, None)
 command: sudorule_remove_allow_command
 args: 1,5,3
-arg: Str('cn', attribute=True, cli_name='sudorule_name', label=Gettext('Rule name', domain='ipa', localedir=None), multivalue=False, primary_key=True, query=True, required=True)
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-option: List('sudocmd?', alwaysask=True, cli_name='sudocmds', label=u'member sudo command', multivalue=True)
-option: List('sudocmdgroup?', alwaysask=True, cli_name='sudocmdgroups', label=u'member sudo command group', multivalue=True)
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('failed', <type 'dict'>, Gettext('Members that could not be removed', domain='ipa', localedir=None))
-output: Output('completed', <type 'int'>, Gettext('Number of members removed', domain='ipa', localedir=None))
+arg: Str('cn', attribute=True, cli_name='sudorule_name', multivalue=False, primary_key=True, query=True, required=True)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+option: List('sudocmd?', alwaysask=True, cli_name='sudocmds', multivalue=True)
+option: List('sudocmdgroup?', alwaysask=True, cli_name='sudocmdgroups', multivalue=True)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('failed', <type 'dict'>, None)
+output: Output('completed', <type 'int'>, None)
 command: sudorule_remove_deny_command
 args: 1,5,3
-arg: Str('cn', attribute=True, cli_name='sudorule_name', label=Gettext('Rule name', domain='ipa', localedir=None), multivalue=False, primary_key=True, query=True, required=True)
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-option: List('sudocmd?', alwaysask=True, cli_name='sudocmds', label=u'member sudo command', multivalue=True)
-option: List('sudocmdgroup?', alwaysask=True, cli_name='sudocmdgroups', label=u'member sudo command group', multivalue=True)
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('failed', <type 'dict'>, Gettext('Members that could not be removed', domain='ipa', localedir=None))
-output: Output('completed', <type 'int'>, Gettext('Number of members removed', domain='ipa', localedir=None))
+arg: Str('cn', attribute=True, cli_name='sudorule_name', multivalue=False, primary_key=True, query=True, required=True)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+option: List('sudocmd?', alwaysask=True, cli_name='sudocmds', multivalue=True)
+option: List('sudocmdgroup?', alwaysask=True, cli_name='sudocmdgroups', multivalue=True)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('failed', <type 'dict'>, None)
+output: Output('completed', <type 'int'>, None)
 command: sudorule_remove_host
 args: 1,5,3
-arg: Str('cn', attribute=True, cli_name='sudorule_name', label=Gettext('Rule name', domain='ipa', localedir=None), multivalue=False, primary_key=True, query=True, required=True)
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-option: List('host?', alwaysask=True, cli_name='hosts', label=u'member host', multivalue=True)
-option: List('hostgroup?', alwaysask=True, cli_name='hostgroups', label=u'member host group', multivalue=True)
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('failed', <type 'dict'>, Gettext('Members that could not be removed', domain='ipa', localedir=None))
-output: Output('completed', <type 'int'>, Gettext('Number of members removed', domain='ipa', localedir=None))
+arg: Str('cn', attribute=True, cli_name='sudorule_name', multivalue=False, primary_key=True, query=True, required=True)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+option: List('host?', alwaysask=True, cli_name='hosts', multivalue=True)
+option: List('hostgroup?', alwaysask=True, cli_name='hostgroups', multivalue=True)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('failed', <type 'dict'>, None)
+output: Output('completed', <type 'int'>, None)
 command: sudorule_remove_option
 args: 1,1,1
-arg: Str('cn', attribute=True, cli_name='sudorule_name', label=Gettext('Rule name', domain='ipa', localedir=None), multivalue=False, primary_key=True, query=True, required=True)
-option: Str('ipasudoopt', cli_name='sudooption', label=Gettext('Sudo Option', domain='ipa', localedir=None))
+arg: Str('cn', attribute=True, cli_name='sudorule_name', multivalue=False, primary_key=True, query=True, required=True)
+option: Str('ipasudoopt', cli_name='sudooption')
 output: Output('result', None, None)
 command: sudorule_remove_runasgroup
 args: 1,4,3
-arg: Str('cn', attribute=True, cli_name='sudorule_name', label=Gettext('Rule name', domain='ipa', localedir=None), multivalue=False, primary_key=True, query=True, required=True)
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-option: List('group?', alwaysask=True, cli_name='groups', label=u'member group', multivalue=True)
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('failed', <type 'dict'>, Gettext('Members that could not be removed', domain='ipa', localedir=None))
-output: Output('completed', <type 'int'>, Gettext('Number of members removed', domain='ipa', localedir=None))
+arg: Str('cn', attribute=True, cli_name='sudorule_name', multivalue=False, primary_key=True, query=True, required=True)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+option: List('group?', alwaysask=True, cli_name='groups', multivalue=True)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('failed', <type 'dict'>, None)
+output: Output('completed', <type 'int'>, None)
 command: sudorule_remove_runasuser
 args: 1,5,3
-arg: Str('cn', attribute=True, cli_name='sudorule_name', label=Gettext('Rule name', domain='ipa', localedir=None), multivalue=False, primary_key=True, query=True, required=True)
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-option: List('user?', alwaysask=True, cli_name='users', label=u'member user', multivalue=True)
-option: List('group?', alwaysask=True, cli_name='groups', label=u'member group', multivalue=True)
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('failed', <type 'dict'>, Gettext('Members that could not be removed', domain='ipa', localedir=None))
-output: Output('completed', <type 'int'>, Gettext('Number of members removed', domain='ipa', localedir=None))
+arg: Str('cn', attribute=True, cli_name='sudorule_name', multivalue=False, primary_key=True, query=True, required=True)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+option: List('user?', alwaysask=True, cli_name='users', multivalue=True)
+option: List('group?', alwaysask=True, cli_name='groups', multivalue=True)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('failed', <type 'dict'>, None)
+output: Output('completed', <type 'int'>, None)
 command: sudorule_remove_user
 args: 1,5,3
-arg: Str('cn', attribute=True, cli_name='sudorule_name', label=Gettext('Rule name', domain='ipa', localedir=None), multivalue=False, primary_key=True, query=True, required=True)
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-option: List('user?', alwaysask=True, cli_name='users', label=u'member user', multivalue=True)
-option: List('group?', alwaysask=True, cli_name='groups', label=u'member group', multivalue=True)
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('failed', <type 'dict'>, Gettext('Members that could not be removed', domain='ipa', localedir=None))
-output: Output('completed', <type 'int'>, Gettext('Number of members removed', domain='ipa', localedir=None))
+arg: Str('cn', attribute=True, cli_name='sudorule_name', multivalue=False, primary_key=True, query=True, required=True)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+option: List('user?', alwaysask=True, cli_name='users', multivalue=True)
+option: List('group?', alwaysask=True, cli_name='groups', multivalue=True)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('failed', <type 'dict'>, None)
+output: Output('completed', <type 'int'>, None)
 command: sudorule_show
 args: 1,4,3
-arg: Str('cn', attribute=True, cli_name='sudorule_name', label=Gettext('Rule name', domain='ipa', localedir=None), multivalue=False, primary_key=True, query=True, required=True)
-option: Flag('rights', autofill=True, default=False, label=Gettext('Rights', domain='ipa', localedir=None))
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+arg: Str('cn', attribute=True, cli_name='sudorule_name', multivalue=False, primary_key=True, query=True, required=True)
+option: Flag('rights', autofill=True, default=False)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('value', <type 'unicode'>, None)
 command: user_add
 args: 1,31,3
-arg: Str('uid', attribute=True, cli_name='login', default_from=DefaultFrom(<lambda>, 'givenname', 'sn'), label=Gettext('User login', domain='ipa', localedir=None), maxlength=255, multivalue=False, normalizer=<lambda>, pattern='^[a-zA-Z0-9_.][a-zA-Z0-9_.-]{0,252}[a-zA-Z0-9_.$-]?$', pattern_errmsg='may only include letters, numbers, _, -, . and $', primary_key=True, required=True)
-option: Str('givenname', attribute=True, cli_name='first', label=Gettext('First name', domain='ipa', localedir=None), multivalue=False, required=True)
-option: Str('sn', attribute=True, cli_name='last', label=Gettext('Last name', domain='ipa', localedir=None), multivalue=False, required=True)
-option: Str('cn', attribute=True, autofill=True, cli_name='cn', default_from=DefaultFrom(<lambda>, 'givenname', 'sn'), label=Gettext('Full name', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Str('displayname', attribute=True, autofill=True, cli_name='displayname', default_from=DefaultFrom(<lambda>, 'givenname', 'sn'), label=Gettext('Display name', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Str('initials', attribute=True, autofill=True, cli_name='initials', default_from=DefaultFrom(<lambda>, 'givenname', 'sn'), label=Gettext('Initials', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Str('homedirectory', attribute=True, cli_name='homedir', default_from=DefaultFrom(<lambda>, 'uid'), label=Gettext('Home directory', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Str('gecos', attribute=True, autofill=True, cli_name='gecos', default_from=DefaultFrom(<lambda>, 'givenname', 'sn'), label=Gettext('GECOS field', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Str('loginshell', attribute=True, cli_name='shell', default=u'/bin/sh', label=Gettext('Login shell', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Str('krbprincipalname', validate_principal, attribute=True, autofill=True, cli_name='principal', default_from=DefaultFrom(<lambda>, 'uid'), flags=['no_update'], label=Gettext('Kerberos principal', domain='ipa', localedir=None), multivalue=False, normalizer=<lambda>, required=False)
-option: Str('mail', attribute=True, cli_name='email', label=Gettext('Email address', domain='ipa', localedir=None), multivalue=True, required=False)
-option: Password('userpassword', attribute=True, cli_name='password', exclude='webui', label=Gettext('Password', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Int('uidnumber', attribute=True, autofill=True, cli_name='uid', default=999, label=Gettext('UID', domain='ipa', localedir=None), minvalue=1, multivalue=False, required=False)
-option: Int('gidnumber', attribute=True, cli_name='gidnumber', default_from=DefaultFrom(<lambda>, 'uid'), label=Gettext('GID', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Str('street', attribute=True, cli_name='street', label=Gettext('Street address', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Str('l', attribute=True, cli_name='city', label=Gettext('City', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Str('st', attribute=True, cli_name='state', label=Gettext('State/Province', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Str('postalcode', attribute=True, cli_name='postalcode', label=Gettext('ZIP', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Str('telephonenumber', attribute=True, cli_name='phone', label=Gettext('Telephone Number', domain='ipa', localedir=None), multivalue=True, required=False)
-option: Str('mobile', attribute=True, cli_name='mobile', label=Gettext('Mobile Telephone Number', domain='ipa', localedir=None), multivalue=True, required=False)
-option: Str('pager', attribute=True, cli_name='pager', label=Gettext('Pager Number', domain='ipa', localedir=None), multivalue=True, required=False)
-option: Str('facsimiletelephonenumber', attribute=True, cli_name='fax', label=Gettext('Fax Number', domain='ipa', localedir=None), multivalue=True, required=False)
-option: Str('ou', attribute=True, cli_name='orgunit', label=Gettext('Org. Unit', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Str('title', attribute=True, cli_name='title', label=Gettext('Job Title', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Str('manager', attribute=True, cli_name='manager', label=Gettext('Manager', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Str('carlicense', attribute=True, cli_name='carlicense', label=Gettext('Car License', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Str('addattr*', validate_add_attribute, cli_name='addattr', exclude='webui')
-option: Str('setattr*', validate_set_attribute, cli_name='setattr', exclude='webui')
+arg: Str('uid', attribute=True, cli_name='login', maxlength=255, multivalue=False, pattern='^[a-zA-Z0-9_.][a-zA-Z0-9_.-]{0,252}[a-zA-Z0-9_.$-]?$', pattern_errmsg='may only include letters, numbers, _, -, . and $', primary_key=True, required=True)
+option: Str('givenname', attribute=True, cli_name='first', multivalue=False, required=True)
+option: Str('sn', attribute=True, cli_name='last', multivalue=False, required=True)
+option: Str('cn', attribute=True, autofill=True, cli_name='cn', multivalue=False, required=False)
+option: Str('displayname', attribute=True, autofill=True, cli_name='displayname', multivalue=False, required=False)
+option: Str('initials', attribute=True, autofill=True, cli_name='initials', multivalue=False, required=False)
+option: Str('homedirectory', attribute=True, cli_name='homedir', multivalue=False, required=False)
+option: Str('gecos', attribute=True, autofill=True, cli_name='gecos', multivalue=False, required=False)
+option: Str('loginshell', attribute=True, cli_name='shell', default=u'/bin/sh', multivalue=False, required=False)
+option: Str('krbprincipalname', attribute=True, autofill=True, cli_name='principal', multivalue=False, required=False)
+option: Str('mail', attribute=True, cli_name='email', multivalue=True, required=False)
+option: Password('userpassword', attribute=True, cli_name='password', exclude='webui', multivalue=False, required=False)
+option: Int('uidnumber', attribute=True, autofill=True, cli_name='uid', default=999, minvalue=1, multivalue=False, required=False)
+option: Int('gidnumber', attribute=True, cli_name='gidnumber', multivalue=False, required=False)
+option: Str('street', attribute=True, cli_name='street', multivalue=False, required=False)
+option: Str('l', attribute=True, cli_name='city', multivalue=False, required=False)
+option: Str('st', attribute=True, cli_name='state', multivalue=False, required=False)
+option: Str('postalcode', attribute=True, cli_name='postalcode', multivalue=False, required=False)
+option: Str('telephonenumber', attribute=True, cli_name='phone', multivalue=True, required=False)
+option: Str('mobile', attribute=True, cli_name='mobile', multivalue=True, required=False)
+option: Str('pager', attribute=True, cli_name='pager', multivalue=True, required=False)
+option: Str('facsimiletelephonenumber', attribute=True, cli_name='fax', multivalue=True, required=False)
+option: Str('ou', attribute=True, cli_name='orgunit', multivalue=False, required=False)
+option: Str('title', attribute=True, cli_name='title', multivalue=False, required=False)
+option: Str('manager', attribute=True, cli_name='manager', multivalue=False, required=False)
+option: Str('carlicense', attribute=True, cli_name='carlicense', multivalue=False, required=False)
+option: Str('addattr*', cli_name='addattr', exclude='webui')
+option: Str('setattr*', cli_name='setattr', exclude='webui')
 option: Flag('noprivate', autofill=True, cli_name='noprivate', default=False)
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
 output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+output: Output('value', <type 'unicode'>, None)
 command: user_del
 args: 1,1,3
-arg: Str('uid', attribute=True, cli_name='login', default_from=DefaultFrom(<lambda>, 'givenname', 'sn'), label=Gettext('User login', domain='ipa', localedir=None), maxlength=255, multivalue=True, normalizer=<lambda>, pattern='^[a-zA-Z0-9_.][a-zA-Z0-9_.-]{0,252}[a-zA-Z0-9_.$-]?$', pattern_errmsg='may only include letters, numbers, _, -, . and $', primary_key=True, query=True, required=True)
+arg: Str('uid', attribute=True, cli_name='login', maxlength=255, multivalue=True, pattern='^[a-zA-Z0-9_.][a-zA-Z0-9_.-]{0,252}[a-zA-Z0-9_.$-]?$', pattern_errmsg='may only include letters, numbers, _, -, . and $', primary_key=True, query=True, required=True)
 option: Flag('continue', autofill=True, cli_name='continue', default=False)
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Output('result', <type 'dict'>, 'list of deletions that failed')
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Output('result', <type 'dict'>, None)
+output: Output('value', <type 'unicode'>, None)
 command: user_disable
 args: 1,0,3
-arg: Str('uid', attribute=True, cli_name='login', default_from=DefaultFrom(<lambda>, 'givenname', 'sn'), label=Gettext('User login', domain='ipa', localedir=None), maxlength=255, multivalue=False, normalizer=<lambda>, pattern='^[a-zA-Z0-9_.][a-zA-Z0-9_.-]{0,252}[a-zA-Z0-9_.$-]?$', pattern_errmsg='may only include letters, numbers, _, -, . and $', primary_key=True, query=True, required=True)
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Output('result', <type 'bool'>, 'True means the operation was successful')
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+arg: Str('uid', attribute=True, cli_name='login', maxlength=255, multivalue=False, pattern='^[a-zA-Z0-9_.][a-zA-Z0-9_.-]{0,252}[a-zA-Z0-9_.$-]?$', pattern_errmsg='may only include letters, numbers, _, -, . and $', primary_key=True, query=True, required=True)
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Output('result', <type 'bool'>, None)
+output: Output('value', <type 'unicode'>, None)
 command: user_enable
 args: 1,0,3
-arg: Str('uid', attribute=True, cli_name='login', default_from=DefaultFrom(<lambda>, 'givenname', 'sn'), label=Gettext('User login', domain='ipa', localedir=None), maxlength=255, multivalue=False, normalizer=<lambda>, pattern='^[a-zA-Z0-9_.][a-zA-Z0-9_.-]{0,252}[a-zA-Z0-9_.$-]?$', pattern_errmsg='may only include letters, numbers, _, -, . and $', primary_key=True, query=True, required=True)
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Output('result', <type 'bool'>, 'True means the operation was successful')
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+arg: Str('uid', attribute=True, cli_name='login', maxlength=255, multivalue=False, pattern='^[a-zA-Z0-9_.][a-zA-Z0-9_.-]{0,252}[a-zA-Z0-9_.$-]?$', pattern_errmsg='may only include letters, numbers, _, -, . and $', primary_key=True, query=True, required=True)
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Output('result', <type 'bool'>, None)
+output: Output('value', <type 'unicode'>, None)
 command: user_find
 args: 1,43,4
 arg: Str('criteria?', noextrawhitespace=False)
-option: Str('uid', attribute=True, autofill=False, cli_name='login', default_from=DefaultFrom(<lambda>, 'givenname', 'sn'), label=Gettext('User login', domain='ipa', localedir=None), maxlength=255, multivalue=False, normalizer=<lambda>, pattern='^[a-zA-Z0-9_.][a-zA-Z0-9_.-]{0,252}[a-zA-Z0-9_.$-]?$', pattern_errmsg='may only include letters, numbers, _, -, . and $', primary_key=True, query=True, required=False)
-option: Str('givenname', attribute=True, autofill=False, cli_name='first', label=Gettext('First name', domain='ipa', localedir=None), multivalue=False, query=True, required=False)
-option: Str('sn', attribute=True, autofill=False, cli_name='last', label=Gettext('Last name', domain='ipa', localedir=None), multivalue=False, query=True, required=False)
-option: Str('cn', attribute=True, autofill=False, cli_name='cn', default_from=DefaultFrom(<lambda>, 'givenname', 'sn'), label=Gettext('Full name', domain='ipa', localedir=None), multivalue=False, query=True, required=False)
-option: Str('displayname', attribute=True, autofill=False, cli_name='displayname', default_from=DefaultFrom(<lambda>, 'givenname', 'sn'), label=Gettext('Display name', domain='ipa', localedir=None), multivalue=False, query=True, required=False)
-option: Str('initials', attribute=True, autofill=False, cli_name='initials', default_from=DefaultFrom(<lambda>, 'givenname', 'sn'), label=Gettext('Initials', domain='ipa', localedir=None), multivalue=False, query=True, required=False)
-option: Str('homedirectory', attribute=True, autofill=False, cli_name='homedir', default_from=DefaultFrom(<lambda>, 'uid'), label=Gettext('Home directory', domain='ipa', localedir=None), multivalue=False, query=True, required=False)
-option: Str('gecos', attribute=True, autofill=False, cli_name='gecos', default_from=DefaultFrom(<lambda>, 'givenname', 'sn'), label=Gettext('GECOS field', domain='ipa', localedir=None), multivalue=False, query=True, required=False)
-option: Str('loginshell', attribute=True, autofill=False, cli_name='shell', default=u'/bin/sh', label=Gettext('Login shell', domain='ipa', localedir=None), multivalue=False, query=True, required=False)
-option: Str('krbprincipalname', validate_principal, attribute=True, autofill=False, cli_name='principal', default_from=DefaultFrom(<lambda>, 'uid'), flags=['no_update'], label=Gettext('Kerberos principal', domain='ipa', localedir=None), multivalue=False, normalizer=<lambda>, query=True, required=False)
-option: Str('mail', attribute=True, autofill=False, cli_name='email', label=Gettext('Email address', domain='ipa', localedir=None), multivalue=True, query=True, required=False)
-option: Password('userpassword', attribute=True, autofill=False, cli_name='password', exclude='webui', label=Gettext('Password', domain='ipa', localedir=None), multivalue=False, query=True, required=False)
-option: Int('uidnumber', attribute=True, autofill=False, cli_name='uid', default=999, label=Gettext('UID', domain='ipa', localedir=None), minvalue=1, multivalue=False, query=True, required=False)
-option: Int('gidnumber', attribute=True, autofill=False, cli_name='gidnumber', default_from=DefaultFrom(<lambda>, 'uid'), label=Gettext('GID', domain='ipa', localedir=None), multivalue=False, query=True, required=False)
-option: Str('street', attribute=True, autofill=False, cli_name='street', label=Gettext('Street address', domain='ipa', localedir=None), multivalue=False, query=True, required=False)
-option: Str('l', attribute=True, autofill=False, cli_name='city', label=Gettext('City', domain='ipa', localedir=None), multivalue=False, query=True, required=False)
-option: Str('st', attribute=True, autofill=False, cli_name='state', label=Gettext('State/Province', domain='ipa', localedir=None), multivalue=False, query=True, required=False)
-option: Str('postalcode', attribute=True, autofill=False, cli_name='postalcode', label=Gettext('ZIP', domain='ipa', localedir=None), multivalue=False, query=True, required=False)
-option: Str('telephonenumber', attribute=True, autofill=False, cli_name='phone', label=Gettext('Telephone Number', domain='ipa', localedir=None), multivalue=True, query=True, required=False)
-option: Str('mobile', attribute=True, autofill=False, cli_name='mobile', label=Gettext('Mobile Telephone Number', domain='ipa', localedir=None), multivalue=True, query=True, required=False)
-option: Str('pager', attribute=True, autofill=False, cli_name='pager', label=Gettext('Pager Number', domain='ipa', localedir=None), multivalue=True, query=True, required=False)
-option: Str('facsimiletelephonenumber', attribute=True, autofill=False, cli_name='fax', label=Gettext('Fax Number', domain='ipa', localedir=None), multivalue=True, query=True, required=False)
-option: Str('ou', attribute=True, autofill=False, cli_name='orgunit', label=Gettext('Org. Unit', domain='ipa', localedir=None), multivalue=False, query=True, required=False)
-option: Str('title', attribute=True, autofill=False, cli_name='title', label=Gettext('Job Title', domain='ipa', localedir=None), multivalue=False, query=True, required=False)
-option: Str('manager', attribute=True, autofill=False, cli_name='manager', label=Gettext('Manager', domain='ipa', localedir=None), multivalue=False, query=True, required=False)
-option: Str('carlicense', attribute=True, autofill=False, cli_name='carlicense', label=Gettext('Car License', domain='ipa', localedir=None), multivalue=False, query=True, required=False)
-option: Int('timelimit?', autofill=False, flags=['no_display'], label=Gettext('Time Limit', domain='ipa', localedir=None), minvalue=0)
-option: Int('sizelimit?', autofill=False, flags=['no_display'], label=Gettext('Size Limit', domain='ipa', localedir=None), minvalue=0)
-option: Flag('whoami', autofill=True, default=False, label=Gettext('Self', domain='ipa', localedir=None))
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-option: Flag('pkey_only?', autofill=True, default=False', label=Gettext('Primary key only', domain='ipa', localedir=None))
-option: List('in_group?', cli_name='in_groups', label=Gettext('group', domain='ipa', localedir=None), multivalue=True)
-option: List('not_in_group?', cli_name='not_in_groups', label=Gettext('group', domain='ipa', localedir=None), multivalue=True)
-option: List('in_netgroup?', cli_name='in_netgroups', label=Gettext('netgroup', domain='ipa', localedir=None), multivalue=True)
-option: List('not_in_netgroup?', cli_name='not_in_netgroups', label=Gettext('netgroup', domain='ipa', localedir=None), multivalue=True)
-option: List('in_role?', cli_name='in_roles', label=Gettext('role', domain='ipa', localedir=None), multivalue=True)
-option: List('not_in_role?', cli_name='not_in_roles', label=Gettext('role', domain='ipa', localedir=None), multivalue=True)
-option: List('in_hbacrule?', cli_name='in_hbacrules', label=Gettext('HBAC rule', domain='ipa', localedir=None), multivalue=True)
-option: List('not_in_hbacrule?', cli_name='not_in_hbacrules', label=Gettext('HBAC rule', domain='ipa', localedir=None), multivalue=True)
-option: List('in_sudorule?', cli_name='in_sudorules', label=Gettext('sudo rule', domain='ipa', localedir=None), multivalue=True)
-option: List('not_in_sudorule?', cli_name='not_in_sudorules', label=Gettext('sudo rule', domain='ipa', localedir=None), multivalue=True)
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
+option: Str('uid', attribute=True, autofill=False, cli_name='login', maxlength=255, multivalue=False, pattern='^[a-zA-Z0-9_.][a-zA-Z0-9_.-]{0,252}[a-zA-Z0-9_.$-]?$', pattern_errmsg='may only include letters, numbers, _, -, . and $', primary_key=True, query=True, required=False)
+option: Str('givenname', attribute=True, autofill=False, cli_name='first', multivalue=False, query=True, required=False)
+option: Str('sn', attribute=True, autofill=False, cli_name='last', multivalue=False, query=True, required=False)
+option: Str('cn', attribute=True, autofill=False, cli_name='cn', multivalue=False, query=True, required=False)
+option: Str('displayname', attribute=True, autofill=False, cli_name='displayname', multivalue=False, query=True, required=False)
+option: Str('initials', attribute=True, autofill=False, cli_name='initials', multivalue=False, query=True, required=False)
+option: Str('homedirectory', attribute=True, autofill=False, cli_name='homedir', multivalue=False, query=True, required=False)
+option: Str('gecos', attribute=True, autofill=False, cli_name='gecos', multivalue=False, query=True, required=False)
+option: Str('loginshell', attribute=True, autofill=False, cli_name='shell', default=u'/bin/sh', multivalue=False, query=True, required=False)
+option: Str('krbprincipalname', attribute=True, autofill=False, cli_name='principal', multivalue=False, query=True, required=False)
+option: Str('mail', attribute=True, autofill=False, cli_name='email', multivalue=True, query=True, required=False)
+option: Password('userpassword', attribute=True, autofill=False, cli_name='password', exclude='webui', multivalue=False, query=True, required=False)
+option: Int('uidnumber', attribute=True, autofill=False, cli_name='uid', default=999, minvalue=1, multivalue=False, query=True, required=False)
+option: Int('gidnumber', attribute=True, autofill=False, cli_name='gidnumber', multivalue=False, query=True, required=False)
+option: Str('street', attribute=True, autofill=False, cli_name='street', multivalue=False, query=True, required=False)
+option: Str('l', attribute=True, autofill=False, cli_name='city', multivalue=False, query=True, required=False)
+option: Str('st', attribute=True, autofill=False, cli_name='state', multivalue=False, query=True, required=False)
+option: Str('postalcode', attribute=True, autofill=False, cli_name='postalcode', multivalue=False, query=True, required=False)
+option: Str('telephonenumber', attribute=True, autofill=False, cli_name='phone', multivalue=True, query=True, required=False)
+option: Str('mobile', attribute=True, autofill=False, cli_name='mobile', multivalue=True, query=True, required=False)
+option: Str('pager', attribute=True, autofill=False, cli_name='pager', multivalue=True, query=True, required=False)
+option: Str('facsimiletelephonenumber', attribute=True, autofill=False, cli_name='fax', multivalue=True, query=True, required=False)
+option: Str('ou', attribute=True, autofill=False, cli_name='orgunit', multivalue=False, query=True, required=False)
+option: Str('title', attribute=True, autofill=False, cli_name='title', multivalue=False, query=True, required=False)
+option: Str('manager', attribute=True, autofill=False, cli_name='manager', multivalue=False, query=True, required=False)
+option: Str('carlicense', attribute=True, autofill=False, cli_name='carlicense', multivalue=False, query=True, required=False)
+option: Int('timelimit?', autofill=False, minvalue=0)
+option: Int('sizelimit?', autofill=False, minvalue=0)
+option: Flag('whoami', autofill=True, default=False)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+option: Flag('pkey_only?', autofill=True, default=False)
+option: List('in_group?', cli_name='in_groups', multivalue=True)
+option: List('not_in_group?', cli_name='not_in_groups', multivalue=True)
+option: List('in_netgroup?', cli_name='in_netgroups', multivalue=True)
+option: List('not_in_netgroup?', cli_name='not_in_netgroups', multivalue=True)
+option: List('in_role?', cli_name='in_roles', multivalue=True)
+option: List('not_in_role?', cli_name='not_in_roles', multivalue=True)
+option: List('in_hbacrule?', cli_name='in_hbacrules', multivalue=True)
+option: List('not_in_hbacrule?', cli_name='not_in_hbacrules', multivalue=True)
+option: List('in_sudorule?', cli_name='in_sudorules', multivalue=True)
+option: List('not_in_sudorule?', cli_name='not_in_sudorules', multivalue=True)
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
 output: ListOfEntries('result', (<type 'list'>, <type 'tuple'>), Gettext('A list of LDAP entries', domain='ipa', localedir=None))
-output: Output('count', <type 'int'>, 'Number of entries returned')
-output: Output('truncated', <type 'bool'>, 'True if not all results were returned')
+output: Output('count', <type 'int'>, None)
+output: Output('truncated', <type 'bool'>, None)
 command: user_mod
 args: 1,31,3
-arg: Str('uid', attribute=True, cli_name='login', default_from=DefaultFrom(<lambda>, 'givenname', 'sn'), label=Gettext('User login', domain='ipa', localedir=None), maxlength=255, multivalue=False, normalizer=<lambda>, pattern='^[a-zA-Z0-9_.][a-zA-Z0-9_.-]{0,252}[a-zA-Z0-9_.$-]?$', pattern_errmsg='may only include letters, numbers, _, -, . and $', primary_key=True, query=True, required=True)
-option: Str('givenname', attribute=True, autofill=False, cli_name='first', label=Gettext('First name', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Str('sn', attribute=True, autofill=False, cli_name='last', label=Gettext('Last name', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Str('cn', attribute=True, autofill=False, cli_name='cn', default_from=DefaultFrom(<lambda>, 'givenname', 'sn'), label=Gettext('Full name', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Str('displayname', attribute=True, autofill=False, cli_name='displayname', default_from=DefaultFrom(<lambda>, 'givenname', 'sn'), label=Gettext('Display name', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Str('initials', attribute=True, autofill=False, cli_name='initials', default_from=DefaultFrom(<lambda>, 'givenname', 'sn'), label=Gettext('Initials', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Str('homedirectory', attribute=True, autofill=False, cli_name='homedir', default_from=DefaultFrom(<lambda>, 'uid'), label=Gettext('Home directory', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Str('gecos', attribute=True, autofill=False, cli_name='gecos', default_from=DefaultFrom(<lambda>, 'givenname', 'sn'), label=Gettext('GECOS field', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Str('loginshell', attribute=True, autofill=False, cli_name='shell', default=u'/bin/sh', label=Gettext('Login shell', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Str('mail', attribute=True, autofill=False, cli_name='email', label=Gettext('Email address', domain='ipa', localedir=None), multivalue=True, required=False)
-option: Password('userpassword', attribute=True, autofill=False, cli_name='password', exclude='webui', label=Gettext('Password', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Int('uidnumber', attribute=True, autofill=False, cli_name='uid', default=999, label=Gettext('UID', domain='ipa', localedir=None), minvalue=1, multivalue=False, required=False)
-option: Int('gidnumber', attribute=True, autofill=False, cli_name='gidnumber', default_from=DefaultFrom(<lambda>, 'uid'), label=Gettext('GID', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Str('street', attribute=True, autofill=False, cli_name='street', label=Gettext('Street address', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Str('l', attribute=True, autofill=False, cli_name='city', label=Gettext('City', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Str('st', attribute=True, autofill=False, cli_name='state', label=Gettext('State/Province', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Str('postalcode', attribute=True, autofill=False, cli_name='postalcode', label=Gettext('ZIP', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Str('telephonenumber', attribute=True, autofill=False, cli_name='phone', label=Gettext('Telephone Number', domain='ipa', localedir=None), multivalue=True, required=False)
-option: Str('mobile', attribute=True, autofill=False, cli_name='mobile', label=Gettext('Mobile Telephone Number', domain='ipa', localedir=None), multivalue=True, required=False)
-option: Str('pager', attribute=True, autofill=False, cli_name='pager', label=Gettext('Pager Number', domain='ipa', localedir=None), multivalue=True, required=False)
-option: Str('facsimiletelephonenumber', attribute=True, autofill=False, cli_name='fax', label=Gettext('Fax Number', domain='ipa', localedir=None), multivalue=True, required=False)
-option: Str('ou', attribute=True, autofill=False, cli_name='orgunit', label=Gettext('Org. Unit', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Str('title', attribute=True, autofill=False, cli_name='title', label=Gettext('Job Title', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Str('manager', attribute=True, autofill=False, cli_name='manager', label=Gettext('Manager', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Str('carlicense', attribute=True, autofill=False, cli_name='carlicense', label=Gettext('Car License', domain='ipa', localedir=None), multivalue=False, required=False)
-option: Str('addattr*', validate_add_attribute, cli_name='addattr', exclude='webui')
-option: Str('setattr*', validate_set_attribute, cli_name='setattr', exclude='webui')
-option: Flag('rights', autofill=True, default=False, label=Gettext('Rights', domain='ipa', localedir=None))
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-option: Str('rename', cli_name='rename', default_from=DefaultFrom(<lambda>, 'givenname', 'sn'), label=Gettext('Rename', domain='ipa', localedir=None), maxlength=255, multivalue=False, normalizer=<lambda>, pattern='^[a-zA-Z0-9_.][a-zA-Z0-9_.-]{0,252}[a-zA-Z0-9_.$-]?$', pattern_errmsg='may only include letters, numbers, _, -, . and $', primary_key=True, required=False)
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+arg: Str('uid', attribute=True, cli_name='login', maxlength=255, multivalue=False, pattern='^[a-zA-Z0-9_.][a-zA-Z0-9_.-]{0,252}[a-zA-Z0-9_.$-]?$', pattern_errmsg='may only include letters, numbers, _, -, . and $', primary_key=True, query=True, required=True)
+option: Str('givenname', attribute=True, autofill=False, cli_name='first', multivalue=False, required=False)
+option: Str('sn', attribute=True, autofill=False, cli_name='last', multivalue=False, required=False)
+option: Str('cn', attribute=True, autofill=False, cli_name='cn', multivalue=False, required=False)
+option: Str('displayname', attribute=True, autofill=False, cli_name='displayname', multivalue=False, required=False)
+option: Str('initials', attribute=True, autofill=False, cli_name='initials', multivalue=False, required=False)
+option: Str('homedirectory', attribute=True, autofill=False, cli_name='homedir', multivalue=False, required=False)
+option: Str('gecos', attribute=True, autofill=False, cli_name='gecos', multivalue=False, required=False)
+option: Str('loginshell', attribute=True, autofill=False, cli_name='shell', default=u'/bin/sh', multivalue=False, required=False)
+option: Str('mail', attribute=True, autofill=False, cli_name='email', multivalue=True, required=False)
+option: Password('userpassword', attribute=True, autofill=False, cli_name='password', exclude='webui', multivalue=False, required=False)
+option: Int('uidnumber', attribute=True, autofill=False, cli_name='uid', default=999, minvalue=1, multivalue=False, required=False)
+option: Int('gidnumber', attribute=True, autofill=False, cli_name='gidnumber', multivalue=False, required=False)
+option: Str('street', attribute=True, autofill=False, cli_name='street', multivalue=False, required=False)
+option: Str('l', attribute=True, autofill=False, cli_name='city', multivalue=False, required=False)
+option: Str('st', attribute=True, autofill=False, cli_name='state', multivalue=False, required=False)
+option: Str('postalcode', attribute=True, autofill=False, cli_name='postalcode', multivalue=False, required=False)
+option: Str('telephonenumber', attribute=True, autofill=False, cli_name='phone', multivalue=True, required=False)
+option: Str('mobile', attribute=True, autofill=False, cli_name='mobile', multivalue=True, required=False)
+option: Str('pager', attribute=True, autofill=False, cli_name='pager', multivalue=True, required=False)
+option: Str('facsimiletelephonenumber', attribute=True, autofill=False, cli_name='fax', multivalue=True, required=False)
+option: Str('ou', attribute=True, autofill=False, cli_name='orgunit', multivalue=False, required=False)
+option: Str('title', attribute=True, autofill=False, cli_name='title', multivalue=False, required=False)
+option: Str('manager', attribute=True, autofill=False, cli_name='manager', multivalue=False, required=False)
+option: Str('carlicense', attribute=True, autofill=False, cli_name='carlicense', multivalue=False, required=False)
+option: Str('addattr*', cli_name='addattr', exclude='webui')
+option: Str('setattr*', cli_name='setattr', exclude='webui')
+option: Flag('rights', autofill=True, default=False)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+option: Str('rename', cli_name='rename', maxlength=255, multivalue=False, pattern='^[a-zA-Z0-9_.][a-zA-Z0-9_.-]{0,252}[a-zA-Z0-9_.$-]?$', pattern_errmsg='may only include letters, numbers, _, -, . and $', primary_key=True, required=False)
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('value', <type 'unicode'>, None)
 command: user_show
 args: 1,4,3
-arg: Str('uid', attribute=True, cli_name='login', default_from=DefaultFrom(<lambda>, 'givenname', 'sn'), label=Gettext('User login', domain='ipa', localedir=None), maxlength=255, multivalue=False, normalizer=<lambda>, pattern='^[a-zA-Z0-9_.][a-zA-Z0-9_.-]{0,252}[a-zA-Z0-9_.$-]?$', pattern_errmsg='may only include letters, numbers, _, -, . and $', primary_key=True, query=True, required=True)
-option: Flag('rights', autofill=True, default=False, label=Gettext('Rights', domain='ipa', localedir=None))
-option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
-option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
-option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+arg: Str('uid', attribute=True, cli_name='login', maxlength=255, multivalue=False, pattern='^[a-zA-Z0-9_.][a-zA-Z0-9_.-]{0,252}[a-zA-Z0-9_.$-]?$', pattern_errmsg='may only include letters, numbers, _, -, . and $', primary_key=True, query=True, required=True)
+option: Flag('rights', autofill=True, default=False)
+option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
+option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui')
+option: Str('version?', exclude='webui')
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
+output: Output('value', <type 'unicode'>, None)
 command: user_unlock
 args: 1,0,3
-arg: Str('uid', attribute=True, cli_name='login', default_from=DefaultFrom(<lambda>, 'givenname', 'sn'), label=Gettext('User login', domain='ipa', localedir=None), maxlength=255, multivalue=False, normalizer=<lambda>, pattern='^[a-zA-Z0-9_.][a-zA-Z0-9_.-]{0,252}[a-zA-Z0-9_.$-]?$', pattern_errmsg='may only include letters, numbers, _, -, . and $', primary_key=True, query=True, required=True)
-output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
-output: Output('result', <type 'bool'>, 'True means the operation was successful')
-output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user")
+arg: Str('uid', attribute=True, cli_name='login', maxlength=255, multivalue=False, pattern='^[a-zA-Z0-9_.][a-zA-Z0-9_.-]{0,252}[a-zA-Z0-9_.$-]?$', pattern_errmsg='may only include letters, numbers, _, -, . and $', primary_key=True, query=True, required=True)
+output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), None)
+output: Output('result', <type 'bool'>, None)
+output: Output('value', <type 'unicode'>, None)
diff --git a/makeapi b/makeapi
index af3b0f96..755849f4 100755
--- a/makeapi
+++ b/makeapi
@@ -2,6 +2,7 @@
 # Authors:
 #   Rob Crittenden <rcritten@redhat.com>
 #   John Dennis <jdennis@redhat.com>
+#   Martin Kosek <mkosek@redhat.com>
 #
 # Copyright (C) 2011  Red Hat
 # see file 'COPYING' for use and warranty information
@@ -26,7 +27,9 @@ import sys
 import os
 import re
 import inspect
-from ipalib import *
+from ipalib import api
+from ipalib.parameters import Param
+from ipalib.output import Output
 from ipalib.text import Gettext, NGettext
 
 API_FILE='API.txt'
@@ -36,6 +39,21 @@ API_NEW_COMMAND = 2
 API_NO_FILE = 4
 API_DOC_ERROR = 8
 
+# attributes removed from Param.__kw dictionary
+PARAM_IGNORED_KW_ATTRIBUTES = ('label',
+                               'doc',
+                               'normalizer',
+                               'encoder',
+                               'default_from',
+                               'create_default',
+                               'hint',
+                               'flags',
+                               'sortorder',)
+
+# attributes removed from Output object
+OUTPUT_IGNORED_ATTRIBUTES = ('doc',
+                             'flags',)
+
 def parse_options():
     from optparse import OptionParser
 
@@ -49,15 +67,37 @@ def parse_options():
     options, args = parser.parse_args()
     return options, args
 
-def strip_doc(line):
-    """
-    Remove the doc= part from the repr() of a Parameter.
+def param_repr(p):
     """
+    Return parameter repr() for API.txt purposes.
 
-    # this pattern allows up to 2 nested parentheses in doc part
-    newline = re.sub(r', doc=([^(,]+)(\([^()]*(\([^()]+\)[^()]*)?\))?', '', line)
+    Some Param attributes do not cause API incompatibility (e.g. doc,
+    label or callables) and should not be added to API.txt. These attributes
+    are removed from the parameter before repr() is called.
 
-    return newline
+    NOTE: since the parameter is not not deepcopy()'ed before attributes are
+    removed, the original parameter is changed in the process. This is OK
+    for ./makeapi since we don't need this attributes anyway (except for
+    validate_doc() which is, however, called before any param_repr() call).
+    """
+    if isinstance(p, Output):
+        for attr in OUTPUT_IGNORED_ATTRIBUTES:
+            try:
+                object.__delattr__(p, attr)
+            except AttributeError:
+                pass
+        return repr(p)
+    elif isinstance(p, Param):
+        param_kw = p.__dict__['_Param__kw']
+        for attr in PARAM_IGNORED_KW_ATTRIBUTES:
+            try:
+                del param_kw[attr]
+            except KeyError:
+                pass
+        object.__setattr__(p, 'rules', {})
+        return repr(p)
+    else:
+        raise ValueError('Unsupported parameter type!')
 
 def validate_doc():
     """
@@ -166,11 +206,11 @@ def make_api():
         fd.write('command: %s\n' % cmd.name)
         fd.write('args: %d,%d,%d\n' % (len(cmd.args), len(cmd.options), len(cmd.output)))
         for a in cmd.args():
-            fd.write('arg: %s\n' % strip_doc(repr(a)))
+            fd.write('arg: %s\n' % param_repr(a))
         for o in cmd.options():
-            fd.write('option: %s\n' % strip_doc(repr(o)))
+            fd.write('option: %s\n' % param_repr(o))
         for o in cmd.output():
-            fd.write('output: %s\n' % strip_doc(repr(o)))
+            fd.write('output: %s\n' % param_repr(o))
     fd.close()
 
     return 0
@@ -211,17 +251,17 @@ def _finalize_command_validation(cmd, found_args, expected_args,
     for a in cmd.args():
         if a.param_spec not in found_args:
             print 'Argument %s of command %s in ipalib, not in API file:\n%s' % (
-                a.param_spec, cmd.name, strip_doc(repr(a)))
+                a.param_spec, cmd.name, param_repr(a))
             passed = False
     for o in cmd.options():
         if o.param_spec not in found_options:
             print 'Option %s of command %s in ipalib, not in API file:\n%s' % (
-                o.param_spec, cmd.name, strip_doc(repr(o)))
+                o.param_spec, cmd.name, param_repr(o))
             passed = False
     for o in cmd.output():
         if o.name not in found_output:
             print 'Output %s of command %s in ipalib, not in API file:\n%s' % (
-                o.name, cmd.name, strip_doc(repr(o)))
+                o.name, cmd.name, param_repr(o))
             passed = False
 
     return passed
@@ -280,13 +320,13 @@ def validate_api():
             found = False
             arg = find_name(line)
             for a in cmd.args():
-                if strip_doc(repr(a)) == line:
+                if param_repr(a) == line:
                     found = True
                 else:
                     if a.name == arg:
                         found = True
                         print 'Arg in %s doesn\'t match.\nGot      %s\nExpected %s' % (
-                            name, strip_doc(repr(a)), line)
+                            name, param_repr(a), line)
                         rval |= API_FILE_DIFFERENCE
             if found:
                 found_args.append(arg)
@@ -299,7 +339,7 @@ def validate_api():
             found = False
             option = find_name(line)
             for o in cmd.options():
-                if strip_doc(repr(o)) == line:
+                if param_repr(o) == line:
                     found = True
                 else:
                     if o.name == option:
@@ -317,7 +357,7 @@ def validate_api():
             found = False
             output = find_name(line)
             for o in cmd.output():
-                if strip_doc(repr(o)) == line:
+                if param_repr(o) == line:
                     found = True
                 else:
                     if o.name == output: