diff docs/tutorials/tutorial.t @ 365:9f6a77ec66cb stable

evolve: switch the official name for "kill" to prune doc have been updated too
author Pierre-Yves.David@ens-lyon.org
date Sun, 15 Jul 2012 13:07:54 +0200
parents fb83210bce32
children 5bc3e5dc2637 2c969d1b18e0
line wrap: on
line diff
--- a/docs/tutorials/tutorial.t	Sun Jul 15 12:57:22 2012 +0200
+++ b/docs/tutorials/tutorial.t	Sun Jul 15 13:07:54 2012 +0200
@@ -284,7 +284,7 @@
 I have a new commit but I realize that don't want it. (transport shop list does
 not fit well in my standard shopping list)
 
-  $ hg kill . # . is for working directory parent
+  $ hg prune . # . is for working directory parent
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory now at 387187ad9bd9
 
@@ -672,7 +672,7 @@
   $ hg up 437efbcaf700
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
-Relocating unstable change after kill
+Relocating unstable change after prune
 ----------------------------------------------
 
 The remote guy keep working
@@ -709,9 +709,9 @@
   o  7e82d3f3c2cb (public): Monthy Python Shopping list
   
 
-In the mean time I noticed you can't buy animals in a super market and I kill the animal changeset:
+In the mean time I noticed you can't buy animals in a super market and I prune the animal changeset:
 
-  $ hg kill 437efbcaf700
+  $ hg prune 437efbcaf700
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory now at ffa278c50818
   1 new unstables changesets
@@ -741,7 +741,7 @@
   $ hg log -r 'unstable()'
   ae45c0c3092a (draft): SPAM SPAM SPAM
 
-# XXX make kill stabilization works
+# XXX make prune stabilization works
 #  $ hg stabilize --any
 #  merging shopping