svn: /php/php-src/ branches/PHP_5_4/README.SVN-RULES trunk/README.SVN-RULES

stas Wed, 15 Jun 2011 23:19:30 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=312197 Log: update the branches list Changed paths: U php/php-src/branches/PHP_5_4/README.SVN-RULES U php/php-src/trunk/README.SVN-RULES Modified: php/php-src/branches/PHP_5_4/README.SVN-RULES =================================================================== --- php/php-src/branches/PHP_5_4/README.SVN-RULES 2011-06-15 22:08:30 UTC (rev 312196) +++ php/php-src/branches/PHP_5_4/README.SVN-RULES 2011-06-15 23:19:30 UTC (rev 312197) @@ -43,14 +43,18 @@ Currently we have the following branches in use:: - trunk Will become PHP 6.0. This CVS branch is for active development. + trunk The active development branch. - branches/PHP_5_3 Is used to release the PHP 5.3.x series. It still allows for + branches/PHP_5_4 Is used to release the PHP 5.4.x series. It still allows for larger enhancements. - branches/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). + branches/PHP_5_3 Is used to release the PHP 5.3.x series. This is current + stable version and is open for bugfixes and small + improvements (check with RMs if in doubt). + branches/PHP_5_2 Is used to release the PHP 5.2.x series. It is closed for + changes now. + branches/PHP_5_1 This branch is closed. branches/PHP_4_4 This branch is closed. Modified: php/php-src/trunk/README.SVN-RULES =================================================================== --- php/php-src/trunk/README.SVN-RULES 2011-06-15 22:08:30 UTC (rev 312196) +++ php/php-src/trunk/README.SVN-RULES 2011-06-15 23:19:30 UTC (rev 312197) @@ -43,14 +43,18 @@ Currently we have the following branches in use:: - trunk Will become PHP 6.0. This CVS branch is for active development. + trunk The active development branch. - branches/PHP_5_3 Is used to release the PHP 5.3.x series. It still allows for + branches/PHP_5_4 Is used to release the PHP 5.4.x series. It still allows for larger enhancements. - branches/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). + branches/PHP_5_3 Is used to release the PHP 5.3.x series. This is current + stable version and is open for bugfixes and small + improvements (check with RMs if in doubt). + branches/PHP_5_2 Is used to release the PHP 5.2.x series. It is closed for + changes now. + branches/PHP_5_1 This branch is closed. branches/PHP_4_4 This branch is closed.