--- pgp/doc/setup.doc	2018/04/24 16:39:43	1.1.1.1
+++ pgp/doc/setup.doc	2018/04/24 16:40:36	1.1.1.2
@@ -1,5 +1,6 @@
-		   Pretty Good Privacy version 2.2
+		   Pretty Good Privacy version 2.3
 		 Installation Guide by Perry Metzger
+		    Edited for 2.3 by Colin Plumb
 
 
 How to Install PGP
@@ -7,10 +8,11 @@ How to Install PGP
 
 The first question is, what platform are you on?
 
-PGP 2.2 runs on several varieties of Unix, MS-DOS, VAX VMS, Ataris,
-Amigas, and possibly other operating systems.  Naturally, installation
-instructions differ depending on your hardware.  Separate instructions
-are provided here for MSDOS and Unix.
+The base PGP 2.3 distribution runs on several varieties of Unix, MS-DOS
+and VAX VMS.  Ports can be expected shortly to the Atari, Amiga, Macintosh,
+and possibly other systems.  Naturally, installation instructions differ
+depending on your hardware.  Separate instructions are provided here for
+MSDOS and Unix.
 
 No matter what the machine you are on, though, do this...
 
@@ -40,18 +42,18 @@ PGP is distributed in a compressed archi
 the relevant files grouped together, and also saves disk space and 
 transmission time.
 
-The current version, 2.2, is archived with the ZIP utility, and the
-PGP executable binary release system is in a file named PGP21.ZIP.
+The current version, 2.3, is archived with the ZIP utility, and the
+PGP executable binary release system is in a file named PGP23.ZIP.
 This contains the executable program, the user documentation, and a
 few keys and signatures.  There is also a second file available
-containing the C and assembly source code, called PGP21SRC.ZIP; unless
+containing the C and assembly source code, called PGP23SRC.ZIP; unless
 you are a programmer interested in cryptography, it is probably of
 little interest to you.  It may or may not be available from the
-source from which you get PGP21.ZIP; if not, and you want it, see the
+source from which you get PGP23.ZIP; if not, and you want it, see the
 Licensing and Distribution section of the PGP User's Guide.
 
 You will need PKUNZIP version 1.1 or later to uncompress and split
-the PGP21.ZIP archive file into individual files.  PKUNZIP is
+the PGP23.ZIP archive file into individual files.  PKUNZIP is
 shareware and is widely available on MSDOS machines.
 
 Create a directory for the PGP files.  For this description, let's
@@ -63,11 +65,14 @@ Type these commands to make the new dire
    md \pgp
    cd \pgp
 
-Uncompress the distribution file PGP21.ZIP to the directory.  For
+Uncompress the distribution file PGP23.ZIP to the directory.  For
 this example, we will assume the file is on floppy drive A - if not,
 substitute your own file location.
 
-   pkunzip a:pgp21
+   pkunzip -d a:pgp23
+
+If you omit the -d flag, all the files in the doc subdirectory will
+be deposited in the pgp directory.  This merely causes clutter.
 
 
 Setting the Environment
@@ -83,6 +88,12 @@ following lines to your AUTOEXEC.BAT fil
 
 Substitute your own directory name if different from "C:\PGP".
 
+The CONFIG.TXT file contains various preferences.  You can change
+the language PGP operates in, and the character set it uses.  The
+IBM PC's default character set, "Code Page 850" will be used if the
+line "charset = cp850" appears in the config.txt file.  You probably
+want to add that line.
+
 Another environmental variable you should set in MSDOS is "TZ", which
 tells MSDOS what time zone you are in, which helps PGP create GMT
 timestamps for its keys and signatures.  If you properly define TZ in
@@ -118,7 +129,15 @@ signature or your bank card code number
 secret and keep it secure!  Use a long, unguessable pass phrase and
 remember it.  Right after you generate a key, put it on your key
 rings and copy your secret keyring (SECRING.PGP) to a blank floppy
-and write protect the floppy.  
+and write protect the floppy.
+
+You might wish to generate a short test key to play around with PGP
+for a little bit and see how it works, or even more than one so
+you can pretend to be sending messages between two different people.
+Since you won't be guarding any secrets, this can be short and have
+a simple pass phrase.  But when you generate your permanent key,
+that you intend to give to others so they can send secure messages
+to you, be much more careful.
 
 After you generate your own key pair, you can add a few more public
 keys to your key ring.  A collection of sample public keys is
@@ -132,8 +151,9 @@ For UNIX:
 
 You likely will have to compile PGP for your system; to do this, first
 make sure the unpacked files are in the correct unix textfile format
-(the files in pgp21src.zip are in MSDOS CRLF format, so for unix you
-must unpack with "unzip -a").  Then copy the file "makefile.unx" in the
+(the files in pgp23src.zip are in MSDOS CRLF format, so for unix you
+must unpack with "unzip -a"; the tar file pgp23.tar.Z uses normal Unix
+line feed conventions).  Then copy the file "makefile.unx" in the
 distribution to "Makefile".
 
 If you don't have an ANSI C compiler you will need the unproto package
@@ -206,6 +226,11 @@ variable "PGPPATH" to point to this plac
 Copy the files "language.txt", "config.txt", and the ".hlp" files from
 the distribution into this subdirectory.
 
+Tell PGP the character set and language you wish to use in the config.txt
+file.  If you have a terminal that only displays 7-bit ASCII, use
+"charset=ascii" to display an approximation (accents are omitted) of
+extended characters.
+
 > IMPORTANT: This directory cannot be shared!  It will contain your <
 > personal private keys!                                            <
 
@@ -219,16 +244,17 @@ Now, if you haven't done so yet, GO READ
 ######################################################################
 For VMS:
 
-Read the file readme.vms in the vms subdirectory
+Read the file readme.vms in the doc subdirectory
 
 ######################################################################
 For Amiga:
 
-[This space intentionally left blank]
+The standard distribution does not yet compile directly on an Amiga.
+If you have SAS C, you might try the makefile.amy as a starting place.
 
 ######################################################################
 For Atari:
 
-[This space intentionally left blank]
+The standard distribution does not yet compile directly on an Atari ST.
 
 ######################################################################