diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2007-10-18 16:17:32 +0000 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2007-10-18 16:17:32 +0000 |
| commit | 601393acd7fcd4446b57314cb070cfd17abda2ee (patch) | |
| tree | ef64f976a7d56da9e80cd8358f6d3e1ca74e5445 /doc/version_naming.html | |
| parent | ff24062577a7adf0da08d1770e7194d7801a5648 (diff) | |
| download | rsyslog-601393acd7fcd4446b57314cb070cfd17abda2ee.tar.gz rsyslog-601393acd7fcd4446b57314cb070cfd17abda2ee.tar.xz rsyslog-601393acd7fcd4446b57314cb070cfd17abda2ee.zip | |
added doc fixes provided by Michael Biebl - thanks
Diffstat (limited to 'doc/version_naming.html')
| -rw-r--r-- | doc/version_naming.html | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/doc/version_naming.html b/doc/version_naming.html index 31fe056e..a685f5ff 100644 --- a/doc/version_naming.html +++ b/doc/version_naming.html @@ -5,7 +5,7 @@ <body> <h1>Version Naming</h1> <p>This document briefly outlines the strategy for naming versions. It applies -to versions 1.0.0 and above. Versions below that are all instable and have a +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 @@ -14,20 +14,20 @@ post about future rsyslog versions</a>.</b></p> been added. This is expected to happen quite infrequently.</p> <p>The minor version number is incremented whenever there is "sufficient need" (at the discretion of the developers). There is a notable difference between -stable and instable branches. The <b>stable branch</b> always has a minor +stable and unstable branches. The <b>stable branch</b> always has a minor version number in the range from 0 to 9. It is expected that the stable branch will receive bug and security fixes only. So the range of minor version numbers should be quite sufficient.</p> -<p>For the <b>instable branch</b>, minor version numbers always start at 10 and +<p>For the <b>unstable branch</b>, minor version numbers always start at 10 and are incremented as needed (again, at the discretion of the developers). Here, new minor versions include both fixes as well as new features (hopefully most of the time). They are expected to be released quite often.</p> <p>The patch level (third number) is incremented whenever a really minor thing must be added to an existing version. This is expected to happen quite infrequently.</p> -<p>In general, the instable branch carries all new development. Once it +<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 +</html> |