--- 1/draft-ietf-openpgp-rfc2440bis-17.txt	2006-05-10 22:12:21.000000000 +0200
+++ 2/draft-ietf-openpgp-rfc2440bis-18.txt	2006-05-10 22:12:21.000000000 +0200
@@ -1,25 +1,25 @@
 Network Working Group                                        Jon Callas
 Category: INTERNET-DRAFT                                PGP Corporation
-draft-ietf-openpgp-rfc2440bis-17.txt
+draft-ietf-openpgp-rfc2440bis-18.txt
 Expires November 2006                                  Lutz Donnerhacke
 May 2006
 
 Obsoletes: 1991, 2440                                        Hal Finney
                                                          PGP Corporation
 
                                                               David Shaw
 
                                                            Rodney Thayer
 
                           OpenPGP Message Format
-                  draft-ietf-openpgp-rfc2440bis-17.txt
+                  draft-ietf-openpgp-rfc2440bis-18.txt
 
     Copyright (C) The Internet Society (2006).
 
 IPR Claim Notice
 
     By submitting this Internet-Draft, each author represents that any
     applicable patent or other IPR claims of which he or she is aware
     have been or will be disclosed, and any of which he or she becomes
     aware will be disclosed, in accordance with Section 6 of BCP 79.
 
@@ -1040,21 +1040,21 @@
 
       - MPI of DSA value r.
 
       - MPI of DSA value s.
 
     The signature calculation is based on a hash of the signed data, as
     described above. The details of the calculation are different for
     DSA signatures than for RSA signatures.
 
     With RSA signatures, the hash value is encoded as described in
-    PKCS#1 section 9.2.1 encoded using PKCS-1 encoding type
+    PKCS#1 section 9.2.1 encoded using PKCS#1 encoding type
     EMSA-PKCS1-v1_5 as described in section 12.1. This requires
     inserting the hash value as an octet string into an ASN.1 structure.
     The object identifier for the type of hash being used is included in
     the structure. The hexadecimal representations for the currently
     defined hash algorithms are:
 
       - MD5:        0x2A, 0x86, 0x48, 0x86, 0xF7, 0x0D, 0x02, 0x05
 
       - RIPEMD-160: 0x2B, 0x24, 0x03, 0x02, 0x01
 
@@ -2717,26 +2717,26 @@
    yDgBO22WxBHv7O8X7O/jygAEzol56iUKiXmV+XmpCtmpqQUKiQrFqclFqUDBovzS
    vBSFjNSiVHsuAA==
    =njUN
    -----END PGP MESSAGE-----
 
     Note that this example has extra indenting; an actual armored
     message would have no leading whitespace.
 
 7. Cleartext signature framework
 
-    It is desirable to sign a textual octet stream without ASCII
-    armoring the stream itself, so the signed text is still readable
-    without special software. In order to bind a signature to such a
-    cleartext, this framework is used. (Note that this framework is not
-    intended to be reversible. RFC 3156 defines another way to sign
-    cleartext messages for environments that support MIME.)
+    It is desirable to be able to sign a textual octet stream without
+    ASCII armoring the stream itself, so the signed text is still
+    readable without special software. In order to bind a signature to
+    such a cleartext, this framework is used. (Note that this framework
+    is not intended to be reversible. RFC 3156 defines another way to
+    sign cleartext messages for environments that support MIME.)
 
     The cleartext signed message consists of:
 
       - The cleartext header '-----BEGIN PGP SIGNED MESSAGE-----' on a
         single line,
 
       - One or more "Hash" Armor Headers,
 
       - Exactly one empty line not included into the message digest,
 
@@ -3810,23 +3810,23 @@
 
     [RFC2279]        Yergeau., F., "UTF-8, a transformation format of
                      Unicode and ISO 10646", RFC 2279, January 1998.
 
     [RFC2822]        Resnick, P., "Internet Message Format", RFC 2822.
 
     [RFC3156]        M. Elkins, D. Del Torto, R. Levien, T. Roessler,
                      "MIME Security with OpenPGP", RFC 3156,
                      August 2001.
 
-    [RFC3437]        B. Kaliski and J. Staddon, " PKCS #1: RSA
+    [RFC3447]        B. Kaliski and J. Staddon, "PKCS #1: RSA
                      Cryptography Specifications Version 2.1",
-                     RFC 2437, February 2003.
+                     RFC 3447, February 2003.
 
     [SCHNEIER]      Schneier, B., "Applied Cryptography Second Edition:
                     protocols, algorithms, and source code in C", 1996.
 
     [TWOFISH]        B. Schneier, J. Kelsey, D. Whiting, D. Wagner, C.
                      Hall, and N. Ferguson, "The Twofish Encryption
                      Algorithm", John Wiley & Sons, 1999.
 
 17. References (Informative)