From 1012fd53320e5a4bb8b9dd0aeba888cc769ff1a0 Mon Sep 17 00:00:00 2001
From: Philip Olson <philip@php.net>
Date: Sun, 20 Apr 2008 07:52:37 +0000
Subject: [PATCH] Completed move of language.variables.superglobals to
 variables/superglobals.xml And linked to the new register_globals FAQ.

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@257949 c90b9560-bf6c-de11-be94-00142212c4b1
---
 language/predefined/variables.xml | 36 +++++++------------------------
 1 file changed, 8 insertions(+), 28 deletions(-)

diff --git a/language/predefined/variables.xml b/language/predefined/variables.xml
index a3fb123342..6abb0f11b9 100644
--- a/language/predefined/variables.xml
+++ b/language/predefined/variables.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 
 <reference xml:id="reserved.variables" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <title>Predefined variables</title>
@@ -7,41 +7,21 @@
  <partintro>
 
   <para>
-   PHP provides a large number of predefined variables to any script. The
+   PHP provides a large number of predefined variables to all scripts. The
    variables represent everything from
    <link linkend="language.variables.external">external variables</link> to
    built-in environment variables, last error messages to last retrieved
    headers.
   </para>
-
-  <section xml:id="language.variables.superglobals">
-   <title>Superglobals</title>
-   <para>
-    Superglobals are built-in variables that are always available in all scopes.
-    These variables are:
-    <simplelist>
-     <member><varname>$GLOBALS</varname></member>
-     <member><varname>$_SERVER</varname></member>
-     <member><varname>$_GET</varname></member>
-     <member><varname>$_POST</varname></member>
-     <member><varname>$_FILES</varname></member>
-     <member><varname>$_COOKIE</varname></member>
-     <member><varname>$_SESSION</varname></member>
-     <member><varname>$_REQUEST</varname></member>
-     <member><varname>$_ENV</varname></member>
-    </simplelist>
-   </para>
-   <note>
-    <simpara>
-     Superglobals cannot be used as 
-     <link linkend="language.variables.variable">variable variables</link>
-     inside functions or class methods.
-    </simpara>
-   </note>
-  </section>
+  
+  <para>
+   See also the FAQ titled
+   "<link linkend="faq.register-globals">How does register_globals affect me?</link>"
+  </para>
 
  </partintro>
 
+ &language.predefined.variables.superglobals;
  &language.predefined.variables.globals;
  &language.predefined.variables.server;
  &language.predefined.variables.get;