aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/ChangeLog6
-rw-r--r--doc/gpg.sgml18
2 files changed, 20 insertions, 4 deletions
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 1d1346cf2..06008a3aa 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,9 @@
+Wed Feb 9 15:33:44 CET 2000 Werner Koch <[email protected]>
+
+ * gpg.sgml: Describe --ignore-time-conflict.
+
+ * gpg.sgml: Fixed a few typos. Thanks to Holger Trapp.
+
Wed Jan 5 11:51:17 CET 2000 Werner Koch <[email protected]>
* FAQ: Enhanced answer for the 3des-s2k bug.
diff --git a/doc/gpg.sgml b/doc/gpg.sgml
index ec160679b..7a31a9d1e 100644
--- a/doc/gpg.sgml
+++ b/doc/gpg.sgml
@@ -1146,6 +1146,16 @@ and encryption keys.
<varlistentry>
+<term>--ignore-time-conflict</term>
+<listitem><para>
+GnuPG normally checks that the timestamps associated with keys and
+signatures have plausible values. However, sometimes a signature seems to
+be older than the key due to clock problems. This option makes these
+checks just a warning.
+</para></listitem></varlistentry>
+
+
+<varlistentry>
<term>--lock-once</term>
<listitem><para>
Lock the databases the first time a lock is requested
@@ -1305,7 +1315,7 @@ Here the key ID is given in the long form as used by OpenPGP.
<listitem><para>
The best way to specify a key ID is by using the fingerprint of
the key. This avoids any ambiguities in case that there are duplicated
-kez IDs (which are really rare for the long key IDs).
+key IDs (which are really rare for the long key IDs).
</para></listitem>
</varlistentry>
@@ -1348,7 +1358,7 @@ only a number.
<term>*Heine</term>
<listitem><para>
By case insensitive substring matching. This is the default mode but
-applications maz want to explicitely indicate this bz putting the asterisk
+applications may want to explicitely indicate this by putting the asterisk
in front.
</para></listitem>
</varlistentry>
@@ -1507,9 +1517,9 @@ is *very* easy to spy out your passphrase!
On many systems this program should be installed as setuid(root). This
is necessary to lock memory pages. Locking memory pages prevents the
operating system from writing memory pages to disk. If you get no
-warning message about insecure memory then your operating system supports
+warning message about insecure memory 3our operating system supports
locking without being root. The program drops root privileges as soon
-as the locked memory is allocated.
+as locked memory is allocated.
</para>
</refsect1>