diff text/quick_start.txt @ 114:aa325d9f79cd

Reqorked quick start text.

--- a/text/quick_start.txt	Thu Apr 23 21:55:26 2009 +0200
+++ b/text/quick_start.txt	Fri Apr 24 10:30:00 2009 +0200
@@ -1,48 +1,38 @@
 = Quick Start =
 
-When you've been using Mercurial for some time, many things become 
-second nature, so it's sometimes hard to remember that its basic concepts are 
-quite revolutionary compared to Subversion. 
+This site should get you going in an instant. 
+
+Aside from the practical Quick Start to the right, there are only a few commands you need to start working. 
 
-Please don't let that intimidate you. Mercurial is damn powerful, even if you 
-just use the basics (init, commit, log, pull, push, serve, merge). And the 
-basics are very easy to use, once you see the model behind that: Each 
-repository has the whole history, and history is not necessarily linear. 
+Even if you stick to these basics, Mercurial is quite powerful. And they are very easy to use, once you see the model behind that: Each repository has the whole history, and history is not necessarily linear. 
 
-Just stick to these and learn the rest of its commands as you need them. 
+A quick overview of the basic commands: 
 
-As a short intro: 
+- hg init: create a new repository
+- hg commit: save your changes in the current repository
+- hg log: see all changes in your repository
+- hg pull: get all changes from another repository int the current one
+- hg push: get all changes from your repository into another one
+- hg serve: create an instant-webserver. People can see the history there and pull from it
+- hg merge: join different lines of history
 
-- init: create a new repository
-- commit: save your changes in the current repository
-- log: see all changes in your repository
-- pull: get all changes from another repository int the current one
-- push: get all changes from your repository into another one
-- serve: create an instant-webserver. People can see the history there and 
-pull from it
-- merge: join different lines of history
-
-If you want to see a nice graph of the history, just do "hg serve" in your 
-repository and then direct your browser to 
+If you want to see a nice graph of the history, just do "hg serve" in your repository and then direct your browser to 
 
         http://127.0.0.1:8000
 
 This also helps getting a feeling for what the commands do. 
 
-(you can do more finegrained stuff with command options. Just call "hg help 
-<command>" to see them). 
-
+(you can also do a lot of finegrained stuff by using different command options. Just call "hg help <command>" to see them). 
 
 I hope your experience with Mercurial will be as great as mine!
 
 - Arne Babenhauserheide
 
-= Basic concepts of Mercurial =
+= Basic concepts of Mercurial for Subversion users =
 
-//If you're interested in the concepts behind Mercurial, please come with us and listen to a great explanation from Martin Geisler: //
+//If you're interested in the concepts behind Mercurial and already know Subversion, please come with us and listen to a great explanation from Martin Geisler: //
 
-Let me try to make
-some of the basic concepts clear:
+Let me try to make some of the basic concepts clear:
 
 * Like in Subversion, history consists of a number of commits. They're
   called changesets in Mercurial.
@@ -89,7 +79,7 @@
   head need not be the tip.
 
 * Having two heads suggest that someone should merge them -- otherwise
-  the changes from one will never be combined with the changed made in
+  the changes from one will never be combined with the changes made in
   the other head.
 
   When merging with 'hg merge' the task is to figure out the canonical