From: Ian Jackson <ian@liberator.relativity.greenend.org.uk>
Date: Thu, 10 Sep 2009 18:34:13 +0000 (+0100)
Subject: Merge branch 'anaplian' into stable-3.x
X-Git-Tag: 3.5
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=commitdiff_plain;h=refs%2Ftags%2F3.5;hp=068b48ca6de5313177773a1a435b2130a56044ef;p=ypp-sc-tools.db-test.git

Merge branch 'anaplian' into stable-3.x
---

diff --git a/yarrg/web/devel b/yarrg/web/devel
index 7e02d4c..063d641 100755
--- a/yarrg/web/devel
+++ b/yarrg/web/devel
@@ -63,7 +63,7 @@ Note that there is <strong>NO WARRANTY</strong> !
 
 <h3>Source code</h3>
 
-<kbd>git-clone http://www.chiark.greenend.org.uk/~ijackson/ypp-sc-tools/master/.git/</kbd><br>
+<kbd>git clone http://www.chiark.greenend.org.uk/~ijackson/ypp-sc-tools/master/.git/</kbd><br>
 obtains the source code of the latest version released for use as a
 client, which you can also find
 <a href="http://www.chiark.greenend.org.uk/~ijackson/ypp-sc-tools/master/">as
diff --git a/yarrg/web/intro b/yarrg/web/intro
index 5b3af6e..c77f183 100755
--- a/yarrg/web/intro
+++ b/yarrg/web/intro
@@ -83,7 +83,7 @@ To install the client, install the `git' version control system
 and the other dependencies listed in the `Installation requirements'
 section of the README and then run:
 <pre>
-git-clone http://www.chiark.greenend.org.uk/~ijackson/ypp-sc-tools/master/.git ypp-sc-tools
+git clone http://www.chiark.greenend.org.uk/~ijackson/ypp-sc-tools/master/.git ypp-sc-tools
 cd ypp-sc-tools
 cd yarrg
 make
@@ -96,7 +96,7 @@ and build the software.
 When new versions of the upload client are released, you can:
 <pre>
 cd .../ypp-sc-tools
-git-pull
+git pull
 cd yarrg
 make
 </pre>