Mutt 0.92.9i.mutt-0-92-9i

2 files changed, 69 insertions, 44 deletions

diff --git a/doc/pgp-Notes.txt b/doc/PGP-Notes.txt
index fc064f89..82be1b20 100644
--- a/doc/pgp-Notes.txt
+++ b/doc/PGP-Notes.txt
@@ -1,8 +1,11 @@
-	   Some notes on Mutt's PGP integration
+		
+		
+		
+		USING PGP FROM WITHIN MUTT
+		
 
-	    1997-12-04, tlr <roessler@guug.de>
-
-	       Last updated: 1998-03-11, tlr
+	    Thomas Roessler <roessler@guug.de>
+	       Fri Jun  5 12:28:52 CEST 1998
 
 
 While encryption, verification and signing of messages are
@@ -14,60 +17,83 @@ numerical key IDs for a message's recipients. These key
 IDs are then passed to the external PGP binary on the
 command line.
 
+The current document contains a short description of the
+PGP related configuration options mutt permits you to set,
+and some frequently asked questions and tips with respect
+to using Mutt with PGP.
 
-Recent Changes
---------------
-
-$pgp_pubring, $pgp_language, $pgp_secring, and $pgp are gone.
-They have been replaced by the following variables:
 
-	pgp_v2_language		pgp_v5_language
-	pgp_v2_pubring		pgp_v5_pubring
-	pgp_v2_secring		pgp_v5_secring
-	pgp_v2			pgp_v5
+PGP settings
+------------
 
-For all of these variables, we use "reasonable" defaults.
-This includes a fix for the outstanding "pkr/skr" problem
-for people using pgp 5.
-
-$pgp_version has been split up into a bunch of variables:
+There are quite a few aspects of mutt's PGP usage you may
+want to customize.  First, you can use different versions
+of PGP for composing and decrypting/verifying messages,
+and for handling key ring stuff.  These versions are
+controlled by the following set of variables:
 
   	pgp_default_version
 	pgp_send_version
 	pgp_receive_version
 	pgp_key_version
 
-The latter three may be set to the value "default" (which
-is the default ;-); in this case, the value of
-$pgp_default_version will be used instead.
+Valid values for all of these variables include "pgp5" and
+"pgp2".
+
+The last three variables may be set to "default" (which is
+the default); in this case, the value of
+$pgp_default_version will be used.
+
+
+$pgp_send_version controls the version of pgp used for
+composing new messages.  $pgp_receive_version is used for
+decrypting messages and verifying signatures.
+$pgp_key_version is the one which is used for key ring
+operations (importing keys from messages, exporting keys
+from your public key ring).
+
+Since the different PGP versions may use different key
+rings and need different language settings, the following
+variables can be used to configure these aspects:
 
-$pgp_send_version is the version of pgp used for composing
-new messages.  $pgp_receive version is used for decrypting
-messages and verifying signatures. $pgp_key_version is the
-one which is used for key ring operations (extracting keys
-from messages, extracting keys from your public key ring).
+  - Language settings:
+	$pgp_v2_language, $pgp_v5_language
 
-Valid values for _all_ variables include "pgp5", "pgp3",
-"pgp2"; "pgp3" and "pgp5" are equivalent.  "g10" has been
-removed for now: The program has changed it's name to
-GNUPG; Support for that program will be included soon.
-Support will be added as soon as the current state of the
-code turns out to be stable.
+  - Public key ring:
+  	$pgp_v2_pubring, $pgp_v5_pubring
 
+  - Secret key ring:
+        $pgp_v2_secring, $pgp_v5_secring
+
+  - PGP itself:
+  	$pgp_v2, $pgp_v5
+	
+    Note that PGP 5 comes in several binaries (pgps, pgpk,
+    pgpv, pgp).  Mutt assumes that these binaries reside
+    in the same directory; $pgp_v5 should point to the
+    "pgp" binary from PGP 5.
+
+For all of these variables, we use "reasonable" defaults
+which should work for most users.
+
+Support for the GNU Privacy Guard (GPG) is currently
+worked on.
+
+
+The value of the variable $pgp_sign_micalg will show up in
+the "micalg" parameter of MIME headers when creating RFC
+2015 signatures.
 
-A new variable named $pgp_sign_micalg has been introduced.
-It contains the default message integrity check algorithm.
 Valid values are "pgp-md5", "pgp-sha1", and "pgp-rmd160".
+
 If you select a signing key using the "sign as" option on
 the compose menu, mutt will automagically figure out the
-correct value to insert here, but it does not know about
-the user's default key.
+correct value to put into this variable, but it does not
+know about the user's default key.
 
-So if you are using an RSA key for signing, set this
-variable to "pgp-md5", if you use a PGP 5 DSS key for
-signing, say "pgp-sha1" here.  The value of this variable
-will show up in the "micalg" parameter of MIME headers
-when creating RFC 2015 signatures.
+So if you are (by default) using an RSA key for signing,
+set this variable to "pgp-md5", if you use a PGP 5 DSS key
+for signing, say "pgp-sha1".
 
 
 
@@ -135,7 +161,7 @@ No.  Application/pgp is not really suited to a world with
 MIME, non-textual body parts and similar things.  Anyway,
 if you really want to generate these old-style
 attachments, include the following macro in your ~/.muttrc
-(line breaks for readibility, this is actually one line):
+(line breaks for readability, this is actually one line):
 
   macro compose S "Fpgp +verbose=0 -fast
   	+clearsig=on\ny^T^Uapplication/pgp; format=text;
@@ -159,4 +185,3 @@ $PGPPATH and add the following line to your muttrc:
 
 For PGP 2.6, a German version called "muttde" is available
 as well.
-
diff --git a/doc/manual.sgml b/doc/manual.sgml
index ef54e694..a86f2260 100644
--- a/doc/manual.sgml
+++ b/doc/manual.sgml
@@ -537,7 +537,7 @@ name="commands">.  Each line of the file may contain one or more commands.
 When multiple commands are used, they must be separated by a semicolon (;).
 <tscreen><verb>
 	set realname='Mutt user' ; ignore x-
-</verb><tscreen>
+</verb></tscreen>
 The hash mark, or pound sign
 (``&num;''), is used as a ``comment'' character. You can use it to
 annotate your initialization file. All text after the comment character