From 068b48ca6de5313177773a1a435b2130a56044ef Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Thu, 10 Sep 2009 19:33:06 +0100 Subject: [PATCH] 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 --- yarrg/README.privacy | 4 ++-- yarrg/web/devel | 8 +++++--- yarrg/web/intro | 4 ++-- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/yarrg/README.privacy b/yarrg/README.privacy index 188a657..d9f8b60 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 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 0214ab5..7e02d4c 100755 --- a/yarrg/web/devel +++ b/yarrg/web/devel @@ -63,9 +63,11 @@ Note that there is NO WARRANTY !

Source code

-git-clone http://www.chiark.greenend.org.uk/~ijackson/ypp-sc-tools/master/
-obtains the source code of the latest release, which you can also find -as an unpacked tree +git-clone http://www.chiark.greenend.org.uk/~ijackson/ypp-sc-tools/master/.git/
+obtains the source code of the latest version released for use as a +client, which you can also find +as +an unpacked tree

Live website source code 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 ba851fc..5b3af6e 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: - http://www.chiark.greenend.org.uk/~ijackson/ypp-sc-tools/master/ + http://www.chiark.greenend.org.uk/~ijackson/ypp-sc-tools/master/ See particularly the -YARRG README. +YARRG README.

To install the client, install the `git' version control system -- 2.30.2