-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi,

attached are just a few one-line changes to the current README.CVS-RULES
files in 5.2 and HEAD, maybe it needs even more massaging.

- - Markus
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.2 (MingW32)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFEcCdx1nS0RcInK9ARAu1BAJ428qhMzN77T9KR5+aBuK0PaK5itQCdHd6D
0D+UDo1QSyNbkrO9F82199U=
=qPn1
-----END PGP SIGNATURE-----
Index: README.CVS-RULES
===================================================================
RCS file: /repository/php-src/README.CVS-RULES,v
retrieving revision 1.19
diff -u -r1.19 README.CVS-RULES
--- README.CVS-RULES    17 Aug 2005 19:52:03 -0000      1.19
+++ README.CVS-RULES    21 May 2006 08:35:06 -0000
@@ -34,11 +34,11 @@
       code handles TSRM correctly and doesn't break for thos who need that.
 
 Currently we have the following branches in use:
-HEAD     Will become PHP 5.1. This CVS branch is for active development.
-PHP_5_0  Is used to release the PHP 5.0.x series. Only minor feature
+HEAD     Will become PHP 6.0. This CVS branch is for active development.
+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_4_3  Is used to release the PHP 4.3.x series. Only bugfixes are permitted
+PHP_4_4  Is used to release the PHP 4.3.x series. Only bugfixes are permitted
          on this branch.
 
 The next few rules are more of a technical nature.
Index: README.CVS-RULES
===================================================================
RCS file: /repository/php-src/README.CVS-RULES,v
retrieving revision 1.18.2.1
diff -u -r1.18.2.1 README.CVS-RULES
--- README.CVS-RULES    4 Dec 2005 23:19:44 -0000       1.18.2.1
+++ README.CVS-RULES    21 May 2006 08:35:37 -0000
@@ -30,8 +30,12 @@
 
    6. Test your changes before committing them. We mean it. Really.
 
+   7. For development use the --enable-maintainer-zts switch to ensure your
+      code handles TSRM correctly and doesn't break for thos who need that.
+
 Currently we have the following branches in use:
 HEAD     Will become PHP 6.0. This CVS branch is for active development.
+PHP_5_2  Is used to release the PHP 5.2.x series.
 PHP_5_1  Is used to release the PHP 5.1.x series. Only minor feature
                 enhancements may go in here, but please keep that as 
infrequent as
                 possible.

-- 
PHP Internals - PHP Runtime Development Mailing List
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to