diff options
| author | Lukas Smith <lsmith@php.net> | 2007-11-24 13:52:19 +0000 |
|---|---|---|
| committer | Lukas Smith <lsmith@php.net> | 2007-11-24 13:52:19 +0000 |
| commit | 60b1395330c5d63fb4365842f812b98105d3175e (patch) | |
| tree | 79d6e462748191c97d2c1f47d59469e8b6991b8a /README.CVS-RULES | |
| parent | e34be4f8bc6fcaa55081c15ac3d9599216f8caea (diff) | |
| download | php-git-60b1395330c5d63fb4365842f812b98105d3175e.tar.gz | |
- 5.2 is only for bug fixes
- emphasis should be made with enclosing with ** and not with _
Diffstat (limited to 'README.CVS-RULES')
| -rw-r--r-- | README.CVS-RULES | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/README.CVS-RULES b/README.CVS-RULES index 72aa0712ce..5d6a26a917 100644 --- a/README.CVS-RULES +++ b/README.CVS-RULES @@ -48,9 +48,8 @@ Currently we have the following branches in use:: PHP_5_3 Is used to release the PHP 5.3.x series. It still allows for larger enhancements. - PHP_5_2 Is used to release the PHP 5.2.x series. Only minor feature - enhancements may go in here, but please keep that as infrequent as - possible. + PHP_5_2 Is used to release the PHP 5.2.x series. Only bugfixes are permitted + on this branch (Consult the releasemaster prior to commit). PHP_5_1 This branch is closed. @@ -95,7 +94,7 @@ If a line begins with #, it is taken to be a comment and will not appear in the ChangeLog. Everything else goes into the ChangeLog. It is important to note that if your comment or news logline spans multiple -lines, you have to put # at the beginning of _every_ such line. +lines, you have to put # at the beginning of **every** such line. Example. Say you modified two files, datetime.c and string.c. In datetime.c you added a new format option for the date() function, and in string.c you fixed a |