diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-04-07 12:53:12 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-04-07 12:53:12 +0200 |
| commit | 2f2ebae69bb9ef7a7a80d718ddcb4e65e2b183a7 (patch) | |
| tree | ba1953678dcacb485e76f6df408b87e0c7e929b1 /doc | |
| parent | c34ef852ee583de6e335f02d78f917b7d4da8062 (diff) | |
| parent | 2f8fb81bd4cfcc69049b767139389af023d1eef6 (diff) | |
| download | rsyslog-2f2ebae69bb9ef7a7a80d718ddcb4e65e2b183a7.tar.gz rsyslog-2f2ebae69bb9ef7a7a80d718ddcb4e65e2b183a7.tar.xz rsyslog-2f2ebae69bb9ef7a7a80d718ddcb4e65e2b183a7.zip | |
Merge branch 'v3-stable' into beta
Conflicts:
ChangeLog
Makefile.am
configure.ac
doc/status.html
rsyslog.conf.5
syslogd.c
Diffstat (limited to 'doc')
| -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 b9bfd5c6..d7111a50 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-01.</p> +<p>This page reflects the status as of 2008-04-04.</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> |