Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5: update the GIT-RULES with the 5.6 and the release branches
mohatt · Aug 26, 2014 · e0a177d · e0a177d
2 parents dbe8c37 + 1e1b7c7
commit e0a177d
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/README.GIT-RULES b/README.GIT-RULES
@@ -45,6 +45,9 @@ Currently we have the following branches in use::
 
   master    The active development branch. 
 
+  PHP-5.6   Is used to release the PHP 5.6.x series. This is a current
+            stable version and is open for bugfixes only.
+
   PHP-5.5   Is used to release the PHP 5.5.x series. This is a current
             stable version and is open for bugfixes only.
 
@@ -59,6 +62,9 @@ Currently we have the following branches in use::
 
   PHP-4.4   This branch is closed.
 
+  PHP-X.Y.Z These branches are used for the release managers for tagging
+            the releases, hence they are closed to the general public.
+
 The next few rules are more of a technical nature::
 
    1. All changes should first go to the lowest branch (i.e. 5.4) and then