summaryrefslogtreecommitdiff
path: root/scripts/Controller.py
diff options
context:
space:
mode:
authorJoe George <joe@zeroc.com>2017-03-28 10:42:38 -0400
committerJoe George <joe@zeroc.com>2017-03-28 10:42:38 -0400
commit964334f68ccae95410d8937320b2f26c275b0f98 (patch)
tree1eee63f56442f896a4ca06a842484415792e28fd /scripts/Controller.py
parentMerge remote-tracking branch 'origin/3.6' (diff)
downloadice-964334f68ccae95410d8937320b2f26c275b0f98.tar.bz2
ice-964334f68ccae95410d8937320b2f26c275b0f98.tar.xz
ice-964334f68ccae95410d8937320b2f26c275b0f98.zip
ICE-7483 - Rename OS X to macOS
Diffstat (limited to 'scripts/Controller.py')
-rwxr-xr-xscripts/Controller.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/Controller.py b/scripts/Controller.py
index 2dce0d40dbf..2e8dda79b50 100755
--- a/scripts/Controller.py
+++ b/scripts/Controller.py
@@ -35,7 +35,7 @@ class ControllerDriver(Driver):
print("Controller driver options:")
print("--id=<identity> The identify of the controller object.")
print("--endpoints=<endpts> The endpoints to listen on.")
- print("--clean Remove trust settings (OS X).")
+ print("--clean Remove trust settings (macOS).")
def __init__(self, options, *args, **kargs):
Driver.__init__(self, options, *args, **kargs)
@@ -51,7 +51,7 @@ class ControllerDriver(Driver):
if isinstance(platform, Darwin):
#
- # On OS X, we set the trust settings on the certificate to prevent
+ # On macOS, we set the trust settings on the certificate to prevent
# the Web browsers from prompting the user about the untrusted
# certificate. Some browsers such as Chrome don't provide the
# option to set this trust settings.