nlopess Tue Jul 4 11:03:22 2006 UTC
Modified files:
/phpdoc/en/install ini.xml
Log:
exchange the PHPRC var and the registry key order for php 5.2
http://cvs.php.net/viewvc.cgi/phpdoc/en/install/ini.xml?r1=1.13&r2=1.14&diff_format=u
Index: phpdoc/en/install/ini.xml
diff -u phpdoc/en/install/ini.xml:1.13 phpdoc/en/install/ini.xml:1.14
--- phpdoc/en/install/ini.xml:1.13 Thu May 11 09:38:23 2006
+++ phpdoc/en/install/ini.xml Tue Jul 4 11:03:22 2006
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.13 $ -->
+<!-- $Revision: 1.14 $ -->
<chapter id="configuration">
<title>Runtime Configuration</title>
@@ -27,13 +27,14 @@
</listitem>
<listitem>
<para>
- <literal>HKEY_LOCAL_MACHINE\SOFTWARE\PHP\IniFilePath</literal>
- (Windows Registry location)
+ The <varname>PHPRC</varname> environment variable. Before PHP 5.2.0
+ this was checked after the registry key mentioned below.
</para>
</listitem>
<listitem>
<para>
- The <varname>PHPRC</varname> environment variable
+ <literal>HKEY_LOCAL_MACHINE\SOFTWARE\PHP\IniFilePath</literal>
+ (Windows Registry location)
</para>
</listitem>
<listitem>
