Clarified that weewx supports FTPS, not SFTP.

Author: tkeffer

README.md

@@ -81,7 +81,7 @@
   <li>Support for multiple skins</li>
   <li>Support sqlite and MySQL</li>
   <li>Optional uploads to Weather Underground, CWOP, AWEKAS, WOW, and others</li>
-  <li>Uploads to your website via FTP, SFTP, or rsync</li>
+  <li>Uploads to your website via FTP, FTPS, or rsync</li>
   <li>Extensive almanac information</li>
 </ul>
 

bin/weecfg/test/expected/weewx32_expected.conf

@@ -142,7 +142,7 @@ version = 3.2.0
         #server = replace with your server name, e.g, www.threefools.org
         #path = replace with the destination directory (e.g., /weather)
 
-        # Set to True for a secure FTP (SFTP) connection. Not all servers
+        # Set to True for an FTP over TLS (FTPS) connection. Not all servers
         # support this:
         secure_ftp = False
 

bin/weecfg/test/expected/weewx_user_expected.conf

@@ -202,7 +202,7 @@ version = 3.2.0a2
         #server = replace with the ftp server name, e.g, www.threefools.org
         #path = replace with the ftp destination directory (e.g., /weather)
 
-        # Set to True for a secure FTP (SFTP) connection. Not all servers
+        # Set to True for an FTP over TLS (FTPS) connection. Not all servers
         # support this.
         secure_ftp = False
 

bin/weeutil/ftpupload.py

@@ -47,7 +47,7 @@ def __init__(self, server,
         max_tries: How many times to try creating a directory or uploading
         a file before giving up [Optional. Default is 3]
         
-        secure: Set to True to attempt a secure FTP (SFTP) session.
+        secure: Set to True to attempt an FTP over TLS (FTPS) session.
         
         debug: Set to 1 for extra debug information, 0 otherwise.
         """
@@ -73,7 +73,7 @@ def run(self):
                 FTPClass = ftplib.FTP_TLS
             except AttributeError:
                 FTPClass = ftplib.FTP
-                syslog.syslog(syslog.LOG_DEBUG, "ftpupload: Your version of Python does not support SFTP. Using unsecure connection.")
+                syslog.syslog(syslog.LOG_DEBUG, "ftpupload: Your version of Python does not support FTPS. Using insecure connection.")
                 self.secure = False
         else:
             FTPClass = ftplib.FTP

docs/changes.txt

@@ -408,7 +408,7 @@ Fixes ticket #40.
 Fixed problem where dumping to database could cause stats to get added to
 the daily summaries twice.
 
-Secure FTP (SFTP) sessions are now possible, but don't work very well with
+FTP over TLS (FTPS) sessions are now possible, but don't work very well with
 Microsoft FTP servers. Requires Python v2.7. Will not work with older
 versions of Python. Fixes ticket #37.
 

docs/usersguide.htm

@@ -2452,7 +2452,9 @@ <h3 class="config_section">[[FTP]]</h3>
 
     <p class="config_important">secure_ftp</p>
 
-    <p>Set to <span class="code">True</span> to use a secure FTP (SFTP) connection. Not
+    <p>Set to <span class="code">True</span> to use FTP (FTPS) over TLS. This is an extension to the FTP
+        protocol that uses a Secure Socket Layer (SSL) protocol, <em>not</em> to be confused with
+        SFTP, which uses a Secure Socket Shell protocol. Not
         all FTP servers support this. In particular, the Microsoft FTP server seems to do a poor
         job of it. Requires Python V2.7. Will not work with older versions of Python.
         Optional. Default is <span class="code">False</span></p>

weewx.conf

@@ -150,7 +150,7 @@ version = 3.5.0
         #server = replace with the ftp server name, e.g, www.threefools.org
         #path = replace with the ftp destination directory (e.g., /weather)
 
-        # Set to True for a secure FTP (SFTP) connection. Not all servers
+        # Set to True for an FTP over TLS (FTPS) connection. Not all servers
         # support this.
         secure_ftp = False