Merge from emacs-23 branch

[gnu-emacs] / lisp / ChangeLog.6

diff --git a/lisp/ChangeLog.6 b/lisp/ChangeLog.6
index e5bd7fa9d27bcb29d5d489a83234d8b00f6fb2ad..7ba9261ccf04c6571f8cea9c56988156ed9eac89 100644 (file)
--- a/lisp/ChangeLog.6
+++ b/lisp/ChangeLog.6
@@ -6892,7 +6892,7 @@
        (find-file-noselect): Use it if new optional argument `rawfile' is
        non-nil.
 
-       * startup.el (command-line-1): Add option --eval to evalute an
+       * startup.el (command-line-1): Add option --eval to evaluate an
        expression on the command line and print the result.
 
 1995-08-14  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
@@ -8022,8 +8022,7 @@ See ChangeLog.5 for earlier changes.
 ;; coding: utf-8
 ;; End:
 
-    Copyright (C) 1995, 1996, 2001, 2002, 2003, 2004, 2005, 2006,
-      2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+    Copyright (C) 1995-1996, 2001-2011  Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
@@ -8040,4 +8039,3 @@ See ChangeLog.5 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: f90e8ffe-6bd0-4423-97d9-637ac4382520