--- pgp/doc/pgp.1	2018/04/24 16:41:28	1.1.1.3
+++ pgp/doc/pgp.1	2018/04/24 16:45:58	1.1.1.5
@@ -1,4 +1,4 @@
-.TH PGP 1 "PGP Version 2.5"
+.TH PGP 1 "PGP Version 2.6.3i"
 .\" NAME should be all caps, SECTION should be 1-8, maybe w/ subsection
 .\" other parms are allowed: see man(7), man(1)
 .SH NAME
@@ -272,7 +272,7 @@ useful enough to be enabled by default.
 
 .B ENCRYPTTOSELF - Add MYNAME to Recipients List
 
-Default setting: ENCRYPTTOSELF = off
+Default setting:  ENCRYPTTOSELF = off
 
 If this is emabled, MYNAME will be implcitly added to the list of
 recipients for any message you encrypt with a public key.  Since in
@@ -364,13 +364,13 @@ information describing what it's doing.
 
 .B PUBRING - Public Key Ring Location
 
-Default setting: PUBRING = $PGPPATH/pubring.pgp
+Default setting:  PUBRING = $PGPPATH/pubring.pgp
 
 This is the path name to the public key ring to use.
 
 .B SECRING - Secret Key Ring Location
 
-Default setting: SECRING = $PGPPATH/secring.pgp
+Default setting:  SECRING = $PGPPATH/secring.pgp
 
 This is the path name to the secret key ring to use.
 
@@ -386,7 +386,7 @@ in a spoofing attack.
 
 .B RANDSEED - Random Number Seed File
 
-Default setting: RANDSEED = $PGPPATH/randseed.bin
+Default setting:  RANDSEED = $PGPPATH/randseed.bin
 
 This is the path to a random seed file which is part of PGP's
 random number generation algorithm, used to generate session keys.
@@ -396,27 +396,17 @@ process and protecting it from disclosur
 
 .B COMMENT - ASCII Armor Comment
 
-Default setting: COMMENT = ""
+Default setting:  COMMENT = ""
 
 If set to a non-empty string, the value of this variable is
 printed in the header of ASCII armor files, preceded by "Comment: ".
 
-.B PKCS_COMPAT - PKCS compatibility
+.B LEGAL_KLUDGE - Incompatibility with PGP versions prior to 2.6
 
-Default setting:  PKCS_COMPAT = 1
+Default setting:  LEGAL_KLUDGE = on
 
-This flag is ignored by PGP 2.5; it is always taken as 1.  If
-set to 1, PGP pads message digests and session keys inside
-RSA-encrypted integers according to RSA Data Security, Inc.'s
-Public-Key Cryptography Standards.  If set to 0, earlier versions
-of PGP generated an old incompatible formats.  Either was accepted.
-
-The RSAREF public-key encryption routines used by PGP 2.5 are unable to
-decode the old formats.
-
-There are still many areas of incompatibility with the PKCS;
-in future, higher values of this flag may enable more compatibility
-features.
+If set, PGP will generate keys and messages in a new format that
+cannot be read by PGP 2.5 and earlier versions.
 
 
 
@@ -549,21 +539,12 @@ of thousands.
 
 .SH "LEGAL RESTRICTIONS"
 
+PGP 2.6.3i is freeware, and may be used for non-commercial purposes
+only. This version of PGP is illegal to use within the USA but is
+fine elsewhere in the world. US users should get a copy of MIT PGP
+2.6.2 instead, or purchase the commercial version 2.7.1 from ViaCrypt.
+
 For detailed information on PGP licensing, distribution, copyrights,
 patents, trademarks, liability limitations, and export controls, see
 the "Legal Issues" section in the "PGP User's Guide, Volume II:
-Special Topics".  In particular, PGP is export restricted by the Offices
-of Defense Trade Controls and Munitions Control, U.S.  Department of
-State, and shall not be exported or reexported from the United States,
-directly or indirectly, without obtaining a U.S. Department of State
-License.
-
-PGP uses a public key algorithm claimed by U.S. patent #4,405,829.  The
-exclusive rights to this patent are held by a California company called
-Public Key Partners.  This is explained in the PGP User's Guide, Volume II.
-
-PGP itself is freeware, but it inherits certain encumbrances from its
-use of RSAREF to perform public-key encryption.
-
-Another fully licensed commercial PGP is available from ViaCrypt, 2104 West
-Peoria Avenue, Phoenix, Arizona 85029, (602) 944-0773.
+Special Topics".