Prefer the ~/.authinfo file over the ~/.authinfo.gpg file, especially when saving.

[gnu-emacs] / lisp / ChangeLog.2

diff --git a/lisp/ChangeLog.2 b/lisp/ChangeLog.2
index 3382aeb522af4d438f1248f58846fac59af0ae52..3604656265334dd561fc46ade96df4bafe60433c 100644 (file)
--- a/lisp/ChangeLog.2
+++ b/lisp/ChangeLog.2
@@ -3717,9 +3717,9 @@
 1986-08-07  Richard Mlynarik  (mly@prep)
 
        * rfc822.el, loaddefs.el, mail-utils.el:
-       Hairy address parser, used only if mail-use-rfc822 is non-nil
+       Hairy address parser, used only if mail-use-rfc822 is non-nil.
        (It is nil by default, so if one doesn't like or need the hair of
-       this file, then one is never troubled by it)
+       this file, then one is never troubled by it.)
 
        * disassemble.el, loaddefs.el:
        Code from doug@csli.stanford.edu modified by mly.
@@ -3992,8 +3992,7 @@
 
 See ChangeLog.1 for earlier changes.
 
-    Copyright (C) 1986, 1987, 1988, 2001, 2002, 2003, 2004, 2005, 2006,
-       2007, 2008  Free Software Foundation, Inc.
+    Copyright (C) 1986-1988, 2001-2011  Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
@@ -4010,4 +4009,3 @@ See ChangeLog.1 for earlier changes.
   You should have received a copy of the GNU General Public License
   along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
-;;; arch-tag: c315ba16-14ba-4b07-86e6-013a18f11be7