diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-01-12 13:34:01 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-01-12 13:34:01 +0100 |
| commit | 58870fc483c441fba4a87b8411642ea5bc8a7e74 (patch) | |
| tree | 10726bfa4634429d24f0d3f41a2e5441b8a13ffb /doc | |
| parent | 671470f1a1880865bc1175414b0e5000713556d1 (diff) | |
| parent | d7277484811249b7acacb45a223928980e1a36b4 (diff) | |
| download | rsyslog-58870fc483c441fba4a87b8411642ea5bc8a7e74.tar.gz rsyslog-58870fc483c441fba4a87b8411642ea5bc8a7e74.tar.xz rsyslog-58870fc483c441fba4a87b8411642ea5bc8a7e74.zip | |
Merge branch 'beta'
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/action_state.dot | 1 | ||||
| -rw-r--r-- | doc/rsyslog_conf_actions.html | 10 |
2 files changed, 4 insertions, 7 deletions
diff --git a/doc/action_state.dot b/doc/action_state.dot index d56d9da0..2f36d8da 100644 --- a/doc/action_state.dot +++ b/doc/action_state.dot @@ -20,6 +20,7 @@ digraph msgState { susp [label="suspended"] rdy -> itx [label="transaction begins"] + rdy -> rtry [label="begin tx\nerror"] itx -> itx [label="success"] itx -> comm [label="commit\n(caller or auto)"] itx -> rtry [label="error"] diff --git a/doc/rsyslog_conf_actions.html b/doc/rsyslog_conf_actions.html index 2ef3f4b0..8c4b9cfc 100644 --- a/doc/rsyslog_conf_actions.html +++ b/doc/rsyslog_conf_actions.html @@ -98,18 +98,14 @@ done, same with /dev/console.</p> messages to a remote host running rsyslogd(8) and to receive messages from remote hosts. Using this feature you're able to control all syslog messages on one host, if all other machines will log remotely to that. -This tears down<br> -administration needs.<br> -<br> -<b>Please note that this version of rsyslogd by default does NOT -forward messages it has received from the network to another host. -Specify the "-h" option to enable this.</b></p> +This tears down administration needs.</p> <p>To forward messages to another host, prepend the hostname with the at sign ("@"). A single at sign means that messages will be forwarded via UDP protocol (the standard for syslog). If you prepend two at signs ("@@"), the messages will be transmitted via TCP. Please note that plain TCP based syslog is not officially standardized, but -most major syslogds support it (e.g. syslog-ng or WinSyslog). The +most major syslogds support it (e.g. syslog-ng or +<a href="http://www.winsyslog.com/">WinSyslog</a>). The forwarding action indicator (at-sign) can be followed by one or more options. If they are given, they must be immediately (without a space) following the final at sign and be enclosed in parenthesis. The |