Rename eww-download-path to eww-download-directory.

[gnu-emacs] / doc / misc / epa.texi

diff --git a/doc/misc/epa.texi b/doc/misc/epa.texi
index 20824e0fc91db03c4350e5a84cc01c1048103f11..210627ec89006d8ae7ab2946224b8bf35b7bf673 100644 (file)
--- a/doc/misc/epa.texi
+++ b/doc/misc/epa.texi
@@ -2,6 +2,7 @@
 @c %**start of header
 @setfilename ../../info/epa
 @settitle EasyPG Assistant User's Manual
+@documentencoding UTF-8
 @c %**end of header
 
 @set VERSION 1.0.0
@@ -9,7 +10,7 @@
 @copying
 This file describes EasyPG Assistant @value{VERSION}.
 
-Copyright @copyright{} 2007--2012 Free Software Foundation, Inc.
+Copyright @copyright{} 2007--2014 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -106,7 +107,7 @@ This chapter introduces various commands for typical use cases.
 * Cryptographic operations on files::
 * Dired integration::
 * Mail-mode integration::
-* Encrypting/decrypting *.gpg files::
+* Encrypting/decrypting gpg files::
 @end menu
 
 @node Key management
@@ -240,8 +241,9 @@ you answered yes, it will let you select the signing keys.
 @node Cryptographic operations on files
 @section Cryptographic operations on files
 
-@deffn Command epa-decrypt-file file
-Decrypt @var{file}.
+@deffn Command epa-decrypt-file file &optional output
+Decrypt @var{file}.  If you do not specify the name @var{output} to
+use for the decrypted file, this function prompts for the value to use.
 @end deffn
 
 @deffn Command epa-verify-file file
@@ -345,8 +347,8 @@ key in the recipient list, use @samp{encrypt-to} option in
 
 @end table
 
-@node Encrypting/decrypting *.gpg files
-@section Encrypting/decrypting *.gpg files
+@node Encrypting/decrypting gpg files
+@section Encrypting/decrypting gpg files
 By default, every file whose name ends with @samp{.gpg} will be
 treated as encrypted.  That is, when you open such a file, the
 decrypted text is inserted in the buffer rather than encrypted one.
@@ -395,7 +397,7 @@ which encryption method should be used through @xref{File Variables, ,
 variable for this.
 @vindex epa-file-encrypt-to
 
-For example, if you want an Elisp file should be encrypted with a
+For example, if you want an Elisp file to be encrypted with a
 public key associated with an email address @samp{ueno@@unixuser.org},
 add the following line to the beginning of the file.
 
@@ -463,7 +465,7 @@ To set up gpg-agent, follow the instruction in GnuPG manual.
 
 To set up elisp passphrase cache, set
 @code{epa-file-cache-passphrase-for-symmetric-encryption}.
-@xref{Encrypting/decrypting *.gpg files}.
+@xref{Encrypting/decrypting gpg files}.
 
 @node Bug Reports
 @chapter Bug Reports