Merge from trunk.

2 files changed, 5 insertions, 1 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 029406e2d30..af8d38a077f 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,7 @@
+2011-11-11  Juanma Barranquero  <lekktu@gmail.com>
+
+        * semantic.texi (Tag handling): Fix typo.
+
 2011-10-31  Katsumi Yamaoka  <yamaoka@jpl.org>
 
         * gnus.texi (Other Gnus Versions): Remove.
diff --git a/doc/misc/semantic.texi b/doc/misc/semantic.texi
index f3f11d29f17..f6cf7a07ae8 100644
--- a/doc/misc/semantic.texi
+++ b/doc/misc/semantic.texi
@@ -306,7 +306,7 @@ Files associated with tags.  Goto-tag, file for include, and file for
 a prototype.
 
 @item semantic-tag-ls.el
-Language dependant features of a tag, such as parent calculation, slot
+Language dependent features of a tag, such as parent calculation, slot
 protection, and other states like abstract, virtual, static, and leaf.
 
 @item semantic-dep.el