From 22350d0768d3e605a49e39f4f257585170d8080e Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Thu, 1 Jun 2023 12:42:51 +0200
Subject: [PATCH] doc: Replace remaining "gpg2" by "gpg".

--
---
 doc/gnupg7.texi   | 17 ++++++++---------
 doc/gpgsm.texi    |  2 +-
 doc/scdaemon.texi |  2 +-
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/doc/gnupg7.texi b/doc/gnupg7.texi
index c48dca96f..a77bf98f9 100644
--- a/doc/gnupg7.texi
+++ b/doc/gnupg7.texi
@@ -11,19 +11,18 @@
 @ifset isman
 GnuPG is a set of programs for public key encryption and digital
 signatures.  The program most users will want to use is the OpenPGP
-command line tool, named @command{gpg2}.  @command{gpgv}is a stripped
-down version of @command{gpg2} with no encryption functionality, used
+command line tool, named @command{gpg}.  @command{gpgv}is a stripped
+down version of @command{gpg} with no encryption functionality, used
 only to verify signatures against a trusted keyring.  @command{gpgsm} is
 the X.509/CMS (for S/MIME) counterpart of
-@command{gpg2}. @command{gpg-agent} is a passphrase and private key
+@command{gpg}. @command{gpg-agent} is a passphrase and private key
 daemon which may also emulate the @command{ssh-agent}.
 @mansect see also
-@command{gpg}(1), 
-@command{gpg2}(1), 
-@command{gpgv}(1), 
-@command{gpgsm}(1), 
-@command{gpg-agent}(1), 
-@command{dirmngr}(8), 
+@command{gpg}(1),
+@command{gpgv}(1),
+@command{gpgsm}(1),
+@command{gpg-agent}(1),
+@command{dirmngr}(8),
 @command{scdaemon}(1)
 @include see-also-note.texi
 @end ifset
diff --git a/doc/gpgsm.texi b/doc/gpgsm.texi
index 364345741..11c5c1962 100644
--- a/doc/gpgsm.texi
+++ b/doc/gpgsm.texi
@@ -1725,7 +1725,7 @@ option @option{--disable-dirmngr}.
 
 @mansect see also
 @ifset isman
-@command{gpg2}(1),
+@command{gpg}(1),
 @command{gpg-agent}(1)
 @end ifset
 @include see-also-note.texi
diff --git a/doc/scdaemon.texi b/doc/scdaemon.texi
index a1d1cbc08..6f56585e6 100644
--- a/doc/scdaemon.texi
+++ b/doc/scdaemon.texi
@@ -757,6 +757,6 @@ length up to N bytes.  If N is not given a default value is used
 @ifset isman
 @command{gpg-agent}(1),
 @command{gpgsm}(1),
-@command{gpg2}(1)
+@command{gpg}(1)
 @end ifset
 @include see-also-note.texi