Skip to content

Commit 8f1baa6

Browse files
author
Julien Pauli
committed
Adjust Git-Rules
1 parent 496f291 commit 8f1baa6

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

README.GIT-RULES

+6-6
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Collaboration is a Good Thing(tm), and Git lets us do this. Thus, following
1212
some basic rules with regards to Git usage will::
1313

1414
a. Make everybody happier, especially those responsible for maintaining
15-
Git itself.
15+
PHP itself.
1616

1717
b. Keep the changes consistently well documented and easily trackable.
1818

@@ -48,11 +48,11 @@ Currently we have the following branches in use::
4848
PHP-5.6 Is used to release the PHP 5.6.x series. This is a current
4949
stable version and is open for bugfixes only.
5050

51-
PHP-5.5 Is used to release the PHP 5.5.x series. This is a current
52-
stable version and is open for bugfixes only.
51+
PHP-5.5 Is used to release the PHP 5.5.x series. This is an old
52+
stable version and is open for security fixes only.
5353

54-
PHP-5.4 Is used to release the PHP 5.4.x series. This is a current
55-
stable version and is open for bugfixes only.
54+
PHP-5.4 Is used to release the PHP 5.4.x series. This is an old
55+
stable version and is open for security fixes only.
5656

5757
PHP-5.3 This branch is closed.
5858

@@ -67,7 +67,7 @@ Currently we have the following branches in use::
6767

6868
The next few rules are more of a technical nature::
6969

70-
1. All changes should first go to the lowest branch (i.e. 5.4) and then
70+
1. All changes should first go to the lowest branch (i.e. 5.6) and then
7171
get merged up to all other branches. If a change is not needed for
7272
later branches (i.e. fixes for features which where dropped from later
7373
branches) an empty merge should be done.

0 commit comments

Comments
 (0)