changeset 1262:eff1acc2511c stable

docs: minor tweaks to sharing guide (suggested by timeless)

--- a/docs/sharing.rst	Tue Apr 14 12:53:12 2015 -0400
+++ b/docs/sharing.rst	Sun Jun 15 21:17:09 2014 -0400
@@ -237,7 +237,7 @@
   $ hg update
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
-This time, all the tests pass, so no further amendment is required.
+This time, all the tests pass, so no further amending is required.
 This bug fix is finished, so we push it to the public repository::
 
   $ hg push
@@ -251,8 +251,8 @@
 .. _`concept guide`: concepts.html
 
 So the picture in ``public`` is much simpler than in either
-``dev-repo`` or ``test-repo``. None of our missteps or amendments are
-visible publicly, just the final, beautifully polished changeset:
+``dev-repo`` or ``test-repo``. Neither our missteps nor our amendments
+are publicly visible, just the final, beautifully polished changeset:
 
   [figure SG05: public repo with rev 0:0dc9, 1:de61, both public]
 
@@ -368,7 +368,7 @@
 
 Figure 6 shows the state of the ``review`` repository at this point.
 
-  [figure SG06: rev 2:fn1e is alice's obsolete v1, rev 3:cbdf is her v2; both children of rev 1:de61]
+  [figure SG06: rev 2:fn1e is Alice's obsolete v1, rev 3:cbdf is her v2; both children of rev 1:de61]
 
 After a hard morning of bug fixing, Alice stops for lunch. Let's see
 what Bob has been up to.
@@ -426,7 +426,7 @@
 Figure 7 shows the result of Bob's work in both ``review`` and
 ``public``.
 
-  [figure SG07: review includes alice's draft work on bug 15, as well as Bob's v1, v2, and v3 changes for feature X: v1 and v2 obsolete, v3 public. public contains only the final, public implementation of feature X]
+  [figure SG07: review includes Alice's draft work on bug 15, as well as Bob's v1, v2, and v3 changes for feature X: v1 and v2 obsolete, v3 public. public contains only the final, public implementation of feature X]
 
 Incidentally, it's important that Bob push to ``public`` *before*
 ``review``. If he pushed to ``review`` first, then revision 6:540b
@@ -480,7 +480,7 @@
 The result, in both ``review`` and ``public`` repositories, is shown
 in figure 8.
 
-  [figure SG08: review shows v1 and v2 of alice's fix, then v1, v2, v3 of bob's feature, finally alice's fix rebased onto bob's. public just shows the final public version of each changeset]
+  [figure SG08: review shows v1 and v2 of Alice's fix, then v1, v2, v3 of Bob's feature, finally Alice's fix rebased onto Bob's. public just shows the final public version of each changeset]
 
 
 ** STOP HERE: WORK IN PROGRESS **
@@ -640,7 +640,7 @@
 but of course “2 new divergent changesets” is the real problem. Figure
 9 shows both problems.
 
-  [figure SG09: bob's repo with 2 heads for the 2 divergent changesets, 5:fc16 and 6:694f; wc is at 5:fc16, hence update refused; both are successors of obsolete 3:fe81, hence divergence]
+  [figure SG09: Bob's repo with 2 heads for the 2 divergent changesets, 5:fc16 and 6:694f; wc is at 5:fc16, hence update refused; both are successors of obsolete 3:fe81, hence divergence]
 
 Now we need to get out of trouble. Unfortunately, a `bug`_ in
 ``evolve`` means that the usual answer (run ``hg evolve --all``) does