From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 10 Sep 2009 12:59:16 +0000 (+0100)
Subject: Look for master-info-v2.txt not master-info-2.txt
X-Git-Tag: 3.5^2~9
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-live.git;a=commitdiff_plain;h=c925ba9b2af7a212378a1bb5e9f20697be857523

Look for master-info-v2.txt not master-info-2.txt
---

diff --git a/yarrg/Commods.pm b/yarrg/Commods.pm
index 860510e..7e7b5cc 100644
--- a/yarrg/Commods.pm
+++ b/yarrg/Commods.pm
@@ -178,7 +178,7 @@ sub parse_info1 ($$) {
 sub parse_info_clientside () {
     my $yarrg= $ENV{'YPPSC_YARRG_DICT_UPDATE'};
     return unless $yarrg;
-    my $master= fetch_with_rsync("info-$masterinfoversion");
+    my $master= fetch_with_rsync("info-v$masterinfoversion");
     parse_info1($master,'s');
     my $local= '_local-info.txt';
     if (stat $local) {
diff --git a/yarrg/README.privacy b/yarrg/README.privacy
index d9f8b60..188a657 100644
--- a/yarrg/README.privacy
+++ b/yarrg/README.privacy
@@ -17,12 +17,12 @@ These servers records everyone's uploads of commodity prices and
 allows you to search for routes using the PCTB and YARRG websites.
 (*NB* currently the YARRG website is still under development.)
 
-The YARRG data upload server may also distribute the uploaded data to
+The YARRG data upload server may also distributes the uploaded data to
 other searching site operators for inclusion in their databases; your
 IP address is not passed on to those other operators.
 
 We upload to the PCTB and YARRG servers if you select one of the
---upload options, and not otherwise - but note that this is the
+--upload options, and not otherwise - but not that this is the
 default.
 
 We also query the PCTB server to determine possible island names, if
diff --git a/yarrg/web/devel b/yarrg/web/devel
index 7e02d4c..0214ab5 100755
--- a/yarrg/web/devel
+++ b/yarrg/web/devel
@@ -63,11 +63,9 @@ 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>
-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
-an unpacked tree</a>
+<kbd>git-clone http://www.chiark.greenend.org.uk/~ijackson/ypp-sc-tools/master/</kbd><br>
+obtains the source code of the latest release, which you can also find
+<a href="http://www.chiark.greenend.org.uk/~ijackson/ypp-sc-tools/master/">as an unpacked tree</a>
 
 <p><a href="source.tar.gz">Live website source code</a> can
 be downloaded, in case we have made changes but not yet pushed them
diff --git a/yarrg/web/intro b/yarrg/web/intro
index 5b3af6e..ba851fc 100755
--- a/yarrg/web/intro
+++ b/yarrg/web/intro
@@ -74,9 +74,9 @@ The YARRG upload client uploads both to YARRG and to the
 
 The current official version of YARRG for use as an upload
 client can browsed here:
- <a href="http://www.chiark.greenend.org.uk/~ijackson/ypp-sc-tools/master/">http://www.chiark.greenend.org.uk/~ijackson/ypp-sc-tools/master/</a>
+ <a href="/~ijackson/ypp-sc-tools/master/">http://www.chiark.greenend.org.uk/~ijackson/ypp-sc-tools/master/</a>
 See particularly the
-<a href="http://www.chiark.greenend.org.uk/~ijackson/ypp-sc-tools/master/yarrg/README">YARRG README</a>.
+<a href="/~ijackson/ypp-sc-tools/master/yarrg/README">YARRG README</a>.
 
 <p>
 To install the client, install the `git' version control system