aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/ChangeLog4
-rw-r--r--doc/DETAILS1
-rw-r--r--doc/gpg.sgml6
3 files changed, 11 insertions, 0 deletions
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 9e08e41cf..b121f95d3 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,7 @@
+2001-03-13 Werner Koch <[email protected]>
+
+ * gpg.sgml: Described --fixed-list-mode.
+
2001-03-06 Werner Koch <[email protected]>
* gpgv.sgml: Changed some gpg to gpgv. Thanks to John A. Murdie.
diff --git a/doc/DETAILS b/doc/DETAILS
index 731d7c091..98a37029d 100644
--- a/doc/DETAILS
+++ b/doc/DETAILS
@@ -18,6 +18,7 @@ ssb::1536:20:5CE086B5B5A18FF4:1998-07-07:0:::
letter, but be prepared that additional information may follow
in some future versions. (not used for secret keys)
o = Unknown (this key is new to the system)
+ i = The key is invalid (e.g. due to a missing self-signature)
d = The key has been disabled
r = The key has been revoked
e = The key has expired
diff --git a/doc/gpg.sgml b/doc/gpg.sgml
index 67af72bc7..1a8ecf41c 100644
--- a/doc/gpg.sgml
+++ b/doc/gpg.sgml
@@ -1353,6 +1353,12 @@ in future versions.
</para></listitem></varlistentry>
<varlistentry>
+<term>--fixed-list-mode</term>
+<listitem><para>
+Do not merge user ID and primary key in --with-colon listing mode.
+</para></listitem></varlistentry>
+
+<varlistentry>
<term>--list-only</term>
<listitem><para>
Changes the behaviour of some commands. This is like --dry-run but