docs/evolve-collaboration.rst
changeset 655 dd5765ae91c3
parent 527 b81193ef3488
--- a/docs/evolve-collaboration.rst	Thu Jan 24 18:02:00 2013 -0500
+++ b/docs/evolve-collaboration.rst	Thu Jan 24 18:05:59 2013 -0500
@@ -12,7 +12,7 @@
 
     $ hg ci -m '[entities] remove magic'
 
-Instant patch ! Note how the default phase of this changeset is (still)
+Instant patch! Note how the default phase of this changeset is (still)
 in "draft" state.
 
 This is easily checkable::
@@ -30,7 +30,7 @@
 "publishing" since they do not have the notion of non-public changesets
 (or mutable history).
 
-During the transition from older mercurial servers to new ones, this will
+During the transition from older Mercurial servers to new ones, this will
 happen often, so be careful.
 
 Now let's come back to our patch. Next hour sees good progress and Alice
@@ -39,7 +39,7 @@
 
     $ hg amend -m '[entities] fix frobulator (closes #42)'
 
-Note that we also fix the commit message. (For recovering mq users: this
+Note that we also fix the commit message. (For recovering MQ users: this
 is just like "hg qrefresh -m").
 
 Before leaving, let's push to the central shared repository. That will
@@ -65,7 +65,7 @@
 brings her to yesterday's patch. Indeed the patch serial number has
 increased (827 still exists but has been obsoleted).
 
-She understands that his original patch has been altered. But how did it
+She understands that her original patch has been altered. But how did it
 evolve?
 
 The enhanced hgview shows the two patches. By default only the most
@@ -84,7 +84,7 @@
 Amend ... Stabilize
 --------------------
 
-Almost perfect ! Alice just needs to fix a half dozen grammar oddities in
+Almost perfect! Alice just needs to fix a half dozen grammar oddities in
 the new docstrings and it will be publishable.
 
 Then, another round of:
@@ -127,7 +127,7 @@
 
 Except that rebase is a destructive (it removes information from the
 repository), unrecoverable operation, and the "evolve + obsolete"
-combo, using changeset copy and obsolescence marker, provide evolution
+combo, using changeset copy and obsolescence marker, provides evolution
 semantics by only adding new information to the repository (but more
 on that later).