From 29c83f1c6096d7f8a39c1ec9ad4bae851ea16b0a Mon Sep 17 00:00:00 2001
From: David Shaw <dshaw@jabberwocky.com>
Date: Tue, 26 Nov 2002 04:00:28 +0000
Subject: [PATCH] * gpg.sgml: Document --primary-keyring.  Clarify
 --s2k-cipher-algo, --s2k-digest-algo, --personal-cipher-preferences,
 --personal-digest-preferences, and --personal-compress-preferences.

---
 doc/ChangeLog |  5 +++++
 doc/gpg.sgml  | 20 ++++++++++++++++----
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 0e1ca2427..bf7baa5f1 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,5 +1,10 @@
 2002-11-25  David Shaw  <dshaw@jabberwocky.com>
 
+	* gpg.sgml: Document --primary-keyring.  Clarify
+	--s2k-cipher-algo, --s2k-digest-algo,
+	--personal-cipher-preferences, --personal-digest-preferences, and
+	--personal-compress-preferences.
+
 	* gpg.sgml: Document --sig-policy-url, --cert-policy-url,
 	--sig-notation, --cert-notation.  Clarify --show-notation and
 	--show-policy-url that policy URLs and notations can be used in
diff --git a/doc/gpg.sgml b/doc/gpg.sgml
index 99ec3639e..af06de9c6 100644
--- a/doc/gpg.sgml
+++ b/doc/gpg.sgml
@@ -1257,6 +1257,13 @@ The filename may be prefixed with a scheme:</para>
 Same as --keyring but for the secret keyrings.
 </para></listitem></varlistentry>
 
+<varlistentry>
+<term>--primary-keyring &ParmFile;</term>
+<listitem<para>
+Designate &ParmFile; as the primary public keyring.  This means that
+newly imported keys (via --import or keyserver --recv-from) will go to
+this keyring.
+</para></listitem></varlistentry>
 
 <varlistentry>
 <term>--homedir &ParmDir;</term>
@@ -1593,7 +1600,8 @@ possibly your entire key.
 <listitem><para>
 Use &ParmName; as the cipher algorithm used to protect secret keys.
 The default cipher is CAST5.  This cipher is also used for
-conventional encryption if --cipher-algo is not given.
+conventional encryption if --personal-cipher-preferences and
+--cipher-algo is not given.
 </para></listitem></varlistentry>
 
 
@@ -1601,8 +1609,7 @@ conventional encryption if --cipher-algo is not given.
 <term>--s2k-digest-algo &ParmName;</term>
 <listitem><para>
 Use &ParmName; as the digest algorithm used to mangle the passphrases.
-The default algorithm is SHA-1.  This digest algorithm is also used
-for conventional encryption if --digest-algo is not given.
+The default algorithm is SHA-1.
 </para></listitem></varlistentry>
 
 
@@ -2231,6 +2238,8 @@ Set the list of personal cipher preferences to &ParmString;, this list
 should be a string similar to the one printed by the command "pref" in
 the edit menu.  This allows the user to factor in their own preferred
 algorithms when algorithms are chosen via recipient key preferences.
+The most highly ranked cipher in this list is also used for the
+--symmetric encryption command.
 </para></listitem></varlistentry>
 
 <varlistentry>
@@ -2240,6 +2249,8 @@ Set the list of personal digest preferences to &ParmString;, this list
 should be a string similar to the one printed by the command "pref" in
 the edit menu.  This allows the user to factor in their own preferred
 algorithms when algorithms are chosen via recipient key preferences.
+The most highly ranked digest algorithm in this list is algo used when
+signing without encryption (e.g. --clearsign or --sign).
 </para></listitem></varlistentry>
 
 <varlistentry>
@@ -2249,7 +2260,8 @@ Set the list of personal compression preferences to &ParmString;, this
 list should be a string similar to the one printed by the command
 "pref" in the edit menu.  This allows the user to factor in their own
 preferred algorithms when algorithms are chosen via recipient key
-preferences.
+preferences.  The most highly ranked algorithm in this list is also
+used when there are no recipient keys to consider (e.g. --symmetric).
 </para></listitem></varlistentry>
 
 <varlistentry>