Justtechjobs.com Find a programming school near you






Online Campus Both


php-documentation-list | 2000092

[PHP-DOC] cvs: phpdoc /it/language control-structures.xml functions.xml operators.xml types.xml variables.xml From: Luca Perugini (l.perugini <email protected>)
Date: 09/17/00

perugini Sun Sep 17 12:49:14 2000 EDT

  Modified files:
    /phpdoc/it/language control-structures.xml functions.xml
                               operators.xml types.xml variables.xml
  Log:
  Synchronized with : PHP3 -> PHP 3, PHP4 -> PHP 4
  
  
Index: phpdoc/it/language/control-structures.xml
diff -u phpdoc/it/language/control-structures.xml:1.3 phpdoc/it/language/control-structures.xml:1.4
--- phpdoc/it/language/control-structures.xml:1.3 Thu Aug 31 15:30:09 2000
+++ phpdoc/it/language/control-structures.xml Sun Sep 17 12:49:14 2000
@@ -421,9 +421,9 @@
    </para>
    <para>
     Other languages have a <literal>foreach</literal> statement to
- traverse an array or hash. PHP3 has no such construct; PHP4 does
+ traverse an array or hash. PHP 3 has no such construct; PHP 4 does
     (see <link
- linkend="control-structures.foreach">foreach</link>). In PHP3, you
+ linkend="control-structures.foreach">foreach</link>). In PHP 3, you
     can combine <link linkend="control-structures.while">while</link>
     with the <function>list</function> and <function>each</function>
     functions to achieve the same effect. See the documentation for
@@ -434,7 +434,7 @@
   <sect1 id="control-structures.foreach">
    <title><literal>foreach</literal></title>
    <para>
- PHP4 (not PHP3) includes a <literal>foreach</literal> construct,
+ PHP 4 (not PHP 3) includes a <literal>foreach</literal> construct,
     much like perl and some other languages. This simply gives an easy
     way to iterate over arrays. There are two syntaxes; the second is
     a minor but useful extension of the first:
@@ -886,11 +886,11 @@
     </informalexample>
    </para>
    <simpara>
- In PHP3, it is possible to execute a <literal>return</literal>
+ In PHP 3, it is possible to execute a <literal>return</literal>
     statement inside a <function>require</function>ed file, as long as
     that statement occurs in the global scope of the
     <function>require</function>ed file. It may not occur within any
- block (meaning inside braces ({}). In PHP4, however, this ability
+ block (meaning inside braces ({}). In PHP 4, however, this ability
     has been discontinued. If you need this functionality, see
     <function>include</function>.
    </simpara>
@@ -973,22 +973,22 @@
     </informalexample>
    </para>
    <simpara>
- In both PHP3 and PHP4, it is possible to execute a
+ In both PHP 3 and PHP 4, it is possible to execute a
     <literal>return</literal> statement inside an
     <function>include</function>ed file, in order to terminate
     processing in that file and return to the script which called
     it. Some differences in the way this works exist, however. The
- first is that in PHP3, the <literal>return</literal> may not
+ first is that in PHP 3, the <literal>return</literal> may not
     appear inside a block unless it's a function block, in which case
     the <literal>return</literal> applies to that function and not the
- whole file. In PHP4, however, this restriction does not
- exist. Also, PHP4 allows you to return values from
+ whole file. In PHP 4, however, this restriction does not
+ exist. Also, PHP 4 allows you to return values from
     <function>include</function>ed files. You can take the value of
     the <function>include</function> call as you would a normal
- function. This generates a parse error in PHP3.
+ function. This generates a parse error in PHP 3.
    </simpara>
    <example>
- <title><function>include</function> in PHP3 and PHP4</title>
+ <title><function>include</function> in PHP 3 and PHP 4</title>
     <para>
      Assume the existence of the following file (named
      <filename>test.inc</filename>) in the same directory as the main
@@ -1014,9 +1014,9 @@
      </programlisting>
     </para>
     <para>
- When <filename>main.html</filename> is called in PHP3, it will
+ When <filename>main.html</filename> is called in PHP 3, it will
      generate a parse error on line 2; you can't take the value of an
- <function>include</function> in PHP3. In PHP4, however, the
+ <function>include</function> in PHP 3. In PHP 4, however, the
      result will be:
      <screen>
 Before the return
@@ -1034,12 +1034,12 @@
      </programlisting>
     </para>
     <para>
- In PHP4, the output will be:
+ In PHP 4, the output will be:
      <screen>
 Before the return
 Back in main.html
      </screen>
- However, PHP3 will give the following output:
+ However, PHP 3 will give the following output:
      <screen>
 Before the return
 27Back in main.html
@@ -1058,7 +1058,7 @@
      </screen>
     </para>
     <para>
- The spurious '27' is due to the fact that PHP3 does not support
+ The spurious '27' is due to the fact that PHP 3 does not support
      <literal>return</literal>ing values from files like that.
     </para>
    </example>
Index: phpdoc/it/language/functions.xml
diff -u phpdoc/it/language/functions.xml:1.2 phpdoc/it/language/functions.xml:1.3
--- phpdoc/it/language/functions.xml:1.2 Thu Aug 31 15:29:12 2000
+++ phpdoc/it/language/functions.xml Sun Sep 17 12:49:14 2000
@@ -23,18 +23,18 @@
     definitions.
    </simpara>
    <simpara>
- In PHP3, functions must be defined before they are referenced. No
- such requirement exists in PHP4.
+ In PHP 3, functions must be defined before they are referenced. No
+ such requirement exists in PHP 4.
    </simpara>
    <simpara>
     PHP does not support function overloading, nor is it possible to
     undefine or redefine previously-declared functions.
    </simpara>
    <simpara>
- PHP3 does not support variable numbers of arguments to functions,
+ PHP 3 does not support variable numbers of arguments to functions,
     although default arguments are supported (see <link
     linkend="functions.arguments.default">Default argument
- values</link> for more information). PHP4 supports both: see <link
+ values</link> for more information). PHP 4 supports both: see <link
     linkend="functions.variable-arg-list">Variable-length argument
     lists</link> and the function references for
     <function>func_num_args</function>,
@@ -57,13 +57,13 @@
      reference</link>, and <link
      linkend="functions.arguments.default">default argument
      values</link>. Variable-length argument lists are supported only
- in PHP4 and later; see <link
+ in PHP 4 and later; see <link
      linkend="functions.variable-arg-list">Variable-length argument
      lists</link> and the function references for
      <function>func_num_args</function>,
      <function>func_get_arg</function>, and
      <function>func_get_args</function> for more information. A
- similar effect can be achieved in PHP3 by passing an array of
+ similar effect can be achieved in PHP 3 by passing an array of
      arguments to a function:
  
     <informalexample>
@@ -208,7 +208,7 @@
     <title>Variable-length argument lists</title>
         
     <simpara>
- PHP4 has support for variable-length argument lists in
+ PHP 4 has support for variable-length argument lists in
      user-defined functions. This is really quite easy, using the
      <function>func_num_args</function>,
      <function>func_get_arg</function>, and
@@ -282,7 +282,7 @@
    </simpara>
    <simpara>
     This is a deprecated feature, and should only be used by the
- PHP/FI2->PHP3 convertor.
+ PHP/FI2->PHP 3 convertor.
    </simpara>
    <warning>
     <para>
@@ -292,7 +292,7 @@
      <function>usort</function>, <function>array_walk</function>, and
      <function>register_shutdown_function</function>. You can get
      around this limitation by writing a wrapper function (in normal
- PHP3 form) to call the <literal>old_function</literal>.
+ PHP 3 form) to call the <literal>old_function</literal>.
     </para>
    </warning>
 
Index: phpdoc/it/language/operators.xml
diff -u phpdoc/it/language/operators.xml:1.2 phpdoc/it/language/operators.xml:1.3
--- phpdoc/it/language/operators.xml:1.2 Thu Aug 31 15:23:23 2000
+++ phpdoc/it/language/operators.xml Sun Sep 17 12:49:14 2000
@@ -95,10 +95,10 @@
     Note that the assignment copies the original variable to the new
     one (assignment by value), so changes to one will not affect the
     other. This may also have relevance if you need to copy something
- like a large array inside a tight loop. PHP4 supports assignment
+ like a large array inside a tight loop. PHP 4 supports assignment
     by reference, using the <computeroutput>$var =
     &amp;$othervar;</computeroutput> syntax, but this is not possible
- in PHP3. 'Assignment by reference' means that both variables end
+ in PHP 3. 'Assignment by reference' means that both variables end
     up pointing at the same data, and nothing is copied anywhere.
     To learn more about references, please read <link
     linkend="language.references">References explained</link>.
@@ -194,7 +194,7 @@
        <entry>Identical</entry>
        <entry>
         True if $a is equal to $b, and they are of the same
- type. (PHP4 only)
+ type. (PHP 4 only)
        </entry>
       </row>
       <row>
@@ -207,7 +207,7 @@
        <entry>Not identical</entry>
        <entry>
         True if $a is not equal to $b, or they are not of the same
- type. (PHP4 only)
+ type. (PHP 4 only)
        </entry>
       </row>
       <row>
Index: phpdoc/it/language/types.xml
diff -u phpdoc/it/language/types.xml:1.2 phpdoc/it/language/types.xml:1.3
--- phpdoc/it/language/types.xml:1.2 Thu Aug 31 15:24:36 2000
+++ phpdoc/it/language/types.xml Sun Sep 17 12:49:14 2000
@@ -409,7 +409,7 @@
      </informalexample>
     </para>
     <para>
- In PHP3 it is not possible to reference multidimensional arrays
+ In PHP 3 it is not possible to reference multidimensional arrays
      directly within strings. For instance, the following will not
      have the desired result:
      <informalexample>
@@ -418,7 +418,7 @@
 echo "This won't work: $a[3][bar]";
       </programlisting>
      </informalexample>
- In PHP3, the above will output <computeroutput>This won't work:
+ In PHP 3, the above will output <computeroutput>This won't work:
      Array[bar]</computeroutput>. The string concatenation operator,
      however, can be used to overcome this:
      <informalexample>
@@ -429,7 +429,7 @@
      </informalexample>
     </para>
     <para>
- In PHP4, however, the whole problem may be circumvented by
+ In PHP 4, however, the whole problem may be circumvented by
      enclosing the array reference (inside the string) in curly
      braces:
      <informalexample>
Index: phpdoc/it/language/variables.xml
diff -u phpdoc/it/language/variables.xml:1.2 phpdoc/it/language/variables.xml:1.3
--- phpdoc/it/language/variables.xml:1.2 Thu Aug 31 15:26:37 2000
+++ phpdoc/it/language/variables.xml Sun Sep 17 12:49:14 2000
@@ -39,7 +39,7 @@
    </para>
 
    <para>
- In PHP3, variables are always assigned by value. That is to say,
+ In PHP 3, variables are always assigned by value. That is to say,
     when you assign an expression to a variable, the entire value of
     the original expression is copied into the destination
     variable. This means, for instance, that after assigning one
@@ -49,7 +49,7 @@
     linkend="language.expressions">Expressions</link>.
    </para>
    <para>
- PHP4 offers another way to assign values to variables:
+ PHP 4 offers another way to assign values to variables:
     <emphasis>assign by reference</emphasis>. This means that the new
     variable simply references (in other words, "becomes an alias for"
     or "points to") the original variable. Changes to the new variable