committing changes in /etc made by "apt dist-upgrade -y"

Packages with configuration changes:
-salt-master 3003.2+ds-1 all
-salt-minion 3003.2+ds-1 all
+salt-master 3004+ds-1 all
+salt-minion 3004+ds-1 all

Package changes:
-salt-common 3003.2+ds-1 all
-salt-master 3003.2+ds-1 all
-salt-minion 3003.2+ds-1 all
-salt-ssh 3003.2+ds-1 all
+salt-common 3004+ds-1 all
+salt-master 3004+ds-1 all
+salt-minion 3004+ds-1 all
+salt-ssh 3004+ds-1 all

diff --git a/salt/master b/salt/master
index fa702192f3e269b5819a2a5b4930e507cdf5260e..07bf2e9591ceb5e5df3672d2e4509d8719d53b37 100644 (file)
--- a/salt/master
+++ b/salt/master
@@ -306,7 +306,7 @@
 ##########################################
 # Enable passphrase protection of Master private key.  Although a string value
 # is acceptable; passwords should be stored in an external vaulting mechanism
-# and retrieved via sdb. See https://docs.saltstack.com/en/latest/topics/sdb/.
+# and retrieved via sdb. See https://docs.saltproject.io/en/latest/topics/sdb/.
 # Passphrase protection is off by default but an example of an sdb profile and
 # query is as follows.
 # masterkeyring:
@@ -1001,7 +1001,7 @@
 # configuration options to fully understand the tunable parameters and their implications.
 #
 # Note: setting ``pillar_cache: True`` has no effect on targeting Minions with Pillars.
-# See https://docs.saltstack.com/en/latest/topics/targeting/pillar.html
+# See https://docs.saltproject.io/en/latest/topics/targeting/pillar.html
 #pillar_cache: False
 
 # If and only if a master has set ``pillar_cache: True``, the cache TTL controls the amount
@@ -1049,7 +1049,7 @@
 
 ######        Reactor Settings        #####
 ###########################################
-# Define a salt reactor. See https://docs.saltstack.com/en/latest/topics/reactor/
+# Define a salt reactor. See https://docs.saltproject.io/en/latest/topics/reactor/
 #reactor: []
 
 #Set the TTL for the cache of the reactor configuration.

diff --git a/salt/minion b/salt/minion
index b87397e8e002a40a800a8f87800bac592f148790..f4d2622683255962d7144604fe1f1d04ac3e0d9e 100644 (file)
--- a/salt/minion
+++ b/salt/minion
@@ -509,7 +509,7 @@
 # templating on the SLS file, and then load the result as YAML. This syntax is
 # documented in further depth at the following URL:
 #
-# https://docs.saltstack.com/en/latest/ref/renderers/#composing-renderers
+# https://docs.saltproject.io/en/latest/ref/renderers/#composing-renderers
 #
 # NOTE: The "shebang" prefix (e.g. "#!jinja|yaml") described in the
 # documentation linked above is for use in an SLS file to override the default
@@ -732,7 +732,7 @@
 
 ######        Reactor Settings        #####
 ###########################################
-# Define a salt reactor. See https://docs.saltstack.com/en/latest/topics/reactor/
+# Define a salt reactor. See https://docs.saltproject.io/en/latest/topics/reactor/
 #reactor: []
 
 #Set the TTL for the cache of the reactor configuration.

diff --git a/salt/proxy b/salt/proxy
index 757941e3accc200aa3ebdf073e6886ea5e2b3c55..c0eec84224dc73c6a4b2b0c86803fc50261622c2 100644 (file)
--- a/salt/proxy
+++ b/salt/proxy
@@ -7,10 +7,10 @@
 # not be set in the config. If there is no blank line after the comment, the
 # value is presented as an example and is not the default.
 
-# Per default the minion will automatically include all config files
-# from minion.d/*.conf (minion.d is a directory in the same directory
+# Per default the proxy minion will automatically include all config files
+# from proxy.d/*.conf (proxy.d is a directory in the same directory
 # as the main minion config file).
-#default_include: minion.d/*.conf
+#default_include: proxy.d/*.conf
 
 # Backwards compatibility option for proxymodules created before 2015.8.2
 # This setting will default to 'False' in the 2016.3.0 release
@@ -361,7 +361,7 @@
 # templating on the SLS file, and then load the result as YAML. This syntax is
 # documented in further depth at the following URL:
 #
-# https://docs.saltstack.com/en/latest/ref/renderers/#composing-renderers
+# https://docs.saltproject.io/en/latest/ref/renderers/#composing-renderers
 #
 # NOTE: The "shebang" prefix (e.g. "#!jinja|yaml") described in the
 # documentation linked above is for use in an SLS file to override the default