hholzgra Thu Mar 28 12:16:46 2002 EDT
Modified files:
/phpdoc/en/appendices commandline.xml migration4.xml
/phpdoc/en/chapters config.xml install.apache.xml
install.configure.php.xml install.windows.xml
security.xml
/phpdoc/en/faq com.xml using.xml
/phpdoc/en/features connection-handling.xml error-handling.xml
file-upload.xml remote-files.xml
/phpdoc/en/functions com.xml filesystem.xml http.xml ibase.xml
info.xml ingres_ii.xml ldap.xml math.xml
mbstring.xml mcrypt.xml ming.xml mssql.xml
pgsql.xml printer.xml session.xml var.xml
/phpdoc/en/language basic-syntax.xml variables.xml
Log:
use &php.ini; entity
Index: phpdoc/en/appendices/commandline.xml
diff -u phpdoc/en/appendices/commandline.xml:1.9
phpdoc/en/appendices/commandline.xml:1.10
--- phpdoc/en/appendices/commandline.xml:1.9 Thu Jan 17 22:32:22 2002
+++ phpdoc/en/appendices/commandline.xml Thu Mar 28 12:16:34 2002
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.9 $ -->
+<!-- $Revision: 1.10 $ -->
<!--
TODO:
@@ -124,7 +124,7 @@
<entry>-c</entry>
<entry>
Using this option, you can specify an alternative
- <filename>php.ini</filename> path, so PHP will
+ &php.ini; path, so PHP will
search your configurations file in this path
instead of the default one.
</entry>
@@ -133,7 +133,7 @@
<entry>-d</entry>
<entry>
With this option, you can set individual
- <filename>php.ini</filename> settings in the
+ &php.ini; settings in the
time of running a script.
</entry>
</row>
Index: phpdoc/en/appendices/migration4.xml
diff -u phpdoc/en/appendices/migration4.xml:1.22
phpdoc/en/appendices/migration4.xml:1.23
--- phpdoc/en/appendices/migration4.xml:1.22 Thu Mar 28 11:40:32 2002
+++ phpdoc/en/appendices/migration4.xml Thu Mar 28 12:16:34 2002
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.22 $ -->
+<!-- $Revision: 1.23 $ -->
<appendix id="migration4">
<title>Migrating from PHP 3 to PHP 4</title>
@@ -56,7 +56,7 @@
<title>Migrating Configuration Files</title>
<para>
The global configuration file, <filename>php3.ini</filename>,
- has changed its name to <filename>php.ini</filename>.
+ has changed its name to &php.ini;.
</para>
<para>
For the Apache configuration file, there are slightly more
@@ -208,7 +208,7 @@
want the error reporting system to report all but the simple
style warnings that are categorized by the symbolic constant
<literal>E_NOTICE</literal>. Then you'll put the following into
- your <filename>php.ini</filename>: <literal>error_reporting =
+ your &php.ini;: <literal>error_reporting =
E_ALL & ~ ( E_NOTICE )</literal>. If you want to suppress
warnings too you add up the appropriate constant within the
braces using the binary or operator '|':
@@ -331,7 +331,7 @@
the Zend engine) at runtime as parsing already happened by
then. So the function <function>short_tags</function> no longer
exists. You can still change the parsers behavior by setting
- appropriate values in the <filename>php.ini</filename> file.
+ appropriate values in the &php.ini; file.
</para>
<para>
Another feature of PHP 3 that is not a part of PHP 4 is the bundled
Index: phpdoc/en/chapters/config.xml
diff -u phpdoc/en/chapters/config.xml:1.40 phpdoc/en/chapters/config.xml:1.41
--- phpdoc/en/chapters/config.xml:1.40 Thu Mar 28 12:06:54 2002
+++ phpdoc/en/chapters/config.xml Thu Mar 28 12:16:34 2002
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.40 $ -->
+<!-- $Revision: 1.41 $ -->
<chapter id="configuration">
<title>Configuration</title>
@@ -8,13 +8,13 @@
<simpara>
The configuration file (called <filename>php3.ini</filename> in
- PHP 3.0, and simply <filename>php.ini</filename> as of PHP 4.0)
+ PHP 3.0, and simply &php.ini; as of PHP 4.0)
is read when PHP starts up. For the server module versions of PHP,
this happens only once when the web server is started. For the
<acronym>CGI</acronym> version, it happens on every invocation.</simpara>
<para>
<example>
- <title>php.ini example</title>
+ <title>&php.ini; example</title>
<programlisting role="ini">
<![CDATA[
; any text on a line after an unquoted semicolon (;) is ignored
Index: phpdoc/en/chapters/install.apache.xml
diff -u phpdoc/en/chapters/install.apache.xml:1.9
phpdoc/en/chapters/install.apache.xml:1.10
--- phpdoc/en/chapters/install.apache.xml:1.9 Thu Mar 28 12:11:10 2002
+++ phpdoc/en/chapters/install.apache.xml Thu Mar 28 12:16:36 2002
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.9 $ -->
+<!-- $Revision: 1.10 $ -->
<sect1 id="install.apache">
<title>Servers-Apache</title>
<para>
@@ -135,7 +135,7 @@
library for Apache, but it will also create a
<filename>pgsql.so</filename> shared library that is loaded into
PHP either by using the extension directive in
- <filename>php.ini</filename> file or by loading it explicitly in
+ &php.ini; file or by loading it explicitly in
a script using the <function>dl</function> function.
</para>
<para>
@@ -173,7 +173,7 @@
Same as before, except instead of including PostgreSQL support
directly into the final <filename>httpd</filename> you will get
a <filename>pgsql.so</filename> shared library that you can load
- into PHP from either the <filename>php.ini</filename> file or
+ into PHP from either the &php.ini; file or
directly using <function>dl</function>.
</para>
<para>
Index: phpdoc/en/chapters/install.configure.php.xml
diff -u phpdoc/en/chapters/install.configure.php.xml:1.1
phpdoc/en/chapters/install.configure.php.xml:1.2
--- phpdoc/en/chapters/install.configure.php.xml:1.1 Fri Jan 11 18:17:16 2002
+++ phpdoc/en/chapters/install.configure.php.xml Thu Mar 28 12:16:36 2002
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
<sect3 id="install.configure.options.php">
<title>PHP options</title>
<variablelist>
@@ -20,7 +20,7 @@
</term>
<listitem>
<para>
- Sets the path in which to look for php.ini, defaults to PREFIX/lib.
+ Sets the path in which to look for &php.ini;, defaults to PREFIX/lib.
</para>
</listitem>
</varlistentry>
Index: phpdoc/en/chapters/install.windows.xml
diff -u phpdoc/en/chapters/install.windows.xml:1.6
phpdoc/en/chapters/install.windows.xml:1.7
--- phpdoc/en/chapters/install.windows.xml:1.6 Wed Mar 13 10:29:14 2002
+++ phpdoc/en/chapters/install.windows.xml Thu Mar 28 12:16:36 2002
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
<sect1 id="install.windows">
<title>Installation on Windows systems</title>
<para>
@@ -51,7 +51,7 @@
<simpara>
The installation wizard gathers enough information to set up the
- <filename>php.ini</filename> file and configure the web server to
+ &php.ini; file and configure the web server to
use PHP. For IIS and also PWS on NT Workstation, a list of all the
nodes on the server with script map settings is displayed, and you
can choose those nodes to which you wish to add the PHP script
@@ -212,7 +212,7 @@
Copy your choosen ini file (see below) to your
'%WINDOWS%' directory on Windows 9x/Me or to your
'%SYSTEMROOT%' directory under Windows NT/2000/XP
- and rename it to <filename>php.ini</filename>. Your
+ and rename it to &php.ini;. Your
'%WINDOWS%' or '%SYSTEMROOT%' directory is
typically:
<simplelist>
@@ -261,7 +261,7 @@
is already built in. Note that on a new installation
it is advisable to first get PHP working and tested
without any extensions before enabling them in
- <filename>php.ini</filename>.
+ &php.ini;.
</simpara>
</listitem>
<listitem>
@@ -546,7 +546,7 @@
The following table describes some of the extensions available. You
can choose which extensions you would like to load when PHP starts
by uncommenting the: 'extension=php_*.dll' lines in
- <filename>php.ini</filename>. You can also load a module dynamically
+ &php.ini;. You can also load a module dynamically
in your script using <function>dl</function>.
</para>
<para>
Index: phpdoc/en/chapters/security.xml
diff -u phpdoc/en/chapters/security.xml:1.46 phpdoc/en/chapters/security.xml:1.47
--- phpdoc/en/chapters/security.xml:1.46 Thu Feb 28 20:07:33 2002
+++ phpdoc/en/chapters/security.xml Thu Mar 28 12:16:36 2002
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.46 $ -->
+<!-- $Revision: 1.47 $ -->
<chapter id="security">
<title>Security</title>
@@ -1185,7 +1185,7 @@
<para>
A few simple techniques can help to hide PHP, possibly slowing
down an attacker who is attempting to discover weaknesses in your
- system. By setting expose_php = off in your php.ini file, you
+ system. By setting expose_php = off in your &php.ini; file, you
reduce the amount of information available to them.
</para>
<para>
Index: phpdoc/en/faq/com.xml
diff -u phpdoc/en/faq/com.xml:1.7 phpdoc/en/faq/com.xml:1.8
--- phpdoc/en/faq/com.xml:1.7 Thu Mar 28 11:06:33 2002
+++ phpdoc/en/faq/com.xml Thu Mar 28 12:16:36 2002
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.7 $ -->
+<!-- $Revision: 1.8 $ -->
<chapter id="faq.com">
<title>PHP and COM</title>
<titleabbrev>PHP and COM</titleabbrev>
@@ -123,7 +123,7 @@
the COM constructor.
</para>
<para>
- Make sure that you have set <literal>com.allow_dcom=true</literal> in your
<literal>php.ini</literal>.
+ Make sure that you have set <literal>com.allow_dcom=true</literal> in your
+&php.ini;.
</para>
</answer>
</qandaentry>
@@ -134,7 +134,7 @@
</question>
<answer>
<para>
- Edit your <literal>php.ini</literal> and set
<literal>com.allow_dcom=true</literal>.
+ Edit your &php.ini; and set <literal>com.allow_dcom=true</literal>.
</para>
</answer>
</qandaentry>
Index: phpdoc/en/faq/using.xml
diff -u phpdoc/en/faq/using.xml:1.15 phpdoc/en/faq/using.xml:1.16
--- phpdoc/en/faq/using.xml:1.15 Thu Mar 28 11:24:13 2002
+++ phpdoc/en/faq/using.xml Thu Mar 28 12:16:36 2002
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.15 $ -->
+<!-- $Revision: 1.16 $ -->
<chapter id="faq.using">
<title>Using PHP</title>
<titleabbrev>Using PHP</titleabbrev>
@@ -20,7 +20,7 @@
<answer>
<para>
Make sure that the <link linkend="ini.track-vars">track_vars</link>
- feature is enabled in your <filename>php.ini</filename>
+ feature is enabled in your &php.ini;
file. Since PHP 4.0.3, this feature is always on. When
<literal>track_vars</literal> is on, it creates some
associative arrays, the most important here is:
@@ -51,7 +51,7 @@
First off, take a look at the <function>addslashes</function>
function. It will do exactly what you want. You should also have
a look at the <link linkend="ini.magic-quotes-gpc">magic_quotes_gpc</link>
- directive in your <filename>php.ini</filename> file.
+ directive in your &php.ini; file.
</para>
</answer>
</qandaentry>
@@ -226,7 +226,7 @@
<para>
You need to turn off the short tags by setting
<link linkend="ini.short-open-tag">short_tags</link> to 0 in your
- <filename>php.ini</filename> file, or by using the appropriate
+ &php.ini; file, or by using the appropriate
Apache directive. You could even use a <File> section to
do this selectively.
</para>
@@ -247,7 +247,7 @@
delimiters. Some of the popular HTML editors handle those more
intelligently (for now). To enable the ASP-style tags, you need
to set the <link linkend="ini.asp-tags">asp_tags</link>
- <filename>php.ini</filename> variable, or use the
+ &php.ini; variable, or use the
appropriate Apache directive.
</para>
</answer>
Index: phpdoc/en/features/connection-handling.xml
diff -u phpdoc/en/features/connection-handling.xml:1.12
phpdoc/en/features/connection-handling.xml:1.13
--- phpdoc/en/features/connection-handling.xml:1.12 Sat Dec 22 12:04:47 2001
+++ phpdoc/en/features/connection-handling.xml Thu Mar 28 12:16:37 2002
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.12 $ -->
+<!-- $Revision: 1.13 $ -->
<chapter id="features.connection-handling">
<title>Connection handling</title>
@@ -31,7 +31,7 @@
scripts run to completion even if there is no remote browser receiving
the output. The default behaviour is however for your script to be
aborted when the remote client disconnects. This behaviour can be
- set via the ignore_user_abort php.ini directive as well as through
+ set via the ignore_user_abort &php.ini; directive as well as through
the corresponding "php_value ignore_user_abort" Apache .conf directive or
with the <function>ignore_user_abort</function> function. If you do
not tell PHP to ignore a user abort and the user aborts, your script
@@ -49,7 +49,7 @@
<simpara>
Your script can also be terminated by the built-in script timer.
The default timeout is 30 seconds. It can be changed using
- the max_execution_time php.ini directive or the corresponding
+ the max_execution_time &php.ini; directive or the corresponding
"php_value max_execution_time" Apache .conf directive as well as with
the <function>set_time_limit</function> function. When the timer
expires the script will be aborted and as with the above client
Index: phpdoc/en/features/error-handling.xml
diff -u phpdoc/en/features/error-handling.xml:1.25
phpdoc/en/features/error-handling.xml:1.26
--- phpdoc/en/features/error-handling.xml:1.25 Mon Mar 25 12:43:45 2002
+++ phpdoc/en/features/error-handling.xml Thu Mar 28 12:16:37 2002
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.25 $ -->
+<!-- $Revision: 1.26 $ -->
<chapter id="features.error-handling">
<title>Error Handling</title>
@@ -106,7 +106,7 @@
<link linkend="language.operators.bitwise">bitwise operators</link>
to combine these values or mask out certain types of errors. Note
that only '|', '~', '!', and '&' will be understood within
- <filename>php.ini</filename>, however, and that no bitwise
+ &php.ini;, however, and that no bitwise
operators will be understood within <filename>php3.ini</filename>.
</para>
<para>
Index: phpdoc/en/features/file-upload.xml
diff -u phpdoc/en/features/file-upload.xml:1.35 phpdoc/en/features/file-upload.xml:1.36
--- phpdoc/en/features/file-upload.xml:1.35 Sun Mar 24 05:19:16 2002
+++ phpdoc/en/features/file-upload.xml Thu Mar 28 12:16:37 2002
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.35 $ -->
+<!-- $Revision: 1.36 $ -->
<chapter id="features.file-upload">
<title>Handling file uploads</title>
@@ -126,7 +126,7 @@
<para>
When <link linkend="ini.register-globals">register_globals</link>
- is turned on in <filename>php.ini</filename> the available variables
+ is turned on in &php.ini; the available variables
are as follows. Note that the following variable names assume the
use of the file upload name 'userfile', as used in the example
script above:
@@ -173,7 +173,7 @@
Files will by default be stored in the server's default temporary
directory, unless another location has been given with the <link
linkend="ini.upload-tmp-dir">upload_tmp_dir</link> directive in
- <filename>php.ini</filename>. The server's default directory can
+ &php.ini;. The server's default directory can
be changed by setting the environment variable
<envar>TMPDIR</envar> in the environment in which PHP runs.
Setting it using <function>putenv</function> from within a PHP
Index: phpdoc/en/features/remote-files.xml
diff -u phpdoc/en/features/remote-files.xml:1.13
phpdoc/en/features/remote-files.xml:1.14
--- phpdoc/en/features/remote-files.xml:1.13 Wed Dec 12 15:46:35 2001
+++ phpdoc/en/features/remote-files.xml Thu Mar 28 12:16:38 2002
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.13 $ -->
+<!-- $Revision: 1.14 $ -->
<chapter id="features.remote-files">
<title>Using remote files</title>
@@ -7,7 +7,7 @@
As long as support for the "URL fopen wrapper" is enabled when
you configure PHP (which it is unless you explicitly pass the
<option>--disable-url-fopen-wrapper</option> flag to configure (for versions
- up to 4.0.3) or set <parameter>allow_url_fopen</parameter> to off in php.ini
+ up to 4.0.3) or set <parameter>allow_url_fopen</parameter> to off in &php.ini;
(for newer versions)),
you can use HTTP and FTP URLs with most functions that take a
filename as a parameter, including the <function>require</function>
Index: phpdoc/en/functions/com.xml
diff -u phpdoc/en/functions/com.xml:1.31 phpdoc/en/functions/com.xml:1.32
--- phpdoc/en/functions/com.xml:1.31 Sat Feb 2 10:35:53 2002
+++ phpdoc/en/functions/com.xml Thu Mar 28 12:16:38 2002
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.31 $ -->
+<!-- $Revision: 1.32 $ -->
<reference id="ref.com">
<title>COM support functions for Windows</title>
<titleabbrev>COM</titleabbrev>
@@ -66,7 +66,7 @@
name of the DCOM server from which the component should be fetched.
If &null;, <literal>localhost</literal> is assumed.
To allow DCOM <constant>com.allow_dcom</constant> has to be set to
- &true; in <filename>php.ini</filename>.
+ &true; in &php.ini;.
</simpara>
</listitem>
</varlistentry>
Index: phpdoc/en/functions/filesystem.xml
diff -u phpdoc/en/functions/filesystem.xml:1.134
phpdoc/en/functions/filesystem.xml:1.135
--- phpdoc/en/functions/filesystem.xml:1.134 Mon Mar 25 19:00:18 2002
+++ phpdoc/en/functions/filesystem.xml Thu Mar 28 12:16:38 2002
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.134 $ -->
+<!-- $Revision: 1.135 $ -->
<reference id="ref.filesystem">
<title>Filesystem functions</title>
<titleabbrev>Filesystem</titleabbrev>
@@ -2224,14 +2224,14 @@
<note>
<para>
This function has nothing to do with the
- <filename>php.ini</filename> file. It is already processed,
+ &php.ini; file. It is already processed,
the time you run your script. This function can be used to
read in your own application's configuration files.
</para>
</note>
<para>
The structure of the ini file is similar to that of
- the <filename>php.ini</filename>'s.
+ the &php.ini;'s.
</para>
<para>
<example>
Index: phpdoc/en/functions/http.xml
diff -u phpdoc/en/functions/http.xml:1.39 phpdoc/en/functions/http.xml:1.40
--- phpdoc/en/functions/http.xml:1.39 Sun Mar 24 19:30:53 2002
+++ phpdoc/en/functions/http.xml Thu Mar 28 12:16:39 2002
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.39 $ -->
+<!-- $Revision: 1.40 $ -->
<reference id="ref.http">
<title>HTTP functions</title>
<titleabbrev>HTTP</titleabbrev>
@@ -183,7 +183,7 @@
in the server until you send it. You can do this by calling
<function>ob_start</function> and <function>ob_end_flush</function>
in your script, or setting the <literal>output_buffering</literal>
- configuration directive on in your <filename>php.ini</filename> or
+ configuration directive on in your &php.ini; or
server configuration files.
</para>
</note>
Index: phpdoc/en/functions/ibase.xml
diff -u phpdoc/en/functions/ibase.xml:1.45 phpdoc/en/functions/ibase.xml:1.46
--- phpdoc/en/functions/ibase.xml:1.45 Sat Feb 2 10:35:59 2002
+++ phpdoc/en/functions/ibase.xml Thu Mar 28 12:16:39 2002
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.45 $ -->
+<!-- $Revision: 1.46 $ -->
<reference id="ref.ibase">
<title>InterBase functions</title>
<titleabbrev>InterBase</titleabbrev>
@@ -18,7 +18,7 @@
<para>
This database uses a single quote (') character for escaping, a
behavior similar to the Sybase database, add to your
- <filename>php.ini</filename> the following directive:
+ &php.ini; the following directive:
<informalexample>
<programlisting>
<![CDATA[
Index: phpdoc/en/functions/info.xml
diff -u phpdoc/en/functions/info.xml:1.92 phpdoc/en/functions/info.xml:1.93
--- phpdoc/en/functions/info.xml:1.92 Mon Mar 11 22:11:54 2002
+++ phpdoc/en/functions/info.xml Thu Mar 28 12:16:40 2002
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.92 $ -->
+<!-- $Revision: 1.93 $ -->
<reference id="ref.info">
<title>PHP Options&Information</title>
<titleabbrev>PHP Options/Info</titleabbrev>
@@ -1280,7 +1280,7 @@
<entry>PHP_INI_SYSTEM</entry>
<entry>4</entry>
<entry>
- Entry can be set in <filename>php.ini</filename> or
+ Entry can be set in &php.ini; or
<filename>httpd.conf</filename>
</entry>
</row>
@@ -1482,7 +1482,7 @@
<entry>INFO_GENERAL</entry>
<entry>1</entry>
<entry>
- The configuration line, php.ini location, build date, Web
+ The configuration line, &php.ini; location, build date, Web
Server, System and more.
</entry>
</row>
Index: phpdoc/en/functions/ingres_ii.xml
diff -u phpdoc/en/functions/ingres_ii.xml:1.16 phpdoc/en/functions/ingres_ii.xml:1.17
--- phpdoc/en/functions/ingres_ii.xml:1.16 Sat Feb 2 10:36:01 2002
+++ phpdoc/en/functions/ingres_ii.xml Thu Mar 28 12:16:40 2002
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.16 $ -->
+<!-- $Revision: 1.17 $ -->
<reference id="ref.ingres">
<title>Ingres II functions</title>
<titleabbrev>Ingres II</titleabbrev>
@@ -68,7 +68,7 @@
</para>
<para>
If some parameters are missing, <function>ingres_connect</function>
- uses the values in <filename>php.ini</filename> for
+ uses the values in &php.ini; for
<parameter>ingres.default_database</parameter>,
<parameter>ingres.default_user</parameter>, and
<parameter>ingres.default_password</parameter>.
Index: phpdoc/en/functions/ldap.xml
diff -u phpdoc/en/functions/ldap.xml:1.43 phpdoc/en/functions/ldap.xml:1.44
--- phpdoc/en/functions/ldap.xml:1.43 Mon Mar 25 16:52:50 2002
+++ phpdoc/en/functions/ldap.xml Thu Mar 28 12:16:40 2002
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.43 $ -->
+<!-- $Revision: 1.44 $ -->
<reference id="ref.ldap">
<title>LDAP functions</title>
<titleabbrev>LDAP</titleabbrev>
@@ -575,7 +575,7 @@
can be converted into a textual error message using
<function>ldap_err2str</function>.</para>
<para>
- Unless you lower your warning level in your php.ini sufficiently
+ Unless you lower your warning level in your &php.ini; sufficiently
or prefix your LDAP commands with @ (at) characters to suppress
warning output, the errors generated will also show up in your
HTML output.
@@ -632,7 +632,7 @@
message text, but always use an error number to check.</para>
<para>
Unless you lower your warning level in your
- <filename>php.ini</filename> sufficiently or prefix your LDAP
+ &php.ini; sufficiently or prefix your LDAP
commands with <literal>@</literal> (at) characters to suppress
warning output, the errors generated will also show up in your
HTML output.</para>
Index: phpdoc/en/functions/math.xml
diff -u phpdoc/en/functions/math.xml:1.77 phpdoc/en/functions/math.xml:1.78
--- phpdoc/en/functions/math.xml:1.77 Thu Mar 14 07:38:05 2002
+++ phpdoc/en/functions/math.xml Thu Mar 28 12:16:41 2002
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.77 $ -->
+<!-- $Revision: 1.78 $ -->
<reference id="ref.math">
<title>Mathematical Functions</title>
<titleabbrev>Math</titleabbrev>
@@ -1159,7 +1159,7 @@
Returns an approximation of pi. The returned <type>float</type>
has a precision based on the
<link linkend="ini.precision">precision</link> directive in
- <filename>php.ini</filename>, which defaults to <literal>14</literal>.
+ &php.ini;, which defaults to <literal>14</literal>.
Also, you can use the <constant>M_PI</constant> constant which yields
identical results to <function>pi</function>.
</simpara>
Index: phpdoc/en/functions/mbstring.xml
diff -u phpdoc/en/functions/mbstring.xml:1.25 phpdoc/en/functions/mbstring.xml:1.26
--- phpdoc/en/functions/mbstring.xml:1.25 Sat Mar 16 07:44:06 2002
+++ phpdoc/en/functions/mbstring.xml Thu Mar 28 12:16:41 2002
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.25 $ -->
+<!-- $Revision: 1.26 $ -->
<reference id="ref.mbstring">
<title>Multi-Byte String Functions</title>
<titleabbrev>Multi-Byte String</titleabbrev>
@@ -152,10 +152,10 @@
</simpara>
<para> There is no way to control HTTP input character
conversion from PHP script. To disable HTTP input character
- conversion, it has to be done in <literal>php.ini</literal>.
+ conversion, it has to be done in &php.ini;.
<example>
<title>
- Disable HTTP input conversion in php.ini
+ Disable HTTP input conversion in &php.ini;
</title>
<programlisting role="php">
<![CDATA[
@@ -180,7 +180,7 @@
</simpara>
<para>
There are several ways to enable output character encoding
- conversion. One is using <literal>php.ini</literal>, another
+ conversion. One is using &php.ini;, another
is using <function>ob_start</function> with
<function>mb_output_handler</function> as
<literal>ob_start</literal> callback function.
@@ -197,7 +197,7 @@
</para>
<para>
<example>
- <title><literal>php.ini</literal> setting example</title>
+ <title>&php.ini; setting example</title>
<programlisting>
<![CDATA[
;; Enable output character encoding conversion for all PHP pages
@@ -270,7 +270,7 @@
<literal>UTF7-IMAP</literal>.
</para>
<para>
- <literal>php.ini</literal> entry, which accepts encoding name,
+ &php.ini; entry, which accepts encoding name,
accepts "<literal>auto</literal>" and
"<literal>pass</literal>" also.
<literal>mbstring</literal> functions, which accepts encoding
@@ -296,7 +296,7 @@
</sect2>
<sect2 id="mb-ini">
- <title>php.ini settings</title>
+ <title>&php.ini; settings</title>
<para>
<itemizedlist>
<listitem>
@@ -353,7 +353,7 @@
</para>
<para>
<example>
- <title><literal>php.ini</literal> setting example</title>
+ <title>&php.ini; setting example</title>
<programlisting>
<![CDATA[
;; Set default internal encoding
@@ -386,7 +386,7 @@
</para>
<para>
<example>
- <title><literal>php.ini</literal> setting for <literal>EUC-JP</literal>
users</title>
+ <title>&php.ini; setting for <literal>EUC-JP</literal> users</title>
<programlisting>
<![CDATA[
;; Disable Output Buffering
@@ -412,7 +412,7 @@
</para>
<para>
<example>
- <title><literal>php.ini</literal> setting for <literal>SJIS</literal>
users</title>
+ <title>&php.ini; setting for <literal>SJIS</literal> users</title>
<programlisting>
<![CDATA[
;; Enable Output Buffering
@@ -469,7 +469,7 @@
supporting only single-byte encoding for multibyte application.
</para>
<para>
- <literal>mbstring.func_overload</literal> in php.ini should be
+ <literal>mbstring.func_overload</literal> in &php.ini; should be
set some positive value to use function overloading.
The value should specify the category of overloading functions,
sbould be set 1 to enable mail function overloading. 2 to enable
Index: phpdoc/en/functions/mcrypt.xml
diff -u phpdoc/en/functions/mcrypt.xml:1.29 phpdoc/en/functions/mcrypt.xml:1.30
--- phpdoc/en/functions/mcrypt.xml:1.29 Mon Mar 11 02:30:20 2002
+++ phpdoc/en/functions/mcrypt.xml Thu Mar 28 12:16:42 2002
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.29 $ -->
+<!-- $Revision: 1.30 $ -->
<reference id="ref.mcrypt">
<title>Mcrypt Encryption Functions</title>
<titleabbrev>mcrypt</titleabbrev>
@@ -640,7 +640,7 @@
<function>mcrypt_list_algorithms</function> takes as optional
parameter a directory which specifies the directory where all
algorithms are located. If not specifies, the value of the
- mcrypt.algorithms_dir php.ini directive is used.
+ mcrypt.algorithms_dir &php.ini; directive is used.
</para>
<para>
<example>
@@ -687,7 +687,7 @@
<function>mcrypt_list_modes</function> takes as optional
parameter a directory which specifies the directory where all
modes are located. If not specifies, the value of the
- mcrypt.modes_dir php.ini directive is used.
+ mcrypt.modes_dir &php.ini; directive is used.
</para>
<para>
<example>
Index: phpdoc/en/functions/ming.xml
diff -u phpdoc/en/functions/ming.xml:1.34 phpdoc/en/functions/ming.xml:1.35
--- phpdoc/en/functions/ming.xml:1.34 Sat Feb 2 10:36:03 2002
+++ phpdoc/en/functions/ming.xml Thu Mar 28 12:16:42 2002
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.34 $ -->
+<!-- $Revision: 1.35 $ -->
<reference id="ref.ming">
<title>Ming functions for Flash</title>
<titleabbrev>Ming (flash)</titleabbrev>
@@ -83,7 +83,7 @@
(you can find your php module directory by running
<command>php-config --extension-dir</command>).
Now either just add <literal>extension=php_ming.so</literal>
- to your <filename>php.ini</filename> file, or put
+ to your &php.ini; file, or put
<literal>dl('php_ming.so');</literal> at the head of all of your
Ming scripts.
</para>
Index: phpdoc/en/functions/mssql.xml
diff -u phpdoc/en/functions/mssql.xml:1.29 phpdoc/en/functions/mssql.xml:1.30
--- phpdoc/en/functions/mssql.xml:1.29 Thu Mar 21 04:45:09 2002
+++ phpdoc/en/functions/mssql.xml Thu Mar 28 12:16:42 2002
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.29 $ -->
+<!-- $Revision: 1.30 $ -->
<reference id="ref.mssql">
<title>Microsoft SQL Server functions</title>
<titleabbrev>MS SQL Server</titleabbrev>
@@ -19,7 +19,7 @@
will require installation of all the tools.
</simpara>
<simpara>
- The MSSQL extension is enabled by adding extension=php_mssql.dll to php.ini.
+ The MSSQL extension is enabled by adding extension=php_mssql.dll to &php.ini;.
</simpara>
</partintro>
Index: phpdoc/en/functions/pgsql.xml
diff -u phpdoc/en/functions/pgsql.xml:1.71 phpdoc/en/functions/pgsql.xml:1.72
--- phpdoc/en/functions/pgsql.xml:1.71 Sat Mar 23 10:46:46 2002
+++ phpdoc/en/functions/pgsql.xml Thu Mar 28 12:16:43 2002
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.71 $ -->
+<!-- $Revision: 1.72 $ -->
<reference id="ref.pgsql">
<title>PostgreSQL functions</title>
<titleabbrev>PostgreSQL</titleabbrev>
@@ -80,7 +80,7 @@
"--with-pgsql[=DIR]" is required when you compile
PHP. If shared object module is available, PostgreSQL module may
be loaded using <link linkend="ini.extension">extension</link>
- directive in <filename>php.ini</filename> or <function>dl</function>
+ directive in &php.ini; or <function>dl</function>
function. Supported ini directives are described in
<filename>php.ini-dist</filename> file which comes with source distribution.
</para>
@@ -1482,13 +1482,13 @@
<para>
To enable persistent connection, <link
linkend="ini.pgsql.allow-persistent">pgsql.allow_persistent</link>
- <filename>php.ini</filename> directive must be set to "On". (Default
is On)
+ &php.ini; directive must be set to "On". (Default is On)
Max number of persistent connection can be defined by <link
linkend="ini.pgsql.max-persistent">pgsql.max_persistent</link>
- <filename>php.ini</filename> directive. (Default is -1 which is no limit) Total
number
+ &php.ini; directive. (Default is -1 which is no limit) Total number
of connection can be set by <link
linkend="ini.pgsql.max-links">pgsql.max_links</link>
- <filename>php.ini</filename> directive.
+ &php.ini; directive.
</para>
<para>
<function>pg_close</function> will not close persistent links
Index: phpdoc/en/functions/printer.xml
diff -u phpdoc/en/functions/printer.xml:1.14 phpdoc/en/functions/printer.xml:1.15
--- phpdoc/en/functions/printer.xml:1.14 Sat Feb 2 10:36:07 2002
+++ phpdoc/en/functions/printer.xml Thu Mar 28 12:16:44 2002
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.14 $ -->
+<!-- $Revision: 1.15 $ -->
<reference id="ref.printer">
<title>Printer functions</title>
<titleabbrev>Printer</titleabbrev>
@@ -30,7 +30,7 @@
<para>
If no parameter was given it tries to open a
connection to the default printer (if not specified in
- <filename>php.ini</filename> as
+ &php.ini; as
<literal>printer.default_printer</literal>, php tries to detect it).
</para>
<para>
Index: phpdoc/en/functions/session.xml
diff -u phpdoc/en/functions/session.xml:1.85 phpdoc/en/functions/session.xml:1.86
--- phpdoc/en/functions/session.xml:1.85 Thu Mar 28 10:45:25 2002
+++ phpdoc/en/functions/session.xml Thu Mar 28 12:16:44 2002
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.85 $ -->
+<!-- $Revision: 1.86 $ -->
<reference id="ref.session">
<title>Session handling functions</title>
<titleabbrev>Sessions</titleabbrev>
@@ -282,7 +282,7 @@
</para>
<para>
The session management system supports a number of configuration
- options which you can place in your php.ini file. We will give a
+ options which you can place in your &php.ini; file. We will give a
short overview.
<itemizedlist>
<listitem>
@@ -938,7 +938,7 @@
<methodparam
choice="opt"><type>bool</type><parameter>secure</parameter></methodparam>
</methodsynopsis>
<para>
- Set cookie parameters defined in the php.ini file. The effect of this
+ Set cookie parameters defined in the &php.ini; file. The effect of this
function only lasts for the duration of the script.
</para>
<note>
@@ -1013,7 +1013,7 @@
<para>
You must set the configuration option
<parameter>session.save_handler</parameter> to
- <parameter>user</parameter> in your php.ini file for
+ <parameter>user</parameter> in your &php.ini; file for
<function>session_set_save_handler</function> to take effect.
</para>
</note>
Index: phpdoc/en/functions/var.xml
diff -u phpdoc/en/functions/var.xml:1.99 phpdoc/en/functions/var.xml:1.100
--- phpdoc/en/functions/var.xml:1.99 Wed Mar 27 08:31:15 2002
+++ phpdoc/en/functions/var.xml Thu Mar 28 12:16:45 2002
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.99 $ -->
+<!-- $Revision: 1.100 $ -->
<reference id="ref.variables">
<title>Variable Functions</title>
<titleabbrev>Variables</titleabbrev>
@@ -1136,7 +1136,7 @@
It's possible to set a callback-function which will be called,
if an undefined class should be instanciated during unserializing.
(to prevent getting an incomplete <type>object</type> "__PHP_Incomplete_Class".)
- Use your php.ini, <function>ini_set</function> or .htaccess-file
+ Use your &php.ini;, <function>ini_set</function> or .htaccess-file
to define 'unserialize_callback_func'.
Everytime an undefined class should be instanciated, it'll be called.
To disable this feature just empty this global variable.
Index: phpdoc/en/language/basic-syntax.xml
diff -u phpdoc/en/language/basic-syntax.xml:1.26
phpdoc/en/language/basic-syntax.xml:1.27
--- phpdoc/en/language/basic-syntax.xml:1.26 Fri Jan 18 14:49:35 2002
+++ phpdoc/en/language/basic-syntax.xml Thu Mar 28 12:16:45 2002
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.26 $ -->
+<!-- $Revision: 1.27 $ -->
<chapter id="language.basic-syntax">
<title>Basic syntax</title>
@@ -65,7 +65,7 @@
PHP code. Of these, only two (<?php. . .?> and <script
language="php">. . .</script>) are always available; the
others can be turned on or off from the
- <filename>php.ini</filename> configuration file. While the
+ &php.ini; configuration file. While the
short-form tags and ASP-style tags may be convenient, they are not
as portable as the longer versions. Also, if you intend to embed
PHP code in XML or XHTML, you will need to use the
Index: phpdoc/en/language/variables.xml
diff -u phpdoc/en/language/variables.xml:1.41 phpdoc/en/language/variables.xml:1.42
--- phpdoc/en/language/variables.xml:1.41 Mon Mar 25 15:39:24 2002
+++ phpdoc/en/language/variables.xml Thu Mar 28 12:16:45 2002
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.41 $ -->
+<!-- $Revision: 1.42 $ -->
<chapter id="language.variables">
<title>Variables</title>
@@ -134,7 +134,7 @@
<simpara>
You can still force the old behaviour by setting <link
linkend="ini.register-globals">register_globals</link> to 'On' in
- your <filename>php.ini</filename> file.
+ your &php.ini; file.
</simpara>
<simpara>
For more information and background on this change, please see
