* gpg.sgml: Minor language tweaks, spell check, copyright date,

etc.

* DETAILS: Note that user IDs/UATs fill in creation and expiration date.
Document namehash.

3 files changed, 28 insertions, 18 deletions

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 628793a90..fd1c1b10b 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,11 @@
+2003-01-14  David Shaw  <[email protected]>
+
+	* gpg.sgml: Minor language tweaks, spell check, copyright date,
+	etc.
+
+	* DETAILS: Note that user IDs/UATs fill in creation and expiration
+	date.  Document namehash.
+
 2003-01-06  David Shaw  <[email protected]>
 
 	* DETAILS: Document disabled flag in capabilities field.
diff --git a/doc/DETAILS b/doc/DETAILS
index 2612afdd5..bcc975d6c 100644
--- a/doc/DETAILS
+++ b/doc/DETAILS
@@ -62,10 +62,13 @@ record.
 		       17 = DSA (sometimes called DH, sign only)
 		       20 = ElGamal (sign and encrypt)
 	    (for other id's see include/cipher.h)
- 5. Field:  KeyID either of 
- 6. Field:  Creation Date (in UTC)
- 7. Field:  Key expiration date or empty if none.
- 8. Field:  Used for serial number in crt records (used to be the Local-ID)
+ 5. Field:  KeyID
+ 6. Field:  Creation Date (in UTC).  For UID and UAT records, this is the
+            self-signature date.
+ 7. Field:  Key or user ID/user attribute expiration date or empty if none.
+ 8. Field:  Used for serial number in crt records (used to be the Local-ID).
+            For UID and UAT records, this is the namehash: a RIPEMD/160 hash
+            of the user ID contents.
  9. Field:  Ownertrust (primary public keys only)
 	    This is a single letter, but be prepared that additional
 	    information may follow in some future versions.
diff --git a/doc/gpg.sgml b/doc/gpg.sgml
index 9f7650ae1..de1724aff 100644
--- a/doc/gpg.sgml
+++ b/doc/gpg.sgml
@@ -1,5 +1,5 @@
 <!-- gpg.sgml - the man page for GnuPG
-    Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+    Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 
     This file is part of GnuPG.
 
@@ -334,8 +334,8 @@ trust-db immediately and no save is required.</para></listitem></varlistentry>
     <term>disable</term>
     <term>enable</term>
     <listitem><para>
-Disable or enable an entire key. A disabled key can normally not be used
-for encryption.</para></listitem></varlistentry>
+Disable or enable an entire key. A disabled key can not normally be
+used for encryption.</para></listitem></varlistentry>
     <varlistentry>
     <term>adduid</term>
     <listitem><para>
@@ -530,7 +530,7 @@ a subkey or a signature, use the --edit command.
 <term>--desig-revoke</term>
 <listitem><para>
 Generate a designated revocation certificate for a key.  This allows a
-user (with the permission of the keyholder) to revoke someone elses
+user (with the permission of the keyholder) to revoke someone else's
 key.
 </para></listitem></varlistentry>
 
@@ -761,19 +761,18 @@ Write output to &ParmFile;.
 </para></listitem></varlistentry>
 
 <varlistentry>
-<term>--no-mangle-dos-filenames</term>
 <term>--mangle-dos-filenames</term>
+<term>--no-mangle-dos-filenames</term>
 <listitem><para>
-The Windows version of GPG replaces the extension of an output
+The Windows version of GnuPG replaces the extension of an output
 filename to avoid problems with filenames containing more than one
-dot. This is not necessary for newer Windows version and such
---no-mangle-dos-filenames can be used to switch this feature off and 
-have GPG append the new extension.   This otion has no effect on
-non-windows platforms.
+dot.  This is not necessary for newer Windows versions and so
+--no-mangle-dos-filenames can be used to switch this feature off and
+have GnuPG append the new extension.  This option has no effect on
+non-Windows platforms.
 </para></listitem></varlistentry>
 
 
-
 <varlistentry>
 <term>-u, --local-user &ParmName;</term>
 <listitem><para>
@@ -2121,8 +2120,8 @@ in future versions.
 <varlistentry>
 <term>--fixed-list-mode</term>
 <listitem><para>
-Do not merge user ID and primary key in --with-colon listing mode and
-print all timestamps as seconds since 1970-01-01.
+Do not merge primary user ID and primary key in --with-colon listing
+mode and print all timestamps as seconds since 1970-01-01.
 </para></listitem></varlistentry>
 
 <varlistentry>
@@ -2261,7 +2260,7 @@ Experimental use only.
 <term>--group &ParmNameValues;</term>
 <listitem><para>
 Sets up a named group, which is similar to aliases in email programs.
-Any time the group name is a receipient (-r or --recipient), it will
+Any time the group name is a recipient (-r or --recipient), it will
 be expanded to the values specified.
 </para><para>
 The values are &ParmKeyIDs; or fingerprints, but any key description