diff --git a/language/variables.xml b/language/variables.xml
index 18cbb182e0..e91def8e04 100644
--- a/language/variables.xml
+++ b/language/variables.xml
@@ -152,7 +152,7 @@ $bar = &test();    // Invalid.
     <para>
      <variablelist>
       <varlistentry>
-       <term>GATEWAY_INTERFACE</term>
+       <term>$GATEWAY_INTERFACE</term>
        <listitem>
         <simpara>
          What revision of the CGI specification the server is using;
@@ -162,7 +162,7 @@ $bar = &amp;test();    // Invalid.
       </varlistentry>
 
       <varlistentry>
-       <term>SERVER_NAME</term>
+       <term>$SERVER_NAME</term>
        <listitem>
         <simpara>
          The name of the server host under which the current script is
@@ -173,7 +173,7 @@ $bar = &amp;test();    // Invalid.
       </varlistentry>
 
       <varlistentry>
-       <term>SERVER_SOFTWARE</term>
+       <term>$SERVER_SOFTWARE</term>
        <listitem>
         <simpara>
          Server identification string, given in the headers when
@@ -183,7 +183,7 @@ $bar = &amp;test();    // Invalid.
       </varlistentry>
 
       <varlistentry>
-       <term>SERVER_PROTOCOL</term>
+       <term>$SERVER_PROTOCOL</term>
        <listitem>
         <simpara>
          Name and revision of the information protocol via which the
@@ -193,7 +193,7 @@ $bar = &amp;test();    // Invalid.
       </varlistentry>
       
       <varlistentry>
-       <term>REQUEST_METHOD</term>
+       <term>$REQUEST_METHOD</term>
        <listitem>
         <simpara>
          Which request method was used to access the page; i.e. 'GET',
@@ -203,7 +203,7 @@ $bar = &amp;test();    // Invalid.
       </varlistentry>
 	  
       <varlistentry>
-       <term>QUERY_STRING</term>
+       <term>$QUERY_STRING</term>
        <listitem>
         <simpara>
          The query string, if any, via which the page was accessed.
@@ -212,7 +212,7 @@ $bar = &amp;test();    // Invalid.
       </varlistentry>
 
       <varlistentry>
-       <term>DOCUMENT_ROOT</term>
+       <term>$DOCUMENT_ROOT</term>
        <listitem>
         <simpara>
          The document root directory under which the current script is
@@ -222,7 +222,7 @@ $bar = &amp;test();    // Invalid.
       </varlistentry>
 
       <varlistentry>
-       <term>HTTP_ACCEPT</term>
+       <term>$HTTP_ACCEPT</term>
        <listitem>
         <simpara>
          Contents of the <literal>Accept:</literal> header from the
@@ -232,7 +232,7 @@ $bar = &amp;test();    // Invalid.
       </varlistentry>
 
       <varlistentry>
-       <term>HTTP_ACCEPT_CHARSET</term>
+       <term>$HTTP_ACCEPT_CHARSET</term>
        <listitem>
         <simpara>
          Contents of the <literal>Accept-Charset:</literal> header
@@ -243,7 +243,7 @@ $bar = &amp;test();    // Invalid.
       </varlistentry>
 
       <varlistentry>
-       <term>HTTP_ACCEPT_ENCODING</term>
+       <term>$HTTP_ACCEPT_ENCODING</term>
        <listitem>
         <simpara>
          Contents of the <literal>Accept-Encoding:</literal> header
@@ -253,7 +253,7 @@ $bar = &amp;test();    // Invalid.
       </varlistentry>
       
       <varlistentry>
-       <term>HTTP_ACCEPT_LANGUAGE</term>
+       <term>$HTTP_ACCEPT_LANGUAGE</term>
        <listitem>
         <simpara>
          Contents of the <literal>Accept-Language:</literal> header
@@ -263,7 +263,7 @@ $bar = &amp;test();    // Invalid.
       </varlistentry>
       
       <varlistentry>
-       <term>HTTP_CONNECTION</term>
+       <term>$HTTP_CONNECTION</term>
        <listitem>
         <simpara>
          Contents of the <literal>Connection:</literal> header from
@@ -273,7 +273,7 @@ $bar = &amp;test();    // Invalid.
       </varlistentry>
 
       <varlistentry>
-       <term>HTTP_HOST</term>
+       <term>$HTTP_HOST</term>
        <listitem>
         <simpara>
          Contents of the <literal>Host:</literal> header from the
@@ -283,7 +283,7 @@ $bar = &amp;test();    // Invalid.
       </varlistentry>
 
       <varlistentry>
-       <term>HTTP_REFERER</term>
+       <term>$HTTP_REFERER</term>
        <listitem>
         <simpara>
          The address of the page (if any) which referred the browser
@@ -294,7 +294,7 @@ $bar = &amp;test();    // Invalid.
       </varlistentry>
 
       <varlistentry>
-       <term>HTTP_USER_AGENT</term>
+       <term>$HTTP_USER_AGENT</term>
        <listitem>
         <simpara>
          Contents of the <literal>User_Agent:</literal> header from
@@ -310,7 +310,7 @@ $bar = &amp;test();    // Invalid.
       </varlistentry>
 
       <varlistentry>
-       <term>REMOTE_ADDR</term>
+       <term>$REMOTE_ADDR</term>
        <listitem>
         <simpara>
          The IP address from which the user is viewing the current
@@ -320,7 +320,7 @@ $bar = &amp;test();    // Invalid.
       </varlistentry>
 
       <varlistentry>
-       <term>REMOTE_PORT</term>
+       <term>$REMOTE_PORT</term>
        <listitem>
         <simpara>
          The port being used on the user's machine to communicate with
@@ -330,7 +330,7 @@ $bar = &amp;test();    // Invalid.
       </varlistentry>
 
       <varlistentry>
-       <term>SCRIPT_FILENAME</term>
+       <term>$SCRIPT_FILENAME</term>
        <listitem>
         <simpara>
          The absolute pathname of the currently executing script.
@@ -339,7 +339,7 @@ $bar = &amp;test();    // Invalid.
       </varlistentry>
 
       <varlistentry>
-       <term>SERVER_ADMIN</term>
+       <term>$SERVER_ADMIN</term>
        <listitem>
         <simpara>
          The value given to the SERVER_ADMIN (for Apache) directive in
@@ -351,7 +351,7 @@ $bar = &amp;test();    // Invalid.
       </varlistentry>
       
       <varlistentry>
-       <term>SERVER_PORT</term>
+       <term>$SERVER_PORT</term>
        <listitem>
         <simpara>
          The port on the server machine being used by the web server
@@ -363,7 +363,7 @@ $bar = &amp;test();    // Invalid.
       </varlistentry>
 
       <varlistentry>
-       <term>SERVER_SIGNATURE</term>
+       <term>$SERVER_SIGNATURE</term>
        <listitem>
         <simpara>
          String containing the server version and virtual host name
@@ -373,7 +373,7 @@ $bar = &amp;test();    // Invalid.
       </varlistentry>
 
       <varlistentry>
-       <term>PATH_TRANSLATED</term>
+       <term>$PATH_TRANSLATED</term>
        <listitem>
         <simpara>
          Filesystem- (not document root-) based path to the current
@@ -384,7 +384,7 @@ $bar = &amp;test();    // Invalid.
       </varlistentry>
 
       <varlistentry>
-       <term>SCRIPT_NAME</term>
+       <term>$SCRIPT_NAME</term>
        <listitem>
         <simpara>
          Contains the current script's path. This is useful for pages
@@ -394,7 +394,7 @@ $bar = &amp;test();    // Invalid.
       </varlistentry>
 
       <varlistentry>
-       <term>REQUEST_URI</term>
+       <term>$REQUEST_URI</term>
        <listitem>
         <simpara>
          The URI which was given in order to access this page; for
@@ -464,7 +464,7 @@ $bar = &amp;test();    // Invalid.
     <para>
      <variablelist>
       <varlistentry>
-       <term>argv</term>
+       <term>$argv</term>
        <listitem>
         <simpara>
          Array of arguments passed to the script. When the script is
@@ -476,7 +476,7 @@ $bar = &amp;test();    // Invalid.
       </varlistentry>
 
       <varlistentry>
-       <term>argc</term>
+       <term>$argc</term>
        <listitem>
         <simpara>
          Contains the number of command line parameters passed to the
@@ -486,7 +486,7 @@ $bar = &amp;test();    // Invalid.
       </varlistentry>
 
       <varlistentry>
-       <term>PHP_SELF</term>
+       <term>$PHP_SELF</term>
        <listitem>
         <simpara>
          The filename of the currently executing script, relative to
@@ -497,7 +497,7 @@ $bar = &amp;test();    // Invalid.
       </varlistentry>
 	  
       <varlistentry>
-       <term>HTTP_COOKIE_VARS</term>
+       <term>$HTTP_COOKIE_VARS</term>
        <listitem>
         <simpara>
          An associative array of variables passed to the current
@@ -507,7 +507,7 @@ $bar = &amp;test();    // Invalid.
       </varlistentry>
       
       <varlistentry>
-       <term>HTTP_GET_VARS</term>
+       <term>$HTTP_GET_VARS</term>
        <listitem>
         <simpara>
          An associative array of variables passed to the current
@@ -517,7 +517,7 @@ $bar = &amp;test();    // Invalid.
       </varlistentry>
       
       <varlistentry>
-       <term>HTTP_POST_VARS</term>
+       <term>$HTTP_POST_VARS</term>
        <listitem>
         <simpara>
          An associative array of variables passed to the current
@@ -527,7 +527,7 @@ $bar = &amp;test();    // Invalid.
       </varlistentry>
     
       <varlistentry>
-       <term>HTTP_POST_FILES</term>
+       <term>$HTTP_POST_FILES</term>
        <listitem>
         <simpara>
          An associative array of variables containing information
@@ -544,7 +544,7 @@ $bar = &amp;test();    // Invalid.
       </varlistentry>
   
     <varlistentry>
-       <term>HTTP_ENV_VARS</term>
+       <term>$HTTP_ENV_VARS</term>
        <listitem>
         <simpara>
          An associative array of variables passed to the current
@@ -554,7 +554,7 @@ $bar = &amp;test();    // Invalid.
       </varlistentry>
 
     <varlistentry>
-       <term>HTTP_SERVER_VARS</term>
+       <term>$HTTP_SERVER_VARS</term>
        <listitem>
         <simpara>
          An associative array of variables passed to the current