mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-03 22:56:33 +02:00
Merge branch 'STABLE-BRANCH-2-2' into master
This commit is contained in:
commit
d4dc4245bf
36 changed files with 516 additions and 135 deletions
|
@ -765,6 +765,15 @@ are:
|
|||
Pinentry the user is not prompted again if he enters a bad password.
|
||||
@end table
|
||||
|
||||
@item --request-origin @var{origin}
|
||||
@opindex request-origin
|
||||
Tell gpgsm to assume that the operation ultimately originated at
|
||||
@var{origin}. Depending on the origin certain restrictions are applied
|
||||
and the Pinentry may include an extra note on the origin. Supported
|
||||
values for @var{origin} are: @code{local} which is the default,
|
||||
@code{remote} to indicate a remote origin or @code{browser} for an
|
||||
operation requested by a web browser.
|
||||
|
||||
@item --no-common-certs-import
|
||||
@opindex no-common-certs-import
|
||||
Suppress the import of common certificates on keybox creation.
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue