summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcus Brinkmann <mb@g10code.com>2007-10-31 14:09:16 +0100
committerMarcus Brinkmann <mb@g10code.com>2007-10-31 14:09:16 +0100
commit659025112cad20e9fc9688bb722ca6676162907d (patch)
tree6e99d711bb4f50a47e542e63bde75524188cfdf6
parent* gpg.texi: Document --rfc4880 (the new --openpgp). (diff)
downloadgnupg2-659025112cad20e9fc9688bb722ca6676162907d.tar.xz
gnupg2-659025112cad20e9fc9688bb722ca6676162907d.zip
2007-10-31 Marcus Brinkmann <marcus@g10code.de>
* gpg-agent.texi (Agent Options): Fix typos, by Bernhard Reiter.
-rw-r--r--doc/ChangeLog4
-rw-r--r--doc/gpg-agent.texi10
2 files changed, 9 insertions, 5 deletions
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 08f44f6cd..714f22da3 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,7 @@
+2007-10-31 Marcus Brinkmann <marcus@g10code.de>
+
+ * gpg-agent.texi (Agent Options): Fix typos, by Bernhard Reiter.
+
2007-10-27 David Shaw <dshaw@jabberwocky.com>
* gpg.texi: Document --rfc4880 (the new --openpgp).
diff --git a/doc/gpg-agent.texi b/doc/gpg-agent.texi
index 0dbf9ad39..a882aab1d 100644
--- a/doc/gpg-agent.texi
+++ b/doc/gpg-agent.texi
@@ -94,10 +94,10 @@ required.
Please make sure that a proper pinentry program has been installed
under the default filename (which is system dependant) or use the
-option @code{pinentry-pgm} to specify the full name of that program.
-It is often useful to install a symbolic link from the actual used
-pinentry (e.g. @file{/usr/bin/pinentry-gtk}) to the expected
-one (e.g. @file{/usr/bin/pinentry}).
+option @code{pinentry-program} to specify the full name of that
+program. It is often useful to install a symbolic link from the
+actual used pinentry (e.g. @file{/usr/bin/pinentry-gtk}) to the
+expected one (e.g. @file{/usr/bin/pinentry}).
@manpause
@noindent
@@ -292,7 +292,7 @@ eval `cut -d= -f 1 < @var{file} | xargs echo export`
@item --no-grab
@opindex no-grab
Tell the pinentryo not to grab the keyboard and mouse. This option
-should in general not be used to avaoid X-sniffing attacks.
+should in general not be used to avoid X-sniffing attacks.
@item --log-file @var{file}
@opindex log-file