diff options
author | Werner Koch <wk@gnupg.org> | 2017-09-26 12:00:03 +0200 |
---|---|---|
committer | Werner Koch <wk@gnupg.org> | 2017-09-26 12:00:03 +0200 |
commit | cd2d758f3f9e0007ecd6bae9d2ee0d631773e237 (patch) | |
tree | 0e1b9c898d0527969fa953e0f1fc418e610c8da4 /doc/wks.texi | |
parent | g10: Select a secret key by checking availability under gpg-agent. (diff) | |
parent | po: Remove trailing colon from a German pinentry string. (diff) | |
download | gnupg2-cd2d758f3f9e0007ecd6bae9d2ee0d631773e237.tar.xz gnupg2-cd2d758f3f9e0007ecd6bae9d2ee0d631773e237.zip |
Merge branch 'STABLE-BRANCH-2-2' into master
--
Signed-off-by: Werner Koch <wk@gnupg.org>
Conflicts:
NEWS - include release info from 2.2.1
configure.ac - keep master.
Diffstat (limited to 'doc/wks.texi')
-rw-r--r-- | doc/wks.texi | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/doc/wks.texi b/doc/wks.texi index f17497f9b..55dfee6d5 100644 --- a/doc/wks.texi +++ b/doc/wks.texi @@ -78,7 +78,9 @@ the command is a properly formatted mail with all standard headers. This mail can be fed to @command{sendmail(8)} or any other tool to actually send that mail. If @command{sendmail(8)} is installed the option @option{--send} can be used to directly send the created -request. +request. If the provider request a 'mailbox-only' user id and no such +user id is found, @command{gpg-wks-client} will try an additional user +id. The @option{--receive} and @option{--read} commands are used to process confirmation mails as send from the service provider. The |