Merge branch 'STABLE-BRANCH-2-2'
authorWerner Koch <wk@gnupg.org>
Thu, 22 Feb 2018 15:19:56 +0000 (16:19 +0100)
committerWerner Koch <wk@gnupg.org>
Thu, 22 Feb 2018 15:19:56 +0000 (16:19 +0100)
1  2 
AUTHORS
README
agent/command.c
configure.ac
doc/gpg.texi
doc/gpgsm.texi
doc/wks.texi
g10/keyedit.c
scd/app-openpgp.c

diff --cc AUTHORS
Simple merge
diff --cc README
Simple merge
diff --cc agent/command.c
Simple merge
diff --cc configure.ac
Simple merge
diff --cc doc/gpg.texi
Simple merge
diff --cc doc/gpgsm.texi
Simple merge
diff --cc doc/wks.texi
@@@ -332,24 -338,19 +338,20 @@@ the submission address
  The output of the last command looks similar to this:
  
  @example
 -  sec   rsa2048 2016-08-30 [SC]
 +  sec   rsa3072 2016-08-30 [SC]
          C0FCF8642D830C53246211400346653590B3795B
    uid           [ultimate] key-submission@@example.net
 -  ssb   rsa2048 2016-08-30 [E]
 +                bxzcxpxk8h87z1k7bzk86xn5aj47intu@@example.net
 +  ssb   rsa3072 2016-08-30 [E]
  @end example
  
- Take the hash of the string "key-submission", which is
- "bxzcxpxk8h87z1k7bzk86xn5aj47intu" and manually publish that key:
+ Take the fingerprint from that output and manually publish the key:
  
  @example
-   $ gpg --export-options export-minimal --export \
-   >  -o /var/lib/gnupg/wks/example.net/hu/bxzcxpxk8h87z1k7bzk86xn5aj47intu \
-   >  key-submission@@example.new
+   $ gpg-wks-server --install-key C0FCF8642D830C53246211400346653590B3795B \
+   >                key-submission@@example.net
  @end example
  
- Make sure that the created file is world readable.
  Finally that submission address needs to be redirected to a script
  running @command{gpg-wks-server}.  The @command{procmail} command can
  be used for this: Redirect the submission address to the user "webkey"
diff --cc g10/keyedit.c
Simple merge
Simple merge