diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-04-12 15:11:50 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-04-12 15:11:50 +0200 |
| commit | 7177afe484e5ded6b0d65d19e18489cdacfeb0fa (patch) | |
| tree | 721b623150baa67e9254d9176eac04773a395e9b /doc/version_naming.html | |
| parent | e2978cd396551280274bd7a17ec3034e4a0dab9e (diff) | |
| parent | 80d62d6bb7fe19c50f10732f98c8de90094845b0 (diff) | |
| download | rsyslog-7177afe484e5ded6b0d65d19e18489cdacfeb0fa.tar.gz rsyslog-7177afe484e5ded6b0d65d19e18489cdacfeb0fa.tar.bz2 rsyslog-7177afe484e5ded6b0d65d19e18489cdacfeb0fa.zip | |
Merge branch 'v5-beta'
Conflicts:
ChangeLog
configure.ac
doc/manual.html
plugins/imuxsock/imuxsock.c
tools/syslogd.c
Diffstat (limited to 'doc/version_naming.html')
| -rw-r--r-- | doc/version_naming.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/version_naming.html b/doc/version_naming.html index 8c1b9187..3bfa19bb 100644 --- a/doc/version_naming.html +++ b/doc/version_naming.html @@ -105,7 +105,7 @@ versions. It applies to versions 1.0.0 and above. Versions below that are all unstable and have a different naming schema.</p> <p><b>Please note that version naming is currently being changed. There is a -<a href="http://rgerhards.blogspot.com/2007/08/on-rsyslog-versions.html">blog +<a href="http://blog.gerhards.net/2007/08/on-rsyslog-versions.html">blog post about future rsyslog versions</a>.</b></p> <p>The major version is incremented whenever a considerate, major features have been added. This is expected to happen quite infrequently.</p> @@ -127,4 +127,4 @@ expected to happen quite infrequently.</p> <p>In general, the unstable branch carries all new development. Once it concludes with a sufficiently-enhanced, quite stable version, a new major stable version is assigned.</p> -</body></html>
\ No newline at end of file +</body></html> |