merge trunk

[gnu-emacs] / doc / misc / semantic.texi

diff --git a/doc/misc/semantic.texi b/doc/misc/semantic.texi
index 56add3b565b0ba99c25da42508b09e5ea3d34aea..6e39d410223c1bf70bc10fab2353f50e9da8f524 100644 (file)
--- a/doc/misc/semantic.texi
+++ b/doc/misc/semantic.texi
@@ -355,7 +355,7 @@ tags are @emph{saved} while a buffer is not in memory.
 
 The database and tables both also provide applicable cache information,
 and cache flushing system.  The semanticdb search routines use caches
-to save datastructures that are complex to calculate.
+to save data structures that are complex to calculate.
 
 Lastly, it provides the concept of @dfn{project root}.  It is a system
 by which a file can be associated with the root of a project, so if
@@ -607,7 +607,7 @@ Emacs Lisp.  It is an LALR parser suitable for complex languages.
 @c LocalWords: backquote bnf bovinate bovinates LALR
 @c LocalWords: bovinating bovination bovinator bucketize
 @c LocalWords: cb cdr charquote checkcache cindex CLOS
-@c LocalWords: concat concocting const constantness ctxt Decl defcustom
+@c LocalWords: concat concocting const ctxt Decl defcustom
 @c LocalWords: deffn deffnx defun defvar destructor's dfn diff dir
 @c LocalWords: doc docstring EDE EIEIO elisp emacsman emph enum
 @c LocalWords: eq Exp EXPANDFULL expression fn foo func funcall