merging Emacs.app (NeXTstep port)

[gnu-emacs] / lisp / ChangeLog.5

diff --git a/lisp/ChangeLog.5 b/lisp/ChangeLog.5
index 7b05b72243fd620474556e40aaeff54f5215a58f..1a2781b0d986dcd3270339b0e7e3f816019bc068 100644 (file)
--- a/lisp/ChangeLog.5
+++ b/lisp/ChangeLog.5
@@ -291,7 +291,7 @@
        branch and removes any locks that might remain after check-in.
 
        (vc-cancel-version): Abort with error message in the CVS case.
-       (The error used to be signalled in vc-backend-uncheck, which is
+       (The error used to be signaled in vc-backend-uncheck, which is
        a little too late.)
 
        (vc-minor-revision): Function removed.
@@ -4249,7 +4249,7 @@
        the autogenerated label in the minibuffer caused the killed text
        to appear in front of the bibtex entry.
 
-1995-01-05  Eric Raymond  <esr@locke.ccil.org>
+1995-01-05  Eric S. Raymond  <esr@locke.ccil.org>
 
        * vc.el (vc-do-command): Change RCS handling so rcsdiff won't strip
        away relative-pathname information.  This function no longer sets the
@@ -4533,7 +4533,7 @@
 
        * imenu.el (imenu-always-use-completion-buffer-p): A value of
        `never' now means never display a completion buffer.
-       (imenu--completion-buffer): Implement 'never behaviour.
+       (imenu--completion-buffer): Implement 'never behavior.
 
 1994-12-21  Stefan Schoef  <schoef@informatik.uni-oldenburg.de>
 
@@ -9270,10 +9270,10 @@ See ChangeLog.4 for earlier changes.
 
   This file is part of GNU Emacs.
 
-  GNU Emacs is free software; you can redistribute it and/or modify
+  GNU Emacs is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 3, or (at your option)
-  any later version.
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
 
   GNU Emacs is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -9281,8 +9281,6 @@ See ChangeLog.4 for earlier changes.
   GNU General Public License for more details.
 
   You should have received a copy of the GNU General Public License
-  along with GNU Emacs; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-  Boston, MA 02110-1301, USA.
+  along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; arch-tag: 1a8fbb45-25d0-48e2-a926-29ca4e3d343a