diff --git a/chapters/install.commandline.xml b/chapters/install.commandline.xml
index 8b253d66cb..01bd2ff6b0 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.7 $ -->
+<!-- $Revision: 1.8 $ -->
   <sect1 id="install.commandline">
    <title>Servers-CGI/Commandline</title>
    <para>
@@ -59,11 +59,15 @@
       Some server supplied environment variables 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': AUTH_TYPE, CONTENT_LENGTH, CONTENT_TYPE,
-      GATEWAY_INTERFACE, PATH_INFO, PATH_TRANSLATED, QUERY_STRING,
-      REMOTE_ADDR, REMOTE_HOST, REMOTE_IDENT, REMOTE_USER,
-      REQUEST_METHOD, SCRIPT_NAME, SERVER_NAME, SERVER_PORT,
-      SERVER_PROTOCOL and SERVER_SOFTWARE
+      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.iplanet.xml b/chapters/install.iplanet.xml
index c17befdd74..01e1d00f30 100644
--- a/chapters/install.iplanet.xml
+++ b/chapters/install.iplanet.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.15 $ -->
+<!-- $Revision: 1.16 $ -->
   <sect1 id="install.netscape-enterprise">
    <title>Servers-Netscape, iPlanet and SunONE</title>
    <para>
@@ -105,7 +105,7 @@
     <formalpara>
      <title>Configuration Instructions for NES/iPlanet/SunONE</title>
      <para>
-      Firstly you may need to add some paths to the LD_LIBRARY_PATH environment
+      Firstly you may need to add some paths to the <varname>LD_LIBRARY_PATH</varname> environment
       for SunONE to find all the shared libs. This can best done in the start
       script for your SunONE webserver. Windows users can probably skip this
       step. The start script is often located in: <filename
@@ -422,7 +422,7 @@ register_globals = On
    <sect2 id="install.netscape.specialpages">
     <title>Special use for error pages or self-made directory listings (PHP &gt;= 4.3.3)</title>
     <para>
-     You can use PHP to generate the error pages for "404 Not Found"
+     You can use PHP to generate the error pages for <literal>"404 Not Found"</literal>
      or similar. Add the following line to the object in <filename>obj.conf</filename> for
      every error page you want to overwrite:
      <programlisting>
diff --git a/chapters/install.otherhttpd.xml b/chapters/install.otherhttpd.xml
index deba1d77a1..fc4003c053 100644
--- a/chapters/install.otherhttpd.xml
+++ b/chapters/install.otherhttpd.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
   <sect1 id="install.otherhttpd">
    <title>Servers-Other web servers</title>
    <para>
@@ -10,8 +10,8 @@
     see <link linkend="install.configure.servers">Server-related
     options</link> for a full list of server-related configure
 -->
-    see Server-related
-    options for a full list of server-related configure
+    see <link linkend="install.configure.options.servers">Server-related
+    options</link> for a full list of server-related configure
     options. The PHP CGI binaries are compatible with almost all
     webservers supporting the CGI standard.
    </para>
diff --git a/chapters/install.sambar.xml b/chapters/install.sambar.xml
index 4c75623745..cd6116ace7 100644
--- a/chapters/install.sambar.xml
+++ b/chapters/install.sambar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
   <sect1 id="install.sambar">
    <title>Servers-Sambar</title>
    <para>
@@ -26,15 +26,16 @@
        <para>
         Open <filename>mappings.ini</filename> and add the following line
         under <literal>[ISAPI]</literal>:
-        <informalexample>
-         <screen>
+      <example>
+       <title>ISAPI configuration of Sambar</title>
+       <programlisting>
 <![CDATA[
 *.php = c:\php\php4isapi.dll
 ]]>
-         </screen>
-        </informalexample>
+       </programlisting>
+      </example>
         (This line assumes that PHP was installed in
-        <literal>c:\php</literal>.)
+        <filename>c:\php</filename>.)
        </para>
       </listitem>
       <listitem>
diff --git a/chapters/install.solaris.xml b/chapters/install.solaris.xml
index 60e1f0e926..4fcdd2502d 100644
--- a/chapters/install.solaris.xml
+++ b/chapters/install.solaris.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
 <sect1 id="install.solaris">
- <title>Unix/Solaris installs</title>
+ <title>Unix/<productname>Solaris</productname> installs</title>
  <para>
   This section contains notes and hints specific to installing
-  PHP on Solaris systems.
+  PHP on <productname>Solaris</productname> systems.
  </para>
  <sect2 id="install.solaris.required">
   <title>Required software</title>
   <para>
-   Solaris installs often lack C compilers and their related tools.
+   <productname>Solaris</productname> installs often lack C compilers and their related tools.
    Read <link linkend="faq.installation.needgnu">this FAQ</link> 
    for information on why using GNU versions for some of these
    tools is necessary.  The required software is as follows:
@@ -78,7 +78,7 @@
  <sect2 id="install.solaris.packages">
   <title>Using Packages</title>
   <simpara>
-   You can simplify the Solaris install process by using pkgadd to
+   You can simplify the <productname>Solaris</productname> install process by using pkgadd to
    install most of your needed components. 
   </simpara>
  </sect2>
diff --git a/chapters/install.windows.xml b/chapters/install.windows.xml
index 63c04ed2ed..f5c2c5fbc2 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.41 $ -->
+<!-- $Revision: 1.42 $ -->
   <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 PATH environment variable.
+       Any directory in your Windows <varname>$PATH</varname> environment variable.
       </member>
      </simplelist>
      <itemizedlist>
@@ -783,8 +783,8 @@ extension=php_bz2.dll
         <filename class="directory">c:\php\dlls\</filename> folder but some, for example Oracle
         (<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 PATH, safe
-        places are:
+        <filename class="directory">c:\php\dlls</filename> folder to your Windows 
+        <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/chapters/install.xitami.xml b/chapters/install.xitami.xml
index e324e07510..9f5e72f4a5 100644
--- a/chapters/install.xitami.xml
+++ b/chapters/install.xitami.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
   <sect1 id="install.xitami">
    <title>Servers-Xitami</title>
    <para>
@@ -43,7 +43,7 @@
       <listitem>
        <para>
         In Filter command or script put the path and name
-        of your PHP executable i.e. <literal>c:\php\php.exe</literal>.
+        of your PHP executable i.e. <filename>c:\php\php.exe</filename>.
        </para>
       </listitem>
       <listitem>
diff --git a/chapters/streams.file.xml b/chapters/streams.file.xml
index 002488e1f2..2128197e05 100755
--- a/chapters/streams.file.xml
+++ b/chapters/streams.file.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
 <!-- Author: Wez Furlong <wez@thebrainroom.com>
   Please contact me before making any major amendments to the
   content of this section.  Splitting/Merging are fine if they are
@@ -44,7 +44,7 @@
       <methodparam><type>void</type><parameter></parameter></methodparam>
      </methodsynopsis>
     <para>
-     <function>php_stream_fopen_from_file</function> returns a stream based on a
+     <function>php_stream_fopen_tmpfile</function> returns a stream based on a
      temporary file opened with a mode of "w+b".  The temporary file will be deleted
      automatically when the stream is closed or the process terminates.
      </para>