philip Fri Feb 9 07:28:30 2007 UTC
Modified files:
/phpdoc/en/appendices reserved.xml
/phpdoc/en/chapters tutorial.xml
/phpdoc/en/features http-auth.xml
/phpdoc/en/language types.xml variables.xml
/phpdoc/en/reference/network/functions setcookie.xml
Log:
Removing "autoglobal" in favor of "superglobal" as it's the "official" term.
This should not confuse users because superglobal is used about 4x as often
in the manual, and it's what most people say/write. This old term is leftover
from when these auto super global variables were first introduced.
http://cvs.php.net/viewvc.cgi/phpdoc/en/appendices/reserved.xml?r1=1.62&r2=1.63&diff_format=u
Index: phpdoc/en/appendices/reserved.xml
diff -u phpdoc/en/appendices/reserved.xml:1.62
phpdoc/en/appendices/reserved.xml:1.63
--- phpdoc/en/appendices/reserved.xml:1.62 Mon Jan 22 03:03:52 2007
+++ phpdoc/en/appendices/reserved.xml Fri Feb 9 07:28:30 2007
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.62 $ -->
+<!-- $Revision: 1.63 $ -->
<appendix id="reserved">
<title>List of Reserved Words</title>
@@ -310,7 +310,7 @@
<simpara>
<varname>$HTTP_SERVER_VARS</varname> contains the same initial
- information, but is not an autoglobal. (Note that
+ information, but is not a superglobal. (Note that
<varname>$HTTP_SERVER_VARS</varname> and <varname>$_SERVER</varname>
are different variables and that PHP handles them as such)
</simpara>
@@ -323,7 +323,7 @@
<varname>$_SERVER</varname> and <varname>$HTTP_SERVER_VARS</varname>
arrays. For related information, see the security chapter titled
<link linkend="security.globals">Using Register
- Globals</link>. These individual globals are not autoglobals.
+ Globals</link>. These individual globals are not superglobals.
</simpara>
<simpara>
@@ -802,7 +802,7 @@
<simpara>
<varname>$HTTP_ENV_VARS</varname> contains the same initial
- information, but is not an autoglobal. (Note that
+ information, but is not a superglobal. (Note that
<varname>$HTTP_ENV_VARS</varname> and <varname>$_ENV</varname>
are different variables and that PHP handles them as such)
</simpara>
@@ -815,7 +815,7 @@
<varname>$_ENV</varname> and <varname>$HTTP_ENV_VARS</varname>
arrays. For related information, see the security chapter titled
<link linkend="security.globals">Using Register
- Globals</link>. These individual globals are not autoglobals.
+ Globals</link>. These individual globals are not superglobals.
</simpara>
</sect2>
@@ -844,7 +844,7 @@
<simpara>
<varname>$HTTP_COOKIE_VARS</varname> contains the same initial
- information, but is not an autoglobal. (Note that
+ information, but is not a superglobal. (Note that
<varname>$HTTP_COOKIE_VARS</varname> and <varname>$_COOKIE</varname>
are different variables and that PHP handles them as such)
</simpara>
@@ -857,7 +857,7 @@
<varname>$_COOKIE</varname> and <varname>$HTTP_COOKIE_VARS</varname>
arrays. For related information, see the security chapter titled
<link linkend="security.globals">Using Register
- Globals</link>. These individual globals are not autoglobals.
+ Globals</link>. These individual globals are not superglobals.
</simpara>
</sect2>
@@ -886,7 +886,7 @@
<simpara>
<varname>$HTTP_GET_VARS</varname> contains the same initial
- information, but is not an autoglobal. (Note that
+ information, but is not a superglobal. (Note that
<varname>$HTTP_GET_VARS</varname> and <varname>$_GET</varname>
are different variables and that PHP handles them as such)
</simpara>
@@ -899,7 +899,7 @@
<varname>$_GET</varname> and <varname>$HTTP_GET_VARS</varname>
arrays. For related information, see the security chapter titled
<link linkend="security.globals">Using Register
- Globals</link>. These individual globals are not autoglobals.
+ Globals</link>. These individual globals are not superglobals.
</simpara>
</sect2>
@@ -928,7 +928,7 @@
<simpara>
<varname>$HTTP_POST_VARS</varname> contains the same initial
- information, but is not an autoglobal. (Note that
+ information, but is not a superglobal. (Note that
<varname>$HTTP_POST_VARS</varname> and <varname>$_POST</varname>
are different variables and that PHP handles them as such)
</simpara>
@@ -941,7 +941,7 @@
<varname>$_POST</varname> and <varname>$HTTP_POST_VARS</varname>
arrays. For related information, see the security chapter titled
<link linkend="security.globals">Using Register
- Globals</link>. These individual globals are not autoglobals.
+ Globals</link>. These individual globals are not superglobals.
</simpara>
</sect2>
@@ -970,7 +970,7 @@
<simpara>
<varname>$HTTP_POST_FILES</varname> contains the same
- information, but is not an autoglobal. (Note that
+ information, but is not a superglobal. (Note that
<varname>$HTTP_POST_FILES</varname> and <varname>$_FILES</varname>
are different variables and that PHP handles them as such)
</simpara>
@@ -983,7 +983,7 @@
<varname>$_FILES</varname> and <varname>$HTTP_POST_FILES</varname>
arrays. For related information, see the security chapter titled
<link linkend="security.globals">Using Register
- Globals</link>. These individual globals are not autoglobals.
+ Globals</link>. These individual globals are not superglobals.
</simpara>
</sect2>
@@ -1024,7 +1024,7 @@
<varname>$_REQUEST</varname> array. For related information, see
the security chapter titled <link
linkend="security.globals">Using Register
- Globals</link>. These individual globals are not autoglobals.
+ Globals</link>. These individual globals are not superglobals.
</simpara>
</sect2>
@@ -1055,7 +1055,7 @@
<simpara>
<varname>$HTTP_SESSION_VARS</varname> contains the same
- information, but is not an autoglobal. (Note that
+ information, but is not a superglobal. (Note that
<varname>$HTTP_SESSION_VARS</varname> and <varname>$_SESSION</varname>
are different variables and that PHP handles them as such)
</simpara>
@@ -1068,7 +1068,7 @@
<varname>$_SESSION</varname> and <varname>$HTTP_SESSION_VARS</varname>
arrays. For related information, see the security chapter titled
<link linkend="security.globals">Using Register
- Globals</link>. These individual globals are not autoglobals.
+ Globals</link>. These individual globals are not superglobals.
</simpara>
</sect2>
http://cvs.php.net/viewvc.cgi/phpdoc/en/chapters/tutorial.xml?r1=1.45&r2=1.46&diff_format=u
Index: phpdoc/en/chapters/tutorial.xml
diff -u phpdoc/en/chapters/tutorial.xml:1.45
phpdoc/en/chapters/tutorial.xml:1.46
--- phpdoc/en/chapters/tutorial.xml:1.45 Tue Feb 6 19:16:03 2007
+++ phpdoc/en/chapters/tutorial.xml Fri Feb 9 07:28:30 2007
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-9"?>
-<!-- $Revision: 1.45 $ -->
+<!-- $Revision: 1.46 $ -->
<chapter id="tutorial">
<title>A simple tutorial</title>
@@ -227,7 +227,7 @@
<para>
<link linkend="reserved.variables.server">$_SERVER</link> is a
special reserved PHP variable that contains all web server information.
- It is known as an autoglobal (or superglobal). See the related manual
page on
+ It is known as a superglobal. See the related manual page on
<link linkend="language.variables.superglobals">superglobals</link>
for more information. These special variables were introduced in PHP
<ulink url="&url.php.release4.1.0;">4.1.0</ulink>. Before this time, we
used
@@ -439,14 +439,14 @@
using the <link linkend="ref.filter">filter</link> extension.
The <varname>$_POST['name']</varname> and <varname>$_POST['age']</varname>
variables are automatically set for you by PHP. Earlier we
- used the <varname>$_SERVER</varname> autoglobal; above we just
+ used the <varname>$_SERVER</varname> superglobal; above we just
introduced the <link linkend="reserved.variables.post">$_POST</link>
- autoglobal which contains all POST data. Notice how the
+ superglobal which contains all POST data. Notice how the
<emphasis>method</emphasis> of our form is POST. If we used the
method <emphasis>GET</emphasis> then our form information would live in
- the <link linkend="reserved.variables.get">$_GET</link> autoglobal instead.
+ the <link linkend="reserved.variables.get">$_GET</link> superglobal
instead.
You may also use the <link
linkend="reserved.variables.request">$_REQUEST</link>
- autoglobal, if you do not care about the source of your request data. It
+ superglobal, if you do not care about the source of your request data. It
contains the merged information of GET, POST and COOKIE data. Also see
the
<function>import_request_variables</function> function.
</para>
@@ -476,7 +476,7 @@
The deprecation of the old <varname>$HTTP_*_VARS</varname> arrays
(which need to be indicated as global when used inside a function or
method). The following
- <link linkend="language.variables.superglobals">autoglobal arrays</link>
+ <link linkend="language.variables.superglobals">superglobal
arrays</link>
were introduced in PHP <ulink
url="&url.php.release4.1.0;">4.1.0</ulink>.
They are: <varname>$_GET</varname>, <varname>$_POST</varname>,
<varname>$_COOKIE</varname>, <varname>$_SERVER</varname>,
@@ -494,7 +494,7 @@
<ulink url="&url.php.release4.2.0;">4.2.0</ulink> the PHP directive
<link linkend="ini.register-globals">register_globals</link> is
<emphasis>off</emphasis> by default in &php.ini;. The preferred
- method of accessing these values is via the autoglobal arrays mentioned
+ method of accessing these values is via the superglobal arrays mentioned
above. Older scripts, books, and tutorials may rely on this
directive being on. If it were on, for example, one could use
<varname>$id</varname> from the URL
http://cvs.php.net/viewvc.cgi/phpdoc/en/features/http-auth.xml?r1=1.48&r2=1.49&diff_format=u
Index: phpdoc/en/features/http-auth.xml
diff -u phpdoc/en/features/http-auth.xml:1.48
phpdoc/en/features/http-auth.xml:1.49
--- phpdoc/en/features/http-auth.xml:1.48 Wed Nov 1 15:37:09 2006
+++ phpdoc/en/features/http-auth.xml Fri Feb 9 07:28:30 2007
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.48 $ -->
+<!-- $Revision: 1.49 $ -->
<chapter id="features.http-auth">
<title>HTTP authentication with PHP</title>
@@ -24,7 +24,7 @@
<note>
<title>PHP Version Note</title>
<para>
- <link linkend="language.variables.superglobals">Autoglobals</link>,
+ <link linkend="language.variables.superglobals">Superglobals</link>,
such as <link linkend="reserved.variables.server">$_SERVER</link>, became
available in PHP <ulink url="&url.php.release4.1.0;">4.1.0</ulink>.
<varname>$HTTP_SERVER_VARS</varname> has been available since PHP 3.
http://cvs.php.net/viewvc.cgi/phpdoc/en/language/types.xml?r1=1.174&r2=1.175&diff_format=u
Index: phpdoc/en/language/types.xml
diff -u phpdoc/en/language/types.xml:1.174 phpdoc/en/language/types.xml:1.175
--- phpdoc/en/language/types.xml:1.174 Sun Feb 4 13:36:00 2007
+++ phpdoc/en/language/types.xml Fri Feb 9 07:28:30 2007
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.174 $ -->
+<!-- $Revision: 1.175 $ -->
<chapter id="language.types">
<title>Types</title>
@@ -1714,7 +1714,7 @@
// This will not work, results in a parse error such as:
// Parse error: parse error, expecting T_STRING' or T_VARIABLE' or
T_NUM_STRING'
-// This of course applies to using autoglobals in strings as well
+// This of course applies to using superglobals in strings as well
print "Hello $arr['fruit']";
print "Hello $_GET['foo']";
http://cvs.php.net/viewvc.cgi/phpdoc/en/language/variables.xml?r1=1.92&r2=1.93&diff_format=u
Index: phpdoc/en/language/variables.xml
diff -u phpdoc/en/language/variables.xml:1.92
phpdoc/en/language/variables.xml:1.93
--- phpdoc/en/language/variables.xml:1.92 Fri Aug 11 16:55:35 2006
+++ phpdoc/en/language/variables.xml Fri Feb 9 07:28:30 2007
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.92 $ -->
+<!-- $Revision: 1.93 $ -->
<chapter id="language.variables">
<title>Variables</title>
@@ -194,7 +194,7 @@
environment, and user input. These new arrays are rather special
in that they are automatically global--i.e., automatically
available in every scope. For this reason, they are often known as
- 'autoglobals' or 'superglobals'. (There is no mechanism in PHP for
+ "superglobals". (There is no mechanism in PHP for
user-defined superglobals.) The superglobals are listed below;
however, for a listing of their contents and further discussion on
PHP predefined variables and their natures, please see the section
http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/network/functions/setcookie.xml?r1=1.3&r2=1.4&diff_format=u
Index: phpdoc/en/reference/network/functions/setcookie.xml
diff -u phpdoc/en/reference/network/functions/setcookie.xml:1.3
phpdoc/en/reference/network/functions/setcookie.xml:1.4
--- phpdoc/en/reference/network/functions/setcookie.xml:1.3 Mon Jan 8
10:35:00 2007
+++ phpdoc/en/reference/network/functions/setcookie.xml Fri Feb 9 07:28:30 2007
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
<!-- splitted from ./en/functions/http.xml, last change in rev 1.2 -->
<refentry id="function.setcookie">
<refnamediv>
@@ -165,7 +165,7 @@
Once the cookies have been set, they can be accessed on the next page load
with the <link linkend="reserved.variables.cookies">$_COOKIE</link> or
<varname>$HTTP_COOKIE_VARS</varname> arrays. Note,
- <link linkend="language.variables.superglobals">autoglobals</link>
+ <link linkend="language.variables.superglobals">superglobals</link>
such as <varname>$_COOKIE</varname> became available in PHP
<ulink url="&url.php.release4.1.0;">4.1.0</ulink>.
<varname>$HTTP_COOKIE_VARS</varname> has existed since PHP 3. Cookie
