* gpg.sgml: Minor language tweaks.

* samplekeys.asc: Updated 99242560.

* DETAILS: spk flags are hex.

doc/ChangeLog

@@ -1,3 +1,11 @@
+2004-10-18  David Shaw  <dshaw@jabberwocky.com>
+
+	* gpg.sgml: Minor language tweaks.
+
+	* samplekeys.asc: Updated 99242560.
+
+	* DETAILS: spk flags are hex.
+
 2004-10-15  Werner Koch  <wk@g10code.com>
 
 	* DETAILS: Document IMPORT_CHECK.

doc/DETAILS

@@ -164,9 +164,9 @@ The "tru" trust database records have the fields:
 The "spk" signature subpacket records have the fields:
 
  2: Subpacket number as per RFC-2440 and later.
- 3: Flags.  Currently the only two bits assigned are 1, to indicate
+ 3: Flags in hex.  Currently the only two bits assigned are 1, to
-    that the subpacket came from the hashed part of the signature, and
+    indicate that the subpacket came from the hashed part of the
-    2, to indicate the subpacket was marked critical.
+    signature, and 2, to indicate the subpacket was marked critical.
  4: Length of the subpacket.  Note that this is the length of the
     subpacket, and not the length of field 5 below.  Due to the need
     for %-encoding, the length of field 5 may be up to 3x this value.

doc/gpg.sgml

@@ -520,10 +520,10 @@ will not be used by GnuPG.
     <listitem><para>
 Set a preferred keyserver for the specified user ID(s).  This allows
 other users to know where you prefer they get your key from.  See
---keyserver-option honor-keyserver-url.  Note that some versions of
+--keyserver-option honor-keyserver-url for more on how this works.
-PGP interpret the presence of a keyserver URL as an instruction to
+Note that some versions of PGP interpret the presence of a keyserver
-enable PGP/MIME mail encoding.  Setting a value of "none" removes a
+URL as an instruction to enable PGP/MIME mail encoding.  Setting a
-existing preferred keyserver.
+value of "none" removes a existing preferred keyserver.
 </para></listitem></varlistentry>
     <varlistentry>
     <term>toggle</term>
@@ -1274,10 +1274,11 @@ timeout applies separately to each key retrieval, and not to the
 <varlistentry>
 <term>http-proxy&OptEqualsValue;</term>
 <listitem><para>
-For keyserver schemes that use HTTP (such as HKP), try to access the
+For HTTP-like keyserver schemes that (such as HKP and HTTP itself),
-keyserver over a proxy.  If a &ParmValue; is specified, use this as
+try to access the keyserver over a proxy.  If a &ParmValue; is
-the HTTP proxy.  If no &ParmValue; is specified, try to use the value
+specified, use this as the HTTP proxy.  If no &ParmValue; is
-of the environment variable "http_proxy".
+specified, try to use the value of the environment variable
+"http_proxy".
 </para></listitem></varlistentry>
 
 <varlistentry>
@@ -2513,9 +2514,9 @@ option is not specified, the expiration time is "never".
 <listitem><para>
 Allow the user to do certain nonsensical or "silly" things like
 signing an expired or revoked key, or certain potentially incompatible
-things like generating deprecated key types.  This also disables
+things like generating unusual key types.  This also disables certain
-certain warning messages about potentially incompatible actions.  As
+warning messages about potentially incompatible actions.  As the name
-the name implies, this option is for experts only.  If you don't fully
+implies, this option is for experts only.  If you don't fully
 understand the implications of what it allows you to do, leave this
 off.  --no-expert disables this option.
 </para></listitem></varlistentry>