--- embedaddon/php/README.GIT-RULES 2013/07/22 01:31:37 1.1 +++ embedaddon/php/README.GIT-RULES 2014/06/15 20:03:41 1.1.1.3 @@ -45,15 +45,18 @@ Currently we have the following branches in use:: master The active development branch. - PHP-5.4 Is used to release the PHP 5.4.x series. It still allows for - larger enhancements. + 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. - PHP-5.3 Is used to release the PHP 5.3.x series. This is current + 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.2 Is used to release the PHP 5.2.x series. It is closed for - changes now. + 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.2 This branch is closed. + PHP-5.1 This branch is closed. PHP-4.4 This branch is closed. @@ -66,9 +69,11 @@ The next few rules are more of a technical nature:: branches) an empty merge should be done. 2. All news updates intended for public viewing, such as new features, - bug fixes, improvements, etc., should go into the NEWS file of the - *first* to be released version with the given change. In other words - any NEWS file change only needs to done in one branch. + bug fixes, improvements, etc., should go into the NEWS file of *any + stable release* version with the given change. In other words, + news about a bug fix which went into PHP-5.4, PHP-5.5 and master + should be noted in both PHP-5.4/NEWS and PHP-5.5/NEWS but + not master, which is not a public released version yet. 3. Do not commit multiple file and dump all messages in one commit. If you modified several unrelated files, commit each group separately and