docs: Mac OS X renamed to macOS

Author: borsboom

doc/MAINTAINER_GUIDE.md

@@ -12,7 +12,7 @@
 
 * Ensure `release` and `stable` branches merged to `master`
 * Check compatibility with latest stackage snapshot
-* Ensure integration tests pass on a representative Windows, Mac OS X, and Linux (Linux
+* Ensure integration tests pass on a representative Windows, macOS, and Linux (Linux
   is handled by Jenkins automatically): `stack install --pedantic && stack test
   --pedantic --flag stack:integration-tests` . The actual release script will
   perform a more thorough test for every platform/variant prior to uploading, so
@@ -85,7 +85,7 @@ for requirements to perform the release, and more details about the tool.
 * On a machine with Vagrant installed:
     * Run `etc/scripts/vagrant-releases.sh`
 
-* On Mac OS X:
+* On macOS:
     * Run `etc/scripts/osx-release.sh`
 
 * On Windows:
@@ -219,7 +219,7 @@ set up.
 
 ## Setting up an ARM VM for releases
 
-These instructions assume the host system is running OS X. Some steps will vary
+These instructions assume the host system is running macOS. Some steps will vary
 with a different host OS.
 
 ### Install qemu on host
@@ -365,7 +365,7 @@ Edit `~/.cabal/config`, and set `executable-stripping: False` and
     [stack-setup-2.yaml](https://github.com/fpco/stackage-content/blob/master/stack/stack-setup-2.yaml)
     for the ones we used in the last GHC release).
 
-    In the case of OS X, repackage the `.xz` bindist as a `.bz2`, since OS X does
+    In the case of macOS, repackage the `.xz` bindist as a `.bz2`, since macOS does
     not include `xz` by default or provide an easy way to install it.
 
   * Build any additional required bindists (see below for instructions)

doc/README.md

@@ -27,7 +27,7 @@ For detailed instructions and downloads, instructions are available by
 operating system/distribution:
 
 * [Windows](install_and_upgrade.md#windows)
-* [Mac OS X](install_and_upgrade.md#mac-os-x)
+* [macOS](install_and_upgrade.md#mac-os-x)
 * [Ubuntu](install_and_upgrade.md#ubuntu)
 * [Debian](install_and_upgrade.md#debian)
 * [CentOS / Red Hat / Amazon Linux](install_and_upgrade.md#centos)

doc/docker_integration.md

@@ -27,9 +27,9 @@ distribution
 a 64-bit kernel. If you do not already have one, we suggest Ubuntu 14.04
 ("trusty") since this is what we test with.
 
-**Mac OS X**: [Docker for Mac](https://docs.docker.com/docker-for-mac/) is the
-supported way to use Docker integration on OS X (the older Docker Machine
-(boot2docker) approach to using Docker on OS X is not supported due to issues
+**macOS**: [Docker for Mac](https://docs.docker.com/docker-for-mac/) is the
+supported way to use Docker integration on macOS (the older Docker Machine
+(boot2docker) approach to using Docker on macOS is not supported due to issues
 with host volume mounting that make Stack nearly unusable for anything but the
 most trivial projects).
 

doc/faq.md

@@ -474,7 +474,7 @@ system libraries.
 
 ## How can I make `stack` aware of my custom SSL certificates?
 
-### OS X
+### macOS
 
 In principle, you can use the following command to add a certificate to your system certificate keychain:
 

doc/install_and_upgrade.md

@@ -60,10 +60,9 @@ NOTE: These executables have been built and tested on a Windows 7, 8.1, and 10
 been tested. If you do test, please edit and update this page to indicate as
 such.
 
-## Mac OS X
+## macOS
 
-
-We generally test on the current version of Mac OS X, but Stack is known to work
+We generally test on the current version of macOS, but Stack is known to work
 on El Capitan, Yosemite and Mavericks as well, and may also work on older
 versions (YMMV).
 
@@ -76,7 +75,7 @@ information.
 ### Manual download
 
 * Download the latest release:
-    * [Mac OS X 64-bit](https://www.stackage.org/stack/osx-x86_64)
+    * [macOS 64-bit](https://www.stackage.org/stack/osx-x86_64)
 * Extract the archive and place `stack` somewhere on your `$PATH` (see
   [Path section below](#path))
 * Now you can run `stack` from the terminal.

doc/nix_integration.md

@@ -119,8 +119,8 @@ If `enable:` is omitted or set to `false`, you can still build in a nix-shell by
 passing the `--nix` flag to stack, for instance `stack --nix build`.  Passing
 any `--nix*` option to the command line will do the same.
 
-**Known limitation on OS X:** currently, `stack --nix ghci` fails on
-OS X, due to a bug in GHCi when working with external shared
+**Known limitation on macOS:** currently, `stack --nix ghci` fails on
+macOS, due to a bug in GHCi when working with external shared
 libraries.
 
 ### The Nix shell
@@ -134,8 +134,8 @@ build environment to facilitate reproducibility. To override this
 behaviour, add `pure: false` to your `stack.yaml` or pass the
 `--no-nix-pure` option to the command line.
 
-**Note:** On OS X shells are non-pure by default currently. This is
-due soon to be resolved locale issues. So on OS X you'll need to be
+**Note:** On macOS shells are non-pure by default currently. This is
+due soon to be resolved locale issues. So on macOS you'll need to be
 a bit more careful to check that you really have listed all
 dependencies.
 

doc/travis-complex.yml

@@ -90,12 +90,12 @@ matrix:
     compiler: ": #stack nightly"
     addons: {apt: {packages: [libgmp-dev]}}
 
-  # Build on OS X in addition to Linux
+  # Build on macOS in addition to Linux
   - env: BUILD=stack ARGS=""
     compiler: ": #stack default osx"
     os: osx
 
-  # Travis includes an OS X which is incompatible with GHC 7.8.4
+  # Travis includes an macOS which is incompatible with GHC 7.8.4
   #- env: BUILD=stack ARGS="--resolver lts-2"
   #  compiler: ": #stack 7.8.4 osx"
   #  os: osx

doc/travis_ci.md

@@ -13,7 +13,7 @@ ready to be used on your projects:
   is intended for projects that need to support multiple GHC versions
   and multiple OSes, such as open source libraries to be released to
   Hackage. It tests against cabal-install, as well as Stack on Linux
-  and OS X. The configuration is significantly more involved to allow
+  and macOS. The configuration is significantly more involved to allow
   for all of this branching behavior.
 
   __NOTE__: It is likely going to be necessary to modify this configuration to

etc/scripts/get-stack.sh

@@ -294,7 +294,7 @@ do_centos_install() {
   fi
 }
 
-# Attempts to install on Mac OS X.
+# Attempts to install on macOS.
 # If 'brew' exists, installs using Homebrew.  Otherwise, installs
 # the generic bindist.
 do_osx_install() {

src/test/Stack/Untar/createFiles.sh

@@ -5,7 +5,7 @@
 # Name for GNU tar.
 TAR=tar
 CHOWN=chown
-# Needed on my OS X install with HomeBrew.
+# Needed on my macOS install with HomeBrew.
 #TAR=gtar
 #CHOWN=gchown