Merge branch 'pr-119'

tomjorquera · Aug 31, 2020 · 10412db · 10412db
2 parents b0a6678 + f711de7
commit 10412db
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,6 +1,7 @@
 UNRELEASED
     * Improve log messages
     * Fix bug `AttributeError: 'NoneType' object has no attribute 'close'` (#126)
+    * Remove documentation of `smtp-ssl-protocol` as this option was dropped in 2016
 
 v3.12.1 (2020-08-02)
     * Fix calling opmlexport without arguments

diff --git a/r2e.1 b/r2e.1
@@ -253,8 +253,6 @@ password for SMTP AUTH
 SMTP server
 .IP smtp-ssl
 Connect to the SMTP server using SSL
-.IP smtp-ssl-protocol
-TLS/SSL version to use on STARTTLS when not using 'smtp-ssl'.
 .RE
 .SS IMAP configuration
 .IP imap-auth