From cc4025977f3fadfe206d6ccb056dafc16f29a575 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 29 Sep 2016 17:01:11 -0400 Subject: [PATCH] Update help text to reflect 3.0 remove: default change --- awx/sso/conf.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/awx/sso/conf.py b/awx/sso/conf.py index e0842f6031..5bcff670cf 100644 --- a/awx/sso/conf.py +++ b/awx/sso/conf.py @@ -44,12 +44,12 @@ which users can administer the organization. users who will be added to the organization. Strings in the format "//" will be interpreted as regular expressions and may also 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 administrative list. - users: None, True/False, string or list/tuple of strings. Same rules apply 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.\ ''') @@ -90,7 +90,7 @@ for each team's membership, where each can contain the following parameters: Strings in the format "//" will be interpreted as regular expressions and may also be used instead of string literals; only "i" and "m" 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.\ ''') @@ -434,7 +434,7 @@ register( ' 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 ' '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.'), category=_('LDAP'), category_slug='ldap',