Started to implement the audit log feature.

Pass PINENTRY_USER_DATA and XAUTHORITY to Pinentry.
Improved support for the quality bar.
Minor internal restructuring.
Translation fixes.

3 files changed, 17 insertions, 5 deletions

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 714f22da3..7a455df7a 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,9 @@
+2007-11-15  Werner Koch  <[email protected]>
+
+	* gpg.texi (GPG Configuration): Add PINENTRY_USER_DATA.
+
+	* gpg-agent.texi (Agent Options): Add xauthority.
+
 2007-10-31  Marcus Brinkmann  <[email protected]>
 
 	* gpg-agent.texi (Agent Options): Fix typos, by Bernhard Reiter.
diff --git a/doc/gpg-agent.texi b/doc/gpg-agent.texi
index a882aab1d..3acb17ac8 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-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}).
+option @option{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
@@ -291,7 +291,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
+Tell the pinentry not to grab the keyboard and mouse.  This option
 should in general not be used to avoid X-sniffing attacks.
 
 @item --log-file @var{file}
@@ -422,11 +422,13 @@ default on Windows systems.
 @itemx --ttytype @var{string}
 @itemx --lc-type @var{string}
 @itemx --lc-messages @var{string}
+@itemx --xauthority @var{string}
 @opindex display 
 @opindex ttyname 
 @opindex ttytype 
 @opindex lc-type 
 @opindex lc-messages
+@opindex xauthority
 These options are used with the server mode to pass localization
 information.
 
diff --git a/doc/gpg.texi b/doc/gpg.texi
index 9667417b8..0a1b92ab9 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -2617,6 +2617,10 @@ protocol version which should be set to 1. When starting the gpg-agent
 as described in its documentation, this variable is set to the correct
 value. The option @option{--gpg-agent-info} can be used to override it.
 
+@item PINENTRY_USER_DATA
+This value is passed via gpg-agent to pinentry.  It is useful to convey
+extra information to a custom pinentry
+
 @item COLUMNS
 @itemx LINES
 Used to size some displays to the full size of the screen.