expo/expoweb
1
0
Fork 0
mirror of https://expo.survex.com/repositories/expoweb/.git/ synced 2024-11-26 09:11:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

moving a couple of files into /computing/ folder and updating links

Browse Source
This commit is contained in:
Philip Sargent 2020-03-01 19:23:17 +00:00
parent 4d79886f44
commit bb2324ebe2
3 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
handbook/computing/exposerver.html
View File

@ -1,7 +1,9 @@
<!DOCTYPE html>
<html> <html>
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Expo server</title> <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> </head>
<body> <body>
<h2 id="tophead">CUCC Expedition Handbook - Expo server in Cambridge</h2> <h2 id="tophead">CUCC Expedition Handbook - Expo server in Cambridge</h2>
@ -9,23 +11,18 @@
<p>The server hosts <p>The server hosts
<a href="http://expo.survex.com">expo.survex.com</a>. <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, <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.
so this is a secure place.
<p>We interact with it using: <p>We interact with it using:
<ul> <ul>
<li>TortoiseHg - communicating with hg running on the server - for the DVCS <li>git - communicating with hg running on the server - for the git
<a href="../../repositories">repositories</a> expoweb, loser, tunnelx, tunneldata. <a href="../../repositories">repositories</a> expoweb, loser, drawings, tunnel.
<li>FTP - mostly for uploading to /expofiles/ <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. <li>ssh - occasionally, by experts,to fix things when something goes wrong or for major site reconfiguration.
</ul> </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 /> <hr />
<ul id="links">
<li><a href="index.htm">Expedition Handbook</a>
</ul>
</body> </body>
</html> </html>

2
handbook/manual.html
View File

@ -196,7 +196,7 @@ editing these files.
Use <tt>python databaseReset.py Use <tt>python databaseReset.py
</tt> on its own to get a list of command options and brief explanations.</p> </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 <p>(If you remember something about CAVETAB2.CSV for editing caves, that was
superseded in 2012).</p> superseded in 2012).</p>

2
handbook/survey/caveentry.html
View File

@ -2,7 +2,7 @@
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
<title>CUCC Expedition Handbook: Cave entry field</title> <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> </head>
<body> <body>
<h2 id="tophead">CUCC Expedition Handbook</h2> <h2 id="tophead">CUCC Expedition Handbook</h2>