Merge branch 'master' into backport_53994

.github/PULL_REQUEST_TEMPLATE.md

@@ -13,7 +13,7 @@ Remove this section if not relevant
 **[NOTICE] Bug fixes or features added to Salt require tests.**
 <!-- Please review the [test documentation](https://docs.saltstack.com/en/master/topics/tutorials/writing_tests.html) for details on how to implement tests into Salt's test suite. -->
 - [ ] Docs
-- [ ] Changelog - https://docs.saltstack.com/en/latest/topics/development/changelog.html
+- [ ] Changelog
 - [ ] Tests written/updated
 
 ### Commits signed with GPG?

.pre-commit-config.yaml

@@ -67,15 +67,6 @@ repos:
           - --py-version=3.5
           - --platform=linux
 
-      - id: pip-tools-compile
-        alias: compile-changelog-requirements
-        name: Changelog Py3.5 Requirements
-        files: ^requirements/static/changelog\.in$
-        args:
-          - -v
-          - --py-version=3.5
-          - --platform=linux
-
       - id: pip-tools-compile
         alias: compile-linux-crypto-py3.5-requirements
         name: Linux Py3.5 Crypto Requirements
@@ -175,15 +166,6 @@ repos:
           - --py-version=3.6
           - --platform=linux
 
-      - id: pip-tools-compile
-        alias: compile-changelog-requirements
-        name: Changelog Py3.6 Requirements
-        files: ^requirements/static/changelog\.in$
-        args:
-          - -v
-          - --py-version=3.6
-          - --platform=linux
-
       - id: pip-tools-compile
         alias: compile-linux-crypto-py3.6-requirements
         name: Linux Py3.6 Crypto Requirements
@@ -283,15 +265,6 @@ repos:
           - --py-version=3.7
           - --platform=linux
 
-      - id: pip-tools-compile
-        alias: compile-changelog-requirements
-        name: Changelog Py3.7 Requirements
-        files: ^requirements/static/changelog\.in$
-        args:
-          - -v
-          - --py-version=3.7
-          - --platform=linux
-
       - id: pip-tools-compile
         alias: compile-linux-crypto-py3.7-requirements
         name: Linux Py3.7 Crypto Requirements

CHANGELOG.md

@@ -1,27 +1,29 @@
+# Changelog
 All notable changes to Salt will be documented in this file.
 
 This changelog follows [keepachangelog](https://keepachangelog.com/en/1.0.0/) format, and is intended for human consumption.
 
 This project versioning is _similar_ to [Semantic Versioning](https://semver.org), and is documented in [SEP 14](https://github.com/saltstack/salt-enhancement-proposals/pull/20/files).
 Versions are `MAJOR.PATCH`.
 
-# Changelog
-
 ## 3001 - Sodium
 
 ### Removed
 
 ### Deprecated
 
 ### Changed
+
 - [#56731](https://github.com/saltstack/salt/pull/56731) - Backport #53994
+- [#56753](https://github.com/saltstack/salt/pull/56753) - Backport 51095
 
 ### Fixed
 - [#56237](https://github.com/saltstack/salt/pull/56237) - Fix alphabetical ordering and remove duplicates across all documentation indexes - [@myii](https://github.com/myii)
 - [#56325](https://github.com/saltstack/salt/pull/56325) - Fix hyperlinks to `salt.serializers` and other documentation issues - [@myii](https://github.com/myii)
 
 ### Added
 - [#56627](https://github.com/saltstack/salt/pull/56627) - Add new salt-ssh set_path option
+- [#51379](https://github.com/saltstack/salt/pull/56792) - Backport 51379 : Adds .set_domain_workgroup to win_system
 
 ## 3000.1
 

conf/master

@@ -677,7 +677,9 @@
 
 # The master_roots setting configures a master-only copy of the file_roots dictionary,
 # used by the state compiler.
-#master_roots: /srv/salt-master
+#master_roots:
+#  base:
+#    - /srv/salt-master
 
 # When using multiple environments, each with their own top file, the
 # default behaviour is an unordered merge. To prevent top files from
@@ -1278,7 +1280,7 @@
 ############################################
 # Warning: Failure to set TCP keepalives on the salt-master can result in
 # not detecting the loss of a minion when the connection is lost or when
-# it's host has been terminated without first closing the socket.
+# its host has been terminated without first closing the socket.
 # Salt's Presence System depends on this connection status to know if a minion
 # is "present".
 # ZeroMQ now includes support for configuring SO_KEEPALIVE if supported by

conf/suse/master

@@ -1202,7 +1202,7 @@ syndic_user: salt
 ############################################
 # Warning: Failure to set TCP keepalives on the salt-master can result in
 # not detecting the loss of a minion when the connection is lost or when
-# it's host has been terminated without first closing the socket.
+# its host has been terminated without first closing the socket.
 # Salt's Presence System depends on this connection status to know if a minion
 # is "present".
 # ZeroMQ now includes support for configuring SO_KEEPALIVE if supported by

doc/_incl/_incl/sls_filename_cant_contain_period.rst

@@ -8,5 +8,5 @@
     to the directory/file webserver_1/0.sls
 
     The same applies for any subdirectories, this is especially 'tricky' when
-    git repos are created.  Another command that typically can't render it's
+    git repos are created.  Another command that typically can't render its
     output is ```state.show_sls``` of a file in a path that contains a dot.

doc/_themes/saltstack/static/js/vendor/jquery-1.9.1.js

@@ -9456,7 +9456,7 @@ jQuery.fn.extend({
 			parentOffset = { top: 0, left: 0 },
 			elem = this[ 0 ];
 
-		// fixed elements are offset from window (parentOffset = {top:0, left: 0}, because it is it's only offset parent
+		// fixed elements are offset from window (parentOffset = {top:0, left: 0}, because it is its only offset parent
 		if ( jQuery.css( elem, "position" ) === "fixed" ) {
 			// we assume that getBoundingClientRect is available when computed position is fixed
 			offset = elem.getBoundingClientRect();

doc/man/salt.7

@@ -284897,7 +284897,7 @@ new
 all
 .TP
 .B note
-If you see the following error, you\(aqll need to upgrade \fBrequests\fP to atleast 2.4.2
+If you see the following error, you\(aqll need to upgrade \fBrequests\fP to at least 2.4.2
 .UNINDENT
 .INDENT 0.0
 .INDENT 3.5

doc/ref/configuration/master.rst

@@ -607,8 +607,8 @@ be found by analyzing the cache log with ``memcache_debug`` enabled.
 Default: ``False``
 
 If cache storage got full, i.e. the items count exceeds the
-``memcache_max_items`` value, memcache cleans up it's storage. If this option
-set to ``False`` memcache removes the only one oldest value from it's storage.
+``memcache_max_items`` value, memcache cleans up its storage. If this option
+set to ``False`` memcache removes the only one oldest value from its storage.
 If this set set to ``True`` memcache removes all the expired items and also
 removes the oldest one if there are no expired items.
 
@@ -1468,7 +1468,7 @@ This should still be considered a less than secure option, due to the fact
 that trust is based on just the requesting minion id.
 
 .. versionchanged:: 2018.3.0
-    For security reasons the file must be readonly except for it's owner.
+    For security reasons the file must be readonly except for its owner.
     If :conf_master:`permissive_pki_access` is ``True`` the owning group can also
     have write access, but if Salt is running as ``root`` it must be a member of that group.
     A less strict requirement also existed in previous version.
@@ -2654,14 +2654,18 @@ nothing is ignored.
 ``master_roots``
 ----------------
 
-Default: ``/srv/salt-master``
+Default: ``''``
 
 A master-only copy of the :conf_master:`file_roots` dictionary, used by the
 state compiler.
 
+Example:
+
 .. code-block:: yaml
 
-    master_roots: /srv/salt-master
+    master_roots:
+      base:
+        - /srv/salt-master
 
 roots: Master's Local File Server
 ---------------------------------
@@ -4151,7 +4155,7 @@ branch/tag (or from a per-remote ``env`` parameter), but if set this will
 override the process of deriving the env from the branch/tag name. For example,
 in the configuration below the ``foo`` branch would be assigned to the ``base``
 environment, while the ``bar`` branch would need to explicitly have ``bar``
-configured as it's environment to keep it from also being mapped to the
+configured as its environment to keep it from also being mapped to the
 ``base`` environment.
 
 .. code-block:: yaml

doc/ref/configuration/nonroot.rst

@@ -21,7 +21,7 @@ As of Salt 0.9.10 it is possible to run Salt as a non-root user. This can be
 done by setting the :conf_master:`user` parameter in the master configuration
 file. and restarting the ``salt-master`` service.
 
-The minion has it's own :conf_minion:`user` parameter as well, but running the
+The minion has its own :conf_minion:`user` parameter as well, but running the
 minion as an unprivileged user will keep it from making changes to things like
 users, installed packages, etc. unless access controls (sudo, etc.) are setup
 on the minion to permit the non-root user to make the needed changes.

doc/ref/executors/index.rst

@@ -69,7 +69,7 @@ Where the args are:
   Dictionary containing the load data including ``executor_opts`` passed via
   cmdline/API.
 ``func``, ``args``, ``kwargs``:
-  Execution module function to be executed and it's arguments. For instance the
+  Execution module function to be executed and its arguments. For instance the
   simplest ``direct_call`` executor just runs it as ``func(*args, **kwargs)``.
 ``Returns``:
   ``None`` if the execution sequence must be continued with the next executor.

doc/topics/cloud/misc.rst

@@ -185,7 +185,7 @@ Connection Timeout
 ==================
 
 There are several stages when deploying Salt where Salt Cloud needs to wait for
-something to happen. The VM getting it's IP address, the VM's SSH port is
+something to happen. The VM getting its IP address, the VM's SSH port is
 available, etc.
 
 If you find that the Salt Cloud defaults are not enough and your deployment

doc/topics/development/contributing.rst

@@ -416,7 +416,7 @@ root of the Salt repository.
 Bootstrap Script Changes
 ------------------------
 
-Salt's Bootstrap Script, known as `bootstrap-salt.sh`_ in the Salt repo, has it's own
+Salt's Bootstrap Script, known as `bootstrap-salt.sh`_ in the Salt repo, has its own
 repository, contributing guidelines, and release cadence.
 
 All changes to the Bootstrap Script should be made to `salt-bootstrap repo`_. Any

doc/topics/development/modules/index.rst

@@ -69,16 +69,6 @@ dynamic modules when states are run. To disable this behavior set
 When dynamic modules are autoloaded via states, only the modules defined in the
 same saltenvs as the states currently being run.
 
-Also it is possible to use the explicit ``saltutil.sync_*`` :py:mod:`state functions <salt.states.saltutil>`
-to sync the modules (previously it was necessary to use the ``module.run`` state):
-
-.. code-block::yaml
-
-   synchronize_modules:
-     saltutil.sync_modules:
-       - refresh: True
-
-
 Sync Via the saltutil Module
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -350,7 +340,7 @@ SDB
 
 * :ref:`Writing SDB Modules <sdb-writing-modules>`
 
-SDB is a way to store data that's not associated with a minion. See 
+SDB is a way to store data that's not associated with a minion. See
 :ref:`Storing Data in Other Databases <sdb>`.
 
 Serializer
@@ -394,6 +384,12 @@ pkgfiles modules handle the actual installation.
 SSH Wrapper
 -----------
 
+.. toctree::
+    :maxdepth: 1
+    :glob:
+
+    ssh_wrapper
+
 Replacement execution modules for :ref:`Salt SSH <salt-ssh>`.
 
 Thorium
@@ -420,7 +416,7 @@ the state system.
 Util
 ----
 
-Just utility modules to use with other modules via ``__utils__`` (see 
+Just utility modules to use with other modules via ``__utils__`` (see
 :ref:`Dunder Dictionaries <dunder-dictionaries>`).
 
 Wheel