From: Ian Jackson <ian@liberator.relativity.greenend.org.uk>
Date: Tue, 20 Oct 2009 18:32:15 +0000 (+0100)
Subject: Merge branch 'stable-3.x'
X-Git-Tag: 5.0^2~6
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-live.git;a=commitdiff_plain;h=c9225ff45ee5e69855cb24cfb648d903dbba54a7;hp=1da4d6e0bbabfb308c1cc5d1e08a2712ce647259

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

diff --git a/yarrg/README b/yarrg/README
index 98e7126..d5062ac 100644
--- a/yarrg/README
+++ b/yarrg/README
@@ -96,7 +96,7 @@ This program has quite a few dependencies:
 On other Linux distros the packages may have different names, but
 these should be roughly right for Debian and its derivatives.  You can
 install them with this rune:
-  sudo apt-get install build-essential libnetpbm10-dev netpbm libx11-dev libxtst-dev libpcre3-dev tk8.4 libxml-parser-perl libjson-perl
+  sudo apt-get install git-core build-essential libnetpbm10-dev netpbm libx11-dev libxtst-dev libpcre3-dev tk8.4 libxml-parser-perl libjson-perl
 
 
 The supplied helper programs
diff --git a/yarrg/web/intro b/yarrg/web/intro
index 467de52..825189b 100755
--- a/yarrg/web/intro
+++ b/yarrg/web/intro
@@ -84,24 +84,27 @@ 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
 </pre>
 this will download the code into the directory <code>ypp-sc-tools</code>,
-and build the software.
+and build the software.  (If your Linux is very up to date you may
+find that it complains that it doesn't know the command <kbd>git-core</kbd>.
+In that case, use <kbd>git core</kbd>, with a space, instead.)
 
 <p>
 
 When new versions of the upload client are released, you can:
 <pre>
 cd .../ypp-sc-tools
-git pull
+git-pull
 cd yarrg
 make
 </pre>
-to fetch the new version.
+to fetch the new version.  (Again, you may need <kbd>git pull</kbd>
+instead of <kbd>git-pull</kbd>.)
 
 <h2>Uploading from Windows</h2>