From: Christopher Jones <sixd@php.net>
Date: Tue, 29 Nov 2011 22:33:55 +0000 (+0000)
Subject: Miscellaneous: move misplaced entry; fix typos; note more precise OCI8 DLL dependency... 
X-Git-Tag: php-5.5.0alpha1~799
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d9e955c6b2156f771ca3442d89d7b4c01653475c;p=php

Miscellaneous: move misplaced entry; fix typos; note more precise OCI8 DLL dependency; remove session.entropy_file setting which was only in PHP_5_3 php.ini-development
---

diff --git a/php.ini-development b/php.ini-development
index fb3b1cace2..bd3eefcfff 100644
--- a/php.ini-development
+++ b/php.ini-development
@@ -176,11 +176,6 @@
 ;   Development Value: "GPCS"
 ;   Production Value: "GPCS"
 
-;windows.show_crt_warning
-; Default value: 0
-; Development value: 0
-; Production value: 0
-
 ;;;;;;;;;;;;;;;;;;;;
 ; php.ini Options  ;
 ;;;;;;;;;;;;;;;;;;;;
@@ -583,6 +578,11 @@ html_errors = On
 ; Log errors to syslog (Event Log on NT, not valid in Windows 95).
 ;error_log = syslog
 
+;windows.show_crt_warning
+; Default value: 0
+; Development value: 0
+; Production value: 0
+
 ;;;;;;;;;;;;;;;;;
 ; Data Handling ;
 ;;;;;;;;;;;;;;;;;
@@ -873,7 +873,7 @@ default_socket_timeout = 60
 ;extension=php_mysql.dll
 ;extension=php_mysqli.dll
 ;extension=php_oci8.dll      ; Use with Oracle 10gR2 Instant Client
-;extension=php_oci8_11g.dll  ; Use with Oracle 11g Instant Client
+;extension=php_oci8_11g.dll  ; Use with Oracle 11gR2 Instant Client
 ;extension=php_openssl.dll
 ;extension=php_pdo_firebird.dll
 ;extension=php_pdo_mysql.dll
diff --git a/php.ini-production b/php.ini-production
index ad20e6d1c6..77caca1021 100644
--- a/php.ini-production
+++ b/php.ini-production
@@ -176,11 +176,6 @@
 ;   Development Value: "GPCS"
 ;   Production Value: "GPCS"
 
-;windows.show_crt_warning
-; Default value: 0
-; Development value: 0
-; Production value: 0
-
 ;;;;;;;;;;;;;;;;;;;;
 ; php.ini Options  ;
 ;;;;;;;;;;;;;;;;;;;;
@@ -583,6 +578,11 @@ html_errors = On
 ; Log errors to syslog (Event Log on NT, not valid in Windows 95).
 ;error_log = syslog
 
+;windows.show_crt_warning
+; Default value: 0
+; Development value: 0
+; Production value: 0
+
 ;;;;;;;;;;;;;;;;;
 ; Data Handling ;
 ;;;;;;;;;;;;;;;;;
@@ -873,7 +873,7 @@ default_socket_timeout = 60
 ;extension=php_mysql.dll
 ;extension=php_mysqli.dll
 ;extension=php_oci8.dll      ; Use with Oracle 10gR2 Instant Client
-;extension=php_oci8_11g.dll  ; Use with Oracle 11g Instant Client
+;extension=php_oci8_11g.dll  ; Use with Oracle 11gR2 Instant Client
 ;extension=php_openssl.dll
 ;extension=php_pdo_firebird.dll
 ;extension=php_pdo_mysql.dll
@@ -1610,6 +1610,7 @@ url_rewriter.tags = "a=href,area=href,frame=src,input=src,form=fakeentry"
 ; Production Value: 1
 ; http://php.net/session.upload-progress.min-freq
 ;session.upload_progress.min_freq = "1"
+
 [MSSQL]
 ; Allow or prevent persistent links.
 mssql.allow_persistent = On