X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=yarrg%2Fweb%2Fintro;h=66dc15fb114fcae3d5811cebdbe855ce5adfac70;hb=ce2957283c84ae291297359f8f2b1b5f0e5fbf20;hp=3088ccedbe7400f7b61ea981d4596e6699448f7d;hpb=6335baf49c849e16ae7845016d97bcb76d4b7cf6;p=ypp-sc-tools.web-live.git

diff --git a/yarrg/web/intro b/yarrg/web/intro
index 3088cce..66dc15f 100755
--- a/yarrg/web/intro
+++ b/yarrg/web/intro
@@ -39,6 +39,8 @@
 <a href="lookup">YARRG</a> -
  Yet Another Revenue Research Gatherer
 |
+<a href="devel">development</a>
+|
 <b>introduction</b>
 |
 <a href="docs">documentation</a>
@@ -72,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
@@ -87,7 +89,9 @@ cd yarrg
 make
 </pre>
 this will download the code into the directory <code>ypp-sc-tools</code>,
-and build the software.
+and build the software.  (If your Linux is very up to date you may
+find that it complains that it doesn't know the command <kbd>git-core</kbd>.
+In that case, use <kbd>git core</kbd>, with a space, instead.)
 
 <p>
 
@@ -98,45 +102,18 @@ git-pull
 cd yarrg
 make
 </pre>
-to fetch the new version.
+to fetch the new version.  (Again, you may need <kbd>git pull</kbd>
+instead of <kbd>git-pull</kbd>.)
 
 <h2>Uploading from Windows</h2>
 
 There is not currently an upload client for Windows which feeds data
 into YARRG.  It would probably be straightforward to modify the
-Windows PCTB v5 upload client to upload to YARRG as well.  The
-mechanism and format for uploading is documented in
-<a href="/~ijackson/ypp-sc-tools/master/yarrg/README.devel">README.devel</a>.
-
-<h1>YARRG development, contribution and troubleshooting</h1>
-
-<h2>Free Software (aka Open Source)</h2>
-
-YARRG is Free Software - you may share and modify it.  See the
-licences for details.
-
-<p>
-
-Not only the client but also the webserver code is Free.  The website
-code can be found in the same tree as above, in the <code>web</code>
-directory.
-
-<p>
-
-But in case we have made changes but not yet pushed them
-(perhaps because we haven't done a release), and to make it easy for
-anyone else who runs a copy of the website to provide everyone with
-the source for their version, the website code itself lets you download
-an up-to-date <a href="source.tar.gz">tarball</a> of its
-actually-running source code.
+Windows PCTB v5 upload client to upload to YARRG as well.
 
 <p>
 
-If you would like to run a (perhaps modified) copy of the YARRG
-website it would be very easy for us to make our system send you
-copies of updates submitted by users of the official YARRG client, in
-the format expected by the code you'll be running.  Please just ask
-us.
+See our <a href="devel">Developers' information</a> page.
 
 <h2>Contacting the YARRG developers</h2>
 
@@ -144,4 +121,4 @@ Email Ian Jackson ijackson (at) chiark.greenend.org.uk.  Or talk to
 any Fleet Officer or above of the crew Special Circumstances on the
 Midnight Ocean.
 
-<& footer, isdocs => 1 &>
+<& footer &>