diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-08-15 14:02:07 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-08-15 14:02:07 +0200 |
| commit | c2f30a2fc3fb1f87c157828dd08ee20fe444833d (patch) | |
| tree | 6ed707814022350d1313558d28059d7aba0e0631 /doc/rsyslog_ng_comparison.html | |
| parent | 8aa2b21f7fc97e09c02f40815be6e4635ec080ba (diff) | |
| parent | 9b46c03ce20c2d074bafdd68840461ed89b35ef4 (diff) | |
| download | rsyslog-c2f30a2fc3fb1f87c157828dd08ee20fe444833d.tar.gz rsyslog-c2f30a2fc3fb1f87c157828dd08ee20fe444833d.tar.xz rsyslog-c2f30a2fc3fb1f87c157828dd08ee20fe444833d.zip | |
Merge branch 'beta'
Conflicts:
ChangeLog
Diffstat (limited to 'doc/rsyslog_ng_comparison.html')
| -rw-r--r-- | doc/rsyslog_ng_comparison.html | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/doc/rsyslog_ng_comparison.html b/doc/rsyslog_ng_comparison.html index 1bab4d74..bc99cb8c 100644 --- a/doc/rsyslog_ng_comparison.html +++ b/doc/rsyslog_ng_comparison.html @@ -430,13 +430,19 @@ directories (log targets) dynamically</td> <td valign="top">control of log output format, including ability to present channel and priority as visible log data</td> <td valign="top">yes</td> -<td valign="top">not sure...</td> +<td valign="top">yes</td> </tr> +<<<<<<< HEAD:doc/rsyslog_ng_comparison.html <tr> <td valign="top">native ability to send mail messages</td> <td valign="top">yes (<a href="ommail.html">ommail</a>, introduced in 3.17.0)</td> <td valign="top">not sure...</td> +======= +<tr><td valign="top">native ability to send mail messages</td> +<td valign="top">yes (<a href="ommail.html">ommail</a>, introduced in 3.17.0)</td> +<td valign="top">no (only via piped external process)</td> +>>>>>>> 3f2856b4b5010dfcaa720b292dc3a655e7b9f6da:doc/rsyslog_ng_comparison.html </tr> <tr> <td valign="top">good timestamp format control; at a @@ -586,5 +592,4 @@ feature sheet. I have not yet been able to fully work through it. In the mean time, you may want to read it in parallel. It is available at <a href="http://www.balabit.com/network-security/syslog-ng/features/detailed/">Balabit's site</a>.</p> - </body></html> |