Merge branch '2016.11' into 'nitrogen'

Conflicts:
  - pkg/salt-minion.service
  - salt/modules/junos.py
  - salt/modules/localemod.py
  - salt/modules/win_system.py
  - salt/states/junos.py
  - tests/unit/modules/test_localemod.py
  - tests/unit/modules/test_win_powercfg.py
  - tests/unit/states/dockerng_test.py

.pylintrc

@@ -74,7 +74,7 @@ confidence=
 # can either give multiple identifiers separated by comma (,) or put this
 # option multiple times (only on the command line, not in the configuration
 # file where it should appear only once).You can also use "--disable=all" to
-# disable everything first and then reenable specific checks. For example, if
+# disable everything first and then re-enable specific checks. For example, if
 # you want to run only the similarities checker, you can use "--disable=all
 # --enable=similarities". If you want to run only the classes checker, but have
 # no Warning level messages displayed, use"--disable=all --enable=classes

.testing.pylintrc

@@ -71,7 +71,7 @@ confidence=
 # can either give multiple identifiers separated by comma (,) or put this
 # option multiple times (only on the command line, not in the configuration
 # file where it should appear only once).You can also use "--disable=all" to
-# disable everything first and then reenable specific checks. For example, if
+# disable everything first and then re-enable specific checks. For example, if
 # you want to run only the similarities checker, you can use "--disable=all
 # --enable=similarities". If you want to run only the classes checker, but have
 # no Warning level messages displayed, use"--disable=all --enable=classes

doc/Makefile

@@ -9,11 +9,6 @@ BUILDDIR      = _build
 SPHINXLANG    =
 XELATEX       = xelatex
 
-# User-friendly check for sphinx-build
-ifeq ($(shell which $(SPHINXBUILD) >/dev/null 2>&1; echo $$?), 1)
-$(error The '$(SPHINXBUILD)' command was not found. Make sure you have Sphinx installed, then set the SPHINXBUILD environment variable to point to the full path of the '$(SPHINXBUILD)' executable. Alternatively you can add the directory with the executable to your PATH. If you don't have Sphinx installed, grab it from http://sphinx-doc.org/)
-endif
-
 # ----- Translations Support ------------------------------------------------>
 #  If language is set, also set translation options
 ifeq ($(shell [ "x$(SPHINXLANG)" != "x" ] && echo 0 || echo 1), 0)
@@ -36,7 +31,7 @@ ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(TRANSLATIONOPTS
 # the i18n builder cannot share the environment and doctrees with the others
 I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
 
-.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest gettext translations download-translations
+.PHONY: help clean check_sphinx-build html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest gettext translations download-translations
 
 help:
 	@echo "Please use \`make <target>' where <target> is one of"
@@ -69,38 +64,42 @@ clean:
 	rm -rf $(BUILDDIR)/*
 	test -d 'locale' && find locale/ -name *.mo -exec rm {} \; || true
 
-html: translations
+# User-friendly check for sphinx-build
+check_sphinx-build:
+	@which $(SPHINXBUILD) >/dev/null 2>&1 || (echo "The '$(SPHINXBUILD)' command was not found. Make sure you have Sphinx installed, then set the SPHINXBUILD environment variable to point to the full path of the '$(SPHINXBUILD)' executable. Alternatively you can add the directory with the executable to your PATH. If you don't have Sphinx installed, grab it from http://sphinx-doc.org/)" >&2; false)
+
+html: check_sphinx-build translations
 	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
 	@echo
 	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
 
-dirhtml: translations
+dirhtml: check_sphinx-build translations
 	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
 	@echo
 	@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
 
-singlehtml: translations
+singlehtml: check_sphinx-build translations
 	$(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
 	@echo
 	@echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
 
-pickle: translations
+pickle: check_sphinx-build translations
 	$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
 	@echo
 	@echo "Build finished; now you can process the pickle files."
 
-json: translations
+json: check_sphinx-build translations
 	$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
 	@echo
 	@echo "Build finished; now you can process the JSON files."
 
-htmlhelp: translations
+htmlhelp: check_sphinx-build translations
 	$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
 	@echo
 	@echo "Build finished; now you can run HTML Help Workshop with the" \
 	      ".hhp project file in $(BUILDDIR)/htmlhelp."
 
-qthelp: translations
+qthelp: check_sphinx-build translations
 	$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
 	@echo
 	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
@@ -109,7 +108,7 @@ qthelp: translations
 	@echo "To view the help file:"
 	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/Salt.qhc"
 
-devhelp: translations
+devhelp: check_sphinx-build translations
 	$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
 	@echo
 	@echo "Build finished."
@@ -118,31 +117,31 @@ devhelp: translations
 	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/Salt"
 	@echo "# devhelp"
 
-epub: translations
+epub: check_sphinx-build translations
 	$(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
 	@echo
 	@echo "Build finished. The epub file is in $(BUILDDIR)/epub."
 
-latex: translations
+latex: check_sphinx-build translations
 	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
 	@echo
 	@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
 	@echo "Run \`make' in that directory to run these through (pdf)latex" \
 	      "(use \`make latexpdf' here to do that automatically)."
 
-latexpdf: translations
+latexpdf: check_sphinx-build translations
 	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
 	@echo "Running LaTeX files through pdflatex..."
 	$(MAKE) -C $(BUILDDIR)/latex all-pdf
 	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
 
-latexpdfja: translations
+latexpdfja: check_sphinx-build translations
 	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
 	@echo "Running LaTeX files through platex and dvipdfmx..."
 	$(MAKE) -C $(BUILDDIR)/latex all-pdf-ja
 	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
 
-pdf: translations
+pdf: check_sphinx-build translations
 	@if [ "$(XELATEX)"  = "xelatex" ] || [ "x$(XELATEX)" = "x" ]; then \
 		echo "The '$(XELATEX)' command was not found."; \
 	fi
@@ -157,62 +156,62 @@ cheatsheet: translations
 	cd cheatsheet &&  xelatex salt.tex && cp salt.pdf ../salt-cheatsheet.pdf
 	@echo "./salt-cheatsheet.pdf created."
 
-text: translations
+text: check_sphinx-build translations
 	$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
 	@echo
 	@echo "Build finished. The text files are in $(BUILDDIR)/text."
 
-man: translations
+man: check_sphinx-build translations
 	$(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
 	@echo
 	@echo "Build finished. The manual pages are in $(BUILDDIR)/man."
 
-texinfo: translations
+texinfo: check_sphinx-build translations
 	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
 	@echo
 	@echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo."
 	@echo "Run \`make' in that directory to run these through makeinfo" \
 	      "(use \`make info' here to do that automatically)."
 
-info: translations
+info: check_sphinx-build translations
 	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
 	@echo "Running Texinfo files through makeinfo..."
 	make -C $(BUILDDIR)/texinfo info
 	@echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo."
 
-gettext:
+gettext: check_sphinx-build
 	$(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale
 	@echo
 	@echo "Build finished. The message catalogs are in $(BUILDDIR)/locale"
 
-changes: translations
+changes: check_sphinx-build translations
 	$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
 	@echo
 	@echo "The overview file is in $(BUILDDIR)/changes."
 
-spelling:
+spelling: check_sphinx-build
 	$(SPHINXBUILD) -b spelling $(ALLSPHINXOPTS) $(BUILDDIR)/spelling
 	@echo
 	@echo "Spell check complete; look for any errors in the above output " \
 	      "or in $(BUILDDIR)/spelling/output.txt."
 
-linkcheck:
+linkcheck: check_sphinx-build
 	$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
 	@echo
 	@echo "Link check complete; look for any errors in the above output " \
 	      "or in $(BUILDDIR)/linkcheck/output.txt."
 
-doctest:
+doctest: check_sphinx-build
 	$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
 	@echo "Testing of doctests in the sources finished, look at the " \
 	      "results in $(BUILDDIR)/doctest/output.txt."
 
-xml: translations
+xml: check_sphinx-build translations
 	$(SPHINXBUILD) -b xml $(ALLSPHINXOPTS) $(BUILDDIR)/xml
 	@echo
 	@echo "Build finished. The XML files are in $(BUILDDIR)/xml."
 
-pseudoxml: translations
+pseudoxml: check_sphinx-build translations
 	$(SPHINXBUILD) -b pseudoxml $(ALLSPHINXOPTS) $(BUILDDIR)/pseudoxml
 	@echo
 	@echo "Build finished. The pseudo-XML files are in $(BUILDDIR)/pseudoxml."

doc/conf.py

@@ -26,7 +26,7 @@ class Mock(object):
     '''
     def __init__(self, mapping=None, *args, **kwargs):
         """
-        Mapping allows to bypass the Mock object, but actually assign
+        Mapping allows autodoc to bypass the Mock object, but actually assign
         a specific value, expected by a specific attribute returned.
         """
         self.__mapping = mapping or {}

doc/faq.rst

@@ -260,9 +260,9 @@ service. But restarting the service while in the middle of a state run
 interrupts the process of the Minion running states and sending results back to
 the Master. A common way to workaround that is to schedule restarting of the
 Minion service using :ref:`masterless mode <masterless-quickstart>` after all
-other states have been applied. This allows to keep Minion to Master connection
-alive for the Minion to report the final results to the Master, while the
-service is restarting in the background.
+other states have been applied. This allows the minion to keep Minion to Master
+connection alive for the Minion to report the final results to the Master, while
+the service is restarting in the background.
 
 Upgrade without automatic restart
 *********************************

doc/topics/releases/2014.7.6.rst

@@ -760,7 +760,7 @@ Extended Changelog Courtesy of Todd Stansell (https://github.com/tjstansell/salt
 
   - **PR** `#22925`_: (*rallytime*) Backport `#22895`_ to 2014.7
     | refs: `#23113`_
-  - **PR** `#22895`_: (*aletourneau*) pam_tally counter was not reset to 0 after a succesfull login
+  - **PR** `#22895`_: (*aletourneau*) pam_tally counter was not reset to 0 after a successful login
     | refs: `#22925`_
   * dfe2066 Merge pull request `#23113`_ from saltstack/revert-22925-`bp-22895`_
   * b957ea8 Revert "Backport `#22895`_ to 2014.7"
@@ -921,7 +921,7 @@ Extended Changelog Courtesy of Todd Stansell (https://github.com/tjstansell/salt
   | refs: `#23113`_
   @ *2015-04-22T02:30:26Z*
 
-  - **PR** `#22895`_: (*aletourneau*) pam_tally counter was not reset to 0 after a succesfull login
+  - **PR** `#22895`_: (*aletourneau*) pam_tally counter was not reset to 0 after a successful login
     | refs: `#22925`_
   * 6890752 Merge pull request `#22925`_ from rallytime/`bp-22895`_
   * 3852d96 Pylint fix
@@ -930,7 +930,7 @@ Extended Changelog Courtesy of Todd Stansell (https://github.com/tjstansell/salt
 
   * 5ebf159 Cleaned up pull request
 
-  * a08ac47 pam_tally counter was not reset to 0 after a succesfull login
+  * a08ac47 pam_tally counter was not reset to 0 after a successful login
 
 - **PR** `#22914`_: (*cachedout*) Call proper returner function in jobs.list_jobs
   @ *2015-04-22T00:49:01Z*

doc/topics/releases/2015.8.4.rst

@@ -403,7 +403,7 @@ Changes:
 
 - **PR** `#29708`_: (*lagesag*) Fix test=True for file.directory with recurse ignore_files/ignore_dirs.
 
-- **PR** `#29642`_: (*cachedout*) Correctly restart deamonized minions on failure
+- **PR** `#29642`_: (*cachedout*) Correctly restart daemonized minions on failure
 
 - **PR** `#29599`_: (*cachedout*) Clean up minion shutdown
 

doc/topics/releases/2016.11.0.rst

@@ -264,7 +264,7 @@ Runner Changes
   ``salt://_utils/``) are now able to be synced to the master, making it easier
   to use them in custom runners. A :py:mod:`saltutil.sync_utils
   <salt.runners.saltutil.sync_utils>` function has been added to the
-  :py:mod:`saltutil runner <salt.runners.saltutil>` to faciliate the syncing of
+  :py:mod:`saltutil runner <salt.runners.saltutil>` to facilitate the syncing of
   utility modules to the master.
 
 Pillar Changes
@@ -291,7 +291,7 @@ Junos Module Changes
 Network Automation: NAPALM
 ==========================
 
-Beginning with 2016.11.0, network automation is inclued by default in the core
+Beginning with 2016.11.0, network automation is included by default in the core
 of Salt. It is based on a the `NAPALM <https://github.com/napalm-automation/napalm>`_
 library and provides facilities to manage the configuration and retrieve data
 from network devices running widely used operating systems such: JunOS, IOS-XR,
@@ -720,7 +720,7 @@ Runner Module Deprecations
 - The ``fileserver`` runner no longer accepts the ``outputter`` keyword argument. Users will
   need to specify an outputter using the ``--out`` option.
 
-- The ``jobs`` runner no longer accepts the ``ouputter`` keyword argument. Users will need to
+- The ``jobs`` runner no longer accepts the ``outputter`` keyword argument. Users will need to
   specify an outputter using the ``--out`` option.
 
 - ``virt`` runner module:

doc/topics/releases/2016.11.1.rst

@@ -873,7 +873,7 @@ Changes:
   - **PR** `#37827`_: (*silenius*) add missing chloginclass
   - **PR** `#37826`_: (*rallytime*) Update branch refs to more relevant branch
   - **PR** `#37823`_: (*rallytime*) Add "names" option to file state docs: point users to highstate doc examples
-  - **PR** `#37822`_: (*laleocen*) add documenation for multiline encryption using nacl
+  - **PR** `#37822`_: (*laleocen*) add documentation for multiline encryption using nacl
     | refs: `#37826`_
   - **PR** `#37821`_: (*rallytime*) Clarify keystone.user_present password state docs with default behavior
   - **PR** `#37820`_: (*rallytime*) Add some dependency documentation to libvirt docs

doc/topics/releases/2016.11.2.rst

@@ -189,9 +189,9 @@ Changes:
 
     * fd2ee7d Add some simple unit tests for salt.config.api_config function
 
-    * 3d2fefc Make sure the pidfile and log_file values are overriden by api opts
+    * 3d2fefc Make sure the pidfile and log_file values are overridden by api opts
 
-    * 1f6b540 Make sure the pidfile and log_file values are overriden by api opts
+    * 1f6b540 Make sure the pidfile and log_file values are overridden by api opts
 
     * 04d307f salt-api no longer forces the default timeout
 
@@ -844,7 +844,7 @@ Changes:
 
   * 68d5475 Fixing Snapper unit tests for SUBVOLUME support
 
-  * e9919a9 Removing posible double '/' from the file paths
+  * e9919a9 Removing possible double '/' from the file paths
 
   * 8b4f87f Updating and fixing the documentation
 

doc/topics/releases/2016.11.3.rst

@@ -367,7 +367,7 @@ Changes:
 
   * 5244041 Merge pull request `#39221`_ from lvg01/fix-bug-39220
 
-    * e8a41d6 Removes to early content stripping (stripping is allready done when needed with ident:true), fixes `#39220`_
+    * e8a41d6 Removes to early content stripping (stripping is already done when needed with ident:true), fixes `#39220`_
 
     * a4b169e Fixed wrong logic, fixes `#39220`_
 
@@ -482,7 +482,7 @@ Changes:
 - **PR** `#39276`_: (*gtmanfred*) _device_mismatch_ignored will never be True
   @ *2017-02-09T17:05:28Z*
 
-  - **ISSUE** `#39269`_: (*alexharrington*) Remount forced with lizardfs fuse filesystem due to device missmatch
+  - **ISSUE** `#39269`_: (*alexharrington*) Remount forced with lizardfs fuse filesystem due to device mismatch
     | refs: `#39276`_
   - **ISSUE** `#39106`_: (*carsten-AEI*) CVMFS fuse mount gets remounted every time
     | refs: `#39276`_
@@ -688,7 +688,7 @@ Changes:
   - **ISSUE** `#1`_: (*thatch45*) Enable regex on the salt cli
   - **PR** `#39146`_: (*gtmanfred*) update vmware getting started doc
   - **PR** `#39145`_: (*garethgreenaway*) [2016.3] Fix when targeting via pillar with Salt syndic
-  - **PR** `#39131`_: (*bobrik*) Clarify ipv6 option for minion and inteface for master, closes `#39118`_
+  - **PR** `#39131`_: (*bobrik*) Clarify ipv6 option for minion and interface for master, closes `#39118`_
   - **PR** `#39116`_: (*terminalmage*) Don't abort pillar.get with merge=True if default is None
   - **PR** `#39077`_: (*terminalmage*) Apply fix from `#38705`_ to 2016.3 branch
   - **PR** `#38804`_: (*alexbleotu*) Second attempt to fix prepending of root_dir to paths
@@ -717,7 +717,7 @@ Changes:
 
       * 97521b3 Second attempt to fix prepending of root_dir to paths
 
-    * 6ffeda3 Clarify ipv6 option for minion and inteface for master, closes `#39118`_ (`#39131`_)
+    * 6ffeda3 Clarify ipv6 option for minion and interface for master, closes `#39118`_ (`#39131`_)
 
     * 646b9ea Don't abort pillar.get with merge=True if default is None (`#39116`_)
 
@@ -978,7 +978,7 @@ Changes:
 
   - **PR** `#39039`_: (*rallytime*) Update 2016.11.2 release notes
 
-* a7fc02e Ungate the status.py module and raise unsupported errors in functions not executeable on Windows. (`#39005`_)
+* a7fc02e Ungate the status.py module and raise unsupported errors in functions not executable on Windows. (`#39005`_)
 
   - **PR** `#39005`_: (*cro*) Ungate the status.py module and raise unsupported errors in functions not executable on Windows.
     | refs: `#39536`_
@@ -1214,7 +1214,7 @@ Changes:
     | refs: `#38875`_
   - **PR** `#38890`_: (*cro*) Backport  `#38887`_ to 2016.3: Enable resetting a VM via salt-cloud & VMware driver
   - **PR** `#38883`_: (*techhat*) Don't require text_out path to exist
-  - **PR** `#38875`_: (*terminalmage*) Reactor: fix traceback when salt:// path is nonexistant
+  - **PR** `#38875`_: (*terminalmage*) Reactor: fix traceback when salt:// path is nonexistent
   - **PR** `#38867`_: (*mchugh19*) Touch deploy.sh before use
     | refs: `#38883`_
   - **PR** `#38851`_: (*terminalmage*) Support docker-py 2.0 in dockerng
@@ -1237,7 +1237,7 @@ Changes:
 
       * fbc4d2a reactor: ensure glob_ref is a string
 
-      * 2e443d7 cp.cache_file: add note re: return for nonexistant salt:// path
+      * 2e443d7 cp.cache_file: add note re: return for nonexistent salt:// path
 
     * e9ebec4 Merge pull request `#38890`_ from cro/vmware_reset_vm_20163