From a0975c941892193faabe39890dd03d883b84b579 Mon Sep 17 00:00:00 2001
From: Philip Sargent <philip.sargent@gmail.com>
Date: Wed, 17 Jul 2019 13:31:37 +0200
Subject: [PATCH] correcting scp & sftp because of keys needed now

---
 handbook/computing/ftpusage.html | 48 +++++++++++++++++---------------
 1 file changed, 26 insertions(+), 22 deletions(-)
diff --git a/handbook/computing/ftpusage.html b/handbook/computing/ftpusage.html
index ce53700c8..cb0cc4e04 100644
--- a/handbook/computing/ftpusage.html
+++ b/handbook/computing/ftpusage.html
@@ -1,31 +1,18 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>CUCC Expedition Handbook: Uploading files/photos</title>
+<title>CUCC Expedition Handbook: Uploading files</title>
 <link rel="stylesheet" type="text/css" href="../../css/main2.css" />
 </head>
 <body>
-<h2 id="tophead">CUCC Expedition Handbook</h2>
+<h2 id="tophead">CUCC Expedition Handbook - FTP on Android phone</h2>
 
-<p>There are essentially two ways of using expo server: one is just FTP, second using version controll.
-    <strong>If you can handle version controll use that!</strong> Find detailed instructions on <a href="repousage.html">repo usage</a> page.</p>
-
-<h1>Using expo server via FTP connection</h1>
-
-<h2>Configure connection on Windows</h2>
-<ul>
-    <li>Get <a href="https://winscp.net/eng/download.php">WinScp</a> application to handle uploads or similar:<br>
-        <img src="./tutorialimgs/winscp.jpg" width="500"></li>
-    <li>Click 'New site' in the popup window and fill in the data.<br>
-        <b>hostname:</b><i>expo.survex.com</i><br>
-        <b>user:</b><i>expo</i><br>
-        <b>password:</b>[contact your expedition leader for password]<br>
-        <img src="./tutorialimgs/newsite.jpg" width="500"></li>
-    <li>Click 'Login' to connect. You should be able to upload files now.</li>
-</ul>
-<hr>
+<h1>Using expo server via FTP or scp or sftp connection</h1>
 
 <h2>Configure connection on Android phone</h2>
+<p>SFTP only works if you have <a href="keyexchange.html">key exchange</a> set up. But
+you can use FTP using this app and this method.
+
 <ul>
     <li>Get <a href="https://play.google.com/store/apps/details?id=com.cxinventor.file.explorer&hl=en">'Cx File Explorer'</a>:<br>
         <img src="./tutorialimgs/cx_file_explorer.png" height="500">
@@ -36,10 +23,10 @@
     <li>Press 'plus' and 'remote':<br>
         <img src="./tutorialimgs/cx_add.png" height="500">
     </li>
-    <li>Press 'SFTP':</li>
+    <li>Press 'FTP':</li>
     <li>Fill in the data:<br>
         <b>Host:</b><i>expo.survex.com</i><br>
-        <b>Port:</b><i>22</i><br>
+        <b>Port:</b><i>21</i><br>
         <b>Username:</b><i>expo</i><br>
         <b>Password:</b>[contact your expedition leader for password]<br>
         <img src="./tutorialimgs/cx_sftp.png" height="500">
@@ -54,12 +41,29 @@
     <li>Done!</li>
 </ul>
 <hr>
+<h2>Configure connection on Windows</h2>
+<p>scp only works if you have <a href="keyexchange.html">key exchange</a> set up.
+
+<ul>
+    <li>Get <a href="https://winscp.net/eng/download.php">WinScp</a> application to handle uploads or similar:<br>
+        <img src="./tutorialimgs/winscp.jpg" width="500"></li>
+    <li>Click 'New site' in the popup window and fill in the data.<br>
+        <b>hostname:</b><i>expo.survex.com</i><br>
+        <b>user:</b><i>expo</i><br>
+        <b>password:</b>[contact your expedition leader for password]<br>
+        <img src="./tutorialimgs/newsite.jpg" width="500"></li>
+    <li>Click 'Login' to connect. You should be able to upload files now.</li>
+</ul>
+<hr>
+
+
 
 <h2>Configure connection on Linux/Unix</h2>
+<p>scp  only works if you have <a href="keyexchange.html">key exchange</a> set up.
 <ul>
     <li>You can upload files using 'scp' command (to upload localfile.file to expofiles/uploads/remotename.file)<br>
         <pre>
-            scp loacalfile.file expo@expo.survex.com:~/expofiles/uploads/remotename.file
+            scp localfile.file expo@expo.survex.com:~/expofiles/uploads/remotename.file
         </pre>
     </li>
 </ul>
