aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/ChangeLog5
-rw-r--r--doc/gpgme.texi12
2 files changed, 11 insertions, 6 deletions
diff --git a/doc/ChangeLog b/doc/ChangeLog
index d1ea9439..638df329 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-12 Marcus Brinkmann <[email protected]>
+
+ * gpgme.texi (Generating Keys): Fix OpenPGP parameters and reference
+ GPG and GPGSM manual.
+
2010-01-05 Werner Koch <[email protected]>
* gpgme.texi (Changing Passphrases): New.
diff --git a/doc/gpgme.texi b/doc/gpgme.texi
index c9bb708f..c2bb3092 100644
--- a/doc/gpgme.texi
+++ b/doc/gpgme.texi
@@ -3294,14 +3294,13 @@ used. GpgSM does not make the fingerprint available.
The argument @var{parms} specifies parameters for the key in an XML
string. The details about the format of @var{parms} are specific to
the crypto engine used by @var{ctx}. Here is an example for GnuPG as
-the crypto engine:
+the crypto engine (all parameters of OpenPGP key generation are
+documented in the GPG manual):
@example
<GnupgKeyParms format="internal">
-Key-Type: DSA
-Key-Length: 1024
-Subkey-Type: ELG-E
-Subkey-Length: 1024
+Key-Type: default
+Subkey-Type: default
Name-Real: Joe Tester
Name-Comment: with stupid passphrase
Name-Email: joe@@foo.bar
@@ -3310,7 +3309,8 @@ Passphrase: abc
</GnupgKeyParms>
@end example
-Here is an example for GpgSM as the crypto engine:
+Here is an example for GpgSM as the crypto engine (all parameters of
+OpenPGP key generation are documented in the GPGSM manual):
@example
<GnupgKeyParms format="internal">