3 files changed, 4 insertions, 70 deletions
diff --git a/doc/gpg.texi b/doc/gpg.texi
index a58b1bcc1..e88ba8589 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -12,8 +12,6 @@
 @cindex options, GPG command
 
 
-@c Begin standard stuff
-@ifclear gpgtwohack
 @manpage gpg.1
 @ifset manverb
 .B gpg
@@ -31,30 +29,6 @@
 .I command
 .RI [ args ]
 @end ifset
-@end ifclear
-@c End standard stuff
-
-@c Begin gpg2 hack stuff
-@ifset gpgtwohack
-@manpage gpg2.1
-@ifset manverb
-.B gpg2
-\- OpenPGP encryption and signing tool
-@end ifset
-
-@mansect synopsis
-@ifset manverb
-.B  gpg2
-.RB [ \-\-homedir
-.IR dir ]
-.RB [ \-\-options
-.IR file ]
-.RI [ options ]
-.I command
-.RI [ args ]
-@end ifset
-@end ifset
-@c End gpg2 hack stuff
 
 
 @mansect description
@@ -68,18 +42,11 @@ There are two main versions of GnuPG: GnuPG 1.x and GnuPG 2.x.  GnuPG
 2.x supports modern encryption algorithms and thus should be preferred
 over GnuPG 1.x.  You only need to use GnuPG 1.x if your platform
 doesn't support GnuPG 2.x, or you need support for some features that
-GnuPG 2.x has deprecated, e.g., decrypting data created with PGP-2
-keys.
+GnuPG 2.x has deprecated for security reasons, e.g., decrypting data
+created with PGP-2 keys.
 
-@ifclear gpgtwohack
 If you are looking for version 1 of GnuPG, you may find that version
 installed under the name @command{gpg1}.
-@end ifclear
-@ifset gpgtwohack
-In contrast to the standalone command @command{gpg} from GnuPG 1.x,
-the 2.x version is commonly installed under the name
-@command{@gpgname}.
-@end ifset
 
 @manpause
 
diff --git a/doc/gpgv.texi b/doc/gpgv.texi
index d70463b80..159c8dddb 100644
--- a/doc/gpgv.texi
+++ b/doc/gpgv.texi
@@ -8,8 +8,6 @@
 
 @include defs.inc
 
-@c Begin standard stuff
-@ifclear gpgtwohack
 @manpage gpgv.1
 @node gpgv
 @section Verify OpenPGP signatures
@@ -25,28 +23,6 @@
 .I sigfile
 .RI [ datafiles ]
 @end ifset
-@end ifclear
-@c End standard stuff
-
-@c Begin gpg2 hack stuff
-@ifset gpgtwohack
-@manpage gpgv2.1
-@node gpgv
-@section Verify OpenPGP signatures
-@ifset manverb
-.B gpgv2
-\- Verify OpenPGP signatures
-@end ifset
-
-@mansect synopsis
-@ifset manverb
-.B  gpgv2
-.RI [ options ]
-.I sigfile
-.RI [ datafiles ]
-@end ifset
-@end ifset
-@c End gpg2 hack stuff
 
 @mansect description
 @code{@gpgvname} is an OpenPGP signature verification tool.
diff --git a/doc/mkdefsinc.c b/doc/mkdefsinc.c
index b8fbed6e9..55a71a7d5 100644
--- a/doc/mkdefsinc.c
+++ b/doc/mkdefsinc.c
@@ -49,11 +49,6 @@
 #endif /*HAVE_W32_SYSTEM*/
 
 
-#if USE_GPG2_HACK
-# define gpg2_suffix "2"
-#else
-# define gpg2_suffix ""
-#endif
 
 
 static int verbose;
@@ -303,10 +298,6 @@ main (int argc, char **argv)
 
   fputs ("\n@c Flags\n\n", stdout);
 
-#if USE_GPG2_HACK
-  fputs ("@set gpgtwohack 1\n\n", stdout);
-#endif
-
   fputs ("\n@c Directories\n\n", stdout);
 
   print_filename ("@set BINDIR         ", GNUPG_BINDIR );
@@ -345,8 +336,8 @@ main (int argc, char **argv)
 
   fputs ("\n@c Macros\n\n", stdout);
 
-  printf ("@macro gpgname\n%s%s\n@end macro\n", GPG_NAME, gpg2_suffix);
-  printf ("@macro gpgvname\n%sv%s\n@end macro\n", GPG_NAME, gpg2_suffix);
+  printf ("@macro gpgname\n%s\n@end macro\n", GPG_NAME);
+  printf ("@macro gpgvname\n%sv\n@end macro\n", GPG_NAME);
 
 
   /* Trailer.  */