cvs: phpdoc /en/appendices migration4.xml phpdevel.xml wrappers.xml /en/chapters config.xml install.apache2.xml install.configure.servers.xml
security.xml /en/faq build.xml /en/features safe-mode.xml /en/functions info.xml mbstring.xml misc.xml var.xml /en/reference/dba configure.xml
/en/reference/errorfunc constants.xml /en/reference/filesystem/functions fopen.xml /en/reference/mbstring reference.xml
/en/reference/misc/functions highlight-file.xml /en/reference/yaz configure.xml
| From: | Friedhelm Betz | Date: | Wed, 21 May 2003 10:34:23 +0000 |
| Subject: | cvs: phpdoc /en/appendices migration4.xml phpdevel.xml wrappers.xml /en/chapters config.xml install.apache2.xml install.configure.servers.xml security.xml /en/faq build.xml /en/features safe-mode.xml /en/functions info.xml mbstring.xml misc.xml var.xml /en/reference/dba configure.xml /en/reference/errorfunc constants.xml /en/reference/filesystem/functions fopen.xml /en/reference/mbstring reference.xml /en/reference/misc/functions highlight-file.xml /en/reference/yaz configure.xml |
||
| Groups: | php.doc | ||
| Request: | Send a blank email to phpdoc+get-969353709@lists.php.net to get a copy of this message | ||
betz Wed May 21 06:34:23 2003 EDT
Modified files:
/phpdoc/en/appendices migration4.xml phpdevel.xml wrappers.xml
/phpdoc/en/chapters config.xml install.apache2.xml
install.configure.servers.xml security.xml
/phpdoc/en/faq build.xml
/phpdoc/en/features safe-mode.xml
/phpdoc/en/functions info.xml mbstring.xml misc.xml var.xml
/phpdoc/en/reference/dba configure.xml
/phpdoc/en/reference/errorfunc constants.xml
/phpdoc/en/reference/filesystem/functions fopen.xml
/phpdoc/en/reference/mbstring reference.xml
/phpdoc/en/reference/misc/functions highlight-file.xml
/phpdoc/en/reference/yaz configure.xml
Log:
use of entities for php.ini, .htaccess and httpd.conf
Index: phpdoc/en/appendices/migration4.xml diff -u phpdoc/en/appendices/migration4.xml:1.33 phpdoc/en/appendices/migration4.xml:1.34 --- phpdoc/en/appendices/migration4.xml:1.33 Sun Apr 20 19:51:02 2003 +++ phpdoc/en/appendices/migration4.xml Wed May 21 06:34:21 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.33 $ --> +<!-- $Revision: 1.34 $ --> <appendix id="migration4"> <title>Migrating from PHP 3 to PHP 4</title> @@ -111,7 +111,7 @@ <listitem> <simpara> Admin values (or flags) can only appear in the server-wide Apache configuration - files (e.g., httpd.conf). + files (e.g., &httpd.conf;). </simpara> </listitem> <listitem> Index: phpdoc/en/appendices/phpdevel.xml diff -u phpdoc/en/appendices/phpdevel.xml:1.23 phpdoc/en/appendices/phpdevel.xml:1.24 --- phpdoc/en/appendices/phpdevel.xml:1.23 Thu May 1 11:37:26 2003 +++ phpdoc/en/appendices/phpdevel.xml Wed May 21 06:34:21 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.23 $ --> +<!-- $Revision: 1.24 $ --> <appendix id="phpdevel"> <title>Extending PHP 3</title> @@ -684,7 +684,7 @@ to the php3_commands structure in mod_php3.c. Note the restrictions part. RSRC_CONF are directives that can only be present in the actual Apache .conf files. Any OR_OPTIONS - directives can be present anywhere, include normal .htaccess + directives can be present anywhere, include normal &htaccess; files.</simpara></listitem> <listitem><simpara>In either php3take1handler() or Index: phpdoc/en/appendices/wrappers.xml diff -u phpdoc/en/appendices/wrappers.xml:1.17 phpdoc/en/appendices/wrappers.xml:1.18 --- phpdoc/en/appendices/wrappers.xml:1.17 Wed May 14 18:04:50 2003 +++ phpdoc/en/appendices/wrappers.xml Wed May 21 06:34:22 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.17 $ --> +<!-- $Revision: 1.18 $ --> <appendix id="wrappers"> <title>List of Supported Protocols/Wrappers</title> <para> @@ -126,7 +126,7 @@ in the <literal>header</literal> context option above. </entry> <entry> - <literal>php.ini</literal> setting: <literal>user_agent</literal> + &php.ini; setting: <literal>user_agent</literal> </entry> </row> <row> Index: phpdoc/en/chapters/config.xml diff -u phpdoc/en/chapters/config.xml:1.102 phpdoc/en/chapters/config.xml:1.103 --- phpdoc/en/chapters/config.xml:1.102 Sun May 18 22:32:15 2003 +++ phpdoc/en/chapters/config.xml Wed May 21 06:34:22 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.102 $ --> +<!-- $Revision: 1.103 $ --> <chapter id="configuration"> <title>Configuration</title> @@ -27,7 +27,7 @@ <note> <para> The Apache web server changes the directory to root at startup causing - PHP to attempt to read <filename>php.ini</filename> from the root + PHP to attempt to read &php.ini; from the root filesystem if it exists. </para> </note> Index: phpdoc/en/chapters/install.apache2.xml diff -u phpdoc/en/chapters/install.apache2.xml:1.10 phpdoc/en/chapters/install.apache2.xml:1.11 --- phpdoc/en/chapters/install.apache2.xml:1.10 Sat Mar 29 10:30:06 2003 +++ phpdoc/en/chapters/install.apache2.xml Wed May 21 06:34:22 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.10 $ --> +<!-- $Revision: 1.11 $ --> <sect1 id="install.apache2"> <title>Servers-Apache 2.0</title> <para> @@ -190,9 +190,8 @@ to work with <literal>PHP</literal>. </para> <para> - You need to insert these three lines to your Apache <filename>httpd.conf - </filename> configuration file to set up the - <emphasis>CGI binary</emphasis>: + You need to insert these three lines to your Apache &httpd.conf; + configuration file to set up the <emphasis>CGI binary</emphasis>: <example> <title>PHP and Apache 2.0 as CGI</title> <programlisting role="apache"> @@ -210,7 +209,7 @@ <filename>winnt/system32</filename> (for Windows NT/2000) or <filename>windows/system32</filename> (for Windows XP), overwriting any older file. You need to insert these two lines to your - Apache <filename>httpd.conf </filename> configuration file to set up the + Apache &httpd.conf; configuration file to set up the <emphasis>PHP-Module</emphasis> for Apache 2.0: <example> <title>PHP and Apache 2.0 as Module</title> Index: phpdoc/en/chapters/install.configure.servers.xml diff -u phpdoc/en/chapters/install.configure.servers.xml:1.4 phpdoc/en/chapters/install.configure.servers.xml:1.5 --- phpdoc/en/chapters/install.configure.servers.xml:1.4 Tue May 20 23:02:31 2003 +++ phpdoc/en/chapters/install.configure.servers.xml Wed May 21 06:34:22 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.4 $ --> +<!-- $Revision: 1.5 $ --> <sect3 id="install.configure.options.servers"> <title>Server options</title> <variablelist> @@ -243,8 +243,8 @@ <listitem> <para> If this is enabled, the PHP CGI binary can safely be placed outside of - the web tree and people will not be able to circumvent - <filename>.htaccess</filename> security. + the web tree and people will not be able to circumvent &htaccess; + security. </para> </listitem> </varlistentry> Index: phpdoc/en/chapters/security.xml diff -u phpdoc/en/chapters/security.xml:1.55 phpdoc/en/chapters/security.xml:1.56 --- phpdoc/en/chapters/security.xml:1.55 Fri May 16 21:12:03 2003 +++ phpdoc/en/chapters/security.xml Wed May 21 06:34:22 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.55 $ --> +<!-- $Revision: 1.56 $ --> <chapter id="security"> <title>Security</title> @@ -321,7 +321,7 @@ possible that a web spider could stumble across a database administrator's web page, and drop all of your databases. You can protect against this with Apache authorization, or you can design - your own access model using LDAP, .htaccess files, etc. and include + your own access model using LDAP, &htaccess; files, etc. and include that code as part of your PHP scripts. </simpara> <simpara> @@ -1248,7 +1248,7 @@ </para> <para> Another tactic is to configure web servers such as apache to - parse different filetypes through PHP, either with an .htaccess + parse different filetypes through PHP, either with an &htaccess; directive, or in the apache configuration file itself. You can then use misleading file extensions: <example> Index: phpdoc/en/faq/build.xml diff -u phpdoc/en/faq/build.xml:1.24 phpdoc/en/faq/build.xml:1.25 --- phpdoc/en/faq/build.xml:1.24 Sat Mar 15 13:30:06 2003 +++ phpdoc/en/faq/build.xml Wed May 21 06:34:22 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.24 $ --> +<!-- $Revision: 1.25 $ --> <chapter id="faq.build"> <title>Build Problems</title> <titleabbrev>Build Problems</titleabbrev> @@ -304,7 +304,7 @@ changed between Apache 1.2 and Apache 1.3. You should check to make sure that the configuration file you are adding the AddType line to is actually being read. You can put an obvious syntax error - into your httpd.conf file or some other obvious change that will + into your &httpd.conf; file or some other obvious change that will tell you if the file is being read correctly. </simpara> </listitem> Index: phpdoc/en/features/safe-mode.xml diff -u phpdoc/en/features/safe-mode.xml:1.38 phpdoc/en/features/safe-mode.xml:1.39 --- phpdoc/en/features/safe-mode.xml:1.38 Wed May 14 02:53:33 2003 +++ phpdoc/en/features/safe-mode.xml Wed May 21 06:34:22 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.38 $ --> +<!-- $Revision: 1.39 $ --> <chapter id="features.safe-mode"> <title>Safe Mode</title> @@ -322,7 +322,7 @@ If instead of <link linkend="ini.safe-mode">safe_mode</link>, you set an <link linkend="ini.open-basedir">open_basedir</link> directory then all file operations will be limited to files under the specified directory - For example (Apache httpd.conf example): + For example (Apache &httpd.conf; example): <programlisting role="ini"> <![CDATA[ <Directory /docroot> @@ -344,7 +344,7 @@ You can also disable individual functions. Note that the disable_functions directive can not be used outside of the &php.ini; file which means that you cannot disable functions on a per-virtualhost or per-directory basis - in your httpd.conf file. + in your &httpd.conf; file. If we add this to our &php.ini; file: <programlisting role="ini"> <![CDATA[ Index: phpdoc/en/functions/info.xml diff -u phpdoc/en/functions/info.xml:1.102 phpdoc/en/functions/info.xml:1.103 --- phpdoc/en/functions/info.xml:1.102 Wed Oct 9 05:50:22 2002 +++ phpdoc/en/functions/info.xml Wed May 21 06:34:22 2003 @@ -8,7 +8,7 @@ instead --> <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.102 $ --> +<!-- $Revision: 1.103 $ --> <reference id="ref.info"> <title>PHP Options&Information</title> <titleabbrev>PHP Options/Info</titleabbrev> @@ -1284,15 +1284,14 @@ <entry>PHP_INI_PERDIR</entry> <entry>2</entry> <entry> - Entry can be set in <filename>.htaccess</filename> + Entry can be set in &htaccess; </entry> </row> <row> <entry>PHP_INI_SYSTEM</entry> <entry>4</entry> <entry> - Entry can be set in &php.ini; or - <filename>httpd.conf</filename> + Entry can be set in &php.ini; or &httpd.conf; </entry> </row> <row> Index: phpdoc/en/functions/mbstring.xml diff -u phpdoc/en/functions/mbstring.xml:1.27 phpdoc/en/functions/mbstring.xml:1.28 --- phpdoc/en/functions/mbstring.xml:1.27 Wed Apr 17 15:58:43 2002 +++ phpdoc/en/functions/mbstring.xml Wed May 21 06:34:22 2003 @@ -8,7 +8,7 @@ instead --> <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.27 $ --> +<!-- $Revision: 1.28 $ --> <reference id="ref.mbstring"> <title>Multi-Byte String Functions</title> <titleabbrev>Multi-Byte String</titleabbrev> @@ -177,8 +177,8 @@ <para> When using PHP as an Apache module, it is possible to override PHP ini setting per Virtual Host in - <literal>httpd.conf</literal> or per directory with - <literal>.htaccess</literal>. Refer to the <link + &httpd.conf; or per directory with + &htaccess;. Refer to the <link linkend="configuration">Configuration</link> section and Apache Manual for details. </para> @@ -2592,4 +2592,3 @@ vim: et tw=78 syn=sgml vi: ts=1 sw=1 --> - Index: phpdoc/en/functions/misc.xml diff -u phpdoc/en/functions/misc.xml:1.75 phpdoc/en/functions/misc.xml:1.76 --- phpdoc/en/functions/misc.xml:1.75 Wed Oct 9 05:50:22 2002 +++ phpdoc/en/functions/misc.xml Wed May 21 06:34:22 2003 @@ -8,7 +8,7 @@ instead --> <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.75 $ --> +<!-- $Revision: 1.76 $ --> <reference id="ref.misc"> <title>Miscellaneous functions</title> <titleabbrev>Misc.</titleabbrev> @@ -536,7 +536,7 @@ code list. </simpara> <simpara> - In your httpd.conf you can add the following: + In your &httpd.conf; you can add the following: </simpara> <para> <informalexample> @@ -1100,4 +1100,3 @@ vim: et tw=78 syn=sgml vi: ts=1 sw=1 --> - Index: phpdoc/en/functions/var.xml diff -u phpdoc/en/functions/var.xml:1.105 phpdoc/en/functions/var.xml:1.106 --- phpdoc/en/functions/var.xml:1.105 Wed Apr 17 15:58:45 2002 +++ phpdoc/en/functions/var.xml Wed May 21 06:34:22 2003 @@ -8,7 +8,7 @@ instead --> <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.105 $ --> +<!-- $Revision: 1.106 $ --> <reference id="ref.variables"> <title>Variable Functions</title> <titleabbrev>Variables</titleabbrev> @@ -1148,7 +1148,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 setting. @@ -1555,4 +1555,3 @@ vim: et tw=78 syn=sgml vi: ts=1 sw=1 --> - Index: phpdoc/en/reference/dba/configure.xml diff -u phpdoc/en/reference/dba/configure.xml:1.6 phpdoc/en/reference/dba/configure.xml:1.7 --- phpdoc/en/reference/dba/configure.xml:1.6 Sun May 11 10:32:14 2003 +++ phpdoc/en/reference/dba/configure.xml Wed May 21 06:34:22 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.6 $ --> +<!-- $Revision: 1.7 $ --> <section id="dba.installation"> &reftitle.install; <para> @@ -130,7 +130,7 @@ <note> <para> This was added in PHP 5.0.0 and allows to read and set microsoft style - ini files (like the php.ini file). + ini files (like the &php.ini; file). </para> </note> </entry> Index: phpdoc/en/reference/errorfunc/constants.xml diff -u phpdoc/en/reference/errorfunc/constants.xml:1.6 phpdoc/en/reference/errorfunc/constants.xml:1.7 --- phpdoc/en/reference/errorfunc/constants.xml:1.6 Sat Mar 29 10:16:52 2003 +++ phpdoc/en/reference/errorfunc/constants.xml Wed May 21 06:34:22 2003 @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.6 $ --> +<!-- $Revision: 1.7 $ --> <section id="errorfunc.constants"> &reftitle.constants; &extension.constants.core; <note> <simpara> You may use these constant names in &php.ini; but not outside - of PHP, like in <filename>httpd.conf</filename>, where you'd + of PHP, like in &httpd.conf;, where you'd use the bitmask values instead. </simpara> </note> @@ -218,4 +218,3 @@ vim: et tw=78 syn=sgml vi: ts=1 sw=1 --> - Index: phpdoc/en/reference/filesystem/functions/fopen.xml diff -u phpdoc/en/reference/filesystem/functions/fopen.xml:1.11 phpdoc/en/reference/filesystem/functions/fopen.xml:1.12 --- phpdoc/en/reference/filesystem/functions/fopen.xml:1.11 Sat Apr 19 21:36:25 2003 +++ phpdoc/en/reference/filesystem/functions/fopen.xml Wed May 21 06:34:23 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.11 $ --> +<!-- $Revision: 1.12 $ --> <!-- splitted from ./en/functions/filesystem.xml, last change in rev 1.2 --> <refentry id="function.fopen"> <refnamediv> @@ -47,9 +47,9 @@ <simpara> The list of supported protocols can be found in <xref linkend="wrappers"/>. Some protocols (also referred to as <literal>wrappers</literal>) support - <literal>context</literal> and/or <literal>php.ini</literal> options. + <literal>context</literal> and/or &php.ini; options. Refer to the specific page for the protocol in use for a list of options - which can be set. ( i.e. <literal>php.ini</literal> value + which can be set. ( i.e. &php.ini; value <literal>user_agent</literal> used by the <literal>http</literal> wrapper) For a description of <literal>contexts</literal> and the <parameter>zcontext</parameter> parameter , refer to <xref linkend="ref.stream"/>. Index: phpdoc/en/reference/mbstring/reference.xml diff -u phpdoc/en/reference/mbstring/reference.xml:1.10 phpdoc/en/reference/mbstring/reference.xml:1.11 --- phpdoc/en/reference/mbstring/reference.xml:1.10 Sat May 3 17:34:57 2003 +++ phpdoc/en/reference/mbstring/reference.xml Wed May 21 06:34:23 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.10 $ --> +<!-- $Revision: 1.11 $ --> <reference id="ref.mbstring"> <title>Multi-Byte String Functions</title> <titleabbrev>Multi-Byte String</titleabbrev> @@ -148,8 +148,8 @@ <para> When using PHP as an Apache module, it is possible to override PHP ini setting per Virtual Host in - <literal>httpd.conf</literal> or per directory with - <literal>.htaccess</literal>. Refer to the <link + &httpd.conf; or per directory with + &htaccess;. Refer to the <link linkend="configuration">Configuration</link> section and Apache Manual for details. </para> @@ -506,4 +506,3 @@ vim: et tw=78 syn=sgml vi: ts=1 sw=1 --> - Index: phpdoc/en/reference/misc/functions/highlight-file.xml diff -u phpdoc/en/reference/misc/functions/highlight-file.xml:1.4 phpdoc/en/reference/misc/functions/highlight-file.xml:1.5 --- phpdoc/en/reference/misc/functions/highlight-file.xml:1.4 Sat May 11 16:05:23 2002 +++ phpdoc/en/reference/misc/functions/highlight-file.xml Wed May 21 06:34:23 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.4 $ --> +<!-- $Revision: 1.5 $ --> <!-- splitted from ./en/functions/misc.xml, last change in rev 1.22 --> <refentry id="function.highlight-file"> <refnamediv> @@ -60,7 +60,7 @@ code list. </simpara> <simpara> - In your httpd.conf you can add the following: + In your &httpd.conf; you can add the following: </simpara> <para> <informalexample> Index: phpdoc/en/reference/yaz/configure.xml diff -u phpdoc/en/reference/yaz/configure.xml:1.6 phpdoc/en/reference/yaz/configure.xml:1.7 --- phpdoc/en/reference/yaz/configure.xml:1.6 Wed Feb 26 11:39:06 2003 +++ phpdoc/en/reference/yaz/configure.xml Wed May 21 06:34:23 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.6 $ --> +<!-- $Revision: 1.7 $ --> <section id="yaz.installation"> &reftitle.install; <para> @@ -28,7 +28,7 @@ </para> <para> If you are using YAZ as a shared extension, add (or uncomment) the following - line in <filename>php.ini</filename> on Unix: + line in &php.ini; on Unix: <screen> extension=php_yaz.so </screen>
Index: phpdoc/en/appendices/migration4.xml diff -u phpdoc/en/appendices/migration4.xml:1.33 phpdoc/en/appendices/migration4.xml:1.34 --- phpdoc/en/appendices/migration4.xml:1.33 Sun Apr 20 19:51:02 2003 +++ phpdoc/en/appendices/migration4.xml Wed May 21 06:34:21 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.33 $ --> +<!-- $Revision: 1.34 $ --> <appendix id="migration4"> <title>Migrating from PHP 3 to PHP 4</title> @@ -111,7 +111,7 @@ <listitem> <simpara> Admin values (or flags) can only appear in the server-wide Apache configuration - files (e.g., httpd.conf). + files (e.g., &httpd.conf;). </simpara> </listitem> <listitem> Index: phpdoc/en/appendices/phpdevel.xml diff -u phpdoc/en/appendices/phpdevel.xml:1.23 phpdoc/en/appendices/phpdevel.xml:1.24 --- phpdoc/en/appendices/phpdevel.xml:1.23 Thu May 1 11:37:26 2003 +++ phpdoc/en/appendices/phpdevel.xml Wed May 21 06:34:21 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.23 $ --> +<!-- $Revision: 1.24 $ --> <appendix id="phpdevel"> <title>Extending PHP 3</title> @@ -684,7 +684,7 @@ to the php3_commands structure in mod_php3.c. Note the restrictions part. RSRC_CONF are directives that can only be present in the actual Apache .conf files. Any OR_OPTIONS - directives can be present anywhere, include normal .htaccess + directives can be present anywhere, include normal &htaccess; files.</simpara></listitem> <listitem><simpara>In either php3take1handler() or Index: phpdoc/en/appendices/wrappers.xml diff -u phpdoc/en/appendices/wrappers.xml:1.17 phpdoc/en/appendices/wrappers.xml:1.18 --- phpdoc/en/appendices/wrappers.xml:1.17 Wed May 14 18:04:50 2003 +++ phpdoc/en/appendices/wrappers.xml Wed May 21 06:34:22 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.17 $ --> +<!-- $Revision: 1.18 $ --> <appendix id="wrappers"> <title>List of Supported Protocols/Wrappers</title> <para> @@ -126,7 +126,7 @@ in the <literal>header</literal> context option above. </entry> <entry> - <literal>php.ini</literal> setting: <literal>user_agent</literal> + &php.ini; setting: <literal>user_agent</literal> </entry> </row> <row> Index: phpdoc/en/chapters/config.xml diff -u phpdoc/en/chapters/config.xml:1.102 phpdoc/en/chapters/config.xml:1.103 --- phpdoc/en/chapters/config.xml:1.102 Sun May 18 22:32:15 2003 +++ phpdoc/en/chapters/config.xml Wed May 21 06:34:22 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.102 $ --> +<!-- $Revision: 1.103 $ --> <chapter id="configuration"> <title>Configuration</title> @@ -27,7 +27,7 @@ <note> <para> The Apache web server changes the directory to root at startup causing - PHP to attempt to read <filename>php.ini</filename> from the root + PHP to attempt to read &php.ini; from the root filesystem if it exists. </para> </note> Index: phpdoc/en/chapters/install.apache2.xml diff -u phpdoc/en/chapters/install.apache2.xml:1.10 phpdoc/en/chapters/install.apache2.xml:1.11 --- phpdoc/en/chapters/install.apache2.xml:1.10 Sat Mar 29 10:30:06 2003 +++ phpdoc/en/chapters/install.apache2.xml Wed May 21 06:34:22 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.10 $ --> +<!-- $Revision: 1.11 $ --> <sect1 id="install.apache2"> <title>Servers-Apache 2.0</title> <para> @@ -190,9 +190,8 @@ to work with <literal>PHP</literal>. </para> <para> - You need to insert these three lines to your Apache <filename>httpd.conf - </filename> configuration file to set up the - <emphasis>CGI binary</emphasis>: + You need to insert these three lines to your Apache &httpd.conf; + configuration file to set up the <emphasis>CGI binary</emphasis>: <example> <title>PHP and Apache 2.0 as CGI</title> <programlisting role="apache"> @@ -210,7 +209,7 @@ <filename>winnt/system32</filename> (for Windows NT/2000) or <filename>windows/system32</filename> (for Windows XP), overwriting any older file. You need to insert these two lines to your - Apache <filename>httpd.conf </filename> configuration file to set up the + Apache &httpd.conf; configuration file to set up the <emphasis>PHP-Module</emphasis> for Apache 2.0: <example> <title>PHP and Apache 2.0 as Module</title> Index: phpdoc/en/chapters/install.configure.servers.xml diff -u phpdoc/en/chapters/install.configure.servers.xml:1.4 phpdoc/en/chapters/install.configure.servers.xml:1.5 --- phpdoc/en/chapters/install.configure.servers.xml:1.4 Tue May 20 23:02:31 2003 +++ phpdoc/en/chapters/install.configure.servers.xml Wed May 21 06:34:22 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.4 $ --> +<!-- $Revision: 1.5 $ --> <sect3 id="install.configure.options.servers"> <title>Server options</title> <variablelist> @@ -243,8 +243,8 @@ <listitem> <para> If this is enabled, the PHP CGI binary can safely be placed outside of - the web tree and people will not be able to circumvent - <filename>.htaccess</filename> security. + the web tree and people will not be able to circumvent &htaccess; + security. </para> </listitem> </varlistentry> Index: phpdoc/en/chapters/security.xml diff -u phpdoc/en/chapters/security.xml:1.55 phpdoc/en/chapters/security.xml:1.56 --- phpdoc/en/chapters/security.xml:1.55 Fri May 16 21:12:03 2003 +++ phpdoc/en/chapters/security.xml Wed May 21 06:34:22 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.55 $ --> +<!-- $Revision: 1.56 $ --> <chapter id="security"> <title>Security</title> @@ -321,7 +321,7 @@ possible that a web spider could stumble across a database administrator's web page, and drop all of your databases. You can protect against this with Apache authorization, or you can design - your own access model using LDAP, .htaccess files, etc. and include + your own access model using LDAP, &htaccess; files, etc. and include that code as part of your PHP scripts. </simpara> <simpara> @@ -1248,7 +1248,7 @@ </para> <para> Another tactic is to configure web servers such as apache to - parse different filetypes through PHP, either with an .htaccess + parse different filetypes through PHP, either with an &htaccess; directive, or in the apache configuration file itself. You can then use misleading file extensions: <example> Index: phpdoc/en/faq/build.xml diff -u phpdoc/en/faq/build.xml:1.24 phpdoc/en/faq/build.xml:1.25 --- phpdoc/en/faq/build.xml:1.24 Sat Mar 15 13:30:06 2003 +++ phpdoc/en/faq/build.xml Wed May 21 06:34:22 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.24 $ --> +<!-- $Revision: 1.25 $ --> <chapter id="faq.build"> <title>Build Problems</title> <titleabbrev>Build Problems</titleabbrev> @@ -304,7 +304,7 @@ changed between Apache 1.2 and Apache 1.3. You should check to make sure that the configuration file you are adding the AddType line to is actually being read. You can put an obvious syntax error - into your httpd.conf file or some other obvious change that will + into your &httpd.conf; file or some other obvious change that will tell you if the file is being read correctly. </simpara> </listitem> Index: phpdoc/en/features/safe-mode.xml diff -u phpdoc/en/features/safe-mode.xml:1.38 phpdoc/en/features/safe-mode.xml:1.39 --- phpdoc/en/features/safe-mode.xml:1.38 Wed May 14 02:53:33 2003 +++ phpdoc/en/features/safe-mode.xml Wed May 21 06:34:22 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.38 $ --> +<!-- $Revision: 1.39 $ --> <chapter id="features.safe-mode"> <title>Safe Mode</title> @@ -322,7 +322,7 @@ If instead of <link linkend="ini.safe-mode">safe_mode</link>, you set an <link linkend="ini.open-basedir">open_basedir</link> directory then all file operations will be limited to files under the specified directory - For example (Apache httpd.conf example): + For example (Apache &httpd.conf; example): <programlisting role="ini"> <![CDATA[ <Directory /docroot> @@ -344,7 +344,7 @@ You can also disable individual functions. Note that the disable_functions directive can not be used outside of the &php.ini; file which means that you cannot disable functions on a per-virtualhost or per-directory basis - in your httpd.conf file. + in your &httpd.conf; file. If we add this to our &php.ini; file: <programlisting role="ini"> <![CDATA[ Index: phpdoc/en/functions/info.xml diff -u phpdoc/en/functions/info.xml:1.102 phpdoc/en/functions/info.xml:1.103 --- phpdoc/en/functions/info.xml:1.102 Wed Oct 9 05:50:22 2002 +++ phpdoc/en/functions/info.xml Wed May 21 06:34:22 2003 @@ -8,7 +8,7 @@ instead --> <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.102 $ --> +<!-- $Revision: 1.103 $ --> <reference id="ref.info"> <title>PHP Options&Information</title> <titleabbrev>PHP Options/Info</titleabbrev> @@ -1284,15 +1284,14 @@ <entry>PHP_INI_PERDIR</entry> <entry>2</entry> <entry> - Entry can be set in <filename>.htaccess</filename> + Entry can be set in &htaccess; </entry> </row> <row> <entry>PHP_INI_SYSTEM</entry> <entry>4</entry> <entry> - Entry can be set in &php.ini; or - <filename>httpd.conf</filename> + Entry can be set in &php.ini; or &httpd.conf; </entry> </row> <row> Index: phpdoc/en/functions/mbstring.xml diff -u phpdoc/en/functions/mbstring.xml:1.27 phpdoc/en/functions/mbstring.xml:1.28 --- phpdoc/en/functions/mbstring.xml:1.27 Wed Apr 17 15:58:43 2002 +++ phpdoc/en/functions/mbstring.xml Wed May 21 06:34:22 2003 @@ -8,7 +8,7 @@ instead --> <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.27 $ --> +<!-- $Revision: 1.28 $ --> <reference id="ref.mbstring"> <title>Multi-Byte String Functions</title> <titleabbrev>Multi-Byte String</titleabbrev> @@ -177,8 +177,8 @@ <para> When using PHP as an Apache module, it is possible to override PHP ini setting per Virtual Host in - <literal>httpd.conf</literal> or per directory with - <literal>.htaccess</literal>. Refer to the <link + &httpd.conf; or per directory with + &htaccess;. Refer to the <link linkend="configuration">Configuration</link> section and Apache Manual for details. </para> @@ -2592,4 +2592,3 @@ vim: et tw=78 syn=sgml vi: ts=1 sw=1 --> - Index: phpdoc/en/functions/misc.xml diff -u phpdoc/en/functions/misc.xml:1.75 phpdoc/en/functions/misc.xml:1.76 --- phpdoc/en/functions/misc.xml:1.75 Wed Oct 9 05:50:22 2002 +++ phpdoc/en/functions/misc.xml Wed May 21 06:34:22 2003 @@ -8,7 +8,7 @@ instead --> <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.75 $ --> +<!-- $Revision: 1.76 $ --> <reference id="ref.misc"> <title>Miscellaneous functions</title> <titleabbrev>Misc.</titleabbrev> @@ -536,7 +536,7 @@ code list. </simpara> <simpara> - In your httpd.conf you can add the following: + In your &httpd.conf; you can add the following: </simpara> <para> <informalexample> @@ -1100,4 +1100,3 @@ vim: et tw=78 syn=sgml vi: ts=1 sw=1 --> - Index: phpdoc/en/functions/var.xml diff -u phpdoc/en/functions/var.xml:1.105 phpdoc/en/functions/var.xml:1.106 --- phpdoc/en/functions/var.xml:1.105 Wed Apr 17 15:58:45 2002 +++ phpdoc/en/functions/var.xml Wed May 21 06:34:22 2003 @@ -8,7 +8,7 @@ instead --> <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.105 $ --> +<!-- $Revision: 1.106 $ --> <reference id="ref.variables"> <title>Variable Functions</title> <titleabbrev>Variables</titleabbrev> @@ -1148,7 +1148,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 setting. @@ -1555,4 +1555,3 @@ vim: et tw=78 syn=sgml vi: ts=1 sw=1 --> - Index: phpdoc/en/reference/dba/configure.xml diff -u phpdoc/en/reference/dba/configure.xml:1.6 phpdoc/en/reference/dba/configure.xml:1.7 --- phpdoc/en/reference/dba/configure.xml:1.6 Sun May 11 10:32:14 2003 +++ phpdoc/en/reference/dba/configure.xml Wed May 21 06:34:22 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.6 $ --> +<!-- $Revision: 1.7 $ --> <section id="dba.installation"> &reftitle.install; <para> @@ -130,7 +130,7 @@ <note> <para> This was added in PHP 5.0.0 and allows to read and set microsoft style - ini files (like the php.ini file). + ini files (like the &php.ini; file). </para> </note> </entry> Index: phpdoc/en/reference/errorfunc/constants.xml diff -u phpdoc/en/reference/errorfunc/constants.xml:1.6 phpdoc/en/reference/errorfunc/constants.xml:1.7 --- phpdoc/en/reference/errorfunc/constants.xml:1.6 Sat Mar 29 10:16:52 2003 +++ phpdoc/en/reference/errorfunc/constants.xml Wed May 21 06:34:22 2003 @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.6 $ --> +<!-- $Revision: 1.7 $ --> <section id="errorfunc.constants"> &reftitle.constants; &extension.constants.core; <note> <simpara> You may use these constant names in &php.ini; but not outside - of PHP, like in <filename>httpd.conf</filename>, where you'd + of PHP, like in &httpd.conf;, where you'd use the bitmask values instead. </simpara> </note> @@ -218,4 +218,3 @@ vim: et tw=78 syn=sgml vi: ts=1 sw=1 --> - Index: phpdoc/en/reference/filesystem/functions/fopen.xml diff -u phpdoc/en/reference/filesystem/functions/fopen.xml:1.11 phpdoc/en/reference/filesystem/functions/fopen.xml:1.12 --- phpdoc/en/reference/filesystem/functions/fopen.xml:1.11 Sat Apr 19 21:36:25 2003 +++ phpdoc/en/reference/filesystem/functions/fopen.xml Wed May 21 06:34:23 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.11 $ --> +<!-- $Revision: 1.12 $ --> <!-- splitted from ./en/functions/filesystem.xml, last change in rev 1.2 --> <refentry id="function.fopen"> <refnamediv> @@ -47,9 +47,9 @@ <simpara> The list of supported protocols can be found in <xref linkend="wrappers"/>. Some protocols (also referred to as <literal>wrappers</literal>) support - <literal>context</literal> and/or <literal>php.ini</literal> options. + <literal>context</literal> and/or &php.ini; options. Refer to the specific page for the protocol in use for a list of options - which can be set. ( i.e. <literal>php.ini</literal> value + which can be set. ( i.e. &php.ini; value <literal>user_agent</literal> used by the <literal>http</literal> wrapper) For a description of <literal>contexts</literal> and the <parameter>zcontext</parameter> parameter , refer to <xref linkend="ref.stream"/>. Index: phpdoc/en/reference/mbstring/reference.xml diff -u phpdoc/en/reference/mbstring/reference.xml:1.10 phpdoc/en/reference/mbstring/reference.xml:1.11 --- phpdoc/en/reference/mbstring/reference.xml:1.10 Sat May 3 17:34:57 2003 +++ phpdoc/en/reference/mbstring/reference.xml Wed May 21 06:34:23 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.10 $ --> +<!-- $Revision: 1.11 $ --> <reference id="ref.mbstring"> <title>Multi-Byte String Functions</title> <titleabbrev>Multi-Byte String</titleabbrev> @@ -148,8 +148,8 @@ <para> When using PHP as an Apache module, it is possible to override PHP ini setting per Virtual Host in - <literal>httpd.conf</literal> or per directory with - <literal>.htaccess</literal>. Refer to the <link + &httpd.conf; or per directory with + &htaccess;. Refer to the <link linkend="configuration">Configuration</link> section and Apache Manual for details. </para> @@ -506,4 +506,3 @@ vim: et tw=78 syn=sgml vi: ts=1 sw=1 --> - Index: phpdoc/en/reference/misc/functions/highlight-file.xml diff -u phpdoc/en/reference/misc/functions/highlight-file.xml:1.4 phpdoc/en/reference/misc/functions/highlight-file.xml:1.5 --- phpdoc/en/reference/misc/functions/highlight-file.xml:1.4 Sat May 11 16:05:23 2002 +++ phpdoc/en/reference/misc/functions/highlight-file.xml Wed May 21 06:34:23 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.4 $ --> +<!-- $Revision: 1.5 $ --> <!-- splitted from ./en/functions/misc.xml, last change in rev 1.22 --> <refentry id="function.highlight-file"> <refnamediv> @@ -60,7 +60,7 @@ code list. </simpara> <simpara> - In your httpd.conf you can add the following: + In your &httpd.conf; you can add the following: </simpara> <para> <informalexample> Index: phpdoc/en/reference/yaz/configure.xml diff -u phpdoc/en/reference/yaz/configure.xml:1.6 phpdoc/en/reference/yaz/configure.xml:1.7 --- phpdoc/en/reference/yaz/configure.xml:1.6 Wed Feb 26 11:39:06 2003 +++ phpdoc/en/reference/yaz/configure.xml Wed May 21 06:34:23 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.6 $ --> +<!-- $Revision: 1.7 $ --> <section id="yaz.installation"> &reftitle.install; <para> @@ -28,7 +28,7 @@ </para> <para> If you are using YAZ as a shared extension, add (or uncomment) the following - line in <filename>php.ini</filename> on Unix: + line in &php.ini; on Unix: <screen> extension=php_yaz.so </screen>