summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schlüter <johannes@php.net>2014-08-14 17:08:02 +0200
committerJohannes Schlüter <johannes@php.net>2014-08-14 17:08:02 +0200
commit7311087cf06bf9f3d6b5863d9b54272f3d163ba9 (patch)
treed23dbf25987c8ff31c04e897ce54a5df464f0028
parent1355ea60ccc3d2b289e5ec72877adc3a99ef9f78 (diff)
downloadphp-git-PHP-5.3.tar.gz
Update Git rulesPHP-5.3
-rw-r--r--README.GIT-RULES6
1 files changed, 2 insertions, 4 deletions
diff --git a/README.GIT-RULES b/README.GIT-RULES
index 6e90aa97b6..30686af812 100644
--- a/README.GIT-RULES
+++ b/README.GIT-RULES
@@ -51,9 +51,7 @@ Currently we have the following branches in use::
PHP-5.4 Is used to release the PHP 5.4.x series. This is a current
stable version and is open for bugfixes only.
- PHP-5.3 Is used to release the PHP 5.3.x series. This is currently
- in extended support and open forsecurity fixes only. Triaged
- via security@php.net
+ PHP-5.3 This branch is closed.
PHP-5.2 This branch is closed.
@@ -63,7 +61,7 @@ Currently we have the following branches in use::
The next few rules are more of a technical nature::
- 1. All changes should first go to the lowest branch (i.e. 5.3) and then
+ 1. All changes should first go to the lowest branch (i.e. 5.4) and then
get merged up to all other branches. If a change is not needed for
later branches (i.e. fixes for features which where dropped from later
branches) an empty merge should be done.