[PHP-DOC] cvs: phpdoc /en/appendices migration4.xml migration5.xml

[Nuno Lopes]

nlopess         Mon Feb  2 10:53:23 2004 EDT

  Modified files:              
    /phpdoc/en/appendices       migration4.xml migration5.xml 
  Log:
  fix examples role=apache
  some CS
  
http://cvs.php.net/diff.php/phpdoc/en/appendices/migration4.xml?r1=1.35&r2=1.36&ty=u
Index: phpdoc/en/appendices/migration4.xml
diff -u phpdoc/en/appendices/migration4.xml:1.35 
phpdoc/en/appendices/migration4.xml:1.36
--- phpdoc/en/appendices/migration4.xml:1.35    Sun Dec 21 09:42:17 2003
+++ phpdoc/en/appendices/migration4.xml Mon Feb  2 10:53:23 2004
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.35 $ -->
+<!-- $Revision: 1.36 $ -->
  <appendix id="migration4">
   <title>Migrating from PHP 3 to PHP 4</title>
        
@@ -63,20 +63,20 @@
     changes. The MIME types recognized by the PHP module have
     changed.
     <informalexample>
-                <programlisting role="apache">
+     <programlisting role="apache-conf">
 <![CDATA[
 application/x-httpd-php3        -->    application/x-httpd-php
 application/x-httpd-php3-source -->    application/x-httpd-php-source
 ]]>
-                </programlisting>
-               </informalexample>
+     </programlisting>
+    </informalexample>
    </para>
    <para>
     You can make your configuration files work with both versions
     of PHP (depending on which one is currently compiled into the
     server), using the following syntax:
     <informalexample>
-                <programlisting>
+     <programlisting role="apache-conf">
 <![CDATA[
 AddType  application/x-httpd-php3        .php3
 AddType  application/x-httpd-php3-source .php3s
@@ -85,7 +85,7 @@
 AddType  application/x-httpd-php-source  .phps
 ]]>
      </programlisting>
-               </informalexample>
+    </informalexample>
    </para>
    <simpara>
     In addition,  the PHP directive names for Apache have changed.
@@ -94,15 +94,15 @@
     Starting with PHP 4.0, there are only four Apache directives
     that relate to PHP:
     <informalexample>
-                <programlisting role="apache">
+     <programlisting role="apache-conf">
 <![CDATA[
 php_value [PHP directive name] [value]
 php_flag [PHP directive name] [On|Off]
 php_admin_value [PHP directive name] [value]
 php_admin_flag [PHP directive name] [On|Off]
 ]]>
-                </programlisting>
-               </informalexample>
+     </programlisting>
+    </informalexample>
    </para>
    <simpara>
     There are two differences between the Admin values and the non admin values:
http://cvs.php.net/diff.php/phpdoc/en/appendices/migration5.xml?r1=1.3&r2=1.4&ty=u
Index: phpdoc/en/appendices/migration5.xml
diff -u phpdoc/en/appendices/migration5.xml:1.3 phpdoc/en/appendices/migration5.xml:1.4
--- phpdoc/en/appendices/migration5.xml:1.3     Mon Feb  2 10:27:30 2004
+++ phpdoc/en/appendices/migration5.xml Mon Feb  2 10:53:23 2004
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
  <appendix id="migration5">
   <title>Migrating from PHP 4 to PHP 5</title>
 
@@ -82,7 +82,7 @@
     Migrate the Apache configuration is extremely easy. See the example below
     to check the change you need to do:
     <informalexample>
-     <programlisting role="apache">
+     <programlisting role="apache-conf">
 <![CDATA[
 # change this line:    
 LoadModule php4_module /php/sapi/php4apache2.dll
@@ -98,7 +98,7 @@
     CGI version has changed its name from php.exe to php-cgi.exe.
     In Apache you should do something like this:
     <informalexample>
-     <programlisting role="apache">
+     <programlisting role="apache-conf">
 <![CDATA[
 # change this line:    
 Action application/x-httpd-php "/php/php.exe"