Merge from origin/emacs-25

[gnu-emacs] / lisp / ChangeLog.6

diff --git a/lisp/ChangeLog.6 b/lisp/ChangeLog.6
index 5d79470bd2a70e492200396c60c81e8754d83ee1..147ded713347420a9bb2a8184aedd49b008aee9a 100644 (file)
--- a/lisp/ChangeLog.6
+++ b/lisp/ChangeLog.6
@@ -3471,7 +3471,7 @@
 
 1996-01-14  Erik Naggum  <erik@naggum.no>
 
-       * all files: Update FSF's address in, and unify formatting of,
+       * All files: Update FSF's address in, and unify formatting of,
        comment preambles.
 
 1996-01-13  Erik Naggum  <erik@naggum.no>
@@ -3687,7 +3687,7 @@
        When changing the environment, avoid need for setenv.
 
 1996-01-05  Karl Eichwalder  <ke@ke.Central.DE>
-            Karl Fogel  <kfogel@floss.red-bean.com>
+           Karl Fogel  <kfogel@floss.red-bean.com>
 
        * bookmark.el: "cyclic.com" addresses changed to "red-bean.com".
        (bookmark-bmenu-mode-map): Don't bind C-k.
@@ -8021,7 +8021,7 @@ See ChangeLog.5 for earlier changes.
 ;; coding: utf-8
 ;; End:
 
-    Copyright (C) 1995-1996, 2001-2012  Free Software Foundation, Inc.
+    Copyright (C) 1995-1996, 2001-2016 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.