saving uncommitted changes in /etc prior to emerge run

diff --git a/php/apache2-php5.6/php.ini b/php/apache2-php5.6/php.ini
index 28ab2a786f8b8b800c6f974859f53ad9de812e62..4176901ceab8446eb7146ccc0b18d93f343e22b2 100644 (file)
--- a/php/apache2-php5.6/php.ini
+++ b/php/apache2-php5.6/php.ini
@@ -667,11 +667,10 @@ auto_prepend_file =
 ; http://php.net/auto-append-file
 auto_append_file =
 
-; By default, PHP will output a character encoding using
-; the Content-type: header.  To disable sending of the charset, simply
-; set it to be empty.
+; By default, PHP will output a media type using the Content-Type header. To
+; disable this, simply set it to be empty.
 ;
-; PHP's built-in default is text/html
+; PHP's built-in default media type is set to text/html.
 ; http://php.net/default-mimetype
 default_mimetype = "text/html"
 
@@ -969,10 +968,6 @@ cli_server.color = On
 ; Default is 0, which does not produce any errors.
 ;intl.error_level = E_WARNING
 
-[sqlite]
-; http://php.net/sqlite.assoc-case
-;sqlite.assoc_case = 0
-
 [sqlite3]
 ;sqlite3.extension_dir =
 

diff --git a/php/cgi-php5.6/php.ini b/php/cgi-php5.6/php.ini
index 28ab2a786f8b8b800c6f974859f53ad9de812e62..4176901ceab8446eb7146ccc0b18d93f343e22b2 100644 (file)
--- a/php/cgi-php5.6/php.ini
+++ b/php/cgi-php5.6/php.ini
@@ -667,11 +667,10 @@ auto_prepend_file =
 ; http://php.net/auto-append-file
 auto_append_file =
 
-; By default, PHP will output a character encoding using
-; the Content-type: header.  To disable sending of the charset, simply
-; set it to be empty.
+; By default, PHP will output a media type using the Content-Type header. To
+; disable this, simply set it to be empty.
 ;
-; PHP's built-in default is text/html
+; PHP's built-in default media type is set to text/html.
 ; http://php.net/default-mimetype
 default_mimetype = "text/html"
 
@@ -969,10 +968,6 @@ cli_server.color = On
 ; Default is 0, which does not produce any errors.
 ;intl.error_level = E_WARNING
 
-[sqlite]
-; http://php.net/sqlite.assoc-case
-;sqlite.assoc_case = 0
-
 [sqlite3]
 ;sqlite3.extension_dir =
 

diff --git a/php/cli-php5.6/php.ini b/php/cli-php5.6/php.ini
index 28ab2a786f8b8b800c6f974859f53ad9de812e62..4176901ceab8446eb7146ccc0b18d93f343e22b2 100644 (file)
--- a/php/cli-php5.6/php.ini
+++ b/php/cli-php5.6/php.ini
@@ -667,11 +667,10 @@ auto_prepend_file =
 ; http://php.net/auto-append-file
 auto_append_file =
 
-; By default, PHP will output a character encoding using
-; the Content-type: header.  To disable sending of the charset, simply
-; set it to be empty.
+; By default, PHP will output a media type using the Content-Type header. To
+; disable this, simply set it to be empty.
 ;
-; PHP's built-in default is text/html
+; PHP's built-in default media type is set to text/html.
 ; http://php.net/default-mimetype
 default_mimetype = "text/html"
 
@@ -969,10 +968,6 @@ cli_server.color = On
 ; Default is 0, which does not produce any errors.
 ;intl.error_level = E_WARNING
 
-[sqlite]
-; http://php.net/sqlite.assoc-case
-;sqlite.assoc_case = 0
-
 [sqlite3]
 ;sqlite3.extension_dir =
 

diff --git a/php/embed-php5.6/php.ini b/php/embed-php5.6/php.ini
index 28ab2a786f8b8b800c6f974859f53ad9de812e62..4176901ceab8446eb7146ccc0b18d93f343e22b2 100644 (file)
--- a/php/embed-php5.6/php.ini
+++ b/php/embed-php5.6/php.ini
@@ -667,11 +667,10 @@ auto_prepend_file =
 ; http://php.net/auto-append-file
 auto_append_file =
 
-; By default, PHP will output a character encoding using
-; the Content-type: header.  To disable sending of the charset, simply
-; set it to be empty.
+; By default, PHP will output a media type using the Content-Type header. To
+; disable this, simply set it to be empty.
 ;
-; PHP's built-in default is text/html
+; PHP's built-in default media type is set to text/html.
 ; http://php.net/default-mimetype
 default_mimetype = "text/html"
 
@@ -969,10 +968,6 @@ cli_server.color = On
 ; Default is 0, which does not produce any errors.
 ;intl.error_level = E_WARNING
 
-[sqlite]
-; http://php.net/sqlite.assoc-case
-;sqlite.assoc_case = 0
-
 [sqlite3]
 ;sqlite3.extension_dir =
 

diff --git a/php/fpm-php5.6/php-fpm.conf b/php/fpm-php5.6/php-fpm.conf
index 9fa6d19938e9e10d1fb41b01e9dd6f876b328783..f71047f27565ebb24cea726b7441273ef4f5c697 100644 (file)
--- a/php/fpm-php5.6/php-fpm.conf
+++ b/php/fpm-php5.6/php-fpm.conf
@@ -20,14 +20,14 @@
 
 [global]
 ; Pid file
-; Note: the default prefix is /var/lib
+; Note: the default prefix is /var
 ; Default Value: none
 ;pid = run/php-fpm.pid
 
 ; Error log file
 ; If it's set to "syslog", log is sent to syslogd instead of being written
 ; in a local file.
-; Note: the default prefix is /var/lib
+; Note: the default prefix is /var
 ; Default Value: log/php-fpm.log
 ;error_log = log/php-fpm.log
 

diff --git a/php/fpm-php5.6/php.ini b/php/fpm-php5.6/php.ini
index 28ab2a786f8b8b800c6f974859f53ad9de812e62..4176901ceab8446eb7146ccc0b18d93f343e22b2 100644 (file)
--- a/php/fpm-php5.6/php.ini
+++ b/php/fpm-php5.6/php.ini
@@ -667,11 +667,10 @@ auto_prepend_file =
 ; http://php.net/auto-append-file
 auto_append_file =
 
-; By default, PHP will output a character encoding using
-; the Content-type: header.  To disable sending of the charset, simply
-; set it to be empty.
+; By default, PHP will output a media type using the Content-Type header. To
+; disable this, simply set it to be empty.
 ;
-; PHP's built-in default is text/html
+; PHP's built-in default media type is set to text/html.
 ; http://php.net/default-mimetype
 default_mimetype = "text/html"
 
@@ -969,10 +968,6 @@ cli_server.color = On
 ; Default is 0, which does not produce any errors.
 ;intl.error_level = E_WARNING
 
-[sqlite]
-; http://php.net/sqlite.assoc-case
-;sqlite.assoc_case = 0
-
 [sqlite3]
 ;sqlite3.extension_dir =