diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-08-15 12:59:24 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-08-15 12:59:24 +0200 |
| commit | 8a1751d1c9cb463aeb3b9c80bff907bbe3d5cd8a (patch) | |
| tree | 21a5726fa380372c08e8975e9c49f9bb6d91feb0 /doc | |
| parent | a61e548958044f9efa013b5911d130ae1930448f (diff) | |
| parent | 3f2856b4b5010dfcaa720b292dc3a655e7b9f6da (diff) | |
| download | rsyslog-8a1751d1c9cb463aeb3b9c80bff907bbe3d5cd8a.tar.gz rsyslog-8a1751d1c9cb463aeb3b9c80bff907bbe3d5cd8a.tar.xz rsyslog-8a1751d1c9cb463aeb3b9c80bff907bbe3d5cd8a.zip | |
Merge branch 'v3-stable' into beta
Conflicts:
ChangeLog
configure.ac
doc/rsyslog_ng_comparison.html
Diffstat (limited to 'doc')
| -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 600875a8..6d14d933 100644 --- a/doc/rsyslog_ng_comparison.html +++ b/doc/rsyslog_ng_comparison.html @@ -426,13 +426,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 @@ -582,5 +588,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> |