[2019.2] Merge forward from 2019.2.0.rc1 to 2019.2

README.rst

@@ -2,7 +2,7 @@
 What is SaltStack?
 ==================
 
-SaltStack makes software for complex systems management at scale.
+SaltStack makes software for complex systems management at scale.
 SaltStack is the company that created and maintains the Salt Open
 project and develops and sells SaltStack Enterprise software, services
 and support. Easy enough to get running in minutes, scalable enough to

conf/minion

@@ -33,7 +33,7 @@
 # and a warning will be logged.
 #random_master: False
 
-# NOTE: Deprecated in Salt Fluorine. Use 'random_master' instead.
+# NOTE: Deprecated in Salt 2019.2.0. Use 'random_master' instead.
 #master_shuffle: False
 
 # Minions can connect to multiple masters simultaneously (all masters

doc/faq.rst

@@ -158,7 +158,7 @@ Similarly, custom states are synced to Minions when :py:func:`saltutil.sync_stat
 They are both also synced when a :ref:`highstate <running-highstate>` is
 triggered.
 
-As of the Fluorine release, as well as 2017.7.7 and 2018.3.2 in their
+As of the 2019.2.0 release, as well as 2017.7.7 and 2018.3.2 in their
 respective release cycles, the ``sync`` argument to :py:func:`state.apply
 <salt.modules.state.apply_>`/:py:func:`state.sls <salt.modules.state.sls>` can
 be used to sync custom types when running individual SLS files.

doc/man/salt-api.1

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SALT-API" "1" "Sep 21, 2018" "2018.3.3" "Salt"
+.TH "SALT-API" "1" "Jan 08, 2019" "2019.2.0" "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" "Sep 21, 2018" "2018.3.3" "Salt"
+.TH "SALT-CALL" "1" "Jan 08, 2019" "2019.2.0" "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" "Sep 21, 2018" "2018.3.3" "Salt"
+.TH "SALT-CLOUD" "1" "Jan 08, 2019" "2019.2.0" "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" "Sep 21, 2018" "2018.3.3" "Salt"
+.TH "SALT-CP" "1" "Jan 08, 2019" "2019.2.0" "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" "Sep 21, 2018" "2018.3.3" "Salt"
+.TH "SALT-KEY" "1" "Jan 08, 2019" "2019.2.0" "Salt"
 .SH NAME
 salt-key \- salt-key Documentation
 .