goba Mon May 24 15:14:28 2004 EDT
Modified files:
/phpdoc/en/appendices reserved.xml
Log:
fix varnames, add the identicality warning where it was missing (_SESSION and _FILES)
http://cvs.php.net/diff.php/phpdoc/en/appendices/reserved.xml?r1=1.40&r2=1.41&ty=u
Index: phpdoc/en/appendices/reserved.xml
diff -u phpdoc/en/appendices/reserved.xml:1.40 phpdoc/en/appendices/reserved.xml:1.41
--- phpdoc/en/appendices/reserved.xml:1.40 Tue Apr 27 18:45:03 2004
+++ phpdoc/en/appendices/reserved.xml Mon May 24 15:14:27 2004
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.40 $ -->
+<!-- $Revision: 1.41 $ -->
<appendix id="reserved">
<title>List of Reserved Words</title>
<para>
The following is a listing of predefined identifiers in PHP. None
- of the identifiers listed here should be used as identifiers in a
+ of the identifiers listed here should be used as identifiers in any of
your scripts. These lists include keywords and predefined variable,
constant, and class names. These lists are neither exhaustive or
complete.
@@ -17,7 +17,7 @@
These words have special meaning in PHP. Some of them represent things
which look like functions, some look like constants, and so on--but
they're not, really: they are language constructs. You cannot use any
- of the following words as constants, class names, or function names.
+ of the following words as constants, class names, function or method names.
Using them as variable names is generally OK, but could lead to confusion.
</simpara>
@@ -679,7 +679,7 @@
<simpara>
<varname>$HTTP_ENV_VARS</varname> contains the same initial
information, but is not an autoglobal. (Note that
- <varname>HTTP_ENV_VARS</varname> and <varname>$_ENV</varname>
+ <varname>$HTTP_ENV_VARS</varname> and <varname>$_ENV</varname>
are different variables and that PHP handles them as such)
</simpara>
@@ -721,7 +721,7 @@
<simpara>
<varname>$HTTP_COOKIE_VARS</varname> contains the same initial
information, but is not an autoglobal. (Note that
- <varname>HTTP_COOKIE_VARS</varname> and <varname>$_COOKIE</varname>
+ <varname>$HTTP_COOKIE_VARS</varname> and <varname>$_COOKIE</varname>
are different variables and that PHP handles them as such)
</simpara>
@@ -763,7 +763,7 @@
<simpara>
<varname>$HTTP_GET_VARS</varname> contains the same initial
information, but is not an autoglobal. (Note that
- <varname>HTTP_GET_VARS</varname> and <varname>$_GET</varname>
+ <varname>$HTTP_GET_VARS</varname> and <varname>$_GET</varname>
are different variables and that PHP handles them as such)
</simpara>
@@ -805,7 +805,7 @@
<simpara>
<varname>$HTTP_POST_VARS</varname> contains the same initial
information, but is not an autoglobal. (Note that
- <varname>HTTP_POST_VARS</varname> and <varname>$_POST</varname>
+ <varname>$HTTP_POST_VARS</varname> and <varname>$_POST</varname>
are different variables and that PHP handles them as such)
</simpara>
@@ -846,7 +846,9 @@
<simpara>
<varname>$HTTP_POST_FILES</varname> contains the same
- information, but is not an autoglobal.
+ information, but is not an autoglobal. (Note that
+ <varname>$HTTP_POST_FILES</varname> and <varname>$_FILES</varname>
+ are different variables and that PHP handles them as such)
</simpara>
<simpara>
@@ -873,7 +875,7 @@
<note>
<simpara>
Prior to PHP 4.3.0, <varname>$_FILES</varname> information was
- also included into <varname>$_REQUEST</varname>.
+ also included in <varname>$_REQUEST</varname>.
</simpara>
</note>
@@ -929,7 +931,9 @@
<simpara>
<varname>$HTTP_SESSION_VARS</varname> contains the same
- information, but is not an autoglobal.
+ information, but is not an autoglobal. (Note that
+ <varname>$HTTP_SESSION_VARS</varname> and <varname>$_SESSION</varname>
+ are different variables and that PHP handles them as such)
</simpara>
<simpara>
