From 7ebf36e6e75db230a47529b4e0f5447afb3e0ddf Mon Sep 17 00:00:00 2001
From: ExpoOnServer <devnull@localhost>
Date: Wed, 5 Sep 2012 22:54:32 +0100
Subject: [PATCH 1/5] Remove '?' from filename 1623-BS20-nn?.html as it blows
 up windows machines

---
 noinfo/cave_data/{1623-BS20-nn?.html => 1623-BS20-nn.html} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename noinfo/cave_data/{1623-BS20-nn?.html => 1623-BS20-nn.html} (100%)
diff --git a/noinfo/cave_data/1623-BS20-nn?.html b/noinfo/cave_data/1623-BS20-nn.html
similarity index 100%
rename from noinfo/cave_data/1623-BS20-nn?.html
rename to noinfo/cave_data/1623-BS20-nn.html

From 4743bdca5485ccecda8e38b28a5c80800ae0cedc Mon Sep 17 00:00:00 2001
From: expoonserver <devnull@localhost>
Date: Sat, 8 Sep 2012 00:28:30 +0100
Subject: [PATCH 2/5] Add swaygo reference added via webui

---
 years/2012/suggestions.html | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/years/2012/suggestions.html b/years/2012/suggestions.html
index 0f53a77fb..da4215b8a 100644
--- a/years/2012/suggestions.html
+++ b/years/2012/suggestions.html
@@ -13,14 +13,22 @@
 <h1>Expo 2013 needs / Suggestions from expo 2012</h1>
 
 
-<ul>O-rings for hangers
+<ul>
+<li>O-rings for hangers</li>
 <li>More maillons</li>
 <li>Purple gear tape</li>
 <li>All CUCC gear marked with purple tape BEFORE Expo including stuff
 bought on gear order</li>
 <li>3 BIG tacklesacks</li>
 <li>New drybags for drills (current ones leak) or alternative way to
-keep drills dry</li>
+keep drills dry <p>Duncan suggests <a href="http://swaygogear.com">Swaygo</a> bags.
+They're not cheap, but they seal like a drybag and are extremely
+durable - in fact they're intended to be dragged through the cave like 
+a tacklesack. We've been using them in China for a few years now, and 
+transport them inside tacklesacks; so far they have never let us down. 
+The largest size (called 'sink' for some reason) is just right for 24v 
+Bosch drills. I reckon that CUCC's Makitas should fit in the medium 
+size ('pit').</p> </li>
 <li>Slings of different lengths</li>
 <li>Maybe more carabiners - check</li>
 <li>Tom Yam/Mi Goreng noodles (lots!)</li>

From 2c47e0964bc865fa6830074d833f3c9c7a8a34e7 Mon Sep 17 00:00:00 2001
From: expoonserver <devnull@localhost>
Date: Sat, 8 Sep 2012 02:15:20 +0100
Subject: [PATCH 3/5] rename 2012-dd-06.html to 1623-2012-dd-06.html fixing
 slug names and missing description close tag

---
 noinfo/cave_data/1623-2012-dd-06.html |  8 +++---
 noinfo/cave_data/2012-dd-06.html      | 38 ---------------------------
 2 files changed, 3 insertions(+), 43 deletions(-)
 delete mode 100644 noinfo/cave_data/2012-dd-06.html

diff --git a/noinfo/cave_data/1623-2012-dd-06.html b/noinfo/cave_data/1623-2012-dd-06.html
index b1cd67d3c..12ad1084e 100644
--- a/noinfo/cave_data/1623-2012-dd-06.html
+++ b/noinfo/cave_data/1623-2012-dd-06.html
@@ -7,7 +7,7 @@
 <body>
 <cave>
 <non_public>False</non_public>
-<caveslug>2012-dd-06</caveslug>
+<caveslug>1623-2012-dd-06</caveslug>
 <official_name>Big D h&ouml;hle</official_name>
 <area>1623</area>
 <kataster_code></kataster_code>
@@ -15,14 +15,12 @@
 <unofficial_number>2012-dd-06</unofficial_number>
 
 <entrance>
-  <entranceslug>2012-dd-06</entranceslug>
+  <entranceslug>1623-2012-dd-06</entranceslug>
   <letter></letter>
 </entrance>
 
 <explorers>CUCC, Duncan Collis and Anthony Day, 2012-08-10, plus unknown explorers from the late 1980s</explorers>
-<underground_description>2.5m high entrance gives way to a short crawl and traverse over a blind 2m pit. 20m from the entrance is a 4m deep pit on the right, beyond which is a pitch. Stones thrown down indicate 15m depth[qm A] with an encouraging boom. No significant draught. No anchors were spotted. However, a flatpack zoom battery was found at the pitch head and an empty packet of &quot;Big D&quot; peanuts with 1988 sell by date was found at the entrance.
-
-<img src="2012-dd-06/i/BigD.jpg"/></underground_description>
+<underground_description>2.5m high entrance gives way to a short crawl and traverse over a blind 2m pit. 20m from the entrance is a 4m deep pit on the right, beyond which is a pitch. Stones thrown down indicate 15m depth[qm A] with an encouraging boom. No significant draught. No anchors were spotted. However, a flatpack zoom battery was found at the pitch head and an empty packet of &quot;Big D&quot; peanuts with 1988 sell by date was found at the entrance.</underground_description>
 <equipment></equipment>
 <references></references>
 <survey></survey>
diff --git a/noinfo/cave_data/2012-dd-06.html b/noinfo/cave_data/2012-dd-06.html
deleted file mode 100644
index 12ad1084e..000000000
--- a/noinfo/cave_data/2012-dd-06.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
-<!-- Only put one cave in this file -->
-<html lang="en">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-</head>
-<body>
-<cave>
-<non_public>False</non_public>
-<caveslug>1623-2012-dd-06</caveslug>
-<official_name>Big D h&ouml;hle</official_name>
-<area>1623</area>
-<kataster_code></kataster_code>
-<kataster_number></kataster_number> 
-<unofficial_number>2012-dd-06</unofficial_number>
-
-<entrance>
-  <entranceslug>1623-2012-dd-06</entranceslug>
-  <letter></letter>
-</entrance>
-
-<explorers>CUCC, Duncan Collis and Anthony Day, 2012-08-10, plus unknown explorers from the late 1980s</explorers>
-<underground_description>2.5m high entrance gives way to a short crawl and traverse over a blind 2m pit. 20m from the entrance is a 4m deep pit on the right, beyond which is a pitch. Stones thrown down indicate 15m depth[qm A] with an encouraging boom. No significant draught. No anchors were spotted. However, a flatpack zoom battery was found at the pitch head and an empty packet of &quot;Big D&quot; peanuts with 1988 sell by date was found at the entrance.</underground_description>
-<equipment></equipment>
-<references></references>
-<survey></survey>
-<kataster_status></kataster_status>
-<underground_centre_line></underground_centre_line>
-<notes></notes>
-<length></length>
-<depth></depth>
-<extent></extent>
-<survex_file></survex_file>
-<description_file></description_file>
-<url>smkridge/2012-dd-06.html</url>
-</cave>
-</body>
-</html>

From 188aff791e2d1b1f60a785c22ddae7f93f787df8 Mon Sep 17 00:00:00 2001
From: expoonserver <devnull@localhost>
Date: Sat, 8 Sep 2012 02:17:00 +0100
Subject: [PATCH 4/5] Tidy up a load of svn-prop files that shouldn't be here
 and certainly not in mercurial VCS

---
 noinfo/br-alm/svn-prop.tmp~   | 2 --
 noinfo/egglgrub/svn-prop.tmp~ | 0
 noinfo/kratzer/svn-prop.tmp~  | 0
 noinfo/loser/svn-prop.tmp~    | 0
 noinfo/plateau/svn-prop.tmp~  | 0
 noinfo/remote/svn-prop.tmp~   | 1 -
 noinfo/wilden/svn-prop.tmp~   | 0
 7 files changed, 3 deletions(-)
 delete mode 100644 noinfo/br-alm/svn-prop.tmp~
 delete mode 100644 noinfo/egglgrub/svn-prop.tmp~
 delete mode 100644 noinfo/kratzer/svn-prop.tmp~
 delete mode 100644 noinfo/loser/svn-prop.tmp~
 delete mode 100644 noinfo/plateau/svn-prop.tmp~
 delete mode 100644 noinfo/remote/svn-prop.tmp~
 delete mode 100644 noinfo/wilden/svn-prop.tmp~

diff --git a/noinfo/br-alm/svn-prop.tmp~ b/noinfo/br-alm/svn-prop.tmp~
deleted file mode 100644
index 4570be307..000000000
--- a/noinfo/br-alm/svn-prop.tmp~
+++ /dev/null
@@ -1,2 +0,0 @@
-.
-*.htm
diff --git a/noinfo/egglgrub/svn-prop.tmp~ b/noinfo/egglgrub/svn-prop.tmp~
deleted file mode 100644
index e69de29bb..000000000
diff --git a/noinfo/kratzer/svn-prop.tmp~ b/noinfo/kratzer/svn-prop.tmp~
deleted file mode 100644
index e69de29bb..000000000
diff --git a/noinfo/loser/svn-prop.tmp~ b/noinfo/loser/svn-prop.tmp~
deleted file mode 100644
index e69de29bb..000000000
diff --git a/noinfo/plateau/svn-prop.tmp~ b/noinfo/plateau/svn-prop.tmp~
deleted file mode 100644
index e69de29bb..000000000
diff --git a/noinfo/remote/svn-prop.tmp~ b/noinfo/remote/svn-prop.tmp~
deleted file mode 100644
index 43d1567c1..000000000
--- a/noinfo/remote/svn-prop.tmp~
+++ /dev/null
@@ -1 +0,0 @@
-*.htm
diff --git a/noinfo/wilden/svn-prop.tmp~ b/noinfo/wilden/svn-prop.tmp~
deleted file mode 100644
index e69de29bb..000000000

From 65faf2587925cc6504760fae7a6a03e8c30bb26a Mon Sep 17 00:00:00 2001
From: expoonserver <devnull@localhost>
Date: Sat, 8 Sep 2012 02:19:14 +0100
Subject: [PATCH 5/5] Add very basic troggle info. Should probably be merged
 into website page.

---
 handbook/troggle.html | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 handbook/troggle.html

diff --git a/handbook/troggle.html b/handbook/troggle.html
new file mode 100644
index 000000000..fac8f2ebf
--- /dev/null
+++ b/handbook/troggle.html
@@ -0,0 +1,10 @@
+
+<html>
+<head>
+<title>Troggle</title>
+</head>
+<body>
+<p>Most of the pages within this website can be edited using the edit button on the main menu.&nbsp; However a few parts, like qm lists and logbook entries cannot be edited this way at this time.</p>
+</body>
+</html>
+
