diff --git a/chapters/install.commandline.xml b/chapters/install.commandline.xml
index 01bd2ff6b0..339923f3f8 100644
--- a/chapters/install.commandline.xml
+++ b/chapters/install.commandline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.8 $ -->
+<!-- $Revision: 1.9 $ -->
   <sect1 id="install.commandline">
    <title>Servers-CGI/Commandline</title>
    <para>
@@ -56,18 +56,19 @@
    <sect2 id="install.commandline.using-variables">
     <title>Using Variables</title>
     <simpara>
-      Some server supplied environment variables are not defined in the
+      Some <link linkend="reserved.variables.server">server supplied
+      environment variables</link> are not defined in the 
       current <ulink url="&url.cgispec;">CGI/1.1 specification</ulink>.
       Only the following variables are defined there; everything else 
-      should be treated as 'vendor extensions': <varname>$AUTH_TYPE</varname>, 
-      <varname>$CONTENT_LENGTH</varname>, <varname>$CONTENT_TYPE</varname>,
-      <varname>$GATEWAY_INTERFACE</varname>, <varname>$PATH_INFO</varname>, 
-      <varname>$PATH_TRANSLATED</varname>, <varname>$QUERY_STRING</varname>,
-      <varname>$REMOTE_ADDR</varname>, <varname>$REMOTE_HOST</varname>, 
-      <varname>$REMOTE_IDENT</varname>, <varname>$REMOTE_USER</varname>,
-      <varname>$REQUEST_METHOD</varname>, <varname>$SCRIPT_NAME</varname>, 
-      <varname>$SERVER_NAME</varname>, <varname>$SERVER_PORT</varname>,
-      <varname>$SERVER_PROTOCOL</varname>, and <varname>$SERVER_SOFTWARE</varname>
+      should be treated as 'vendor extensions': <varname>AUTH_TYPE</varname>, 
+      <varname>CONTENT_LENGTH</varname>, <varname>CONTENT_TYPE</varname>,
+      <varname>GATEWAY_INTERFACE</varname>, <varname>PATH_INFO</varname>, 
+      <varname>PATH_TRANSLATED</varname>, <varname>QUERY_STRING</varname>,
+      <varname>REMOTE_ADDR</varname>, <varname>REMOTE_HOST</varname>, 
+      <varname>REMOTE_IDENT</varname>, <varname>REMOTE_USER</varname>,
+      <varname>REQUEST_METHOD</varname>, <varname>SCRIPT_NAME</varname>, 
+      <varname>SERVER_NAME</varname>, <varname>SERVER_PORT</varname>,
+      <varname>SERVER_PROTOCOL</varname>, and <varname>SERVER_SOFTWARE</varname>
     </simpara>
    </sect2>
    
diff --git a/chapters/install.windows.xml b/chapters/install.windows.xml
index f5c2c5fbc2..bcb1568593 100644
--- a/chapters/install.windows.xml
+++ b/chapters/install.windows.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.42 $ -->
+<!-- $Revision: 1.43 $ -->
   <sect1 id="install.windows">
    <title>Installation on Windows systems</title>
    <para>
@@ -233,7 +233,7 @@ c:\php
        webserver loads the dll (e.g. <filename>php4apache.dll</filename>).
       </member>
       <member>
-       Any directory in your Windows <varname>$PATH</varname> environment variable.
+       Any directory in your Windows <varname>PATH</varname> environment variable.
       </member>
      </simplelist>
      <itemizedlist>
@@ -784,7 +784,7 @@ extension=php_bz2.dll
         (<filename>php_oci8.dll</filename>) require DLLs which are not bundled
         with the distribution package. Copy the bundled DLLs from
         <filename class="directory">c:\php\dlls</filename> folder to your Windows 
-        <varname>$PATH</varname>, safe places are:
+        <varname>PATH</varname>, safe places are:
         <simplelist>
          <member>c:\windows\system for Windows 9x/Me</member>
          <member>c:\winnt\system32 for Windows NT/2000</member>
diff --git a/features/http-auth.xml b/features/http-auth.xml
index b2bc1c136d..859b6358bd 100644
--- a/features/http-auth.xml
+++ b/features/http-auth.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.39 $ -->
+<!-- $Revision: 1.40 $ -->
  <chapter id="features.http-auth">
   <title>HTTP authentication with PHP</title>
 
@@ -12,8 +12,8 @@
    input window.  Once the user has filled in a username and a password, 
    the URL containing the PHP script will be called again with the 
    <link linkend="reserved.variables">predefined variables</link> 
-   <varname>$PHP_AUTH_USER</varname>, <varname>$PHP_AUTH_PW</varname>, 
-   and <varname>$AUTH_TYPE</varname> set to the user name, password and 
+   <varname>PHP_AUTH_USER</varname>, <varname>PHP_AUTH_PW</varname>, 
+   and <varname>AUTH_TYPE</varname> set to the user name, password and 
    authentication type respectively.  These predefined variables are found 
    in the <link linkend="reserved.variables.server">$_SERVER</link> and 
    <varname>$HTTP_SERVER_VARS</varname> arrays.  Only "Basic" authentication 
@@ -68,8 +68,8 @@
   </note>
 
   <para>
-   Instead of simply printing out <varname>$PHP_AUTH_USER</varname> 
-   and <varname>$PHP_AUTH_PW</varname>, as done in the above example, 
+   Instead of simply printing out <varname>PHP_AUTH_USER</varname> 
+   and <varname>PHP_AUTH_PW</varname>, as done in the above example, 
    you may want to check the username and password for validity.  
    Perhaps by sending a query to a database, or by looking up the 
    user in a dbm file.