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/status.html | |
| 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/status.html')
| -rw-r--r-- | doc/status.html | 4 |
1 files changed, 2 insertions, 2 deletions
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> |