summaryrefslogtreecommitdiff
path: root/README.CVS-RULES
diff options
context:
space:
mode:
authorMark A. Hershberger <mah@debian.(none)>2009-03-25 00:35:13 -0400
committerMark A. Hershberger <mah@debian.(none)>2009-03-25 00:35:13 -0400
commit0a36161e13484a99ccf69bb38f206462d27cc6d6 (patch)
treed5107db4b7369603ac7c753829e8972ee74949f7 /README.CVS-RULES
parentce7edc9b3c7370f32fec0bc7a8ec3e29ed9a5f61 (diff)
downloadphp-0a36161e13484a99ccf69bb38f206462d27cc6d6.tar.gz
Imported Upstream version 5.1.2upstream/5.1.2
Diffstat (limited to 'README.CVS-RULES')
-rw-r--r--README.CVS-RULES6
1 files changed, 3 insertions, 3 deletions
diff --git a/README.CVS-RULES b/README.CVS-RULES
index 8e3641b28..43240c816 100644
--- a/README.CVS-RULES
+++ b/README.CVS-RULES
@@ -31,11 +31,11 @@ Having said that, here are the organizational rules:
6. Test your changes before committing them. We mean it. Really.
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_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_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.4.x series. Only bugfixes are permitted
on this branch.
The next few rules are more of a technical nature.