Merge branch 'v3-stable' into v4-stable

Conflicts:
	doc/rsyslog_conf.html

10 files changed, 18 insertions, 17 deletions

diff --git a/doc/index.html b/doc/index.html
index 349c8e57..b3b336a7 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -25,8 +25,7 @@ To do the really cool things, though,
 you need to learn a bit about its new features.
 The man pages offer a bare minimum of information (and are still quite long). Read the 
 <a href="manual.html">html documentation</a> instead.
-When you change the configuration,
-remember to restart (or HUP) rsyslogd, because otherwise it won't use your
-new settings (and you'll end up totally puzzled why this great config of yours
-does not even work a bit...;))
+When you change the configuration, remember to restart rsyslogd, because otherwise
+it will not use your new settings (and you'll end up totally puzzled why this great
+config of yours does not even work a bit...;))
 </body></html>
diff --git a/doc/manual.html b/doc/manual.html
index e61132c1..19332b33 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -44,7 +44,6 @@ the links below for the</b><br></p><ul>
 <li><a href="generic_design.html">backgrounder on
 generic syslog application design</a><!-- not good as it currently is ;) <li><a href="contributors.html">contributor &quot;Hall of Fame&quot;</a>--></li>
 <li><a href="modules.html">description of rsyslog modules</a></li>
-<li><a href="man_rsyslogd.html">rsyslogd man page</a> (heavily outdated)</li>
 </ul>
 <p><b>We have some in-depth papers on</b></p>
 <ul>
diff --git a/doc/rsconf1_dirgroup.html b/doc/rsconf1_dirgroup.html
index de070126..4bc8692f 100644
--- a/doc/rsconf1_dirgroup.html
+++ b/doc/rsconf1_dirgroup.html
@@ -9,7 +9,7 @@
 <p><b>Type:</b> global configuration directive</p>
 <p><b>Default:</b> </p>
 <p><b>Description:</b></p>
-<p>Set the group for directories newly created. Please note that this setting does not affect the group of directories already existing. The parameter is a group name, for which the groupid is obtained by rsyslogd on startup and on HUPing. Interim changes to the user mapping are not detected.</p>
+<p>Set the group for directories newly created. Please note that this setting does not affect the group of directories already existing. The parameter is a group name, for which the groupid is obtained by rsyslogd on during startup processing. Interim changes to the user mapping are not detected.</p>
 <p><b>Sample:</b></p>
 <p><code><b>$DirGroup loggroup</b></code></p>
 
diff --git a/doc/rsconf1_dirowner.html b/doc/rsconf1_dirowner.html
index da8e252d..f779c008 100644
--- a/doc/rsconf1_dirowner.html
+++ b/doc/rsconf1_dirowner.html
@@ -9,7 +9,7 @@
 <p><b>Type:</b> global configuration directive</p>
 <p><b>Default:</b> </p>
 <p><b>Description:</b></p>
-<p>Set the file owner for directories newly created. Please note that this setting does not affect the owner of directories already existing. The parameter is a user name, for which the userid is obtained by rsyslogd on startup and on HUPing. Interim changes to the user mapping are not detected.</p>
+<p>Set the file owner for directories newly created. Please note that this setting does not affect the owner of directories already existing. The parameter is a user name, for which the userid is obtained by rsyslogd during startup processing. Interim changes to the user mapping are not detected.</p>
 <p><b>Sample:</b></p>
 <p><code><b>$DirOwner loguser</b></code></p>
 
diff --git a/doc/rsconf1_filegroup.html b/doc/rsconf1_filegroup.html
index dd5b8ad5..935f074a 100644
--- a/doc/rsconf1_filegroup.html
+++ b/doc/rsconf1_filegroup.html
@@ -9,7 +9,7 @@
 <p><b>Type:</b> global configuration directive</p>
 <p><b>Default:</b> </p>
 <p><b>Description:</b></p>
-<p>Set the group for dynaFiles newly created. Please note that this setting does not affect the group of files already existing. The parameter is a group name, for which the groupid is obtained by rsyslogd on startup and on HUPing. Interim changes to the user mapping are not detected.</p>
+<p>Set the group for dynaFiles newly created. Please note that this setting does not affect the group of files already existing. The parameter is a group name, for which the groupid is obtained by rsyslogd during startup processing. Interim changes to the user mapping are not detected.</p>
 <p><b>Sample:</b></p>
 <p><code><b>$FileGroup loggroup</b></code></p>
 
diff --git a/doc/rsconf1_fileowner.html b/doc/rsconf1_fileowner.html
index 935cfffd..62125c8d 100644
--- a/doc/rsconf1_fileowner.html
+++ b/doc/rsconf1_fileowner.html
@@ -9,7 +9,7 @@
 <p><b>Type:</b> global configuration directive</p>
 <p><b>Default:</b> </p>
 <p><b>Description:</b></p>
-<p>Set the file owner for dynaFiles newly created. Please note that this setting does not affect the owner of files already existing. The parameter is a user name, for which the userid is obtained by rsyslogd on startup and on HUPing. Interim changes to the user mapping are not detected.</p>
+<p>Set the file owner for dynaFiles newly created. Please note that this setting does not affect the owner of files already existing. The parameter is a user name, for which the userid is obtained by rsyslogd during startup processing. Interim changes to the user mapping are not detected.</p>
 <p><b>Sample:</b></p>
 <p><code><b>$FileOwner loguser</b></code></p>
 
diff --git a/doc/rsyslog_conf_global.html b/doc/rsyslog_conf_global.html
index 778e18f8..7dda046f 100644
--- a/doc/rsyslog_conf_global.html
+++ b/doc/rsyslog_conf_global.html
@@ -91,10 +91,13 @@ default 60000 (1 minute)]</li>
 <li><a href="rsconf1_actionresumeinterval.html">$ActionResumeInterval</a></li>
 <li>$ActionResumeRetryCount &lt;number&gt; [default 0, -1 means eternal]</li>
 <li>$ActionSendResendLastMsgOnReconn &lt;[on/<b>off</b>]&gt; specifies if the last message is to be resend when a connecition broken and has been reconnedcted. May increase reliability, but comes at the risk of message duplication.
-<li>$ActionSendStreamDriver &lt;driver basename&gt; just like $DefaultNetstreamDriver, but for the specific action
-</li><li>$ActionSendStreamDriverMode &lt;mode&gt;, default 0, mode to use with the stream driver
-(driver-specific)</li><li>$ActionSendStreamDriverAuthMode &lt;mode&gt;,&nbsp; authentication mode to use with the stream driver
-(driver-specific)</li><li>$ActionSendStreamDriverPermittedPeer &lt;ID&gt;,&nbsp; accepted fingerprint (SHA1) or name of remote peer
+<li>$ActionSendStreamDriver &lt;driver basename&gt; just like $DefaultNetstreamDriver, but for the specific action</li>
+<li>$ActionSendStreamDriverMode &lt;mode&gt;, default 0, mode to use with the stream driver (driver-specific)</li>
+<li>$ActionSendStreamDriverAuthMode &lt;mode&gt;,&nbsp; authentication mode to use with the stream driver. Note that this directive requires TLS
+netstream drivers. For all others, it will be ignored.
+(driver-specific)</li>
+<li>$ActionSendStreamDriverPermittedPeer &lt;ID&gt;,&nbsp; accepted fingerprint (SHA1) or name of remote peer. Note that this directive requires TLS
+netstream drivers. For all others, it will be ignored.
 (driver-specific) -<span style="font-weight: bold;"> directive may go away</span>!</li>
 <li><b>$ActionSendUDPRebindInterval</b> nbr</a>- [available since 4.3.2] - instructs the UDP send
 action to rebind the send socket every nbr of messages sent. Zero, the default, means
diff --git a/doc/rsyslog_php_syslog_ng.html b/doc/rsyslog_php_syslog_ng.html
index 9e722755..bf48a1eb 100644
--- a/doc/rsyslog_php_syslog_ng.html
+++ b/doc/rsyslog_php_syslog_ng.html
@@ -107,7 +107,7 @@ server machine, &quot;syslog&quot; is the database name (default from the schema
 and &quot;pass&quot; are the logon credentials. Use a user with low privileges, insert into the 
 logs table is sufficient. &quot;syslog-ng&quot; is the template name and tells rsyslogd to 
 use the SQL statement shown above.</p>
-<p>Once you have made the changes, all you need to do is reload (or HUP) 
+<p>Once you have made the changes, all you need to do is restart
 rsyslogd. Then, you should see syslog messages flow into your database - and 
 show up in php-syslog-ng.</p>
 <h2>Conclusion</h2>
@@ -148,4 +148,4 @@ no Front-Cover Texts, and no Back-Cover Texts. A copy of the license can be
 viewed at <a href="http://www.gnu.org/copyleft/fdl.html">
 http://www.gnu.org/copyleft/fdl.html</a>.</p>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/doc/rsyslog_recording_pri.html b/doc/rsyslog_recording_pri.html
index 1dcf00c7..cf11e3e5 100644
--- a/doc/rsyslog_recording_pri.html
+++ b/doc/rsyslog_recording_pri.html
@@ -62,7 +62,7 @@ semicolon:</p>
 <p>That's all you need to do. There is one common pitfall: you need to define 
 the template before you use it in a selector line. Otherwise, you will receive 
 an error.</p>
-<p>Once you have applied the changes, you need to restart or HUP rsyslogd. It 
+<p>Once you have applied the changes, you need to restart rsyslogd. It 
 will then pick the new configuration.</p>
 <h2>What if I do not want rsyslogd to be the standard syslogd?</h2>
 <p>If you do not want to switch to rsyslog, you can still use it as a setup aid. 
diff --git a/doc/rsyslog_tls.html b/doc/rsyslog_tls.html
index e37d26a7..bb312c77 100644
--- a/doc/rsyslog_tls.html
+++ b/doc/rsyslog_tls.html
@@ -128,7 +128,7 @@ This is all you need to do. You can use the rest of your rsyslog.conf
 together with this configuration. The way messages are received does
 not interfer with any other option, so you are able to do anything else
 you like without any restrictions.
-<p>Restart (or HUP) rsyslogd. The server should now be fully
+<p>Restart rsyslogd. The server should now be fully
 operational.</p>
 <h3>Client Setup</h3>
 <p>The client setup is equally&nbsp;simple. You need less