diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-04-07 14:27:41 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-04-07 14:27:41 +0200 |
| commit | 5139502b0e20f667fdcccfeebc6a93b1effc407a (patch) | |
| tree | 6255423ab23226e7825069908c2acc45d4245528 /doc | |
| parent | 8a28324ed4ee674b6f38ae02a96c3e5db3800b32 (diff) | |
| parent | 3f36ac250f0a0d7b037b79b599694d0c7d13f039 (diff) | |
| download | rsyslog-5139502b0e20f667fdcccfeebc6a93b1effc407a.tar.gz rsyslog-5139502b0e20f667fdcccfeebc6a93b1effc407a.tar.xz rsyslog-5139502b0e20f667fdcccfeebc6a93b1effc407a.zip | |
Merge branch 'beta'
Conflicts:
ChangeLog
configure.ac
doc/rsyslog_ng_comparison.html
doc/status.html
msg.c
rsyslog.conf.5
rsyslog.h
rsyslogd.8
syslogd.c
Conflicts were due to patch being multiple times applied in CVS import.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/rsyslog_ng_comparison.html | 7 | ||||
| -rw-r--r-- | doc/status.html | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/doc/rsyslog_ng_comparison.html b/doc/rsyslog_ng_comparison.html index 60eeee74..4ee8c10b 100644 --- a/doc/rsyslog_ng_comparison.html +++ b/doc/rsyslog_ng_comparison.html @@ -1,7 +1,6 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <html><head> -<meta http-equiv="Content-Language" content="de"><title>rsyslog vs. syslog-ng - a comparison</title> - +<title>rsyslog vs. syslog-ng - a comparison</title> </head> <body> <h1>rsyslog vs. syslog-ng</h1> @@ -573,6 +572,6 @@ 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> -<p>This document is current as of 2008-02-28 and definitely +<p>This document is current as of 2008-04-07 and definitely incomplete (I did not yet manage to complete it!).</p> -</body></html>
\ No newline at end of file +</body></html> diff --git a/doc/status.html b/doc/status.html index bfced290..5ab6ea05 100644 --- a/doc/status.html +++ b/doc/status.html @@ -2,7 +2,7 @@ <html><head><title>rsyslog status page</title></head> <body> <h2>rsyslog status page</h2> -<p>This page reflects the status as of 2008-04-02.</p> +<p>This page reflects the status as of 2008-04-07.</p> <h2>Current Releases</h2> <p><b>development:</b> 3.15.0 - @@ -30,7 +30,7 @@ help port rsyslog to other platforms. As such, platform list is now maintained inside the rsyslog wiki</a>. Platform maintainers perhaps have posted extra information there. If you do platform-specific work, feel free to add information to the wiki.</p> -<p>Rsyslog is the default syslogd in Fedora 8.</p> +<p>Rsyslog is the default syslogd in Fedora 8 and above.</p> <h2>Additional information</h2> <p><b>Currently supported features are listed on the <a href="features.html">rsyslog features page</a>.</b></p> <ul> |