aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--doc/ChangeLog4
-rw-r--r--doc/DETAILS5
-rw-r--r--doc/gpg.sgml11
3 files changed, 18 insertions, 2 deletions
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 3667faa36..1ed8ca0e5 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,7 @@
+2005-07-19 Werner Koch <[email protected]>
+
+ * gpg.sgml: Document --limit-card-insert-tries.
+
2005-07-18 David Shaw <[email protected]>
* samplekeys.asc: Update 99242560.
diff --git a/doc/DETAILS b/doc/DETAILS
index 67dd57ca9..01083eed0 100644
--- a/doc/DETAILS
+++ b/doc/DETAILS
@@ -553,13 +553,14 @@ more arguments in future versions.
5 = No card reader available
- PLAINTEXT <format> <timestamp>
+ PLAINTEXT <format> <timestamp> <filename>
This indicates the format of the plaintext that is about to be
written. The format is a 1 byte hex code that shows the
format of the plaintext: 62 ('b') is binary data, 74 ('t') is
text data with no character set specified, and 75 ('u') is
text data encoded in the UTF-8 character set. The timestamp
- is in seconds since the epoch.
+ is in seconds since the epoch. If a filename is available it
+ gets printed as the third argument, percent-escaped as usual.
PLAINTEXT_LENGTH <length>
This indicates the length of the plaintext that is about to be
diff --git a/doc/gpg.sgml b/doc/gpg.sgml
index 3cf4da293..8517e8182 100644
--- a/doc/gpg.sgml
+++ b/doc/gpg.sgml
@@ -2483,6 +2483,17 @@ option may lead to data and key corruption.
</para></listitem></varlistentry>
<varlistentry>
+<term>--limit-card-insert-tries &ParmN;</term>
+<listitem><para>
+With &ParmN; greater than 0 the number of prompts asking to insert a
+smartcard gets limited to N-1. Thus with a value of 1 gpg won't at
+all ask to insert a card if none has been inserted at startup. This
+option is useful in the configuration file in case an application does
+not know about the smartcard support and waits ad infinitum for an
+inserted card.
+</para></listitem></varlistentry>
+
+<varlistentry>
<term>--no-random-seed-file</term>
<listitem><para>
GnuPG uses a file to store its internal random pool over invocations.