aboutsummaryrefslogtreecommitdiffstats
path: root/doc/gpg-agent.texi
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--doc/gpg-agent.texi15
1 files changed, 9 insertions, 6 deletions
diff --git a/doc/gpg-agent.texi b/doc/gpg-agent.texi
index 793d093a1..fbab7a17e 100644
--- a/doc/gpg-agent.texi
+++ b/doc/gpg-agent.texi
@@ -118,7 +118,9 @@ $ eval `gpg-agent --daemon`
@item --options @var{file}
@opindex options
Reads configuration from @var{file} instead of from the default
-per-user configuration file.
+per-user configuration file. The default configuration file is named
+@file{gpg-agent.conf} and expected in the @file{.gnupg} directory directly
+below the home directory of the user.
@item -v
@item --verbose
@@ -224,15 +226,16 @@ control this behaviour but this command line option takes precedence.
Set the time a cache entry is valid to @var{n} seconds. The default are
600 seconds.
-@item --pinentry-program @var{path}
+@item --pinentry-program @var{filename}
@opindex pinentry-program
-Use program @var{path} as the PIN entry. The default is installation
+Use program @var{filename} as the PIN entry. The default is installation
dependend and can be shown with the @code{--version} command.
-@item --scdaemon-program @var{path}
+@item --scdaemon-program @var{filename}
@opindex scdaemon-program
-Use program @var{path} as the Smartcard daemon. The default is installation
-dependend and can be shown with the @code{--version} command.
+Use program @var{filename} as the Smartcard daemon. The default is
+installation dependend and can be shown with the @code{--version}
+command.
@item --display @var{string}