From a2dcc1471020a01f6051efc6aeee8e43096a5ba6 Mon Sep 17 00:00:00 2001
From: David Shaw <dshaw@jabberwocky.com>
Date: Wed, 8 May 2002 03:38:35 +0000
Subject: * gpg.sgml: Add entries for --sk-comments, --no-sk-comments, --pgp7,
 and --no-pgp7.  Fix --pgp2 and --pgp6: the proper name is --escape-from-lines
 and not --escape-from.

---
 doc/ChangeLog |  6 ++++++
 doc/gpg.sgml  | 37 ++++++++++++++++++++++++++++++++-----
 2 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 4a9c4bf28..513d54f2e 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,9 @@
+2002-05-07  David Shaw  <dshaw@jabberwocky.com>
+
+	* gpg.sgml: Add entries for --sk-comments, --no-sk-comments,
+	--pgp7, and --no-pgp7.  Fix --pgp2 and --pgp6: the proper name is
+	--escape-from-lines and not --escape-from.
+
 2002-04-30  Timo Schulz  <ts@winpt.org>
 
 	* gpg.sgml: Add an entry for --encrypt-files and --decrypt-files.
diff --git a/doc/gpg.sgml b/doc/gpg.sgml
index ecf6aa422..dfda887df 100644
--- a/doc/gpg.sgml
+++ b/doc/gpg.sgml
@@ -1171,12 +1171,25 @@ Write log output to file descriptor &ParmN; and not to stderr.
 </para></listitem></varlistentry>
 
 
+<varlistentry>
+<term>--sk-comments</term>
+<listitem><para>
+Include secret key comment packets when exporting secret keys.  This
+is a GnuPG extension to the OpenPGP standard, and is off by default.
+Please note that this has nothing to do with the comments in clear
+text signatures or armor headers.
+</para></listitem></varlistentry>
+
+<varlistentry>
+<term>--no-sk-comments</term>
+<listitem><para>
+Resets the --sk-comments option.
+</para></listitem></varlistentry>
+
 <varlistentry>
 <term>--no-comment</term>
 <listitem><para>
-Do not write comment packets.  This option affects only
-the generation of secret keys.	Please note, that this has nothing
-to do with the comments in clear text signatures.
+See --sk-comments.  This option is deprecated and may be removed soon.
 </para></listitem></varlistentry>
 
 
@@ -1531,7 +1544,7 @@ a message that PGP 2.x will not be able to handle.  Note that `PGP
 available, but the MIT release is a good common baseline.
 </para><para>
 This option implies `--rfc1991 --no-openpgp --disable-mdc
---no-force-v4-certs --no-comment --escape-from --force-v3-sigs
+--no-force-v4-certs --no-comment --escape-from-lines --force-v3-sigs
 --no-ask-sig-expire --no-ask-cert-expire --cipher-algo IDEA
 --digest-algo MD5 --compress-algo 1'
 </para></listitem></varlistentry>
@@ -1552,7 +1565,7 @@ compression algorithms none and ZIP.  This also disables making
 signatures with signing subkeys as PGP 6 does not understand
 signatures made by signing subkeys.
 </para><para>
-This option implies `--disable-mdc --no-comment --escape-from
+This option implies `--disable-mdc --no-comment --escape-from-lines
 --force-v3-sigs --no-ask-sig-expire --compress-algo 1'
 </para></listitem></varlistentry>
 
@@ -1562,6 +1575,20 @@ This option implies `--disable-mdc --no-comment --escape-from
 Resets the --pgp6 option.
 </para></listitem></varlistentry>
 
+<varlistentry>
+<term>--pgp7</term>
+<listitem><para>
+Set up all options to be as PGP 7 compliant as possible.  This is
+identical to --pgp6 except that the list of allowable ciphers is
+expanded to add AES128, AES192, AES256, and TWOFISH.
+</para></listitem></varlistentry>
+
+<varlistentry>
+<term>--no-pgp7</term>
+<listitem><para>
+Resets the --pgp7 option.
+</para></listitem></varlistentry>
+
 <varlistentry>
 <term>--openpgp</term>
 <listitem><para>
-- 
cgit v1.2.3