diff --git a/handbook/computing/exposerver.html b/handbook/computing/exposerver.html index 6bc7a869f..7e1d1824b 100644 --- a/handbook/computing/exposerver.html +++ b/handbook/computing/exposerver.html @@ -1,7 +1,9 @@ +<!DOCTYPE html> <html> <head> +<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <title>Expo server</title> -<link rel="stylesheet" type="text/css" href="../css/main2.css" /> +<link rel="stylesheet" type="text/css" href="../../css/main2.css" /> </head> <body> <h2 id="tophead">CUCC Expedition Handbook - Expo server in Cambridge</h2> @@ -9,23 +11,18 @@ <p>The server hosts <a href="http://expo.survex.com">expo.survex.com</a>. -<p>It lives (2018) under Sam Wenham's desk. Sam works for the University Computing Service (UCS), University of Cambridge, -so this is a secure place. - +<p>It lived under Sam Wenham's deskat the University Computing Service (UCS), University of Cambridge until spring 2019. Now it is a borrowed virtual machine on a debian mirror server somewhere in the midlands. <p>We interact with it using: <ul> -<li>TortoiseHg - communicating with hg running on the server - for the DVCS -<a href="../../repositories">repositories</a> expoweb, loser, tunnelx, tunneldata. -<li>FTP - mostly for uploading to /expofiles/ +<li>git - communicating with hg running on the server - for the git +<a href="../../repositories">repositories</a> expoweb, loser, drawings, tunnel. +<li>sFTP and rsync - mostly for uploading to /expofiles/ <li>ssh - occasionally, by experts,to fix things when something goes wrong or for major site reconfiguration. </ul> -Now readthe <a href="manual.html#manual">Expo data management systems manual</a>. +Now readthe <a href="../manual.html#manual">Expo data management systems manual</a>. <hr /> -<ul id="links"> -<li><a href="index.htm">Expedition Handbook</a> -</ul> </body> </html> diff --git a/handbook/manual.html b/handbook/manual.html index ca451f3a4..8f6a422a5 100644 --- a/handbook/manual.html +++ b/handbook/manual.html @@ -196,7 +196,7 @@ editing these files. Use <tt>python databaseReset.py </tt> on its own to get a list of command options and brief explanations.</p> -<p>Clicking on 'New cave' (at the bottom of the cave index) lets you enter a new cave. <a href="caveentry.html">Info on how to enter new caves has been split into its own page</a>.</p> +<p>Clicking on 'New cave' (at the bottom of the cave index) lets you enter a new cave. <a href="computing/caveentry.html">Info on how to enter new caves has been split into its own page</a>.</p> <p>(If you remember something about CAVETAB2.CSV for editing caves, that was superseded in 2012).</p> diff --git a/handbook/survey/caveentry.html b/handbook/survey/caveentry.html index 798dd5fd2..7bc4d61c9 100644 --- a/handbook/survey/caveentry.html +++ b/handbook/survey/caveentry.html @@ -2,7 +2,7 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <title>CUCC Expedition Handbook: Cave entry field</title> -<link rel="stylesheet" type="text/css" href="../css/main2.css" /> +<link rel="stylesheet" type="text/css" href="../../css/main2.css" /> </head> <body> <h2 id="tophead">CUCC Expedition Handbook</h2>