summaryrefslogtreecommitdiff
path: root/CODING_STANDARDS
diff options
context:
space:
mode:
authorMichael Wallner <mike@php.net>2013-10-09 09:18:29 +0200
committerMichael Wallner <mike@php.net>2013-10-09 09:18:29 +0200
commit29d5ff75d5ac076eb0b4623e1a29eb33bb65393a (patch)
tree3e697c7d1e0b4572e3d83ce7b53a3c234a879e65 /CODING_STANDARDS
parent1815942f53a976555e9cb60ac3ce2425142d1cb1 (diff)
parent36fb4ed9685fa4d8b5c5e7255b097e5888623f2d (diff)
downloadphp-git-29d5ff75d5ac076eb0b4623e1a29eb33bb65393a.tar.gz
Merge branch 'PHP-5.5'
* PHP-5.5: Fixed segfault when built with OpenSSL >= 1.0.1 fixing a minor typo in CODING_STANDARDS document FIX BUG #65219 - Typo correction FIX BUG #65219 - USE DB not being sent for FreeTDS version < 0.92 FreeTDS <0.92 does not support DBSETLDBNAME option and therefore will not work with SQL Azure. Fallback to dbuse command in letter versions.
Diffstat (limited to 'CODING_STANDARDS')
-rw-r--r--CODING_STANDARDS2
1 files changed, 1 insertions, 1 deletions
diff --git a/CODING_STANDARDS b/CODING_STANDARDS
index 16ec36b681..a05d761cf1 100644
--- a/CODING_STANDARDS
+++ b/CODING_STANDARDS
@@ -151,7 +151,7 @@ Naming Conventions
7. Classes should be given descriptive names. Avoid using abbreviations where
possible. Each word in the class name should start with a capital letter,
- without underscore delimiters (CampelCaps starting with a capital letter).
+ without underscore delimiters (CamelCaps starting with a capital letter).
The class name should be prefixed with the name of the 'parent set' (e.g.
the name of the extension)::