aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/ChangeLog6
-rw-r--r--doc/gpg-agent.texi16
-rw-r--r--doc/tools.texi2
3 files changed, 16 insertions, 8 deletions
diff --git a/doc/ChangeLog b/doc/ChangeLog
index a876b6bb0..a03b11116 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,9 @@
+2009-06-02 Werner Koch <[email protected]>
+
+ * tools.texi (watchgnupg): Typo fix. Fixes bug#1065.
+
+ * gpg-agent.texi (Agent Commands): Update description of --daemon.
+
2009-05-20 Werner Koch <[email protected]>
* gpg.texi (GPG Configuration Options): Explain new meaning of
diff --git a/doc/gpg-agent.texi b/doc/gpg-agent.texi
index 16dd52197..27946c025 100644
--- a/doc/gpg-agent.texi
+++ b/doc/gpg-agent.texi
@@ -157,15 +157,17 @@ default mode is to create a socket and listen for commands there.
@item --daemon [@var{command line}]
@opindex daemon
-Run the program in the background. This option is required to prevent
-it from being accidently running in the background. A common way to do
-this is:
-@example
-@end example
-$ eval $(gpg-agent --daemon)
+Start the gpg-agent as a daemon; that is, detach it from the console
+and run it in the background. Because @command{gpg-agent} prints out
+important information required for further use, a common way of
+invoking gpg-agent is: @code{eval $(gpg-agent --daemon)} to setup the
+environment variables. The option @option{--write-env-file} is
+another way commonly used to do this. Yet another way is creating
+a new process as a child of gpg-agent: @code{gpg-agent --daemon
+/bin/sh}. This way you get a new shell with the environment setup
+properly; if you exit from this shell, gpg-agent terminates as well.
@end table
-
@mansect options
@node Agent Options
@section Option Summary
diff --git a/doc/tools.texi b/doc/tools.texi
index 506529065..fa794fc2b 100644
--- a/doc/tools.texi
+++ b/doc/tools.texi
@@ -41,7 +41,7 @@ GnuPG comes with a couple of smaller tools:
@end ifset
@mansect description
-Most of the main utilities are able to write there log files to a
+Most of the main utilities are able to write their log files to a
Unix Domain socket if configured that way. @command{watchgnupg} is a simple
listener for such a socket. It ameliorates the output with a time
stamp and makes sure that long lines are not interspersed with log