mm-util.el (mm-ucs-to-char): Use eval-and-compile.

[gnus] / texi / auth.texi

diff --git a/texi/auth.texi b/texi/auth.texi
index 9fe9b28..7ff112f 100644 (file)
--- a/texi/auth.texi
+++ b/texi/auth.texi
@@ -177,8 +177,8 @@ for details.
 
 If you don't customize @code{auth-sources}, you'll have to live with
 the defaults: any host and any port are looked up in the netrc
-file @code{~/.authinfo.gpg}, which is a GnuPG encrypted file.
-@xref{GnuPG and EasyPG Assistant Configuration}.
+file @code{~/.authinfo.gpg}, which is a GnuPG encrypted file
+(@pxref{GnuPG and EasyPG Assistant Configuration}).
 
 The simplest working netrc line example is one without a port.
 
@@ -267,47 +267,49 @@ users' netrc files.
 @node GnuPG and EasyPG Assistant Configuration
 @appendix GnuPG and EasyPG Assistant Configuration
 
+If you don't customize @code{auth-sources}, the auth-source library
+reads @code{~/.authinfo.gpg}, which is a GnuPG encrypted file.
+
 In Emacs 23 or later there is an option @code{auto-encryption-mode} to
-automatically decrypt @code{*.gpg} files and it is enabled by default
-so there is no setting is needed.  If you are using earlier versions
-of Emacs for some reason, you will need:
+automatically decrypt @code{*.gpg} files.  It is enabled by default.
+If you are using earlier versions of Emacs, you will need:
 
 @lisp
 (require 'epa-file)
 (epa-file-enable)
 @end lisp
 
-If you want your GnuPG passwords to be cached, setup @code{gpg-agent}
+If you want your GnuPG passwords to be cached, set up @code{gpg-agent}
 or EasyPG Assitant
-@pxref{Caching Passphrases, , Caching Passphrases, epa}
-
-For those who are using older vesions of Emacs, here are some portion
-copied from the EasyPG Assitant manual:
+(@pxref{Caching Passphrases, , Caching Passphrases, epa}).
 
-Here are some questions:
+To quick start, here are some questions:
 
 @enumerate
-@item Do you use GnuPG version 2 instead of GnuPG version 1?
-@item Do you use symmetric encryption rather than public key encryption?
-@item Do you want to use gpg-agent?
+@item
+Do you use GnuPG version 2 instead of GnuPG version 1?
+@item
+Do you use symmetric encryption rather than public key encryption?
+@item
+Do you want to use gpg-agent?
 @end enumerate
 
 Here are configurations depending on your answers:
 
 @multitable {111} {222} {333} {configuration configuration configuration}
 @item @b{1} @tab @b{2} @tab @b{3} @tab Configuration
-@item Yes @tab Yes @tab Yes @tab Nothing to do.
+@item Yes @tab Yes @tab Yes @tab Set up gpg-agent.
 @item Yes @tab Yes @tab No @tab You can't, without gpg-agent.
-@item Yes @tab No @tab Yes @tab Nothing to do.
+@item Yes @tab No @tab Yes @tab Set up gpg-agent.
 @item Yes @tab No @tab No @tab You can't, without gpg-agent.
 @item No @tab Yes @tab Yes @tab Set up elisp passphrase cache.
 @item No @tab Yes @tab No @tab Set up elisp passphrase cache.
-@item No @tab No @tab Yes @tab Nothing to do.
+@item No @tab No @tab Yes @tab Set up gpg-agent.
 @item No @tab No @tab No @tab You can't, without gpg-agent.
 @end multitable
 
-To setup gpg-agent, follow the instruction in GnuPG manual.
-@pxref{Invoking GPG-AGENT, , Invoking GPG-AGENT, gnupg}.
+To set up gpg-agent, follow the instruction in GnuPG manual
+(@pxref{Invoking GPG-AGENT, , Invoking GPG-AGENT, gnupg}).
 
 To set up elisp passphrase cache, set
 @code{epa-file-cache-passphrase-for-symmetric-encryption}.