From 04f70187b9a50f4be34f8c18cd26c3b53751fdd6 Mon Sep 17 00:00:00 2001
From: "Philip Sargent (muscogee)" <philip.sargent@gmail.com>
Date: Sun, 1 Mar 2020 20:18:46 +0000
Subject: [PATCH] fixing links and adding cross-references
---
handbook/computing/basiclaptop.html | 1 +
handbook/computing/yourlaptop.html | 2 +-
handbook/onlinesystems.html | 14 +++++++-------
handbook/survey/newsurvex.html | 9 +++++----
handbook/website-history.html | 2 +-
5 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/handbook/computing/basiclaptop.html b/handbook/computing/basiclaptop.html
index 7054e2c3e..c947c2ecd 100644
--- a/handbook/computing/basiclaptop.html
+++ b/handbook/computing/basiclaptop.html
@@ -34,6 +34,7 @@ And please <b>write some documentation for the next person</b> in your situation
<p>If you are just typing up logbook entries then you don't need any other software. If you are working with survey data download this software (short list):
<ul>
<li><a href="https://git-scm.com/">git</a> - version control system</li>
+<li><a href="getsurvex.html">Installing surveying software</a> - survex, tunnel, therion - specifically for expo use
<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>: 2.5D cave drawing program 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</a> - Therion processes survey data and generates maps or 3D models of caves.
diff --git a/handbook/computing/yourlaptop.html b/handbook/computing/yourlaptop.html
index f710f117a..147fc01a7 100644
--- a/handbook/computing/yourlaptop.html
+++ b/handbook/computing/yourlaptop.html
@@ -148,7 +148,7 @@ to <a href="https://blog.shvetsov.com/2010/03/making-pageant-automatically-load-
<ul>
<li>Using Survex, Tunnel and Therion, see the <a href="http://expo.survex.com/handbook/survey/">Expo Handbook - Surveying section</a>.
-<li><em>For installing Survex, Tunnel etc. see <a href="../getsurvex.html">this page</a> which will be merged in here eventually.</em>
+<li><em>For installing Survex, Tunnel etc. see <a href="getsurvex.html">this page</a> which may be merged in here eventually.</em>
<li><a href="../../documents/tunnel-loefflerCP35-only.pdf">Introduction to using Tunnel</a> - article by Dave Loeffler. This is really good and should be read first.
diff --git a/handbook/onlinesystems.html b/handbook/onlinesystems.html
index 0027dbad1..cfb5c5ebe 100644
--- a/handbook/onlinesystems.html
+++ b/handbook/onlinesystems.html
@@ -51,9 +51,9 @@ just be overwritten</p>
<h3 id="edithandbook">Editing this handbook and historic expo documentation</h3>
<p>The primary and recommended way of editing this handbook (and the website generally) is to use
-a laptop which has the <a href="#mercurial">Distributed Version Control System</a> software installed. The
+a laptop which has the version control software installed. The
person editing needs to know how to use this software, and also needs to know how to edit raw HTML files
-using a text editor.
+using a text editor. The public <a href="exposerver.html">expo server</a> is on a machine far, far away that we only access remotely.
<p>The <em>Expo laptop</em> has the software installed, so it is best to learn how to do this
when sitting at that laptop.
@@ -66,11 +66,11 @@ problem. It also means that several people can work on the site on
different computers at once and normally merge their changes
easily.
-<p>The recommended editing workflow is to (a) use the DVCM to synchronise your local laptop copy of the
+<p>The recommended editing workflow is to (a) use the version control software to synchronise your local laptop copy of the
website files with that on the server; (b) edit a set of .html files on your laptop so that all links between them are consistent,
save the files locally, and "commit" them locally;
(c) "push" the collection of changes to the expo online server as a single action.
-<p>See the <a href="manual.html#manual">Expo data management systems manual</a> for a fuller description of the DVCM
+<p>See the <a href="manual.html#manual">Expo data management systems manual</a> for a fuller description of the version control software
repositories and how to install and use the software.
<h3 id="editthispage">Using "Edit this page"</h3>
@@ -88,8 +88,8 @@ mechanism does not tidy-up after itself properly.
See <a href="manual.html#editthispage">these instructions for this tidy-up</a>
-<h3 id="mercurial">DVCS - version control</a></h3>
-<p>We use a distributed revision control system (DVCS) for all the important data.
+<h3 id="git">Version control system</a></h3>
+<p>We use a distributed revision control system (git, and formerly mercurial) for all the important data.
This means that many people can edit and merge their changes with the expo
server in Cambridge at the same time: inlcuding people still on expo in the Tatty Hut
and those who have returned to the UK. Also anyone who is up
@@ -99,7 +99,7 @@ and the updates will be merged when they get back to civilization.
<p>In principle, survey notes can be typed into a laptop up on the plateau which would
then get synchronised when it next gets internet access.
</p>
-<p>A DVCS is inefficient for scanned survey notes, which are large files that
+<p>A version control system is inefficient for scanned survey notes which are large files that
do not get modified, so they are kept as a plain directory of files 'expofiles'.
The same goes for holiday photographs and GPS logs.</p>
diff --git a/handbook/survey/newsurvex.html b/handbook/survey/newsurvex.html
index a7ab60d66..fd9d16d60 100644
--- a/handbook/survey/newsurvex.html
+++ b/handbook/survey/newsurvex.html
@@ -19,11 +19,12 @@
-->
</ul>
<h2>Process</h2>
-<p>
+<p>In principle you do not need any software other than a text editor to create a survex file.
+ So you do not need to have installed survex on your laptop at this point.
+</p>
<h3 id="survexformat">Typing in the survey data in survex format</h3>
-<p>[This has been described in several places and we are in the process of consolidating
-the documentation and getting rid of out of date notes.]
+
<p>The survey data typed up must include all the notes, including station details and passage
names. Make a backup copy to another machine or USB stick as soon as you have typed it in.
@@ -48,9 +49,9 @@ ensure that it is <em>saved, committed, </em>and<em> pushed</em> appropriately.
<p>Once you have created the .svx file you will run survex to generate a centre line, transcribe your sketches onto that paper, scan it again and then digitise into tunnel or therion.
<ul>
-<li><a href="drawup.htm">Drawing up your survey</a> - incomplete and a bit out of date
<li><a href="athome.htm">Back in the UK</a> - not really part of the process
<li><a href="/expofiles/presentations/cave_surveying_20130626.pdf">Cave Surveying - training course slidepack</a>
+<li><a href="../survexhiustory96.htm">History of Survex (1996)</a></li>
</ul>
<p>[Nerds: survex cave data belongs in the repository "loser", e.g.
diff --git a/handbook/website-history.html b/handbook/website-history.html
index 64689f867..c7344e3fe 100644
--- a/handbook/website-history.html
+++ b/handbook/website-history.html
@@ -33,7 +33,7 @@ the release of the BBC Micro and then the Acorn A4. A full history of this perio
<h3>Survex - cave surveying</h3>
<p>In the 1990s, Olly Betts and Wookey began
-work on "<a href="getsurvex.html">Survex</a>", a
+work on "<a href="computing/getsurvex.html">Survex</a>", a
program in C for the calculation and 3-D visualization of centerlines, with
intelligent loop closure processing. Julian Todd's Java program "Tunnel" facilitated the
production of attractive, computerized passage sketches from Survex centerline data and scanned