Merge pull request #49689 from terminalmage/2017.7-docs

Fix docs build errors (2017.7 branch)

doc/conf.py

@@ -65,6 +65,7 @@ MOCK_MODULES = [
     'user',
 
     # salt core
+    'concurrent',
     'Crypto',
     'Crypto.Signature',
     'Crypto.Cipher',

doc/ref/modules/index.rst

@@ -137,7 +137,7 @@ call functions available in other execution modules.
 The variable ``__salt__`` is packed into the modules after they are loaded into
 the Salt minion.
 
-The ``__salt__`` variable is a :ref:`Python dictionary <typesmapping>`
+The ``__salt__`` variable is a :ref:`Python dictionary <python:typesmapping>`
 containing all of the Salt functions. Dictionary keys are strings representing
 the names of the modules and the values are the functions themselves.
 
@@ -176,7 +176,7 @@ Grains Data
 -----------
 
 The values detected by the Salt Grains on the minion are available in a
-:ref:`Python dictionary <typesmapping>` named ``__grains__`` and can be
+:ref:`Python dictionary <python:typesmapping>` named ``__grains__`` and can be
 accessed from within callable objects in the Python modules.
 
 To see the contents of the grains dictionary for a given system in your
@@ -265,7 +265,7 @@ Virtual module names are set using the ``__virtual__`` function and the
 ``__virtual__`` Function
 ========================
 
-The ``__virtual__`` function returns either a :ref:`string <typesseq>`,
+The ``__virtual__`` function returns either a :ref:`string <python:typesseq>`,
 :py:data:`True`, :py:data:`False`, or :py:data:`False` with an :ref:`error
 string <modules-error-info>`. If a string is returned then the module is loaded
 using the name of the string as the virtual name. If ``True`` is returned the

doc/ref/states/writing.rst

@@ -190,7 +190,7 @@ functions available in other state modules.
 The variable ``__states__`` is packed into the modules after they are loaded into
 the Salt minion.
 
-The ``__states__`` variable is a :ref:`Python dictionary <typesmapping>`
+The ``__states__`` variable is a :ref:`Python dictionary <python:typesmapping>`
 containing all of the state modules. Dictionary keys are strings representing
 the names of the modules and the values are the functions themselves.
 

doc/topics/grains/index.rst

@@ -152,8 +152,8 @@ The grains are derived by executing all of the "public" functions (i.e. those
 which do not begin with an underscore) found in the modules located in the
 Salt's core grains code, followed by those in any custom grains modules. The
 functions in a grains module must return a :ref:`Python dictionary
-<typesmapping>`, where the dictionary keys are the names of grains, and each
-key's value is that value for that grain.
+<python:typesmapping>`, where the dictionary keys are the names of grains, and
+each key's value is that value for that grain.
 
 Custom grains modules should be placed in a subdirectory named ``_grains``
 located under the :conf_master:`file_roots` specified by the master config

doc/topics/jinja/index.rst

@@ -161,7 +161,7 @@ Saltstack extends `builtin filters`_ with these custom filters:
 
 Converts any time related object into a time based string. It requires valid
 strftime directives. An exhaustive list can be found :ref:`here
-<strftime-strptime-behavior>` in the Python documentation.
+<python:strftime-strptime-behavior>` in the Python documentation.
 
 .. code-block:: jinja