diff --git a/appendices/filters.xml b/appendices/filters.xml
index 3d8b7a4d3f..493bd9be89 100644
--- a/appendices/filters.xml
+++ b/appendices/filters.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.8 $ -->
+<!-- $Revision: 1.9 $ -->
 <appendix id="filters">
  <title>List of Available Filters</title>
  <para>
@@ -279,7 +279,7 @@ fwrite($fp, "This is a test.\n");
 
   <simpara>
     zlib.* compression filters are available with PHP as of version <literal>5.1.0</literal> if
-    <xref linkend="zlib"/> support is enabled.  They are also available as a backport in version
+    <xref linkend="ref.zlib"/> support is enabled.  They are also available as a backport in version
     <literal>5.0.x</literal> by installing the <ulink url="&url.pecl.package;zlib_filter">zlib_filter</ulink>
     package from <ulink url="&url.pecl;">PECL</ulink>.  These filters are <emphasis>not</emphasis>
     available for <literal>PHP 4</literal>.
diff --git a/chapters/install.apache.xml b/chapters/install.apache.xml
index 96e62716bc..ac9ec7cfe8 100644
--- a/chapters/install.apache.xml
+++ b/chapters/install.apache.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.23 $ -->
+<!-- $Revision: 1.24 $ -->
   <sect1 id="install.apache">
    <title>Servers-Apache</title>
    <para>
@@ -14,10 +14,10 @@
     <para>
      You can select arguments to add to the
      <command>configure</command> on line 10 below from the <link
-     linkend="install.configure">Complete list of configure
-     options</link>. The version numbers have been omitted here, to
-     ensure the instructions are not incorrect. You will need to replace
-     the 'xxx' here with the correct values from your files.
+     linkend="configure">configure options</link>.  The version numbers have
+     been omitted here, to ensure the instructions are not incorrect. You
+     will need to replace the 'xxx' here with the correct values from your
+     files.
     </para>
 
     <example id="install.apache.unix.longer">
diff --git a/chapters/install.caudium.xml b/chapters/install.caudium.xml
index ff0192ff17..ca05f01304 100644
--- a/chapters/install.caudium.xml
+++ b/chapters/install.caudium.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.7 $ -->
+<!-- $Revision: 1.8 $ -->
   <sect1 id="install.caudium">
    <title>Servers-Caudium</title>
    <para>
@@ -36,9 +36,8 @@
    </example>
    <para>
     You can of course compile your Caudium module with support for the
-    various extensions available in PHP 4. See the 
-    <link linkend="install.configure">complete list of configure
-    options</link> for an exhaustive rundown. 
+    various extensions available in PHP.  See the chapter on  
+    <link linkend="configure">configure options</link> for more details.
    </para>
    <note>
     <para>
diff --git a/chapters/install.fhttpd.xml b/chapters/install.fhttpd.xml
index 533aee8c82..112a088930 100644
--- a/chapters/install.fhttpd.xml
+++ b/chapters/install.fhttpd.xml
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
   <sect1 id="install.fhttpd">
    <title>Servers-fhttpd</title>
    <para>
     To build PHP as an fhttpd module, answer "yes" to "Build as an
-    fhttpd module?" (the <link
-    linkend="install.configure.with-fhttpd">
-    --with-fhttpd</link>=<replaceable>DIR</replaceable>
-    option to configure) and specify the fhttpd source base
-    directory.  The default directory is <filename
+    fhttpd module?" to the <literal>--with-fhttpd=[DIR]</literal>
+    <link linkend="configure">configure option</link> and specify the fhttpd
+    source base directory.  The default directory is <filename
     class="directory">/usr/local/src/fhttpd</filename>. If you are
     running fhttpd, building PHP as a module will give better
     performance, more control and remote execution capability.
diff --git a/chapters/install.iplanet.xml b/chapters/install.iplanet.xml
index 01e1d00f30..fd2a6ccde6 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.16 $ -->
+<!-- $Revision: 1.17 $ -->
   <sect1 id="install.netscape-enterprise">
    <title>Servers-Netscape, iPlanet and SunONE</title>
    <para>
@@ -23,9 +23,8 @@
     <title>Installing PHP with NES/iPlanet/SunONE Webserver on Sun Solaris</title>
     <para>
      To build PHP with NES/iPlanet/SunONE webservers, enter the proper install
-     directory for the
-     <link linkend="install.configure.with-nsapi">--with-nsapi=[DIR]</link>
-     option. The default directory is usually
+     directory for the <literal>--with-nsapi=[DIR]</literal> option. The
+     default directory is usually 
      <filename class="directory">/opt/netscape/suitespot/</filename>.
      Please also read <filename>/php-xxx-version/sapi/nsapi/nsapi-readme.txt</filename>.
     </para>
diff --git a/chapters/install.otherhttpd.xml b/chapters/install.otherhttpd.xml
index fc4003c053..4da9db7d65 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.2 $ -->
+<!-- $Revision: 1.3 $ -->
   <sect1 id="install.otherhttpd">
    <title>Servers-Other web servers</title>
    <para>
@@ -10,10 +10,9 @@
     see <link linkend="install.configure.servers">Server-related
     options</link> 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.
+    see the <link linkend="configure">configure options</link> chapter for
+    more details.  The PHP CGI binaries are compatible with almost all
+    webservers supporting the CGI standard. 
    </para>
   </sect1>
 
@@ -36,4 +35,4 @@ End:
 vim600: syn=xml fen fdm=syntax fdl=2 si
 vim: et tw=78 syn=sgml
 vi: ts=1 sw=1
--->
\ No newline at end of file
+-->
diff --git a/chapters/install.unix.xml b/chapters/install.unix.xml
index 722b052928..bcce23fe83 100644
--- a/chapters/install.unix.xml
+++ b/chapters/install.unix.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
   <sect1 id="install.unix">
    <title>Installation on Unix systems</title>
    <para>
@@ -56,10 +56,9 @@
     The initial PHP setup and configuration process is controlled by the
     use of the commandline options of the <filename>configure</filename>
     script. This page outlines the usage of the most common options,
-    but there are many others to play with. Check out the <link
-    linkend="install.configure">Complete list of configure
-     options</link> for an exhaustive rundown. There are several ways
-     to install PHP:
+    but there are many others to play with. Check out the chapter on 
+    <link linkend="configure">configure options</link> for more details. 
+    There are several ways to install PHP:
     <itemizedlist>
      <listitem>
       <simpara>
diff --git a/chapters/install.windows.xml b/chapters/install.windows.xml
index bcb1568593..c880f66281 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.43 $ -->
+<!-- $Revision: 1.44 $ -->
   <sect1 id="install.windows">
    <title>Installation on Windows systems</title>
    <para>
@@ -380,12 +380,6 @@ doc_root = c:\apache\htdocs // for Apache
        </simpara>
       </listitem>
 
-      <listitem>
-       <simpara>
-        .. the <link linkend="install.oreilly">Oreilly Website Pro</link> server.
-       </simpara>
-      </listitem>
-      
       <listitem>
        <simpara>
         .. the <link linkend="install.sambar">Sambar</link> server.
diff --git a/chapters/tutorial.xml b/chapters/tutorial.xml
index d61cb54bfa..be29a55826 100644
--- a/chapters/tutorial.xml
+++ b/chapters/tutorial.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.34 $ -->
+<!-- $Revision: 1.35 $ -->
  <chapter id="tutorial">
   <title>A simple tutorial</title>
 
@@ -44,10 +44,10 @@
    </para>
    <para>
     You can either install these individually or choose a simpler way. Our
-    manual has <link linkend="install">installation instructions for PHP</link>
-    (assuming you already have some webserver set up). In case you have
-    problems with installing PHP yourself, we would suggest you ask your
-    questions on our <ulink url="&url.php.mailing-lists;">installation
+    manual has <link linkend="installation">installation instructions for
+    PHP</link> (assuming you already have some webserver set up). In case
+    you have problems with installing PHP yourself, we would suggest you ask
+    your questions on our <ulink url="&url.php.mailing-lists;">installation
     mailing list</ulink>. If you choose to go on the simpler route, then
     <ulink url="&url.installkits;">locate a pre-configured package</ulink>
     for your operating system,  which automatically installs all of these
diff --git a/reference/session/reference.xml b/reference/session/reference.xml
index 9fa2d3c42d..a59c6d23ba 100644
--- a/reference/session/reference.xml
+++ b/reference/session/reference.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.46 $ -->
+<!-- $Revision: 1.47 $ -->
  <reference id="ref.session">
   <title>Session Handling Functions</title>
   <titleabbrev>Sessions</titleabbrev>
@@ -320,7 +320,7 @@ if (! isset($_SESSION['count'])) {
     <para>
      PHP is capable of transforming links transparently. Unless you are using
      PHP 4.2 or later, you need to enable it manually when building PHP.
-     Under Unix, pass <link linkend="configure.enable-trans-sid">
+     Under Unix, pass <link linkend="ini.session.use-trans-sid">
      --enable-trans-sid</link> to configure. If this build
      option and the run-time option
      <literal>session.use_trans_sid</literal> are enabled, relative
@@ -374,7 +374,7 @@ here</a>.
     </para>
     <para>
      Printing the SID, like shown above, is not necessary if
-     <link linkend="install.configure.enable-trans-sid">
+     <link linkend="ini.session.use-trans-sid">
      --enable-trans-sid</link> was used to compile PHP.
     </para>
     <note>