Use estream_asprintf instead of the GNU asprintf.

3 files changed, 14 insertions, 4 deletions

diff --git a/doc/ChangeLog b/doc/ChangeLog
index f2d6b05f2..8811a8824 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,5 +1,11 @@
+2007-05-11  Werner Koch  <wk@g10code.com>
+
+	* gpgsm.texi (--export): Enhanced description.
+
 2007-05-09  Werner Koch  <wk@g10code.com>
 
+	* examples/gpgconf.conf: Remove active example line.
+
 	* Makefile.am (online): Distinguish between released and svn manuals.
 
 2007-05-08  Werner Koch  <wk@g10code.com>
diff --git a/doc/examples/gpgconf.conf b/doc/examples/gpgconf.conf
index c9012137d..f66b6b128 100644
--- a/doc/examples/gpgconf.conf
+++ b/doc/examples/gpgconf.conf
@@ -52,7 +52,5 @@
 #-------------------------------------------------------------------
 
 
-# Deny all users to change the allow-mark-trusted option.
-* gpg-agent allow-mark-trusted [no-change]
 
 
diff --git a/doc/gpgsm.texi b/doc/gpgsm.texi
index 451f09a9c..eed673c43 100644
--- a/doc/gpgsm.texi
+++ b/doc/gpgsm.texi
@@ -228,8 +228,14 @@ Delete the keys matching @var{pattern}.
 @item --export [@var{pattern}]
 @opindex export
 Export all certificates stored in the Keybox or those specified by the
-optional @var{pattern}.  When using along with the @code{--armor} option
-a few informational lines are prepended before each block.
+optional @var{pattern}. Those pattern consist of a list of user ids
+(@pxref{how-to-specify-a-user-id}).  When used along with the
+@option{--armor} option a few informational lines are prepended before
+each block.  There is one limitation: As there is no commonly agreed
+upon way to pack more than one certificate into an ASN.1 structure, the
+binary export (i.e. without using @option{armor}) works only for the
+export of one certificate.  Thus it is required to specify a
+@var{pattern} which yields exactly one certificate.
 
 @item --export-secret-key-p12 @var{key-id}
 @opindex export