From: Katsumi Yamaoka <yamaoka@jpl.org>
Date: Mon, 8 Jun 2009 22:47:52 +0000 (+0000)
Subject: Synch with Emacs trunk:
X-Git-Url: http://cgit.sxemacs.org/?p=gnus;a=commitdiff_plain;h=bf4e6629187bcc9870482dae72c49f6d54648ad0

Synch with Emacs trunk:
2009-06-04  Daiki Ueno  <ueno@unixuser.org>

	* gnus.texi (Security): Fix wording; add a link to epa.info.

2009-06-04  Ryan Yeske  <rcyeske@gmail.com>

	* message.texi (Header Commands): Fix descriptions to match
	keybindings.

2009-04-22  Daiki Ueno  <ueno@unixuser.org>

	* gnus.texi (Security): Mention that EasyPG is the current default.
---

diff --git a/texi/ChangeLog b/texi/ChangeLog
index 47d1928c0..5a0705977 100644
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,16 @@
+2009-06-04  Daiki Ueno  <ueno@unixuser.org>
+
+	* gnus.texi (Security): Fix wording; add a link to epa.info.
+
+2009-06-04  Ryan Yeske  <rcyeske@gmail.com>
+
+	* message.texi (Header Commands): Fix descriptions to match
+	keybindings.
+
+2009-04-22  Daiki Ueno  <ueno@unixuser.org>
+
+	* gnus.texi (Security): Mention that EasyPG is the current default.
+
 2009-04-12  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* auth.texi: Synch up with Emacs---change Info file name auth.info to
diff --git a/texi/gnus.texi b/texi/gnus.texi
index cabf69113..704054f9f 100644
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -12020,8 +12020,9 @@ things to work:
 @item
 To handle @acronym{PGP} and @acronym{PGP/MIME} messages, you have to
 install an OpenPGP implementation such as GnuPG.  The Lisp interface
-to GnuPG included with Gnus is called PGG (@pxref{Top, ,PGG, pgg, PGG
-Manual}), but Mailcrypt and gpg.el are also supported.
+to GnuPG included with Emacs is called EasyPG (@pxref{Top, ,EasyPG,
+epa, EasyPG Assistant user's manual}), but PGG (@pxref{Top, ,PGG, pgg,
+PGG Manual}), Mailcrypt, and gpg.el are also supported.
 
 @item
 To handle @acronym{S/MIME} message, you need to install OpenSSL.  OpenSSL 0.9.6
@@ -12048,16 +12049,18 @@ protocols.  Otherwise, ask user.
 @item mml1991-use
 @vindex mml1991-use
 Symbol indicating elisp interface to OpenPGP implementation for
-@acronym{PGP} messages.  The default is @code{pgg}, but
-@code{mailcrypt} and @code{gpg} are also supported although
-deprecated.
+@acronym{PGP} messages.  The default is @code{epg}, but @code{pgg},
+@code{mailcrypt}, and @code{gpg} are also supported although
+deprecated.  By default, Gnus uses the first available interface in
+this order.
 
 @item mml2015-use
 @vindex mml2015-use
 Symbol indicating elisp interface to OpenPGP implementation for
-@acronym{PGP/MIME} messages.  The default is @code{pgg}, but
-@code{mailcrypt} and @code{gpg} are also supported although
-deprecated.
+@acronym{PGP/MIME} messages.  The default is @code{epg}, but
+@code{pgg}, @code{mailcrypt}, and @code{gpg} are also supported
+although deprecated.  By default, Gnus uses the first available
+interface in this order.
 
 @end table
 
diff --git a/texi/message.texi b/texi/message.texi
index f863485ca..654f1403e 100644
--- a/texi/message.texi
+++ b/texi/message.texi
@@ -551,8 +551,8 @@ in the key binding is for Originator.)
 @findex message-goto-bcc
 Go to the @code{Bcc} header (@code{message-goto-bcc}).
 
-@item C-c C-f C-f
-@kindex C-c C-f C-f
+@item C-c C-f C-w
+@kindex C-c C-f C-w
 @findex message-goto-fcc
 Go to the @code{Fcc} header (@code{message-goto-fcc}).
 
@@ -581,8 +581,8 @@ Go to the @code{Newsgroups} header (@code{message-goto-newsgroups}).
 @findex message-goto-distribution
 Go to the @code{Distribution} header (@code{message-goto-distribution}).
 
-@item C-c C-f C-o
-@kindex C-c C-f C-o
+@item C-c C-f C-f
+@kindex C-c C-f C-f
 @findex message-goto-followup-to
 Go to the @code{Followup-To} header (@code{message-goto-followup-to}).