Described new options

3 files changed, 76 insertions, 5 deletions

diff --git a/doc/gpg-agent.texi b/doc/gpg-agent.texi
index fbab7a17e..92975fd11 100644
--- a/doc/gpg-agent.texi
+++ b/doc/gpg-agent.texi
@@ -146,11 +146,34 @@ This option is only useful for testing; it sets the system time back or
 forth to @var{epoch} which is the number of seconds elapsed since the year
 1970.
 
+@item --debug-level @var{level}
+@opindex debug-level
+Select the debug level for investigating problems. @var{level} may be
+one of:
+
+   @table @code
+   @item none
+   no debugging at all.
+   @item basic  
+   some basic debug messages
+   @item advanced
+   more verbose debug messages
+   @item expert
+   even more detailed messages
+   @item guru
+   all of the debug messages you can get
+   @end table
+
+How these messages are mapped to the actual debugging flags is not
+specified and may change with newer releaes of this program. They are
+however carefully selected to best aid in debugging.
+
 @item --debug @var{flags}
 @opindex debug
 This option is only useful for debugging and the behaviour may change at
 any time without notice.  FLAGS are bit encoded and may be given in
 usual C-Syntax. The currently defined bits are:
+
    @table @code
    @item 0  (1)
    X.509 or OpenPGP protocol related data
diff --git a/doc/gpgsm.texi b/doc/gpgsm.texi
index bf0e071b8..10d487f82 100644
--- a/doc/gpgsm.texi
+++ b/doc/gpgsm.texi
@@ -343,11 +343,35 @@ This option is only useful for testing; it sets the system time back or
 forth to @var{epoch} which is the number of seconds elapsed since the year
 1970.
 
+@item --debug-level @var{level}
+@opindex debug-level
+Select the debug level for investigating problems. @var{level} may be
+one of:
+
+   @table @code
+   @item none
+   no debugging at all.
+   @item basic  
+   some basic debug messages
+   @item advanced
+   more verbose debug messages
+   @item expert
+   even more detailed messages
+   @item guru
+   all of the debug messages you can get
+   @end table
+
+How these messages are mapped to the actual debugging flags is not
+specified and may change with newer releaes of this program. They are
+however carefully selected to best aid in debugging.
+
 @item --debug @var{flags}
 @opindex debug
-This option is only useful for debugging and the behaviour may change at
-any time without notice.  FLAGS are bit encoded and may be given in
-usual C-Syntax. The currently defined bits are:
+This option is only useful for debugging and the behaviour may change
+at any time without notice; using @code{--debug-levels} is the
+preferred method to select the debug verbosity.  FLAGS are bit encoded
+and may be given in usual C-Syntax. The currently defined bits are:
+
    @table @code
    @item 0  (1)
    X.509 or OpenPGP protocol related data
@@ -365,10 +389,11 @@ usual C-Syntax. The currently defined bits are:
    write hashed data to files named @code{dbgmd-000*}
    @item 10 (1024)
    trace Assuan protocol
-   @item 12 (4096)
-   bypass all certificate validation
    @end table
 
+Note, that all flags set using this option may get overriden by
+@code{--debug-level}.
+
 @item --debug-all
 @opindex debug-all
 Same as @code{--debug=0xffffffff}
diff --git a/doc/scdaemon.texi b/doc/scdaemon.texi
index 5a5a1af6a..51ec4b34c 100644
--- a/doc/scdaemon.texi
+++ b/doc/scdaemon.texi
@@ -88,11 +88,34 @@ Outputs additional information while running.
 You can increase the verbosity by giving several
 verbose commands to @sc{gpgsm}, such as @samp{-vv}.
 
+@item --debug-level @var{level}
+@opindex debug-level
+Select the debug level for investigating problems. @var{level} may be
+one of:
+
+   @table @code
+   @item none
+   no debugging at all.
+   @item basic  
+   some basic debug messages
+   @item advanced
+   more verbose debug messages
+   @item expert
+   even more detailed messages
+   @item guru
+   all of the debug messages you can get
+   @end table
+
+How these messages are mapped to the actual debugging flags is not
+specified and may change with newer releaes of this program. They are
+however carefully selected to best aid in debugging.
+
 @item --debug @var{flags}
 @opindex debug
 This option is only useful for debugging and the behaviour may change at
 any time without notice.  FLAGS are bit encoded and may be given in
 usual C-Syntax. The currently defined bits are:
+
    @table @code
    @item 0  (1)
    X.509 or OpenPGP protocol related data