Repository : ssh://git@open-mesh.org/doc

On branches: backup-redmine/2017-07-13,master

commit cae23c7d9c74e6ddcf42b10ac6f2895519f9cf46 Author: Sven Eckelmann sven@narfation.org Date: Wed Oct 20 21:46:03 2010 +0000

doc: batman-adv/Release-todo: Clarify release scheduling a little bit

cae23c7d9c74e6ddcf42b10ac6f2895519f9cf46 batman-adv/Release-todo.textile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/batman-adv/Release-todo.textile b/batman-adv/Release-todo.textile index c9707cf6..dcdcb4ac 100644 --- a/batman-adv/Release-todo.textile +++ b/batman-adv/Release-todo.textile @@ -6,9 +6,9 @@ This page contains a checklist of things that need to be done for a release.

[[Image(wiki:release-todo:release_scheduling.svg)]]

- * next branch is released as feature release 20_ _.a.0 after linux 2.6.x-rc3 is released + * next branch is released as feature release 20_ _.a.0 after linux 2.6.x-rc3 is tagged * maint branch is released on demand (for example after security issues) - * a feature release __must__ be done before 2.6.x-rc6 to allow upcoming features merged after the release into next to enter the linux-next repository for 2.6.y before 2.6.x-rc7 + * a feature release __must__ be done before 2.6.x-rc6. The time till 2.6.x-rc7 is needed to merge new features into next and submit them to the linux maintainers for 2.6.y

'''Code'''