Added -kk tags for keywords

moodle · Jun 4, 2004 · 308214e · 308214e
1 parent 6a652cb
commit 308214e
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lang/en/docs/cvs.html b/lang/en/docs/cvs.html
@@ -171,7 +171,7 @@ <h3><a name="4.2" id="4.2"></a>4.2 Stable branches for each release</h3>
             <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 @@ <h3><a name="4.3" id="4.3"></a>4.3 Feature branches for large changes </h3>
 		  <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>