Revert bogus parts of "Look for master-info-v2.txt not master-info-2.txt"

This reverts most of commit c925ba9b2af7a212378a1bb5e9f20697be857523
because that appears to accidentally revert several other changes.

We retain the one intended hunk, in Commods.pm, which had a conflict anyway.

Conflicts:
	yarrg/Commods.pm

diff --git a/yarrg/README.privacy b/yarrg/README.privacy
index 188a657113fb615db2a4910f91266d2298c74e79..d9f8b60d3c93368c6e501561e0eb60486496f189 100644 (file)
--- 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 distributes the uploaded data to
+The YARRG data upload server may also distribute 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 not that this is the
+--upload options, and not otherwise - but note 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 0214ab57a6fee36ed6243ed6772ed17d6af98d9e..7e02d4c38e51cdb6af68a0eed9a1d6f44e685831 100755 (executable)
--- a/yarrg/web/devel
+++ b/yarrg/web/devel
@@ -63,9 +63,11 @@ 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/</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>
+<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>
 
 <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 ba851fcbcaecd33950a5579eece6d73c9a8c0f6e..5b3af6e22ed2afb856d950496210d98401c0d668 100755 (executable)
--- 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="/~ijackson/ypp-sc-tools/master/">http://www.chiark.greenend.org.uk/~ijackson/ypp-sc-tools/master/</a>
+ <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>
 See particularly the
-<a href="/~ijackson/ypp-sc-tools/master/yarrg/README">YARRG README</a>.
+<a href="http://www.chiark.greenend.org.uk/~ijackson/ypp-sc-tools/master/yarrg/README">YARRG README</a>.
 
 <p>
 To install the client, install the `git' version control system