merge with various server changes

1623/107/qms.txt

@@ -108,11 +108,11 @@ C2013-107CH-10	B	china.1	second pitch down between china.1 and china.0 (major dr
 C2013-107CH-11	A	china.0	continuation of rift beyond china.0 (major draft south past china.1; water noise?)	explored	lasttsa
 C2013-107CH-12	C	china.4	south of china.4, hole down into rocks by W wall south of SSB; accidentally omitted from 2013 survey
 C2014-107CH-1	C	nippeddown.3	[add: Jess, David]
-C2014-107CH-2	B	lasttsa.2.7	climb up at end of Last TSA, not too hard but needs a rope. Air goes this way. [check: Wookey, Jess]
+C2014-107CH-2	B	lasttsa.2.7	climb up LH wall at end of Last TSA, not too hard but needs a rope. Air goes this way.
-C2014-107CH-3	X	china.8	Big square hole in the roof, another 10-15m above the top of Wookeys climb at N end of China (i.e. 25-30m above floor) [check: Wookey]
+C2014-107CH-3	X	china.8	Big square hole in the roof, another 10-15m above the ledge climbed to at N end of China (i.e. 25-30m above floor)
-C2014-107CH-4	X	the aven entering the final chamber. [check Wookey, Jess (taken from logbook)] NOT MARKED ON SURVEY
+C2014-107CH-4	X	the aven entering the final chamber of last TSA
-C2015-107CH-1	C	smoothbottom.3, hole in floor, v loose	[check: Matt, Luke, Joe]
+15-CH-1	C	smoothbottom.3, hole in floor, v loose	[check: Matt, Luke, Joe]
-15-CH-1C	smoothbottom2.-, 5m climb up into small gap in loose boulder choke NOT MARKED ON SURVEY	[check: Wookey, Matt]
+15-CH-2	C	smoothbottom2.-, 5m climb up into small gap in loose boulder choke
 
 Wonderland (107-WL)
 

1623/258/caveDescriptions-temp/stonemonkey.txt

@@ -0,0 +1,12 @@
+Stone Monkey
+
+A draughting hole part way along the Caramel Catharsis traverse becomes a walking-sized passage heading steeply uphill to the east. [HOLE ON LEFT BY STATION 2 - WHAT DOES THIS DO? NOTES IMPLY "SMALL PHREAS" - QM OR TOO TIGHT?]. After 25m, keep left for the way on - two tubes on the right are too tight. The passage continues, past two crawls on the right [QM 07-01 C] [QM 07-02 C], for 35m to a junction. Left (north) leads to a sloping chamber with a phreatic tube leading off [QM 07-100 C]. Straight ahead (east) is the way on.
+
+Continuing straight ahead is a fork. The left fork leads to a 2m climb down to two successive 5m pitches [UNDESCENDED? NO QM].
+
+The right fork is the main way on, and leads past a roof tube on the right [QM 07-03 C] to a junction. Right (south) is the connection to Boulder Surfer, the bottom of the Ducks on Ice route into the cave. Left (north) are a number of QMs. Working round the left hand wall from the point of entry is a climb to twin phreatic passages - the first of which is 2x1m [QM 07-17 A], the neighbouring passage is more of a tube [QM 0764-1 B]; a 4/5m climb down with a continuation [QM 07-16 B]; and a possible passage high in the roof [QM 07-15 B]. [TUNNEL SHOWS A FURTHER WAY ON TO EAST, NOT MARKED AS QM - DOES THIS EXIST?]
+
+The main way on is straight ahead (south east). The passage continues in similar fashion for 35m to a 4m climb up followed immediately by a 5m climb down. There are a few leads on this stretch of passage: a phreatic tube in the north wall of the passage [QM 07-14 C]; two rifts in the south wall [QM 07-12 C] [QM 0758-1 C] [POSSIBLE DUPLICATE OF QM 08-06]; a passage heading south 12m up in the south wall [QM 08-06 B]; and an aven above [QM 07-10 X].
+
+
+

1623/258/caveDescriptions-temp/stonemonkey2.txt

@@ -0,0 +1 @@
+Described in stonemonkey.txt

1623/258/caveDescriptions-temp/stonemonkey3.txt

@@ -0,0 +1,3 @@
+Texel Passage
+
+Beyond the 5m climb down at the end of Stone Monkey is a chamber with a 4m pitch [ASSUME UNDESCENDED?] [QM 0817-1 B]. The continuation is a very pretty crawling passage with a black sand/mud floor, past a small unexplored passage at floor level on the right [QM 08-07 B]. After 45m the passage enlarges and the floor becomes rocky. The passage continues past a pool on the left at the base of an aven and a bat skeleton to a crawling up through boulders. Beyond the crawl are some black floor deposits (taped off) and a Chamber - "The Claw" - containing a 7m pitch which is the way on.

1623/258/qm.csv

@@ -44,23 +44,23 @@ Cave	Year	Number	Grade	nearest station	Description	Completion Description	Found
 258	2006	43	C	258.ribsknodel.16	Small passage in Alphabet Soup, heading W		Tom Handford and Dave Loeffler	
 258	2006	44	C	258.ribsknodel.15	Small passage in Alphabet Soup, heading NW		Tom Handford and Dave Loeffler	
 	2006	45	X	258.ribsknodel.15	Aven in Alphabet Soup (inferred from survey by AD)			
-258	2007	1	C	258.stonemonkey.8				
+258	2007	1	C	258.stonemonkey.8	Crawl			
-258	2007	2	C	258.stonemonkey.9				
+258	2007	2	C	258.stonemonkey.9	Phreatic crawl			
-258	2007	3	C	258.stonemonkey.16				
+258	2007	3	C	258.stonemonkey.16	Roof tube			
 258	2007	4	A	258.littoralnorth.15	Small passage on L before Y KeyKey			
 258	2007	5	C	258.literalnorth.17	Pit near Rhubarb Crumbly junction			
 258	2007	6	B	258.literalnorth.9	AD SUSPECTS THIS MIGHT NOT EXIST [TUNNEL UPDATE]			
 258	2007	7	B	258.literalnorth.4	Passage on Caramel Catharsis traverse		Pete Harley and Frank Tully	
 258	2007	8	C	258.literalnorth.5	Passage on Caramel Catharsis traverse (strong draught)		Pete Harley and Frank Tully	
 258	2007	9						
-258	2007	10						
+258	2007	10	X	stonemonkey2.20	Aven in Stone Monkey			
 258	2007	11						
-258	2007	12						
+258	2007	12	C	stonemonkey2.20	Rift in Stone Monkey			
 258	2007	13						
-258	2007	14						
+258	2007	14	C	stonemonkey2.20	Phreatic tube in Stone Monkey			
-258	2007	15						
+258	2007	15	B	stonemonkey.17	Passage in roof in Stone Monkey, nr. Boulder Surfer junction			
-258	2007	16						
+258	2007	16	B	stonemonkey.17	4/5m climb down to continuation in Stone Monkey			
-258	2007	17						
+258	2007	17	A	stonemonkey.17	2m wide 1m high phreas in Stone Monkey near junction with Boulder Surfer			
 258	2007	18	C	maxpleasure1.8	Small horizontal tube in Rhubarb Crumbly		Andrew Atkinson, Wookey	
 258	2007	19	C	maxpleasure1.14	Crawl in Rhubarb Crumbly		Andrew Atkinson, Wookey	
 258	2007	20	X	maxpleasure4.3	Aven at choked end			
@@ -146,13 +146,13 @@ Cave	Year	Number	Grade	nearest station	Description	Completion Description	Found
 258	2007	100	C	258.stonemonkey.12	Phreatic tube at top of sloping chamber			
 258	2007	101	X	maxpleasure3.15	Aven in Star Light passage, near snow and leaves			
 258	2007	102	C	letsgetnaked.43	Tight rift			
-258	2008	1						
+258	2008	1	C	bouldersurfer.8	Small, draughting passage at dog leg in Boulder Surfer			
-258	2008	2						
+258	2008	2	B	bouldersurfer.11	Small side passage in Boulder Surfer			
-258	2008	3						
+258	2008	3	C	bouldersurfer.14	Hole in floor in Boulder Surfer			
 258	2008	4						
 258	2008	5						
-258	2008	6						
+258	2008	6	B	stonemonkey2.21	South going passage, 12m up in south wall of Stone Monkey			
-258	2008	7						
+258	2008	7	B	stonemonkey3.8	Passage in crawl in Stone Monkey			
 258	2008	8						
 258	2008	9						
 258	2008	10						
@@ -263,3 +263,6 @@ Cave	Year	Number	Grade	nearest station	Description	Completion Description	Found
 258	2007	0760-1	B	pantinsales.3	Traverse into spacious rift, 15m down second half of Pantin Sales Pitch.			
 258	2008	0811-1	X	delicious1.2	Aven above Gravity Always Wins			
 258	2014	1417-1	X	ducksonice.4	Aven in alcove at base of entrance pitch [COULD BE DUPLICATE OF 06-06?]			
+258	2007	0764-1	B	stonemonkey.17	Phreatic tube adjacent to QM 07-17			
+258	2007	0758-1	C	stonemonkey2.20	Nasty rift  in Stone Monkey [POSSIBLY DUPLICATED BY QM 08-06]			
+258	2008	0817-1	B	stonemonkey3.11	4m pitch in Stone Monkey, presumed undescended			

handbook/rope_history.html

@@ -19,5 +19,23 @@
 <td class="droptest">To be tested 2018</td>
 <td class="retiretment">Post expo 2020</td>
 </tr>
+<tr>
+<td class="year">2014</td>
+<td class="manafacturer">Corde Courante</td>
+<td class="type">10mm</td>
+<td class="docs">None</td>
+<td class="desc">black green</td>
+<td class="droptest">Section with heavy glazing to be tested 2015</td>
+<td class="retiretment">Post expo 2020</td>
+</tr>
+<tr>
+<td class="year">2014</td>
+<td class="manafacturer">Corde Courante</td>
+<td class="type">9mm</td>
+<td class="docs">None</td>
+<td class="desc">black green black</td>
+<td class="droptest">Section with mild glazing to be tested 2015</td>
+<td class="retiretment">Post expo 2020</td>
+</tr>
 </tbody>
 </table></body></html>

infodx.htm

@@ -39,11 +39,7 @@
   </li>
   <li>Coming year: <a href="years/2016/">2016</a></li>
 </ul>
-<h2>Survey information</h2>
+
-<ul>
-<li><a href="expofiles/surveyscans/">Survey scans</a>
-</li>
-</ul>
 <h2>Area Description</h2>
 <ul>
   <li><a href="noinfo/all.3d">Current data</a> for display with aven</li>
@@ -102,6 +98,19 @@
   <li><a href="update.htm">What's new</a> in the archive</li>
 </ul>
 
+<h2>Useful files external to website</h2>
+<p>These files are not version-controlled (take care updating), and will not be available if you are looking at an offline copy of the website.</p>
+<ul>
+<li><a href="expofiles">General file bucket</a></li>
+<li><a href="expofiles/surveyscans/">Survey scans</a></li>
+<li><a href="expofiles/presentations/">External Presentations(Hidden Earth, etc)</a></li>
+<li><a href="expofiles/surveys">Full-size surveys</a></li>
+<li><a href="expofiles/rigging_topos">Rigging topos</a></li>
+<li><a href="expofiles/terrain">Terrain models</a></li>
+<li><a href="expofiles/tunnelwiki/www.freesteel.co.uk/wiki/index.php/Tunnel.html">Tunnel Wiki (documentation)</a></li>
+
+</ul>
+
 <h2>Picture Gallery</h2>
 Each page has a group of thumbnails
 <ul>

map/index.html

@@ -8,8 +8,7 @@
 <meta http-equiv="content-language" content="en" />
 
 <script src="/javascript/openlayers/OpenLayers.js"></script>
-<script src="/javascript/openstreetmap/OpenStreetMap.js"></script>
+<script src="/javascript/openlayers/OpenStreetMap.js"></script>
-<!-- script src="http://www.openstreetmap.org/openlayers/OpenStreetMap.js"></script -->
 <script src="util.js"></script>
  
 <script type="text/javascript">
@@ -18,12 +17,12 @@
 // Position and Zoomlevel of the map
 var lon = 13.8081;
 var lat = 47.6776;
-var zoom = 12; 
+var zoom = 14; 
 
 var map;
 
 var showPopupOnHover = true;
-text = new Array("Show instructions","Hide instructions");
+text = new Array("Show map information","Hide map information");
 
 function drawmap() {
     OpenLayers.Lang.setCode('en');
@@ -44,12 +43,31 @@ function drawmap() {
         displayProjection: new OpenLayers.Projection("EPSG:4326")
     } );
 
+// Display the control elements
+//map.addControl(new OpenLayers.Control.PanZoomBar());
+//map.addControl(new OpenLayers.Control.Permalink('permalink'));
+//map.addControl(new OpenLayers.Control.ScaleLine());
+//map.addControl(new OpenLayers.Control.LayerSwitcher());
+
+//checkForPermalink();
 
 icons = new Array();
-icons[0] = new Array('/javascript/openlayers/img/marker.png','21','25','0.5','1');
+icons[0] = new Array('http://openlayers.org/api/img/marker.png','21','25','0.5','1');
 
 // Display layers
 
+layer_markers = new OpenLayers.Layer.Markers("Marker", { projection: new OpenLayers.Projection("EPSG:4326"),visibility: true, displayInLayerSwitcher: false });
+//layer_vectors = new OpenLayers.Layer.Vector("Zeichnungen", { displayInLayerSwitcher: true } );
+//map.addLayer(layer_vectors);
+map.addLayer(layer_markers)
+//layers = new Array();
+//layer_layerMapnik = new OpenLayers.Layer.OSM.Mapnik("Mapnik");
+//map.addLayer(layer_layerMapnik);
+//layers.push(new Array(layer_layerMapnik,'layer_layerMapnik'));
+//layer_layerCyclemap = new OpenLayers.Layer.OSM.CycleMap("Cyclemap");
+//map.addLayer(layer_layerCyclemap);
+//layers.push(new Array(layer_layerCyclemap,'layer_layerCyclemap'));
+
 layerMapnik = new OpenLayers.Layer.OSM.Mapnik("Mapnik");
 map.addLayer(layerMapnik);
 
@@ -61,7 +79,7 @@ layers.push(new Array(layerMapnik,'layerMapnik'));
 layers.push(new Array(layerCycleMap,'layerCycleMap'));
 
 //this isn't right yet - GPX points are not appearing
-/*map.addLayer(
+map.addLayer(
 	new OpenLayers.Layer.Markers("Entrances","ents.gpx",
 		{format: OpenLayers.Format.GPX({extractWaypoints: true}),
 	         styleMap: new OpenLayers.StyleMap(
@@ -70,28 +88,29 @@ layers.push(new Array(layerCycleMap,'layerCycleMap'));
 		 projection: new OpenLayers.Projection("EPSG:4326")
 		}
 	)
-);*/
+);
 
 var gpxStyles = new OpenLayers.StyleMap({
                 "default": new OpenLayers.Style({
                     pointRadius: "5", // sized according to type attribute
                     graphicName: "star",
-                    label: "${name}",        
+					label: "${name}",        
                     labelAlign: "rb",
                   
-                    //labelAlign: "${align}",
+				    //labelAlign: "${align}",
                     //labelXOffset: "${xOffset}",
                     //labelYOffset: "${yOffset}",
                     labelOutlineColor: "white",
                     labelOutlineWidth: 3,
 
-                    fontSize: 12,
+					fontSize: 12,
                     fontFamily: "Arial",
                     fontColor: "brown",
                     labelYOffset: 10,
                     fillColor: "black",
-
+                    
-                    strokeColor: "red",
+					
+					strokeColor: "red",
                     strokeWidth: 3, 
                     strokeOpacity: 0.8
                 }),
@@ -118,7 +137,7 @@ var layerGPX = new OpenLayers.Layer.Vector("Entrances", {
 map.addLayer(layerGPX);
 layers.push(new Array(layerGPX,'layerGPX'));
 			
-// fit map to bounds of window and add start, finish pins (finish not working)
+				// fit map to bounds of window and add start, finish pins (finish not working)
 layerGPX.events.register("loadend", layerGPX, function() {
 	this.map.zoomToExtent(this.getDataExtent());
 	//var startPoint = this.features[0].geometry.components[0];				
@@ -138,8 +157,15 @@ layers.push(new Array(layerMarkers,'layerMarkers'));
 
 setLayer(1);
 
+// Jump to the right location
+jumpTo(lon,lat,zoom);
 
-
+// Display marker icons
+//icons = new Array();
+//icons[0] = new Array('http://openlayers.org/api/img/marker.png','21','25','0.5','1');
+//icons[4] = new Array('http://osmtools.de/easymap/images/pin_red.png','16','28','0','1');
+//icons[6] = new Array('http://osmtools.de/easymap/images/pin_green.png','16','28','0','1');
+//icons[10] = new Array('http://osmtools.de/easymap/images/haus_red.png','20','24','0.5','0.5');
 
 // Display markers
 addMarker(layerMarkers,13.8248,47.6884,"<b>Stone Bridge</b><p />Not the real stone bridge: this is a demo",false,0);
@@ -147,7 +173,6 @@ addMarker(layerMarkers,13.8248,47.6884,"<b>Stone Bridge</b><p />Not the real sto
 geometries = new Array();
 
 // Nochmal was..
-map.setCenter(0, zoom, 1, 1);
 jumpTo(lon, lat, zoom);
 toggleInfo();
 checkUtilVersion(4);
@@ -177,7 +202,7 @@ body {
 -->
 </style></head>
 <body onload="drawmap();">
-	<div id="descriptionToggle" onclick="toggleInfo()">Show instructions</div>
+	<div id="descriptionToggle" onclick="toggleInfo()">Show map information</div>
 	<div id="description" class="hide">Expo prototype slippy map<br >Please mouseover<br >the pin markers.<br ></div>
 	<div id="map"></div>
 	<div class="hide"><p><p>If you see this text, you opened the map HTML-File without the necessary files.</p></div>

noinfo/cave_data/1623-258.html

@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <!-- Only put one cave in this file -->
-<!-- If you edit this file, make sure you update the website database -->
+<!-- If you edit this file, make sure you update the websites database -->
 <html lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
@@ -13,7 +13,7 @@
 <area>1623</area>
 <area>2d</area>
 <kataster_code>2/S/E x</kataster_code>
-<kataster_number>258</kataster_number>
+<kataster_number>258</kataster_number> 
 <unofficial_number>258</unofficial_number>
 
 <entrance>
@@ -26,11 +26,18 @@
   <letter>b</letter>
 </entrance>
 
-<explorers>CUCC 2006-15</explorers>
+<explorers>CUCC 2006-2015</explorers>
-<underground_description>See <a href="/1623/258/desc.html">underground description</a> page</underground_description>
+<underground_description>Tunnocks is a major part of the Schwarzmooskogelhoehlensystem, comprising much of the northern section. 
+
+The cave description is currently (2016) undergoing a major update. <a href="/1623/258/desc.html">Start here for now underground description</a>.</underground_description>
 <equipment>See underground description</equipment>
 <references></references>
-<survey></p><ul><li><a href="surveys/plan2007BW.png">Plan, post-2007 Expo</a>[784KB; 2021x3449 pixels, greyscale]</li>  <li><a href="surveys/plan2007BWhires.png">Plan, post-2007 Expo</a>[3218KB; 9454x17164 pixels, greyscale]</li></ul><p></survey>
+<survey></p><ul>
+<li><a href="../../expofiles/surveys/tunnocks/tunnocksposter2011.png">2011 survey</a>
+(5MB, png)</li>
+<li><a href="../../expofiles/surveys/tunnocks/tunnocksposter2010.png">2010 survey</a>
+(5MB, png)</li>
+<li><a href="../../expofiles/surveys/plan2007BW.png">Plan, post-2007 Expo</a>[784KB; 2021x3449 pixels, greyscale]</li>  <li><a href="../../expofiles/surveys/plan2007BWhires.png">Plan, post-2007 Expo</a>[3218KB; 9454x17164 pixels, greyscale]</li></ul><p></survey>
 <kataster_status></kataster_status>
 <underground_centre_line>In dataset</underground_centre_line>
 <notes></notes>
@@ -38,7 +45,7 @@
 <depth></depth>
 <extent></extent>
 <survex_file>caves/258/258.svx</survex_file>
-<description_file>1623/258/258.html</description_file>
+<description_file>1623/258/desc.html</description_file>
 <url>1623/258/258.html</url>
 </cave>
 </body>

noinfo/cave_data/1623-264.html

@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <!-- Only put one cave in this file -->
-<!-- If you edit this file, make sure you update the website database -->
+<!-- If you edit this file, make sure you update the websites database -->
 <html lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
@@ -13,7 +13,7 @@
 <area>1623</area>
 <area>2d</area>
 <kataster_code>1/S =</kataster_code>
-<kataster_number>264</kataster_number>
+<kataster_number>264</kataster_number> 
 <unofficial_number>2005-05</unofficial_number>
 
 <entrance>
@@ -22,13 +22,14 @@
 </entrance>
 
 <explorers>Entrance noted CUCC 2002 (Duncan). Refound + partially explored CUCC 2005 (Peter + Phil). Explored to ~3km in 2014.</explorers>
-<underground_description><a href="../../1623/264/ent.html">ent</a>
+<underground_description><a href="../../1623/264/ent.html">ent</a>
-
+
 </underground_description>
 <equipment>5m handline and ~120m for entrance shaft</equipment>
 <references>Brief description and sketch in 2002#31; <a href="../../years/2005/logbook.html#t2005-08-10A">2005 log book</a>.</references>
-<survey> <a href="/expofiles/surveys/264/2015/area-plan-elv.png">Survey 2015</a>
+<survey><a href="/expofiles/surveys/264/2015/area-plan-elv.png">Survey 2015</a>
-</survey>
+
+<a href="http://expo/expofiles/surveys/264/balconyhohle.png>Balcony survey</a>(2MB)</survey>
 <kataster_status></kataster_status>
 <underground_centre_line></underground_centre_line>
 <notes>The original ID 2005-05 was also used (briefly) for another entrance, which was found the next day to connect to 204, and designated as 204G. The number was reused due to an acute tag shortage.</notes>

noinfo/cave_data/1623-B4.html

@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <!-- Only put one cave in this file -->
-<!-- If you edit this file, make sure you update the website database -->
+<!-- If you edit this file, make sure you update the websites database -->
 <html lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
@@ -13,7 +13,7 @@
 <area>1623</area>
 <area>4</area>
 <kataster_code>1/S +</kataster_code>
-<kataster_number></kataster_number>
+<kataster_number></kataster_number> 
 <unofficial_number>B4</unofficial_number>
 
 <entrance>
@@ -25,7 +25,9 @@
 <underground_description>Descent of 45&deg; snow slope reaches a choked rift. Above and ahead water enters via small aven but no sign of a way on.</underground_description>
 <equipment></equipment>
 <references></references>
-<survey>CUCC sketch 1996</survey>
+<survey><p>CUCC sketch 1996</p>
+<p>Surveyed 2005, Olly Betts, Jenny Black</p>
+<p>Photoed 2015, Wookey</p></survey>
 <kataster_status></kataster_status>
 <underground_centre_line></underground_centre_line>
 <notes></notes>

tollrd.htm

@@ -64,7 +64,8 @@ the car park owing to the propensity of tourists to wander around looking at
 the views, not the traffic :-)</p>
 
 <table class="trad"><tr><th>Vehicle</th><th>Time up</th><th>by</th><th>Time down</th><th>by</th></tr>
-<tr><td>Bike</td><td>01:15:00</td><td>Justin (1992)</td><td>00:09:26</td><td>Clive George</td></tr>
+<tr><td>Bike</td><td>00:48:00</td><td>Becka Lawson (2016)</td><td>00:09:26</td><td>Clive George</td></tr>
+<tr><td> </td><td>01:15:00</td><td>Justin (1992)</td><td> </td><td> </td></tr>
 <tr><td>Car</td><td>00:07:46</td><td>Andy Waddington (1998)</td><td>00:07:30</td><td>Andy Waddington (1998)</td></tr>
 </table>
 

travel.htm

@@ -81,8 +81,7 @@
 	bridge to reach the town centre.  The second turning for <b>Bad
 	Aussee</b> is to the right.  At the bottom of the sliproad, turn right
 	again to pass back under the <b>145</b> and follow the road into the
-	town centre.  Both routes meet up in the town centre at a junction
+	town centre.  Both routes meet up in the town centre at a peculiar three-way junction.  There seem to be no obvious
-	which vaguely resembles a roundabout.  There seem to be no obvious
 	rules here, except not to bump into anything.  Follow the sign to
 	<b>G&ouml;ssl</b>, passing immediately through a very narrow section of road
 	with traffic lights to control the flow of traffic.  The road crosses a
@@ -161,25 +160,5 @@
 <hr />
 
 <!-- LINKS -->
-<ul id="links">
-<li>Back to <a href="../index.htm">CUCC Home page</a></li>
-<li><b>Main Indices:</b>
-<ul>
-<li><a href="infodx.htm"><b>Index</b> to Expo</a> information pages</li>
-<li><a href="areas.htm">Description of CUCC's area</a> and split to subareas</li>
-<li>Full <a href="indxal.htm">Index to cave descriptions</a> in area 1623</li>
-<li>List of (links to) <a href="pubs.htm">published reports and logbooks</a></li>
-</ul></li>
-<li><b>Pictures:</b>
-<ul>
-<li><a href="gall0.htm">Text only Index</a></li>
-<li><a href="gallery/0.htm">Index pages (with thumbnails)</a></li>
-</ul></li>
-<li>Other info:
-<ul>
-<li>Table of <a href="folk/index.htm">members of CUCC expeditions</a> 1976-present</li>
-<li><a href="others/index.htm">Other groups</a> who have worked in the area.</li>
-</ul></li></ul>
-
 </body>
 </html>