From 156eed7d513d802b78ef4c76eb88f0d563f47b82 Mon Sep 17 00:00:00 2001 From: Ryan Weaver Date: Wed, 12 Jun 2013 09:35:57 -0500 Subject: [PATCH 1/2] Adding a section to outline the exact process the documentation team takes during the release lifecycle --- contributing/community/releases.rst | 4 +++ contributing/documentation/overview.rst | 46 +++++++++++++++++++++++++ 2 files changed, 50 insertions(+) diff --git a/contributing/community/releases.rst b/contributing/community/releases.rst index 9825a01e7a5..9e47e749097 100644 --- a/contributing/community/releases.rst +++ b/contributing/community/releases.rst @@ -13,6 +13,8 @@ release comes out every *six months*: one in *May* and one in *November*. "rules" explained in this document must be strictly followed as of Symfony 2.4. +.. _contributing-release-development: + Development ----------- @@ -29,6 +31,8 @@ During the development phase, any new feature can be reverted if it won't be finished in time or if it won't be stable enough to be included in the current final release. +.. _contributing-release-maintenance: + Maintenance ----------- diff --git a/contributing/documentation/overview.rst b/contributing/documentation/overview.rst index e48a1d73ca6..e73fcfbe71f 100644 --- a/contributing/documentation/overview.rst +++ b/contributing/documentation/overview.rst @@ -184,3 +184,49 @@ Read the dedicated :doc:`document `. .. _`fork`: https://help.github.com/articles/fork-a-repo .. _`pull requests`: https://help.github.com/articles/using-pull-requests .. _`Documentation Build Errors`: http://symfony.com/doc/build_errors + +Managing Releases +----------------- + +Symfony has a very standardized release process, which you can read more +about in the :doc:`/contributing/community/releases` section. + +To keep up with the release process, the documentation team makes several +changes to the documentation at various parts of the lifecycle. + +When a Release reaches "end of maintenance" +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Every release will eventually reach its "end of maintenance". For details, +see :ref`contributing-release-maintenance`. + +When a release reaches its end of maintenance, the following items are done. +For this example, suppose version 2.1 has just reached its end of maintenance: + +* Changes and pull requests are no longer merged into to the branch (2.1), + except for security updates, which are merged until the release reaches + its "end of life". + +* All branches still under maintenance (e.g. 2.2 and higher) are updated + to reflect that pull requests should start from the now-oldest maintained + version (e.g. 2.2). + +* Remove all ``versionadded`` mentions - and any other notes related to features + changing or being new - for the version (e.g. 2.1) from the master branch. + The result is that the next release (which is the first that comes entirely + *after* the end of maintenance of this branch), will have no mentions of + the old version (e.g. 2.1). + +When a new Branch is created for a Release +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +During the :ref:`stabilization phase`, a +new branch on the documentation is created. For example, if version 2.3 were +being stabilized, then a new 2.3 branch would be created for it. When this +happens, the following items are done: + +* Change all version and master references to the correct version (e.g. 2.3). + For example, in installation chapters, we reference the version you should + use for installation. As an example, see the changes made in `PR #2688`_. + +.. _`PR #2688`: https://github.com/symfony/symfony-docs/pull/2688 From f0d86757ad3ab95a3488c8ee66bedbc250c28f7c Mon Sep 17 00:00:00 2001 From: Ryan Weaver Date: Wed, 12 Jun 2013 09:56:36 -0500 Subject: [PATCH 2/2] [#2720] Tweaks thanks to @WouterJ --- contributing/documentation/overview.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contributing/documentation/overview.rst b/contributing/documentation/overview.rst index e73fcfbe71f..3817cece92e 100644 --- a/contributing/documentation/overview.rst +++ b/contributing/documentation/overview.rst @@ -198,7 +198,7 @@ When a Release reaches "end of maintenance" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Every release will eventually reach its "end of maintenance". For details, -see :ref`contributing-release-maintenance`. +see :ref:`contributing-release-maintenance`. When a release reaches its end of maintenance, the following items are done. For this example, suppose version 2.1 has just reached its end of maintenance: @@ -211,7 +211,7 @@ For this example, suppose version 2.1 has just reached its end of maintenance: to reflect that pull requests should start from the now-oldest maintained version (e.g. 2.2). -* Remove all ``versionadded`` mentions - and any other notes related to features +* Remove all ``versionadded`` directives - and any other notes related to features changing or being new - for the version (e.g. 2.1) from the master branch. The result is that the next release (which is the first that comes entirely *after* the end of maintenance of this branch), will have no mentions of