Fix typos, clarify and update years on the handbook uploading page

This commit is contained in:
Wookey 2015-09-29 12:39:48 +01:00
parent a7b38163be
commit 5cc39a999c

View File

@ -9,25 +9,27 @@
<h2 id="tophead">CUCC Expedition Handbook</h2> <h2 id="tophead">CUCC Expedition Handbook</h2>
<h1>Uploading photos and files</h1> <h1>Uploading photos and files</h1>
<p>The expo website supports 2 basic methods of upload: <p>The expo website has a big section under 'expoimages' that is not part of the repositories. This section describes how to move files into that area. It supports 2 basic methods of upload:
<ol> <ol>
<li>Uploading directly to the file store using scp/sftp/rsync</li> <li>Uploading directly to the file store using scp/sftp/rsync</li>
<li>Uploading to a special 'uploads' directory using Webdav</li> <li>Uploading to a special 'uploads' directory using Webdav</li>
</ol> </ol>
</p> </p>
<p>In both cases you need to know the expo password.</p>
<p>In the former case nothing else needs doing. In the second case an <p>In the former case nothing else needs doing. In the second case an
admin has to move the files to the correct final location, so rememebr admin has to move the files to the correct final location, so remember
to tell someone you've done it.</p> to tell someone you've done it.</p>
<p>Note that uploading photos does not automatically update the view <p>Note that uploading photos does not automatically update the view
at <a href="http://expo.survex.com/photos/">http://expo.survex.com/photos/</a>. An at <a href="http://expo.survex.com/photos/">http://expo.survex.com/photos/</a>. An
update script needs to be run. This should run once/day around update script needs to be run. This should run once/day around
midnight UTC, but may be broken. Prod a web admin.</p> midnight UTC, but may be broken. Prod a web admin if nothing is
updated by the next morning..</p>
<h2>Installing FireFTP</h2> <h2>Installing FireFTP</h2>
<p>Works on Windows, Mac, Linux, Android.</p> <p>Works on Windows, Mac, Linux, Android. This is a firefox browser plugin that enables FTP/SFTP uploads using just your browser.</p>
<ol> <ol>
<li>Install the firefox web browser. You can download it and find <li>Install the firefox web browser. You can download it and find
@ -55,19 +57,20 @@ on the centre of the screen.</li>
<h2>Using scp</h2> <h2>Using scp</h2>
<p>Works on Windows (using winscp), Linux (using scp), and no doubt mac and android with other tools.</p> <p>Works on Windows (using winscp), Linux (using scp), and no doubt
mac and android with other tools.</p>
<p>The above FireFTP is just one example of a tool that does this job</p> <p>The above FireFTP is just one example of a tool that does this job</p>
<pre> <pre>
directory: /home/expo/expoimages/photos/2013/YourName directory: /home/expo/expoimages/photos/2015/YourName
server: expo.survex.com server: expo.survex.com
user: expo user: expo
with the usual expo password with the usual expo password
protocol: sftp or scp protocol: sftp or scp
</pre> </pre>
<p>Obviously replace 'YourName' with your actual name (no spaces)</p> <p>Obviously replace 'YourName' with your actual name (no spaces!)</p>
<p>If you don't have winscp installed you can get it from here: <p>If you don't have winscp installed you can get it from here:
http://winscp.net/eng/index.php</p> http://winscp.net/eng/index.php</p>
@ -80,9 +83,9 @@ http://winscp.net/eng/docs/screenshots</p>
<h2>Using Webdav</h2> <h2>Using Webdav</h2>
<p>This method can only upload under one special 'uploads' <p>This method can only upload to one special 'uploads'
directory. Ask someone tomove your uploaded files to the final directory. Ask someone to move your uploaded files to the final
location.</p> location. But you may not need any extra software.</p>
<p> This is the upload dir: <tt><a href="/expoimages/uploads/">http://expo.survex.com/expoimages/uploads/</a></tt> <p> This is the upload dir: <tt><a href="/expoimages/uploads/">http://expo.survex.com/expoimages/uploads/</a></tt>
<p>You can use 'open as webfolder' on IE, or install this: <p>You can use 'open as webfolder' on IE, or install this:
@ -91,7 +94,7 @@ firefox, you will get a pop-up box asking for authenticaion for
'expo-uploads'. The user is 'expo', the password is the usual 'expo-uploads'. The user is 'expo', the password is the usual
one. Once done you can just copy files in.</p> one. Once done you can just copy files in.</p>
<p>Make a directory like photos/2013/YourName so we know what's <p>Make a directory like photos/2015/YourName so we know what's
been uploaded. been uploaded.
<p>Command-line people can use the 'cadaver' client which is even <p>Command-line people can use the 'cadaver' client which is even