From e84574f25d6d9d14b15084b225a30c2f96811e4b Mon Sep 17 00:00:00 2001
From: Philip Sargent <philip.sargent@klebos.com>
Date: Tue, 22 Feb 2022 00:58:09 +0000
Subject: [PATCH] 2021 to 2022 webpage updates

---
 folk/README.txt                 |  4 ++--
 handbook/computing/newyear.html | 10 +++++-----
 index.htm                       |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/folk/README.txt b/folk/README.txt
index d0abcc0a5..37ae0d769 100644
--- a/folk/README.txt
+++ b/folk/README.txt
@@ -43,6 +43,6 @@ folk-0 is for awkward buggers whose attendance spans decades. This needs updatin
 one of these lags attends:
 AERW, Becka, Mark Dougherty, Philip Sargent, Chris Densham, Mike Richardson
 
-Currently (May 2021) the software ignores folk-0, -1, -2 and you will need to use the old folk.csv for 
-the 2021 expo. But we hope to have this fixed in time...
+Currently (Feb. 2022) the software ignores folk-0, -1, -2 and you will need to use the old folk.csv for 
+the 2022 expo. But we hope to have this fixed next year...
 
diff --git a/handbook/computing/newyear.html b/handbook/computing/newyear.html
index 43f1da395..65b4bff4d 100644
--- a/handbook/computing/newyear.html
+++ b/handbook/computing/newyear.html
@@ -24,12 +24,12 @@ overwriting what is on the server. Changes to <var>:expoweb:</var> and <var>:tro
 system as these are <a href="../computing/repos.html">repositories</a>.
     <h4>Well before Expo as these pages are used in planning</h4>
 <ul>
-<li>Create a new <var>expoweb</var> website folder e.g. /2021/ in 
+<li>Create a new <var>expoweb</var> website folder e.g. /2022/ in 
 <ul>
 <li>expoweb/years/
 </ul>
 
-<li>edit <var>expoweb/index.htm</var> - edit the title and make it link to e.g. <var>expoweb/years/2021/</var>
+<li>edit <var>expoweb/index.htm</var> - edit the title and make it link to e.g. <var>expoweb/years/2022/</var>
 <li>edit <var>troggle/templates/base.html</var> - change the title and add a link to this year's expo
 <li>copy the contents of the previous year's <var>expoweb/years/</var> folder, e.g. /2016/ to /2017/ and edit all the files therein. You should start with at least an index.html and a mission.html
 <li>edit <var>expoweb/folk/folk.csv</var> - see below - to add a column for the coming year. Until that year column exists, the online system will be unaware that there is an expedition that year.
@@ -37,7 +37,7 @@ system as these are <a href="../computing/repos.html">repositories</a>.
 
 <h4>Whenever you like before Expo</h4>
 <ul>
-    <li>Create new subfolders e.g. /2021/ in <var>expofiles/</var>, in each of
+    <li>Create new subfolders e.g. /2022/ in <var>expofiles/</var>, in each of
         <ul>
         <li>expofiles/writeups/
         <li>expofiles/photos/
@@ -47,7 +47,7 @@ system as these are <a href="../computing/repos.html">repositories</a>.
         <li>expofiles/videos/ - optional. We don't do this much.
         </ul>
     <li>copy <var>wallets.py</var> from the previous year's folder in <var>expofiles/surveyscans/</var> into the current year
-        <li>create 50 folders in the new surveyscans year folder e.g. in <var>expofiles/surveyscans/2021/</var> of the form /2021#01/, /2021#02/ etc.
+        <li>create 50 folders in the new surveyscans year folder e.g. in <var>expofiles/surveyscans/2022/</var> of the form /2022#01/, /2022#02/ etc.
     <li>Test that the bierbook and seshbook LaTeX scripts <var>expoweb/documents/bierbook</var> work on your machine</li>
 </ul>
 
@@ -55,7 +55,7 @@ system as these are <a href="../computing/repos.html">repositories</a>.
 <ul>
      <li>create initial versions of the bierbook and the seshbook in <var>expoweb/documents/bierbook</var> 
      (the final copies after expo will be scanned and put in 
-     e.g. <var>expofiles/writeups/2021/</var> along with the scanned logbook). These need an updated <var>names.txt<var> file of expoers.
+     e.g. <var>expofiles/writeups/2022/</var> along with the scanned logbook). These need an updated <var>names.txt<var> file of expoers.
     <li>update the gear tape colours for the expected expoers in <a href="../geartape.html"><var>/expoweb/handbook/geartape.html</a> </li>
     <li>edit <var>expoweb/folk/folk.csv</var> - see below - to add people. Until a name is recorded in the Folk file that person will not be recognised within the online system as a cave surveyor or logbook entry writer.
     <li>Create the Bank of Expo <a href="../bankofexpo.html"><var>boe</var></a> for the expected attendees. 
diff --git a/index.htm b/index.htm
index a2854a7ff..4e6221e08 100644
--- a/index.htm
+++ b/index.htm
@@ -13,7 +13,7 @@
 
 <div id="homebox" style="color:black; background-color: rgba(255, 255, 255, 0.6); padding: 1% 5% 5%; margin-right:10%">
 
-   <h1 style="color:black">CUCC in Austria <a style="color:black" href="years/1976/report.htm">1976</a>-<a style="color:black" href="years/2021/">2021</a></h1>
+   <h1 style="color:black">CUCC in Austria <a style="color:black" href="years/1976/report.htm">1976</a>-<a style="color:black" href="years/2022/">2022</a></h1>
    <p>Welcome to the website of the <a style="color:black" href="https://camcaving.uk" target="_blank">Cambridge University Caving Club</a> expeditions to Austria</p>