aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Shaw <[email protected]>2005-12-08 05:29:35 +0000
committerDavid Shaw <[email protected]>2005-12-08 05:29:35 +0000
commit4ba9fd4683d3e644cf9dc73147aa848d60b4c455 (patch)
treeda22ee68cdf1440c0738999db578d7c81f32627a
parent* gpgkeys_finger.c (get_key), gpgkeys_curl.c (get_key): Better language (diff)
downloadgnupg-4ba9fd4683d3e644cf9dc73147aa848d60b4c455.tar.gz
gnupg-4ba9fd4683d3e644cf9dc73147aa848d60b4c455.zip
* gpg.sgml: Document -d. Add [file] to a few options.
-rw-r--r--doc/ChangeLog4
-rw-r--r--doc/gpg.sgml14
2 files changed, 11 insertions, 7 deletions
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 53c563467..cbc0782eb 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,7 @@
+2005-12-07 David Shaw <[email protected]>
+
+ * gpg.sgml: Document -d. Add [file] to a few options.
+
2005-11-17 David Shaw <[email protected]>
* gpg.sgml: Clarify "xxxxx-clean" and "clean". Document
diff --git a/doc/gpg.sgml b/doc/gpg.sgml
index 2cf67758c..c96fbb839 100644
--- a/doc/gpg.sgml
+++ b/doc/gpg.sgml
@@ -105,7 +105,7 @@ a file containing keys is listed).
<variablelist>
<varlistentry>
-<term>-s, --sign</term>
+<term>-s, --sign &OptParmFile;</term>
<listitem><para>
Make a signature. This command may be combined with --encrypt (for a
signed and encrypted message), --symmetric (for a signed and
@@ -116,21 +116,21 @@ or a passphrase).
<varlistentry>
-<term>--clearsign</term>
+<term>--clearsign &OptParmFile;</term>
<listitem><para>
Make a clear text signature.
</para></listitem></varlistentry>
<varlistentry>
-<term>-b, --detach-sign</term>
+<term>-b, --detach-sign &OptParmFile;</term>
<listitem><para>
Make a detached signature.
</para></listitem></varlistentry>
<varlistentry>
-<term>-e, --encrypt</term>
+<term>-e, --encrypt &OptParmFile;</term>
<listitem><para>
Encrypt data. This option may be combined with --sign (for a signed
and encrypted message), --symmetric (for a message that may be
@@ -141,7 +141,7 @@ or a passphrase).
<varlistentry>
-<term>-c, --symmetric</term>
+<term>-c, --symmetric &OptParmFile;</term>
<listitem><para>
Encrypt with a symmetric cipher using a passphrase. The default
symmetric cipher used is CAST5, but may be chosen with the
@@ -154,14 +154,14 @@ secret key or a passphrase).
<varlistentry>
-<term>--store</term>
+<term>--store &OptParmFile;</term>
<listitem><para>
Store only (make a simple RFC1991 packet).
</para></listitem></varlistentry>
<varlistentry>
-<term>--decrypt &OptParmFile;</term>
+<term>-d, --decrypt &OptParmFile;</term>
<listitem><para>
Decrypt &ParmFile; (or stdin if no file is specified) and
write it to stdout (or the file specified with