Merge from emacs-24; up to 2014-04-04T23:31:02Z!joaotavora@gmail.com

[bpt/emacs.git] / etc / NEWS.1-17

diff --git a/etc/NEWS.1-17 b/etc/NEWS.1-17
index dc9922e..e0c94db 100644 (file)
--- a/etc/NEWS.1-17
+++ b/etc/NEWS.1-17
@@ -1,6 +1,6 @@
 GNU Emacs NEWS -- history of user-visible changes.  26-Mar-1986
 
-Copyright (C) 1985-1986, 2006-2011  Free Software Foundation, Inc.
+Copyright (C) 1985-1986, 2006-2014 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 
@@ -1198,7 +1198,7 @@ them with `\='.  For example, "\\=\\= is the way to quote \\=\\["
 will come out as `\= is the way to quote \['.
 
 The new function `substitute-command-keys' takes a string possibly
-contaning \[...] constructs and replaces those constructs with
+containing \[...] constructs and replaces those constructs with
 the key sequences they currently stand for.
 
 * Primitives `find-line-comment' and `find-line-comment-body' flushed.
@@ -1630,7 +1630,7 @@ Changes in Emacs 1.12
  read-char now returns a value in the range 128-255 if
  a Meta character is typed.  When interpreted as command
  input, a Meta character is equivalent to a two character
- sequence, the meta prefix character followed by the un-metized
+ sequence, the meta prefix character followed by the unmetized
  character (Meta-G unmetized is G).
 
  The meta prefix character