[svn r8033] fix name ambiguities so it can be parsed by folkreader

This commit is contained in:
julian 2008-10-26 19:31:14 +01:00
parent f4d35730da
commit ec35f056e5

@ -15,7 +15,7 @@ p { clear: both }
<hr />
<div class="tripdate">5/7/04</div>
<div class="trippeople"><u>Mark S</u>, Olly M et al</div>
<div class="trippeople"><u>Mark S</u>, Olly M, *et al</div>
<div class="triptitle">In Cambridge</div>
<p>And so it was that at 12.41 on Monday 5th July did the weighbridge at Madingley Mulch pronounce one white Citro&euml;n C15D van, by the
@ -41,6 +41,7 @@ planning to leave for Dover at 4am. Expo had begun.</p>
<div class="tripdate">5/7/04</div>
<div class="trippeople"><u>Martin</u></div>
<div class="triptitle">In Cambridge</div>
<p>I was phoned, "There is a problem", "Please bring your bathroom scales", "400kg overweight", "bollocks" (thought Martin).
Solutions ...another car ... too crap .. another trailer ... too long ... DSL ... too expensive ...</p>
@ -83,7 +84,8 @@ the enormous space left for it on the page.]</i></p>
<hr />
<div class="tripdate">7/7/04</div>
<div class="trippeople">Olly M, Mark and <u>Dave</u></div>
<div class="trippeople">Olly M, Mark S and <u>Dave</u></div>
<div class="triptitle">Walk up</div>
<p>Walked up hill. Snow level very high. Had considerable fun hauling gear out of Traungold (caving gear + some digging were needed).</p>
@ -92,7 +94,8 @@ the enormous space left for it on the page.]</i></p>
<hr />
<div class="tripdate">8/7/04</div>
<div class="trippeople">Olly M, Mark and <u>Dave</u></div>
<div class="trippeople">Olly M, Mark S and <u>Dave</u></div>
<div class="triptitle">Set up</div>
<p>More getting stuff out of snow-choked holes.</p>
@ -112,7 +115,8 @@ downhill in the rain.</p>
<hr />
<div class="tripdate">11/7/04</div>
<div class="trippeople"><u>Julia</u> and Anthony...</div>
<div class="trippeople"><u>Julia</u> and Anthony</div>
<div class="triptitle">Drive to expo</div>
<p>.. are here. Det er veldig variskelig &aring; snakke <i>[illegible]</i>. Men jeg m&aring; pr&oslash;ve. We left Anthony's office at
3.00pm on Friday (I remembered the guitar). Getting out of Norge not easy, but achieved eventually. 6 hours Oslo to G&oslash;teborg. Then
@ -126,6 +130,7 @@ Expo is great + so is G&ouml;sser.</p>
<div class="tripdate">12/7/04</div>
<div class="trippeople"><u>Jenny</u> + Olly B</div>
<div class="triptitle">Carry up</div>
<p>We set off for our 3<sup>rd</sup> carry to Top Camp, and for the first time it wasn't raining. As we got to TC it got much darker, and
just as we started pitching the big expo tent it started to hail horizontally which was really quite grim... Eventually we got the tent up
@ -136,6 +141,7 @@ lot in the erratic boulders just below where 76 turned out to be.</p>
<div class="tripdate">13/7/04</div>
<div class="trippeople"><u>Jenny</u> + Olly B</div>
<div class="triptitle">Set up</div>
<p>Carried up our final load to TC, noticed that the tent had lots of big puddles. Perhaps optimistically, I assumed it had come into the
tent whilst we erected it in the hail storm, so I bailed out the water + we set off for 76, armed with a GPS. We got to near the GPS point
@ -148,6 +154,7 @@ as it opens out into a small sheltered valley (with room for a small tent). We w
<div class="tripdate">13/7/04</div>
<div class="trippeople"><u>Julia</u></div>
<div class="triptitle">Caving song</div>
<p>Oh, so caving songs get written in the rain, right. Well, plenty of rain here, so let's have some inspiration. There's Duncan's first
bit:</p>
@ -215,6 +222,7 @@ while Olly, Stuart and I wandered down Ariston. Ran out of rope at Steel Toecap
<a id="t2004-07-14B" />
<div class="tripdate">14/7/04</div>
<div class="trippeople"><u>Jenny</u> + Olly B</div>
<div class="triptitle">76</div>
<p>Woke up to find just how un-waterproof the tent was &ndash; lots of leaks through the ceiling and 3 puddles a couple of inches deep,
wet sleeping bags and other wet stuff which wasn't nice at all. Eventually got going after a short delay to dry out the lighter before we
@ -256,7 +264,7 @@ cold + knackered + wanted to go downhill.</p>
<hr />
<a id="t2004-07-15B" />
<div class="tripdate">15/7/04</div>
<div class="trippeople"><u>Olly M</u>, Stuart, Peter</div>
<div class="trippeople"><u>Olly M</u>, Stuart, Pete</div>
<div class="triptitle">204E rigging</div>
<p>Had much difficulty finding the entrance, it was further than I remembered. Took ages to rig the pitch, then went out.</p>
@ -267,6 +275,7 @@ cold + knackered + wanted to go downhill.</p>
<a id="t2004-07-16A" />
<div class="tripdate">16/7/04</div>
<div class="trippeople">Jenny, <u>Olly B</u></div>
<div class="triptitle">76</div>
<p>We bolted on down from the head of Draught Bitter (where the draught was so fierce it made my eyes water while drilling a hole for a
bolt). A deviation off a 70s spit got us to a little rock bridge, and a rebelay off another unusually well preserved and flush 70s spit to
@ -279,7 +288,9 @@ falling snow &amp; rocks, but after two spits I'm still not there and my legs ar
<hr />
<a id="t2004-07-17A" />
<div class="tripdate">17/7/04</div> <div class="trippeople">Olly + <u>Jenny</u></div>
<div class="tripdate">17/7/04</div>
<div class="trippeople">Olly B + <u>Jenny</u></div>
<div class="triptitle">76</div>
<p>Back down 76 again, this time it's my turn to bolt. I get down to the bolts Olly put in yesterday (after adding a spit for a deviation
on the way down to stop the rope cutting through the big snow plug), and spend quite a while swinging around trying to work out what is
@ -339,6 +350,7 @@ MSD.</p>
<div class="tripdate">18/7/04</div>
<div class="trippeople">Olly B + <u>Jenny</u></div>
<div class="triptitle">76</div>
<p>Walked back up to the bivvy, and sat around for a while feeling too hot. Eventually got underground with a plan of finishing surveying
what we have found. We started at Draught Bitter, and surveyed downwards. I realised how crap surveying pitches was, especially really
@ -383,6 +395,7 @@ short climb up the side of the shaft and another hole. But no more rope, so I we
<a id="t2004-07-19C" />
<div class="tripdate">19/7/04</div>
<div class="trippeople"><u>Martin</u>, Nial</div>
<div class="triptitle">204</div>
<p>Went in E, noticed rubs (Olly says it wasn't his (threatened with hammer)). Rigged Taking the Piss, with PPE green string. Rigged Wot
No Bolts, from first hole using two bolts! (Deviation needed). 03-67B pushed to conclusion, 03-68B, 03-69B pushed to beginning of Faith
@ -604,7 +617,7 @@ calming tongue. <i>[I think my jammers are knackered &ndash; the teeth don't bit
<hr />
<a id="t2004-07-22C" />
<div class="tripdate">22/7/04</div>
<div class="trippeople"><u>Olly M</u>, Peter</div>
<div class="trippeople"><u>Olly M</u>, Pete</div>
<div class="triptitle">Hauchh&ouml;hle</div>
<p>Julia had asked people to look at Hauchh&ouml;hle so Pete and I decided to have a poke. A survey was produced showing the main way on
@ -625,7 +638,7 @@ and miles of cave passage to whoever would listen.</p>
<hr />
<div class="tripdate">22/7/04</div>
<div class="trippeople"><u>Olly M</u>, Peter</div>
<div class="trippeople"><u>Olly M</u>, Pete</div>
<div class="triptitle">Random German</div>
<p>Pete and I had failed to walk up the previous evening so an 8am rising and a run to the bus stop was in order. Waiting in Bad Aussee
@ -808,7 +821,7 @@ Earl Teflon-Jammers Merson was, of course, fine + blamed it all on my poor techn
<hr />
<a id="t2004-07-25B" />
<div class="tripdate">25/7/04</div>
<div class="trippeople">Olly + <u>Jenny</u></div>
<div class="trippeople">Olly B + <u>Jenny</u></div>
<div class="triptitle">76 &ndash; Brave New World</div>
<p>Olly fettled the rigging in the entrance to add a tight guide line above the rock bridge, and we went into the Test Tube, and onto
@ -855,7 +868,7 @@ spanking new rope unless you're pristine. Thanks to Tony for cleaning + checking
<hr />
<a id="t2004-07-26B" />
<div class="tripdate">26/7/04</div>
<div class="trippeople">Olly + <u>Jenny</u></div>
<div class="trippeople">Olly B + <u>Jenny</u></div>
<div class="triptitle">76 &ndash; Brave New World</div>
<p>Decided to carry the drill through the Test Tube to bolt stuff in Brave New World. We decided it would be better to carry SRT kits
@ -902,7 +915,7 @@ takes ~ 1 1/2 hours to get to the bottom of Subsoil and ~ 2 1/2 hours to get out
<hr />
<div class="tripdate">27/7/04</div>
<div class="trippeople"><u>Peter</u>, Olly M</div>
<div class="trippeople"><u>Pete</u>, Olly M</div>
<div class="triptitle">Plateau walk + Hauchh&ouml;hle</div>
<p>Finally set off up the hill to fetch the remainder of my caving gear at 3.50pm, intending to make a quick return in daylight with the
@ -992,7 +1005,7 @@ there are enough (i.e. more than 4) moderately hard (but not necessarily bionic)
<hr />
<a id="t2004-07-27C" />
<div class="tripdate">27/7/04</div>
<div class="trippeople">Olly + <u>Jenny</u></div>
<div class="trippeople">Olly B + <u>Jenny</u></div>
<div class="triptitle">76 &ndash; Brave New World</div>
<p>Didn't feel like carrying tackle through the Test Tube again, so took survey gear to tick off some leads (hopefully). The first lead we
@ -1520,7 +1533,7 @@ beginning of Underhand &ndash; explored but not surveyed by Pete]</i>.</p>
<hr />
<a id="t2004-08-08A" />
<div class="tripdate">8/8/04</div>
<div class="trippeople">Olly M, <u>Dave</u> (+ various spectators)</div>
<div class="trippeople">Olly M, <u>Dave</u> + *various spectators</div>
<div class="triptitle">Shaft bashing</div>
<p>Rigged and descended a slot at the edge of a choss bowl near 2000-08. It didn't go.</p>