Photo upload docm updated

handbook/survey/newwallet.html

@@ -106,16 +106,18 @@ survey books are divided into "Kaninchenhöhle" (usually referred to as
 should also fill in so that people can find your survey again.</p>-->
 
 <h3 id="existing">Check existing online wallets (surveyscans folders)</h3>
+
 <p>As well as looking through the other plastic wallets in this year's lever-arch binder, have a look online at 
 the <a href="/survey_scans/">list of all online wallets</a> and have a look at all the folders referred to
 in your cave in, e.g. here is the data for <a href="/survexfile/204">cave 204</a>: the wallet identifier is 
 in the right-most column titles "Scans". If you are doing an entirely new cave, then this won't exist yet but it
 will be where your new discovery is eventually published.
 <p>As well as following through the links on those pages, have a look at the 
-<a href="/dwgfiles">drawings files page</a> which lists all the scanned notes, 
-plan and elevation scans in the each wallet ("Scans folder" column). 
+<a href="/dwgfiles">drawings files page</a> which lists all the Tunnel and Therion files, and associated with each, the wallets and 
+their the scanned notes, plan and elevation scans ("Scan files" column). 
 
 <h3 id="onlinew">Scan the notes into the online wallet</h3>
+
 <style>figure {font-weight: bold; font-size: small; font-family: sans-serif;font-variant-caps: small-caps;}</style>
 <div  class="onright">
 <figure>
@@ -130,7 +132,7 @@ plan and elevation scans in the each wallet ("Scans folder" column).
 <p>Each wallet has a corresponding folder in the online system where a record is kept
 of what information is in the wallet and where the corresponding survey data is filed:
 <pre>
-/expofiles/surveyscans/2018/2018#22/
+/expofiles/surveyscans/2018/2018#19/
 </pre>
 
 
@@ -148,35 +150,50 @@ icon from the vertical menu of icons which you get by clicking on
 </figure>
 </div>
 
-<p style="margin-left:20px">[ Normal people should skip this, <br />&nbsp;
+<p style="margin-left:20px">[ Normal people should skip this, 
 but nerds need to look here 
-for the <a href="onlinewallet.html">online wallet maintenance process</a> ]. 
+to understand the <a href="onlinewallet.html">online wallet maintenance process</a> ]. 
 
 <p>If your initial backup photos of your notes were poor quality, use the 
 scanner in the potato hut to make better copies. Scan to JPEG format as .jpg files.
-<p>Name the scanned pages "<em>notes-1.jpg</em>, or  <em>notes-cavepassagename.jpg</em>" etc. This is important as a script detects whether these files exist
-(with names beginning "notes..", "plan.." and "elev..") and if you name them something else it will hassle you unnecessarily.
 
-<p>[ Note to maintainers: do not rename these files even if they have been created with the wrong names. 
+<p>Name the scanned pages "<em>notes-1.jpg</em>, or  <em>notes-cavepassagename.jpg</em>" etc. This is important as a script detects 
+whether these files exist (with names beginning "notes..", "plan.." and "elev..") and if you name them something else it will hassle 
+you unnecessarily.
+<p style="margin-left:20px">[ Note to maintainers: do not rename these files even if they have been created with the wrong names. 
 They are permanently referred to by the tunnel/therion/troggle system !]
 
+<h3>Uploading the scanned files to the server</h3>
+
+<ul>
+<li>Use the <a href="/scanupload/2022:01">Upload Scans</a> form
+</ul>
+<p>Upload the scanned files from any computer with internet access using the <a href="/scanupload/2022:01">Upload Scans</a> form. 
+You will need to login as user 'expo' with the usual {cavy:beery} password.
+
+
+
 <p>Scanned survey notes are voluminous and so are not kept in the version control system. Instead it is all kept
-in the file bucket "expofiles" on the expo server machine (formerly in Cambridge, but now in Germany).
+in the file bucket "expofiles" on the expo server machine.
 <p>You will be using the expo laptop to do the scanning 
-and you will put all the scan files in the folder for your wallet, e.g. for 2018#19 it is:
+and you will put all the scan files in the folder for your wallet, e.g. for 
+<a href="/survey_scans/2018%252319/">2018#19</a> it was:
 <pre>
 /home/expo/expofiles/surveyscans/2018/2018#19/
 </pre>
-but then please also upload them using the <a href="/scanupload/2021:01">Upload Scans</a> form. 
+but then please also upload them to the same wallet on the server. This is what that wallet looks like using 
+the <a href="/scanupload/2018:19">Upload Scans</a> form. 
+<p>
 <code>
 If you make a mistake and need to rename a file then be aware that this is much, much easier using
 the <em>expo laptop</em>. The correct folder
 on the expo server is the same as that on the expo laptop - because we set up the expo laptop to be like that.
-But you will need to learn how to use Filezilla <a href="../computing/uploading.html#init">(expo-relevant instructions here)</a>.
+But you will need to learn how to use Filezilla <a href="../computing/uploading.html#init">(expo-relevant instructions here)</a> 
+to move and rearrange things on the server to match.
 Please <em>only copy files to the server that you created yourself and which live in your own wallet folder</em> 
-<p>If you want to use your own laptop you need a 
+<p>If you want to use your own laptop for complex rearrangements of files in the server's online wallets you need a 
 <a href="../computing/basiclaptop.html">minimal laptop setup</a>
-- as <a href="../computing/uploading.html">documented for uploading your expo photographs</a>. 
+- as <a href="../computing/uploading.html">documented for complex uploading your expo photographs</a>. 
 </code>
 <h3 id="runsurvex">Storing your electronic survey .topo files</h3>
 <p>If you used a PDA instead of making notes on paper, you need to store your .topo files in the right place.