[git] gnupg-doc - branch, master, updated. adce0202b12c680ee3e64e2f51760608b53d5657

[by Werner Koch]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GnuPG website and other docs".

The branch, master has been updated
       via  adce0202b12c680ee3e64e2f51760608b53d5657 (commit)
      from  5e326105a760d04f8db6f9e94e54b8ee0d15537e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit adce0202b12c680ee3e64e2f51760608b53d5657
Author: Werner Koch <wk at gnupg.org>
Date:   Fri May 6 16:10:24 2016 +0200

    drafts: Fix content-type contradiction in openpgp-webkey-service.
    
    Reported-by: Damien Goutte-Gattat

diff --git a/misc/id/openpgp-webkey-service/middle.mkd b/misc/id/openpgp-webkey-service/middle.mkd
index f306322..2de39e9 100644
--- a/misc/id/openpgp-webkey-service/middle.mkd
+++ b/misc/id/openpgp-webkey-service/middle.mkd
@@ -93,10 +93,10 @@ may be revoked or expired - it is up to the client to handle such
 conditions.  The server MUST also accept a HEAD method so that a
 client may only check for the existence of a key.
 
-The server SHOULD return "application/pgp-key" as the content-type for
-the data but clients MUST also accept "application/octet-string" as
-content-type.  The server MUST NOT return an ASCII armored version of
-the key.
+The server SHOULD return "application/octet-string" as the
+content-type for the data but clients MAY also accept any other
+appropriate content-type.  The server MUST NOT return an ASCII armored
+version of the key.
 
 
 # Web Key Directory Update Protocol
@@ -119,10 +119,8 @@ Directory, she performs the following steps:
       https://example.org/.well-known/openpgpkey/submission-address
 
 2. She sends her key using SMTP (or any other transport mechanism) to
-   the provider using the submission address.  The content-type SHOULD
-   be "application/pgp-key" and the key being a binary attachment
-   (which is then likely base64 encoded).  Note that the OpenPGP ASCII
-   armor is not used.
+   the provider using the submission address and key format as
+   specified by PGP/MIME.
 
 3. The provider checks that the received key has a User ID which
     - matches an account name of the provider,

-----------------------------------------------------------------------

Summary of changes:
 misc/id/openpgp-webkey-service/middle.mkd | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
The GnuPG website and other docs
http://git.gnupg.org