Merge with changes from server

This commit is contained in:
Wookey
2016-11-17 12:31:00 +00:00
5 changed files with 42 additions and 3 deletions

View File

@@ -24,7 +24,7 @@
<li>TravelLunch</li> <li>TravelLunch</li>
<li><a href= "www.weatherwriter.com" >Weatherwriter</a></li> <li><a href="http://www.weatherwriter.com">Weatherwriter</a></li>
</ul> </ul>

View File

@@ -16,7 +16,7 @@ exploration of these annual expeditions.</b></p>
<p>The expedition runs in the Summer, usually August; it is <p>The expedition runs in the Summer, usually August; it is
still at the earliest planning stage. More details will appear when still at the earliest planning stage. More details will appear when
available on the <a href="years/2014/index.html">Expo 2014 page</a>.</p> available on the <a href="years/2017/index.html">Expo 2017 page</a>.</p>
<p>For those coming on an Austria expedition for the first time, this great <p>For those coming on an Austria expedition for the first time, this great
bulk of material can seem a little overwhelming. However, it's important for bulk of material can seem a little overwhelming. However, it's important for

18
rope_history.html Normal file
View File

@@ -0,0 +1,18 @@
<html><head><title>Rope History</title></head><body>
<H1>Rope History<H1>
<table>
<theader>
<tr>
<th>Year bought</th><th>Manufacturer</th><th>Type</th><th>Manufacturer Documentation</th><th>Description / Photo</th><th>Drop test results</th><th>(Intended) retirement</th>
</tr>
</theader>
<tbody>
<td class="year">2015</td>
<td class="manafacturer">A</td>
<td class="type">B</td>
<td class="docs">None</td>
<td class="desc">None</td>
<td class="droptest">To be tested 2018</td>
<td class="retiretment">Post expo 2020</td>
</tbody>
</table></body></html>

View File

@@ -9,7 +9,7 @@
<li>TravelLunch</li> <li>TravelLunch</li>
<li><a href= "www.weatherwriter.com" >Weatherwriter</a></li> <li><a href="http://www.weatherwriter.com">Weatherwriter</a></li>
</ul> </ul>

21
years/2017/index.html Normal file
View File

@@ -0,0 +1,21 @@
<html>
<head>
<title>Expo 2017: Documentation index</title>
<link rel="stylesheet" type="text/css" href="../../css/main2.css" />
</head>
<body>
<h1>Expo 2017: documentation index</h1>
<p><span style="font-weight: bold;">Pre-Expo Documentation</span></p>
<ul>
<li><a href="http://www.srcf.ucam.org/caving/wiki/Expo_2017/Who_and_When">Who and when planning page</a></li>
<li><a href="../2016/stuffleftattopcamp.html">Things left at top camp 2016</a></li>
<li><a href="../2016/stuffleftatbasecamp.html">Stuff left at base camp 2016</a></li>
<li><a href="../2016/thingsfor2017.html">Things needed for 2017</a></li>
<li><a href="stuffbought.html">Things bought 2017</a></li>
<li><a href="sponsors.html">Sponsors 2017 </a></li>
</ul>
<hr />
<!-- LINKS -->
</body>
</html>