Merge

css/main2_old-pre20110428.css

@@ -1,40 +0,0 @@
-.caption			{ font-size: 8pt; margin-bottom: 0pt; }
-.centre				{ text-align: center; }
-.plus2pt			{ font-size: 160%; }
-
-body, td, center, ul, p, input 	{ color: #000; font-family: sans-serif; }
-a:link, a:visited		{ text-decoration: none; }
-div.centre img			{ vertical-align: middle; }
-h1				{ text-align: center; font-size: 210%;
-				line-height: 100%; }
-h2				{ color: #009900; }
-h3				{ color: #2c105e; }
-h4				{ color: #0d664c; }
-img.onright, div.onright	{ vertical-align: top; float: right;
-				margin-left: 10pt;  margin-bottom: 10pt;
-				margin-right: 8pt; }
-img.onleft, div.onleft		{ vertical-align: top; float: left;
-				margin-right: 10pt; margin-bottom: 10pt;
-				margin-left: 8pt; }
-img.icon			{ vertical-align: middle; }
-img.aligntop			{ vertical-align: top; }
-table.imgtable			{ margin-left: auto; margin-right: auto; }
-table.imgtable td		{ vertical-align: middle; text-align: center;
-				padding: 10px; }
-
-/* "Traditional" table with borders.*/
-table.trad			{ margin: 0pt; border: 1px solid #000;
-				border-color: #c0c0c0 #8d8d8d #8d8d8d #c0c0c0; }
-table.bigfatborder		{ border-width: 6px; }
-table.trad td, table.trad th	{ margin: 0pt; border: 1px solid #aaa;
-				border-color: #8d8d8d #c0c0c0 #c0c0c0 #8d8d8d; }
-
-/* You are not expected to understand this. It is necessary. */
-table.centre			{ margin-left: auto; margin-right: auto; }
-table.centre td			{ text-align: left; }
-
-h2#tophead			{ text-align: center; margin-bottom: -10pt; }
-table#cavepage			{ width: 100%; font-size: 160%; }
-table#cavepage th#kat_no	{ text-align: left; width: 25%; }
-table#cavepage th#name		{ text-align: center; width: 50%; }
-table#cavepage th#status	{ text-align: right; width: 25%; }

handbook/bankofexpo.html

@@ -12,7 +12,7 @@
 <p><em>Please be respectful of this website as you'll find you can edit transactions that others have listed. This is to allow people to collaboratively add their combined expenses with all the complications that cavers bring to anything. However, it could be abused. Please don't. The admins can see records of who changed what and when. </em>
 <p>BoC was originally designed for <b>expedition use</b>, where expenses are distributed by number of nights/car-passengers/beers. Being online helps accounting transparency, allows real-time review of creditors/debtors, and, if input permissions are devolved, reduces the burden on the treasurer. Due to its expedition origins it correctly handles exchange rates changing over time.
 <p>Please read how these expenses records are also kept manually on paper in the <a href="bierbook.html">Bier and Sesh books</a> in the potato hut.
-<p>The 2018 Bank of Expo is hosted at <a href="http://expo.survex.com/boe">expo.survex.com/boe</a>.
+<p>The current Bank of Expo is hosted at <a href="http://expo.survex.com/boe/">expo.survex.com/boe/</a> (and the previous year at <a href="http://expo.survex.com/boe-lastyear/">expo.survex.com/boe-lastyear/</a>.
 <p>Bank of Expo (and the same software running as Bank of CUCC for ordinary caving trips) was written by Stuart Bennett in Cambridge. He says:
 <p>
 <em>"BoC is a multi-user auditable online share-based accounting system.  The `share-based' part is probably its distinguishing feature: absolute amounts are split evenly across the slates of implicated users and/or ring-fenced cost-pools.  Transactions are automatically double-entry, and as real-world transactions are made against a real bank account, the
@@ -20,10 +20,9 @@
 <p>
 The split mechanism transparently underlies everything, but for user-friendliness there are various handy web-forms provided which generate the split tables (`Transaction Groups').  These range from a simple person-to-person swap, to a customizable `Event' with costs for various items being automatically squirrelled away into pre-set cost-pools."</em>
 
-<p>Now read the online documentation at <a href="https://github.com/malc0/BoC">https://github.com/malc0/BoC</a> which has a link to a demonstration system that you can play with (CUCC meets 2014-15).
+<p>Now read the <a href="boc.pdf">the documentation</a> (PDF) (for the version running on the expo server).</p>
 
-<p>
+<p>Source and docs for the upstream version are online at <a href="https://github.com/malc0/BoC">https://github.com/malc0/BoC</a> which has a link to a demonstration system that you can play with (CUCC meets 2014-15).</p>
-Here is the <a href="bocdoc.pdf">the original documentation</a> (PDF).  It's a bit out of date: the instructions online  largely replace Chapter 2.
 
 <hr />
 

handbook/computing/keyexchange.html

@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>Handbook placeholder page</title>
+<title>Key-Pair Setup (Expo handbook)</title>
 <link rel="stylesheet" type="text/css" href="../../css/main2.css" />
 </head>
 <body>
@@ -20,7 +20,7 @@
 
 <p>Explanation of <a href="https://www.ssh.com/ssh/keygen/">key-pairs and the ssh-keygen command</a>.</p>
 
-<p>A public key file looks like this: <tt>ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEApc9+PAMrDtWa8D8/ZneLP2X9UOYmTITAhTd2DRs8SE+NDgis5pYo/Xhtbrg86ePMAC2YM5xAkYx3jNA/VZ/PkB3gTzYJW3T/zTH+cc7YeWhy9l1zIMaYqeyvw7FxeSBaR4XoLPVtVUlai8DUDiWAEm7VvOKj1n68z1LxVh1MZXLm7btckf6fske2YU9UpjqT++AURQvFheRJ4la7KBJ7LXZ3A/TQ7HQaTpqmcQKCiRj/yZ5FNHxBk0M+ShbHUtz1GhXRCMJ3LZHaw24OJyVJ8YNzBiStBb1qcWCXX7HR9CUNhz7tA5HZyc1lau/1vwk8MSe93lyyLntzJKkqmkW/cQ== wookey@kh</tt>i.e. a long string of characters with 'ssh-rsa' at the start and a 'user'@'machine' ID at the end.</p>
+<p>A public key file looks like this: <tt>ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEApc9+PAMrDtWa8D8/ZneLP2X9UOYmTITAhTd2DRs8SE+NDgis5pYo/Xhtbrg86ePMAC2YM5xAkYx3jNA/VZ/PkB3gTzYJW3T/zTH+cc7YeWhy9l1zIMaYqeyvw7FxeSBaR4XoLPVtVUlai8DUDiWAEm7VvOKj1n68z1LxVh1MZXLm7btckf6fske2YU9UpjqT++AURQvFheRJ4la7KBJ7LXZ3A/TQ7HQaTpqmcQKCiRj/yZ5FNHxBk0M+ShbHUtz1GhXRCMJ3LZHaw24OJyVJ8YNzBiStBb1qcWCXX7HR9CUNhz7tA5HZyc1lau/1vwk8MSe93lyyLntzJKkqmkW/cQ== wookey@kh</tt>i.e. a long string of characters with 'ssh-rsa' at the start and an ID at the end (often 'user'@'machine').</p>
 
 <h3>Windows</h3>
   <p>On a Windows machine use  
@@ -28,8 +28,11 @@
 <p>Follow the Puttygen instructions, but the really short version is:
   <li>Run PuTTYgen</li>
   <li>Click on 'Generate'. Follow the instructions. Don't bother adding a passphrase.</li>
-  <li>Save the key</li>
+  <li>Type your name in the 'Key comment' field. (just so we know who's key it is)</li>
-  <li>Copy all of the public key out of the window and paste that into the email. Make sure not to miss part or add newlines or otherwise mess with it.</li>
+  <li>Save the private key (this will create a .ppk file that you will need later)</li>
+  <li>Don't save the public key - instead copy all of the text from the 'Public key for pasting 
++into OPENSSH authorized_keys file' field, and paste that into the email. Make sure not to miss part or add newlines or otherwise mess with it.</li>
+  <li>Run Pageant (it will have been installed in your Start menu, otherwise find it it "C:\Program Files\PuTTY\pageant.exe"). Click the "Add Key" button. Select the .ppk file in the pop-up file list. You only need to do this once.
 </ol>
 
 <h3>Linux</h3>
@@ -39,7 +42,6 @@
   <li>If not, run <tt>ssh-keygen</tt>. It may ask about passwords: you can add a password for extra
   security, but a passwordless key is fine, and more convenient.</li>
   <li>That will create a file: <tt>.ssh/id_rsa.pub</tt> in your home directory. Email that file to one of the admins listed above. </li>
-	<li>Run Pageant (it will have been installed in your Start menu, otherwise find it it "C:\Program Files\PuTTY\pageant.exe"). Click the "Add Key" button. Select the .ppk file in the pop-up file list. You only need to do this once.
 	
 </ol>
 
@@ -62,7 +64,7 @@
 
 
 <h2>Your second machine</h2>
-<p>OK, you have an uploaded and usable key and you can ssh into the expo server. Now you want to set up a key for another machine such as your phone. You don't need a nerd admin now, you can do this yourself. But be <b>extremely careful</b> to follow this exactly. If you innocently rename the files to something that appears more sensible it won't work.
+<p>OK, you have an uploaded and usable key and you can ssh into the expo server. If you want to connect from another machine (e.g. your phone) it's better to make another key than try to re-use the first one. You don't need a nerd admin now, you can do this yourself. But be <b>extremely careful</b> to follow this exactly. If you innocently rename the files to something that appears more sensible it won't work.
 <ol>
 <li>On your new machine, generate a key-pair. Since you are probably using a different operating system on your second machine, read the instructions above for the relevant OS. Yes you will be generating a new key. Do not re-use the key you had already.
 <li>This time though, you will want to be sure that the key has a meaningful label. On Linux this means something like this:
@@ -73,7 +75,7 @@ If you accepted the defaults, the public key will be called <span style="font-fa
 <li>Now copy the public key file to your <em>first machine</em>, the one that is already set up with a working key-pair setup with the expo server. Using email to yourself is easiest.
 <li>Now upload the public key using sFTP (Filezilla configured to use sFTP, which uses Pageant by default) to <span style="font-family:monospace; size=x-small; background-color: lightgray">expo.survex.com/home/expo/.ssh/keys/</span>
 <li>Now login to the expo server on your first machine and do these commands:<br>
-Be <b>extremely careful</b> to type ">>" and not ">" in the fourth line below otherwise you will delete everything.
+Be <b>extremely careful</b> to type ">>" and not ">" in the fourth line below otherwise you will delete <i>everyone's</i> logins.
 <tt><font color=red">$</font> ssh expo@expo.survex.com
 <br><font color=blue">expo@expo:~$</font> cd .ssh
 <br><font color=blue">expo@expo:~$</font> cp -p authorized_keys authorized_keys.backup