From 44ca9163fc5b41863b8444177825580dc7b08028 Mon Sep 17 00:00:00 2001
From: Alejandro Colomar <alx@kernel.org>
Date: Fri, 26 Apr 2024 16:25:34 +0200
Subject: CONTRIBUTING.d/: Clarify how to send patches with git-send-email(1)

Cc: Simon Barth <simon.barth@gmx.de>
Signed-off-by: Alejandro Colomar <alx@kernel.org>
---
 CONTRIBUTING.d/mail    |  8 --------
 CONTRIBUTING.d/patches | 27 ++++++++++++++++++++++++++-
 2 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/CONTRIBUTING.d/mail b/CONTRIBUTING.d/mail
index 48e5b9a93..fc75b9eee 100644
--- a/CONTRIBUTING.d/mail
+++ b/CONTRIBUTING.d/mail
@@ -51,14 +51,6 @@ 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:
-
-            [sendemail]
-                sendmailcmd = neomutt -C -H - && true
-
 See also
        CONTRIBUTING
        CONTRIBUTING.d/*
diff --git a/CONTRIBUTING.d/patches b/CONTRIBUTING.d/patches
index 96550ce0e..df010cc46 100644
--- a/CONTRIBUTING.d/patches
+++ b/CONTRIBUTING.d/patches
@@ -6,7 +6,8 @@ Description
        <CONTRIBUTING.d/bugs>), then send a patch in an email.
 
        -  Follow the instructions for sending mail to the mailing list
-          from <CONTRIBUTING.d/mail>.
+          from <CONTRIBUTING.d/mail>.  See also "Send the patches"
+          below.
 
        -  The subject of the email should contain "[patch]" in the
           subject line.
@@ -87,8 +88,32 @@ Description
        -  Make patches against the latest version of the manual page.
           Use git(1) for getting the latest version.
 
+
+   Send the patches
+       We recommend using git-send-email(1) to send the patches to the
+       mailing list.  For instructions on how to configure and use it,
+       see <https://git-send-email.io/>.  It can also be configured to
+       use mutt(1) as a driver, which only requires the following
+       section in <~/.gitconfig> (assuming mutt(1) is already configured
+       for sending mail):
+
+           [sendemail]
+               sendmailcmd = mutt -H - && true
+
+   Sign the patches with PGP
+       See <CONTRIBUTING.d/mail> for more details on signing your mail
+       to the list.  git-send-email(1) can be configured to use a recent
+       version of neomutt(1) (>= 20240201), to sign patches with PGP
+       (assuming neomutt(1) is already configured for sending signed
+       mail).  neomutt(1)'s -C flag enables crypto:
+
+           [sendemail]
+               sendmailcmd = neomutt -C -H - && true
+
 See also
        CONTRIBUTING
        CONTRIBUTING.d/*
 
        <https://www.kernel.org/doc/Documentation/process/submitting-patches.rst>
+       <https://git-send-email.io/>
+       <https://neomutt.org/feature/cli-crypto>
-- 
cgit v1.2.3