Merge from trunk.

1 files changed, 2 insertions, 2 deletions

diff --git a/src/ChangeLog.7 b/src/ChangeLog.7
index 73d0d45e9c1..fc97acdeb1e 100644
--- a/src/ChangeLog.7
+++ b/src/ChangeLog.7
@@ -5774,7 +5774,7 @@
 
         (w32_initialize): Set input mode.  Use w32_msg_worker instead
         of windows_msg_worker.  Dynamically link proportional scroll bar
-        functions and intialize proportional scroll bar variables.
+        functions and initialize proportional scroll bar variables.
         (syms_of_w32term): DEFVAR new variables.
 
         * w32term.h (w32_output): New fields menubar_widget, menubar_active,
@@ -10963,7 +10963,7 @@
 1996-08-28  Morten Welinder  <terra@diku.dk>
 
         * minibuf.c (Vhistory_length, Qhistory_length): New variables.
-        (syms_of_minibuf): Register and initialise these.
+        (syms_of_minibuf): Register and initialize these.
         (read_minibuf): Truncate history list if needed.
 
 1996-08-28  Richard Stallman  <rms@psilocin.gnu.ai.mit.edu>