@@ -65,7 +65,7 @@ credits files in ext/standard.
6565
66664 . Checkout the release branch for this release (e.g., PHP-5.4.2) from the main branch.
6767
68- 5 . Bump the version numbers in `` main/php_version.h `` , `` Zend/zend.h `` , `` configure.ac `` , `` scripts/phpize.m4 `` and possibly `` NEWS `` .
68+ 5 . Bump the version numbers in `` main/php_version.h `` , `` Zend/zend.h `` , `` configure.ac `` and possibly `` NEWS `` .
6969Do not use abbreviations for alpha and beta. Do not use dashes, you should
7070`` #define PHP_VERSION "5.4.22RC1" `` and not `` #define PHP_VERSION "5.4.22-RC1" ``
7171
@@ -79,7 +79,7 @@ Do not use abbreviations for alpha and beta. Do not use dashes, you should
79799 . Tag the repository release branch with the version, e.g.:
8080`` git tag -u YOURKEYID php-5.4.2RC2 ``
8181
82- 10 . Bump the version numbers in `` main/php_version.h `` , `` Zend/zend.h `` , `` configure.ac `` , `` scripts/phpize.m4 `` and `` NEWS ``
82+ 10 . Bump the version numbers in `` main/php_version.h `` , `` Zend/zend.h `` , `` configure.ac `` and `` NEWS ``
8383in the * main* branch (PHP-5.4 for example) to prepare for the ** next** version.
8484F.e. if the RC is "5.4.1RC1" then the new one should be "5.4.2-dev" - regardless if we get
8585a new RC or not. This is to make sure `` version_compare() `` can correctly work.
@@ -162,7 +162,7 @@ Rolling a stable release
162162------------------------
163163
1641641 . Checkout your release branch, you should have created when releasing previous RC
165- and bump the version numbers in `` main/php_version.h `` , `` Zend/zend.h `` , `` configure.ac `` , `` scripts/phpize.m4 `` and possibly `` NEWS `` .
165+ and bump the version numbers in `` main/php_version.h `` , `` Zend/zend.h `` , `` configure.ac `` and possibly `` NEWS `` .
166166
1671672 . If a CVE commit needs to be merged to the release, then have it committed to
168168the base branches and merged upwards as usual (f.e commit the CVE fix to 5.3,
@@ -336,7 +336,7 @@ Forking a new release branch
336336
3373372 . Just prior to cutting X.Y.0beta1, create the new branch locally.
338338 Add a commit on master after the branch point clearing the NEWS, UPGRADING
339- and UPGRADING.INTERNALS files, updating the version in configure.ac and scripts/phpize.m4 (run
339+ and UPGRADING.INTERNALS files, updating the version in configure.ac (run
340340 ./configure to automatically update main/php_versions.h, too) and Zend/zend.h.
341341 Also list the new branch in CONTRIBUTING.md.
342342 Example: http://git.php.net/?p=php-src.git;a=commit;h=a63c99b
0 commit comments