install/ini.xml
15841d188475e59c105f57c9022873f2cd7467b5
...
...
@@ -1,6 +1,6 @@
1
1
<?xml version="1.0" encoding="utf-8"?>
2
2
<!-- $Revision$ -->
3
-
<chapter xml:id="configuration" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
3
+
<chapter xml:id="configuration" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
4
4
<title>Runtime Configuration</title>
5
5

6
6
<sect1 xml:id="configuration.file">
...
...
@@ -215,8 +215,8 @@ $ PHP_INI_SCAN_DIR=/usr/local/etc/php.d: php
215
215
</simpara>
216
216
<simpara>
217
217
Only INI settings with the
218
-
modes <constant>PHP_INI_PERDIR</constant> and
219
-
<constant>PHP_INI_USER</constant> will be recognized in .user.ini-style INI
218
+
modes <constant>INI_PERDIR</constant> and
219
+
<constant>INI_USER</constant> will be recognized in .user.ini-style INI
220
220
files.
221
221
</simpara>
222
222

...
...
@@ -253,48 +253,16 @@ $ PHP_INI_SCAN_DIR=/usr/local/etc/php.d: php
253
253
<para>
254
254
For example, the
255
255
<link linkend="ini.output-buffering">output_buffering</link> setting
256
-
is <literal>PHP_INI_PERDIR</literal> therefore it may not be set using
256
+
is <constant>INI_PERDIR</constant> therefore it may not be set using
257
257
<function>ini_set</function>. However, the
258
258
<link linkend="ini.display-errors">display_errors</link> directive is
259
-
<literal>PHP_INI_ALL</literal> therefore it may be set anywhere,
259
+
<constant>INI_ALL</constant> therefore it may be set anywhere,
260
260
including with <function>ini_set</function>.
261
261
</para>
262
262

263
263
<para>
264
264
<table>
265
-
<title>Definition of PHP_INI_* modes</title>
266
-
<tgroup cols="2">
267
-
<thead>
268
-
<row>
269
-
<entry>Mode</entry>
270
-
<entry>Meaning</entry>
271
-
</row>
272
-
</thead>
273
-
<tbody>
274
-
<row>
275
-
<entry><literal>PHP_INI_USER</literal></entry>
276
-
<entry>
277
-
Entry can be set in user scripts (like with <function>ini_set</function>)
278
-
or in the <link linkend="configuration.changes.windows">Windows registry</link>.
279
-
Entry can be set in &user-ini;
280
-
</entry>
281
-
</row>
282
-
<row>
283
-
<entry><literal>PHP_INI_PERDIR</literal></entry>
284
-
<entry>
285
-
Entry can be set in &php.ini;, &htaccess;, &httpd.conf; or &user-ini;
286
-
</entry>
287
-
</row>
288
-
<row>
289
-
<entry><literal>PHP_INI_SYSTEM</literal></entry>
290
-
<entry>Entry can be set in &php.ini; or &httpd.conf;</entry>
291
-
</row>
292
-
<row>
293
-
<entry><literal>PHP_INI_ALL</literal></entry>
294
-
<entry>Entry can be set anywhere</entry>
295
-
</row>
296
-
</tbody>
297
-
</tgroup>
265
+
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('constant.ini-mode')/*)"><xi:fallback/></xi:include>
298
266
</table>
299
267
</para>
300
268
</sect1>
...
...
@@ -315,8 +283,8 @@ $ PHP_INI_SCAN_DIR=/usr/local/etc/php.d: php
315
283
There are several Apache directives that allow you
316
284
to change the PHP configuration from within the Apache configuration
317
285
files. For a listing of which directives are
318
-
<constant>PHP_INI_ALL</constant>, <constant>PHP_INI_PERDIR</constant>,
319
-
or <constant>PHP_INI_SYSTEM</constant>, have a look at the
286
+
<constant>INI_ALL</constant>, <constant>INI_PERDIR</constant>,
287
+
or <constant>INI_SYSTEM</constant>, have a look at the
320
288
<link linkend="ini.list">List of php.ini directives</link> appendix.
321
289
</para>
322
290

...
...
@@ -331,7 +299,7 @@ $ PHP_INI_SCAN_DIR=/usr/local/etc/php.d: php
331
299
<listitem>
332
300
<para>
333
301
Sets the value of the specified directive.
334
-
Can be used only with <constant>PHP_INI_ALL</constant> and <constant>PHP_INI_PERDIR</constant> type directives.
302
+
Can be used only with <constant>INI_ALL</constant> and <constant>INI_PERDIR</constant> type directives.
335
303
To clear a previously set value use <literal>none</literal> as the value.
336
304
</para>
337
305
<note>
...
...
@@ -351,8 +319,8 @@ $ PHP_INI_SCAN_DIR=/usr/local/etc/php.d: php
351
319
<listitem>
352
320
<para>
353
321
Used to set a boolean configuration directive.
354
-
Can be used only with <constant>PHP_INI_ALL</constant> and
355
-
<constant>PHP_INI_PERDIR</constant> type directives.
322
+
Can be used only with <constant>INI_ALL</constant> and
323
+
<constant>INI_PERDIR</constant> type directives.
356
324
</para>
357
325
</listitem>
358
326
</varlistentry>
...
...
@@ -435,8 +403,8 @@ $ PHP_INI_SCAN_DIR=/usr/local/etc/php.d: php
435
403
should have the name of the PHP configuration directive and the
436
404
string value. PHP constants in the values are not parsed.
437
405
However, only configuration values changeable in
438
-
<constant>PHP_INI_USER</constant> can be set
439
-
this way, <constant>PHP_INI_PERDIR</constant> values can not,
406
+
<constant>INI_USER</constant> can be set
407
+
this way, <constant>INI_PERDIR</constant> values can not,
440
408
because these configuration values are re-read for each request.
441
409
</simpara>
442
410
</sect2>
443
411