cross-references fixed and moving waffly stuff

handbook/computing/yourlaptop.html

@@ -17,7 +17,7 @@ The <i>expo laptop</i> uses <a href="https://www.debian.org/intro/about">Debian<
 
 <li>Windows machines can do everything needed, but some useful software has no Windows version and you will need to find your own equivalents. There are also dangerous 'gotchas' to look out for because the file-naming system is different. Do use Linux instead if you can.
 
-<li>WSL: the Windows Subsystem for Linux. The first release of this  didn't do the ssh key exchange process easily. The <a href="https://docs.microsoft.com/en-us/windows/wsl/install-win10">2019 WSL2 release</a> includes a complete Linux kernel. If you want to use this, then please do - and write the handbook documentation too. But beware, it can work in <a href="https://docs.microsoft.com/en-us/windows/wsl/wsl2-index">two different modes</a> which behave differently.
+<li>WSL: the Windows Subsystem for Linux. The first release of this  didn't do the ssh key exchange process easily. The <a href="https://docs.microsoft.com/en-us/windows/wsl/install-win10">2019 WSL2 release</a> includes a complete Linux kernel. If you want to use this, then please do - and then write the handbook documentation too. But beware that it has <a href="https://docs.microsoft.com/en-us/windows/wsl/wsl2-index">two different modes</a> which behave differently.
 
 <li>Mac users will need to use the Linux documentation as a guide and work it all out for themselves.
 
@@ -26,14 +26,15 @@ The <i>expo laptop</i> uses <a href="https://www.debian.org/intro/about">Debian<
 
 <h3>Software</h3>
 <p>Long-standing Expo policy is to retain absolute control of all software and all data. So we use <a href="https://en.wikipedia.org/wiki/Free_and_open-source_software">FOSS software</a> and we store data in text files not in a database. You can use other software on your own machine if it is format-compatible and exports data in the formats we want, but all the recommended software here is open source and please don't install proprietary software on the '<em>expo laptop</em>'.
+<img src="https://survex.com/img/aven-1.2.37-by-date.png" align="right" width="200">
 <p>The list of software:
 <ul>
-<li>mercurial
+<li><a href="https://www.mercurial-scm.org/">mercurial</a> - distributed version control system
-<li>git
+<li><a href="https://git-scm.com/">git</a> - distributed version control system
-<li>TortoiseHg
+<li><a href="https://tortoisehg.bitbucket.io/">TortoiseHg</a> - GUI to mercurial
-<li>scp and ftp GUI software, such as <a href="../fzconfig.html">Filezilla</a> - with a configuration file to get to the expo server
+<li><a href="https://tortoisegit.org/support/faq/#prerequisites">TortoiseGit</a> - GUI interface to git
-<li><a href="https://tortoisegit.org/support/faq/#prerequisites">TortoiseGit</a> - GUI interface to git. Optional.
+<li>ftp GUI software, such as <a href="../fzconfig.html">Filezilla</a> - with a configuration file to get to the expo server
-<li>Survex, including the Aven visualisation tool.
+<li><a href="https://survex.com/download.html">Survex</a>, including the Aven visualisation tool.
 <li><a href="https://github.com/CaveSurveying/tunnelx">Tunnel</a>: a  Java 2.5D cave drawing program surveys based on Survex-compatible data which can also read PocketTopo files. (Generally called 'tunnel' even though the project and executable is actually 'tunnelx'.)
 <li><a href="https://therion.speleo.sk/">therion.speleo.sk/</a>Therion - Therion processes survey data and generates maps or 3D models of caves. 
 <li><a href="https://www.qgis.org/en/site/">QGIS</a> - A Free and Open Source Geographic Information System
@@ -43,22 +44,22 @@ The <i>expo laptop</i> uses <a href="https://www.debian.org/intro/about">Debian<
 <li>python, if you are extending troggle or the scripts in expoweb/noinfo/ - already installed on Linux
 <li>python packages you will want to install: [<em>not yet documented</em>]
 </ul>
-<p>Nearly all the Austrian survey has beeen produced using Tunnel but we are moving to Therion for new caves because Therion does elevations properly and Tunnel never will.
+<p>Nearly all our Austrian surveys have beeen produced using Tunnel but we are moving to Therion for new caves because Therion does elevations properly and Tunnel never will.
 
 <p>For Windows users only:
 <ul>
-<li><a href="https://www.chiark.greenend.org.uk/~sgtatham/putty/latest.html">PuTTY</a> including pagent. Version 0.73 was released on 2019-09-29. You need this to generate and to use ssh keys on Windows.
+<li><a href="https://www.chiark.greenend.org.uk/~sgtatham/putty/latest.html">PuTTY</a> including pagent. Version 0.73 was released on 2019-09-29. You need this to generate and to use ssh keys on Windows. Otherwise none of git, mercurial, scp, ftp or rsync will work.
 <li><a href="https://gitforwindows.org/">Git for Windows</a>
 <li><a href="https://www.python.org/downloads/windows/">python for windows</a>. We are using python 2.7 not 3.8.
-<li>WinScp can be used instead of Filezilla, see 
+<li>WinScp can be used instead of Filezilla, - needs an <a href="computing/keyexchange.html">ssh key</a> installed. 
 </ul>
 
 <p>For Android phones:
 <ul>
 <li><a href="ftpusage.html">FTP using Cx_File_Explorer</a> (this is probably out of date)
-<li><a href="https://www.termius.com/">Terminus</a> - command line ssh to login to the expo server.
+<li><a href="https://www.termius.com/">Terminus</a> - command line to create a key for your phone and to ssh login to the expo server.
 <li>OsmAnd - GPS app. See separate pages on using GPS software
-<li><a href="../uploading.html#android">andftp</a> app
+<li><a href="../uploading.html#android">andftp</a> app - needs an <a href="computing/keyexchange.html">ssh key</a> installed on your phone
 <li><a href="https://sites.google.com/site/speleoapps/home">TopoDroid</a> makes cave surveys with the DistoX.
 <li><a href="https://sites.google.com/site/speleoapps/home">Cave3D</a> is a Therion 3D viewer.
 <li><a href="https://sites.google.com/site/speleoapps/home">ThManager</a> organizes single surveys, exported by TopoDroid, into Therion projects encoded by Therion "thconfig" files.
@@ -83,13 +84,17 @@ The <i>expo laptop</i> uses <a href="https://www.debian.org/intro/about">Debian<
 <h3>Configuration</h3>
 
 You need to do the 
-<a href="computing/keyexchange.html">key exchange</a> process - which you can only do entirely on your own if 
+<a href="keyexchange.html">key exchange</a> procedure - which you can only do entirely on your own if 
-you have access to the <i>expo laptop</i> to upload and install the public key generated by your laptop. 
+you have access to the <i>expo laptop</i> to upload and install the public key generated by your laptop. Do this first, Without it none of git, mercurial, scp, ftp or rsync will work.
 
 <p>On a Windows machine you will need to configure pageant (the putty authentication agent) 
 to <a href="https://blog.shvetsov.com/2010/03/making-pageant-automatically-load-keys.html">run at startup to load your key</a>. Note that you are loading your <em>private</em> key, the .ppk file, into pageant and that this key never leaves your laptop.
 
-<p>When using Windows please be <a href="http://expo.survex.com/handbook/survey/getin.htm#filenames">excessively careful when naming files and survex names</a>.
+<p><a href="../tortoise/tortoise-win.htm">Installing TortoiseHg and PuTTy on Windows</a> - full illustrated instructions.
+
+<p><a href="../fzconfig.html">Installing Filezilla</a> - - full illustrated instructions.
+
+<p>When using Windows please, please be <a href="http://expo.survex.com/handbook/survey/getin.htm#filenames">excessively careful when naming files and survex names</a> and be <a href="../manual.html#quickstart">exceptionally careful when using rsync</a>.
 
 <p>The handbook has extensive documentation on when and where it is necessary to use scp and ftp to manage large files in 'expofiles'. See <a href="../upload-expert.html">Experts: Uploading files</a>, a href="../uploading.html">Uploading files</a> and  <a href="../gpxupload.html">Uploading GPS tracks</a>. Only machines which have done the key exchange process can do scp, ftp or rsync.
 
@@ -97,13 +102,15 @@ to <a href="https://blog.shvetsov.com/2010/03/making-pageant-automatically-load-
 <img src="/expofiles/tunnelwiki/wiki/images/6/65/Banner204.png" align="right" width=100>
 <p>For Survex, Tunnel and Therion, see the <a href="http://expo.survex.com/handbook/survey/">Expo Surveying Handbook</a>.
 
-<p><em>For installing Survex, Tunnel etc. see <a href="../getsurvex.html">this page</a> which will be merged in here eventually.
+<p><em>For installing Survex, Tunnel etc. see <a href="../getsurvex.html">this page</a> which will be merged in here eventually.</em>
 
 <p><a href="http://expo.survex.com/expofiles/tunnelwiki/wiki/pages/Tunnel.html">The Tunnel tutorial</a> - installation notes and a wiki of examples and tutorials 
 <p><a href="https://bitbucket.org/goatchurch/tunnelx/src/default/">bitbucket.org/goatchurch/tunnelx</a> - documentation and source code in the bitbucket repository system.
 
+<h3>Cheat lists and quick reminders</h3>
 <p>Quick <a href="qstart-hg.html">reminders for using mercurial</a> at the command line.
-<p>Full instructions for <a href="../tortoise/tortoise-win.htm">installing TortoiseHg and PuTTy on Windows</a>
+<p>Quick <a href="../manual.html#quickstart">reminders for using rsync and mercurial</a> at the command line.
+
 <hr />
 
 <div id="menu">

handbook/fzconfig.html

@@ -11,6 +11,8 @@
 <h3 id="install">Installing Filezilla</h3>
 <p>This software works identically on both Windows and Linux.
 <p>Filezilla is an "FTP client". This means that it connects to servers using a venerable service called "file transfer protocol" i.e. FTP. It looks a bit like copying files from one folder to another on your desktop but it works between different machines.
+
+<p>These are instructions for installing it on your own machine. But <em>none of this will work</em> until you have also done the <a href="computing/keyexchange.html">key exchange</a> procedure.
 <ul>
 <li> Download the software from here <a href="https://filezilla-project.org/download.php?show_all=1">Filezilla Downloads</a>. ( Obviously Linux users will use their usual package management system instead of doing this download.)
 <li>Now install the software following <a href="https://wiki.filezilla-project.org/Client_Installation">the instructions here</a>. 

handbook/gpxupload.html

@@ -43,7 +43,7 @@ unavoidable complexities in getting the GPX file out of your device.
 <li>It may give you options such as "Garmin", or "File". Choose "File". 
 <li>It will ask for a filename to use. Pick something like "northplat-asmith-2018-07-29" (if your name is Aaron Smith)
 <li>A GPX file "northplat-asmith-2018-07-29.gpx" will be downloaded to the Downloads folder on your laptop.
-<li>Write a note in <a href="../logbooks.html">the expo logbook</a> to say what you have done with a short description of what you saw and found.
+<li>Write a note in <a href="logbooks.html">the expo logbook</a> to say what you have done with a short description of what you saw and found.
 </ol>
 
 <p>
@@ -56,7 +56,7 @@ Congratulations. You now have your track recorded using GPS as a GPX file.
 <li>Email the public link from the app to someone who knows how to do it. <br>
 <li>Email the  GPX file to someone who knows how to do it. <br>
 GPX files are small enough for email systems, so don't be shy of adding them as attachments.
-<li>Write a note in <a href="../logbooks.html">the expo logbook</a> to say what you have done with a short description of what you saw and found.
+<li>Write a note in <a href="logbooks.html">the expo logbook</a> to say what you have done with a short description of what you saw and found.
 </ol>
 
 <p>If you can't find someone who knows how to do it, find the most extreme nerd you can find and point them at the 
@@ -65,7 +65,7 @@ GPX files are small enough for email systems, so don't be shy of adding them as
 <h3>Slightly less simple upload instructions</h3>
 <p>Using your own laptop on expo, or after you return from expo, 
 use the "more complex" instructions for <a href="uploading.html">uploading photos</a> to /uploads/, 
-but upload your GPX files instead.
+but upload your GPX files instead. But <em>none of this will work</em> on  your own laptop until you have also done the <a href="computing/keyexchange.html">key exchange</a> procedure.
 
 <h2 id="uploadgpx">More complex upload instructions</h2>
 <p>OK you now have a file produced by your device, something like XTR20170714X2345.GPX .
@@ -75,7 +75,7 @@ but upload your GPX files instead.
 to something recognisable such as 'top-camp-to-toilet-grike.gpx' (all lower case).
 <li>On the <i>expo laptop</i> copy it to a folder in/home/expo/Downloads/gpslogs/YourName/
 <li>Tell someone you have done it.
-<li>Write a note in <a href="../logbooks.html">the expo logbook</a> to say what you have done with a short description of what you saw and found.
+<li>Write a note in <a href="logbooks.html">the expo logbook</a> to say what you have done with a short description of what you saw and found.
 </ol>
 
 

handbook/index.htm

@@ -34,13 +34,13 @@ This is what it's all about:
 Need to get in touch with someone? Look here.
 <ul>
   <li><a href="phone.htm">Phone numbers and setup</a> - Topcamp and basecamp numbers, adding credit.</li>
-  <li><a href="rescue.htm">Rescue</a> - How and when to call rescue. (read before you need!)</li>
+  <li><a href="rescue.htm">RESCUE</a> - How and when to call rescue. (read before you need!)</li>
   <li><a href="cavelink.html">Cavelink</a> - The VLF radio system that enables communication between topcamp and underground.</li>
 </ul>
 <hr>
 
 <h2>Computing and Cave Surveying</h2>
-This is a scientific expedition - the Austrian government allows us to wander around the plateau in exchange for cave surveys. Learn how to contribute!
+This is a scientific expedition - the Austrian government allows us to wander around the plateau <em>in exchange for</em> cave surveys. Learn how to contribute!
 <ul>
   <li><a href="onlinesystems.html">Expo online systems</a> - Overview of expo server capabilites.</li>
   <li><a href="computer.html">Basecamp computers</a> - What's the network setup, how to use it.</li>
@@ -51,7 +51,7 @@ This is a scientific expedition - the Austrian government allows us to wander ar
   <li><a href="survey/newcave.html">Recording newly found caves</a> - What and how to record. (important!)</li>
   <li><a href="logbooks.html">Logbook</a> - Adding trip notes and cave descriptions.</li>
 
-  <li><a href="getsurvex.html">Getting software</a> - How to get and set-up survey creation software.</li>
+  <li><a href="computing/yourlaptop.html">Configuring a new laptop</a> - Experts only: software and configuration.</li>
 
   
   <br>
@@ -100,6 +100,14 @@ Things that are likely to be relevant at basecamp.
 </ul>
 <hr>
 
+<h2>Planning to next Expo</h2>
+<ul>
+  <li><a href="planning.html">Expo Planning Guide</a> - How to plan and orgnise expo.</li>
+  <li><a href="leader.htm">Expo leader checklist</a> - For leaders: check these before you leave UK.</li>
+  <li><a href="treasurer.html">Expo treasurer's guide</a> - For treasurers: tasks, tips.</li>
+</ul>
+<hr>
+
 <h2>History</h2>
 <ul>
   <li><a href="../primer.htm">Primer</a> - For new expedition members - the caves we are exploring</li>
@@ -110,11 +118,7 @@ Things that are likely to be relevant at basecamp.
 
 <h2>Misc</h2>
 <ul>
-  <li><a href="datamgt.html">Cave data management</a> - Paragraph long corporate philosophy blurb.</li>
   <li><a href="vocab.htm">Travelling cavers phrases</a> - Vocabulary in (German, Spanish, French).</li>
-  <li><a href="planning.html">Expo Planning Guide</a> - How to plan and orgnise expo.</li>
-  <li><a href="leader.htm">Expo leader checklist</a> - For leaders: check these before you leave UK.</li>
-  <li><a href="treasurer.html">Expo treasurer's guide</a> - For treasurers: tasks, tips.</li>
 </ul>
 
 <hr />

handbook/survey/index.htm

@@ -37,6 +37,7 @@ detailed topics.</p>
 	<ul>
 		<li><a href="what.htm">What is a cave survey ?</a></li>
 		<li><a href="why.htm">Why am I doing this ?</a></li>
+		<li><a href="../datamgt.html">Waht is cave data management ?</a></li>
 	</ul>
   </li>
 	<li><b>For those new to CUCC expo surveying:</b>

handbook/uploading.html

@@ -117,7 +117,7 @@ and then click on the "Connect" button at the bottom of the sub-window.
 
 <a href="fzexample.png" border=2><img src="fzexample.png" align=center width=65%></a><br>(Click to enlarge).
 
-<p><img src="https://wiki.filezilla-project.org/favicon.ico" width=64  style="float:right; margin: 10px">For installing and pre-configuring Filezilla on a new machine see <a href="fzconfig.html">FileZilla install instructions</a> which will set you up pointing at the correct folder automatically.
+<p><img src="https://wiki.filezilla-project.org/favicon.ico" width=64  style="float:right; margin: 10px">For installing and pre-configuring Filezilla on a new machine see <a href="fzconfig.html">FileZilla install instructions</a> which will set you up pointing at the correct folder automatically. But <em>none of this will work</em> on  new machine until you have also done the <a href="computing/keyexchange.html">key exchange</a> procedure.
 
 <h3>Automated magic</h3>
 <p>Note that uploading photos does not automatically update the view
@@ -131,9 +131,9 @@ at <a href="http://expo.survex.com/photos/">http://expo.survex.com/photos/</a> i
 <h2 id="morecomplex">Using your own laptop</h2>
 <p>To use your own laptop on expo, or after you return from expo, you need need to use FTP. So become an <a href="#experienced">experienced user</a> first.
 
-<p>You will need to know the expo password.</p>
+<p>You will need to know the expo password but <em>none of this will work</em> until you have also done the <a href="computing/keyexchange.html">key exchange</a> procedure.</p>
 
-<p><img src="https://wiki.filezilla-project.org/favicon.ico" width=64 style="float:right; margin: 10px">To installand configure Filezilla on your machine see <a href="fzconfig.html">FileZilla install instructions</a> which will set you up pointing at the correct folder automatically.
+<p><img src="https://wiki.filezilla-project.org/favicon.ico" width=64 style="float:right; margin: 10px">To install and configure Filezilla on your machine see <a href="fzconfig.html">FileZilla install instructions</a> which will set you up pointing at the correct folder automatically.
 
 
 <h2 id="android">Getting photo files from phones</h2>
@@ -154,7 +154,7 @@ at <a href="http://expo.survex.com/photos/">http://expo.survex.com/photos/</a> i
 <li>the target folder: <span style="font-family: monospace">/uploads/</span>, or it may appear as <span style="font-family: monospace">/expofiles/uploads/</span>
 <li>the port number: 21 (if you leave this blank it will probably work)
 </ol>
-<p>Then this is what you do:
+<p>But <em>none of this will work</em> until you have also done the <a href="computing/keyexchange.html">key exchange</a> procedure. On a phone this means that you will also need to install a terminal (command line) app. See <a href="computing/yourlaptop.html">your machine</a> instructions, the Android bits.
 <ol>
 <li>Install the <a href="http://www.lysesoft.com/products/andftp/">andftp</a> app onto your Android phone using the Google Play Store and allow it to access your files and photos on your phone (just click on the popup to do this).
 <li>Click on the icon that looks like a "plus" synbol in a circle