diff --git a/handbook/manual.html b/handbook/manual.html index c37f7801e..6e34696d7 100644 --- a/handbook/manual.html +++ b/handbook/manual.html @@ -62,7 +62,7 @@ expo.survex.com. This is currently hosted on a server at the university. We use
You will type this description, and pass it on to someone more nerdy who -will file it in the right place. This will involve "creating a new cave" using the troggle system. +will file it in the right place. This will involve "creating a new cave" using the troggle system.
to be documented diff --git a/handbook/troggle-ish.html b/handbook/troggle-ish.html index 878fab14a..2a2dcc8d4 100644 --- a/handbook/troggle-ish.html +++ b/handbook/troggle-ish.html @@ -20,7 +20,7 @@ Most people will not want to read this at all. This is for speleosoftwarearcheol
Troggle is the software collection (not really a "package") based on Django originally intended to manage all expo data in a logical and accessible way -and publish it on the web. +and publish it on the web. It was first used on the 2009 expo - see 2009 logbook.
Only a small part of troggle's original plan was fully implemented and deployed. Many of the things it was intended to replace are still operating as a motley collection written by many different people in several languages (but mostly perl and python; we won't talk about the person who likes to use OCamL). @@ -322,9 +322,6 @@ Storage: convert small 800x600 version into website by default. (matching structure? - -
Since last year it appears that the roof has fallen in and there is a new hole in the roof <-- Bollocks ! Look at the survey fellas... The boulder choke is very -loose and should be descended with caution. Once we arrived at Shell Pitch, +loose and should be descended with caution. +
Once we arrived at Shell Pitch, Julian and Matt went ahead to start rigging Piezo. Mark and I began to re-rig Shell Pitch but due to a slight misjudgement we only had one hammer with us and were unable to dress the rock properly. This will be re-rigged -next time we go down, hopefully. On the traverse to Piezo there is a move +next time we go down, hopefully. +
On the traverse to Piezo there is a move over a deep hole which should be hand lined and possibly explored. Julian had rigged the first part of Piezo too a long free hang. We descended this but found that rigging the next pitch would be difficult avoid what could be @@ -31,7 +34,8 @@ side is overhanging and should make an excellent place to rig, but unfortunately it is virtually impossible to reach, let alone to drill a hole. After some looking we spotted a good ish rigging point, again it was somewhat difficult to reach as a traverse out was required and then the rope -just pulled you straight back. Matt at this point was feeling very cold and +just pulled you straight back. +
Matt at this point was feeling very cold and decided to leave the cave. We then started rigging a descending traverse from the top of the pitch to reach this point. After 3 bolts we were tired and decided to come out. We're not far from reaching the good rigging side - @@ -823,7 +827,7 @@ ticked off 2 QM's !
[and don't write up their trip at all, even though Mike remembered it in 2009 when it wasn't -parsed into the troggle database] +parsed into the troggle database]
T/U 11 hours diff --git a/years/2009/jobs.html b/years/2009/jobs.html index 99d7b21b4..c8c0e3b77 100644 --- a/years/2009/jobs.html +++ b/years/2009/jobs.html @@ -65,7 +65,7 @@
This year's expedition also had a non-caving goal (not just drinking Gösser). Recently members of CUCC have started to -develop a piece of software called Troggle, which aims to facilitate +develop a piece of software called Troggle, which aims to facilitate keeping track of logbook entries, typing up surveys, caves etc, and save time in a lot of the work that goes on behind the scenes when expo is over. This year was the first time Troggle would be tested "in th field" (well, spud hut).