--- doc/build/Attic/cvsupgrade.html	2001/04/18 16:48:04	1.2
+++ doc/build/Attic/cvsupgrade.html	2001/11/27 22:59:04	1.7
@@ -6,10 +6,7 @@
 <h1>LON-CAPA CVS Upgrade</h1>
 <h3>Current CVS Upgrade Procedure</h3>
 <p>
-Scott Harrison
-</p>
-<p>
-Last updated: 4/18/2001
+Scott Harrison, last updated 11/7/2001
 </p>
 <ul>
 <li><a href="#fileupgrade">CVS Upgrade</a></li>
@@ -38,14 +35,11 @@ upgrading your system is a simple proces
 <td>export CVSROOT=:pserver:USERNAME@zaphod.lite.msu.edu:/home/cvs
 <br />cvs login</td></tr>
 <tr><td>Go to your repository directory</td><td>cd loncapa</td></tr>
-<tr><td>Update your CVS sources</td><td>cvs update -d</td></tr>
+<tr><td>Update your CVS sources</td><td>cvs update -d -r STABLE</td></tr>
 <tr><td>Go to the build directory</td><td>cd loncom/build</td></tr>
 <tr><td>Become 'root'</td><td>su</td></tr>
+<tr><td>Build files</td><td>make build</td></tr>
 <tr><td>Install/update static files</td><td>make install</td></tr>
-<tr><td>Install/update dynamically configurable files<br />
-<i>this preserves the current settings of your machine, don't worry :)</i>
-</td>
-<td>make configinstall</td></tr>
 <tr><td>Restart your web server<br />Due to an apache bug, you should
 enter this command twice.  Restarting the web server will
 <ul>
@@ -59,7 +53,10 @@ enter this command twice.  Restarting th
 <td>/etc/rc.d/init.d/loncontrol restart</td></tr>
 <tr><td colspan=2>After CVS logging in, you can always cut and paste this line
 below assuming you do everything as root :)<br />
-<tt>cd loncapa; cvs update -d; cd loncom/build; make install; make configinstall; /etc/rc.d/init.d/httpd restart; /etc/rc.d/init.d/httpd restart; /etc/rc.d/init.d/httpd restart; /etc/rc.d/init.d/loncontrol restart</tt></td></tr>
+<tt>cd loncapa; cvs update -d -r STABLE; cd loncom/build; make build; 
+make install; /etc/rc.d/init.d/httpd restart; /etc/rc.d/init.d/httpd
+restart; /etc/rc.d/init.d/httpd restart; /etc/rc.d/init.d/loncontrol restart
+</tt></td></tr>
 </table>
 <p>
 It may be also advisable to test your system after an upgrade if there are
@@ -111,12 +108,12 @@ and CVS:doc/otherfiles/cd_rpms.txt.
 <b>Upgrade existing RPMS from a trusted source:</b>
 RPMs are currently available at
 <blockquote>
-http://install.lon-capa.org/3.1/currentcdsource/RedHat/RPMS
+http://install.lon-capa.org/3.1/latestRPMS/
 </blockquote>
 For example, to upgrade your LON-CAPA-systemperl RPM, you
 would enter commands like
 <blockquote>
-wget http://install.lon-capa.org/3.1/currentcdsource/RedHat/RPMS/LON-CAPA-systemperl-3.1-1.i386.rpm<br />
+wget http://install.lon-capa.org/3.1/currentcdsource/RedHat/RPMS/LON-CAPA-systemperl-3.2-1.i386.rpm<br />
 (then as root) rpm -Uvh --force LON-CAPA-systemperl-3.1-1.i386.rpm
 </blockquote>
 </p>
@@ -148,7 +145,7 @@ RedHat 6.2 bugs involving enlightenment
 <td>export CVSROOT=:pserver:USERNAME@zaphod.lite.msu.edu:/home/cvs
 <br />cvs login</td></tr>
 <tr><td>Go to your repository directory</td><td>cd loncapa</td></tr>
-<tr><td>Update your CVS sources</td><td>cvs update -d</td></tr>
+<tr><td>Update your CVS sources</td><td>cvs update -d -r STABLE</td></tr>
 <tr><td>Go to the build directory</td><td>cd loncom/build</td></tr>
 <tr><td>Become 'root'</td><td>su</td></tr>
 <tr><td>View the CVS source->install status of your machine</td><td>make statuspost
@@ -165,6 +162,11 @@ then visit http://MACHINENAME/lon-status
 These instructions assume bash (as opposed to tcsh).
 </p>
 <p>
+You will also need an account on zaphod.lite.msu.edu.
+Please e-mail lon-capa@hobbes.lite.msu.edu and request that
+an account be created.
+</p>
+<p>
 The straightforward way to enable CVS is to manually configure your
 environment and log in:
 <blockquote>
@@ -211,7 +213,8 @@ Useful commands are:
 <tr><td>Command</td></td><td>Description</td></tr>
 <tr><td>info cvs</td></td><td>doc's</td></tr>
 <tr><td>cvs log FILENAME</td></td><td>see what's happened with a file</td></tr>
-<tr><td>cvs update -d</td></td><td>update your CVS tree from the current directory location</td></tr>
+<tr><td>cvs update -d -r STABLE</td></td><td>update your CVS tree from the
+current directory location</td></tr>
 </table>
 </body>
 </html>