mirror of
git://git.gnupg.org/gnupg.git
synced 2024-12-21 10:09:57 +01:00
Minor doc updates v2.0 vs. v2.1)
This commit is contained in:
parent
fe8619d29c
commit
663768f9af
4
.gitignore
vendored
4
.gitignore
vendored
@ -46,6 +46,7 @@ common/t-sexputil
|
||||
common/t-sysutils
|
||||
common/t-stringhelp
|
||||
common/t-timestuff
|
||||
common/t-ssh-utils
|
||||
doc/addgnupghome.8
|
||||
doc/applygnupgdefaults.8
|
||||
doc/faq.html
|
||||
@ -129,6 +130,9 @@ tests/private-keys-v1.d/
|
||||
tests/pubring.kbx
|
||||
tests/testdir.stamp
|
||||
tests/trustlist.txt
|
||||
tests/openpgp/*.log
|
||||
tests/openpgp/trustdb.gpg
|
||||
tests/openpgp/z
|
||||
tools/clean-sat
|
||||
tools/gpg-check-pattern
|
||||
tools/gpg-connect-agent
|
||||
|
@ -348,11 +348,13 @@ Allow clients to mark keys as trusted, i.e. put them into the
|
||||
@file{trustlist.txt} file. This is by default not allowed to make it
|
||||
harder for users to inadvertently accept Root-CA keys.
|
||||
|
||||
@ifset gpgtwoone
|
||||
@anchor{option --allow-loopback-pinentry}
|
||||
@item --allow-loopback-pinentry
|
||||
@opindex allow-loopback-pinentry
|
||||
Allow clients to use the loopback pinentry features; see the option
|
||||
@option{pinentry-mode} for details.
|
||||
@end ifset
|
||||
|
||||
@item --ignore-cache-for-signing
|
||||
@opindex ignore-cache-for-signing
|
||||
@ -1332,6 +1334,7 @@ See Assuan command @code{PKSIGN}.
|
||||
This does not need any value. It is used to enable the
|
||||
PINENTRY_LAUNCHED inquiry.
|
||||
|
||||
@ifset gpgtwoone
|
||||
@item pinentry-mode
|
||||
This option is used to change the operation mode of the pinentry. The
|
||||
following values are defined:
|
||||
@ -1355,12 +1358,16 @@ following values are defined:
|
||||
Use the @xref{option --allow-loopback-pinentry}.
|
||||
|
||||
@end table
|
||||
@end ifset
|
||||
|
||||
@ifset gpgtwoone
|
||||
@item cache-ttl-opt-preset
|
||||
This option sets the cache TTL for new entries created by GENKEY and
|
||||
PASSWD commands when using the @option{--preset} option. It it is not
|
||||
used a default value is used.
|
||||
@end ifset
|
||||
|
||||
@ifset gpgtwoone
|
||||
@item s2k-count
|
||||
Instead of using the standard S2K counted (which is computed on the
|
||||
fly), the given S2K count is used for new keys or when changing the
|
||||
@ -1368,6 +1375,7 @@ passphrase of a key. Values below 65536 are considered to be 0. This
|
||||
option is valid for the entire session or until reset to 0. This
|
||||
option is useful if the key is later used on boxes which are either
|
||||
much slower or faster than the actual box.
|
||||
@end ifset
|
||||
|
||||
@end table
|
||||
|
||||
|
@ -165,12 +165,20 @@ use @samp{--help} to get a list of supported operations.
|
||||
@table @gnupgtabopt
|
||||
@item --gen-key
|
||||
@opindex gen-key
|
||||
@ifclear gpgtwoone
|
||||
-This command allows the creation of a certificate signing request. It
|
||||
-is commonly used along with the @option{--output} option to save the
|
||||
-created CSR into a file. If used with the @option{--batch} a parameter
|
||||
-file is used to create the CSR.
|
||||
@end ifclear
|
||||
@ifset gpgtwoone
|
||||
This command allows the creation of a certificate signing request or a
|
||||
self-signed certificate. It is commonly used along with the
|
||||
@option{--output} option to save the created CSR or certificate into a
|
||||
file. If used with the @option{--batch} a parameter file is used to
|
||||
create the CSR or certificate and it is further possible to create
|
||||
non-self-signed certificates.
|
||||
@end ifset
|
||||
|
||||
@item --list-keys
|
||||
@itemx -k
|
||||
@ -955,10 +963,16 @@ this is a missing certificate.
|
||||
@node CSR and certificate creation,,,Unattended Usage
|
||||
@section CSR and certificate creation
|
||||
|
||||
@ifclear gpgtwoone
|
||||
@strong{Please notice}: The immediate creation of certificates is only
|
||||
supported by GnuPG version 2.1 or later. With a 2.0 version you may
|
||||
only create a CSR.
|
||||
@end ifclear
|
||||
|
||||
The command @option{--gen-key} may be used along with the option
|
||||
@option{--batch} to either create a certificate signing request (CSR) or an
|
||||
X.509 certificate. The is controlled by a parameter file; the format
|
||||
of this file is as follows:
|
||||
@option{--batch} to either create a certificate signing request (CSR)
|
||||
or an X.509 certificate. The is controlled by a parameter file; the
|
||||
format of this file is as follows:
|
||||
|
||||
@itemize @bullet
|
||||
@item Text only, line length is limited to about 1000 characters.
|
||||
|
Loading…
x
Reference in New Issue
Block a user