6 files changed, 31 insertions, 13 deletions
diff --git a/doc/ChangeLog b/doc/ChangeLog
index ae0fb87e7..572bf4df9 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,12 @@
+2004-05-08  David Shaw  <[email protected]>
+
+	* DETAILS, credits-1.0, credits-1.2: ElGamal -> Elgamal.
+
+	* gpg.sgml: Document --no-use-embedded-filename and
+	--min-cert-level.
+
+	* gpgv.sgml: Removed leftover </para>.
+
 2004-05-03  Werner Koch  <[email protected]>
 
 	* gpgv.sgml: Removed reference to non-available option
diff --git a/doc/DETAILS b/doc/DETAILS
index 398da507c..c87eae380 100644
--- a/doc/DETAILS
+++ b/doc/DETAILS
@@ -59,9 +59,9 @@ record.
 		    be marked as ultimately trusted.
  3. Field:  length of key in bits.
  4. Field:  Algorithm:	1 = RSA
-		       16 = ElGamal (encrypt only)
+		       16 = Elgamal (encrypt only)
 		       17 = DSA (sometimes called DH, sign only)
-		       20 = ElGamal (sign and encrypt - don't use them!)
+		       20 = Elgamal (sign and encrypt - don't use them!)
 	    (for other id's see include/cipher.h)
  5. Field:  KeyID
  6. Field:  Creation Date (in UTC).  For UID and UAT records, this is the
@@ -605,7 +605,7 @@ Key generation
 	     "<"  Size of one factor decreased
 	     ">"  Size of one factor increased
 
-    The prime number for ElGamal is generated this way:
+    The prime number for Elgamal is generated this way:
 
     1) Make a prime number q of 160, 200, 240 bits (depending on the keysize)
     2) Select the length of the other prime factors to be at least the size
diff --git a/doc/credits-1.0 b/doc/credits-1.0
index 977910652..c536e771d 100644
--- a/doc/credits-1.0
+++ b/doc/credits-1.0
@@ -35,7 +35,7 @@ Walter Koch, Wim Vandeputte and Gerlinde Klaes.
 This software has been made possible by the previous work of
 Chris Wedgwood, Jean-loup Gailly, Jon Callas, Mark Adler, Martin Hellmann
 Paul Kendall, Philip R. Zimmermann, Peter Gutmann, Philip A. Nelson,
-Taher ElGamal, Torbjorn Granlund, Whitfield Diffie, some unknown NSA
+Taher Elgamal, Torbjorn Granlund, Whitfield Diffie, some unknown NSA
 mathematicians and all the folks who have worked hard to create complete
 and free operating systems.
 
diff --git a/doc/credits-1.2 b/doc/credits-1.2
index 7c34a9da3..115328c11 100644
--- a/doc/credits-1.2
+++ b/doc/credits-1.2
@@ -67,6 +67,6 @@ IIDA, Yoshihiro Kajiki and Gerlinde Klaes.
 This software has been made possible by the previous work of Chris
 Wedgwood, Jean-loup Gailly, Jon Callas, Mark Adler, Martin Hellmann
 Paul Kendall, Philip R. Zimmermann, Peter Gutmann, Philip A. Nelson,
-Taher ElGamal, Torbjorn Granlund, Whitfield Diffie, some unknown NSA
+Taher Elgamal, Torbjorn Granlund, Whitfield Diffie, some unknown NSA
 mathematicians and all the folks who have worked hard to create
 complete and free operating systems.
diff --git a/doc/gpg.sgml b/doc/gpg.sgml
index 3cf2854b2..8fd2888bf 100644
--- a/doc/gpg.sgml
+++ b/doc/gpg.sgml
@@ -813,7 +813,7 @@ Write output to &ParmFile;.
 <varlistentry>
 <term>--max-output &ParmN;</term>
 <listitem><para>
-This option set a limit on the number of bytes that will be generated
+This option sets a limit on the number of bytes that will be generated
 when processing a file.  Since OpenPGP supports various levels of
 compression, it is possible that the plaintext of a given message may
 be significantly larger than the original OpenPGP message.  While
@@ -1040,6 +1040,13 @@ specific levels and how they are used. --no-ask-cert-level disables
 this option.  This option defaults to yes.
 </para></listitem></varlistentry>
 
+<varlistentry>
+<term>--min-cert-level</term>
+<listitem><para>
+When building the trust database, disregard any signatures with a
+certification level below this.  Defaults to 1, which accepts all
+signatures.
+</para></listitem></varlistentry>
 
 <varlistentry>
 <term>--default-cert-level &ParmN;</term>
@@ -1789,9 +1796,10 @@ display the message.  This option overrides --set-filename.
 
 <varlistentry>
 <term>--use-embedded-filename</term>
+<term>--no-use-embedded-filename</term>
 <listitem><para>
-Try to create a file with a name as embedded in the data.
-This can be a dangerous option as it allows to overwrite files.
+Try to create a file with a name as embedded in the data.  This can be
+a dangerous option as it allows to overwrite files.  Defaults to no.
 </para></listitem></varlistentry>
 
 
@@ -2402,10 +2410,11 @@ Display the session key used for one message. See --override-session-key
 for the counterpart of this option.
 </para>
 <para>
-We think that Key-Escrow is a Bad Thing; however the user should
-have the freedom to decide whether to go to prison or to reveal the content of
-one specific message without compromising all messages ever encrypted for one
-secret key. DON'T USE IT UNLESS YOU ARE REALLY FORCED TO DO SO.
+We think that Key Escrow is a Bad Thing; however the user should have
+the freedom to decide whether to go to prison or to reveal the content
+of one specific message without compromising all messages ever
+encrypted for one secret key. DON'T USE IT UNLESS YOU ARE REALLY
+FORCED TO DO SO.
 </para></listitem></varlistentry>
 
 <varlistentry>
diff --git a/doc/gpgv.sgml b/doc/gpgv.sgml
index 238fd4ad2..8412b708c 100644
--- a/doc/gpgv.sgml
+++ b/doc/gpgv.sgml
@@ -119,7 +119,7 @@ does not contain a slash, it is assumed to be in the
 home-directory ("~/.gnupg" if --homedir is not used).
 The filename may be prefixed with a scheme:</para>
 <para>"gnupg-ring:" is the default one.</para>
-</para></listitem></varlistentry>
+</listitem></varlistentry>
 
 
 <varlistentry>