rename yourlaptop as surveylaptop

This commit is contained in:
2022-11-25 20:33:16 +00:00
parent d5ff5f7e34
commit b4353d2c0b
11 changed files with 62 additions and 37 deletions

View File

@@ -32,7 +32,7 @@
<p>and of course using your phone or laptop you can update entries on expo antics on public forums such as ukcaving.
<p>If you also have Survex and Therion installed on the laptop, you can do nearly everything for initial cave survey data entry. See the
<a href="getsurvex.html">Survex, Tunnel and Therion</a> installation instructions and the <a href="yourlaptop.html">expo data maintenance</a> installation instructions.
<a href="getsurvex.html">Survex, Tunnel and Therion</a> installation instructions and the <a href="surveylaptop.html">expo survey laptop</a> installation instructions.
(These will be moved to a different page in the handbook soon).
<p>We are actively working on increasing the number of expo activities that can be done with just a browser and no, or minimal, installed software.
@@ -47,14 +47,14 @@ href="manual.html">data maintenance manual</a>.
<li><a href="#any">A Survey laptop</a>: a basic laptop with Survex and Therion installed - for cave surveying data entry.
<li>An <a href="#basic">expo basic laptop</a>
<li>A <a href="winlaptop.html">Windows expo basic laptop</a>
<li>A full <a href="yourlaptop.html">expo data maintenance computer</a> and Android phone config
<li>A full <a href="surveylaptop.html">expo survey computer</a> and Android phone config
<li>An <a href="../troggle/troglaptop.html">expo software development computer</a> for troggle programming
</ul>
<p>See <a href="../troggle/trognotes.html#devtree">the expertise sequence</a> which lists what you can do at each stage.
<h2 id="basic">Your own basic laptop</h2>
<p>If you are new to expo and can't do what you want with just a browser and email, then please use the <em>expo laptop</em> in the potato hut first. You don't <em>need</em> to use your own laptop - which can take several hours to configure completely.
<p>To set up your own basic laptop for all cave data maintenance you need to do this:</p>
<p>To set up your own basic laptop for bulk cave data maintenance you need to do this:</p>
<ol>
<li>Register an SSH key</a> with an expo nerd i.e 'get a login'. (see "Key Configuration" below)</li>
<li>Install <a href="#software">git version control software</a> to download ("clone"), view and edit caving data.</li>
@@ -66,12 +66,12 @@ href="manual.html">data maintenance manual</a>.
<p>The <em>expo laptop</em> is a basic laptop configuration. It has everything for editing and testing survey files (survex, aven, cavern), drawings (tunnel, therion), scanned images of sketches and centre-lines, and photographs. The <em>expo laptop</em> in the potato hut is also physically connected to a flatbed scanner but you can use your phone camera instead and email the images to yourself on your laptop.
<p>The <em>expo laptop</em> may also have some software for managing vector images (such as rigging guides), <a href="https://paperless.bheeb.ch/">PocketTopo</a> files, <a href="https://en.wikipedia.org/wiki/Geographic_information_system">GIS digital maps</a> and <a href="https://activityworkshop.net/software/gpsprune/development.html">GPS tracks</a>. See the <a href="yourlaptop.html">full data maintenance laptop configuration</a> for details.
<p>The <em>expo laptop</em> may also have some software for managing vector images (such as rigging guides), <a href="https://paperless.bheeb.ch/">PocketTopo</a> files, <a href="https://en.wikipedia.org/wiki/Geographic_information_system">GIS digital maps</a> and <a href="https://activityworkshop.net/software/gpsprune/development.html">GPS tracks</a>. See the <a href="surveylaptop.html">full survey laptop configuration</a> for details.
<p>Managing large sets of photographs and scanned images, and managing several folders of these on your laptop and on <var>expofiles</var> on the server is finicky and time-consuming. Many programmers use rsync to help them with this, but if you have never used rsync, now is <em>not</em> the time to learn. Use filezilla and FTP. It is at this point that if you are using a Windows machine, you <em>really</em> need to <a href="winlaptop.html#problems">read about how expo uses hard and soft links and filenames on Windows</a>. If things get screwed up badly, it will need someone on a Linux machine to sort it out.
<p>Once you have got all this working, and if it doesn't do what you want or you don't understand how to use it,
look at the <a href="yourlaptop.html">full data maintenance laptop configuration</a> for everything else.
look at the <a href="surveylaptop.html">full survey laptop configuration</a> for everything else.
And please <b>write some documentation for the next person</b> in your situation.
<h3>Cheat lists and quick reminders</h3>
@@ -112,7 +112,7 @@ careful when naming files and survex names</a> and be <a href="manual.html#quick
<ul>
<li>Using Survex, Tunnel and Therion, see the <a href="http://expo.survex.com/handbook/survey/">Expo Handbook - Surveying section</a>.
<li>For more detailed configuration, explanations and help see the <a href="yourlaptop.html#configuration">full laptop</a> instructions
<li>For more detailed configuration, explanations and help see the <a href="surveylaptop.html#configuration">survey laptop</a> instructions
</ul>
<h3>FTP</h3>