diff --git a/chapters/install.xml b/chapters/install.xml
index 31d29dbe8b..bb9cace734 100644
--- a/chapters/install.xml
+++ b/chapters/install.xml
@@ -96,16 +96,16 @@
      </listitem>
     </itemizedlist>
    </para>
-
+	 
    <sect2 id="install.unix.apache-module">
     <title>Apache Module Quick Reference</title>
-
+		
     <para>
      PHP can be compiled in a number of different ways, but one of
      the most popular is as an Apache module. The following is a quick
      installation overview.
     </para>
-
+		
     <example id="install.unix.apache-module.quick">
      <title>
       Quick Installation Instructions for PHP 4 (Apache Module Version)
@@ -175,7 +175,7 @@
     This section contains notes and hints specific to HP-UX installs
     of PHP. 
    </para>
-   <example id="install.hpux">
+   <example id="install.hpux.example">
     <title>
      Installation Instructions for HP-UX 10
     </title>
@@ -250,7 +250,6 @@ Hope this helps somebody,
 Paul Mckay.
   </programlisting>
  </example>
-</sect2>
 
 </sect1>
 
@@ -360,7 +359,7 @@ Paul Mckay.
      There are two slightly different versions of Mac OS X, client and
      server. The following is for OS X server.
     </simpara>
-    <example id="install.macosx.compile">
+    <example id="install.macosx.compile.example">
      <title>
       Mac OS X server install
      </title>
@@ -432,6 +431,7 @@ Paul Mckay.
       </programlisting>
      </example>
      
+<simpara>
      Other examples for
      <ulink url="&url.stepwise.macosx-client;">Mac OS X client</ulink>
      and
@@ -1619,7 +1619,7 @@ Paul Mckay.
        <parameter>--enable-force-cgi-redirect</parameter>
       </term>
       <listitem>
-       <para>
+       <para> 
         PHP 3, PHP 4: Enable the security check for internal server redirects.
         You should use this if you are running the CGI version with Apache.
        </para>
@@ -2936,7 +2936,7 @@ Paul Mckay.
    
   </sect1>
 
-  <sect1 id="install-windows95-nt">
+  <sect1 id="install-windows-modules">
    <title>Installation of Windows Modules</title>
    <para>
     After installing PHP and a webserver on windows, you will
@@ -3513,17 +3513,16 @@ Paul Mckay.
    </sect2>
    
   </sect1>
-
+	
   <sect1 id="install.netscape-enterprise">
    <title>Netscape and iPlanet Enterprise Server Installs</title>
    <para>
     To build PHP with NES or iPlanet web servers, enter the proper
-    install directory for the <option>
-    <link linkend="install.configure.with-nsapi">--with-nsapi</link>=
-    <replaceable>DIR</replaceable></option>
-    option. The default directory is usually <filename
-    class="directory">/opt/netscape/suitespot/</filename>. Please
-    also read /php-xxx-version/sapi/nsapi/nsapi-readme.txt. 
+		install directory for the 
+    <option><link linkend="install.configure.with-nsapi">--with-nsapi</link> = <replaceable>DIR</replaceable></option> 
+    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>
    <para>
     <example id="install.netscape-enterprise.solaris">
@@ -3577,13 +3576,13 @@ your netscape server is installed. Otherwise, change to correct path:
      <filename
      class="directory">/path/to/server/https-servername/start</filename> 
     </para>
-    <para>
+	 <para>
      You may also need to edit the configuration files that are
-     located in:<filename
+		located in:<filename
      class="directory">/path/to/server/https-servername/config/</filename>.
-     <para>
-
-     <example id="install.netscape-enterprise.configure">
+	 </para>
+	 
+	 <example id="install.netscape-enterprise.configure">
       <title>
        Configuration Example for Netscape Enterprise
       </title>
@@ -3601,7 +3600,7 @@ You should place the following lines after mime types init.
     Init fn="load-modules" funcs="php4_init,php4_close,php4_execute,php4_auth_trans" shlib="/php4/nsapiPHP4.dll"
     Init fn=php4_init errorString="Failed to initialize PHP!"
 
-    <Object name="default"> 
+    &lt;object name="default"&gt;
     . 
     . 
     . 
@@ -3609,13 +3608,13 @@ You should place the following lines after mime types init.
     Service fn="php4_execute" type="magnus-internal/x-httpd-php" 
     . 
     . 
-    </Object> 
+    &lt;/Object&gt;
 
 
-    <Object name="x-httpd-php"> 
+    &lt;Object name="x-httpd-php"&gt; 
     ObjectType fn="force-type" type="magnus-internal/x-httpd-php" 
     Service fn=php4_execute 
-    </Object> 
+    &lt;/Object&gt; 
 
 
     Authentication configuration 
@@ -3624,22 +3623,21 @@ You should place the following lines after mime types init.
     PASSED TO YOUR PHP SCRIPT. To configure PHP Authentication for the entire server, add 
     the following line: 
 
-    <Object name="default"> 
+    &lt;Object name="default"&gt; 
     AuthTrans fn=php4_auth_trans 
     . 
     . 
     . 
     . 
-    </Object> 
+    &lt;/Object&gt; 
 
     To use PHP Authentication on a single directory, add the following: 
 
-    <Object ppath="d:\path\to\authenticated\dir\*"> 
+    &lt;Object ppath="d:\path\to\authenticated\dir\*"&gt; 
     AuthTrans fn=php4_auth_trans 
-    </Object>
+    &lt;/Object&gt;
      </programlisting>
     </example>
-   </para>
   </sect1>
 
   <sect1 id="install.omnihttpd">
@@ -3701,7 +3699,7 @@ You should place the following lines after mime types init.
    
   </sect1>
 
-  <sect1 id="install.otherhttpd.details">
+  <sect1 id="install.otherhttpd">
    <title>Other web servers</title>
    <para>
     PHP can be built to support a large number of web servers. Please
diff --git a/functions/uodbc.xml b/functions/uodbc.xml
index 6a43dc7c29..8f2b560513 100644
--- a/functions/uodbc.xml
+++ b/functions/uodbc.xml
@@ -18,12 +18,14 @@
     url="&url.solid;">Solid</ulink>, and <ulink
     url="&url.sybase;">Sybase SQL Anywhere</ulink>.
    </simpara>
+<!-- install.xml has changed, so this link is no longer working
    <simpara>
     Please see the <link
     linkend="database-support-options">Installation on Unix
     Systems</link> chapter for more information about configuring PHP
     with these databases.
    </simpara>
+-->
    <note>
     <simpara>
      There is no ODBC involved when connecting to the above