cvs: phpdoc /en/reference/apache ini.xml /en/reference/info/functions ini-set.xml /en/reference/var/functions unserialize.xml

betz Sun Mar 30 09:44:59 2003 EDT Modified files: /phpdoc/en/reference/apache ini.xml /phpdoc/en/reference/info/functions ini-set.xml /phpdoc/en/reference/var/functions unserialize.xml Log: use of entities Index: phpdoc/en/reference/apache/ini.xml diff -u phpdoc/en/reference/apache/ini.xml:1.2 phpdoc/en/reference/apache/ini.xml:1.3 --- phpdoc/en/reference/apache/ini.xml:1.2 Tue Feb 18 13:03:57 2003 +++ phpdoc/en/reference/apache/ini.xml Sun Mar 30 09:44:59 2003 @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.2 $ --> +<!-- $Revision: 1.3 $ --> <section id="apache.configuration"> &reftitle.runtime; <para> The behaviour of the Apache PHP module is affected by settings in &php.ini;. Configuration settings from &php.ini; may be overridden by php_flag settings - in the server configuration file or local <filename>.htaccess</filename> files. + in the server configuration file or local &htaccess; files. </para> <example> - <title>Turning off PHP parsing for a directory using <filename>.htaccess</filename></title> + <title>Turning off PHP parsing for a directory using &htaccess;</title> <programlisting>php_flag engine off</programlisting> </example> <para> @@ -68,10 +68,9 @@ This directive is really only useful in the Apache module version of PHP. It is used by sites that would like to turn PHP parsing on and off on a per-directory or per-virtual - server basis. By putting <userinput>engine - off</userinput> in the appropriate places in the - <filename>httpd.conf</filename> file, PHP can be enabled or - disabled. + server basis. By putting <userinput>engine off</userinput> + in the appropriate places in the &httpd.conf; file, PHP can + be enabled or disabled. </para> </listitem> </varlistentry> Index: phpdoc/en/reference/info/functions/ini-set.xml diff -u phpdoc/en/reference/info/functions/ini-set.xml:1.25 phpdoc/en/reference/info/functions/ini-set.xml:1.26 --- phpdoc/en/reference/info/functions/ini-set.xml:1.25 Thu Jan 16 10:16:55 2003 +++ phpdoc/en/reference/info/functions/ini-set.xml Sun Mar 30 09:44:59 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.25 $ --> +<!-- $Revision: 1.26 $ --> <!-- splitted from ./en/functions/info.xml, last change in rev 1.23 --> <refentry id="function.ini-set"> <refnamediv> @@ -1212,15 +1212,14 @@ <entry>PHP_INI_PERDIR</entry> <entry>2</entry> <entry> - Entry can be set in &php.ini;, <filename>.htaccess</filename> or - <filename>httpd.conf</filename> + Entry can be set in &php.ini;, &htaccess; or &httpd.conf; </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/reference/var/functions/unserialize.xml diff -u phpdoc/en/reference/var/functions/unserialize.xml:1.11 phpdoc/en/reference/var/functions/unserialize.xml:1.12 --- phpdoc/en/reference/var/functions/unserialize.xml:1.11 Wed Feb 19 17:11:54 2003 +++ phpdoc/en/reference/var/functions/unserialize.xml Sun Mar 30 09:44:59 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.11 $ --> +<!-- $Revision: 1.12 $ --> <!-- splitted from ./en/functions/var.xml, last change in rev 1.2 --> <refentry id="function.unserialize"> <refnamediv> @@ -29,7 +29,7 @@ It's possible to set a callback-function which will be called, if an undefined class should be instantiated during unserializing. (to prevent getting an incomplete <type>object</type> "__PHP_Incomplete_Class".) - Use your &php.ini;, <function>ini_set</function> or <filename>.htaccess</filename> + Use your &php.ini;, <function>ini_set</function> or &htaccess; to define 'unserialize_callback_func'. Everytime an undefined class should be instantiated, it'll be called. To disable this feature just empty this setting. Also note that the directive