[PHP-CVS] com php-src: fixing a minor typo in CODING_STANDARDS document: CODING_STANDARDS

2013-10-06 Thread Lior Kaplan
Commit:b5a0f128718d93a236b450bb9b409477f0a97888
Author:ArunSK arunsk@gmail.com Mon, 7 Oct 2013 00:26:49 +0200
Committer: Lior Kaplan kaplanl...@gmail.com  Mon, 7 Oct 2013 00:26:49 
+0200
Parents:   63f242178d33fa22346d2e976b06a76455dbd6ab
Branches:  PHP-5.4

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=b5a0f128718d93a236b450bb9b409477f0a97888

Log:
fixing a minor typo in CODING_STANDARDS document

Changed paths:
  M  CODING_STANDARDS


Diff:
diff --git a/CODING_STANDARDS b/CODING_STANDARDS
index 7413be4..5ceacdc 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)::


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



[PHP-CVS] com php-src: Add information about which INI file is which inside respective files: php.ini-development php.ini-production

2013-09-27 Thread Lior Kaplan
Commit:0ad0a2f56ea5f9822297fec8e2816751b9a4f653
Author:Ondřej Surý ond...@sury.org Fri, 27 Sep 2013 17:46:14 +0200
Committer: Lior Kaplan kaplanl...@gmail.com  Fri, 27 Sep 2013 17:46:14 
+0200
Parents:   7a1a1aec8c90fff8a24dc53d2232e22fbca3d39f
Branches:  PHP-5.4 PHP-5.5

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=0ad0a2f56ea5f9822297fec8e2816751b9a4f653

Log:
Add information about which INI file is which inside respective files

Changed paths:
  M  php.ini-development
  M  php.ini-production


Diff:
diff --git a/php.ini-development b/php.ini-development
index ba20bd3..b935f22 100644
--- a/php.ini-development
+++ b/php.ini-development
@@ -83,6 +83,8 @@
 ; development version only in development environments as errors shown to
 ; application users can inadvertently leak otherwise secure information.
 
+; This is php.ini-development INI file.
+
 ;;;
 ; Quick Reference ;
 ;;;
diff --git a/php.ini-production b/php.ini-production
index db48a8f..4ee7ac9 100644
--- a/php.ini-production
+++ b/php.ini-production
@@ -83,6 +83,8 @@
 ; development version only in development environments as errors shown to
 ; application users can inadvertently leak otherwise secure information.
 
+; This is php.ini-production INI file.
+
 ;;;
 ; Quick Reference ;
 ;;;


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



[PHP-CVS] com php-src: Merge branch 'PHP-5.4' into PHP-5.5: php.ini-development php.ini-production

2013-09-27 Thread Lior Kaplan
Commit:e98fc7de52ff7ddbcce77bd1bd9df146a25d6659
Author:Lior Kaplan kaplanl...@gmail.com Fri, 27 Sep 2013 17:50:03 
+0200
Parents:   80346690ba0a13f8a2a924671aaed55f824839c3 
0ad0a2f56ea5f9822297fec8e2816751b9a4f653
Branches:  PHP-5.5

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=e98fc7de52ff7ddbcce77bd1bd9df146a25d6659

Log:
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Add information about which INI file is which inside respective files

Changed paths:
  MM  php.ini-development
  MM  php.ini-production


Diff:



--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php