Merge from emacs-24; up to 2014-08-07T11:49:36Z!rrt@sc3d.org

2 files changed, 5 insertions, 1 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index adf61e833b3..9dc3af97788 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,7 @@
+2014-11-03  Glenn Morris  <rgm@gnu.org>
+
+        * programs.texi (Misc for Programs): Fix typo.
+
 2014-10-30  Eli Zaretskii  <eliz@gnu.org>
 
         * frames.texi (Scroll Bars): Improve indexing of faces.
diff --git a/doc/emacs/programs.texi b/doc/emacs/programs.texi
index 4c80449c2a2..f2ca386b49e 100644
--- a/doc/emacs/programs.texi
+++ b/doc/emacs/programs.texi
@@ -1453,7 +1453,7 @@ creates.
 @findex superword-mode
  Superword mode is a buffer-local minor mode that causes editing and
 motion commands to treat symbols (e.g., @samp{this_is_a_symbol}) as words.
-When Subword mode is enabled, the minor mode indicator
+When Superword mode is enabled, the minor mode indicator
 @iftex
 @samp{@math{^2}}
 @end iftex