2 files changed, 7 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e726990cacf..6fdc2d08718 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-09-17  Tom Willemse  <tom@ryuslash.org>  (tiny change)
+
+        * progmodes/prog-mode.el (prog-mode-hook): Replace reference to
+        Text mode in docstring (bug#18464).
+
 2014-09-21  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * progmodes/perl-mode.el (perl-syntax-propertize-function):
@@ -41,8 +46,7 @@
 
         * image-mode.el (image-toggle-display-image): If we have a
         `fit-width' or a `fit-height', don't limit the size of the image
-        to the window size, because that doesn't preserve the aspect
-        ratio.
+        to the window size, because that doesn't preserve the aspect ratio.
         * image-mode.el: Move defvars earlier to avoid a byte-compilation
         warning.
 
diff --git a/lisp/progmodes/prog-mode.el b/lisp/progmodes/prog-mode.el
index 747e63f9237..5037020f94e 100644
--- a/lisp/progmodes/prog-mode.el
+++ b/lisp/progmodes/prog-mode.el
@@ -36,7 +36,7 @@
   :group 'languages)
 
 (defcustom prog-mode-hook nil
-  "Normal hook run when entering Text mode and many related modes."
+  "Normal hook run when entering programming modes."
   :type 'hook
   :options '(flyspell-prog-mode abbrev-mode flymake-mode linum-mode
                                 prettify-symbols-mode)