mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
Update Python 2 docs links to Python 3
This commit is contained in:
parent
2a83ef6402
commit
ba68c91cfa
10 changed files with 11 additions and 11 deletions
|
@ -2,7 +2,7 @@ Target Selection
|
|||
----------------
|
||||
|
||||
The default matching that Salt utilizes is shell-style globbing around the
|
||||
minion id. See https://docs.python.org/2/library/fnmatch.html#module-fnmatch.
|
||||
minion id. See https://docs.python.org/3/library/fnmatch.html#module-fnmatch.
|
||||
|
||||
.. option:: -E, --pcre
|
||||
|
||||
|
|
|
@ -2,7 +2,7 @@ Target Selection
|
|||
----------------
|
||||
|
||||
The default matching that Salt utilizes is shell-style globbing around the
|
||||
minion id. See https://docs.python.org/2/library/fnmatch.html#module-fnmatch.
|
||||
minion id. See https://docs.python.org/3/library/fnmatch.html#module-fnmatch.
|
||||
|
||||
.. option:: -E, --pcre
|
||||
|
||||
|
|
|
@ -34,7 +34,7 @@ available in salt are shown in the table below.
|
|||
Python dependencies used by salt may define and use additional logging
|
||||
levels. For example, the Python 2 version of the ``multiprocessing``
|
||||
standard Python library `uses the levels
|
||||
<https://docs.python.org/2/library/multiprocessing.html#logging>`_
|
||||
<https://docs.python.org/3/library/multiprocessing.html#logging>`_
|
||||
``subwarning``, 25 and ``subdebug``, 5.
|
||||
|
||||
+----------+---------------+--------------------------------------------------------------------------+
|
||||
|
|
|
@ -1941,7 +1941,7 @@ Default: ``None``
|
|||
TLS/SSL connection options. This could be set to a dictionary containing
|
||||
arguments corresponding to python ``ssl.wrap_socket`` method. For details see
|
||||
`Tornado <http://www.tornadoweb.org/en/stable/tcpserver.html#tornado.tcpserver.TCPServer>`_
|
||||
and `Python <https://docs.python.org/2/library/ssl.html#ssl.wrap_socket>`_
|
||||
and `Python <https://docs.python.org/3/library/ssl.html#ssl.wrap_socket>`_
|
||||
documentation.
|
||||
|
||||
Note: to set enum arguments values like ``cert_reqs`` and ``ssl_version`` use
|
||||
|
|
|
@ -2990,7 +2990,7 @@ Default: ``None``
|
|||
TLS/SSL connection options. This could be set to a dictionary containing
|
||||
arguments corresponding to python ``ssl.wrap_socket`` method. For details see
|
||||
`Tornado <http://www.tornadoweb.org/en/stable/tcpserver.html#tornado.tcpserver.TCPServer>`_
|
||||
and `Python <https://docs.python.org/2/library/ssl.html#ssl.wrap_socket>`_
|
||||
and `Python <https://docs.python.org/3/library/ssl.html#ssl.wrap_socket>`_
|
||||
documentation.
|
||||
|
||||
Note: to set enum arguments values like ``cert_reqs`` and ``ssl_version`` use
|
||||
|
|
|
@ -131,7 +131,7 @@ Once placed in :conf_master:`file_roots`, Salt users can distribute and use
|
|||
minion1:
|
||||
True
|
||||
|
||||
.. _`Python package`: https://docs.python.org/2/tutorial/modules.html#packages
|
||||
.. _`Python package`: https://docs.python.org/3/tutorial/modules.html#packages
|
||||
|
||||
.. _cross-calling-execution-modules:
|
||||
|
||||
|
|
|
@ -2263,7 +2263,7 @@ variable type. Here is the python documentation for `string methods`_.
|
|||
|
||||
{% set strings = grains.id.split('-') %}{{ strings[0] }}
|
||||
|
||||
.. _`string methods`: https://docs.python.org/2/library/stdtypes.html#string-methods
|
||||
.. _`string methods`: https://docs.python.org/3/library/stdtypes.html#string-methods
|
||||
|
||||
Custom Execution Modules
|
||||
========================
|
||||
|
|
|
@ -46,7 +46,7 @@ The TCP transport allows for the master/minion communication to be optionally
|
|||
wrapped in a TLS connection. Enabling this is simple, the master and minion need
|
||||
to be using the tcp connection, then the `ssl` option is enabled. The `ssl`
|
||||
option is passed as a dict and corresponds to the options passed to the
|
||||
Python `ssl.wrap_socket <https://docs.python.org/2/library/ssl.html#ssl.wrap_socket>`
|
||||
Python `ssl.wrap_socket <https://docs.python.org/3/library/ssl.html#ssl.wrap_socket>`
|
||||
function.
|
||||
|
||||
A simple setup looks like this, on the Salt Master add the `ssl` option to the
|
||||
|
|
|
@ -475,6 +475,6 @@ Python testing documentation. Please see the follow references for more informat
|
|||
.. _asserts: https://docs.pytest.org/en/latest/assert.html
|
||||
.. _pytest syntax: https://docs.pytest.org/en/latest/usage.html#specifying-tests-selecting-tests
|
||||
.. _MagicMock: https://docs.python.org/3/library/unittest.mock.html
|
||||
.. _Python Unittest: https://docs.python.org/2/library/unittest.html
|
||||
.. _Python's Assert Functions: https://docs.python.org/2/library/unittest.html#assert-methods
|
||||
.. _Python Unittest: https://docs.python.org/3/library/unittest.html
|
||||
.. _Python's Assert Functions: https://docs.python.org/3/library/unittest.html#assert-methods
|
||||
.. _salt jenkins: https://github.com/saltstack/salt-jenkins
|
||||
|
|
|
@ -1167,7 +1167,7 @@ before execution. The value can be formatted as ``<hash_algorithm>=<hash_sum>``,
|
|||
or it can be a URI to a file containing the hash sum.
|
||||
|
||||
For a list of supported algorithms, see the `hashlib documentation
|
||||
<https://docs.python.org/2/library/hashlib.html>`_.
|
||||
<https://docs.python.org/3/library/hashlib.html>`_.
|
||||
|
||||
Here's an example using ``source_hash``:
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue