Merge another docs fix from 'pre-0.64'.

[PuTTY.git] / doc / pgpkeys.but

diff --git a/doc/pgpkeys.but b/doc/pgpkeys.but
index 79768c35f2f1f0dc1a0e5725db8b94deb2549d59..e6f25c6b4a63784916adff1f2df60a90f687aa8a 100644 (file)
--- a/doc/pgpkeys.but
+++ b/doc/pgpkeys.but
@@ -1,5 +1,3 @@
-\define{versionidpgpkeys} \versionid $Id$
-
 \A{pgpkeys} PuTTY download keys and signatures
 
 \cfg{winhelp-topic}{pgpfingerprints}
@@ -12,13 +10,11 @@ accurate idea of what each signature guarantees.
 This description is provided as both a web page on the PuTTY site, and
 an appendix in the PuTTY manual.
 
-As of the next release, all of the PuTTY executables will contain
-\#{XXX-REMOVE-BEFORE-RELEASE: fix this up for forthcoming release
-As of release 0.58, all of the PuTTY executables contain}
-fingerprint material (usually accessed via the \i\c{-pgpfp}
-command-line option), such that if you have an executable you trust,
-you can use it to establish a trust path, for instance to a newer
-version downloaded from the Internet.
+As of release 0.58, all of the PuTTY executables contain fingerprint
+material (usually accessed via the \i\c{-pgpfp} command-line
+option), such that if you have an executable you trust, you can use
+it to establish a trust path, for instance to a newer version
+downloaded from the Internet.
 
 (Note that none of the keys, signatures, etc mentioned here have
 anything to do with keys used with SSH - they are purely for verifying
@@ -75,7 +71,7 @@ human intervention, so nobody would be able to type a passphrase.
 
 The actual snapshots are built on a team member's home Windows box.
 The keys themselves are stored on an independently run Unix box
-(the same one that hosts our Subversion repository). After
+(the same one that hosts our Git repository). After
 being built, the binaries are uploaded to this Unix box and then
 signed automatically.