Merge from emacs-23; up to 2010-06-03T05:41:49Z!rgm@gnu.org.

[bpt/emacs.git] / doc / misc / semantic.texi

diff --git a/doc/misc/semantic.texi b/doc/misc/semantic.texi
index 08d82d3..f3f11d2 100644 (file)
--- a/doc/misc/semantic.texi
+++ b/doc/misc/semantic.texi
@@ -24,8 +24,7 @@
 @copying
 This manual documents the Semantic library and utilities.
 
-Copyright @copyright{} 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007,
-2009, 2010 Free Software Foundation, Inc.
+Copyright @copyright{} 1999-2005, 2007, 2009-2011 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -41,9 +40,9 @@ developing GNU and promoting software freedom.''
 @end quotation
 @end copying
 
-@dircategory Emacs
+@dircategory Emacs misc features
 @direntry
-* Semantic: (semantic).      Source code parser library and utilities.
+* Semantic: (semantic).         Source code parser library and utilities.
 @end direntry
 
 @titlepage
@@ -65,7 +64,7 @@ developing GNU and promoting software freedom.''
 @macro obsolete{old,new}
 @sp 1
 @strong{Compatibility}:
-@code{\new\} introduced in @semantic{} version 2.0 supercedes
+@code{\new\} introduced in @semantic{} version 2.0 supersedes
 @code{\old\} which is now obsolete.
 @end macro
 
@@ -224,8 +223,8 @@ grammar developers; it is useful mostly for the hackers who would like
 to learn more about how @semantic{} works.
 
 @menu
-* Parser code ::         Code used for the parsers
-* Tag handling ::        Code used for manipulating tags
+* Parser code ::          Code used for the parsers
+* Tag handling ::         Code used for manipulating tags
 * Semanticdb Internals :: Code used in the semantic database
 * Analyzer Internals ::   Code used in the code analyzer
 * Tools ::                Code used in user tools
@@ -622,7 +621,3 @@ Emacs Lisp.  It is an LALR parser suitable for complex languages.
 @c LocalWords: subsubsection sw sym texi texinfo titlefont titlepage
 @c LocalWords: tok TOKEN's toplevel typemodifiers uml unset untar
 @c LocalWords: uref usedb var vskip xref yak
-
-@ignore
-   arch-tag: cbc6e78c-4ff1-410e-9fc7-936487e39bbf
-@end ignore