summaryrefslogtreecommitdiff
path: root/CODING_STANDARDS
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2013-12-14 20:47:37 +0100
committerAnatol Belski <ab@php.net>2013-12-14 20:47:37 +0100
commit904721189ff949c67795ec418f04b67951cbd57b (patch)
tree06b7d04ffd09f1d66fa0481e9a4a5ff1ab35c3b1 /CODING_STANDARDS
parent41eaac3491cfcad02ebab5f86ece018d9e3c4cc6 (diff)
parent509a67d28f792a2a11f86a3aca4a5ac820d2f747 (diff)
downloadphp-git-904721189ff949c67795ec418f04b67951cbd57b.tar.gz
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5: fixed parameter order for zend_throw_exception_ex call Fix doc (svn -> git)
Diffstat (limited to 'CODING_STANDARDS')
-rw-r--r--CODING_STANDARDS4
1 files changed, 2 insertions, 2 deletions
diff --git a/CODING_STANDARDS b/CODING_STANDARDS
index a05d761cf1..5fd3f9f35a 100644
--- a/CODING_STANDARDS
+++ b/CODING_STANDARDS
@@ -59,8 +59,8 @@ Exceptions:
you're calling.
7. When commenting out code using a #if statement, do NOT use 0 only. Instead
- use "<svn username here>_0". For example, #if FOO_0, where FOO is your
- svn user foo. This allows easier tracking of why code was commented out,
+ use "<git username here>_0". For example, #if FOO_0, where FOO is your
+ git user foo. This allows easier tracking of why code was commented out,
especially in bundled libraries.
8. Do not define functions that are not available. For instance, if a