diff --git a/chapters/install.caudium.xml b/chapters/install.caudium.xml
index a787350629..050bd69aaa 100644
--- a/chapters/install.caudium.xml
+++ b/chapters/install.caudium.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
   <sect1 id="install.caudium">
    <title>Servers-Caudium</title>
    <para>
-    PHP 4 can be built as a Pike module for the Caudium webserver. Note
-    that this is not supported with PHP 3. Follow the simple
+    PHP 4 can be built as a Pike module for the
+    <ulink url="&url.caudium;">Caudium webserver</ulink>.
+    Note that this is not supported with PHP 3. Follow the simple
     instructions below to install PHP 4 for Caudium.
    </para>
    <example id="install.caudium.instructions">
diff --git a/chapters/install.commandline.xml b/chapters/install.commandline.xml
index 4b67e1c004..cd8ff48433 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.2 $ -->
+<!-- $Revision: 1.3 $ -->
   <sect1 id="install.commandline">
    <title>Servers-CGI/Commandline</title>
    <para>
@@ -50,9 +50,9 @@
     <title>Using Variables</title>
     <simpara>
       Some server supplied enviroment variables are not defined in the
-      current CGI/1.1 specification. Only the following variables are
-      defined there; everything else should be treated as 'vendor
-      extensions': AUTH_TYPE, CONTENT_LENGTH, CONTENT_TYPE,
+      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,