summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CODING_STANDARDS9
-rw-r--r--README.EXT_SKEL2
-rw-r--r--README.SUBMITTING_PATCH11
3 files changed, 13 insertions, 9 deletions
diff --git a/CODING_STANDARDS b/CODING_STANDARDS
index fccc2b873d..bebc951452 100644
--- a/CODING_STANDARDS
+++ b/CODING_STANDARDS
@@ -166,9 +166,10 @@ User Functions/Methods Naming Conventions
Internal Function Naming Convensions
----------------------
-1. Exposed module API must be named 'php_modulename_function()' to avoid
- symbol collision. They should be in lowercase, with words underscore
- delimited. Exposed API must be defined in 'php_modulename.h'.
+1. Functions that are part of the external API should be named
+ 'php_modulename_function()' to avoid symbol collision. They should be in
+ lowercase, with words underscore delimited. Exposed API must be defined
+ in 'php_modulename.h'.
PHPAPI char *php_session_create_id(PS_CREATE_SID_ARGS);
@@ -179,7 +180,7 @@ Internal Function Naming Convensions
2. Main module source file must be named 'modulename.c'.
-3. Header file that are used by other sources must be named 'php_modulename.h'.
+3. Header file that is used by other sources must be named 'php_modulename.h'.
Syntax and indentation
diff --git a/README.EXT_SKEL b/README.EXT_SKEL
index 20b684ddfa..42df006d24 100644
--- a/README.EXT_SKEL
+++ b/README.EXT_SKEL
@@ -91,7 +91,7 @@ FORMAT OF FUNCTION DEFINITIONS FILE
module_name_function(int arg1, int arg2 [, int arg3 [, int arg4]])
- Arguments arg1 and arg2 is required.
+ Arguments arg1 and arg2 are required.
Arguments arg3 and arg4 are optional.
If possible, the function definition should also contain it's return type
diff --git a/README.SUBMITTING_PATCH b/README.SUBMITTING_PATCH
index 57bd2881b8..ee8e6bbaef 100644
--- a/README.SUBMITTING_PATCH
+++ b/README.SUBMITTING_PATCH
@@ -50,13 +50,16 @@ 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.
-Preferred way to propose PHP patch is sending pull request from github.
+The preferred way to propose PHP patch is sending pull request from
+github.
https://github.com/php/php-src
-Fork official PHP repository and send pull request. It will be notified
-to pull request mailing list. You can add pull requests to
-http://bugs.php.net/ reports also.
+Fork the official PHP repository and send a pull request. A
+notification will be sent to the pull request mailing list. Sending a
+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/.
PHP Documentation Patches