change OS X to macOS (#41294)

* change OS X to macOS

<!--- Your description here -->

+label: docsite_pr

* Update all Mac OS X references to be macOS

* Drop extra Mac

docs/docsite/rst/dev_guide/testing/sanity/integration-aliases.rst

@@ -39,7 +39,7 @@ Skipping
 Aliases can be used to skip platforms using one of the following:
 
 - ``skip/freebsd`` - Skip tests on FreeBSD.
-- ``skip/osx`` - Skip tests on macOS / OS X.
+- ``skip/osx`` - Skip tests on macOS.
 - ``skip/rhel`` - Skip tests on RHEL.
 
 Aliases can be used to skip Python major versions using one of the following:

docs/docsite/rst/installation_guide/intro_installation.rst

@@ -43,11 +43,11 @@ Control Machine Requirements
 
 Currently Ansible can be run from any machine with Python 2 (versions 2.6 or 2.7) or Python 3 (versions 3.5 and higher) installed (Windows isn't supported for the control machine).
 
-This includes Red Hat, Debian, CentOS, OS X, any of the BSDs, and so on.
+This includes Red Hat, Debian, CentOS, macOS, any of the BSDs, and so on.
 
 .. note::
 
-    Mac OS X by default is configured for a small number of file handles, so if you want to use 15 or more forks you'll need to raise the ulimit with ``sudo launchctl limit maxfiles unlimited``. This command can also fix any "Too many open files" error.
+    macOS by default is configured for a small number of file handles, so if you want to use 15 or more forks you'll need to raise the ulimit with ``sudo launchctl limit maxfiles unlimited``. This command can also fix any "Too many open files" error.
 
 
 .. warning::
@@ -221,7 +221,7 @@ Latest Releases on Mac OSX
 
 The preferred way to install Ansible on a Mac is via pip.
 
-The instructions can be found in `Latest Releases Via Pip`_ section. If you are running macOS/OS X version 10.12 or older, then you ought to upgrade to the latest pip (9.0.3 or newer) to connect to the Python Package Index securely.
+The instructions can be found in `Latest Releases Via Pip`_ section. If you are running macOS version 10.12 or older, then you ought to upgrade to the latest pip (9.0.3 or newer) to connect to the Python Package Index securely.
 
 .. _from_pkgutil:
 
@@ -266,7 +266,7 @@ Or if you are looking for the latest development version::
 
    $ pip install git+https://github.com/ansible/ansible.git@devel
 
-If you are installing on OS X Mavericks, you may encounter some noise from your compiler.  A workaround is to do the following::
+If you are installing on macOS Mavericks, you may encounter some noise from your compiler.  A workaround is to do the following::
 
    $ sudo CFLAGS=-Qunused-arguments CPPFLAGS=-Qunused-arguments pip install ansible
 

docs/docsite/rst/plugins/callback.rst

@@ -16,7 +16,7 @@ Example Callback Plugins
 The :doc:`_plays <callback/log_plays>` callback is an example of how to record playbook events to a log file,
 and the :doc:`mail <callback/mail>` callback sends email on playbook failures.
 
-The :doc:`osx_say <callback/osx_say>` callback responds with computer synthesized speech on OS X in relation to playbook events.
+The :doc:`osx_say <callback/osx_say>` callback responds with computer synthesized speech on macOS in relation to playbook events.
 
 
 .. _enabling_callbacks:
@@ -75,7 +75,7 @@ You can also set this as an environment variable:
 Plugin List
 +++++++++++
 
-You can use ``ansible-doc -t callback -l`` to see the list of available plugins. 
+You can use ``ansible-doc -t callback -l`` to see the list of available plugins.
 Use ``ansible-doc -t callback <plugin name>`` to see specific documents and examples.
 
 

docs/docsite/rst/reference_appendices/faq.rst

@@ -377,9 +377,9 @@ The mkpasswd utility that is available on most Linux systems is a great option:
 .. code-block:: shell-session
 
     mkpasswd --method=sha-512
-    
 
-If this utility is not installed on your system (e.g. you are using OS X) then you can still easily
+
+If this utility is not installed on your system (e.g. you are using macOS) then you can still easily
 generate these passwords using Python. First, ensure that the `Passlib <https://bitbucket.org/ecollins/passlib/wiki/Home>`_
 password hashing library is installed:
 

docs/docsite/rst/roadmap/ROADMAP_2_2.rst

@@ -230,10 +230,10 @@ Another note from Jason M: A lot of this work is to ease the burden of CI, CI pe
 
     **Done:** Windows integration tests now run on Shippable.
 
-  - FreeBSD - Include FreeBSD in CI coverage. Not originally on the roadmap, this is an intermediary step for CI coverage for OS X.
+  - FreeBSD - Include FreeBSD in CI coverage. Not originally on the roadmap, this is an intermediary step for CI coverage for macOS.
 
     **Done:** FreeBSD integration tests now run on Shippable.
 
-  - OS X - Include OS X in CI coverage.
+  - macOS - Include macOS in CI coverage.
 
-    **Done:** OS X integration tests now run on Shippable.
+    **Done:** macOS integration tests now run on Shippable.

docs/docsite/rst/roadmap/ROADMAP_2_3.rst

@@ -118,9 +118,9 @@ Lead by mattclay
 
   Some new issues have also appeared, which are currently being worked on.
 
-- *Enable Remaining Tests:* Implement fixes for OS X, FreeBSD and Python 3 to enable the remaining blacklisted tests for CI.
+- *Enable Remaining Tests:* Implement fixes for macOS, FreeBSD and Python 3 to enable the remaining blacklisted tests for CI.
 
-  **Ongoing:** More tests have been enabled for OS X, FreeBSD and Python 3. However, work still remains to enable more tests.
+  **Ongoing:** More tests have been enabled for macOS, FreeBSD and Python 3. However, work still remains to enable more tests.
 
 - *Windows Server 2016:* Add Windows Server 2016 to CI when official AMIs become available.
 

docs/docsite/rst/scenario_guides/guide_gce.rst

@@ -17,7 +17,7 @@ The GCE modules all require the apache-libcloud module which you can install fro
 
     $ pip install apache-libcloud
 
-.. note:: If you're using Ansible on Mac OS X, libcloud also needs to access a CA cert chain. You'll need to download one (you can get one for `here <http://curl.haxx.se/docs/caextract.html>`_.)
+.. note:: If you're using Ansible on macOS, libcloud also needs to access a CA cert chain. You'll need to download one (you can get one for `here <http://curl.haxx.se/docs/caextract.html>`_.)
 
 Credentials
 -----------

docs/docsite/rst/user_guide/intro_getting_started.rst

@@ -28,7 +28,7 @@ machines over SSH.
 
 By default, Ansible will try to use native
 OpenSSH for remote communication when possible.  This enables ControlPersist (a performance feature), Kerberos, and options in ``~/.ssh/config`` such as Jump Host setup.  However, when using Enterprise Linux 6 operating systems as the control machine (Red Hat Enterprise Linux and derivatives such as CentOS), the version of OpenSSH may be too old to support ControlPersist. On these operating systems, Ansible will fallback into using a high-quality Python implementation of
-OpenSSH called 'paramiko'.  If you wish to use features like Kerberized SSH and more, consider using Fedora, OS X, or Ubuntu as your control machine until a newer version of OpenSSH is available for your platform.
+OpenSSH called 'paramiko'.  If you wish to use features like Kerberized SSH and more, consider using Fedora, macOS, or Ubuntu as your control machine until a newer version of OpenSSH is available for your platform.
 
 Occasionally you'll encounter a device that doesn't support SFTP. This is rare, but should it occur, you can switch to SCP mode in :ref:`intro_configuration`.
 

hacking/env-setup

@@ -25,7 +25,7 @@ elif [ -n "$KSH_VERSION" ] && echo $KSH_VERSION | grep -qv '^@(#)PD KSH'; then
 else
     HACKING_DIR="$PWD/hacking"
 fi
-# The below is an alternative to readlink -fn which doesn't exist on OS X
+# The below is an alternative to readlink -fn which doesn't exist on macOS
 # Source: http://stackoverflow.com/a/1678636
 FULL_PATH=$($PYTHON_BIN -c "import os; print(os.path.realpath('$HACKING_DIR'))")
 export ANSIBLE_HOME="$(dirname "$FULL_PATH")"
@@ -70,16 +70,16 @@ fi
 
 if [ "$verbosity" != silent ] ; then
     cat <<- EOF
-	
+
 	Setting up Ansible to run out of checkout...
-	
+
 	PATH=$PATH
 	PYTHONPATH=$PYTHONPATH
 	MANPATH=$MANPATH
-	
+
 	Remember, you may wish to specify your host file with -i
-	
+
 	Done!
-	
+
 	EOF
 fi

lib/ansible/module_utils/facts/network/darwin.py

@@ -22,7 +22,7 @@ from ansible.module_utils.facts.network.generic_bsd import GenericBsdIfconfigNet
 
 class DarwinNetwork(GenericBsdIfconfigNetwork):
     """
-    This is the Mac OS X/Darwin Network Class.
+    This is the Mac macOS Darwin Network Class.
     It uses the GenericBsdIfconfigNetwork unchanged
     """
     platform = 'Darwin'

lib/ansible/module_utils/facts/network/generic_bsd.py

@@ -109,7 +109,7 @@ class GenericBsdIfconfigNetwork(Network):
             all_ipv4_addresses=[],
             all_ipv6_addresses=[],
         )
-        # FreeBSD, DragonflyBSD, NetBSD, OpenBSD and OS X all implicitly add '-a'
+        # FreeBSD, DragonflyBSD, NetBSD, OpenBSD and macOS all implicitly add '-a'
         # when running the command 'ifconfig'.
         # Solaris must explicitly run the command 'ifconfig -a'.
         rc, out, err = self.module.run_command([ifconfig_path, ifconfig_options])

lib/ansible/module_utils/urls.py

@@ -248,8 +248,8 @@ if not HAS_MATCH_HOSTNAME:
     HAS_MATCH_HOSTNAME = True
 
 
-# This is a dummy cacert provided for Mac OS since you need at least 1
-# ca cert, regardless of validity, for Python on Mac OS to use the
+# This is a dummy cacert provided for macOS since you need at least 1
+# ca cert, regardless of validity, for Python on macOS to use the
 # keychain functionality in OpenSSL for validating SSL certificates.
 # See: http://mercurial.selenic.com/wiki/CACertificates#Mac_OS_X_10.6_and_higher
 b_DUMMY_CA_CERT = b"""-----BEGIN CERTIFICATE-----
@@ -625,7 +625,7 @@ class SSLValidationHandler(urllib_request.BaseHandler):
         to_add_fd, to_add_path = tempfile.mkstemp()
         to_add = False
 
-        # Write the dummy ca cert if we are running on Mac OS X
+        # Write the dummy ca cert if we are running on macOS
         if system == u'Darwin':
             os.write(tmp_fd, b_DUMMY_CA_CERT)
             # Default Homebrew path for OpenSSL certs

lib/ansible/modules/files/stat.py

@@ -424,7 +424,7 @@ def format_output(module, path, st):
             ('st_ftype', 'file_type'),
             ('st_attrs', 'attrs'),
             ('st_obtype', 'object_type'),
-            # OS X
+            # macOS
             ('st_rsize', 'real_size'),
             ('st_creator', 'creator'),
             ('st_type', 'file_type'),

lib/ansible/modules/system/group.py

@@ -283,7 +283,7 @@ class DragonFlyBsdGroup(FreeBsdGroup):
 
 class DarwinGroup(Group):
     """
-    This is a Mac OS X Darwin Group manipulation class.
+    This is a Mac macOS Darwin Group manipulation class.
 
     This overrides the following methods from the generic class:-
       - group_del()

lib/ansible/modules/system/osx_defaults.py

@@ -16,10 +16,10 @@ DOCUMENTATION = '''
 ---
 module: osx_defaults
 author: Franck Nijhof (@frenck)
-short_description: osx_defaults allows users to read, write, and delete Mac OS X user defaults from Ansible
+short_description: osx_defaults allows users to read, write, and delete macOS user defaults from Ansible
 description:
-  - osx_defaults allows users to read, write, and delete Mac OS X user defaults from Ansible scripts.
-    Mac OS X applications and other programs use the defaults system to record user preferences and other
+  - osx_defaults allows users to read, write, and delete macOS user defaults from Ansible scripts.
+    macOS applications and other programs use the defaults system to record user preferences and other
     information that must be maintained when the applications aren't running (such as default font for new
     documents, or the position of an Info panel).
 version_added: "2.0"

lib/ansible/modules/system/user.py

@@ -41,7 +41,7 @@ options:
         required: false
         type: bool
         description:
-            - Darwin/OS X only, optionally hide the user from the login window and system preferences.
+            - macOS only, optionally hide the user from the login window and system preferences.
             - The default will be 'True' if the I(system) option is used.
         version_added: "2.6"
     non_unique:
@@ -74,8 +74,8 @@ options:
     shell:
         description:
             - Optionally set the user's shell.
-            - On Mac OS X, before version 2.5, the default shell for non-system users was /usr/bin/false.
-              Since 2.5, the default shell for non-system users on Mac OS X is /bin/bash.
+            - On macOS, before version 2.5, the default shell for non-system users was /usr/bin/false.
+              Since 2.5, the default shell for non-system users on macOS is /bin/bash.
     home:
         description:
             - Optionally set the user's home directory.
@@ -86,7 +86,7 @@ options:
     password:
         description:
             - Optionally set the user's password to this crypted value.
-            - On Darwin/OS X systems, this value has to be cleartext. Beware of security issues.
+            - On macOS systems, this value has to be cleartext. Beware of security issues.
             - See U(https://docs.ansible.com/ansible/faq.html#how-do-i-generate-crypted-passwords-for-the-user-module)
               for details on various ways to generate these password values.
     state:
@@ -1693,7 +1693,7 @@ class SunOS(User):
 
 class DarwinUser(User):
     """
-    This is a Darwin Mac OS X User manipulation class.
+    This is a Darwin macOS User manipulation class.
     Main differences are that Darwin:-
       - Handles accounts in a database managed by dscl(1)
       - Has no useradd/groupadd

lib/ansible/parsing/vault/__init__.py

@@ -836,7 +836,7 @@ class VaultEditor:
             r = subprocess.call(['shred', tmp_path])
         except (OSError, ValueError):
             # shred is not available on this system, or some other error occurred.
-            # ValueError caught because OS X El Capitan is raising an
+            # ValueError caught because macOS El Capitan is raising an
             # exception big enough to hit a limit in python2-2.7.11 and below.
             # Symptom is ValueError: insecure pickle when shred is not
             # installed there.

lib/ansible/plugins/callback/osx_say.py

@@ -11,7 +11,7 @@ DOCUMENTATION = '''
     type: notification
     requirements:
       - whitelising in configuration
-      - the '/usr/bin/say' command line program (standard on OS X)
+      - the '/usr/bin/say' command line program (standard on macOS)
     short_description: oneline Ansible screen output
     version_added: historical
     description:
@@ -32,7 +32,7 @@ SAY_CMD = "/usr/bin/say"
 
 class CallbackModule(CallbackBase):
     """
-    makes Ansible much more exciting on OS X.
+    makes Ansible much more exciting on macOS.
     """
     CALLBACK_VERSION = 2.0
     CALLBACK_TYPE = 'notification'

lib/ansible/plugins/filter/core.py

@@ -275,7 +275,7 @@ def get_encrypted_password(password, hashtype='sha512', salt=None):
 
         if not HAS_PASSLIB:
             if sys.platform.startswith('darwin'):
-                raise AnsibleFilterError('|password_hash requires the passlib python module to generate password hashes on Mac OS X/Darwin')
+                raise AnsibleFilterError('|password_hash requires the passlib python module to generate password hashes on macOS/Darwin')
             saltstring = "$%s$%s" % (cryptmethod[hashtype], salt)
             encrypted = crypt.crypt(password, saltstring)
         else:

test/integration/targets/tags/runme.sh

@@ -2,7 +2,7 @@
 
 set -eu
 
-# Using set -x for this test causes the Shippable console to stop receiving updates and the job to time out for OS X.
+# Using set -x for this test causes the Shippable console to stop receiving updates and the job to time out for macOS.
 # Once that issue is resolved the set -x option can be added above.
 
 # Run these using en_US.UTF-8 because list-tasks is a user output function and so it tailors its output to the

test/runner/injector/injector.py

@@ -120,7 +120,7 @@ def main():
         try:
             cwd = os.getcwd()
         except OSError as ex:
-            # some platforms, such as OS X, may not allow querying the working directory when using become to drop privileges
+            # some platforms, such as macOS, may not allow querying the working directory when using become to drop privileges
             if ex.errno != errno.EACCES:
                 raise
             if require_cwd: