mirror of
https://expo.survex.com/repositories/expoweb/.git/
synced 2025-04-03 09:31:46 +01:00
handbook updating
This commit is contained in:
parent
96d0d7e504
commit
f8635a25b7
@ -1,41 +0,0 @@
|
|||||||
<html>
|
|
||||||
<head>
|
|
||||||
<title>CUCC Expedition Handbook</title>
|
|
||||||
<link rel="stylesheet" type="text/css" href="../css/main2.css" />
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
<h1>'Easy' short guide to mercurial</h1>
|
|
||||||
<p>Beginners: STOP here. This is not for you. You will be using Tortoise, a visual graphical interface to mercurial. Go <a href="index.htm">back</a> to safety now.
|
|
||||||
<p>Experts: do this in a terminal window on the Expo laptop. This uses the command line, not a graphical user interface.
|
|
||||||
<h2>Before you start</h2>
|
|
||||||
cd ~loser</br>
|
|
||||||
hg diff</br>
|
|
||||||
<b>If any changes are displayed, commit them (you will need to find out what they are by looking at the files listed):</b></br>
|
|
||||||
hg commit -m "<i>surveys in Pooh Passage which John did</i>" -u "<i>YourName</i>"</br>
|
|
||||||
hg fetch</br>
|
|
||||||
<b>If there are any errors then STOP, and get someone to fix it.</b>
|
|
||||||
|
|
||||||
<h2>Make your changes, then:</h2>
|
|
||||||
<b>If you have added new files:</b></br>
|
|
||||||
hg add <i>file1 file2 file3</i><br/>
|
|
||||||
hg commit -m "<i>surveys of 200m pitch in Far End</i>" -u <i>"YourName"</i><br/>
|
|
||||||
hg fetch<br/>
|
|
||||||
<b>If there are any errors then STOP, and get someone to fix it.</b><br/>
|
|
||||||
hg push<br/></body>
|
|
||||||
<hr>
|
|
||||||
<ul id="links">
|
|
||||||
<li><a href="index.htm">Expedition Handbook</a>
|
|
||||||
<ul>
|
|
||||||
<li><a href="survey/index.htm">Surveying guide</a></li>
|
|
||||||
<li><a href="look4.htm">Prospecting guide</a></li>
|
|
||||||
<li><a href="rescue.htm">Rescue guide</a></li>
|
|
||||||
<li><a href="rig/rigit.html">Rigging guide</a></li>
|
|
||||||
<li><a href="photo.htm">Photography guide</a></li>
|
|
||||||
</ul></li>
|
|
||||||
<li><a href="../infodx.htm">Index to info/topics</a></li>
|
|
||||||
|
|
||||||
<li><a href="../index.htm">Back to Expedition Intro</a></li>
|
|
||||||
<li><a href="../../index.htm">Back to CUCC Home</a></li>
|
|
||||||
</ul>
|
|
||||||
</html>
|
|
||||||
|
|
||||||
@ -29,7 +29,7 @@ thinks you have been on too long. Get instructions from the Gasthof campsite rec
|
|||||||
|
|
||||||
<h3>Expo laptop</h3>
|
<h3>Expo laptop</h3>
|
||||||
|
|
||||||
<p>The <em>Expo laptop</em> 'debian' in the tatty hut is a Dell Latitude E4200 laptop (loaned by Phil
|
<p>The <em>Expo laptop</em> 'debian' in the tatty hut is a Dell Latitude E4200 laptop (loaned by Philip
|
||||||
Sargent) which is connected to the router by a cable and also by WiFi
|
Sargent) which is connected to the router by a cable and also by WiFi
|
||||||
(it's wifi configuration was fixed by Sam in 2019). It
|
(it's wifi configuration was fixed by Sam in 2019). It
|
||||||
also has an external numberpad as a couple of vital keys are dead
|
also has an external numberpad as a couple of vital keys are dead
|
||||||
|
|||||||
@ -107,24 +107,6 @@ Purplish-blue</span> nail-polish
|
|||||||
</td></tr>
|
</td></tr>
|
||||||
|
|
||||||
|
|
||||||
<tr>
|
|
||||||
<td><span style="border: thin solid black; padding: 0.3ex 0.5em; color:white; background:#f00;">
|
|
||||||
Red</span> toughtags
|
|
||||||
</td>
|
|
||||||
<td>Adam Henry
|
|
||||||
</td>
|
|
||||||
<td>Maybe
|
|
||||||
</td></tr>
|
|
||||||
|
|
||||||
<tr>
|
|
||||||
<td><span style="border: thin solid black; padding: 0.3ex 0.5em; color:white; background:#f00;">
|
|
||||||
Red</span> toughtags
|
|
||||||
</td>
|
|
||||||
<td>Adam Henry
|
|
||||||
</td>
|
|
||||||
<td>Maybe
|
|
||||||
</td></tr>
|
|
||||||
|
|
||||||
</table>
|
</table>
|
||||||
|
|
||||||
<br>
|
<br>
|
||||||
|
|||||||
@ -36,22 +36,26 @@ Need to get in touch with someone? Look here.
|
|||||||
<h2>Computing</h2>
|
<h2>Computing</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 in exchange for cave surveys. Learn how to contribute!
|
||||||
<ul>
|
<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>
|
<li><a href="computer.html">Basecamp computers</a> - What's the network setup, how to use it.</li>
|
||||||
<li><a href="computing/ftpusage.html">Basic FTP setup</a> - Instructions for Windows, Android and Linux on <strong>how to upload files (and photos)</strong> to expo server.</li>
|
|
||||||
<li><a href="uploading.html">Uploading photos</a> - More detailed description on photos management.</li>
|
<li><a href="uploading.html">Uploading photos</a> - More detailed description on photos management.</li>
|
||||||
|
|
||||||
<li><a href="computing/repousage.html">Basic repositories setup</a> - Instructions for Windows and Linux on repository setup.</li>
|
|
||||||
|
|
||||||
<li><a href="getsurvex.html">Getting software</a> - How to get and set-up survey creation software.</li>
|
|
||||||
|
|
||||||
<li><a href="survey/newcave.html">Recording newly found caves</a> - What and how to record. (important!)</li>
|
<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="logbooks.html">Logbook</a> - Adding trip notes and cave descriptions.</li>
|
||||||
|
|
||||||
<li><a href="onlinesystems.html">Expo online systems</a> - Overview of expo server capabilites.</li>
|
<li><a href="getsurvex.html">Getting software</a> - How to get and set-up survey creation software.</li>
|
||||||
|
<ul>
|
||||||
<i>Broken:
|
<i>
|
||||||
|
<li>Broken:
|
||||||
<li><a href="essentials.html">Cave locations</a> - How to download locations of known caves.</li>
|
<li><a href="essentials.html">Cave locations</a> - How to download locations of known caves.</li>
|
||||||
<li><a href="gpxupload.html">Phone GPS</a> - How to upload location of the cave you've found.</li>
|
<li><a href="gpxupload.html">Phone GPS</a> - How to upload location of the cave you've found.</li>
|
||||||
|
<li><a href="computing/repousage.html">Basic repositories setup</a> - Very brief instructions for Windows and Linux on repository setup.</li>
|
||||||
|
</i>
|
||||||
|
</ul>
|
||||||
|
|
||||||
|
<li><a href="computing/ftpusage.html">Basic FTP setup</a> - Very brief instructions for Windows, Android and Linux on <strong>how to upload files (and photos)</strong> to expo server.</li>
|
||||||
</i>
|
</i>
|
||||||
|
|
||||||
<br>
|
<br>
|
||||||
|
|||||||
@ -37,11 +37,6 @@ it is the only documentation we have for:
|
|||||||
</ul>
|
</ul>
|
||||||
<h2><a id="update">Updating the online systems - overview</a></h2>
|
<h2><a id="update">Updating the online systems - overview</a></h2>
|
||||||
|
|
||||||
<h3>Experts short cut</h3>
|
|
||||||
|
|
||||||
<p>Short <a href="checkin.htm">command-line instructions</a> for updating the
|
|
||||||
data on the server
|
|
||||||
(using the <em>expo laptop</em>). This is a memory jog for experts, not beginners.</p>
|
|
||||||
|
|
||||||
|
|
||||||
<h3>Autogenerated pages</h3>
|
<h3>Autogenerated pages</h3>
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user