From 32e9db4a2c5e57064581c0895ae25d6eb843c891 Mon Sep 17 00:00:00 2001 From: Philip Sargent Date: Thu, 24 Feb 2022 12:29:51 +0000 Subject: [PATCH] 2022 updates --- handbook/computing/newyear.html | 6 +++- handbook/l/life-wallet.html | 3 ++ handbook/l/seq-wallet.html | 3 ++ handbook/l/trogclass-1.html | 5 ++++ handbook/survey/athome.htm | 43 ++++---------------------- handbook/survey/status.html | 16 ++++------ pubs.htm | 53 +++++++++------------------------ smkridge.html | 20 +++---------- years/2022/index.html | 8 +++-- 9 files changed, 49 insertions(+), 108 deletions(-) diff --git a/handbook/computing/newyear.html b/handbook/computing/newyear.html index 65b4bff4d..68eb663de 100644 --- a/handbook/computing/newyear.html +++ b/handbook/computing/newyear.html @@ -22,6 +22,10 @@

There is no script to do this (yet). In the list below everything in expofiles is done by directly overwriting what is on the server. Changes to :expoweb: and :troggle: must be done using the version control system as these are repositories. +

[Many website pages generated by troggle will fail for the new year you are creating until you do the folk-update process +to create a new year column (see below). ] + +

Well before Expo as these pages are used in planning

Whenever you like before Expo

diff --git a/handbook/l/life-wallet.html b/handbook/l/life-wallet.html index 57d15f475..54bd97238 100644 --- a/handbook/l/life-wallet.html +++ b/handbook/l/life-wallet.html @@ -41,5 +41,8 @@ Wallet Lifecycle Statechart # philip.sargent@cklebos.eu free account -->
+Go to + Creating a new survey wallet. +
\ No newline at end of file diff --git a/handbook/l/seq-wallet.html b/handbook/l/seq-wallet.html index fd1cb29fb..b744eb1ec 100644 --- a/handbook/l/seq-wallet.html +++ b/handbook/l/seq-wallet.html @@ -63,5 +63,8 @@ title Wallet Process Sequence # philip.sargent@cambridgeenergy.uk free account -->
+Go to + Creating a new survey wallet. +
\ No newline at end of file diff --git a/handbook/l/trogclass-1.html b/handbook/l/trogclass-1.html index da40fc85e..5349735bf 100644 --- a/handbook/l/trogclass-1.html +++ b/handbook/l/trogclass-1.html @@ -144,5 +144,10 @@ implementation model our repertoire of diagrams is richer than for the other kin model."
+Go to + Sequence diagram for a new survey wallet
+ Go to + Activity diagram for a new survey wallet +
\ No newline at end of file diff --git a/handbook/survey/athome.htm b/handbook/survey/athome.htm index c78172a5c..22005ef00 100644 --- a/handbook/survey/athome.htm +++ b/handbook/survey/athome.htm @@ -11,7 +11,7 @@

In the UK

In an ideal world, we would have a beautifully drawn up survey and -detailed guidebook descriptions of everything ready to show at the +detailed guidebook descriptions of everything ready to show at the BCRA Hidden Earth conference (September). Although we are getting better, it is in fact a @@ -31,12 +31,12 @@ later

Have you written a passage description ? If not, do it when you get home. If you can type it, so much the better, email it to any or preferably all of -Mark Shinwell <mshinwell> at Gmail, Philip Sargent <p.m.sargent.72> at cantab.net - Wookey <wookey> at aleph1.co.uk and + Philip Sargent <p.m.sargent.72> at cantab.net, Becka <beckalawson> at gmail.com or + Wookey <wookey> at wookware.org and anyone else relevant or whoever is in Cambridge doing the drawing up. -
If you have to write it -on paper, photocopy it or scan it and post or email it to whoever has the survey book (to glue in) +

If you have to write it +on paper, photo it, or scan it and email it to whoever has the survey book (to print and to glue in) and to someone else who will take the trouble to type it up.

Have you got the survey book or a @@ -87,38 +87,5 @@ and by now my beard is also long. XHTML is history and we are in the sunny uplan of HTML5... PhilipS 2018-08-10 -->

- - diff --git a/handbook/survey/status.html b/handbook/survey/status.html index 4a9b5a454..543edfd88 100644 --- a/handbook/survey/status.html +++ b/handbook/survey/status.html @@ -29,17 +29,11 @@

-

Third, and this is for when things seem to be going horribly wrong, look in the scans of the logbook, the bierbook and the callout book in e.g. in expofiles/writeups/2018 to find any record of trips which are otherwise unrecorded or lost and who was actually on expo on any one day. If even the scans don't exist then there is quite a bit of work to do before you can get on with the survey generation. - - - - - +

Third, and this is for when things seem to be going horribly wrong, look in the scans of the logbook, the +bierbook and the callout book in e.g. in expofiles/writeups/2018 to find any record of trips which +are otherwise unrecorded or lost and who was actually on expo on any one day. If even the scans don't exist then there is +quite a bit of work to do before you can get on with the survey generation.

- - diff --git a/pubs.htm b/pubs.htm index 6a0271853..dac5c534b 100644 --- a/pubs.htm +++ b/pubs.htm @@ -67,7 +67,7 @@ or the reference has not been looked up:

2017 | 2018 | 2019 | -(no expedition in 2020) +(no expeditions in 2020, 2021)

1977 (missing) | 1978 | 1979 | -1980 (missing) | -1981 (missing) | +1980 (missing) | +1981 (missing) | 1982 | -1983 (no images yet - partial logbook scan found in 2021) | +1983 (no images yet - partial logbook scan found in 2021) | 1984 | 1985 | 1987 | 1988 | -1989 (no graphics yet) | +1989 (no graphics yet) | 1990 | 1991 | -1992 (no graphics yet) | +1992 (no graphics yet) | 1993 | 1994 | 1995 | @@ -96,16 +96,16 @@ or the reference has not been looked up:

1997 | 1998 | 1999 | -2000 (no graphics yet added) | -2001 (graphics are broken, need rescanning) | +2000 (no graphics yet added) | +2001 (graphics are broken, need rescanning) | 2002 | 2003 | 2004 | 2005 | 2006 | 2007 | -2008 (no graphics yet)| -2009 (no graphics yet,incomplete)| +2008 (no graphics yet)| +2009 (no graphics yet,incomplete)| 2010 | 2011 | 2012 | @@ -113,9 +113,9 @@ or the reference has not been looked up:

2014 | 2015 | 2016 | -2017 (graphics&nbsb;incomplete)| -2018 (missing, hopefully in Austria...) | -2019 +2017 (graphics incomplete)| +2018 | +2019 (graphics missing)

Accounts following CUCC Austria 1976

@@ -590,31 +590,6 @@ href="years/2019/" name="pubs2019">Austria 2019 Expedition Blog (UK Cavers Forum)

- - + diff --git a/smkridge.html b/smkridge.html index 8bf011ac5..5511fdfda 100644 --- a/smkridge.html +++ b/smkridge.html @@ -11,7 +11,7 @@ It used to be auto-generated from CAVETAB2.CSV by make-areaindices.py . -->

Schwarzmooskogel ridge

-

Exploration in the last few years has shown that though a variety of +

Exploration in the last few years of the last century showed that though a variety of different approach walks are needed to visit various parts of the long ridge on the SE side of area 1623, many of the significant caves form part of a single, very extensive, system.

@@ -32,8 +32,8 @@ the Hoch Klapf valley which marks the boundary with the adjacent kataster region 1624. There is no real boundary to the north or northeast - just a limit to how far we have yet looked. Currently this is some distance further NE beyond the summit of the Nieder -Augst-Eck. Beyond this, there are no known caves for some way, by which -time they fall into the remote plateau or Beyond this, + they fall into the remote plateau or Wildensee areas, as listed here.

@@ -72,21 +72,9 @@ There are corresponding lists of caves in the areas covered by each walkin: the area between the peaks of the Vorder and Hinterer Schwarzmooskogels.
  • Steinbrücken area (access route 5) - this covers more or less everything north of the peak of the Hinter, as well as the -recently discovered 161g and 161h entrances.
    • + 161g and 161h entrances. - - - - -
    - - - diff --git a/years/2022/index.html b/years/2022/index.html index ff600d258..0f9eb6c92 100644 --- a/years/2022/index.html +++ b/years/2022/index.html @@ -18,8 +18,10 @@ Back to Expo Planning Guide.

    Pre-Expo Planning

    PDF docs created for planning the 2020 Expo: @@ -44,7 +46,7 @@ On expo website:
  • Gear order for 2022
  • Things bought 2022 -
  • Pre-Expo Training Blog on ukcaving.com +
  • Pre-Expo Training Blog on ukcaving.com (Fix to new URL)
  • Geartape colours to be updated as members commit to come