Merge branch '2016.11' into 'develop'

Conflicts:
  - salt/states/kapacitor.py

HACKING.rst

@@ -94,10 +94,10 @@ virtualenv using the ``--system-site-packages`` option so that these modules
 are available in the virtualenv.
 
 
-Installing dependencies on OS X
-```````````````````````````````
+Installing dependencies on macOS
+````````````````````````````````
 
-One simple way to get all needed dependencies on OS X is to use homebrew,
+One simple way to get all needed dependencies on macOS is to use homebrew,
 and install the following packages::
 
     brew install zmq
@@ -187,7 +187,7 @@ Edit the master config file:
     ``/path/to/your/virtualenv/salt-master.pid``.
 4.  If you are also running a non-development version of Salt you will have to
     change the ``publish_port`` and ``ret_port`` values as well.
-5. On OS X also set max_open_files to 2048.
+5. On xxxOS X also set max_open_files to 2048.
 
 Edit the minion config file:
 

doc/topics/beacons/index.rst

@@ -48,7 +48,7 @@ minion pillar, grains, or local config file.
 
 .. note::
     The `inotify` beacon only works on OSes that have `inotify` kernel support.
-    Currently this excludes FreeBSD, Mac OS X, and Windows.
+    Currently this excludes FreeBSD, macOS, and Windows.
 
 Beacon Monitoring Interval
 --------------------------

doc/topics/cloud/install/index.rst

@@ -12,7 +12,7 @@ On Ubuntu, install Salt Cloud by using following command:
     sudo apt-get update
     sudo apt-get install salt-cloud
 
-If using Salt Cloud on OS X, ``curl-ca-bundle`` must be installed. Presently,
+If using Salt Cloud on macOS, ``curl-ca-bundle`` must be installed. Presently,
 this package is not available via ``brew``, but it is available using MacPorts:
 
 .. code-block:: bash

doc/topics/development/hacking.rst

@@ -83,10 +83,10 @@ Install Salt (and dependencies) into the virtualenv:
 .. _`Fedora Linux`: http://fedoraproject.org/
 .. _`Amazon Linux`: https://aws.amazon.com/amazon-linux-ami/
 
-.. note:: Installing dependencies on OS X.
+.. note:: Installing dependencies on macOS.
 
-    You can install needed dependencies on OS X using homebrew or macports.
-    See :ref:`OS X Installation <macos-installation>`
+    You can install needed dependencies on macOS using homebrew or macports.
+    See :ref:`macOS Installation <macos-installation>`
 
 .. warning:: Installing on RedHat-based Distros
 
@@ -195,7 +195,7 @@ If you would like to log to the console instead of to the log file, remove the
         # use 'limit descriptors 2047' for c-shell
         ulimit -n 2047
 
-    To set file descriptors on OSX, refer to the :ref:`OS X Installation
+    To set file descriptors on macOS, refer to the :ref:`macOS Installation
     <macos-installation>` instructions.
 
 

doc/topics/development/tests/integration.rst

@@ -82,9 +82,9 @@ test suite illustrating the broad usefulness of each function.
 
 The ``setUp`` function is used to set up any repetitive or useful tasks that the
 tests in a test class need before running. For example, any of the ``mac_*``
-integration tests should only run on OSX machines. The ``setUp`` function can be
-used to test for the presence of the ``Darwin`` kernel. If the ``Darwin`` kernel
-is not present, then the test should be skipped.
+integration tests should only run on macOS machines. The ``setUp`` function can
+be used to test for the presence of the ``Darwin`` kernel. If the ``Darwin``
+kernel is not present, then the test should be skipped.
 
 .. code-block:: python
 

doc/topics/installation/osx.rst

@@ -1,8 +1,8 @@
 .. _macos-installation:
 
-====
-OS X
-====
+=====
+macOS
+=====
 
 Installation from the Official SaltStack Repository
 ===================================================
@@ -39,7 +39,7 @@ Installation from MacPorts
 
 Installation from Pip
 =====================
-When only using the OS X system's pip, install this way:
+When only using the macOS system's pip, install this way:
 
 .. code-block:: bash
 
@@ -48,23 +48,23 @@ When only using the OS X system's pip, install this way:
 Salt-Master Customizations
 ==========================
 .. note::
-    Salt master on OS X is not tested or supported by SaltStack. See `SaltStack Platform Support <https://saltstack.com/product-support-lifecycle/>`_ for more information.
+    Salt master on macOS is not tested or supported by SaltStack. See `SaltStack Platform Support <https://saltstack.com/product-support-lifecycle/>`_ for more information.
 
-To run salt-master on OS X, sudo add this configuration option to the /etc/salt/master file:
+To run salt-master on macOS, sudo add this configuration option to the /etc/salt/master file:
 
 .. code-block:: bash
 
     max_open_files: 8192
 
-On versions previous to OS X 10.10 (Yosemite), increase the root user maxfiles limit:
+On versions previous to macOS 10.10 (Yosemite), increase the root user maxfiles limit:
 
 .. code-block:: bash
 
     sudo launchctl limit maxfiles 4096 8192
 
 .. note::
 
-    On OS X 10.10 (Yosemite) and higher, maxfiles should not be adjusted. The
+    On macOS 10.10 (Yosemite) and higher, maxfiles should not be adjusted. The
     default limits are sufficient in all but the most extreme scenarios.
     Overriding these values with the setting below will cause system
     instability!

doc/topics/releases/0.17.0.rst

@@ -160,10 +160,10 @@ Extensive additions have been added to Salt for LXC support. This included
 the backend libs for managing LXC containers. Addition into the salt-virt
 system is still in the works.
 
-Mac OS X User/Group Support
----------------------------
+macOS User/Group Support
+------------------------
 
-Salt is now able to manage users and groups on Minions running Mac OS X.
+Salt is now able to manage users and groups on Minions running macOS.
 However, at this time user passwords cannot be managed.
 
 Django ORM External Pillar

doc/topics/releases/0.17.2.rst

@@ -66,7 +66,7 @@ Version 0.17.2 is another bugfix release for :ref:`0.17.0
 - Fix compound matcher for grains (:issue:`7944`)
 - Improve error reporting in ebuild module (related to :issue:`5393`)
 - Add ``dir_mode`` to ``file.managed`` (:issue:`7860`)
-- Improve traceroute support for FreeBSD and OS X (:issue:`4927`)
+- Improve traceroute support for FreeBSD and macOS (:issue:`4927`)
 - Fix for matching minions under syndics (:issue:`7671`)
 - Improve exception handling for missing ID (:issue:`8259`)
 - Fix grain mismatch for ScientificLinux (:issue:`8338`)

doc/topics/releases/2016.3.0.rst

@@ -107,7 +107,7 @@ Cloud Changes
 Platform Changes
 ================
 
-- Renamed modules related to OS X. The following module filenames were changed.
+- Renamed modules related to macOS. The following module filenames were changed.
   The virtual name remained unchanged.
 
 - **PR** `#30558`_: renamed osxdesktop.py to mac_desktop.py

doc/topics/troubleshooting/index.rst

@@ -244,7 +244,7 @@ Then pass the signal to the master or minion when it seems to be unresponsive:
     killall -SIGUSR1 salt-master
     killall -SIGUSR1 salt-minion
 
-Also under BSD and Mac OS X in addition to SIGUSR1 signal, debug subroutine set
+Also under BSD and macOS in addition to SIGUSR1 signal, debug subroutine set
 up for SIGINFO which has an advantage of being sent by Ctrl+T shortcut.
 
 When filing an issue or sending questions to the mailing list for a problem

doc/topics/tutorials/index.rst

@@ -30,6 +30,6 @@ Tutorials Index
 * :ref:`How to Convert Jinja Logic to an Execution Module <tutorial-jinja_to_execution-module>`
 * :ref:`Using Salt with Stormpath <tutorial-stormpath>`
 * :ref:`Syslog-ng usage <syslog-ng-sate-usage>`
-* :ref:`The MacOS X (Maverick) Developer Step By Step Guide To Salt Installation <tutorial-macos-walk-through>`
+* :ref:`The macOS (Maverick) Developer Step By Step Guide To Salt Installation <tutorial-macos-walk-through>`
 * :ref:`SaltStack Walk-through <tutorial-salt-walk-through>`
 * :ref:`Writing Salt Tests <tutorial-salt-testing>`

doc/topics/tutorials/walkthrough_macosx.rst

@@ -1,11 +1,11 @@
 .. _tutorial-macos-walk-through:
 
-========================================================================
-The MacOS X (Maverick) Developer Step By Step Guide To Salt Installation
-========================================================================
+======================================================================
+The macOS (Maverick) Developer Step By Step Guide To Salt Installation
+======================================================================
 
 This document provides a step-by-step guide to installing a Salt cluster
-consisting of  one master, and one minion running on a local VM hosted on Mac OS X.
+consisting of  one master, and one minion running on a local VM hosted on macOS.
 
 
 .. note::
@@ -85,12 +85,12 @@ Step 1 - Configuring The Salt Master On Your Mac
 `official documentation
 <http://docs.saltstack.com/topics/installation/osx.html>`_
 
-Because Salt has a lot of dependencies that are not built in Mac OS X, we will
-use Homebrew to install Salt. Homebrew is a package manager for Mac, it's
-great, use it (for this tutorial at least!). Some people spend a lot of time
-installing libs by hand to better understand dependencies, and then realize how
-useful a package manager is once they're configuring a brand new machine and
-have to do it all over again. It also lets you *uninstall* things easily.
+Because Salt has a lot of dependencies that are not built in macOS, we will use
+Homebrew to install Salt. Homebrew is a package manager for Mac, it's great, use
+it (for this tutorial at least!). Some people spend a lot of time installing
+libs by hand to better understand dependencies, and then realize how useful a
+package manager is once they're configuring a brand new machine and have to do
+it all over again. It also lets you *uninstall* things easily.
 
 .. note::
 
@@ -109,7 +109,7 @@ have to do it all over again. It also lets you *uninstall* things easily.
 
 .. tip::
 
-    Use the keyboard shortcut ``cmd + shift + period`` in the "open" Mac OS X
+    Use the keyboard shortcut ``cmd + shift + period`` in the "open" macOS
     dialog box to display hidden files and folders, such as .profile.
 
 
@@ -169,7 +169,7 @@ http://docs.saltstack.com/ref/configuration/examples.html#configuration-examples
     ``/etc/salt/master`` is a file, not a folder.
 
 Salt Master configuration changes. The Salt master needs a few customization
-to be able to run on Mac OS X:
+to be able to run on macOS:
 
 .. code-block:: bash
 
@@ -216,7 +216,7 @@ Install VirtualBox
 ------------------
 
 Go get it here: https://www.virtualBox.org/wiki/Downloads (click on VirtualBox
-for OS X hosts => x86/amd64)
+for macOS hosts => x86/amd64)
 
 Install Vagrant
 ---------------
@@ -317,7 +317,7 @@ following:
 
 .. note::
 
-    That ip is the ip of your VM host (the Mac OS X OS). The number is a
+    That ip is the ip of your VM host (the macOS host). The number is a
     VirtualBox default and is displayed in the log after the Vagrant ssh
     command. We'll use that IP to tell the minion where the Salt master is.
     Once you're done, end the ssh session by typing ``exit``.
@@ -436,7 +436,7 @@ and then applied by running the :py:func:`state.apply
 <salt.modules.state.apply_>` function to have the Salt master order its minions
 to update their instructions and run the associated commands.
 
-First Create an empty file on your Salt master (Mac OS X machine):
+First Create an empty file on your Salt master (macOS machine):
 
 .. code-block:: bash
 

pkg/osx/README.md

@@ -1,36 +1,34 @@
-===============================
-Building Native Packages on OSX
-===============================
+=================================
+Building Native Packages on macOS
+=================================
 
-Salt runs well on the Mac, but does have some limitations.
+Salt runs well on the macOS, but does have some limitations.
 
-In this directory you will find scripts and collateral to build an OSX
-.pkg-style package that uses a custom-built Python.  This process has
-been tested on Mac OSX Lion (10.7) and following.
+In this directory you will find scripts and collateral to build a macOS
+.pkg-style package that uses a custom-built Python.  This process has been
+tested on macOS Lion (10.7) and later.
 
-In addition, because of changes in launchd from version
-to version of the OS, a simpler approach is taken for
-the launchd plist files.
+In addition, because of changes in launchd from version to version of the OS, a
+simpler approach is taken for the launchd plist files.
 
-This approach enables Salt users to potentially
-add items to their Salt install via 'pip install' without
-interfering with the rest of their system's Python packages.
+This approach enables Salt users to potentially add items to their Salt install
+via 'pip install' without interfering with the rest of their system's Python
+packages.
 
 To build a native package you will need the following installed:
 
 - Xcode, or the Xcode Command Line Tools
 - git
 
-The native package will install package files into /opt/salt.
-Configuration files will be installed to /etc, but will have
-'.dist' appended to them.
+The native package will install package files into /opt/salt. Configuration
+files will be installed to /etc, but will have '.dist' appended to them.
 
-Launchd plists will be placed in /Library/LaunchDaemons.  By default
-salt-minion will NOT be enabled or started.
+Launchd plists will be placed in /Library/LaunchDaemons. By default salt-minion
+will NOT be enabled or started.
 
-The process has been automated via the ``build.sh`` script
-in the directory with this README file.  Checkout the Salt repo from
-GitHub, chdir into the base repo directory, and run
+The process has been automated via the ``build.sh`` script in the directory with
+this README file.  Checkout the Salt repo from GitHub, chdir into the base repo
+directory, and run
 
     ./build.sh
 
@@ -39,5 +37,3 @@ References:
 
 http://crushbeercrushcode.org/2014/01/using-pkgbuild-and-productbuild-on-os-x-10-7/
 http://stackoverflow.com/questions/11487596/making-os-x-installer-packages-like-a-pro-xcode-developer-id-ready-pkg
-
-

pkg/osx/build.sh

@@ -1,12 +1,12 @@
 #!/bin/bash
 ############################################################################
 #
-# Title: Build Salt Script for OSX
+# Title: Build Salt Script for macOS
 # Authors: CR Oldham, Shane Lee
 # Date: December 2015
 #
 # Description: This script downloads and installs all dependencies and build
-#              tools required to create a .pkg file for installation on OSX.
+#              tools required to create a .pkg file for installation on macOS.
 #              Salt and all dependencies will be installed to /opt/salt. A
 #              .pkg file will then be created based on the contents of
 #              /opt/salt
@@ -57,7 +57,7 @@ PKGRESOURCES=$SRCDIR/pkg/osx
 ############################################################################
 if [[ ! -e "$SRCDIR/.git" ]] && [[ ! -e "$SRCDIR/scripts/salt" ]]; then
     echo "This directory doesn't appear to be a git repository."
-    echo "The OS X build process needs some files from a Git checkout of Salt."
+    echo "The macOS build process needs some files from a Git checkout of Salt."
     echo "Run this script from the root of the Git checkout."
     exit -1
 fi

pkg/osx/build_env.sh

@@ -2,11 +2,11 @@
 
 ############################################################################
 #
-# Title: Build Environment Script for OSX
+# Title: Build Environment Script for macOS
 # Authors: CR Oldham, Shane Lee
 # Date: December 2015
 #
-# Description: This script sets up a build environment for salt on OSX.
+# Description: This script sets up a build environment for salt on macOS.
 #
 # Requirements:
 #     - XCode Command Line Tools (xcode-select --install)
@@ -15,7 +15,7 @@
 #     This script is not passed any parameters
 #
 #     Example:
-#         The following will set up a build environment for salt on OSX
+#         The following will set up a build environment for salt on macOS
 #
 #         ./dev_env.sh
 #

pkg/osx/build_pkg.sh

@@ -1,11 +1,11 @@
 #!/bin/bash
 ############################################################################
 #
-# Title: Build Package Script for OSX
+# Title: Build Package Script for macOS
 # Authors: CR Oldham, Shane Lee
 # Date: December 2015
 #
-# Description: This creates an OSX package for Salt from the contents of
+# Description: This creates an macOS package for Salt from the contents of
 #              /opt/salt
 #
 # Requirements:
@@ -67,7 +67,7 @@ PKGRESOURCES=$SRCDIR/pkg/osx
 ############################################################################
 if [[ ! -e "$SRCDIR/.git" ]] && [[ ! -e "$SRCDIR/scripts/salt" ]]; then
     echo "This directory doesn't appear to be a git repository."
-    echo "The OS X build process needs some files from a Git checkout of Salt."
+    echo "The macOS build process needs some files from a Git checkout of Salt."
     echo "Run this script from the 'pkg/osx' directory of the Git checkout."
     exit -1
 fi