nlopess Tue Apr 19 14:48:14 2005 EDT
Modified files:
/phpdoc/en/appendices ini.xml
/phpdoc/en/reference/mime_magic ini.xml
Log:
update main ini table
http://cvs.php.net/diff.php/phpdoc/en/appendices/ini.xml?r1=1.18&r2=1.19&ty=u
Index: phpdoc/en/appendices/ini.xml
diff -u phpdoc/en/appendices/ini.xml:1.18 phpdoc/en/appendices/ini.xml:1.19
--- phpdoc/en/appendices/ini.xml:1.18 Thu Mar 31 12:49:30 2005
+++ phpdoc/en/appendices/ini.xml Tue Apr 19 14:48:07 2005
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.18 $ -->
+<!-- $Revision: 1.19 $ -->
<appendix id="ini">
<title>&php.ini; directives</title>
@@ -126,7 +126,7 @@
<entry></entry>
</row>
<row>
- <entry>apd.statement_tracing</entry>
+ <entry><link
linkend="ini.apd.statement-tracing">apd.statement_tracing</link></entry>
<entry>"0"</entry>
<entry>PHP_INI_ALL</entry>
<entry></entry>
@@ -696,6 +696,12 @@
<entry></entry>
</row>
<row>
+ <entry>ibm_db2.binmode</entry>
+ <entry>"0"</entry>
+ <entry>PHP_INI_ALL</entry>
+ <entry></entry>
+ </row>
+ <row>
<entry>iconv.input_encoding</entry>
<entry>"ISO-8859-1"</entry>
<entry>PHP_INI_ALL</entry>
@@ -1044,13 +1050,13 @@
<entry></entry>
</row>
<row>
- <entry>mime_magic.debug</entry>
+ <entry><link
linkend="ini.mime-magic.debug">mime_magic.debug</link></entry>
<entry>"0"</entry>
<entry>PHP_INI_SYSTEM</entry>
<entry>Available since PHP 5.0.0.</entry>
</row>
<row>
- <entry>mime_magic.magicfile</entry>
+ <entry><link
linkend="ini.mime-magic.magicfile">mime_magic.magicfile</link></entry>
<entry>"/path/to/php/magic.mime"</entry>
<entry>PHP_INI_SYSTEM</entry>
<entry>Available since PHP 4.3.0.</entry>
@@ -1362,12 +1368,6 @@
<entry>Available since PHP 4.0.4.</entry>
</row>
<row>
- <entry>pdo.global_value</entry>
- <entry>"42"</entry>
- <entry>PHP_INI_ALL</entry>
- <entry></entry>
- </row>
- <row>
<entry>pfpro.defaulthost</entry>
<entry>"test-payflow.verisign.com"</entry>
<entry>PHP_INI_ALL</entry>
http://cvs.php.net/diff.php/phpdoc/en/reference/mime_magic/ini.xml?r1=1.4&r2=1.5&ty=u
Index: phpdoc/en/reference/mime_magic/ini.xml
diff -u phpdoc/en/reference/mime_magic/ini.xml:1.4
phpdoc/en/reference/mime_magic/ini.xml:1.5
--- phpdoc/en/reference/mime_magic/ini.xml:1.4 Tue Feb 22 12:36:08 2005
+++ phpdoc/en/reference/mime_magic/ini.xml Tue Apr 19 14:48:13 2005
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
<section id="mime-magic.configuration">
&reftitle.runtime;
&extension.runtime;
@@ -17,6 +17,12 @@
</thead>
<tbody>
<row>
+ <entry>mime_magic.debug</entry>
+ <entry>"0"</entry>
+ <entry>PHP_INI_SYSTEM</entry>
+ <entry>Available since PHP 5.0.0.</entry>
+ </row>
+ <row>
<entry>mime_magic.magicfile</entry>
<entry>"/path/to/php/magic.mime"</entry>
<entry>PHP_INI_SYSTEM</entry>
@@ -27,6 +33,35 @@
</table>
&ini.php.constants;
</para>
+
+ &ini.descriptions.title;
+
+ <para>
+ <variablelist>
+ <varlistentry id="ini.mime-magic.debug">
+ <term>
+ <parameter>mime_magic.debug</parameter>
+ <type>bool</type>
+ </term>
+ <listitem>
+ <para>
+ Enable/disable debugging.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry id="ini.mime-magic.magicfile">
+ <term>
+ <parameter>mime_magic.magicfile</parameter>
+ <type>string</type>
+ </term>
+ <listitem>
+ <para>
+ The path to the magic.mime file.
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </para>
</section>
<!-- Keep this comment at the end of the file
