website: new copyright date for jarrg

[ypp-sc-tools.web-live.git] / yarrg / web / upload

diff --git a/yarrg/web/upload b/yarrg/web/upload
index 0b55d4dda203f2b38ff12926e63d86e16ac239e5..a0c40fe2360e3c23b49472c5489060ef4ef9b2f4 100755 (executable)
--- a/yarrg/web/upload
+++ b/yarrg/web/upload
@@ -39,7 +39,7 @@ my $url_base_base= 'http://yarrg.chiark.net/download/jarrg';
 </%shared>
 <%def downloadurl><%args>
 $leaf
-$test => 1
+$test => 0
 #        ^ change this to change the default version
 </%args><%perl>
 my $download_version= $test ? '/test' : '';
@@ -105,7 +105,7 @@ report the problem to us, not to Three Rings.
 <h3>Installing and running on Linux</h3>
 
 Download
-<& downloadurl, leaf => 'jarrg.tar.gz' &>
+<& downloadurl, leaf => 'jarrg-linux.tar.gz' &>
 and unpack it.  You run jarrg from the command line.  Change
 (<code>cd</code>) to the top level <code>jarrg</code> directory
 which was created when you unpacked the tarball, and then run
@@ -139,6 +139,11 @@ best starting point.
 
 <h2>How does it work?  Is it a violation of the Terms of Service?</h2>
 
+JARRG (and the old OCR clients) comply with Three Rings' official
+<a href="http://yppedia.puzzlepirates.com/Official:Third_Party_Software">Third Party Software Policy</a>.
+
+<p>
+
 Essentially, JARRG is a specialised "screen reader" which instead of
 reading information out loud, uploads it to the YARRG and PCTB
 databases.
@@ -175,30 +180,30 @@ should cause any kind of problem).
 <h2><a name="source">Authorship, source code and other versions</a></h2>
 
 Thanks to Burninator for writing the core of the JARRG client.  Ian
-Jackson and Owen Dunn adapted it to improve the installation setup (in
-particular, to avoid modifying any of the YPP client's startup files).
-Owen Dunn added support for uploading to YARRG, updated the build
-system, and wrote a Windows installer.
+Jackson and Owen Dunn adapted it to fix bugs and to improve the
+installation setup (in particular, to avoid modifying any of the YPP
+client's startup files).  Owen Dunn added support for uploading to
+YARRG, updated the build system, and wrote a Windows installer.
 
 <p>
 
 JARRG is
 Copyright 2006-2009 Burninator,
 Copyright 2009-2010 Owen Dunn and
-Copyright 2009-2010 Ian Jackson.
+Copyright 2009-2011 Ian Jackson.
 It is Free Software with <strong>NO WARRANTY</strong>, released under
 the MIT-style two-clause licence.
 
 <p>
 
-The download directory can contains other versions (eg unreleased test
-versions), which you can see here:
+The code for the downloadable binaries is in
+in <& downloadurl, leaf=>'jarrg-source.tar.gz' &>.
+The download directory also sometimes contains other versions
+(eg unreleased test versions), which you can see here:
  <& downloadurl, leaf => '', test => 0 &>
 
 <p>
 
-The source code for the downloadable released binaries is in the
-<&| downloadurl, leaf=>'jarrg.tar.gz' &>Linux tarball</&>.
 We maintain JARRG in git, and you can get
 source code for recent and perhaps unreleased versions from one of:
 <pre>