Merge from emacs-24; up to 2012-12-27T20:09:45Z!juri@jurta.org

2 files changed, 5 insertions, 1 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 6845e39eae5..b1f9fb2a40d 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,7 @@
+2013-06-01  Glenn Morris  <rgm@gnu.org>
+
+        * programs.texi (Semantic): Fix typo.
+
 2013-05-30  Xue Fuqiao  <xfq.free@gmail.com>
 
         * maintaining.texi (Types of Log File): Supplement some
diff --git a/doc/emacs/programs.texi b/doc/emacs/programs.texi
index 459221a9088..70eecf1c97b 100644
--- a/doc/emacs/programs.texi
+++ b/doc/emacs/programs.texi
@@ -1356,7 +1356,7 @@ the menu item named @samp{Source Code Parsers (Semantic)} in the
 @samp{Tools} menu.  This enables Semantic mode, a global minor mode.
 
    When Semantic mode is enabled, Emacs automatically attempts to
-parses each file you visit.  Currently, Semantic understands C, C++,
+parse each file you visit.  Currently, Semantic understands C, C++,
 Scheme, Javascript, Java, HTML, and Make.  Within each parsed buffer,
 the following commands are available: