Index: openacs-4/packages/acs-core-docs/www/xml/install-guide/openacs.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/install-guide/openacs.xml,v
diff -u -r1.19 -r1.20
--- openacs-4/packages/acs-core-docs/www/xml/install-guide/openacs.xml	12 Feb 2004 13:51:43 -0000	1.19
+++ openacs-4/packages/acs-core-docs/www/xml/install-guide/openacs.xml	15 Feb 2004 11:28:44 -0000	1.20
@@ -1,5 +1,5 @@
 <?xml version='1.0' ?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
                "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
 <!ENTITY % myvars SYSTEM "../variables.ent">
 %myvars;
@@ -60,7 +60,7 @@
   </sect2>
   
   <sect2 id="install-with-script">
-    <title>Install with automated script</title>
+    <title>Installation Option 1: Use automated script</title>
     <para>A bash script is available to automate all of the steps for the rest of this section.  It requires <link linkend="install-tclwebtest">tclwebtest</link>.  The automated script can greatly accelerate the install process, but is very sensitive to the install environment.  We recommend that you run the automated install and, if it does not work the first time, consider switching to a <link linkend="install-from-tarball">manual installation</link>.</para>
         <para>Get the install script from CVS.  It is located within
         the main cvs tree, at /etc/install.  Use anonymous CVS
@@ -99,7 +99,7 @@
   </sect2>
 
   <sect2 id="install-from-tarball">
-    <title>Install from tarball</title>
+    <title>Installation Option 2: Install from tarball</title>
     <para>You should already have downloaded the OpenACS tarball
       to the <computeroutput>/tmp</computeroutput> directory.  If
       not, <link linkend="openacs-download">download the OpenACS
@@ -444,7 +444,7 @@
       <listitem id="start-aolserver">
         <para>
 	  Kill any current running AOLserver processes and start a new
-	  one.  The recommended way to start an AOLserver process is by running the included script, <computeroutput>/var/lib/aolserver/<replaceable>service0</replaceable>/packages/etc/daemontools/run</computeroutput>.  If you are not using the default file paths and names, you will need to edit <computeroutput>run</computeroutput>.</para>
+	  one.  The recommended way to start an AOLserver process is by running the included script, <computeroutput>/var/lib/aolserver/<replaceable>service0</replaceable>/etc/daemontools/run</computeroutput>.  If you are not using the default file paths and names, you will need to edit <computeroutput>run</computeroutput>.</para>
             <para>If you want to use port 80, there are complications.  AOLserver must be root to use system ports such as
 	  80, but refuses to run as root for security reasons. So, we call the run script as root and specify a non-root user ID and
 	  Group ID which AOLserver will switch to after claiming the
@@ -585,6 +585,10 @@
     </orderedlist>
   </sect2>
 
+  <sect2 id="install-from-cvs">
+    <title>Installation Option 3: Install from CVS</title>
+    <para>If you want to track fresh code developments inbetween releases, or you are an OpenACS core developer, you may want to install from CVS.  This is identical to Option 2 except that you get the files from CVS instead of the tarball: <ulink url="http://openacs.org/4/checkout">CVS Checkout Instructions</ulink>.  So, instead of <computeroutput><userinput>tar xzf /tmp/&tarballpath;.tgz</userinput></computeroutput>, <computeroutput><userinput>cvs -z3 -d :pserver:anonymous@openacs.org:/cvsroot co acs-core</userinput></computeroutput>.</para>
+  </sect2>
   <sect2 id="install-next-steps">
     <title>Next Steps</title>
     <itemizedlist>
Index: openacs-4/packages/acs-core-docs/www/xml/install-guide/other-software.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/install-guide/other-software.xml,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/acs-core-docs/www/xml/install-guide/other-software.xml	26 Jan 2004 15:39:44 -0000	1.11
+++ openacs-4/packages/acs-core-docs/www/xml/install-guide/other-software.xml	15 Feb 2004 11:28:44 -0000	1.12
@@ -826,9 +826,11 @@
       <title>Install tclwebtest.</title>
       <para>Download the <link linkend="source-tclwebtest">tclwebtest
       source</link>, unpack it, and put it an appropriate
-      place.  As root:</para>
+      place.  (tclwebtest 1.0 will be required for auto-tests in OpenACS 5.1.  When it exists, the cvs command here will be replaced with http://prdownloads.sourceforge.net/tclwebtest/tclwebtest-0.3.tar.gz?download.) As root:</para>
       <screen><action>cd /tmp
-tar xvzf tclwebtest-0.3.tar.gz
+cvs -z3 -d:pserver:anonymous@cvs.sourceforge.net:/cvsroot/tclwebtest co tclwebtest
+#wget http://umn.dl.sourceforge.net/sourceforge/tclwebtest/tclwebtest-1.0.tar.gz
+#tar xvzf tclwebtest-1-0.tar.gz
 mv tclwebtest-0.3 /usr/local/
 ln -s /usr/local/tclwebtest-0.3 /usr/local/tclwebtest
 ln -s /usr/local/tclwebtest/tclwebtest /usr/local/bin
Index: openacs-4/packages/acs-core-docs/www/xml/install-guide/overview.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/install-guide/overview.xml,v
diff -u -r1.20 -r1.21
--- openacs-4/packages/acs-core-docs/www/xml/install-guide/overview.xml	4 Feb 2004 16:47:35 -0000	1.20
+++ openacs-4/packages/acs-core-docs/www/xml/install-guide/overview.xml	15 Feb 2004 11:28:44 -0000	1.21
@@ -13,15 +13,15 @@
   </para>
 
   <orderedlist>
-    <listitem><para>Install an OS and supporting software (see <xref linkend="unix-installation"/> or <xref linkend="install-redhat"/> for more details).</para>
+    <listitem><para>Install an OS and supporting software (see <xref linkend="unix-installation"/> or <xref linkend="install-redhat"/> for more details).  See the <xref linkend="compatibility-matrix"/>.</para>
     </listitem>
 
     <listitem><para>Install a database (see <xref linkend="oracle"/> or
         <xref linkend="postgres"/>).</para>
     </listitem>
 
     <listitem>
-      <para> Install AOLserver (see <xref linkend="aolserver"/>).</para>
+      <para> Install AOLserver (<xref linkend="aolserver4"/>) .</para>
     </listitem>
 
     <listitem><para>Create a unique database and system user.
@@ -49,7 +49,7 @@
           PostgreSQL in Debian and Red Hat and FreeBSD ports works fine.</para>
       </listitem>
       <listitem>
-        <para>An experimental script <link
+        <para>Once AOLserver and a database are installed, a bash script <link
             linkend="install-with-script">automates the OpenACS checkout and
             installation</link>.
         </para>