didou           Mon Jan 22 01:20:23 2007 UTC

  Modified files:              
    /phpdoc/en/language control-structures.xml 
  Log:
  Fix #38024: require also produces an E_WARNING
  
http://cvs.php.net/viewvc.cgi/phpdoc/en/language/control-structures.xml?r1=1.135&r2=1.136&diff_format=u
Index: phpdoc/en/language/control-structures.xml
diff -u phpdoc/en/language/control-structures.xml:1.135 
phpdoc/en/language/control-structures.xml:1.136
--- phpdoc/en/language/control-structures.xml:1.135     Wed Sep  6 12:42:52 2006
+++ phpdoc/en/language/control-structures.xml   Mon Jan 22 01:20:23 2007
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.135 $ -->
+<!-- $Revision: 1.136 $ -->
  <chapter id="language.control-structures">
   <title>Control Structures</title>
 
@@ -1223,9 +1223,8 @@
    </simpara>
    <simpara>
      <function>require</function> and <function>include</function>
-     are identical in every way except how they handle failure.
-     <function>include</function> produces a
-     <link linkend="internal.e-warning">Warning</link> while
+     are identical in every way except how they handle failure. They both
+     produce a <link linkend="internal.e-warning">Warning</link>, but
      <function>require</function> results in a <link 
linkend="internal.e-error">
      Fatal Error</link>.  In other words, don't hesitate to use
      <function>require</function> if you want a missing file to halt processing
@@ -1291,8 +1290,8 @@
    <simpara>
      The documentation below also applies to <function>require</function>.
      The two constructs are identical in every way except how they handle
-     failure.  <function>include</function> produces a
-     <link linkend="internal.e-warning">Warning</link> while 
<function>require</function>
+     failure. They both produce a 
+     <link linkend="internal.e-warning">Warning</link>, but 
<function>require</function>
      results in a <link linkend="internal.e-error">Fatal Error</link>.
      In other words, use <function>require</function> if you want
      a missing file to halt processing of the page.  
<function>include</function> does

Reply via email to