aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcus Brinkmann <[email protected]>2003-05-27 05:41:43 +0000
committerMarcus Brinkmann <[email protected]>2003-05-27 05:41:43 +0000
commit569509758a754c7c76ee2f278c8d0adce5488ec0 (patch)
tree0a1c6ba5cb803624ca8e6f58edbac6481881e1f0
parent2003-05-27 Marcus Brinkmann <[email protected]> (diff)
downloadgpgme-569509758a754c7c76ee2f278c8d0adce5488ec0.tar.gz
gpgme-569509758a754c7c76ee2f278c8d0adce5488ec0.zip
2003-05-27 Marcus Brinkmann <[email protected]>
* gpgme.texi (Protocol Selection): Do not use @acronym in @node because that breaks texi2dvi.
-rw-r--r--doc/ChangeLog3
-rw-r--r--doc/gpgme.texi5
2 files changed, 6 insertions, 2 deletions
diff --git a/doc/ChangeLog b/doc/ChangeLog
index bc4abc02..0f4545cd 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,5 +1,8 @@
2003-05-27 Marcus Brinkmann <[email protected]>
+ * gpgme.texi (Protocol Selection): Do not use @acronym in @node
+ because that breaks texi2dvi.
+
* gpgme.texi (Passphrase Callback): Document new prototype.
2003-05-18 Marcus Brinkmann <[email protected]>
diff --git a/doc/gpgme.texi b/doc/gpgme.texi
index ef4896cc..eb838be0 100644
--- a/doc/gpgme.texi
+++ b/doc/gpgme.texi
@@ -1538,7 +1538,8 @@ The function @code{gpgme_get_protocol} retrieves the protocol currently
use with the context @var{ctx}.
@end deftypefun
-@node @acronym{ASCII} Armor
+@c FIXME: Unfortunately, using @acronym here breaks texi2dvi.
+@node ASCII Armor
@subsection @acronym{ASCII} Armor
@cindex context, armor mode
@cindex @acronym{ASCII} armor
@@ -2681,7 +2682,7 @@ data buffer.
@deftypefun gpgme_error_t gpgme_op_import (@w{gpgme_ctx_t @var{ctx}}, @w{gpgme_data_t @var{keydata}})
The function @code{gpgme_op_import} adds the keys in the data buffer
@var{keydata} to the key ring of the crypto engine used by @var{ctx}.
-The format of @var{keydata} can be @var{ASCII} armored, for example,
+The format of @var{keydata} can be @acronym{ASCII} armored, for example,
but the details are specific to the crypto engine.
After the operation completed successfully, the result can be