3 files changed, 71 insertions, 9 deletions
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 49e8b026f..07f94f338 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,7 @@
+2005-02-24  Werner Koch  <[email protected]>
+
+	* tools.texi (gpg-connect-agent): New.
+
 2005-02-14  Werner Koch  <[email protected]>
 
 	* gpgsm.texi (Certificate Management): Document --import.
diff --git a/doc/gpg-agent.texi b/doc/gpg-agent.texi
index 01b4227c6..17bd59c7a 100644
--- a/doc/gpg-agent.texi
+++ b/doc/gpg-agent.texi
@@ -326,10 +326,8 @@ Ignore requests to change change the current @sc{tty} respective the X
 window system's @code{DISPLAY} variable.  This is useful to lock the
 pinentry to pop up at the @sc{tty} or display you started the agent.
 
-@item --ssh-support
-@itemx --ssh-support
-@opindex ssh-support
-@opindex ssh
+@item --enable-ssh-support
+@opindex enable-ssh-support
 
 Enable emulation of the OpenSSH Agent protocol.
 
@@ -350,13 +348,11 @@ Once, a key has been added to the gpg-agent this way, the gpg-agent
 will be ready to use the key.
 
 Note: in case the gpg-agent receives a signature request, the user
-might need to be prompted for a passphrased, which is necessary for
+might need to be prompted for a passphrase, which is necessary for
 decrypting the stored key.  Since the ssh-agent protocol does not
 contain a mechanism for telling the agent on which display/terminal it
-is running, gpg-agent's --ssh-support switch implies --keep-display
-and --keep-tty.  This strategy causes the gpg-agent to open a pinentry
-on the display or on the terminal, on which it (the gpg-agent) was
-started.
+is running, gpg-agent's ssh-support will use the TTY or X display where
+gpg-agent has been started. 
 
 @end table
 
diff --git a/doc/tools.texi b/doc/tools.texi
index 684975e19..7c963622f 100644
--- a/doc/tools.texi
+++ b/doc/tools.texi
@@ -13,6 +13,7 @@ GnuPG comes with a couple of smaller tools:
 * gpgconf::               Modify .gnupg home directories.
 * gpgsm-gencert.sh::      Generate an X.509 certificate request.
 * gpg-preset-passphrase:: Put a passphrase into the cache.
+* gpg-connect-agent::     Communicate with a running agent.
 @end menu
 
 @c
@@ -665,3 +666,64 @@ for other users.
 
 
 
+
+@c
+@c   GPG-CONNECT-AGENT
+@c
+@node gpg-connect-agent
+@section Communicate with a runnig agent.
+
+The @command{gpg-connect-agent} is a utility to communicate with a
+running @command{gpg-agent}.  It is useful to check out the commands
+gpg-agent provides using the Assuan interface.  It might also be useful
+for scripting simple applications.  Inputis expected at stdin and out
+put gets printed to stdout.
+
+It is very similar to running @command{gpg-agent} in server mode; but
+here we connect to a running instance.
+
+@menu
+* Invoking gpg-connect-agent::   List of all commands and options.
+@end menu
+
+
+@node Invoking gpg-connect-agent
+@subsection List of all commands and options.
+
+@noindent
+@command{gpg-connect-agent} is invoked this way:
+
+@example
+gpg-connect-agent [options]
+@end example
+
+@noindent
+The following options may be used:
+
+@table @gnupgtabopt
+@item -v
+@itemx --verbose
+@opindex verbose
+Output additional information while running.  
+
+@item -q
+@item --quiet
+@opindex q
+@opindex quiet
+Try to be as quiet as possible.
+
+@item --homedir @var{dir}
+@opindex homedir
+Set the name of the home directory to @var{dir}. If his option is not
+used, the home directory defaults to @file{~/.gnupg}.  It is only
+recognized when given on the command line.  It also overrides any home
+directory stated through the environment variable @env{GNUPGHOME} or
+(on W32 systems) by means on the Registry entry
+@var{HKCU\Software\GNU\GnuPG:HomeDir}.
+
+
+@end table
+
+
+
+