From a3ff1cacc2c539042aad2d7ac35d00b381748f98 Mon Sep 17 00:00:00 2001 From: Philip Sargent Date: Thu, 9 Aug 2018 11:31:45 +0200 Subject: [PATCH] knitting in docmn for writing logbook entries, fixing old survey methods --- handbook/geartape.html | 74 ++++++++++++++++++------------------ handbook/logbooks.html | 15 ++++++-- handbook/survey/newcave.html | 1 + handbook/survey/ontop.htm | 49 ++++++++++++++++-------- handbook/survey/why.htm | 4 +- piclinks/ssvypl.htm | 4 +- primer.htm | 5 ++- tcamps.htm | 5 ++- years/2018/logbook.html | 1 + 9 files changed, 92 insertions(+), 66 deletions(-) diff --git a/handbook/geartape.html b/handbook/geartape.html index 1a3a89a78..350bedc9e 100644 --- a/handbook/geartape.html +++ b/handbook/geartape.html @@ -79,6 +79,7 @@ Galaxy pattern 2018 + Earth @@ -86,6 +87,30 @@ Galaxy pattern 2018 + + +Yellow toughtags + +Christopher Holt + +2018 + + + +Purple toughtags + +Cat Henry + +2018 + + + +Red toughtags + +Adam Henry + +2018 +
@@ -121,15 +146,7 @@ Galaxy pattern - - -***, -*** - -Christopher Holt - -2018 - + ***, @@ -172,26 +189,6 @@ Galaxy pattern - -Grey, Green - - - - Manfred Wuits (Vienna) - -2018 - - - - -Grey, -Black - - Adam Aldridge (ULSA) - -2018 - - ***, @@ -211,20 +208,23 @@ Black 2018 - -***, -*** + + +Grey, Green -Cat Henry + + + Manfred Wuits (Vienna) 2018 + - -***, -*** + +Grey, +Black -Adam Henry + Adam Aldridge (ULSA) 2018 diff --git a/handbook/logbooks.html b/handbook/logbooks.html index 9a9e4ac8d..db86f0000 100644 --- a/handbook/logbooks.html +++ b/handbook/logbooks.html @@ -10,7 +10,11 @@ the base camp logbook or the top camp logbook. All these logbook entries are then typed into a laptop (often the expo laptop) which is then synchronised the version control system. -

Where the logbook file is kept

+

The logbook writeup is the oldest and most basic way of recording your trip but it must not be neglected. This is also where you put +your speculations and ideas for what looks promising and what is obvious but doesn't go: things that are vital to future expoers. And please, please +do lots of sketches in the logbook. + +

Where the logbook computer file is kept

If you are using the expo laptop just edit this file: 

 /home/expoweb/years/2018/logbook.html
@@ -22,10 +26,13 @@ and other people will take care of synchronising it with the version control sys
 copy it by email or USB stick to another laptop, edit it there and then copy it back. That will 
 delete other people's work.
 
-
If you are using your own laptop then you will need to 
-install and learn how to use the version control software. 
+
If you are using your own laptop then you will need to either:
+

 
 
Logbooks are typed up and kept in the [expoweb]/years/[nnnn]/ directory as 'logbook.html'.

 
@@ -41,7 +48,7 @@ ensure that the updates from all the people entering trip data are OK and don't

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.

-

T/U stands for "Time Underground" in hours or minutes. +

T/U stands for "Time Underground" in hours (6 minutes would be "0.1 hours").

Historical logbooks

diff --git a/handbook/survey/newcave.html b/handbook/survey/newcave.html index 81080e9ef..9584d1a93 100644 --- a/handbook/survey/newcave.html +++ b/handbook/survey/newcave.html @@ -21,6 +21,7 @@ survey information in your waterproof notebook.

After 40 years or so, we have a well-defined process which you will need to learn.