diff --git a/README.md b/README.md
index aedb81c4..90031e9e 100644
--- a/README.md
+++ b/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>
 
diff --git a/bin/wee_import b/bin/wee_import
index ba7ecbdb..cf7b09cd 100644
--- a/bin/wee_import
+++ b/bin/wee_import
@@ -575,7 +575,7 @@ usage = """wee_import --help
        wee_import --version
        wee_import --import-config=IMPORT_CONFIG_FILE
             [--config=CONFIG_FILE]
-            [--date YYYY/MM/DD|YYYY/MM/DD hh:mm|YYYY/MM/DD (hh:mm)-YYYY/MM/DD (hh:mm)]
+            [--date=YYYY/MM/DD|'YYYY/MM/DD hh:mm'|'YYYY/MM/DD (hh:mm)-YYYY/MM/DD (hh:mm)']
             [--dry-run]
             [--verbose]
             [--log=-|LOG_FILE]
@@ -606,10 +606,11 @@ def main():
                       help="Print what would happen but do not do it.")
     parser.add_option("--date", dest="date", type=str, metavar="YYYY-MM-DD",
                       help="Date or time to import as a string of form "
-                           "'YYYY-MM-DD' or 'YYYY-MM-DD hh:mm'. A date range or "
+                           "YYYY/MM/DD or 'YYYY/MM/DD hh:mm'. A date range or "
                            "date-time range may be specified by separating two "
                            "date strings or two date-time strings with a hyphen. "
-                           "Argument must be enclosed in quotation marks.")
+                           "Arguments that include hh:mm must be enclosed in "
+                           "quotation marks.")
     parser.add_option("--log", dest="logging", type=str, metavar="LOG_FILE",
                       help="Control logging of most output. Log output is sent "
                            "to LOG_FILE if specified. Log output is turned off "
diff --git a/bin/weecfg/test/expected/weewx32_expected.conf b/bin/weecfg/test/expected/weewx32_expected.conf
index 461db156..22dc2209 100644
--- a/bin/weecfg/test/expected/weewx32_expected.conf
+++ b/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
         
diff --git a/bin/weecfg/test/expected/weewx_user_expected.conf b/bin/weecfg/test/expected/weewx_user_expected.conf
index 12c1ff4b..944a3b83 100644
--- a/bin/weecfg/test/expected/weewx_user_expected.conf
+++ b/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
         
diff --git a/bin/weeutil/ftpupload.py b/bin/weeutil/ftpupload.py
index 1b013e3c..99634a97 100644
--- a/bin/weeutil/ftpupload.py
+++ b/bin/weeutil/ftpupload.py
@@ -47,7 +47,7 @@ class FtpUpload(object):
         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 @@ class FtpUpload(object):
                 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
diff --git a/docs/changes.txt b/docs/changes.txt
index 71fcbe19..bce98cd5 100644
--- a/docs/changes.txt
+++ b/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.
 
diff --git a/docs/usersguide.htm b/docs/usersguide.htm
index 0ec78702..7a8c777a 100644
--- a/docs/usersguide.htm
+++ b/docs/usersguide.htm
@@ -2452,7 +2452,9 @@ longitude = -77.0366</pre>
 
     <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>
diff --git a/weewx.conf b/weewx.conf
index 2f9c5994..a99a19e5 100644
--- a/weewx.conf
+++ b/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