Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix some factual errors in the process
This commit is contained in:
Ferenc Kovacs 2015-01-22 21:28:21 +01:00
commit f014785eeb

View file

@ -196,11 +196,11 @@ last commit id to web/php.git, then, mirrors will now sync
Getting the stable release announced Getting the stable release announced
------------------------------------ ------------------------------------
1. Run the bumpRelease script for phpweb on your local checkout 1. Update phpweb/include/releases.inc with the old release info
(updates the download archives)
a. ``php bin/bumpRelease 5`` to create the release file (releases/x_y_z.php) a. You can run ``php bin/bumpRelease 5`` if you are making a release for the
The release announcement file should list in detail security fixes and highest branch, otherwise you have to do this manually, see point 1.b
changes in behavior (whether due to a bug fix or not).
b. In case multiple PHP minor versions are in active development you have b. In case multiple PHP minor versions are in active development you have
to manually copy the old information to include/releases.inc to manually copy the old information to include/releases.inc
@ -220,8 +220,9 @@ Getting the stable release announced
f. if the windows builds aren't ready yet prefix the "windows" key with a dot (".windows") f. if the windows builds aren't ready yet prefix the "windows" key with a dot (".windows")
3. Update phpweb/include/releases.php with the old release info 3. Create the release file (releases/x_y_z.php)
(updates the download archives) Usually we use the same content as for point 6, but included in php template
instead of the release xml.
4. Update php-qa/include/release-qa.php and add the next version as an QARELEASE 4. Update php-qa/include/release-qa.php and add the next version as an QARELEASE
(prepare for next RC) (prepare for next RC)