From 76c5af7e6ff473f845424260596d62582280e02e Mon Sep 17 00:00:00 2001 From: Philip Sargent Date: Tue, 17 Jul 2018 11:59:48 +0200 Subject: [PATCH] Better instructions for typing in logbook entries --- handbook/logbooks.html | 30 ++++++++++++++++++++++++++---- handbook/travel.html | 1 - handbook/update.htm | 5 +++-- 3 files changed, 29 insertions(+), 7 deletions(-) diff --git a/handbook/logbooks.html b/handbook/logbooks.html index 15a4c75e5..9a9e4ac8d 100644 --- a/handbook/logbooks.html +++ b/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.

Where the logbook file is kept

-

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

+

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

+/home/expoweb/years/2018/logbook.html
+
+and other people will take care of synchronising it with the version control system. + +

+DO NOT 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 +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. +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. + +

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

Format of the online logbooks

@@ -23,9 +39,12 @@ which is then synchronised the version control system. <div class="triptitle">Top Camp - Setting up 76 bivi</div> <div class="timeug">T/U 10 mins</div> -

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.

+

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. -

+
+

Historical logbooks

Older logbooks (prior to 2007) were stored as logbook.txt with just a bit of consistent markup to allow troggle parsing.

The formatting was largely freeform, with a bit of markup ('===' around header, bars separating date, - , 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.

@@ -39,8 +58,11 @@ which is then synchronised the version control system. T/U: Jess 1 hr, Emma 0.5 hr -

+

+ diff --git a/handbook/travel.html b/handbook/travel.html index 8205270dd..f5aeedfa4 100644 --- a/handbook/travel.html +++ b/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).

-