Updated Branches: refs/heads/4.0.x 5c7d80886 -> 1abcb09e9
Updated with new release process. Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/1abcb09e Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/1abcb09e Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/1abcb09e Branch: refs/heads/4.0.x Commit: 1abcb09e9f895a5037b41ac314de1ad64d93e3eb Parents: 5c7d808 Author: Leif Hedstrom <zw...@apache.org> Authored: Wed Aug 21 14:58:44 2013 -0600 Committer: Leif Hedstrom <zw...@apache.org> Committed: Wed Aug 21 15:00:38 2013 -0600 ---------------------------------------------------------------------- doc/admin/getting-started.en.rst | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/1abcb09e/doc/admin/getting-started.en.rst ---------------------------------------------------------------------- diff --git a/doc/admin/getting-started.en.rst b/doc/admin/getting-started.en.rst index a97c065..ceb8cf5 100644 --- a/doc/admin/getting-started.en.rst +++ b/doc/admin/getting-started.en.rst @@ -26,24 +26,23 @@ Before you start ================ Before you get started with Traffic Server you may have to decide which -version you want to use. Traffic Server uses the same "semantic -versioning" to denote "stability" as Apache -`apr <http://apr.apache.org/versioning.html>`_ and -`httpd <http://httpd.apache.org/dev/release.html>`_ do: +version you want to use. Traffic Server follows the `Semantic Versioning +<http://semver.org>`_ guidelines, in summary A version is made of a version-triplet: *``MAJOR.MINOR.PATCH``* -The most important thing that you need to know is that an *even -``MINOR``* marks a production stable release (such as 3.0.3 and 3.2.5), -while an *odd ``MINOR``* number marks a targeted at developers. - -Sometimes we speak of trunk, master, or when talking about actual -releases, we will say "-unstable", or "-dev". All of these are -interchangable: trunk or master or sometimes TIP or HEAD, refer to the -latest code in a Version Control System. While "-dev" (or the -unfortunately named "-unstable") qualifies that a certain release -"3.3.1-dev" is has not had seen enough testing to be seen as production -ready. +As of v4.0.0, there are no longer any development (or unstable) releases. +All releases are considered stable and ready for production use, releases +within a major version are always upgrade compatible. More details are +available on the `Wiki page +<https://cwiki.apache.org/confluence/display/TS/New+Release+Processes>`_. + +Sometimes we speak of trunk, master or HEAD, all of which are used +interchangeably: trunk or master or sometimes TIP or HEAD, refer to the +latest code in a Git Version Control System. Master is always kept releasable, +and compatible with the current major release version. Incompatible changes +are sometimes committed on a next-major release branch, for example we have +the ``5.0.x`` branch where changes incompatible with 4.x are managed. If your distribution does not come with a prepackaged Traffic Server, please go to `downloads </downloads>`_ to choose the version that you