summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Harvey <aharvey@php.net>2012-09-10 10:06:10 +0800
committerAdam Harvey <aharvey@php.net>2012-09-10 10:06:10 +0800
commit58d6a425287dbc2c5ebad3eafeba828abbdf1d0d (patch)
treee4d0ffad193ab761dc062a3c59bdfcf507f78378
parent57bebfcbdc24cf688e2a522c3047ff8f0be1b2b6 (diff)
parentf66642aae10fbf77d536a4a4ac68602124e41ae0 (diff)
downloadphp-git-58d6a425287dbc2c5ebad3eafeba828abbdf1d0d.tar.gz
Merge branch 'PHP-5.3' into PHP-5.4
-rw-r--r--CODING_STANDARDS6
1 files changed, 3 insertions, 3 deletions
diff --git a/CODING_STANDARDS b/CODING_STANDARDS
index ae8ee04190..7413be453c 100644
--- a/CODING_STANDARDS
+++ b/CODING_STANDARDS
@@ -2,11 +2,11 @@
PHP Coding Standards
========================
-This file lists several standards that any programmer, adding or changing
-code in PHP, should follow. Since this file was added at a very late
+This file lists several standards that any programmer adding or changing
+code in PHP should follow. Since this file was added at a very late
stage of the development of PHP v3.0, the code base does not (yet) fully
follow it, but it's going in that general direction. Since we are now
-well into the version 4 releases, many sections have been recoded to use
+well into version 5 releases, many sections have been recoded to use
these rules.
Code Implementation