External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-26 21:35:01 -02:30
Code Issues Packages Projects Releases Wiki Activity

Update help text to reflect 3.0 remove: default change

Browse Source
This commit is contained in:
Bill Nottingham
2016-09-29 17:01:11 -04:00
parent ec2b0ac90d
commit cc4025977f
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
awx/sso/conf.py
View File

@@ -44,12 +44,12 @@ which users can administer the organization.
users who will be added to the organization. Strings in the format users who will be added to the organization. Strings in the format
"/<pattern>/<flags>" will be interpreted as regular expressions and may also "/<pattern>/<flags>" will be interpreted as regular expressions and may also
be used instead of string literals; only "i" and "m" are supported for flags. be used instead of string literals; only "i" and "m" are supported for flags.
- remove_admins: True/False. Defaults to False. - remove_admins: True/False. Defaults to True.
If True, a user who does not match will be removed from the organization's If True, a user who does not match will be removed from the organization's
administrative list. administrative list.
- users: None, True/False, string or list/tuple of strings. Same rules apply - users: None, True/False, string or list/tuple of strings. Same rules apply
as for admins. as for admins.
- remove_users: True/False. Defaults to False. Same rules as apply for - remove_users: True/False. Defaults to True. Same rules as apply for
remove_admins.\ remove_admins.\
''') ''')
@@ -90,7 +90,7 @@ for each team's membership, where each can contain the following parameters:
Strings in the format "/<pattern>/<flags>" will be interpreted as regular Strings in the format "/<pattern>/<flags>" will be interpreted as regular
expressions and may also be used instead of string literals; only "i" and "m" expressions and may also be used instead of string literals; only "i" and "m"
are supported for flags. are supported for flags.
- remove: True/False. Defaults to False. If True, a user who does not match - remove: True/False. Defaults to True. If True, a user who does not match
the rules above will be removed from the team.\ the rules above will be removed from the team.\
''') ''')
@@ -434,7 +434,7 @@ register(
' If a string or list of strings, specifies the group DN(s). ' ' If a string or list of strings, specifies the group DN(s). '
'User will be added as a team member if the user is a member of ' 'User will be added as a team member if the user is a member of '
'ANY of these groups.\n' 'ANY of these groups.\n'
'- remove: True/False. Defaults to False. If True, a user who is ' '- remove: True/False. Defaults to True. If True, a user who is '
'not a member of the given groups will be removed from the team.'), 'not a member of the given groups will be removed from the team.'),
category=_('LDAP'), category=_('LDAP'),
category_slug='ldap', category_slug='ldap',