upload docs page: Correct and clarify cd to jpctb

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

diff --git a/yarrg/web/upload b/yarrg/web/upload
index 2714dcd8aa4998a71135e0cb561e2cee57dae3c9..db82c6910c88caf468fd3f93ded34a1019ce0d0b 100755 (executable)
--- a/yarrg/web/upload
+++ b/yarrg/web/upload
@@ -34,6 +34,11 @@
 
 </%doc>
 <& docshead &>
+<%perl>
+my $url_base_base= 'http://yarrg.chiark.net/download/jpctb';
+my $download_version= 'test';
+my $url_base= "$url_base_base/$download_version";
+</%perl>
 <h1>Uploading to YARRG</h1>
 <p>
 
@@ -46,7 +51,7 @@ Puzzle Pirates game client and uploads it to the database.
 
 You will need to upload data yourself if there is no data for your
 ocean or island, or the data that is there is too old.  You should
-also upload when preparing trade run, as market conditions change and
+also upload when preparing a trade run, as market conditions change and
 you want a plan based on recent data.
 
 <p>
@@ -84,9 +89,10 @@ report the problem to us, not to Three Rings.
 <h3>Installing and running on Linux</h3>
 
 Download
-<a href="http://www.greenend.org.uk/owen/free/jpctb.tar.gz">http://www.greenend.org.uk/owen/free/jpctb.tar.gz</a>
+<a href="<% $url_base %>/jpctb.tar.gz"><% $url_base %>/jpctb.tar.gz</a>
 and unpack it.  You run it from the command line.  Change
-to the directory where you unpacked the tarball above, and then run
+(<code>cd</code>) to the top level <code>jpctb</code> directory
+which was created when you unpacked the tarball, and then run
 <pre>
 ./jpctb /path/to/yohoho/yohoho
 </pre>
@@ -97,7 +103,7 @@ ordinary Puzzle Pirates startup script, which is normally
 <h3>Installing on Windows</h3>
 
 Download
-<a href="http://www.greenend.org.uk/owen/free/jpctb-linkfarmer/jpctp-setup.exe">http://www.greenend.org.uk/owen/free/jpctb-linkfarmer/jpctp-setup.exe</a>
+<a href="<% $url_base %>/jpctb-setup.exe"><% $url_base %>/jpctb-setup.exe</a>
 and double-click on it.  It will either:
 <ol>
 <li>Just work, in which case you'll have a new icon on your desktop which
@@ -124,9 +130,9 @@ databases.
 <p>
 
 YARRG JPCTB uses the Java Accessibility API, which is a part of the
-Java platform.  It's an facility in Java, available for all Java
+Java platform.  It's a facility in Java, available for all Java
 programs, intended to help make applications available to users with
-disabilities; for example, it permits hooking in screen readers.  The
+disabilities: for example, it permits hooking in screen readers.  The
 use of the Java Accessibility API was helpfully suggested by a Ringer
 in the forums (to another developer of a third-party tool, wanting
 help getting information out of Duty Reports).
@@ -141,7 +147,7 @@ core game functionality which would make cheating possible.
 
 <p>
 
-JPCTB works by running any unmodified copy of the YPP client but with
+JPCTB works by running an unmodified copy of the YPP client but with
 a separate JVM (Java Virtual Machine) configured to use the
 appropriate accessibility plugin.  We do this (rather than configuring
 the computer's main JVM to use the JPCTB accessibility plugin) so that
@@ -149,7 +155,7 @@ it is still possible to launch Puzzle Pirates <em>without</em> JPCTB
 (for example, in case the JPCTB client should cause any kind of
 problem).
 
-<h2>Authorship and source code</h2>
+<h2>Authorship, source code and other versions</h2>
 
 Thanks to Burninator for writing the core of the JPCTB client.  Ian
 Jackson and Owen Dunn adapted it to improve the installation setup (in
@@ -169,11 +175,18 @@ the MIT-style two-clause licence.
 
 <p>
 
+The download directory can contains other versions (eg unreleased test
+versions), which you can see here:
+ <a href="<% $url_base_base %>/"><% $url_base_base %>/</a> .
+
+<p>
+
 The source code for the downloadable released binaries is in the
-<a href="http://www.greenend.org.uk/owen/free/jpctb.tar.gz">Linux
+<a href="<% $url_base %>/jpctb.tar.gz">Linux
 tarball</a>.  We maintain YARRG JPCTB in git, and you can get
-recent and perhaps unreleased versions from
-<code>git://git.yarrg.chiark.net/jpctb.git</code>.
+source code for recent and perhaps unreleased versions from
+<code>git://git.yarrg.chiark.net/jpctb.git</code> and/or
+<code>git://git.chiark.greenend.org.uk/~ijackson/jpctb.git</code> .
 
 
 </div>