From 467d5a1ef94b35cfae7bac8f4ed1f2558fceda8a Mon Sep 17 00:00:00 2001
From: Philip Sargent <philip.sargent@klebos.com>
Date: Sun, 11 Apr 2021 01:25:13 +0100
Subject: [PATCH] bad external urls fixed

---
 handbook/computing/getsurvex.html | 8 ++------
 handbook/cpne.htm                 | 2 +-
 handbook/survey/newsurvex.html    | 4 ++--
 years/1978/npc79.htm              | 4 ++--
 4 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/handbook/computing/getsurvex.html b/handbook/computing/getsurvex.html
index 1086a6c78..1f76b37ef 100644
--- a/handbook/computing/getsurvex.html
+++ b/handbook/computing/getsurvex.html
@@ -19,17 +19,13 @@ A <a href="../survexhistory96.htm">history of survex</a> article was published i
 This is what you will use to visualise .svx files as beautiful cave centre-line surveys.
 
 <p>If you are entering new survey data from a new cave, you will also need either 
-<a href="https://bitbucket.org/goatchurch/tunnelx/wiki/Home">TunnelX</a> or 
+<a href="https://github.com/CaveSurveying/tunnelx">TunnelX</a> or 
 <a href="https://therion.speleo.sk/">Therion</a> to 
 convert your sketches into actual plan and elevation presentation-quality surveys.
 <h2>TunnelX</h2>
 <p>Tunnel was written by <a href="http://expo.survex.com/folk/l/jtodd.htm">Julian Todd</a> (18 Austrian expos since 1989). It allows the generation of full 3D models of cave passages which can be viewed using a VRML browser.
 <p>
-<a href="https://bitbucket.org/goatchurch/tunnelx/wiki/Home">TunnelX intro</a>.
-<p>
-<a href="https://bitbucket.org/goatchurch/tunnelx/wiki/Installing_and_Running">TunnelX installation and running</a>.
-<p>
-<a href="http://expo.survex.com/expofiles/tunnelwiki/wiki/pages/Tunnel.html">TunnelX detailed wiki documentation (old)</a>.
+<a href="/expofiles/tunnelwiki/wiki/pages/A_walk_through_tunnel.html">TunnelX detailed wiki documentation (old)</a>.
 
 <h2>Therion</h2>
 <a href="../l/therion-dataflow.html"><img class="onright" src="../t/therion-dataflow.jpg"></a>
diff --git a/handbook/cpne.htm b/handbook/cpne.htm
index 0a76b9b3e..8e023980e 100644
--- a/handbook/cpne.htm
+++ b/handbook/cpne.htm
@@ -55,7 +55,7 @@ expedition cavers.</p>
 	<li>The <a href="../years/1989/rescue.htm">1989 rescues</a> referred to.</li>
 	<li><b>Other rescue topics:</b>
 	<ul>
-		<li><a href="http://www.pennine.demon.co.uk/NPC/1987/DRGIBSON.HTM">Caving
+		<li><a href="http://www.waddingtons.info/NPC/1987/DRGIBSON.HTM">Caving
 		Accidents: Management from Site to surface</a>. An article by Dr. D.Gibson
 		in the 1987 NPC Journal.</li>
 		<li><a href="../years/1980/report.htm#rescue80">Trapped by flood</a> in 113, 1980</li>
diff --git a/handbook/survey/newsurvex.html b/handbook/survey/newsurvex.html
index dfebf36de..53a05bddf 100644
--- a/handbook/survey/newsurvex.html
+++ b/handbook/survey/newsurvex.html
@@ -126,7 +126,7 @@ http://expo.suvex.com/survexfile/caves-{area}/{cave}/{surveytripid}.svx
 </pre>
 e.g.
 <pre>
-<a href="http://expo.suvex.com/survexfile/caves-1623/2050-CUCC-01/easybimble.svx">http://expo.suvex.com/survexfile/caves-1623/2050-CUCC-01/easybimble.svx</a>
+<a href="/survexfile/caves-1623/2050-CUCC-01/easybimble.svx">/survexfile/caves-1623/2050-CUCC-01/easybimble.svx</a>
 </pre>
 and a suvex-file editing page will open, pre-populated with an example template 
 for survex data, most of which you will delete and replace. Edit this template and type in your own data.
@@ -172,7 +172,7 @@ typing up your notes.
 <p>If you have a complex cave like 204 or 161 with many separate exploration zones then you can put subfolder names in the
 URL bar e.g. 
 <pre>
-<a href="http://expo.suvex.com/survexfile/caves-1623/2050-CUCC-01/murderalley/killerclimb/easybimble.svx">http://expo.suvex.com/survexfile/caves-1623/2050-CUCC-01/murderalley/killerclimb/easybimble.svx</a>
+<a href="/survexfile/caves-1623/2050-CUCC-01/murderalley/killerclimb/easybimble.svx">survexfile/caves-1623/2050-CUCC-01/murderalley/killerclimb/easybimble.svx</a>
 </pre>
 and the intermediate directories will be created on the server if they don't already exist. This is in addition to 
 the directory name which is also the name of your new cave being created automatically.
diff --git a/years/1978/npc79.htm b/years/1978/npc79.htm
index cae450f93..668ce4f67 100644
--- a/years/1978/npc79.htm
+++ b/years/1978/npc79.htm
@@ -201,8 +201,8 @@ there, pushing them just a little more trouble.</p>
 <hr />
 <!-- LINKS -->
 <ul id="links">
-<li><a href="http://www.pennine.demon.co.uk/NPC/">Northern Pennine Club</a>
-<a href="http://www.pennine.demon.co.uk/NPC/1979/MENU.HTM">1979 Journal</a>
+<li><a href=https://northernpennineclub.org.uk/">Northern Pennine Club</a>
+<a href="http://www.waddingtons.info/NPC/1979/CUCC7778.HTM">1979 Journal</a>
 (from which the above is taken)</li>
 <li>1978 Expedition info:
 <ul>