hg.rst
changeset 1645 7fb7a32336a2
parent 1605 41ef0417d899
child 1646 fdd6045a5563
--- a/hg.rst	Wed Nov 19 21:39:14 2014 +0200
+++ b/hg.rst	Tue Nov 25 19:24:23 2014 +0200
@@ -131,7 +131,7 @@
 -----------------
 ::
 
-  $ hg conver --branchmap $branchmapfile oldrepo newrepo
+  $ hg convert --branchmap $branchmapfile oldrepo newrepo
 
 To convert non-ASCII names use UTF-8 coding for 'branchmap' file.
 
@@ -139,8 +139,8 @@
 separator between old branch name and new, so new branch name can not contain
 spaces.
 
-Join history of two repos.
-==========================
+Joining history of two repos.
+=============================
 ::
 
   $ cat >filemap1.txt <<EOF
@@ -242,12 +242,12 @@
 
   PORT=7878
   SRC=/srv/hg
-  CONGIG=/srv/hg/hgweb.config
+  CONFIG=/srv/hg/hgweb.config
   PIDFILE=/var/run/hg.pid
 
   case "$1" in
   start)
-    echo "Mecurial Server service starting."
+    echo "Mercurial Server service starting."
     (cd "$SRC"; $CMD serve -d -p $PORT --pid-file "$PIDFILE")
     ;;
   stop)
@@ -336,7 +336,7 @@
   $ hg qpop -a
   $ hg qdelete first.patch
 
-To add new version of source and fix patches for it first de apply patches,
+To add new version of source and fix patches for it first de-apply patches,
 then pull new changes and try apply patches on top of new sources::
 
   $ hg qpop -a