Merge branch 'develop' into feature-djangomod_migrate

.github/stale.yml

@@ -1,8 +1,8 @@
 # Probot Stale configuration file
 
 # Number of days of inactivity before an issue becomes stale
-# 530 is approximately 1 year and 5 months
-daysUntilStale: 530
+# 520 is approximately 1 year and 5 months
+daysUntilStale: 520
 
 # Number of days of inactivity before a stale issue is closed
 daysUntilClose: 7

conf/minion

@@ -70,6 +70,11 @@
 # Set to zero if the minion should shutdown and not retry.
 # retry_dns: 30
 
+# Set the number of times to attempt to resolve
+# the master hostname if name resolution fails. Defaults to None,
+# which will attempt the resolution indefinitely.
+# retry_dns_count: 3
+
 # Set the port used by the master reply and authentication server.
 #master_port: 4506
 

doc/contents.rst

@@ -8,7 +8,7 @@ Salt Table of Contents
     :maxdepth: 2
 
     topics/index
-    topics/community
+    topics/community/index
     topics/installation/index
     topics/configuration/index
     topics/using_salt

doc/man/salt-api.1

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SALT-API" "1" "Jun 14, 2018" "2018.3.2" "Salt"
+.TH "SALT-API" "1" "Sep 21, 2018" "2018.3.3" "Salt"
 .SH NAME
 salt-api \- salt-api Command
 .
@@ -103,9 +103,9 @@ Logfile logging log level. One of \fBall\fP, \fBgarbage\fP, \fBtrace\fP,
 .UNINDENT
 .SH SEE ALSO
 .sp
-\fIsalt\-api(7)\fP
-\fIsalt(7)\fP
-\fIsalt\-master(1)\fP
+\fBsalt\-api(7)\fP
+\fBsalt(7)\fP
+\fBsalt\-master(1)\fP
 .SH AUTHOR
 Thomas S. Hatch <thatch45@gmail.com> and many others, please see the Authors file
 .\" Generated by docutils manpage writer.

doc/man/salt-call.1

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SALT-CALL" "1" "Jun 14, 2018" "2018.3.2" "Salt"
+.TH "SALT-CALL" "1" "Sep 21, 2018" "2018.3.3" "Salt"
 .SH NAME
 salt-call \- salt-call Documentation
 .
@@ -265,9 +265,9 @@ output. Set to True or False. Default: none.
 .UNINDENT
 .SH SEE ALSO
 .sp
-\fIsalt(1)\fP
-\fIsalt\-master(1)\fP
-\fIsalt\-minion(1)\fP
+\fBsalt(1)\fP
+\fBsalt\-master(1)\fP
+\fBsalt\-minion(1)\fP
 .SH AUTHOR
 Thomas S. Hatch <thatch45@gmail.com> and many others, please see the Authors file
 .\" Generated by docutils manpage writer.

doc/man/salt-cloud.1

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SALT-CLOUD" "1" "Jun 14, 2018" "2018.3.2" "Salt"
+.TH "SALT-CLOUD" "1" "Sep 21, 2018" "2018.3.3" "Salt"
 .SH NAME
 salt-cloud \- Salt Cloud Command
 .
@@ -387,10 +387,10 @@ salt\-cloud \-m /path/to/cloud.map \-Q
 .UNINDENT
 .SH SEE ALSO
 .sp
-\fIsalt\-cloud(7)\fP
-\fIsalt(7)\fP
-\fIsalt\-master(1)\fP
-\fIsalt\-minion(1)\fP
+\fBsalt\-cloud(7)\fP
+\fBsalt(7)\fP
+\fBsalt\-master(1)\fP
+\fBsalt\-minion(1)\fP
 .SH AUTHOR
 Thomas S. Hatch <thatch45@gmail.com> and many others, please see the Authors file
 .\" Generated by docutils manpage writer.

doc/man/salt-cp.1

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SALT-CP" "1" "Jun 14, 2018" "2018.3.2" "Salt"
+.TH "SALT-CP" "1" "Sep 21, 2018" "2018.3.3" "Salt"
 .SH NAME
 salt-cp \- salt-cp Documentation
 .
@@ -201,9 +201,9 @@ New in version 2016.3.7,2016.11.6,2017.7.0.
 .UNINDENT
 .SH SEE ALSO
 .sp
-\fIsalt(1)\fP
-\fIsalt\-master(1)\fP
-\fIsalt\-minion(1)\fP
+\fBsalt(1)\fP
+\fBsalt\-master(1)\fP
+\fBsalt\-minion(1)\fP
 .SH AUTHOR
 Thomas S. Hatch <thatch45@gmail.com> and many others, please see the Authors file
 .\" Generated by docutils manpage writer.

doc/man/salt-key.1

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SALT-KEY" "1" "Jun 14, 2018" "2018.3.2" "Salt"
+.TH "SALT-KEY" "1" "Sep 21, 2018" "2018.3.3" "Salt"
 .SH NAME
 salt-key \- salt-key Documentation
 .
@@ -340,9 +340,9 @@ Auto\-create a signing key\-pair if it does not yet exist
 .UNINDENT
 .SH SEE ALSO
 .sp
-\fIsalt(7)\fP
-\fIsalt\-master(1)\fP
-\fIsalt\-minion(1)\fP
+\fBsalt(7)\fP
+\fBsalt\-master(1)\fP
+\fBsalt\-minion(1)\fP
 .SH AUTHOR
 Thomas S. Hatch <thatch45@gmail.com> and many others, please see the Authors file
 .\" Generated by docutils manpage writer.

doc/man/salt-master.1

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SALT-MASTER" "1" "Jun 14, 2018" "2018.3.2" "Salt"
+.TH "SALT-MASTER" "1" "Sep 21, 2018" "2018.3.3" "Salt"
 .SH NAME
 salt-master \- salt-master Documentation
 .
@@ -108,9 +108,9 @@ Logfile logging log level. One of \fBall\fP, \fBgarbage\fP, \fBtrace\fP,
 .UNINDENT
 .SH SEE ALSO
 .sp
-\fIsalt(1)\fP
-\fIsalt(7)\fP
-\fIsalt\-minion(1)\fP
+\fBsalt(1)\fP
+\fBsalt(7)\fP
+\fBsalt\-minion(1)\fP
 .SH AUTHOR
 Thomas S. Hatch <thatch45@gmail.com> and many others, please see the Authors file
 .\" Generated by docutils manpage writer.

doc/man/salt-minion.1

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SALT-MINION" "1" "Jun 14, 2018" "2018.3.2" "Salt"
+.TH "SALT-MINION" "1" "Sep 21, 2018" "2018.3.3" "Salt"
 .SH NAME
 salt-minion \- salt-minion Documentation
 .
@@ -109,9 +109,9 @@ Logfile logging log level. One of \fBall\fP, \fBgarbage\fP, \fBtrace\fP,
 .UNINDENT
 .SH SEE ALSO
 .sp
-\fIsalt(1)\fP
-\fIsalt(7)\fP
-\fIsalt\-master(1)\fP
+\fBsalt(1)\fP
+\fBsalt(7)\fP
+\fBsalt\-master(1)\fP
 .SH AUTHOR
 Thomas S. Hatch <thatch45@gmail.com> and many others, please see the Authors file
 .\" Generated by docutils manpage writer.

doc/man/salt-proxy.1

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SALT-PROXY" "1" "Jun 14, 2018" "2018.3.2" "Salt"
+.TH "SALT-PROXY" "1" "Sep 21, 2018" "2018.3.3" "Salt"
 .SH NAME
 salt-proxy \- salt-proxy Documentation
 .
@@ -116,10 +116,10 @@ Logfile logging log level. One of \fBall\fP, \fBgarbage\fP, \fBtrace\fP,
 .UNINDENT
 .SH SEE ALSO
 .sp
-\fIsalt(1)\fP
-\fIsalt(7)\fP
-\fIsalt\-master(1)\fP
-\fIsalt\-minion(1)\fP
+\fBsalt(1)\fP
+\fBsalt(7)\fP
+\fBsalt\-master(1)\fP
+\fBsalt\-minion(1)\fP
 .SH AUTHOR
 Thomas S. Hatch <thatch45@gmail.com> and many others, please see the Authors file
 .\" Generated by docutils manpage writer.