[svn] GnuPG - r4055 - trunk/doc

[svn author dshaw]

Author: dshaw
Date: 2006-03-09 05:00:18 +0100 (Thu, 09 Mar 2006)
New Revision: 4055

Modified:
   trunk/doc/ChangeLog
   trunk/doc/gpg.sgml
Log:
* gpg.sgml: Document "notation".


Modified: trunk/doc/ChangeLog
===================================================================
--- trunk/doc/ChangeLog	2006-03-09 03:49:39 UTC (rev 4054)
+++ trunk/doc/ChangeLog	2006-03-09 04:00:18 UTC (rev 4055)
@@ -1,3 +1,7 @@
+2006-03-08  David Shaw  <dshaw at jabberwocky.com>
+
+	* gpg.sgml: Document "notation".
+
 2006-03-07  David Shaw  <dshaw at jabberwocky.com>
 
 	* gpg.sgml: Rename backsigs to cross-certification (backsigs is

Modified: trunk/doc/gpg.sgml
===================================================================
--- trunk/doc/gpg.sgml	2006-03-09 03:49:39 UTC (rev 4054)
+++ trunk/doc/gpg.sgml	2006-03-09 04:00:18 UTC (rev 4055)
@@ -506,9 +506,10 @@
     <term>showpref</term>
     <listitem><para>
 More verbose preferences listing for the selected user ID.  This shows
-the preferences in effect by including the implied preferences of
-3DES (cipher), SHA-1 (digest), and Uncompressed (compression) if they
-are not already included in the preference list.
+the preferences in effect by including the implied preferences of 3DES
+(cipher), SHA-1 (digest), and Uncompressed (compression) if they are
+not already included in the preference list.  In addition, the
+preferred keyserver and signature notations (if any) are shown.
 </para></listitem></varlistentry>
     <varlistentry>
     <term>setpref &ParmString;</term>
@@ -529,11 +530,17 @@
 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-options honor-keyserver-url for more on how this works.
-Note that some versions of PGP interpret the presence of a keyserver
-URL as an instruction to enable PGP/MIME mail encoding.  Setting a
-value of "none" removes a existing preferred keyserver.
+Setting a value of "none" removes an existing preferred keyserver.
 </para></listitem></varlistentry>
     <varlistentry>
+    <term>notation</term>
+    <listitem><para>
+Set a name=value notation for the specified user ID(s).  See
+--cert-notation for more on how this works.  Setting a value of "none"
+removes all notations, and setting a name with no value removes that
+notation alone.
+</para></listitem></varlistentry>
+    <varlistentry>
     <term>toggle</term>
     <listitem><para>
 Toggle between public and secret key listing.</para></listitem></varlistentry>