Commiting unchecked in files found on the server having run dos2unix

on them, as they had windows carriage returns
This commit is contained in:
Expo on server
2022-09-07 08:40:29 +01:00
parent f289f623be
commit 286f1ef5bb
2 changed files with 88 additions and 110 deletions

View File

@@ -2,19 +2,26 @@
<html> <html>
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Expo 2020: Organisation and mission statement</title> <title>Expo 2020: index</title>
<link rel="stylesheet" type="text/css" href="../../css/main2.css" /> <link rel="stylesheet" type="text/css" href="../../css/main2.css" />
</head> </head>
<body> <body>
<h1>Expo 2020</h1> <h1>Expo 2020</h1>
<p>Caving <a href="/expedition/2020">trips records</a>.
<h2>COVID - No expedition this year</h2> <h2>COVID - No expedition this year</h2>
<p>But there was a great deal of planning discussion on the Slack channel for this expo whcih is worth perusing, much of it has lasting value: <p>But there was a great deal of planning discussion on the Slack channel for this expo which is worth perusing, much of it has lasting value:
<ul> <ul>
<li><a href="https://app.slack.com/client/TQF95LK8T">Expo channels on Slack (External site)</a> (yet to be scraped and properly archived) ARCHIVE ONLY - do not edit. </li> <li><a href="https://app.slack.com/client/TQF95LK8T">Expo channels on Slack (External site)</a> (yet to be scraped and properly archived) ARCHIVE ONLY - do not edit. </li>
</ul> </ul>
<hr /> <hr />
<h3>PDF docs created for planning the 2020 Expo:</h3>
<ul>
<li><a href="/expofiles/documents/2020-expo-planning/Expo-initial-survey-responses-fleur.pdf">Responses to wishes survey</a>
<li><a href="/expofiles/documents/2020-expo-planning/expo-initial-survey-summary-charts-fleur.pdf">Summary charts from wishes survey</a>
<li><a href="/expofiles/documents/2020-expo-planning/">PDF docs list</a>
</ul>
<p> <p>
Back to <a href="../../handbook/planning.html">Expo Planning Guide</a>. Back to <a href="../../handbook/planning.html">Expo Planning Guide</a>.
</body> </body>

View File

@@ -11,25 +11,15 @@
<h2>Expo 2022: Organisation</h2> <h2>Expo 2022: Organisation</h2>
<p> <p>
Link to last expedition: <a href="../2019/index.html">2019</a><br /> Link to last expedition: <a href="../2019/index.html">2019</a><br />
Back to <a href="../../handbook/planning.html">Expo Planning Guide</a>. Link to 2020 (planning) docs: <a href="../2020/index.html">2020</a><br />
<h3>Pre-Expo Planning</h3> <h3>Pre-Expo Planning</h3>
<ul> <ul>
<li><a href="https://trello.com/b/WddB62HI/expo-jobs">Trello: expo-jobs (External site)</a> (email expo leader for access)</li> <li><a href="https://trello.com/b/WddB62HI/expo-jobs">Trello: expo-jobs (External site)</a> (email expo leader for access)</li>
<li><a href="https://app.element.io/#/room/#expo:matrix.org">matrix chat rooms (External site)</a> (email Wookey for access)</li> <li><a href="https://app.element.io/#/room/#expo:matrix.org">matrix chat rooms (External site)</a></li>
<li><a href="https://docs.google.com/spreadsheets/d/1tVRtxYa3IMRDnC5J6nUEBCbhYpqESv2Movyzp6c7dg4/edit#gid=0">Who and when planning page</a> (Google Docs)</li> <li><a href="https://docs.google.com/spreadsheets/d/1tVRtxYa3IMRDnC5J6nUEBCbhYpqESv2Movyzp6c7dg4/edit#gid=0">Who and when planning page</a> (Google Docs)</li>
<li><a href="../2020/index.html">2020 Expo channels on Slack</a> (much of this is relevant) ARCHIVE ONLY - do not edit.</li>
</ul> </ul>
PDF docs created for planning the 2020 Expo:
<ul>
<li><a href="/expofiles/documents/2020-expo-planning/Expo-initial-survey-responses-fleur.pdf">Responses to wishes survey</a>
<li><a href="/expofiles/documents/2020-expo-planning/expo-initial-survey-summary-charts-fleur.pdf">Summary charts from wishes survey</a>
<li><a href="/expofiles/documents/2020-expo-planning/">PDF docs list</a>
</ul>
On expo website: On expo website:
<ul> <ul>
@@ -39,63 +29,44 @@ On expo website:
<h3>Expo reports</h3> <h3>Expo reports</h3>
<ul> <ul>
<li><a href="../2022/logbook.html">Logbook</a> (<a href="../../expofiles/writeups/2022/logbook.pdf">PDF</a>) <li><a href="../2022/logbook.html">Logbook</a> (<a href="../../expofiles/writeups/2022/logbook.pdf">PDF scan</a>)
</ul> </ul>
<h3>During Expo - mostly data entry</h3> <h3>During Expo - mostly data entry</h3>
<ul> <ul>
<li><a href="../../handbook/phone.htm#addcredit">Add credit to both phones</a> - Can be done online just before Expo <li><a href="../../../expofiles/surveyscans/2022/walletindex.html">2022 surveying progress</a>
<li><a href="https://ukcaving.com/board/index.php?topic=25249">During-Expo Blog</a> on ukcaving.com
<li><a href="../../../expofiles/surveyscans/2022/walletindex.html">2022 surveying progress</a> - Monitor this to help decide priorities
<li><a href="https://ukcaving.com/board/index.php?topic=25249">During-Expo Blog</a> on ukcaving.com
<li>Photos of Call-out book every week (backup)
<li>Photos of bier book every week - bier and expenses (backup)
<li>Photos sesh book every week (backup).
</ul> </ul>
<h3>Last day of expo</h3> <h3>Last day of expo</h3>
<ul> <ul>
<li>Photos of bier book complete (backup)
<li>Photos of accounts and sesh book complete (backup).
<li>Things left at Base Camp 2022 <li>Things left at Base Camp 2022
<li><a href="topcamplist.html">Things left at Top Camp 2022</a> <li><a href="topcamplist.html">Things left at Top Camp 2022</a>
<li>Things left at Undergound Camp (?) 2022 <li>Things left at Undergound Camp(s) 2022
<li>Ropes out of cave at end expo <li>Ropes out of cave at end expo
</ul> </ul>
<h3>Post-Expo Completion</h3> <h3>Post-Expo Completion</h3>
<ul> <ul>
<li>2022 surveying completion <li>Scan of bier book
<li>Scan of accounts and sesh books.
<li>Call-out book scanned <li>Call-out book scanned
<li>Caver's Forum expo report - Caving UK
<li>Things needed for next year 2023 <li>Things needed for next year 2023
</span> </span>
</ul> </ul>
<h2><a href="mission.html">2022 Mission statement</a></h2> <h2><a href="mission.html">2022 Mission statement</a></h2>
<ul> <ul>
<li><a href="/expofiles/documents/2020-expo-planning/cucc-objectives-2020-points-to-consider.pdf">Cave by cave priorities, bivvy location(s)</a> <li><a href="/expofiles/documents/2020-expo-planning/cucc-objectives-2020-points-to-consider.pdf">Cave by cave priorities, bivvy location(s)</a>
</ul> </ul>
<h4>Criteria for a successful expo</h4>
<p>To discuss.. (not <em>just</em> x miles of newly surveyed cave)
<h4>Organisational targets</h4> <h4>Organisational targets</h4>
<ul> <ul>
<li>To do.. finally and completely de-rig Organhohle bivvy stocks?
<li>Photos for expo archive
<li><a href="/expofiles/documents/2020-expo-planning/anchor-appraisal-martingreen2020.pdf">New cave anchor proposals</a> <li><a href="/expofiles/documents/2020-expo-planning/anchor-appraisal-martingreen2020.pdf">New cave anchor proposals</a>
</ul> </ul>
<h4>Training targets</h4>
<ul>
<li>Introduce new cavers to alpine expedition caving in relatively safe situation.
<li><a href="/expofiles/documents/2020-expo-planning/mentorship-programme-initial-outline.pdf">Mentorship outline proposal</a>
</ul>
<h3>Every Expo - ongoing jobs</h3> <h3>Every Expo - ongoing jobs</h3>
<ul> <ul>
<li><a href="https://github.com/CaveSurveyGIS/CUCCexposurveyissues/issues">Github: Survey notes to do</a></li> <li><a href="https://github.com/CaveSurveyGIS/CUCCexposurveyissues/issues">Github: Survey notes to do</a></li>