dams Sat Jul 31 14:30:07 2004 EDT
Modified files:
/phpdoc/en/appendices migration5.xml
Log:
fixing filename tags
http://cvs.php.net/diff.php/phpdoc/en/appendices/migration5.xml?r1=1.29&r2=1.30&ty=u
Index: phpdoc/en/appendices/migration5.xml
diff -u phpdoc/en/appendices/migration5.xml:1.29
phpdoc/en/appendices/migration5.xml:1.30
--- phpdoc/en/appendices/migration5.xml:1.29 Sat Jul 31 01:14:55 2004
+++ phpdoc/en/appendices/migration5.xml Sat Jul 31 14:30:07 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.29 $ -->
+<!-- $Revision: 1.30 $ -->
<appendix id="migration5">
<title>Migrating from PHP 4 to PHP 5</title>
@@ -192,9 +192,9 @@
<title>CLI and CGI</title>
<para>
In PHP 5 there were some changes in CLI and CGI filenames. In PHP 5, the
- CGI version was renamed to <literal>php-cgi.exe</literal> (previously
- <literal>php.exe</literal>) and the CLI version now sits in the main
- directory (previously <literal>cli/php.exe</literal>).
+ CGI version was renamed to <filename>php-cgi.exe</filename> (previously
+ <filename>php.exe</filename>) and the CLI version now sits in the main
+ directory (previously <filename>cli/php.exe</filename>).
</para>
<para>
In PHP 5 it was also introduced a new mode:
@@ -227,7 +227,8 @@
<para>
Migrate the Apache configuration is extremely easy. See the example below
to check the change you need to do:
- <informalexample>
+ <example>
+ <title>Migrating Apache configuration files for PHP 5</title>
<programlisting role="apache-conf">
<![CDATA[
# change this line:
@@ -237,13 +238,15 @@
LoadModule php5_module /php/php5apache2.dll
]]>
</programlisting>
- </informalexample>
+ </example>
</para>
<para>
If your webserver is running PHP in CGI mode, you should note that the
- CGI version has changed its name from php.exe to php-cgi.exe.
- In Apache you should do something like this:
- <informalexample>
+ CGI version has changed its name :
+ (<filename>php.exe</filename> becomes <filename>php-cgi.exe</filename>.
+ In Apache, you should do something like this:
+ <example>
+ <title>Migrating Apache configuration files for PHP 5, CGI mode</title>
<programlisting role="apache-conf">
<![CDATA[
# change this line:
@@ -253,7 +256,7 @@
Action application/x-httpd-php "/php/php-cgi.exe"
]]>
</programlisting>
- </informalexample>
+ </example>
</para>
<para>
In other webservers you need to change either the CGI or the ISAPI module