1 files changed, 24 insertions, 7 deletions
diff --git a/doc/gpg.sgml b/doc/gpg.sgml
index 3b7b70074..830ba9c1e 100644
--- a/doc/gpg.sgml
+++ b/doc/gpg.sgml
@@ -193,7 +193,7 @@ for a quick encryption of multiple files.
 <term>--decrypt-files <optional><parameter/files/</optional></term>
 <listitem><para>
 The same as --encrypt-files with the difference that files will be
-decrypted. The syntax or the filenames is the same.
+decrypted. The syntax of the filenames is the same.
 </para></listitem></varlistentry>
 
 <!--
@@ -869,9 +869,9 @@ Try to be as quiet as possible.
 <varlistentry>
 <term>-z &ParmN;, --compress-level &ParmN;</term>
 <listitem><para>
-Set compression level to &ParmN;. A value of 0 for &ParmN;
-disables compression. Default is to use the default
-compression level of zlib (normally 6).
+Set compression level to &ParmN;. A value of 0 for &ParmN; disables
+compression. Default is to use the default compression level of zlib
+(normally 6).
 </para></listitem></varlistentry>
 
 
@@ -2223,8 +2223,9 @@ Experimental use only.
 <term>--group &ParmNameValues;</term>
 <listitem><para>
 Sets up a named group, which is similar to aliases in email programs.
-Any time the group name is a recipient (-r or --recipient), it will
-be expanded to the values specified.
+Any time the group name is a recipient (-r or --recipient), it will be
+expanded to the values specified.  Multiple groups with the same name
+are automatically merged into a single group.
 </para><para>
 The values are &ParmKeyIDs; or fingerprints, but any key description
 is accepted.  Note that a value with spaces in it will be treated as
@@ -2236,9 +2237,15 @@ arguments.
 </para></listitem></varlistentry>
 
 <varlistentry>
+<term>--ungroup &ParmName;</term>
+<listitem><para>
+Remove a given entry from the --group list.
+</para></listitem></varlistentry>
+
+<varlistentry>
 <term>--no-groups</term>
 <listitem><para>
-Clear the --group list.
+Remove all entries from the --group list.
 </para></listitem></varlistentry>
 
 <varlistentry>
@@ -2286,6 +2293,16 @@ edit menu.  This affects both key generation and "updpref" in the edit
 menu.
 </para></listitem></varlistentry>
 
+<varlistentry>
+<term>--list-config &OptParmNames;</term>
+<listitem><para>
+Display various internal configuration parameters of GnuPG.  This
+option is intended for external programs that call GnuPG to perform
+tasks, and is thus not generally useful.  See the file
+<filename>doc/DETAILS</filename> in the source distribution for the
+details of which configuration items may be listed.  --list-config is
+only useful with --with-colons set.
+</para></listitem></varlistentry>
 
 </variablelist>
 </refsect1>