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.20 -r1.21
--- openacs-4/packages/acs-core-docs/www/xml/install-guide/upgrade.xml	7 May 2004 00:27:05 -0000	1.20
+++ openacs-4/packages/acs-core-docs/www/xml/install-guide/upgrade.xml	7 May 2004 16:49:12 -0000	1.21
@@ -425,9 +425,8 @@
             <para>Create a new directory as temporary working space to reconcile conflicts between the new files and your current work.  The example uses the cvs keyword yesterday, making the assumption that you haven't checked in new code to your local tree in the last day.</para>
             <screen>[service0 openacs-4.6]$ <userinput> cd /var/lib/aolserver</userinput>
 [service0 tmp]$ <userinput>mkdir <replaceable>service0</replaceable>-upgrade</userinput>
-[service0 tmp]$ <userinput>cvs checkout -d openacs-upgrade -jOpenACS:yesterday -jOpenACS <replaceable>service0</replaceable> &gt; cvs.txt 2&gt;&amp;1</userinput>
-(CVS feedback here)
-</screen>
+[service0 tmp]$ <userinput>cvs checkout -d openacs-upgrade -jOpenACS:yesterday -jOpenACS -kk <replaceable>service0</replaceable> &gt; cvs.txt 2&gt;&amp;1</userinput>
+(CVS feedback here)</screen>
           <para>The file /tmp/openacs-upgrade/cvs.txt contains the results of the upgrade.  If you changed files that are part of the OpenACS tarball and those changes conflict with the 4.5-4.6 upgrade, you'll have to manually reconcile them.  Use the emacs command <computeroutput>M-x sort-lines</computeroutput> and then, for each line that starts with a C, open that file and manually resolve the conflict by deleting the excess lines.  When you're finished, or if there aren't any conflicts, save and exit.</para>
             <para>Once you've fixed any conflicts, commit the new code
             to your local tree.  </para>