changeset 500:2d59eda59895

Minor help edit

--- a/help/a-33.html	Mon Aug 22 21:31:55 2011 +0100
+++ b/help/a-33.html	Tue Aug 23 10:46:33 2011 +0100
@@ -3,26 +3,28 @@
 
 <h2>I tried to push my changes, but it told me &ldquo;the remote repository may have been changed by someone else&rdquo; and refused</h2>
 
-<p>This error indicates that the remote repository has some changes in it
-that you do not have in your local repository (and that are in
-branches that you have also changed).  Perhaps someone else made these
-changes and pushed them, or they may have come from you pushing from a
-different computer.</p>
+<p>This indicates that the remote repository has some changes in it that
+you do not have in your local repository (and that are in branches
+that you have also changed).</p>
+
+<p>Perhaps someone else made these changes and pushed them, or they may
+have been pushed by you from a different computer.</p>
+
+<p><b>Why should that prevent me from pushing my changes?</b></p>
 
 <p>A good principle is that you should review and test your changes
-before you push them to another repository.  Although (with a
-distributed version control system) it's generally OK to commit
+before you push them to another repository.  It may be OK to commit
 changes locally that don't really work or that aren't complete enough
-to test, it's a bad idea to push anything that would cause the remote
-repository to have an untested set of changes in it.</p>
+to test, but it's a bad idea to push anything that would cause the
+remote repository to have an untested set of changes in it.</p>
 
-<p>For that reason, if you change some files and someone else changes
-others and you both push them without knowing about the other one,
-Mercurial must refuse whichever push happens later &ndash; it won't simply
-merge the changes because the result might not make any sense.</p>
+<p>For this reason, if you change some files, someone else changes some
+others, and you both try to push them without knowing about the other
+one, Mercurial must refuse the second push &ndash; it can't simply merge
+the changes because the result might not make any sense.</p>
 
 <p>Instead you must pull the other person's changes and merge them
-locally before you push.  Fortunately, this is easy to do.</p>
+locally before you push.  Fortunately, this is easy to do:</p>
 
 <p><b>1. Click Pull on the main toolbar at the top of the EasyMercurial window.</b>
 <ul><li>You should see that some changes are pulled and added to your local repository.  This will usually lead to a forked graph in the History pane, as your changes and the other user's were both started from the same parent at the same time.</li></ul></p>

--- a/help/topics/33.txt	Mon Aug 22 21:31:55 2011 +0100
+++ b/help/topics/33.txt	Tue Aug 23 10:46:33 2011 +0100
@@ -2,26 +2,28 @@
 
 I tried to push my changes, but it told me "the remote repository may have been changed by someone else" and refused
 
-This error indicates that the remote repository has some changes in it
-that you do not have in your local repository (and that are in
-branches that you have also changed).  Perhaps someone else made these
-changes and pushed them, or they may have come from you pushing from a
-different computer.
+This indicates that the remote repository has some changes in it that
+you do not have in your local repository (and that are in branches
+that you have also changed).
+
+Perhaps someone else made these changes and pushed them, or they may
+have been pushed by you from a different computer.
+
+*Why should that prevent me from pushing my changes?*
 
 A good principle is that you should review and test your changes
-before you push them to another repository.  Although (with a
-distributed version control system) it's generally OK to commit
+before you push them to another repository.  It may be OK to commit
 changes locally that don't really work or that aren't complete enough
-to test, it's a bad idea to push anything that would cause the remote
-repository to have an untested set of changes in it.
+to test, but it's a bad idea to push anything that would cause the
+remote repository to have an untested set of changes in it.
 
-For that reason, if you change some files and someone else changes
-others and you both push them without knowing about the other one,
-Mercurial must refuse whichever push happens later -- it won't simply
-merge the changes because the result might not make any sense.
+For this reason, if you change some files, someone else changes some
+others, and you both try to push them without knowing about the other
+one, Mercurial must refuse the second push -- it can't simply merge
+the changes because the result might not make any sense.
 
 Instead you must pull the other person's changes and merge them
-locally before you push.  Fortunately, this is easy to do.
+locally before you push.  Fortunately, this is easy to do:
 
 *1. Click Pull on the main toolbar at the top of the EasyMercurial window.*