From: moodler <moodler>
Date: Fri, 4 Jun 2004 06:04:08 +0000 (+0000)
Subject: Added -kk tags for keywords
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=308214e87e44445d8d401a052222bad2f21cf53a;p=moodle.git

Added -kk tags for keywords
---

diff --git a/lang/en/docs/cvs.html b/lang/en/docs/cvs.html
index 74b19cf987..124a1027b0 100644
--- a/lang/en/docs/cvs.html
+++ b/lang/en/docs/cvs.html
@@ -171,7 +171,7 @@ update -dP</div>
             <div class="commandline">cvs update -dPA</div>
           </li>
           <li>Merge everything on the branch since the last merge, into your trunk version<br><br>
-            <div class="commandline">cvs update -j MOODLE_13_MERGED -j MOODLE_13_STABLE</div>
+            <div class="commandline">cvs update -kk -j MOODLE_13_MERGED -j MOODLE_13_STABLE</div>
 	      </li>
           <li>Check the merged copy back into CVS trunk version<br><br>
             <div class="commandline">cvs commit</div>
@@ -210,7 +210,7 @@ update -dP</div>
 		  <br><br>
             <div class="commandline">
             <strong>cvs update -dPA</strong><br />
-            <strong>cvs update -j <span class="style1">MOODLE_XX_WIDGET</span></strong><br />
+            <strong>cvs update -kk -j <span class="style1">MOODLE_XX_WIDGET</span></strong><br />
             <strong>cvs commit </strong></div>
           </li>
       </ol>