Index: openacs-4/packages/acs-core-docs/www/xml/install-guide/upgrade.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/install-guide/upgrade.xml,v diff -u -r1.17 -r1.18 --- openacs-4/packages/acs-core-docs/www/xml/install-guide/upgrade.xml 18 Mar 2004 11:14:58 -0000 1.17 +++ openacs-4/packages/acs-core-docs/www/xml/install-guide/upgrade.xml 18 Mar 2004 12:39:08 -0000 1.18 @@ -454,7 +454,7 @@ Import the new code (for example, OpenACS 5.0.4, openacs-5-0-compat versions of ETP, blogger, and other applications) into a "vendor branch" of the - SERVICE0 CVS tree, as described in "Upgrading a local CVS repository", step 1, above. + service0 CVS tree, as described in "Upgrading a local CVS repository", step 1, above. As soon as we do this, any cvs update command on production might bring new code onto the production site, which would be bad. Do step 2 above (merging conflicts in a service0-upgrade working tree).