aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/gpg-agent.texi2
-rw-r--r--doc/scdaemon.texi7
-rw-r--r--doc/tools.texi18
3 files changed, 26 insertions, 1 deletions
diff --git a/doc/gpg-agent.texi b/doc/gpg-agent.texi
index a886d1534..533c97fd3 100644
--- a/doc/gpg-agent.texi
+++ b/doc/gpg-agent.texi
@@ -501,7 +501,7 @@ checking of some root certificate requirements.
As a special feature a line @code{include-default} will include a global
list of trusted certificates (e.g. @file{/etc/gnupg/trustlist.txt}).
-This global list is also used if the local list ios not available.
+This global list is also used if the local list is not available.
@item sshcontrol
diff --git a/doc/scdaemon.texi b/doc/scdaemon.texi
index 6eb2f1656..f8bab803b 100644
--- a/doc/scdaemon.texi
+++ b/doc/scdaemon.texi
@@ -251,6 +251,13 @@ readers might need a string here; run the program in verbose mode to get
a list of available readers. The default is then the first reader
found.
+To get a list of available CCID readers you may use this command:
+@smallexample
+echo scd getinfo reader_list | gpg-connect-agent --decode | awk '/^D/ @{print $2@}'
+@end smallexample
+
+
+
@item --disable-keypad
@opindex disable-keypad
Even if a card reader features a keypad, do not try to use it.
diff --git a/doc/tools.texi b/doc/tools.texi
index d10b806eb..4187293c6 100644
--- a/doc/tools.texi
+++ b/doc/tools.texi
@@ -955,6 +955,16 @@ When using @option{-S} or @option{--exec}, @command{gpg-connect-agent}
connects to the assuan server in extended mode to allow descriptor
passing. This option makes it use the old mode.
+@item --hex
+@opindex hex
+Print data lines in a hex format and the ASCII representation of
+non-control characters.
+
+@item --decode
+@opindex decode
+Decode data lines. That is to remove percent escapes but make sure that
+a new line always starts with a D and a space.
+
@end table
@mansect control commands
@@ -995,6 +1005,14 @@ input source for other commands.
@item /recvfd
Not yet implemented.
+@item /hex
+@itemx /nohex
+Same as the command line option @option{--hex}.
+
+@item /decode
+@itemx /nodecode
+Same as the command line option @option{--decode}.
+
@item /help
Print a list of available control commands.