com php-src: Update NEWS handling section of README.GIT-RULES: README.GIT-RULES

Commit: 3624a9ca7a8405f1e3983a34b495d8bb57d9b708 Author: Michael Wallner <mike@php.net> Thu, 19 Dec 2013 10:04:32 +0100 Parents: 2303d0ea2257ecb9f06d19c4a62c4909a4cfdfa0 Branches: PHP-5.4 PHP-5.5 PHP-5.6 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=3624a9ca7a8405f1e3983a34b495d8bb57d9b708 Log: Update NEWS handling section of README.GIT-RULES See http://marc.info/?t=138124004400005&r=1&w=2 Changed paths: M README.GIT-RULES Diff: diff --git a/README.GIT-RULES b/README.GIT-RULES index 6e90aa9..3df9d17 100644 --- a/README.GIT-RULES +++ b/README.GIT-RULES @@ -69,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