*** empty log message ***

[bpt/emacs.git] / lisp / ChangeLog.6

diff --git a/lisp/ChangeLog.6 b/lisp/ChangeLog.6
index 1f0d58f..f06df64 100644 (file)
--- a/lisp/ChangeLog.6
+++ b/lisp/ChangeLog.6
@@ -4591,7 +4591,7 @@
 1995-12-13  Simon Marshall  <simon@duality.gnu.ai.mit.edu>
 
        * faces.el (modify-face): Take extra optional arg FRAME.
-       Use face-try-color-list to change foreground and background colours.
+       Use face-try-color-list to change foreground and background colors.
        If BOLD-P, ITALIC-P or UNDERLINE-P not nil or t, don't change the
        display attribute corresponding to that arg.  Doc fix.
 
@@ -5291,7 +5291,7 @@
 
        * skeleton.el (skeleton-end-hook): Now defvared and responsible for
        pushing out anything following skeleton to next line.  Thus this
-       behaviour can now be controlled by modes.
+       behavior can now be controlled by modes.
        (skeleton-insert): Parameter `no-newline' removed.
        (skeleton-read): Take this into account.
        (skeleton-internal-1): Less spurious empty lines when wrapping.
@@ -5477,7 +5477,7 @@
 
 1995-10-26  Simon Marshall  <simon@duality.gnu.ai.mit.edu>
 
-       * font-lock.el: General reorganisation.
+       * font-lock.el: General reorganization.
        (font-lock-fontify-syntactically-region): Renamed from
        font-lock-fontify-region.  Assume that region end-points are at bol.
        Don't bother wrapping with save-excursion; caller does this.
@@ -6134,7 +6134,7 @@
        (diary-remind-message, marking-diary-entries,
        marking-diary-entry): New variables.
        (diary-mark-sexp-diary-entries, mark-diary-entries): Rewritten to
-       accomodate marking-diary-entries.
+       accommodate marking-diary-entries.
        (diary-sexp-entry): Fix indentation.
        (diary-chinese-date, diary-coptic-date, diary-ethiopic-date):
        Do autoloads.
@@ -6721,7 +6721,7 @@
 
        * skeleton.el (skeleton-newline-indent-rigidly): New variable.
        (skeleton-internal-1): Use it for indenting after \n because previous
-       behaviour was only useful for `sh-script.el' and old `ada.el'.  Other
+       behavior was only useful for `sh-script.el' and old `ada.el'.  Other
        modes now get their own indentation.
        (skeleton, skeleton-modified, skeleton-point, skeleton-regions): `New'
        variables for passing between the mutually recursive functions of
@@ -8027,10 +8027,10 @@ See ChangeLog.5 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
@@ -8038,9 +8038,6 @@ See ChangeLog.5 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: f90e8ffe-6bd0-4423-97d9-637ac4382520