5 files changed, 54 insertions, 8 deletions
diff --git a/doc/dirmngr.texi b/doc/dirmngr.texi
index 8e0979c3e..0bf35b72f 100644
--- a/doc/dirmngr.texi
+++ b/doc/dirmngr.texi
@@ -167,6 +167,14 @@ Append all logging output to @var{file}.  This is very helpful in
 seeing what the agent actually does.  Use @file{socket://} to log to
 socket.
 
+@item --compatibility-flags @var{flags}
+@opindex compatibility-flags
+Set compatibility flags to work around certain problems or to emulate
+bugs.  The @var{flags} are given as a comma separated list of flag
+names and are OR-ed together.  The special flag "none" clears the list
+and allows to start over with an empty list.  To get a list of
+available flags the sole word "help" can be used.
+
 @item --debug-level @var{level}
 @opindex debug-level
 Select the debug level for investigating problems.  @var{level} may be a
@@ -590,6 +598,15 @@ won't be rejected due to an unknown critical extension.  Use this
 option with care because extensions are usually flagged as critical
 for a reason.
 
+@item --ignore-crl-extension @var{oid}
+@opindex ignore-crl-extension
+Add @var{oid} to the list of ignored CRL extensions.  The @var{oid} is
+expected to be in dotted decimal form.  Critical flagged CRL
+extensions matching one of the OIDs in the list are treated as if they
+are actually handled and thus the certificate won't be rejected due to
+an unknown critical extension.  Use this option with care because
+extensions are usually flagged as critical for a reason.
+
 @item --ignore-cert @var{fpr}|@var{file}
 @opindex ignore-cert
 Entirely ignore certificates with the fingerprint @var{fpr}.  As an
diff --git a/doc/gpg.texi b/doc/gpg.texi
index 6b584a913..15b3243d0 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -1675,24 +1675,29 @@ prevent the creation of a @file{~/.gnupg} homedir.
 @item -z @var{n}
 @itemx --compress-level @var{n}
 @itemx --bzip2-compress-level @var{n}
+@itemx --no-compress
 @opindex compress-level
 @opindex bzip2-compress-level
+@opindex no-compress
 Set compression level to @var{n} for the ZIP and ZLIB compression
 algorithms. The default is to use the default compression level of zlib
 (normally 6). @option{--bzip2-compress-level} sets the compression level
 for the BZIP2 compression algorithm (defaulting to 6 as well). This is a
 different option from @option{--compress-level} since BZIP2 uses a
 significant amount of memory for each additional compression level.
-@option{-z} sets both. A value of 0 for @var{n} disables compression.
-A value of -1 forces compression using the default level.
+
+Option @option{-z} sets both. A value of 0 for @var{n} disables
+compression.  A value of -1 forces compression using the default
+level.  Option @option{--no-compress} is identical to @option{-z0}.
 
 Except for the @option{--store} command compression is always used
 unless @command{gpg} detects that the input is already compressed.  To
-inhibit the use of compression use @option{-z0}; to force compression
-use @option{-z-1} or option @option{z} with another compression level
-than the default as indicated by -1.  Note that this overriding of the
-default deection works only with @option{z} and not with the long
-variant of this option.
+inhibit the use of compression use @option{-z0} or
+@option{--no-compress}; to force compression use @option{-z-1} or
+option @option{z} with another compression level than the default as
+indicated by -1.  Note that this overriding of the default deection
+works only with @option{z} and not with the long variant of this
+option.
 
 
 @item --bzip2-decompress-lowmem
@@ -2671,6 +2676,12 @@ The available properties are:
   created.  The second is the same but given as an ISO string,
   e.g. "2016-08-17". (drop-subkey)
 
+  @item key_expires
+  @itemx key_expires_d
+  The expiration time of a public key or subkey or 0 if it does not
+  expire.  The second is the same but given as an ISO date string or
+  an empty string e.g. "2038-01-19".
+
   @item fpr
   The hexified fingerprint of the current subkey or primary key.
   (drop-subkey)
diff --git a/doc/gpgsm.texi b/doc/gpgsm.texi
index 11c5c1962..e976767f6 100644
--- a/doc/gpgsm.texi
+++ b/doc/gpgsm.texi
@@ -554,6 +554,13 @@ Assume the input data is plain base-64 encoded.
 @opindex assume-binary
 Assume the input data is binary encoded.
 
+@item --input-size-hint @var{n}
+@opindex input-size-hint
+This option can be used to tell GPGSM the size of the input data in
+bytes.  @var{n} must be a positive base-10 number.  It is used by the
+@option{--status-fd} line ``PROGRESS'' to provide a value for
+``total'' if that is not available by other means.
+
 @anchor{option --p12-charset}
 @item --p12-charset @var{name}
 @opindex p12-charset
@@ -1721,6 +1728,9 @@ If @var{value} is true or @var{value} is not given all network access
 is disabled for this session.  This is the same as the command line
 option @option{--disable-dirmngr}.
 
+@item input-size-hint
+This is the same as the @option{--input-size-hint} command line option.
+
 @end table
 
 @mansect see also
diff --git a/doc/tools.texi b/doc/tools.texi
index 5fa21c66a..eefa4f9d6 100644
--- a/doc/tools.texi
+++ b/doc/tools.texi
@@ -2049,6 +2049,12 @@ default is to take the directory name from the input filename.  If no
 input filename is known a directory named @file{GPGARCH} is used.
 This option is deprecated in favor of option @option{--directory}.
 
+@item --no-compress
+@opindex no-compress
+This option tells gpg to disable compression (i.e. using option -z0).
+It is useful for archiving only large files which are are already
+compressed (e.g. a set of videos).
+
 @item --gpg @var{gpgcmd}
 @opindex gpg
 Use the specified command @var{gpgcmd} instead of @command{gpg}.
diff --git a/doc/wks.texi b/doc/wks.texi
index 39e345f15..26d8b96f6 100644
--- a/doc/wks.texi
+++ b/doc/wks.texi
@@ -216,12 +216,14 @@ addrspec, e.g. "postel@@isi.edu") per line.  Empty lines and lines
 starting with a '#' are ignored.
 
 @item --add-revocs
+@itemx --no-add-revocs
 @opindex add-revocs
+@opindex no-add-revocs
 If enabled append revocation certificates for the same addrspec as
 used in the WKD to the key.  Modern gpg version are able to import and
 apply them for existing keys.  Note that when used with the
 @option{--mirror} command the revocation are searched in the local
-keyring and not in an LDAP directory.
+keyring and not in an LDAP directory.  The default is @option{--add-revocs}.
 
 @item --verbose
 @opindex verbose