Add a few more nice to have hooks

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
2025-04-17 10:10:20 +00:00 · 2023-02-06 19:32:11 +00:00 · 2023-02-06 19:32:11 +00:00 · 6c819439b5
commit 6c819439b5
parent de0070b713
889 changed files with 2220 additions and 2325 deletions
--- a/.mention-bot
+++ b/.mention-bot
@ -14,4 +14,3 @@
 "skipTitle": "Merge forward",
 "userBlacklist": ["cvrebert", "markusgattol", "olliewalsh", "basepi"]
 }
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@ -1,9 +1,50 @@
 ---
 default_language_version:
  python: python3
 exclude: ^(doc/_static/.*|doc/_themes/.*)$
 repos:
  - repo: https://github.com/pre-commit/pre-commit-hooks
    rev: v4.4.0
    hooks:
      - id: check-merge-conflict  # Check for files that contain merge conflict strings.
      - id: trailing-whitespace   # Trims trailing whitespace.
        args:
          - --markdown-linebreak-ext=md
        exclude: >
          (?x)^(
            pkg/macos/pkg-resources/.*\.rtf
          )$
      - id: mixed-line-ending     # Replaces or checks mixed line ending.
        args:
          - --fix=lf
      - id: end-of-file-fixer     # Makes sure files end in a newline and only a newline.
      - id: check-ast             # Simply check whether files parse as valid python.
        exclude: >
          (?x)^(
            templates/.*
          )$
      - id: check-case-conflict   # Check for files with names that would conflict on a
                                  # case-insensitive filesystem like MacOS HFS+ or Windows FAT.
      - id: check-json            # Attempts to load all json files to verify syntax.
      - id: check-symlinks        # Checks for symlinks which do not point to anything.
      - id: debug-statements      # Check for debugger imports and py37+ breakpoint() calls in python source.
        exclude: >
          (?x)^(
            templates/.*
          )$
      - id: fix-byte-order-marker # removes UTF-8 byte order marker
      - id: forbid-submodules     # forbids any submodules in the repository.
      - id: fix-encoding-pragma   # Remove `# -*- coding: utf-8 -*-` from the top of python files.
        args:
          - --remove
        exclude: >
          (?x)^(
            salt/ext/.*
          )$
  - repo: https://github.com/s0undt3ch/python-tools-scripts
    rev: "0.10.1"
    hooks:
--- a/SUPPORT.rst
+++ b/SUPPORT.rst
@ -30,4 +30,3 @@ guidelines for filing bug reports:
 **SaltStack Support** - If you need dedicated, prioritized support, please
 consider a SaltStack Support package that fits your needs:
 `<http://www.saltstack.com/support>`_
--- a/changelog/62578.added
+++ b/changelog/62578.added
@ -1,2 +1 @@
 Adds __env__substitution to ext_pillar.stack; followup of #61531, improved exception handling for stacked template (jinja) template rendering and yaml parsing in ext_pillar.stack
--- a/cicd/kitchen_template.yml
+++ b/cicd/kitchen_template.yml
@ -47,4 +47,3 @@
      - artifacts/
      - .kitchen/
    expire_in: 6 months
--- a/conf/roster
+++ b/conf/roster
@ -6,4 +6,3 @@
 #  sudo: True         # Whether to sudo to root, not enabled by default
 #web2:
 #  host: 192.168.42.2
--- a/doc/cheatsheet/salt.tex
+++ b/doc/cheatsheet/salt.tex
@ -283,4 +283,3 @@ vm.swappiness:
 \end{multicols}
 \end{document}
--- a/doc/gen_gource
+++ b/doc/gen_gource
@ -4,4 +4,3 @@
 #
 #
 gource -1280x720 -s 0.5 --stop-at-end --hide filenames --highlight-all-users --file-filter po -a 5 --camera-mode overview --disable-progress --disable-bloom  --output-ppm-stream - --output-framerate 30 -o - | ffmpeg -y -r 60 -f image2pipe -vcodec ppm -i - -vcodec libvpx -b 10000K gource.webm
--- a/doc/glossary.rst
+++ b/doc/glossary.rst
@ -272,4 +272,3 @@ Glossary
        A master process which can send notices and receive replies from
        minions. *See also*:
        :conf_master:`worker_threads`.
--- a/doc/ref/cli/_includes/target-selection-ssh.rst
+++ b/doc/ref/cli/_includes/target-selection-ssh.rst
@ -8,4 +8,3 @@ minion id. See https://docs.python.org/3/library/fnmatch.html#module-fnmatch.
    The target expression will be interpreted as a PCRE regular expression
    rather than a shell glob.
--- a/doc/ref/configuration/delta_proxy.rst
+++ b/doc/ref/configuration/delta_proxy.rst
@ -433,4 +433,3 @@ For reference, see:
 * `Netmiko Salt proxy module
  <https://docs.saltproject.io/en/latest/ref/proxy/all/salt.proxy.netmiko_px.html#module-salt.proxy.netmiko_px>`_
--- a/doc/ref/executors/all/salt.executors.direct_call.rst
+++ b/doc/ref/executors/all/salt.executors.direct_call.rst
@ -3,4 +3,3 @@ salt.executors.direct_call
 .. automodule:: salt.executors.direct_call
    :members:
--- a/doc/ref/executors/all/salt.executors.docker.rst
+++ b/doc/ref/executors/all/salt.executors.docker.rst
@ -3,4 +3,3 @@ salt.executors.docker
 .. automodule:: salt.executors.docker
    :members:
--- a/doc/ref/executors/all/salt.executors.splay.rst
+++ b/doc/ref/executors/all/salt.executors.splay.rst
@ -3,4 +3,3 @@ salt.executors.splay
 .. automodule:: salt.executors.splay
    :members:
--- a/doc/ref/executors/all/salt.executors.sudo.rst
+++ b/doc/ref/executors/all/salt.executors.sudo.rst
@ -3,4 +3,3 @@ salt.executors.sudo
 .. automodule:: salt.executors.sudo
    :members:
--- a/doc/ref/executors/all/salt.executors.transactional_update.rst
+++ b/doc/ref/executors/all/salt.executors.transactional_update.rst
@ -3,4 +3,3 @@ salt.executors.transactional_update module
 .. automodule:: salt.executors.transactional_update
    :members:
--- a/doc/ref/modules/all/salt.modules.arista_pyeapi.rst
+++ b/doc/ref/modules/all/salt.modules.arista_pyeapi.rst
@ -3,4 +3,3 @@ salt.modules.arista_pyeapi
 .. automodule:: salt.modules.arista_pyeapi
    :members:
--- a/doc/ref/modules/all/salt.modules.ciscoconfparse_mod.rst
+++ b/doc/ref/modules/all/salt.modules.ciscoconfparse_mod.rst
@ -3,4 +3,3 @@ salt.modules.ciscoconfparse_mod
 .. automodule:: salt.modules.ciscoconfparse_mod
    :members:
--- a/doc/ref/modules/all/salt.modules.iosconfig.rst
+++ b/doc/ref/modules/all/salt.modules.iosconfig.rst
@ -3,4 +3,3 @@ salt.modules.iosconfig
 .. automodule:: salt.modules.iosconfig
    :members:
--- a/doc/ref/modules/all/salt.modules.jira_mod.rst
+++ b/doc/ref/modules/all/salt.modules.jira_mod.rst
@ -3,4 +3,3 @@ salt.modules.jira_mod
 .. automodule:: salt.modules.jira_mod
    :members:
--- a/doc/ref/modules/all/salt.modules.napalm_bgp.rst
+++ b/doc/ref/modules/all/salt.modules.napalm_bgp.rst
@ -3,4 +3,3 @@ salt.modules.napalm_bgp
 .. automodule:: salt.modules.napalm_bgp
    :members:
--- a/doc/ref/modules/all/salt.modules.napalm_formula.rst
+++ b/doc/ref/modules/all/salt.modules.napalm_formula.rst
@ -3,4 +3,3 @@ salt.modules.napalm_formula
 .. automodule:: salt.modules.napalm_formula
    :members:
--- a/doc/ref/modules/all/salt.modules.napalm_mod.rst
+++ b/doc/ref/modules/all/salt.modules.napalm_mod.rst
@ -3,4 +3,3 @@ salt.modules.napalm_mod
 .. automodule:: salt.modules.napalm_mod
    :members:
--- a/doc/ref/modules/all/salt.modules.napalm_netacl.rst
+++ b/doc/ref/modules/all/salt.modules.napalm_netacl.rst
@ -3,4 +3,3 @@ salt.modules.napalm_netacl
 .. automodule:: salt.modules.napalm_netacl
    :members:
--- a/doc/ref/modules/all/salt.modules.napalm_ntp.rst
+++ b/doc/ref/modules/all/salt.modules.napalm_ntp.rst
@ -3,4 +3,3 @@ salt.modules.napalm_ntp
 .. automodule:: salt.modules.napalm_ntp
    :members:
--- a/doc/ref/modules/all/salt.modules.napalm_route.rst
+++ b/doc/ref/modules/all/salt.modules.napalm_route.rst
@ -4,4 +4,3 @@ salt.modules.napalm_route
 .. automodule:: salt.modules.napalm_route
    :members:
    :undoc-members:
--- a/doc/ref/modules/all/salt.modules.napalm_snmp.rst
+++ b/doc/ref/modules/all/salt.modules.napalm_snmp.rst
@ -4,4 +4,3 @@ salt.modules.napalm_snmp
 .. automodule:: salt.modules.napalm_snmp
    :members:
    :undoc-members:
--- a/doc/ref/modules/all/salt.modules.napalm_users.rst
+++ b/doc/ref/modules/all/salt.modules.napalm_users.rst
@ -4,4 +4,3 @@ salt.modules.napalm_users
 .. automodule:: salt.modules.napalm_users
    :members:
    :undoc-members:
--- a/doc/ref/modules/all/salt.modules.netbox.rst
+++ b/doc/ref/modules/all/salt.modules.netbox.rst
@ -3,4 +3,3 @@ salt.modules.netbox
 .. automodule:: salt.modules.netbox
    :members:
--- a/doc/ref/modules/all/salt.modules.netmiko_mod.rst
+++ b/doc/ref/modules/all/salt.modules.netmiko_mod.rst
@ -3,4 +3,3 @@ salt.modules.netmiko_mod
 .. automodule:: salt.modules.netmiko_mod
    :members:
--- a/doc/ref/modules/all/salt.modules.nxos.rst
+++ b/doc/ref/modules/all/salt.modules.nxos.rst
@ -3,4 +3,3 @@ salt.modules.nxos
 .. automodule:: salt.modules.nxos
    :members:
--- a/doc/ref/modules/all/salt.modules.nxos_api.rst
+++ b/doc/ref/modules/all/salt.modules.nxos_api.rst
@ -3,4 +3,3 @@ salt.modules.nxos_api
 .. automodule:: salt.modules.nxos_api
    :members:
--- a/doc/ref/modules/all/salt.modules.parallels.rst
+++ b/doc/ref/modules/all/salt.modules.parallels.rst
@ -3,4 +3,3 @@ salt.modules.parallels
 .. automodule:: salt.modules.parallels
    :members:
--- a/doc/ref/modules/all/salt.modules.pcs.rst
+++ b/doc/ref/modules/all/salt.modules.pcs.rst
@ -3,4 +3,3 @@ salt.modules.pcs
 .. automodule:: salt.modules.pcs
    :members:
--- a/doc/ref/modules/all/salt.modules.peeringdb.rst
+++ b/doc/ref/modules/all/salt.modules.peeringdb.rst
@ -3,4 +3,3 @@ salt.modules.peeringdb
 .. automodule:: salt.modules.peeringdb
    :members:
--- a/doc/ref/modules/all/salt.modules.scp_mod.rst
+++ b/doc/ref/modules/all/salt.modules.scp_mod.rst
@ -3,4 +3,3 @@ salt.modules.scp
 .. automodule:: salt.modules.scp_mod
    :members:
--- a/doc/ref/modules/all/salt.modules.service.rst
+++ b/doc/ref/modules/all/salt.modules.service.rst
@ -32,4 +32,3 @@ Execution Module                          Used for
 :py:mod:`~salt.modules.upstart_service`   Ubuntu-based distros using upstart
 :py:mod:`~salt.modules.win_service`       Windows
 ========================================= ========================================
--- a/doc/ref/modules/all/salt.modules.suse_ip.rst
+++ b/doc/ref/modules/all/salt.modules.suse_ip.rst
@ -1,4 +1,4 @@
-====================
+====================
 salt.modules.suse_ip
 ====================
--- a/doc/ref/modules/all/salt.modules.win_smtp_server.rst
+++ b/doc/ref/modules/all/salt.modules.win_smtp_server.rst
@ -3,4 +3,3 @@ salt.modules.win_smtp_server
 .. automodule:: salt.modules.win_smtp_server
    :members:
--- a/doc/ref/proxy/all/salt.proxy.nxos.rst
+++ b/doc/ref/proxy/all/salt.proxy.nxos.rst
@ -3,4 +3,3 @@ salt.proxy.nxos
 .. automodule:: salt.proxy.nxos
    :members:
--- a/doc/ref/proxy/all/salt.proxy.nxos_api.rst
+++ b/doc/ref/proxy/all/salt.proxy.nxos_api.rst
@ -3,4 +3,3 @@ salt.proxy.nxos_api
 .. automodule:: salt.proxy.nxos_api
    :members:
--- a/doc/ref/sdb/all/index.rst
+++ b/doc/ref/sdb/all/index.rst
@ -24,4 +24,3 @@ sdb modules
    tism
    vault
    yaml
--- a/doc/ref/serializers/all/salt.serializers.keyvalue.rst
+++ b/doc/ref/serializers/all/salt.serializers.keyvalue.rst
@ -3,4 +3,3 @@ salt.serializers.keyvalue
 .. automodule:: salt.serializers.keyvalue
    :members:
--- a/doc/ref/states/all/salt.states.net_napalm_yang.rst
+++ b/doc/ref/states/all/salt.states.net_napalm_yang.rst
@ -3,4 +3,3 @@ salt.states.net_napalm_yang
 .. automodule:: salt.states.net_napalm_yang
    :members:
--- a/doc/ref/states/all/salt.states.netacl.rst
+++ b/doc/ref/states/all/salt.states.netacl.rst
@ -3,4 +3,3 @@ salt.states.netacl
 .. automodule:: salt.states.netacl
    :members:
--- a/doc/ref/states/all/salt.states.netntp.rst
+++ b/doc/ref/states/all/salt.states.netntp.rst
@ -3,4 +3,3 @@ salt.states.netntp
 .. automodule:: salt.states.netntp
    :members:
--- a/doc/ref/states/all/salt.states.netsnmp.rst
+++ b/doc/ref/states/all/salt.states.netsnmp.rst
@ -4,4 +4,3 @@ salt.states.netsnmp
 .. automodule:: salt.states.netsnmp
    :members:
    :undoc-members:
--- a/doc/ref/states/all/salt.states.netusers.rst
+++ b/doc/ref/states/all/salt.states.netusers.rst
@ -4,4 +4,3 @@ salt.states.netusers
 .. automodule:: salt.states.netusers
    :members:
    :undoc-members:
--- a/doc/ref/states/all/salt.states.nxos.rst
+++ b/doc/ref/states/all/salt.states.nxos.rst
@ -3,4 +3,3 @@ salt.states.nxos
 .. automodule:: salt.states.nxos
    :members:
--- a/doc/ref/states/all/salt.states.pcs.rst
+++ b/doc/ref/states/all/salt.states.pcs.rst
@ -3,4 +3,3 @@ salt.states.pcs
 .. automodule:: salt.states.pcs
    :members:
--- a/doc/ref/states/all/salt.states.probes.rst
+++ b/doc/ref/states/all/salt.states.probes.rst
@ -3,4 +3,3 @@ salt.states.probes
 .. automodule:: salt.states.probes
    :members:
--- a/doc/ref/states/all/salt.states.win_smtp_server.rst
+++ b/doc/ref/states/all/salt.states.win_smtp_server.rst
@ -3,4 +3,3 @@ salt.states.win_smtp_server
 .. automodule:: salt.states.win_smtp_server
    :members:
--- a/doc/ref/states/include.rst
+++ b/doc/ref/states/include.rst
@ -91,4 +91,3 @@ needs to be defined. An exclude statement that verifies that the running
    The current state processing flow checks for duplicate IDs before
    processing excludes. An error occurs if duplicate IDs are present even if
    one of the IDs is targeted by an ``exclude``.
--- a/doc/ref/thorium/all/salt.thorium.check.rst
+++ b/doc/ref/thorium/all/salt.thorium.check.rst
@ -3,4 +3,3 @@ salt.thorium.check
 .. automodule:: salt.thorium.check
    :members:
--- a/doc/ref/thorium/all/salt.thorium.file.rst
+++ b/doc/ref/thorium/all/salt.thorium.file.rst
@ -3,4 +3,3 @@ salt.thorium.file
 .. automodule:: salt.thorium.file
    :members:
--- a/doc/ref/thorium/all/salt.thorium.local.rst
+++ b/doc/ref/thorium/all/salt.thorium.local.rst
@ -3,4 +3,3 @@ salt.thorium.local
 .. automodule:: salt.thorium.local
    :members:
--- a/doc/ref/thorium/all/salt.thorium.reg.rst
+++ b/doc/ref/thorium/all/salt.thorium.reg.rst
@ -3,4 +3,3 @@ salt.thorium.reg
 .. automodule:: salt.thorium.reg
    :members:
--- a/doc/ref/thorium/all/salt.thorium.timer.rst
+++ b/doc/ref/thorium/all/salt.thorium.timer.rst
@ -3,4 +3,3 @@ salt.thorium.timer
 .. automodule:: salt.thorium.timer
    :members:
--- a/doc/topics/api.rst
+++ b/doc/topics/api.rst
@ -7,5 +7,3 @@ APIs
    ../ref/clients/index
    netapi/index
--- a/doc/topics/cloud/cloudstack.rst
+++ b/doc/topics/cloud/cloudstack.rst
@ -167,4 +167,3 @@ assigned to the VM:
      securitygroup:
        - default
        - salt-master
--- a/doc/topics/cloud/lxc.rst
+++ b/doc/topics/cloud/lxc.rst
@ -199,4 +199,3 @@ Driver Support
 - Container creation
 - Image listing (LXC templates)
 - Running container information (IP addresses, etc.)
--- a/doc/topics/cloud/qs.rst
+++ b/doc/topics/cloud/qs.rst
@ -145,4 +145,3 @@ any number of VMs. On subsequent runs, any VMs that do not exist are created,
 and VMs that are already configured are left unmodified.
 See :ref:`Cloud Map File <salt-cloud-map>`.
--- a/doc/topics/cloud/scaleway.rst
+++ b/doc/topics/cloud/scaleway.rst
@ -101,4 +101,3 @@ Execute a query and return all information about the nodes running on configured
 .. note::
    Additional documentation about Scaleway can be found at `<https://www.scaleway.com/docs>`_.
--- a/doc/topics/cloud/vagrant.rst
+++ b/doc/topics/cloud/vagrant.rst
@ -266,4 +266,3 @@ Create and use your new Salt minion
    sudo apt install git
    git clone ssh://git@github.com/yourID/your_project
    # etc...
--- a/doc/topics/cloud/xen.rst
+++ b/doc/topics/cloud/xen.rst
@ -199,4 +199,3 @@ command:
    # salt-cloud --list-locations myxen
 Returns a list of resource pools.
--- a/doc/topics/development/reporting_bugs.rst
+++ b/doc/topics/development/reporting_bugs.rst
@ -35,9 +35,3 @@ In an issue report, please include the following information:
 .. note::
    Please be certain to scrub any logs or SLS files for sensitive data!
--- a/doc/topics/execution/remote_execution.rst
+++ b/doc/topics/execution/remote_execution.rst
@ -154,5 +154,3 @@ Shell completion scripts for the Salt CLI are available in the ``pkg`` Salt
 `source directory`_.
 .. _source directory: https://github.com/saltstack/salt/tree/develop/pkg
--- a/doc/topics/jobs/job_cache.rst
+++ b/doc/topics/jobs/job_cache.rst
@ -68,5 +68,3 @@ register of executed jobs. Salt comes with two main mechanisms to do this, the
 master job cache and the external job cache.
 See :ref:`Storing Job Results in an External System <external-job-cache>`.
--- a/doc/topics/projects/index.rst
+++ b/doc/topics/projects/index.rst
@ -44,4 +44,3 @@ Salt Vagrant Demo
 A Salt Demo using Vagrant.
 https://github.com/UtahDave/salt-vagrant-demo
--- a/doc/topics/proxyminion/demo.rst
+++ b/doc/topics/proxyminion/demo.rst
@ -112,4 +112,3 @@ the 'url' key above should say ``url: http://127.0.0.1:8000``
 11. States can be written to target the proxy.  Feel free to experiment with
    them.
--- a/doc/topics/releases/2016.3.0.rst
+++ b/doc/topics/releases/2016.3.0.rst
@ -491,4 +491,3 @@ States
 * :mod:`states.zabbix_hostgroup <salt.states.zabbix_hostgroup>`
 * :mod:`states.zabbix_user <salt.states.zabbix_user>`
 * :mod:`states.zabbix_usergroup <salt.states.zabbix_usergroup>`
--- a/doc/topics/releases/2017.7.9.rst
+++ b/doc/topics/releases/2017.7.9.rst
@ -13,4 +13,3 @@ GCE Driver
 The GCE salt cloud driver can now be used with GCE instance credentials by
 setting the configuration parameters ``service_account_private_key`` and
 ``service_account_private_email`` to an empty string.
--- a/doc/topics/releases/2019.2.8.rst
+++ b/doc/topics/releases/2019.2.8.rst
@ -10,4 +10,3 @@ Fixed
 -----
 - Fixes salt-ssh authentication when using tty (#58922)
--- a/doc/topics/releases/3000.6.rst
+++ b/doc/topics/releases/3000.6.rst
@ -10,4 +10,3 @@ Fixed
 -----
 - Fixes salt-ssh authentication when using tty (#58922)
--- a/doc/topics/releases/3001.1.rst
+++ b/doc/topics/releases/3001.1.rst
@ -60,4 +60,3 @@ Added
 -----
 - Added docs demonstrating how to apply an MSI patch with winrepo (#32780)
--- a/doc/topics/releases/3001.4.rst
+++ b/doc/topics/releases/3001.4.rst
@ -10,4 +10,3 @@ Fixed
 -----
 - Fixes salt-ssh authentication when using tty (#58922)
--- a/doc/topics/releases/3002.6.rst
+++ b/doc/topics/releases/3002.6.rst
@ -21,4 +21,3 @@ Fixed
 - Allow "extra_filerefs" as sanitized kwargs for SSH client.
  Fix regression on "cmd.run" when passing tuples as cmd. (#59664)
 - Allow all ssh kwargs as sanitized kwargs for SSH client. (#59748)
--- a/doc/topics/releases/3003.2.rst
+++ b/doc/topics/releases/3003.2.rst
@ -16,4 +16,3 @@ Fixed
 - Stop SSH from hanging if connection is lost. Also added args to customize grace period. (#60216)
 - Improve reliability of Terminal class (#60504)
 - Ignore configuration for 'enable_fqdns_grains' for AIX, Solaris and Juniper, assume False (#60529)
--- a/doc/topics/releases/3003.5.rst
+++ b/doc/topics/releases/3003.5.rst
@ -18,4 +18,3 @@ Security
 --------
 - Fixed PAM auth to reject auth attempt if user account is locked. (cve-2022-22967)
--- a/doc/topics/releases/3005.1.rst
+++ b/doc/topics/releases/3005.1.rst
@ -27,4 +27,3 @@ Fixed
 - 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)
--- a/doc/topics/spm/config.rst
+++ b/doc/topics/spm/config.rst
@ -87,4 +87,3 @@ The files in this type of package are configuration files for Salt, which
 normally live in the ``/etc/salt/`` directory. Configuration files for packages
 other than Salt can and should be handled with a Salt State (using a ``formula``
 type of package).
--- a/doc/topics/spm/index.rst
+++ b/doc/topics/spm/index.rst
@ -55,4 +55,3 @@ See :ref:`Installing SPM Packages <spm-master>`
    config
    spm_formula
    dev
--- a/doc/topics/spm/master.rst
+++ b/doc/topics/spm/master.rst
@ -118,4 +118,3 @@ command.
 If files have been modified, they will not be removed. Empty directories will
 also be removed.
--- a/doc/topics/spm/packaging.rst
+++ b/doc/topics/spm/packaging.rst
@ -135,4 +135,3 @@ installed on.
 Please see the :ref:`SPM Development Guide <spm-development>` for information
 on creating new modules for package file management.
--- a/doc/topics/spm/repo.rst
+++ b/doc/topics/spm/repo.rst
@ -47,4 +47,3 @@ create_repo`` command:
 SPM generates the repository metadata for all of the packages in that directory
 and places it in an ``SPM-METADATA`` file at the folder root. This command is
 used even if repository metadata already exists in that directory.
--- a/doc/topics/states/index.rst
+++ b/doc/topics/states/index.rst
@ -79,4 +79,3 @@ resources to learn more about state and renderers.
    ../tutorials/states_pt3
    ../tutorials/states_pt4
    ../../ref/states/index
--- a/doc/topics/targeting/grains.rst
+++ b/doc/topics/targeting/grains.rst
@ -32,4 +32,3 @@ which has a value that contains the word ``production``:
 .. important::
  See :ref:`Is Targeting using Grain Data Secure? <faq-grain-security>` for
  important security information.
--- a/doc/topics/topology/index.rst
+++ b/doc/topics/topology/index.rst
@ -23,5 +23,3 @@ your deployment as needed for redundancy, geographical distribution, and scale.
    ../tutorials/intro_scale
    ../tutorials/multimaster
    ../tutorials/multimaster_pki
--- a/doc/topics/tutorials/esxi_proxy_minion.rst
+++ b/doc/topics/tutorials/esxi_proxy_minion.rst
@ -525,4 +525,3 @@ Relevant Salt Files and Resources
 - :ref:`Salt Proxy Minion Docs <proxy-minion>`
 - :ref:`Salt Proxy Minion End-to-End Example <proxy-minion-end-to-end-example>`
 - :mod:`vSphere Execution Module <salt.modules.vsphere>`
--- a/doc/topics/tutorials/pillar.rst
+++ b/doc/topics/tutorials/pillar.rst
@ -406,4 +406,3 @@ out the issue. But always change the root admin password in the first place.
 This is very helpful for any module that needs credentials to apply state
 changes: mysql, keystone, etc.
--- a/doc/topics/tutorials/preseed_key.rst
+++ b/doc/topics/tutorials/preseed_key.rst
@ -67,4 +67,3 @@ You will want to place the minion keys before starting the salt-minion daemon:
 Once in place, you should be able to start salt-minion and run ``salt-call
 state.apply`` or any other salt commands that require master authentication.
--- a/doc/topics/tutorials/standalone_minion.rst
+++ b/doc/topics/tutorials/standalone_minion.rst
@ -106,4 +106,3 @@ External Pillars
 ================
 :ref:`External pillars <external-pillars>` are supported when running in masterless mode.
--- a/doc/topics/tutorials/states_pt5.rst
+++ b/doc/topics/tutorials/states_pt5.rst
@ -5,4 +5,3 @@ States Tutorial, Part 5 - Orchestration with Salt
 =================================================
 This was moved to :ref:`Orchestrate Runner <orchestrate-runner>`.
--- a/pkg/common/fish-completions/salt-master.fish
+++ b/pkg/common/fish-completions/salt-master.fish
@ -3,4 +3,3 @@
 # hack to load functions from salt_common completion
 complete --do-complete='salt_common --' >/dev/null
--- a/pkg/common/fish-completions/salt-minion.fish
+++ b/pkg/common/fish-completions/salt-minion.fish
@ -3,4 +3,3 @@
 # hack to load functions from salt_common completion
 complete --do-complete='salt_common --' >/dev/null
--- a/pkg/common/fish-completions/salt-run.fish
+++ b/pkg/common/fish-completions/salt-run.fish
@ -3,4 +3,3 @@
 # hack to load functions from salt_common completion
 complete --do-complete='salt_common --' >/dev/null
--- a/pkg/common/fish-completions/salt-syndic.fish
+++ b/pkg/common/fish-completions/salt-syndic.fish
@ -3,4 +3,3 @@
 # hack to load functions from salt_common completion
 complete --do-complete='salt_common --' >/dev/null
--- a/pkg/common/fish-completions/salt_common.fish
+++ b/pkg/common/fish-completions/salt_common.fish
@ -436,4 +436,3 @@ function __fish_salt_prefix_with_arg_name
 		tee
 	end
 end
--- a/pkg/debian/salt-api.install
+++ b/pkg/debian/salt-api.install
@ -1,2 +1 @@
 pkg/common/salt-api.service /lib/systemd/system
--- a/pkg/old/smartos/salt-api.xml
+++ b/pkg/old/smartos/salt-api.xml
@ -67,4 +67,3 @@
      </template>
    </service>
 </service_bundle>
--- a/Show more
+++ b/Show more
`@ -1,2 +1 @@`
	`Adds __env__substitution to ext_pillar.stack; followup of #61531, improved exception handling for stacked template (jinja) template rendering and yaml parsing in ext_pillar.stack`	`Adds __env__substitution to ext_pillar.stack; followup of #61531, improved exception handling for stacked template (jinja) template rendering and yaml parsing in ext_pillar.stack`
`@ -283,4 +283,3 @@ vm.swappiness:`

	`\end{multicols}`	`\end{multicols}`
	`\end{document}`	`\end{document}`
`@ -8,4 +8,3 @@ minion id. See https://docs.python.org/3/library/fnmatch.html#module-fnmatch.`

	`The target expression will be interpreted as a PCRE regular expression`	`The target expression will be interpreted as a PCRE regular expression`
	`rather than a shell glob.`	`rather than a shell glob.`
`@ -433,4 +433,3 @@ For reference, see:`

	* `Netmiko Salt proxy module	* `Netmiko Salt proxy module
	<https://docs.saltproject.io/en/latest/ref/proxy/all/salt.proxy.netmiko_px.html#module-salt.proxy.netmiko_px>`_	<https://docs.saltproject.io/en/latest/ref/proxy/all/salt.proxy.netmiko_px.html#module-salt.proxy.netmiko_px>`_
`@ -3,4 +3,3 @@ salt.executors.direct_call`

	`.. automodule:: salt.executors.direct_call`	`.. automodule:: salt.executors.direct_call`
	`:members:`	`:members:`
`@ -3,4 +3,3 @@ salt.executors.docker`

	`.. automodule:: salt.executors.docker`	`.. automodule:: salt.executors.docker`
	`:members:`	`:members:`
`@ -3,4 +3,3 @@ salt.executors.splay`

	`.. automodule:: salt.executors.splay`	`.. automodule:: salt.executors.splay`
	`:members:`	`:members:`
`@ -3,4 +3,3 @@ salt.executors.sudo`

	`.. automodule:: salt.executors.sudo`	`.. automodule:: salt.executors.sudo`
	`:members:`	`:members:`
`@ -3,4 +3,3 @@ salt.executors.transactional_update module`

	`.. automodule:: salt.executors.transactional_update`	`.. automodule:: salt.executors.transactional_update`
	`:members:`	`:members:`
`@ -3,4 +3,3 @@ salt.modules.arista_pyeapi`

	`.. automodule:: salt.modules.arista_pyeapi`	`.. automodule:: salt.modules.arista_pyeapi`
	`:members:`	`:members:`