From 0270ba78cda70c31c4a1f02bb807b9f9a9a218ea Mon Sep 17 00:00:00 2001
From: Justin Martin <frozenfire@php.net>
Date: Sat, 9 Jun 2012 23:29:04 +0000
Subject: [PATCH] Added &user-ini; entity for referring to .user.ini file.
 Added .user.ini to list of where configurations can be set. Closes bug
 #62282.

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@326074 c90b9560-bf6c-de11-be94-00142212c4b1
---
 install/ini.xml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/install/ini.xml b/install/ini.xml
index e4c7887b74..dd7c3b5f58 100644
--- a/install/ini.xml
+++ b/install/ini.xml
@@ -206,12 +206,16 @@ include_path = ".;c:\php\lib"
        <entry><literal>PHP_INI_USER</literal></entry>
        <entry>
         Entry can be set in user scripts (like with <function>ini_set</function>)
-        or in the <link linkend="configuration.changes.windows">Windows registry</link>
+        or in the <link linkend="configuration.changes.windows">Windows registry</link>.
+        Since PHP 5.3, entry can be set in &user-ini;
        </entry>
       </row>
       <row>
        <entry><literal>PHP_INI_PERDIR</literal></entry>
-       <entry>Entry can be set in &php.ini;, &htaccess; or &httpd.conf;</entry>
+       <entry>
+        Entry can be set in &php.ini;, &htaccess;, &httpd.conf; or &user-ini;
+        (since PHP 5.3)
+       </entry>
       </row>
       <row>
        <entry><literal>PHP_INI_SYSTEM</literal></entry>