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 17ec5d1..f3f11d2 100644 (file)
--- a/doc/misc/semantic.texi
+++ b/doc/misc/semantic.texi
@@ -1,7 +1,7 @@
 \input texinfo
 @setfilename ../../info/semantic
 @set TITLE  Semantic Manual
-@set AUTHOR Eric M. Ludlam and David Ponce
+@set AUTHOR Eric M. Ludlam, David Ponce, and Richard Y. Kim
 @settitle @value{TITLE}
 
 @c *************************************************************************
@@ -24,8 +24,7 @@
 @copying
 This manual documents the Semantic library and utilities.
 
-Copyright @copyright{} 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007,
-2009 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,13 +40,10 @@ developing GNU and promoting software freedom.''
 @end quotation
 @end copying
 
-@ifinfo
-@format
-START-INFO-DIR-ENTRY
-* Semantic: (semantic).      Source code parser library and utilities.
-END-INFO-DIR-ENTRY
-@end format
-@end ifinfo
+@dircategory Emacs misc features
+@direntry
+* Semantic: (semantic).         Source code parser library and utilities.
+@end direntry
 
 @titlepage
 @center @titlefont{Semantic}
@@ -68,7 +64,7 @@ END-INFO-DIR-ENTRY
 @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
 
@@ -153,8 +149,8 @@ distributed along with @semantic{}.
                +---------------+    | COMMON |    | COMMON |<--- SPEEDBAR
       Java --->| JAVA   PARSER |--->| PARSE  |    |        |
                +---------------+    | TREE   |    | PARSE  |<--- SEMANTICDB
-               +---------------+    | FORMAT |    | API    |<--- ecb
-    Scheme --->| SCHEME PARSER |--->|        |    |        |
+               +---------------+    | FORMAT |    | API    |
+    Scheme --->| SCHEME PARSER |--->|        |    |        |<--- ecb
                +---------------+    |        |    |        |
                +---------------+    |        |    |        |
    Texinfo --->| TEXI.  PARSER |--->|        |    |        |
@@ -162,15 +158,6 @@ distributed along with @semantic{}.
 
                     ...                ...           ...         ...
 
-               +---------------+    |        |    |        |<--- app. 1
-   Lang. A --->| A      Parser |--->|        |    |        |
-               +---------------+    |        |    |        |<--- app. 2
-               +---------------+    |        |    |        |
-   Lang. B --->| B      Parser |--->|        |    |        |<--- app. 3
-               +---------------+    |        |    |        |
-
-                     ...        ...     ...          ...       ...
-
                +---------------+    |        |    |        |
    Lang. Y --->| Y      Parser |--->|        |    |        |<--- app. ?
                +---------------+    |        |    |        |
@@ -231,15 +218,13 @@ time.  @xref{SemanticDB}.
 @chapter Semantic Internals
 
 This chapter provides an overview of the internals of @semantic{}.
-This information would not be needed by neither application developers
-nor grammar developers.
-
-It would be useful mostly for the hackers who would like to learn
-more about how @semantic{} works.
+This information is usually not needed by application developers or
+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
@@ -636,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