From 2c8927feef24ddf070838cf23aad2e340f3f01c9 Mon Sep 17 00:00:00 2001
From: Simon Ser <contact@emersion.fr>
Date: Tue, 30 Nov 2021 21:59:51 +0000
Subject: [PATCH] Use direct TLS by default, add hints for STARTTLS

In general it's better to use direct TLS connections. Default to
direct TLS in our example Git config.

Add a hint about STARTTLS, because (1) some old providers may still
not have direct TLS and (2) the Git smtpencryption option is very
confusing.
---
 index.html | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/index.html b/index.html
index 6441a6d..e69733f 100644
--- a/index.html
+++ b/index.html
@@ -150,8 +150,8 @@
                 <pre>[sendemail]
 	smtpserver = mail.example.org
 	smtpuser = you@example.org
-	smtpencryption = tls
-	smtpserverport = 587</pre>
+	smtpencryption = ssl
+	smtpserverport = 465</pre>
                 <p>
                   Be sure to fill in the appropriate values for your email
                   provider - you will probably only have to fill in
@@ -162,6 +162,11 @@
                 <pre>git config --global user.email "you@example.org"
 <!--              -->git config --global user.name "Your Name"</pre>
                 <a href="#step-3" class="button">Next</a>
+                <p>
+                  This configuration assumes direct TLS. If your provider only
+                  offers STARTTLS, set <code>smtpencryption = tls</code> and
+                  <code>smtpserverport = 587</code>.
+                </p>
               </div>
             </div>
           </div>
-- 
2.45.2