From 0317ae66f301cb4ee029eb84378eb932bf6edfb4 Mon Sep 17 00:00:00 2001
From: David Shaw <dshaw@jabberwocky.com>
Date: Thu, 9 Mar 2006 04:00:18 +0000
Subject: * gpg.sgml: Document "notation".

---
 doc/ChangeLog |  4 ++++
 doc/gpg.sgml  | 19 +++++++++++++------
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 626fd6a51..ff567b64b 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,7 @@
+2006-03-08  David Shaw  <dshaw@jabberwocky.com>
+
+	* gpg.sgml: Document "notation".
+
 2006-03-07  David Shaw  <dshaw@jabberwocky.com>
 
 	* gpg.sgml: Rename backsigs to cross-certification (backsigs is
diff --git a/doc/gpg.sgml b/doc/gpg.sgml
index 44877a9f3..050aa6e5e 100644
--- a/doc/gpg.sgml
+++ b/doc/gpg.sgml
@@ -506,9 +506,10 @@ preferences, without including any implied preferences.
     <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,9 +530,15 @@ used by GnuPG.
 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>
-- 
cgit v1.2.3