aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/ChangeLog5
-rw-r--r--doc/glossary.texi5
-rw-r--r--doc/gpg-agent.texi8
-rw-r--r--doc/gpgsm.texi5
4 files changed, 15 insertions, 8 deletions
diff --git a/doc/ChangeLog b/doc/ChangeLog
index a87680b2b..27546e08f 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,8 @@
+2007-06-21 Werner Koch <[email protected]>
+
+ * gpgsm.texi (Certificate Management): Changed description of
+ --gen-key.
+
2007-06-19 Werner Koch <[email protected]>
* glossary.texi (Glossary): Describe PSE.
diff --git a/doc/glossary.texi b/doc/glossary.texi
index 6eede19d2..22bd7adc5 100644
--- a/doc/glossary.texi
+++ b/doc/glossary.texi
@@ -16,6 +16,11 @@ certificates.
The @emph{Certificate Revocation List} is a list containing
certificates revoked by the issuer.
+@item CSR
+ The @emph{Certificate Signing Request} is a message send to a CA to
+ask them to issue a new certificate. The data format of such a signing
+request is called PCKS#10.
+
@item Keygrip
This term is used by GnuPG to describe a 20 byte hash value used
to identify a certain key without referencing to a concrete protocol.
diff --git a/doc/gpg-agent.texi b/doc/gpg-agent.texi
index 85ce1acd4..e9ef3a9e9 100644
--- a/doc/gpg-agent.texi
+++ b/doc/gpg-agent.texi
@@ -369,20 +369,16 @@ this option at runtime does not kill an already forked scdaemon.
@item --use-standard-socket
@itemx --no-use-standard-socket
-@itemx --no-reuse-standard-socket
@opindex use-standard-socket
@opindex no-use-standard-socket
-@opindex no-reuse-standard-socket
By enabling this option @command{gpg-agent} will listen on the socket
named @file{S.gpg-agent}, located in the home directory, and not create
a random socket below a temporary directory. Tools connecting to
@command{gpg-agent} should first try to connect to the socket given in
environment variable @var{GPG_AGENT_INFO} and the fall back to this
socket. This option may not be used if the home directory is mounted as
-a remote file system. If @option{--no-reuse-standard-socket} is used,
-@command{gpg-agent} will not try to reuse a socket which is already in
-use. Note, that @option{--use-standard-socket} is the default on
-Windows systems.
+a remote file system. Note, that @option{--use-standard-socket} is the
+default on Windows systems.
@item --display @var{string}
diff --git a/doc/gpgsm.texi b/doc/gpgsm.texi
index 69a7f10d7..b318ab877 100644
--- a/doc/gpgsm.texi
+++ b/doc/gpgsm.texi
@@ -164,8 +164,9 @@ use @samp{--help} to get a list of supported operations.
@table @gnupgtabopt
@item --gen-key
@opindex gen-key
-This command will only print an error message and direct the user to the
-@command{gpgsm-gencert.sh} script.
+This command allows the interactive creation of a certifcate signing
+request. It is commonly used along with the @option{--output} option to
+save the created CSR into a file.
@item --list-keys
@itemx -k