@@ -12,7 +12,7 @@ Collaboration is a Good Thing(tm), and Git lets us do this. Thus, following
12
12
some basic rules with regards to Git usage will::
13
13
14
14
a. Make everybody happier, especially those responsible for maintaining
15
- Git itself.
15
+ PHP itself.
16
16
17
17
b. Keep the changes consistently well documented and easily trackable.
18
18
@@ -48,11 +48,11 @@ Currently we have the following branches in use::
48
48
PHP-5.6 Is used to release the PHP 5.6.x series. This is a current
49
49
stable version and is open for bugfixes only.
50
50
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.
53
53
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.
56
56
57
57
PHP-5.3 This branch is closed.
58
58
@@ -67,7 +67,7 @@ Currently we have the following branches in use::
67
67
68
68
The next few rules are more of a technical nature::
69
69
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
71
71
get merged up to all other branches. If a change is not needed for
72
72
later branches (i.e. fixes for features which where dropped from later
73
73
branches) an empty merge should be done.
0 commit comments