diff --git a/awx/main/conf.py b/awx/main/conf.py index 94f448e3bc..6756347b54 100644 --- a/awx/main/conf.py +++ b/awx/main/conf.py @@ -72,8 +72,8 @@ register( 'HTTP headers and meta keys to search to determine remote host ' 'name or IP. Add additional items to this list, such as ' '"HTTP_X_FORWARDED_FOR", if behind a reverse proxy. ' - 'See the "Proxy Support" section of the Adminstrator guide for ' - 'more details.' + 'See the "Proxy Support" section of the AAP Installation guide ' + 'for more details.' ), category=_('System'), category_slug='system', diff --git a/awx/settings/defaults.py b/awx/settings/defaults.py index 3fd721c1af..31c0957987 100644 --- a/awx/settings/defaults.py +++ b/awx/settings/defaults.py @@ -162,7 +162,7 @@ ALLOWED_HOSTS = [] # reverse proxy. REMOTE_HOST_HEADERS = ['REMOTE_ADDR', 'REMOTE_HOST'] -# If we is behind a reverse proxy/load balancer, use this setting to +# If we are behind a reverse proxy/load balancer, use this setting to # allow the proxy IP addresses from which Tower should trust custom # REMOTE_HOST_HEADERS header values # REMOTE_HOST_HEADERS = ['HTTP_X_FORWARDED_FOR', ''REMOTE_ADDR', 'REMOTE_HOST'] diff --git a/awx/ui/src/screens/Setting/MiscSystem/MiscSystemDetail/MiscSystemDetail.js b/awx/ui/src/screens/Setting/MiscSystem/MiscSystemDetail/MiscSystemDetail.js index d5c9ddb10f..c3e1d04971 100644 --- a/awx/ui/src/screens/Setting/MiscSystem/MiscSystemDetail/MiscSystemDetail.js +++ b/awx/ui/src/screens/Setting/MiscSystem/MiscSystemDetail/MiscSystemDetail.js @@ -41,7 +41,6 @@ function MiscSystemDetail() { ); data.DEFAULT_EXECUTION_ENVIRONMENT = name; } - const systemData = pluck( data, 'ACTIVITY_STREAM_ENABLED', diff --git a/awx/ui/src/screens/Setting/shared/data.allSettingOptions.json b/awx/ui/src/screens/Setting/shared/data.allSettingOptions.json index 0c6a5b5ff7..21cdae90c6 100644 --- a/awx/ui/src/screens/Setting/shared/data.allSettingOptions.json +++ b/awx/ui/src/screens/Setting/shared/data.allSettingOptions.json @@ -51,7 +51,7 @@ "type": "list", "required": true, "label": "Remote Host Headers", - "help_text": "HTTP headers and meta keys to search to determine remote host name or IP. Add additional items to this list, such as \"HTTP_X_FORWARDED_FOR\", if behind a reverse proxy. See the \"Proxy Support\" section of the Adminstrator guide for more details.", + "help_text": "HTTP headers and meta keys to search to determine remote host name or IP. Add additional items to this list, such as \"HTTP_X_FORWARDED_FOR\", if behind a reverse proxy. See the \"Proxy Support\" section of the AAP Installation guide for more details.", "category": "System", "category_slug": "system", "default": ["REMOTE_ADDR", "REMOTE_HOST"],