From: Stanislav Malyshev <stas@php.net>
Date: Wed, 15 Jun 2011 23:19:30 +0000 (+0000)
Subject: update the branches list
X-Git-Tag: php-5.4.0alpha1~36
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=240653bad73e7f81ca2bc971933de4c4b9a91e33;p=php

update the branches list
---

diff --git a/README.SVN-RULES b/README.SVN-RULES
index 2b3cb8036a..3085489c31 100644
--- a/README.SVN-RULES
+++ b/README.SVN-RULES
@@ -43,13 +43,17 @@ Having said that, here are the organizational rules::
 
 Currently we have the following branches in use::
 
-  trunk             Will become PHP 6.0. This CVS branch is for active development.
+  trunk             The active development branch. 
 
-  branches/PHP_5_3  Is used to release the PHP 5.3.x series. It still allows for
+  branches/PHP_5_4  Is used to release the PHP 5.4.x series. It still allows for
                     larger enhancements.
 
-  branches/PHP_5_2  Is used to release the PHP 5.2.x series. Only bugfixes are permitted
-                    on this branch (Consult the releasemaster prior to commit).
+  branches/PHP_5_3  Is used to release the PHP 5.3.x series. This is current 
+                    stable version and is open for bugfixes and small
+                    improvements (check with RMs if in doubt).
+
+  branches/PHP_5_2  Is used to release the PHP 5.2.x series. It is closed for 
+                    changes now.
 
   branches/PHP_5_1  This branch is closed.