Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4: Add information about which INI file is which inside respective files
13 years ago · e98fc7de52
2 changed files with 4 additions and 0 deletions
--- 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 ;
 ;;;;;;;;;;;;;;;;;;;
--- 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 ;
 ;;;;;;;;;;;;;;;;;;;