diff options
| -rw-r--r-- | README.GIT-RULES | 2 | ||||
| -rw-r--r-- | README.RELEASE_PROCESS | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/README.GIT-RULES b/README.GIT-RULES index 5f35cc4f3e..a88a8c9f32 100644 --- a/README.GIT-RULES +++ b/README.GIT-RULES @@ -79,7 +79,7 @@ The next few rules are more of a technical nature:: should be noted in both PHP-5.4/NEWS and PHP-5.5/NEWS but not master, which is not a public released version yet. - 3. Do not commit multiple file and dump all messages in one commit. If you + 3. Do not commit multiple files and dump all messages in one commit. If you modified several unrelated files, commit each group separately and provide a nice commit message for each one. See example below. diff --git a/README.RELEASE_PROCESS b/README.RELEASE_PROCESS index 38bc6e1845..3411ed903e 100644 --- a/README.RELEASE_PROCESS +++ b/README.RELEASE_PROCESS @@ -17,7 +17,7 @@ It is recommended to do so a couple of days before the packaging day, to have enough time to investigate failures, communicate with the authors and commit the fixes. The RM for the branch is also responsible for keeping the CI green on -ongoing bases between the releases. Check the CI status for your branch +ongoing basis between the releases. Check the CI status for your branch periodically and resolve the failures ASAP. See more in: https://wiki.php.net/rfc/travis_ci @@ -271,8 +271,8 @@ to upgrade. 10. Wait an hour or two, then send a mail to php-announce@lists.php.net, php-general@lists.php.net and internals@lists.php.net with a text similar to http://news.php.net/php.internals/17222. -Please make sure that the mail to php-announce@ is its own completely seperate email. -This is to make sure that repiles to the announcement on php-general@ or internals@ +Please make sure that the mail to php-announce@ is its own completely separate email. +This is to make sure that replies to the announcement on php-general@ or internals@ will not accidentally hit the php-announce@ mailinglist. Re-releasing the same version (or -pl) @@ -309,6 +309,6 @@ to upgrade. 5. Wait an hour or two, then send a mail to php-announce@lists.php.net, php-general@lists.php.net and internals@lists.php.net with a text similar to the news entry. -Please make sure that the mail to php-announce@ is its own completely seperate email. -This is to make sure that repiles to the announcement on php-general@ or internals@ +Please make sure that the mail to php-announce@ is its own completely separate email. +This is to make sure that replies to the announcement on php-general@ or internals@ will not accidentally hit the php-announce@ mailinglist. |