Better instructions for typing in logbook entries

handbook/logbooks.html

@@ -11,7 +11,23 @@ the base camp logbook or the top camp logbook. All these logbook entries are the
 which is then synchronised the version control system.
 
 <h3>Where the logbook file is kept</h3>
-<p>Logbooks are typed up and put under the [expoweb]/years/nnnn/ directory as 'logbook.html'.</p>
+<p>If you are using the <em>expo laptop</em> just edit this file:
+<pre>
+/home/expoweb/years/2018/logbook.html
+</pre>
+and other people will take care of synchronising it with the version control system.
+
+<p>
+<b>DO NOT</b> take a copy of the logbook.html file from the expo laptop, 
+copy it by email or USB stick to another laptop, edit it there and then copy it back. That will 
+<em>delete other people's work</em>.
+
+<p>If you are using your own laptop then you will need to 
+<a href="update.htm#manual">install and learn how to use</a> the version control software. 
+And you will need to synchronise regularly (every day) to 
+ensure that the updates from all the people entering trip data are OK and don't get overwritten by ignorant use of this software.
+
+<p>Logbooks are typed up and kept in the [expoweb]/years/[nnnn]/ directory as 'logbook.html'.</p>
 
 <h3>Format of the online logbooks</a></h3>
 
@@ -23,9 +39,12 @@ which is then synchronised the version control system.
 &lt;div class="triptitle"&gt;Top Camp - Setting up 76 bivi&lt;/div&gt;
 &lt;div class="timeug"&gt;T/U 10 mins&lt;/div&gt;
 </pre>
-<p>Note that the ID's must be unique, so are generated from 't' plus the trip date plus a,b,c etc when there is more than one trip on a day.</p>
+<p>Note that the ID's must be unique, so are generated from 't' plus the trip date plus a,b,c etc. 
+when there is more than one trip on a day.</p>
+<p>T/U stands for "Time Underground" in hours <em>or</em> minutes.
 
-<hr>
+<hr />
+<h3>Historical logbooks</h3>
 <p>Older logbooks (prior to 2007) were stored as logbook.txt with just a bit of consistent markup to allow troggle parsing.</p>
 
 <p>The formatting was largely freeform, with a bit of markup ('===' around header, bars separating date, <place> - <description>, and who) which allows the troggle import script to read it correctly. The underlines show who wrote the entry. There is also a format for time-underground info so it can be automagically tabulated.</p>
@@ -39,8 +58,11 @@ which is then synchronised the version control system.
 
 T/U: Jess 1 hr, Emma 0.5 hr
 </pre>
-<p>
+
 <hr />
+<ul id="links">
+<li><a href="index.htm">Expedition Handbook</a>
+</ul>
 </body>
 </html>
 

handbook/travel.html

@@ -256,7 +256,6 @@ From the three-way junction, which is just by the Post Office ("Postampt"), foll
 	days (return to UK only), and more recently by Brian Outram in a more 
 	leisurely 16 days (I think).</p>
 <hr />
-<hr />
 <ul id="links">
 <li><a href="index.htm">Expedition Handbook</a>
 

handbook/update.htm

@@ -11,8 +11,9 @@
 <p>We have <a href="http://wookware.org/talks/expocomputer/#/">an Overview Presentation</a> on how the cave data, handbook and website are constructed and managed. It contains material which will be merged into this website manual.
 
 <ul>
-<li><a href="uploading.html">Uploading your photos and GPS tracks</a></li>
+<li><a href="uploading.html">Uploading your photos</a></li>
 <li><a href="logbooks.html">Uploading typed logbooks</a></li>
+<li><a href="gpxupload.html">Uploading GPS tracks</a></li>
 <li><a href="#update">Updating the website</a></li>
 <li><a href="#manual">Expo Website manual</a></li>
 </ul>
@@ -93,7 +94,7 @@ processes that a maintainer would want to do.</p>
 <li><a href="#cavepages">Updating cave pages</a></li>
 <li><a href="#updatingyears">Updating expo year pages</a></li>
 <li><a href="logbooks.html">Adding typed logbooks</a></li>
-<li><a href="#photos">Uploading photos</a></li>
+<li><a href="uploading.html">Uploading photos</a></li>
 <li><a href="#tickingoff">Ticking off QMs</a></li>
 <li><a href="#surveystatus">Maintaining the survey status table</a></li>
 <li><a href="#automation">Automation</a></li>