[prev in list] [next in list] [prev in thread] [next in thread] 

List:       phpdoc
Subject:    [PHP-DOC] cvs: phpdoc /en/appendices migration5.xml
From:       "Damien Seguy" <dams () php ! net>
Date:       2005-11-29 16:59:45
Message-ID: cvsdams1133283585 () cvsserver
[Download RAW message or body]

dams		Tue Nov 29 11:59:45 2005 EDT

  Modified files:              
    /phpdoc/en/appendices	migration5.xml 
  Log:
  rephrase
  
http://cvs.php.net/diff.php/phpdoc/en/appendices/migration5.xml?r1=1.41&r2=1.42&ty=u
Index: phpdoc/en/appendices/migration5.xml
diff -u phpdoc/en/appendices/migration5.xml:1.41 phpdoc/en/appendices/migration5.xml:1.42
--- phpdoc/en/appendices/migration5.xml:1.41	Mon Apr 11 03:51:02 2005
+++ phpdoc/en/appendices/migration5.xml	Tue Nov 29 11:59:43 2005
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.41 $ -->
+<!-- $Revision: 1.42 $ -->
  <appendix id="migration5">
   <title>Migrating from PHP 4 to PHP 5</title>
 
@@ -127,10 +127,11 @@
     </listitem>
     <listitem>
      <simpara>
-      If there are functions defined in the included file, they can be used in the
-      main file independent if they are before <function>return</function> or after.
-      If the file is included twice, PHP 5 issues fatal error because functions
-      were already declared, while PHP 4 doesn't complain about it.
+      If there are functions defined in the included file, they will be defined
+      in the main file, wether they are they are before or after the 
+      <function>return</function> instruction. If the file is included twice, 
+      PHP 5 issues fatal error because functions were already declared, while 
+      PHP 4 doesn't complain about it.
       It is recommended to use <function>include_once</function> instead of
       checking if the file was already included and conditionally return inside
       the included file.
[prev in list] [next in list] [prev in thread] [next in thread]