dams            Wed Jul 18 09:24:54 2001 EDT

  Modified files:              
    /phpdoc/en/appendices       reserved.xml 
  Log:
  Added a few entries.Updated introductory paragraph.
  
Index: phpdoc/en/appendices/reserved.xml
diff -u phpdoc/en/appendices/reserved.xml:1.4 phpdoc/en/appendices/reserved.xml:1.5
--- phpdoc/en/appendices/reserved.xml:1.4       Sat Jul  7 14:42:13 2001
+++ phpdoc/en/appendices/reserved.xml   Wed Jul 18 09:24:54 2001
@@ -1,7 +1,10 @@
 <appendix id="reserved">
  <title>PHP reserved words</title>
  <para>
-  Here is the list of PHP reserved words and usual constants.
+  Here is the list of PHP reserved words, usual constants and predefined
+  variables. You won't find any function here, but rather language constructs.
+  You shouldn't try to use those names as variables, function, constant or method's
+  name, as it will surely lead to confusion.
   <itemizedlist>
    <listitem>
        <simpara>
@@ -10,6 +13,16 @@
    </listitem>
    <listitem>
        <simpara>
+        <link linkend="language.variables.predefined.php">$argv</link>.
+    </simpara>
+   </listitem>
+   <listitem>
+       <simpara>
+        <link linkend="language.variables.predefined.php">$argc</link>.
+    </simpara>
+   </listitem>
+   <listitem>
+       <simpara>
         <link linkend="control-structures.break">break</link>.
     </simpara>
    </listitem>
@@ -40,6 +53,16 @@
    </listitem>
    <listitem>
        <simpara>
+        <function>die</function>.
+    </simpara>
+   </listitem>
+   <listitem>
+       <simpara>
+        <function>echo</function>.
+    </simpara>
+   </listitem>
+   <listitem>
+       <simpara>
         <link linkend="control-structures.else">else</link>.
     </simpara>
    </listitem>
@@ -60,6 +83,11 @@
    </listitem>
    <listitem>
        <simpara>
+        <link linkend="control-structures.alternative-syntax">endforeach</link>.
+    </simpara>
+   </listitem>
+   <listitem>
+       <simpara>
         <link linkend="control-structures.alternative-syntax">endif</link>.
     </simpara>
    </listitem>
@@ -93,7 +121,12 @@
         <link linkend="language.constants">E_WARNING</link>.
     </simpara>
    </listitem>
-        <listitem>
+   <listitem>
+       <simpara>
+        <function>exit</function>.
+    </simpara>
+   </listitem>
+   <listitem>
        <simpara>
         <link linkend="keyword.class">extends</link>.
     </simpara>
@@ -120,6 +153,36 @@
    </listitem>
    <listitem>
        <simpara>
+        <link linkend="language.variables.predefined.php">$HTTP_COOKIE_VARS</link>.
+    </simpara>
+   </listitem>
+   <listitem>
+       <simpara>
+        <link linkend="language.variables.predefined.php">$HTTP_GET_VARS</link>.
+    </simpara>
+   </listitem>
+   <listitem>
+       <simpara>
+        <link linkend="language.variables.predefined.php">$HTTP_POST_VARS</link>.
+    </simpara>
+   </listitem>
+    <listitem>
+       <simpara>
+        <link linkend="language.variables.predefined.php">$$HTTP_POST_FILES</link>.
+    </simpara>
+   </listitem>
+   <listitem>
+       <simpara>
+        <link linkend="language.variables.predefined.php">$HTTP_ENV_VARS</link>.
+    </simpara>
+   </listitem>
+    <listitem>
+       <simpara>
+        <link linkend="language.variables.predefined.php">$HTTP_SERVER_VARS</link>.
+    </simpara>
+   </listitem>
+   <listitem>
+       <simpara>
         <link linkend="control-structures.if">if</link>.
     </simpara>
    </listitem>
@@ -155,6 +218,11 @@
    </listitem>
    <listitem>
        <simpara>
+        <link linkend="language.constants.predefined">NULL</link>.
+    </simpara>
+   </listitem>
+   <listitem>
+       <simpara>
         <link linkend="language.operators.logical">or</link>.
     </simpara>
    </listitem>
@@ -170,11 +238,21 @@
    </listitem>
    <listitem>
        <simpara>
+        <link linkend="language.variables.predefined.php">$PHP_SELF</link>.
+    </simpara>
+   </listitem>
+   <listitem>
+       <simpara>
         <link linkend="language.constants">PHP_VERSION</link>.
     </simpara>
    </listitem>
    <listitem>
        <simpara>
+        <function>print</function>.
+    </simpara>
+   </listitem>
+   <listitem>
+       <simpara>
         <function>require</function>.
     </simpara>
    </listitem>
@@ -205,7 +283,7 @@
    </listitem>
    <listitem>
        <simpara>
-        <link linkend="keyword.class">this</link>.
+        <link linkend="keyword.class">$this</link>.
     </simpara>
    </listitem>
    <listitem>


Reply via email to