Include the word 'member' with autogenerated optional member labels.

There were reports of confusion over what was being prompted for, hopefully
adding member will make things clearer.

ticket 1062

2 files changed, 77 insertions, 77 deletions

diff --git a/API.txt b/API.txt
index c2034746d..67245c568 100644
--- a/API.txt
+++ b/API.txt
@@ -885,8 +885,8 @@ arg: Str('cn', attribute=True, cli_name='group_name', label=Gettext('Group name'
 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='user', multivalue=True)
-option: List('group?', alwaysask=True, cli_name='groups', label='group', multivalue=True)
+option: List('user?', alwaysask=True, cli_name='users', label='member user', multivalue=True)
+option: List('group?', alwaysask=True, cli_name='groups', label='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))
@@ -951,8 +951,8 @@ arg: Str('cn', attribute=True, cli_name='group_name', label=Gettext('Group name'
 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='user', multivalue=True)
-option: List('group?', alwaysask=True, cli_name='groups', label='group', multivalue=True)
+option: List('user?', alwaysask=True, cli_name='users', label='member user', multivalue=True)
+option: List('group?', alwaysask=True, cli_name='groups', label='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))
@@ -989,8 +989,8 @@ arg: Str('cn', attribute=True, cli_name='name', label=Gettext('Rule name', domai
 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='host', multivalue=True)
-option: List('hostgroup?', alwaysask=True, cli_name='hostgroups', label='hostgroup', multivalue=True)
+option: List('host?', alwaysask=True, cli_name='hosts', label='member host', multivalue=True)
+option: List('hostgroup?', alwaysask=True, cli_name='hostgroups', label='member hostgroup', 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))
@@ -1000,8 +1000,8 @@ arg: Str('cn', attribute=True, cli_name='name', label=Gettext('Rule name', domai
 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='hbacsvc', multivalue=True)
-option: List('hbacsvcgroup?', alwaysask=True, cli_name='hbacsvcgroups', label='hbacsvcgroup', multivalue=True)
+option: List('hbacsvc?', alwaysask=True, cli_name='hbacsvcs', label='member hbacsvc', multivalue=True)
+option: List('hbacsvcgroup?', alwaysask=True, cli_name='hbacsvcgroups', label='member hbacsvcgroup', 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))
@@ -1011,8 +1011,8 @@ arg: Str('cn', attribute=True, cli_name='name', label=Gettext('Rule name', domai
 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='host', multivalue=True)
-option: List('hostgroup?', alwaysask=True, cli_name='hostgroups', label='hostgroup', multivalue=True)
+option: List('host?', alwaysask=True, cli_name='hosts', label='member host', multivalue=True)
+option: List('hostgroup?', alwaysask=True, cli_name='hostgroups', label='member hostgroup', 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))
@@ -1022,8 +1022,8 @@ arg: Str('cn', attribute=True, cli_name='name', label=Gettext('Rule name', domai
 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='user', multivalue=True)
-option: List('group?', alwaysask=True, cli_name='groups', label='group', multivalue=True)
+option: List('user?', alwaysask=True, cli_name='users', label='member user', multivalue=True)
+option: List('group?', alwaysask=True, cli_name='groups', label='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))
@@ -1089,8 +1089,8 @@ arg: Str('cn', attribute=True, cli_name='name', label=Gettext('Rule name', domai
 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='host', multivalue=True)
-option: List('hostgroup?', alwaysask=True, cli_name='hostgroups', label='hostgroup', multivalue=True)
+option: List('host?', alwaysask=True, cli_name='hosts', label='member host', multivalue=True)
+option: List('hostgroup?', alwaysask=True, cli_name='hostgroups', label='member hostgroup', 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))
@@ -1100,8 +1100,8 @@ arg: Str('cn', attribute=True, cli_name='name', label=Gettext('Rule name', domai
 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='hbacsvc', multivalue=True)
-option: List('hbacsvcgroup?', alwaysask=True, cli_name='hbacsvcgroups', label='hbacsvcgroup', multivalue=True)
+option: List('hbacsvc?', alwaysask=True, cli_name='hbacsvcs', label='member hbacsvc', multivalue=True)
+option: List('hbacsvcgroup?', alwaysask=True, cli_name='hbacsvcgroups', label='member hbacsvcgroup', 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))
@@ -1111,8 +1111,8 @@ arg: Str('cn', attribute=True, cli_name='name', label=Gettext('Rule name', domai
 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='host', multivalue=True)
-option: List('hostgroup?', alwaysask=True, cli_name='hostgroups', label='hostgroup', multivalue=True)
+option: List('host?', alwaysask=True, cli_name='hosts', label='member host', multivalue=True)
+option: List('hostgroup?', alwaysask=True, cli_name='hostgroups', label='member hostgroup', 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))
@@ -1122,8 +1122,8 @@ arg: Str('cn', attribute=True, cli_name='name', label=Gettext('Rule name', domai
 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='user', multivalue=True)
-option: List('group?', alwaysask=True, cli_name='groups', label='group', multivalue=True)
+option: List('user?', alwaysask=True, cli_name='users', label='member user', multivalue=True)
+option: List('group?', alwaysask=True, cli_name='groups', label='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))
@@ -1211,7 +1211,7 @@ arg: Str('cn', attribute=True, cli_name='name', label=Gettext('Service group nam
 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='hbacsvc', multivalue=True)
+option: List('hbacsvc?', alwaysask=True, cli_name='hbacsvcs', label='member hbacsvc', 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))
@@ -1255,7 +1255,7 @@ arg: Str('cn', attribute=True, cli_name='name', label=Gettext('Service group nam
 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='hbacsvc', multivalue=True)
+option: List('hbacsvc?', alwaysask=True, cli_name='hbacsvcs', label='member hbacsvc', 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))
@@ -1295,7 +1295,7 @@ arg: Str('fqdn', validate_host, attribute=True, cli_name='hostname', label=Gette
 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='host', multivalue=True)
+option: List('host?', alwaysask=True, cli_name='hosts', label='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))
@@ -1369,7 +1369,7 @@ arg: Str('fqdn', validate_host, attribute=True, cli_name='hostname', label=Gette
 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='host', multivalue=True)
+option: List('host?', alwaysask=True, cli_name='hosts', label='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))
@@ -1402,8 +1402,8 @@ arg: Str('cn', attribute=True, cli_name='hostgroup_name', label=Gettext('Host-gr
 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='host', multivalue=True)
-option: List('hostgroup?', alwaysask=True, cli_name='hostgroups', label='hostgroup', multivalue=True)
+option: List('host?', alwaysask=True, cli_name='hosts', label='member host', multivalue=True)
+option: List('hostgroup?', alwaysask=True, cli_name='hostgroups', label='member hostgroup', 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))
@@ -1453,8 +1453,8 @@ arg: Str('cn', attribute=True, cli_name='hostgroup_name', label=Gettext('Host-gr
 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='host', multivalue=True)
-option: List('hostgroup?', alwaysask=True, cli_name='hostgroups', label='hostgroup', multivalue=True)
+option: List('host?', alwaysask=True, cli_name='hosts', label='member host', multivalue=True)
+option: List('hostgroup?', alwaysask=True, cli_name='hostgroups', label='member hostgroup', 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))
@@ -1547,11 +1547,11 @@ arg: Str('cn', attribute=True, cli_name='name', label=Gettext('Netgroup name', d
 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='user', multivalue=True)
-option: List('group?', alwaysask=True, cli_name='groups', label='group', multivalue=True)
-option: List('host?', alwaysask=True, cli_name='hosts', label='host', multivalue=True)
-option: List('hostgroup?', alwaysask=True, cli_name='hostgroups', label='hostgroup', multivalue=True)
-option: List('netgroup?', alwaysask=True, cli_name='netgroups', label='netgroup', multivalue=True)
+option: List('user?', alwaysask=True, cli_name='users', label='member user', multivalue=True)
+option: List('group?', alwaysask=True, cli_name='groups', label='member group', multivalue=True)
+option: List('host?', alwaysask=True, cli_name='hosts', label='member host', multivalue=True)
+option: List('hostgroup?', alwaysask=True, cli_name='hostgroups', label='member hostgroup', multivalue=True)
+option: List('netgroup?', alwaysask=True, cli_name='netgroups', label='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))
@@ -1615,11 +1615,11 @@ arg: Str('cn', attribute=True, cli_name='name', label=Gettext('Netgroup name', d
 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='user', multivalue=True)
-option: List('group?', alwaysask=True, cli_name='groups', label='group', multivalue=True)
-option: List('host?', alwaysask=True, cli_name='hosts', label='host', multivalue=True)
-option: List('hostgroup?', alwaysask=True, cli_name='hostgroups', label='hostgroup', multivalue=True)
-option: List('netgroup?', alwaysask=True, cli_name='netgroups', label='netgroup', multivalue=True)
+option: List('user?', alwaysask=True, cli_name='users', label='member user', multivalue=True)
+option: List('group?', alwaysask=True, cli_name='groups', label='member group', multivalue=True)
+option: List('host?', alwaysask=True, cli_name='hosts', label='member host', multivalue=True)
+option: List('hostgroup?', alwaysask=True, cli_name='hostgroups', label='member hostgroup', multivalue=True)
+option: List('netgroup?', alwaysask=True, cli_name='netgroups', label='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))
@@ -1664,7 +1664,7 @@ arg: Str('cn', attribute=True, cli_name='name', label=Gettext('Permission name',
 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='privilege', multivalue=True)
+option: List('privilege?', alwaysask=True, cli_name='privileges', label='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))
@@ -1721,7 +1721,7 @@ arg: Str('cn', attribute=True, cli_name='name', label=Gettext('Permission name',
 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='privilege', multivalue=True)
+option: List('privilege?', alwaysask=True, cli_name='privileges', label='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))
@@ -1767,7 +1767,7 @@ arg: Str('cn', attribute=True, cli_name='name', label=Gettext('Privilege name',
 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='role', multivalue=True)
+option: List('role?', alwaysask=True, cli_name='roles', label='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))
@@ -1822,7 +1822,7 @@ arg: Str('cn', attribute=True, cli_name='name', label=Gettext('Privilege name',
 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='role', multivalue=True)
+option: List('role?', alwaysask=True, cli_name='roles', label='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))
@@ -1945,10 +1945,10 @@ arg: Str('cn', attribute=True, cli_name='name', label=Gettext('Role name', domai
 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='user', multivalue=True)
-option: List('group?', alwaysask=True, cli_name='groups', label='group', multivalue=True)
-option: List('host?', alwaysask=True, cli_name='hosts', label='host', multivalue=True)
-option: List('hostgroup?', alwaysask=True, cli_name='hostgroups', label='hostgroup', multivalue=True)
+option: List('user?', alwaysask=True, cli_name='users', label='member user', multivalue=True)
+option: List('group?', alwaysask=True, cli_name='groups', label='member group', multivalue=True)
+option: List('host?', alwaysask=True, cli_name='hosts', label='member host', multivalue=True)
+option: List('hostgroup?', alwaysask=True, cli_name='hostgroups', label='member hostgroup', 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))
@@ -2003,10 +2003,10 @@ arg: Str('cn', attribute=True, cli_name='name', label=Gettext('Role name', domai
 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='user', multivalue=True)
-option: List('group?', alwaysask=True, cli_name='groups', label='group', multivalue=True)
-option: List('host?', alwaysask=True, cli_name='hosts', label='host', multivalue=True)
-option: List('hostgroup?', alwaysask=True, cli_name='hostgroups', label='hostgroup', multivalue=True)
+option: List('user?', alwaysask=True, cli_name='users', label='member user', multivalue=True)
+option: List('group?', alwaysask=True, cli_name='groups', label='member group', multivalue=True)
+option: List('host?', alwaysask=True, cli_name='hosts', label='member host', multivalue=True)
+option: List('hostgroup?', alwaysask=True, cli_name='hostgroups', label='member hostgroup', 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))
@@ -2097,7 +2097,7 @@ arg: Str('krbprincipalname', validate_principal, attribute=True, cli_name='princ
 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='host', multivalue=True)
+option: List('host?', alwaysask=True, cli_name='hosts', label='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))
@@ -2148,7 +2148,7 @@ arg: Str('krbprincipalname', validate_principal, attribute=True, cli_name='princ
 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='host', multivalue=True)
+option: List('host?', alwaysask=True, cli_name='hosts', label='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))
@@ -2237,7 +2237,7 @@ arg: Str('cn', attribute=True, cli_name='sudocmdgroup_name', label=Gettext('Sudo
 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='sudocmd', multivalue=True)
+option: List('sudocmd?', alwaysask=True, cli_name='sudocmds', label='member sudocmd', 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))
@@ -2281,7 +2281,7 @@ arg: Str('cn', attribute=True, cli_name='sudocmdgroup_name', label=Gettext('Sudo
 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='sudocmd', multivalue=True)
+option: List('sudocmd?', alwaysask=True, cli_name='sudocmds', label='member sudocmd', 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))
@@ -2321,8 +2321,8 @@ arg: Str('cn', attribute=True, cli_name='sudorule_name', label=Gettext('Rule nam
 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='sudocmd', multivalue=True)
-option: List('sudocmdgroup?', alwaysask=True, cli_name='sudocmdgroups', label='sudocmdgroup', multivalue=True)
+option: List('sudocmd?', alwaysask=True, cli_name='sudocmds', label='member sudocmd', multivalue=True)
+option: List('sudocmdgroup?', alwaysask=True, cli_name='sudocmdgroups', label='member sudocmdgroup', 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))
@@ -2332,8 +2332,8 @@ arg: Str('cn', attribute=True, cli_name='sudorule_name', label=Gettext('Rule nam
 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='sudocmd', multivalue=True)
-option: List('sudocmdgroup?', alwaysask=True, cli_name='sudocmdgroups', label='sudocmdgroup', multivalue=True)
+option: List('sudocmd?', alwaysask=True, cli_name='sudocmds', label='member sudocmd', multivalue=True)
+option: List('sudocmdgroup?', alwaysask=True, cli_name='sudocmdgroups', label='member sudocmdgroup', 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))
@@ -2343,8 +2343,8 @@ arg: Str('cn', attribute=True, cli_name='sudorule_name', label=Gettext('Rule nam
 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='host', multivalue=True)
-option: List('hostgroup?', alwaysask=True, cli_name='hostgroups', label='hostgroup', multivalue=True)
+option: List('host?', alwaysask=True, cli_name='hosts', label='member host', multivalue=True)
+option: List('hostgroup?', alwaysask=True, cli_name='hostgroups', label='member hostgroup', 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))
@@ -2359,7 +2359,7 @@ arg: Str('cn', attribute=True, cli_name='sudorule_name', label=Gettext('Rule nam
 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='group', multivalue=True)
+option: List('group?', alwaysask=True, cli_name='groups', label='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))
@@ -2369,8 +2369,8 @@ arg: Str('cn', attribute=True, cli_name='sudorule_name', label=Gettext('Rule nam
 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='user', multivalue=True)
-option: List('group?', alwaysask=True, cli_name='groups', label='group', multivalue=True)
+option: List('user?', alwaysask=True, cli_name='users', label='member user', multivalue=True)
+option: List('group?', alwaysask=True, cli_name='groups', label='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))
@@ -2380,8 +2380,8 @@ arg: Str('cn', attribute=True, cli_name='sudorule_name', label=Gettext('Rule nam
 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='user', multivalue=True)
-option: List('group?', alwaysask=True, cli_name='groups', label='group', multivalue=True)
+option: List('user?', alwaysask=True, cli_name='users', label='member user', multivalue=True)
+option: List('group?', alwaysask=True, cli_name='groups', label='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))
@@ -2449,8 +2449,8 @@ arg: Str('cn', attribute=True, cli_name='sudorule_name', label=Gettext('Rule nam
 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='sudocmd', multivalue=True)
-option: List('sudocmdgroup?', alwaysask=True, cli_name='sudocmdgroups', label='sudocmdgroup', multivalue=True)
+option: List('sudocmd?', alwaysask=True, cli_name='sudocmds', label='member sudocmd', multivalue=True)
+option: List('sudocmdgroup?', alwaysask=True, cli_name='sudocmdgroups', label='member sudocmdgroup', 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))
@@ -2460,8 +2460,8 @@ arg: Str('cn', attribute=True, cli_name='sudorule_name', label=Gettext('Rule nam
 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='sudocmd', multivalue=True)
-option: List('sudocmdgroup?', alwaysask=True, cli_name='sudocmdgroups', label='sudocmdgroup', multivalue=True)
+option: List('sudocmd?', alwaysask=True, cli_name='sudocmds', label='member sudocmd', multivalue=True)
+option: List('sudocmdgroup?', alwaysask=True, cli_name='sudocmdgroups', label='member sudocmdgroup', 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))
@@ -2471,8 +2471,8 @@ arg: Str('cn', attribute=True, cli_name='sudorule_name', label=Gettext('Rule nam
 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='host', multivalue=True)
-option: List('hostgroup?', alwaysask=True, cli_name='hostgroups', label='hostgroup', multivalue=True)
+option: List('host?', alwaysask=True, cli_name='hosts', label='member host', multivalue=True)
+option: List('hostgroup?', alwaysask=True, cli_name='hostgroups', label='member hostgroup', 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))
@@ -2487,7 +2487,7 @@ arg: Str('cn', attribute=True, cli_name='sudorule_name', label=Gettext('Rule nam
 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='group', multivalue=True)
+option: List('group?', alwaysask=True, cli_name='groups', label='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))
@@ -2497,8 +2497,8 @@ arg: Str('cn', attribute=True, cli_name='sudorule_name', label=Gettext('Rule nam
 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='user', multivalue=True)
-option: List('group?', alwaysask=True, cli_name='groups', label='group', multivalue=True)
+option: List('user?', alwaysask=True, cli_name='users', label='member user', multivalue=True)
+option: List('group?', alwaysask=True, cli_name='groups', label='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))
@@ -2508,8 +2508,8 @@ arg: Str('cn', attribute=True, cli_name='sudorule_name', label=Gettext('Rule nam
 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='user', multivalue=True)
-option: List('group?', alwaysask=True, cli_name='groups', label='group', multivalue=True)
+option: List('user?', alwaysask=True, cli_name='users', label='member user', multivalue=True)
+option: List('group?', alwaysask=True, cli_name='groups', label='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))
diff --git a/ipalib/plugins/baseldap.py b/ipalib/plugins/baseldap.py
index f07fb2774..053a0a5a3 100644
--- a/ipalib/plugins/baseldap.py
+++ b/ipalib/plugins/baseldap.py
@@ -1062,7 +1062,7 @@ class LDAPModMember(LDAPQuery):
                 name = to_cli(ldap_obj_name)
                 doc = self.member_param_doc % ldap_obj.object_name_plural
                 yield List('%s?' % name, cli_name='%ss' % name, doc=doc,
-                           label=ldap_obj.object_name, alwaysask=True)
+                           label='member ' + ldap_obj.object_name, alwaysask=True)
 
     def get_member_dns(self, **options):
         dns = {}