diff help/topics.html @ 499:b3309be1640f

More help. This I think will do for 1.0.
author Chris Cannam
date Mon, 22 Aug 2011 21:31:55 +0100
parents 21aa41b62c3a
children f56e5c39aad1
line wrap: on
line diff
--- a/help/topics.html	Mon Aug 22 18:46:06 2011 +0100
+++ b/help/topics.html	Mon Aug 22 21:31:55 2011 +0100
@@ -7,8 +7,8 @@
 <p><a href="a-04.html">What is a repository?</a></p>
 <h3>Opening and initialising things</h3>
 <p><a href="a-10.html">Someone gave me a repository URL and asked me to clone it</a></p>
-<p><a href="a-11.html">I have a folder of source code or documents on my computer and I want to use version control to manage it</a></p>
-<p><a href="a-12.html">I want to start a completely new project using version control</a></p>
+<p><a href="a-11.html">I have a folder of source code or documents on my computer and I want to use version control to manage them</a></p>
+<p><a href="a-12.html">I want to start a new project using version control</a></p>
 <p><a href="a-13.html">I have a Mercurial repository on my local computer already and I want to use it with EasyMercurial</a></p>
 <h3>Making changes</h3>
 <p><a href="a-20.html">I've added a new file: what do I do with it?</a></p>
@@ -17,5 +17,6 @@
 <p><a href="a-23.html">I just deleted a file using the system file manager &ndash; then remembered I hadn't told the version control tool about it &ndash; what now?</a></p>
 <h3>Sharing changes</h3>
 <p><a href="a-30.html">I have committed some changes &ndash; how do I share them with my colleagues?</a></p>
-<p><a href="a-31.html">I want to let my colleagues pull changes from my local repository</a></p>
-<p><a href="a-32.html">I want to push my changes to a master repository shared with my colleagues</a></p>
+<p><a href="a-31.html">I want to let my colleagues pull changes directly from my local repository</a></p>
+<p><a href="a-32.html">I want to put my changes into a master repository shared with my colleagues</a></p>
+<p><a href="a-33.html">I tried to push my changes, but it told me &ldquo;the remote repository may have been changed by someone else&rdquo; and refused</a></p>