Merge branch 'master' into master

.github/workflows/pr-checks.yml

@@ -1,7 +1,7 @@
 name: PR Checks
 
 on:
-  pull_request_target:
+  pull_request:
     types: [opened, synchronize]
 
 permissions:

.github/workflows/release.yml

@@ -10,6 +10,10 @@ on:
         description: "Build Man Pages"
         default: true
         required: false
+      branch:
+        description: "Branch to build/push PR"
+        default: "master"
+        required: false
 
 permissions:
   contents: read
@@ -36,6 +40,7 @@ jobs:
 
     - uses: actions/checkout@v2
       with:
+        ref: ${{ github.event.inputs.branch }}
         fetch-depth: 0
 
     - name: Install Nox
@@ -101,6 +106,9 @@ jobs:
         apt-get install -y git/buster-backports
 
     - uses: actions/checkout@v2
+      with:
+        ref: ${{ github.event.inputs.branch }}
+
 
     - id: changed-files
       if: github.event.inputs.manPages == 'true'
@@ -163,6 +171,7 @@ jobs:
 
     - uses: actions/checkout@v2
       with:
+        ref: ${{ github.event.inputs.branch }}
         fetch-depth: 0
 
     - name: Download salt-man-pages
@@ -196,3 +205,4 @@ jobs:
           This PR is auto-generated by
           [create-pull-request](https://github.com/peter-evans/create-pull-request).
         branch: docs_${{ github.event.inputs.saltVersion }}
+        base: ${{ github.event.inputs.branch }}

.pre-commit-config.yaml

@@ -8,20 +8,6 @@ repos:
     hooks:
 
   # ----- Packaging Requirements ------------------------------------------------------------------------------------>
-      - id: pip-tools-compile
-        alias: compile-pkg-linux-3.5-zmq-requirements
-        name: Linux Packaging Py3.5 ZeroMQ Requirements
-        files: ^requirements/((base|zeromq|crypto)\.txt|static/pkg/(linux\.in|py3\.5/linux\.txt))$
-        pass_filenames: false
-        args:
-          - -v
-          - --py-version=3.5
-          - --platform=linux
-          - --include=requirements/base.txt
-          - --include=requirements/zeromq.txt
-          - --include=requirements/zeromq.txt
-          - requirements/static/pkg/linux.in
-
       - id: pip-tools-compile
         alias: compile-pkg-linux-3.6-zmq-requirements
         name: Linux Packaging Py3.6 ZeroMQ Requirements
@@ -215,23 +201,6 @@ repos:
   # <---- Packaging Requirements -------------------------------------------------------------------------------------
 
   # ----- CI Requirements ------------------------------------------------------------------------------------------->
-      - id: pip-tools-compile
-        alias: compile-ci-linux-py3.5-zmq-requirements
-        name: Linux CI Py3.5 ZeroMQ Requirements
-        files: ^requirements/((base|zeromq|pytest)\.txt|static/((ci|pkg)/(linux\.in|common\.in)|pkg/py3\.5/linux\.txt))$
-        pass_filenames: false
-        args:
-          - -v
-          - --py-version=3.5
-          - --platform=linux
-          - --include=requirements/base.txt
-          - --include=requirements/zeromq.txt
-          - --include=requirements/pytest.txt
-          - --include=requirements/static/pkg/linux.in
-          - --include=requirements/static/ci/common.in
-          - --pip-args=--constraint=requirements/static/pkg/py{py_version}/linux.txt
-          - requirements/static/ci/linux.in
-
       - id: pip-tools-compile
         alias: compile-ci-linux-py3.6-zmq-requirements
         name: Linux CI Py3.6 ZeroMQ Requirements
@@ -317,19 +286,6 @@ repos:
           - --pip-args=--constraint=requirements/static/pkg/py{py_version}/linux.txt
           - requirements/static/ci/linux.in
 
-      - id: pip-tools-compile
-        alias: compile-ci-linux-crypto-py3.5-requirements
-        name: Linux CI Py3.5 Crypto Requirements
-        files: ^requirements/(crypto\.txt|static/ci/(crypto\.in|py3\.5/linux-crypto\.txt))$
-        pass_filenames: false
-        args:
-          - -v
-          - --py-version=3.5
-          - --platform=linux
-          - --out-prefix=linux
-          - --pip-args=--constraint=requirements/static/ci/py{py_version}/linux.txt
-          - requirements/static/ci/crypto.in
-
       - id: pip-tools-compile
         alias: compile-ci-linux-crypto-py3.6-requirements
         name: Linux CI Py3.6 Crypto Requirements
@@ -1193,6 +1149,7 @@ repos:
                 salt/ext/.*|
                 tests/.*
             )$
+        additional_dependencies: ['importlib_metadata<5']
   - repo: https://github.com/PyCQA/bandit
     rev: "1.7.4"
     hooks:
@@ -1202,6 +1159,7 @@ repos:
         args: [--silent, -lll, --skip, B701]
         files: ^tests/.*
         exclude: ^tests/minionswarm\.py
+        additional_dependencies: ['importlib_metadata<5']
   # <---- Security ---------------------------------------------------------------------------------------------------
 
   # ----- Pre-Commit ------------------------------------------------------------------------------------------------>

CHANGELOG.md

@@ -7,6 +7,31 @@ Versions are `MAJOR.PATCH`.
 
 # Changelog
 
+Salt 3005.1 (2022-09-26)
+========================
+
+Fixed
+-----
+
+- Fix arch parsing issue in apt source files (#62247)
+- Fixed parsing CDROM apt sources (#62474)
+- Use str() method instead of repo_line for when python3-apt is installed or not in aptpkg.py. (#62546)
+- Remove the connection_timeout from netmiko_connection_args before netmiko_connection_args is added to __context__["netmiko_device"]["args"] which is passed along to the Netmiko library. (#62547)
+- fixes #62553 by checking for disabled master_type before starting master connection and skipping it if set. (#62553)
+- Fix runas with cmd module when using the onedir bundled packages (#62565)
+- Fix the Pyinstaller hooks to preserve the environment if None is passed. (#62567, #62628)
+- pkgrepo.managed sets wrong permissions on keys installed to /etc/apt/keyring (#62569)
+- pkgrepo.managed creates zero byte gpg files when dearmoring contents to the same filename (#62570)
+- Ensure default values for IPC Buffers are correct type (#62591)
+- Fix a hang on salt-ssh when using sudo. (#62603)
+- Renderers now have access to the correct set of salt functions. (#62610, #62620)
+- Fix including Jinja template from absolute path (#62611)
+- include jmespath in package requirements (#62613)
+- Fix pkgrepo.managed signed-by in test=true mode (#62662)
+- Ensure the status of the service is captured when the beacon function is called, even when the event is not being emitted. (#62675)
+- The sub proxies controlled by Deltaproxy need to have their own req_channel otherwise there are timeout exceptions when the __master_req_channel_payload is fired and reacted on. (#62708)
+
+
 Salt 3005 (2022-08-22)
 ======================
 

changelog/36138.fixed

@@ -0,0 +1 @@
+Add kwargs to handle extra parameters for http.query

changelog/48609.changed

@@ -0,0 +1 @@
+More intelligent diffing in changes of file.serialize state.

changelog/51620.fixed

@@ -0,0 +1 @@
+Do not raise an exception in pkg.info_installed on nonzero return code

changelog/52354.fixed

@@ -0,0 +1 @@
+Don't check for cached pillar errors on state.apply

changelog/56013.added

@@ -0,0 +1 @@
+Added the win_lgpo_reg state and execution modules which will allow registry based group policy to be set directly in the Registry.pol file

changelog/57180.fixed

@@ -0,0 +1 @@
+Don't check for cached pillar errors on state.apply

changelog/58971.changed

@@ -0,0 +1 @@
+Update pillar.obfuscate to accept kwargs in addition to args.  This is useful when passing in keyword arguments like saltenv that are then passed along to pillar.items.

changelog/59339.fixed

@@ -0,0 +1 @@
+Don't check for cached pillar errors on state.apply

changelog/59909.fixed

@@ -0,0 +1 @@
+add load balancing policy default option and ensure the module can be executed with arguments from CLI

changelog/60154.added

@@ -0,0 +1 @@
+State module to manage SysFS attributes

changelog/60170.fixed

@@ -0,0 +1 @@
+Fixed cache directory corruption startup error

changelog/60430.added

@@ -0,0 +1 @@
+Added ability for `salt.wait_for_event` to handle `event_id`s that have a list value.

changelog/60700.added

@@ -0,0 +1 @@
+Added autostart option to virt.defined and virt.running states, along with virt.update execution modules.

changelog/60915.fixed

@@ -0,0 +1 @@
+Fixed parsing new format of terraform states in roster.terraform

changelog/61092.fixed

@@ -0,0 +1,3 @@
+state.orchestrate_single only passes a pillar if it is set to the state
+function. This allows it to be used with state functions that don't accept a
+pillar keyword argument.

changelog/61319.added

@@ -0,0 +1 @@
+Support the --priority flag when adding sources to Chocolatey.

changelog/61335.added

@@ -0,0 +1 @@
+Add namespace option to ext_pillar.http_json

changelog/61409.changed

@@ -0,0 +1,3 @@
+Add missing MariaDB Grants to mysql module.
+MariaDB has added some grants in 10.4.x and 10.5.x that are not present here, which results in an error when creating.
+Also improved exception handling in `grant_add` which did not log the original error message and replaced it with a generic error.

changelog/61542.deprecated

@@ -0,0 +1 @@
+Removing all references to napalm-base which is no longer supported.

changelog/61650.fixed

@@ -0,0 +1 @@
+Fix ssh config roster to correctly parse the ssh config files that contain spaces.

changelog/61857.added

@@ -0,0 +1 @@
+Added new optional vault option, ``config_location``. This can be either ``master`` or ``local`` and defines where vault will look for connection details, either requesting them from the master or using the local config.

changelog/61931.added

@@ -0,0 +1 @@
+Add ipwrap() jinja filter to wrap IPv6 addresses with brackets.

changelog/62029.fixed

@@ -0,0 +1 @@
+Normalize package names once on using pkg.installed/removed with yum to make it possible to install packages with the name containing a part similar to a name of architecture.

changelog/62030.fixed

@@ -0,0 +1 @@
+Fix inconsitency regarding name and pkgs parameters between zypperpkg.upgrade() and yumpkg.upgrade()

changelog/62031.added

@@ -0,0 +1 @@
+Add `diff_attr` parameter to pkg.upgrade() (zypper/yum).

changelog/62032.fixed

@@ -0,0 +1 @@
+Fix attr=all handling in pkg.list_pkgs() (yum/zypper).

changelog/62053.fixed

@@ -0,0 +1 @@
+Fixed the humanname being ignored in pkgrepo.managed on openSUSE Leap

changelog/62074.fixed

@@ -0,0 +1 @@
+Fix ordering of args to libcloud_storage.download_object module

changelog/62082.fixed

@@ -0,0 +1 @@
+Ignore extend declarations in sls files that are excluded.

changelog/62101.fixed

@@ -0,0 +1 @@
+Remove leftover usage of impacket

changelog/62235.fixed

@@ -0,0 +1 @@
+Fix salt-ssh not detecting `platform-python` as a valid interpreter on EL8

changelog/62334.fixed

@@ -0,0 +1 @@
+Issue 62334: Displays a debug log message instead of an error log message when the publisher fails to connect

changelog/62390.fixed

@@ -0,0 +1 @@
+Fix the "zpool.present" state when enabling zpool features that are already active.

changelog/62435.fixed

@@ -0,0 +1 @@
+Provide better error handling in the various napalm proxy minion functions when the device is not accessible.

changelog/62474.fixed

@@ -0,0 +1 @@
+Fixed parsing CDROM apt sources

changelog/62485.deprecated

@@ -0,0 +1 @@
+The `expand_repo_def` function in `salt.modules.aptpkg` is now deprecated. It's only used in `salt.states.pkgrepo` and it has no use of being exposed to the CLI.

changelog/62676.fixed

@@ -0,0 +1 @@
+Modified "_get_flags" function so that it returns regex flags instead of integers

changelog/62795.fixed

@@ -0,0 +1 @@
+Fixing a bug when listing the running schedule if "schedule.enable" and/or "schedule.disable" has been run, where the "enabled" items is being treated as a schedule item.

changelog/62817.fixed

@@ -0,0 +1 @@
+Prevent annoying RuntimeWarning message about line buffering (buffering=1) not being supported in binary mode

changelog/62818.fixed

@@ -0,0 +1,2 @@
+Include UID and GID checks in modules.file.check_perms as well as comparing
+ownership by username and group name.

changelog/62845.fixed

@@ -0,0 +1 @@
+Remove Azure deprecation messages from functions that always run w/ salt-cloud

changelog/62854.fixed

@@ -0,0 +1 @@
+Use select instead of iterating over entrypoints as a dictionary for importlib_metadata>=5.0.0

changelog/62856.added

@@ -0,0 +1 @@
+Add password/account locking/unlocking in user.present state on supported operating systems

changelog/62858.fixed

@@ -0,0 +1 @@
+Fixed master job scheduler using when

changelog/62873.fixed

@@ -0,0 +1 @@
+LGPO: Added support for missing domain controller policies: VulnerableChannelAllowList and LdapEnforceChannelBinding

changelog/62882.fixed

@@ -0,0 +1 @@
+Fixed dockermod version_info function for docker-py 6.0.0+

changelog/62886.fixed

@@ -0,0 +1 @@
+Moving setting the LOAD_BALANCING_POLICY_MAP dictionary into the try except block that determines if the cassandra_cql module should be made available.

changelog/62900.fixed

@@ -0,0 +1 @@
+Updating various MongoDB module functions to work with latest version of pymongo.

changelog/62914.deprecated

@@ -0,0 +1 @@
+Removing manufacture grain which has been deprecated.

changelog/62915.deprecated

@@ -0,0 +1 @@
+Removing deprecated utils/boto3_elasticsearch.py

changelog/62917.deprecated

@@ -0,0 +1 @@
+Removing support for the now deprecated _ext_nodes from salt/master.py.

changelog/62942.fixed

@@ -0,0 +1 @@
+Fix systemd_service.* functions hard code relative command name

changelog/62953.fixed

@@ -0,0 +1 @@
+Fix file.symlink backupname operation can copy remote contents to local disk

conf/master

@@ -51,7 +51,7 @@
 # Key cache. Increases master speed for large numbers of accepted
 # keys. Available options: 'sched'. (Updates on a fixed schedule.)
 # Note that enabling this feature means that minions will not be
-# available to target for up to the length of the maintanence loop
+# available to target for up to the length of the maintenance loop
 # which by default is 60s.
 #key_cache: ''
 

conf/suse/master

@@ -49,7 +49,7 @@ syndic_user: salt
 # Key cache. Increases master speed for large numbers of accepted
 # keys. Available options: 'sched'. (Updates on a fixed schedule.)
 # Note that enabling this feature means that minions will not be
-# available to target for up to the length of the maintanence loop
+# available to target for up to the length of the maintenance loop
 # which by default is 60s.
 #key_cache: ''
 

doc/man/salt-api.1

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SALT-API" "1" "Jun 30, 2022" "3005" "Salt"
+.TH "SALT-API" "1" "Sep 26, 2022" "3005.1" "Salt"
 .SH NAME
 salt-api \- salt-api Command
 .

doc/man/salt-call.1

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SALT-CALL" "1" "Jun 30, 2022" "3005" "Salt"
+.TH "SALT-CALL" "1" "Sep 26, 2022" "3005.1" "Salt"
 .SH NAME
 salt-call \- salt-call Documentation
 .

doc/man/salt-cloud.1

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SALT-CLOUD" "1" "Jun 30, 2022" "3005" "Salt"
+.TH "SALT-CLOUD" "1" "Sep 26, 2022" "3005.1" "Salt"
 .SH NAME
 salt-cloud \- Salt Cloud Command
 .

doc/man/salt-cp.1

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SALT-CP" "1" "Jun 30, 2022" "3005" "Salt"
+.TH "SALT-CP" "1" "Sep 26, 2022" "3005.1" "Salt"
 .SH NAME
 salt-cp \- salt-cp Documentation
 .

doc/man/salt-key.1

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SALT-KEY" "1" "Jun 30, 2022" "3005" "Salt"
+.TH "SALT-KEY" "1" "Sep 26, 2022" "3005.1" "Salt"
 .SH NAME
 salt-key \- salt-key Documentation
 .

doc/man/salt-master.1

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SALT-MASTER" "1" "Jun 30, 2022" "3005" "Salt"
+.TH "SALT-MASTER" "1" "Sep 26, 2022" "3005.1" "Salt"
 .SH NAME
 salt-master \- salt-master Documentation
 .

doc/man/salt-minion.1

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SALT-MINION" "1" "Jun 30, 2022" "3005" "Salt"
+.TH "SALT-MINION" "1" "Sep 26, 2022" "3005.1" "Salt"
 .SH NAME
 salt-minion \- salt-minion Documentation
 .

doc/man/salt-proxy.1

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SALT-PROXY" "1" "Jun 30, 2022" "3005" "Salt"
+.TH "SALT-PROXY" "1" "Sep 26, 2022" "3005.1" "Salt"
 .SH NAME
 salt-proxy \- salt-proxy Documentation
 .

doc/man/salt-run.1

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SALT-RUN" "1" "Jun 30, 2022" "3005" "Salt"
+.TH "SALT-RUN" "1" "Sep 26, 2022" "3005.1" "Salt"
 .SH NAME
 salt-run \- salt-run Documentation
 .

doc/man/salt-ssh.1

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SALT-SSH" "1" "Jun 30, 2022" "3005" "Salt"
+.TH "SALT-SSH" "1" "Sep 26, 2022" "3005.1" "Salt"
 .SH NAME
 salt-ssh \- salt-ssh Documentation
 .

doc/man/salt-syndic.1

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SALT-SYNDIC" "1" "Jun 30, 2022" "3005" "Salt"
+.TH "SALT-SYNDIC" "1" "Sep 26, 2022" "3005.1" "Salt"
 .SH NAME
 salt-syndic \- salt-syndic Documentation
 .

doc/man/salt.1

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SALT" "1" "Jun 30, 2022" "3005" "Salt"
+.TH "SALT" "1" "Sep 26, 2022" "3005.1" "Salt"
 .SH NAME
 salt \- salt
 .

doc/man/spm.1

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SPM" "1" "Jun 30, 2022" "3005" "Salt"
+.TH "SPM" "1" "Sep 26, 2022" "3005.1" "Salt"
 .SH NAME
 spm \- Salt Package Manager Command
 .

doc/ref/configuration/logging/index.rst

@@ -4,7 +4,7 @@
 Logging
 =======
 
-The salt project tries to get the logging to work for you and help us solve any
+The Salt Project tries to get the logging to work for you and help us solve any
 issues you might find along the way.
 
 If you want to get some more information on the nitty-gritty of salt's logging
@@ -240,6 +240,11 @@ at the ``debug`` level, and sets a custom module to the ``all`` level:
 
 .. conf_log:: log_fmt_jid
 
+You can determine what log call name to use here by adding ``%(module)s`` to the 
+log format. Typically, it is the path of the file which generates the log 
+without the trailing ``.py`` and with path separators replaced with ``.``
+
+
 ``log_fmt_jid``
 -------------------
 

doc/ref/configuration/master.rst

@@ -1008,6 +1008,23 @@ is set to ``tcp`` by default on Windows.
 
     ipc_mode: ipc
 
+.. conf_master:: ipc_write_buffer
+
+``ipc_write_buffer``
+-----------------------
+
+Default: ``0``
+
+The maximum size of a message sent via the IPC transport module can be limited
+dynamically or by sharing an integer value lower than the total memory size. When
+the value ``dynamic`` is set, salt will use 2.5% of the total memory as
+``ipc_write_buffer`` value (rounded to an integer). A value of ``0`` disables
+this option.
+
+.. code-block:: yaml
+
+    ipc_write_buffer: 10485760
+
 .. conf_master:: tcp_master_pub_port
 
 ``tcp_master_pub_port``

doc/ref/configuration/minion.rst

@@ -177,7 +177,7 @@ The type of the :conf_minion:`master` variable. Can be ``str``, ``failover``,
 
     master_type: str
 
-If this option is ``str`` (default), multiple hot masters are configured.    
+If this option is ``str`` (default), multiple hot masters are configured.
 Minions can connect to multiple masters simultaneously (all master are "hot").
 
 .. code-block:: yaml
@@ -1494,6 +1494,23 @@ process communications. ``ipc_mode`` is set to ``tcp`` on such systems.
 
     ipc_mode: ipc
 
+.. conf_minion:: ipc_write_buffer
+
+``ipc_write_buffer``
+-----------------------
+
+Default: ``0``
+
+The maximum size of a message sent via the IPC transport module can be limited
+dynamically or by sharing an integer value lower than the total memory size. When
+the value ``dynamic`` is set, salt will use 2.5% of the total memory as
+``ipc_write_buffer`` value (rounded to an integer). A value of ``0`` disables
+this option.
+
+.. code-block:: yaml
+
+    ipc_write_buffer: 10485760
+
 .. conf_minion:: tcp_pub_port
 
 ``tcp_pub_port``

doc/ref/modules/all/index.rst

@@ -517,6 +517,7 @@ execution modules
     win_iis
     win_ip
     win_lgpo
+    win_lgpo_reg
     win_license
     win_network
     win_ntp

doc/ref/modules/all/salt.modules.win_lgpo.rst

@@ -3,4 +3,3 @@ salt.modules.win_lgpo
 
 .. automodule:: salt.modules.win_lgpo
     :members:
-    :undoc-members:

doc/ref/modules/all/salt.modules.win_lgpo_reg.rst

@@ -0,0 +1,5 @@
+salt.modules.win_lgpo_reg
+=========================
+
+.. automodule:: salt.modules.win_lgpo_reg
+    :members:

doc/ref/states/all/index.rst

@@ -303,6 +303,7 @@ state modules
     supervisord
     svn
     sysctl
+    sysfs
     syslog_ng
     sysrc
     telemetry_alert
@@ -329,6 +330,7 @@ state modules
     win_firewall
     win_iis
     win_lgpo
+    win_lgpo_reg
     win_license
     win_network
     win_path

doc/ref/states/all/salt.states.sysfs.rst

@@ -0,0 +1,5 @@
+salt.states.sysfs
+==================
+
+.. automodule:: salt.states.sysfs
+    :members:

doc/ref/states/all/salt.states.win_lgpo.rst

@@ -3,4 +3,3 @@ salt.states.win_lgpo
 
 .. automodule:: salt.states.win_lgpo
     :members:
-    :undoc-members:

doc/ref/states/all/salt.states.win_lgpo_reg.rst

@@ -0,0 +1,5 @@
+salt.states.win_lgpo_reg
+========================
+
+.. automodule:: salt.states.win_lgpo_reg
+    :members:

doc/ref/states/requisites.rst

@@ -168,7 +168,7 @@ module they are using.
 Requisites Types
 ----------------
 
-All requisite types have a corresponding :ref:`<requisite>_in <requisites-in>` form:
+All requisite types have a corresponding :ref:`_in <requisites-in>` form:
 
 * :ref:`require <requisites-require>`: Requires that a list of target states succeed before execution
 * :ref:`onchanges <requisites-onchanges>`: Execute if any target states succeed with changes
@@ -185,8 +185,10 @@ Several requisite types have a corresponding :ref:`requisite_any <requisites-any
 * ``onchanges_any``
 * ``onfail_any``
 
-Lastly, onfail has one special ``onfail_all`` form to account for when `AND`
-logic is desired instead of the default `OR` logic of onfail/onfail_any (which
+There is no combined form of :ref:`_any <requisites-any>` and :ref:`_in <requisites-in>` requisites, such as ``require_any_in``!
+
+Lastly, onfail has one special ``onfail_all`` form to account for when ``AND``
+logic is desired instead of the default ``OR`` logic of onfail/onfail_any (which
 are equivalent).
 
 All requisites define specific relationships and always work with the dependency
@@ -797,8 +799,8 @@ from ``all()`` to ``any()``.
       cmd.run:
         - name: /bin/false
 
-In this example `A` will run because at least one of the requirements specified,
-`B` or `C`, will succeed.
+In this example ``A`` will run because at least one of the requirements specified,
+``B`` or ``C``, will succeed.
 
 .. code-block:: yaml
 

doc/topics/cloud/azure.rst

@@ -1102,7 +1102,7 @@ Name of existing container.
 
 signed_identifiers
 ``````````````````
-SignedIdentifers instance
+SignedIdentifiers instance
 
 blob_public_access
 ``````````````````

doc/topics/cloud/windows.rst

@@ -13,7 +13,7 @@ Requirements
 .. note::
    Support ``winexe`` and ``impacket`` has been deprecated and will be removed in
    3001. These dependencies are replaced by ``pypsexec`` and ``smbprotocol``
-   respectivly. These are pure python alternatives that are compatible with all
+   respectively. These are pure python alternatives that are compatible with all
    supported python versions.
 
 Salt Cloud makes use of `impacket` and `winexe` to set up the Windows Salt

doc/topics/community/index.rst

@@ -20,7 +20,7 @@ is hosted by Google Groups. It is open to new members.
 .. _`salt-users mailing list`: https://groups.google.com/forum/#!forum/salt-users
 
 Additionally, all users of Salt should be subscribed to the Announcements mailing
-list which contains important updates about Salt, such as new releaes and
+list which contains important updates about Salt, such as new releases and
 security-related announcements. This list is low-traffic.
 
 .. _`salt-announce mailing list`: https://groups.google.com/forum/#!forum/salt-announce

doc/topics/development/conventions/documentation.rst

@@ -160,7 +160,7 @@ New modules must be added to the index manually.
     :blob:`state modules<doc/ref/states/all/index.rst>`,
     :blob:`renderer modules <doc/ref/renderers/all/index.rst>`, etc.
 
-2.  Add the new module to the alphebetized list.
+2.  Add the new module to the alphabetized list.
 
 3.  :ref:`Build the documentation <docs-building>` which will generate an ``.rst``
     file for the new module in the same directory as the ``index.rst``.

doc/topics/development/conventions/formulas.rst

@@ -598,7 +598,7 @@ Avoid heavy logic and programming
 `````````````````````````````````
 
 Jinja is not Python. It was made by Python programmers and shares many
-semantics and some syntax but it does not allow for abitrary Python function
+semantics and some syntax but it does not allow for arbitrary Python function
 calls or Python imports. Jinja is a fast and efficient templating language but
 the syntax can be verbose and visually noisy.
 

doc/topics/development/conventions/release.rst

@@ -32,7 +32,7 @@ example):
 #. Announce new RC to salt-users and salt-announce google groups.
 #. Triage incoming issues based on the new RC release.
 #. Fix RC issues once they are categorized as a release blocker.
-#. Depending on the issues found during the RC process make a decesion
+#. Depending on the issues found during the RC process make a decision
    on whether to release based off the RC or go through another RC process
 #. If a RC is categorized as stable, build all required packages.
 #. Test all release packages.

doc/topics/development/reporting_bugs.rst

@@ -23,7 +23,7 @@ In an issue report, please include the following information:
 
  * Any configuration options set in a configuration file that may be relevant.
 
- * A reproduceable test case. This may be as simple as an SLS file that
+ * A reproducible test case. This may be as simple as an SLS file that
    illustrates a problem or it may be a link to a repository that contains a
    number of SLS files that can be used together to re-produce a problem. If
    the problem is transitory, any information that can be used to try and

doc/topics/highavailability/index.rst

@@ -44,7 +44,7 @@ REQUIRED to use failover.
 Multimaster with PKI and Failover is discussed in
 :ref:`this tutorial <tutorial-multi-master-pki>`
 
-``master_type: failover`` can be combined with ``master_shuffle: True``
+``master_type: failover`` can be combined with ``random_master: True``
 to spread minion connections across all masters (one master per
 minion, not each minion connecting to all masters).  Adding Salt Syndics
 into the mix makes it possible to create a load-balanced Salt infrastructure.

doc/topics/jinja/index.rst

@@ -1144,7 +1144,7 @@ Example:
     This option may have adverse effects when using the default renderer,
     ``jinja|yaml``. This is due to the fact that YAML requires proper handling
     in regard to special characters. Please see the section on :ref:`YAML ASCII
-    support <yaml_plain_ascii>` in the :ref:`YAML Idiosyncracies
+    support <yaml_plain_ascii>` in the :ref:`YAML Idiosyncrasies
     <yaml-idiosyncrasies>` documentation for more information.
 
 .. jinja_ref:: json_decode_list
@@ -1889,6 +1889,28 @@ Returns:
   ["fe80::"]
 
 
+.. jinja_ref:: ipwrap
+
+``ipwrap``
+----------
+
+.. versionadded:: 3006.0
+
+From a string, list, or tuple, returns any IPv6 addresses wrapped in square brackets([])
+
+Example:
+
+.. code-block:: jinja
+
+  {{ ['192.0.2.1', 'foo', 'bar', 'fe80::', '2001:db8::1/64'] | ipwrap }}
+
+Returns:
+
+.. code-block:: python
+
+  ["192.0.2.1", "foo", "bar", "[fe80::]", "[2001:db8::1]/64"]
+
+
 .. jinja_ref:: network_hosts
 
 ``network_hosts``
@@ -1988,7 +2010,7 @@ Example:
     This option may have adverse effects when using the default renderer,
     ``jinja|yaml``. This is due to the fact that YAML requires proper handling
     in regard to special characters. Please see the section on :ref:`YAML ASCII
-    support <yaml_plain_ascii>` in the :ref:`YAML Idiosyncracies
+    support <yaml_plain_ascii>` in the :ref:`YAML Idiosyncrasies
     <yaml-idiosyncrasies>` documentation for more information.
 
 .. jinja_ref:: dns_check
@@ -2366,8 +2388,8 @@ external template file.
 
 .. note::
 
-    Macros and variables can be shared across templates. They should not be
-    starting with one or more underscores, and should be managed by one of the
+    Macros and variables can be shared across templates. They should not start
+    with one or more underscores, and should be managed by one of the
     following tags: `macro`, `set`, `load_yaml`, `load_json`, `import_yaml` and
     `import_json`.
 

doc/topics/matchers/index.rst

@@ -47,8 +47,8 @@ As an example, let's modify the ``list`` matcher to have the separator be a
         return bool(self.opts["id"] in tgt)
 
 
-Place this code in a file called ``list_matcher.py`` in ``_matchers`` in your
-``file_roots``. Sync this down to your minions with
+Place this code in a file called ``list_match.py`` in a ``_matchers`` directory in your
+``file_roots``. Sync this down to your minions with 
 :py:func:`saltutil.sync_matchers <salt.modules.saltutil.sync_matchers>`.
 Then attempt to match with the following, replacing ``minionX`` with three of your minions.
 

doc/topics/pillar/index.rst

@@ -522,7 +522,7 @@ The :py:func:`pillar.get <salt.modules.pillar.get>` Function
 
 The :mod:`pillar.get <salt.modules.pillar.get>` function works much in the same
 way as the ``get`` method in a python dict, but with an enhancement: nested
-dictonaries can be traversed using a colon as a delimiter.
+dictionaries can be traversed using a colon as a delimiter.
 
 If a structure like this is in pillar:
 
@@ -706,7 +706,7 @@ The following functions support passing pillar data on the CLI via the
 - :py:func:`state.highstate <salt.modules.state.highstate>`
 - :py:func:`state.sls <salt.modules.state.sls>`
 
-Triggerring decryption of this CLI pillar data can be done in one of two ways:
+Triggering decryption of this CLI pillar data can be done in one of two ways:
 
 1. Using the ``pillar_enc`` argument:
 

doc/topics/proxyminion/demo.rst

@@ -100,7 +100,7 @@ the 'url' key above should say ``url: http://127.0.0.1:8000``
 
 8. The REST service implements a degenerately simple pkg and service provider as
    well as a small set of grains.  To "install" a package, use a standard
-   ``pkg.install``.  If you pass '==' and a verrsion number after the package
+   ``pkg.install``.  If you pass '==' and a version number after the package
    name then the service will parse that and accept that as the package's
    version.
 

doc/topics/proxyminion/ssh.rst

@@ -76,6 +76,6 @@ from the file ``/srv/pillar/p8000.sls`` (if you have not changed your default pi
 
 8. The SSH shell implements a degenerately simple pkg.
    To "install" a package, use a standard
-   ``pkg.install``.  If you pass '==' and a verrsion number after the package
+   ``pkg.install``.  If you pass '==' and a version number after the package
    name then the service will parse that and accept that as the package's
    version.

doc/topics/reactor/index.rst

@@ -99,7 +99,7 @@ API and the runner system.  In this example, a command is published to the
           - mods: orchestrate.runit
     {% endif %}
 
-This example will execute the state.orchestrate runner and intiate an execution
+This example will execute the state.orchestrate runner and initiate an execution
 of the ``runit`` orchestrator located at ``/srv/salt/orchestrate/runit.sls``.
 
 Types of Reactions

doc/topics/releases/3005.1.rst

@@ -0,0 +1,30 @@
+.. _release-3005-1:
+
+=========================
+Salt 3005.1 Release Notes
+=========================
+
+Version 3005.1 is a bug fix release for :ref:`3005 <release-3005>`.
+
+
+Fixed
+-----
+
+- Fix arch parsing issue in apt source files (#62247)
+- Fixed parsing CDROM apt sources (#62474)
+- Use str() method instead of repo_line for when python3-apt is installed or not in aptpkg.py. (#62546)
+- Remove the connection_timeout from netmiko_connection_args before netmiko_connection_args is added to __context__["netmiko_device"]["args"] which is passed along to the Netmiko library. (#62547)
+- fixes #62553 by checking for disabled master_type before starting master connection and skipping it if set. (#62553)
+- Fix runas with cmd module when using the onedir bundled packages (#62565)
+- Fix the Pyinstaller hooks to preserve the environment if None is passed. (#62567, #62628)
+- pkgrepo.managed sets wrong permissions on keys installed to /etc/apt/keyring (#62569)
+- pkgrepo.managed creates zero byte gpg files when dearmoring contents to the same filename (#62570)
+- Ensure default values for IPC Buffers are correct type (#62591)
+- Fix a hang on salt-ssh when using sudo. (#62603)
+- Renderers now have access to the correct set of salt functions. (#62610, #62620)
+- Fix including Jinja template from absolute path (#62611)
+- include jmespath in package requirements (#62613)
+- Fix pkgrepo.managed signed-by in test=true mode (#62662)
+- Ensure the status of the service is captured when the beacon function is called, even when the event is not being emitted. (#62675)
+- The sub proxies controlled by Deltaproxy need to have their own req_channel otherwise there are timeout exceptions when the __master_req_channel_payload is fired and reacted on. (#62708)
+

doc/topics/solaris/solaris-specific-behavior.rst

@@ -19,7 +19,7 @@ issue on github: #37027
 Grains
 =========================
 Not all grains are available or some have empty or 0 as value. Mostly grains 
-that are depenend on hardware discovery like:
+that are dependent on hardware discovery like:
 - num_gpus
 - gpus