Merge pull request saltstack#37387 from rallytime/merge-develop

[develop] Merge forward from 2016.11 to develop

Author: Nicole Thomas

conf/proxy

@@ -28,7 +28,7 @@
 # dictionary.  Otherwise it is assumed that the module calls the grains
 # function in a custom way and returns the data elsewhere
 #
-# Default to False for 2016.3 and Carbon.  Switch to True for Nitrogen.
+# Default to False for 2016.3 and 2016.11.  Switch to True for Nitrogen.
 # proxy_merge_grains_in_module: False
 
 # If multiple masters are specified in the 'master' setting, the default behavior

doc/man/salt-api.1

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SALT-API" "1" "October 26, 2016" "2016.3.4" "Salt"
+.TH "SALT-API" "1" "October 31, 2016" "2016.11.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" "October 26, 2016" "2016.3.4" "Salt"
+.TH "SALT-CALL" "1" "October 31, 2016" "2016.11.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" "October 26, 2016" "2016.3.4" "Salt"
+.TH "SALT-CLOUD" "1" "October 31, 2016" "2016.11.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" "October 26, 2016" "2016.3.4" "Salt"
+.TH "SALT-CP" "1" "October 31, 2016" "2016.11.0" "Salt"
 .SH NAME
 salt-cp \- salt-cp Documentation
 .
@@ -52,6 +52,9 @@ salt\-cp \-G \(aqos:Arch.*\(aq [ options ] SOURCE DEST
 Salt copy copies a local file out to all of the Salt minions matched by the
 given target.
 .sp
+Salt copy is only intended for use with small files (< 100KB). If you need
+to copy large files out to minions please use the cp.get_file function.
+.sp
 Note: salt\-cp uses salt\(aqs publishing mechanism. This means the privacy of the
 contents of the file on the wire is completely dependent upon the transport
 in use. In addition, if the salt\-master is running with debug logging it is

doc/man/salt-key.1

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SALT-KEY" "1" "October 26, 2016" "2016.3.4" "Salt"
+.TH "SALT-KEY" "1" "October 31, 2016" "2016.11.0" "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" "October 26, 2016" "2016.3.4" "Salt"
+.TH "SALT-MASTER" "1" "October 31, 2016" "2016.11.0" "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" "October 26, 2016" "2016.3.4" "Salt"
+.TH "SALT-MINION" "1" "October 31, 2016" "2016.11.0" "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" "October 26, 2016" "2016.3.4" "Salt"
+.TH "SALT-PROXY" "1" "October 31, 2016" "2016.11.0" "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" "October 26, 2016" "2016.3.4" "Salt"
+.TH "SALT-RUN" "1" "October 31, 2016" "2016.11.0" "Salt"
 .SH NAME
 salt-run \- salt-run Documentation
 .