summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Jones <sixd@php.net>2014-08-07 09:30:19 -0700
committerChristopher Jones <sixd@php.net>2014-08-07 09:30:19 -0700
commita7ecfb50c141eb9f5edc296a30905a66a69cf1f8 (patch)
tree2a6c8852583e3cb1d0157a411246a50ca066994c
parent217c8edd006db9acc9e30c5ed422d8d838cce2e4 (diff)
parent45caa88c29421d7e16cf23b118ebeacbbe326f60 (diff)
downloadphp-git-a7ecfb50c141eb9f5edc296a30905a66a69cf1f8.tar.gz
Merge branch 'PHP-5.6'
* PHP-5.6: Small tidy ups and raise visibility of GitHub PR process
-rw-r--r--README.SUBMITTING_PATCH35
1 files changed, 18 insertions, 17 deletions
diff --git a/README.SUBMITTING_PATCH b/README.SUBMITTING_PATCH
index 50a1664a71..bdd46a22f8 100644
--- a/README.SUBMITTING_PATCH
+++ b/README.SUBMITTING_PATCH
@@ -17,7 +17,7 @@ Online Forums
-------------
There are several IRC channels where PHP developers are often
available to discuss questions. They include #php.pecl and #php.doc
-on the EFNet network and #php-dev-win on FreeNode.
+on the EFNet network and #winphp-dev on FreeNode.
PHP Patches
@@ -33,27 +33,17 @@ and discuss it on the development mail list internals@lists.php.net.
RFC Wiki accounts can be requested on
http://wiki.php.net/start?do=register. PHP extension maintainers can
be found in the EXTENSIONS file in the PHP source. Mail list
-subscription is explained on http://www.php.net/mailing-lists.php.
+subscription is explained on http://php.net/mailing-lists.php.
Information on PHP internal C functions is at
-http://www.php.net/internals, though this is considered incomplete.
-Various external resources can be found on the web. A standard
+http://php.net/internals, though this is considered incomplete.
+Various external resources can be found on the web. See
+https://wiki.php.net/internals for some references. A standard
printed reference is the book "Extending and Embedding PHP" by Sara
Golemon.
-Attach the patch to the PHP bug and consider sending a notification
-email about the change to internals@lists.php.net. Also CC the
-extension maintainer. Explain what has been changed by your patch.
-Test scripts should be included.
-
-Please make the mail subject prefix "[PATCH]". If attaching a patch,
-ensure it has a file extension of ".txt". This is because only MIME
-attachments of type 'text/*' are accepted.
-
The preferred way to propose PHP patch is sending pull request from
-github.
-
-https://github.com/php/php-src
+GitHub: https://github.com/php/php-src
Fork the official PHP repository and send a pull request. A
notification will be sent to the pull request mailing list. Sending a
@@ -61,6 +51,17 @@ note to PHP Internals list (internals@lists.php.net) may help getting
more feedback and quicker turnaround. You can also add pull requests
to bug reports at http://bugs.php.net/.
+If you are not using GitHub, attach your patch to a PHP bug and
+consider sending a notification email about the change to
+internals@lists.php.net. If the bug is for an extension, also CC the
+extension maintainer. Explain what has been changed by your patch.
+Test scripts should be included.
+
+Please make the mail subject prefix "[PATCH]". If attaching a patch,
+ensure it has a file extension of ".txt". This is because only MIME
+attachments of type 'text/*' are accepted.
+
+
PHP Documentation Patches
-------------------------
@@ -71,7 +72,7 @@ the PHP mail archives.
If your change is large, then first discuss it with the mail list
phpdoc@lists.php.net. Subscription is explained on
-http://www.php.net/mailing-lists.php.
+http://php.net/mailing-lists.php.
Information on contributing to PHP documentation is at
http://php.net/dochowto and http://wiki.php.net/doc/howto