From 3d08cd331c1adcf0d917392f7e527b3f00511748 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Fri, 24 May 2024 06:52:22 +0200
Subject: Merging upstream version 6.8.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 CONTRIBUTING.d/mail | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'CONTRIBUTING.d/mail')

diff --git a/CONTRIBUTING.d/mail b/CONTRIBUTING.d/mail
index 48e5b9a..a749e34 100644
--- a/CONTRIBUTING.d/mail
+++ b/CONTRIBUTING.d/mail
@@ -51,13 +51,11 @@ Description
         using a PGP key.  See also:
         <https://www.gnupg.org/faq/gnupg-faq.html#use_pgpmime>
 
-        There are many ways you can sign your patches, and it depends on
-        your preferred tools.  You can use neomutt(1) (>= 20240201) as a
-        driver for git-send-email(1).  In <~/.gitconfig>, add the
-        following section:
+        If you use mutt(1), we recommend the following configuration for
+        PGP:
 
-            [sendemail]
-                sendmailcmd = neomutt -C -H - && true
+            set crypt_autosign = yes
+            set crypt_protected_headers_write = yes
 
 See also
        CONTRIBUTING
-- 
cgit v1.2.3