Merge from trunk.

65 files changed, 613 insertions, 490 deletions

diff --git a/lisp/cedet/ChangeLog b/lisp/cedet/ChangeLog
index e5969a3c291..ccc81e6613e 100644
--- a/lisp/cedet/ChangeLog
+++ b/lisp/cedet/ChangeLog
@@ -1,3 +1,43 @@
+2011-12-06  Juanma Barranquero  <lekktu@gmail.com>
+
+        * semantic/bovine/c.el (semantic-tag-abstract-p): Fix typo.
+
+2011-11-26  Chong Yidong  <cyd@gnu.org>
+
+        * semantic/wisent/python-wy.el:
+        * semantic/wisent/js-wy.el:
+        * semantic/wisent/javat-wy.el:
+        * semantic/bovine/c-by.el:
+        * semantic/grammar-wy.el: Regenerate.
+
+2011-11-24  Juanma Barranquero  <lekktu@gmail.com>
+
+        * semantic/lex-spp.el (semantic-lex-spp-first-token-arg-list): Fix typo.
+
+2011-11-20  Juanma Barranquero  <lekktu@gmail.com>
+
+        * cedet-cscope.el (cedet-cscope-version-check):
+        * cedet-global.el (cedet-global-min-version)
+        (cedet-gnu-global-version-check):
+        * cedet.el (cedet-version):
+        * data-debug.el (data-debug-prev, data-debug-contract-current-line):
+        * ede.el (ede-buffer-belongs-to-project-p, ede-auto-add-to-target)
+        (ede-new, ede-invoke-method, project-edit-file-target, project-rescan)
+        (ede-add-project-to-global-list, ede-map-all-subprojects):
+        * inversion.el (inversion-check-version):
+        * mode-local.el (mode-local-map-file-buffers, define-child-mode)
+        (define-overloadable-function):
+        * pulse.el (pulse-flag, pulse):
+        * semantic.el (semantic-elapsed-time, semantic-parse-region)
+        (navigate-menu):
+        * ede/proj-comp.el (ede-compilation-program):
+        * semantic/debug.el (semantic-debug-parser-go)
+        (semantic-debug-parser-fail, semantic-debug-parser-quit)
+        (semantic-debug-parser-abort):
+        * semantic/idle.el (semantic-idle-core-handler):
+        * semantic/bovine/debug.el (semantic-bovine-debug-error-frame):
+        Fix typos.
+
 2011-11-16  Juanma Barranquero  <lekktu@gmail.com>
 
         * semantic/lex.el (semantic-lex-tokens):
diff --git a/lisp/cedet/cedet-cscope.el b/lisp/cedet/cedet-cscope.el
index 74892533ab6..71942698c5f 100644
--- a/lisp/cedet/cedet-cscope.el
+++ b/lisp/cedet/cedet-cscope.el
@@ -135,8 +135,8 @@ the error code."
 
 (defun cedet-cscope-version-check (&optional noerror)
   "Check the version of the installed CScope command.
-If optional programatic argument NOERROR is non-nil, then
-instead of throwing an error if CScope isn't available, then
+If optional programmatic argument NOERROR is non-nil,
+then instead of throwing an error if CScope isn't available,
 return nil."
   (interactive)
   (require 'inversion)
diff --git a/lisp/cedet/cedet-files.el b/lisp/cedet/cedet-files.el
index ae037028bf7..6f40ee7030f 100644
--- a/lisp/cedet/cedet-files.el
+++ b/lisp/cedet/cedet-files.el
@@ -83,7 +83,7 @@ specific conversions during tests."
           (setq file (concat driveletter ":"
                              (substring file (match-end 1))))))
 
-      ;; Handle the \\file\name nomenclature on some windows boxes.
+      ;; Handle the \\file\name nomenclature on some Windows boxes.
       (when (string-match "^!" file)
         (setq file (concat "//" (substring file 1)))))
     file))
diff --git a/lisp/cedet/cedet-global.el b/lisp/cedet/cedet-global.el
index d2a9794ec81..aa18c0d2f42 100644
--- a/lisp/cedet/cedet-global.el
+++ b/lisp/cedet/cedet-global.el
@@ -27,7 +27,7 @@
 (declare-function inversion-check-version "inversion")
 
 (defvar cedet-global-min-version "5.0"
-  "Minimum version of GNU global required.")
+  "Minimum version of GNU Global required.")
 
 (defcustom cedet-global-command "global"
   "Command name for the GNU Global executable."
@@ -131,8 +131,8 @@ If a default starting DIR is not specified, the current buffer's
 
 (defun cedet-gnu-global-version-check (&optional noerror)
   "Check the version of the installed GNU Global command.
-If optional programatic argument NOERROR is non-nil, then
-instead of throwing an error if Global isn't available, then
+If optional programmatic argument NOERROR is non-nil,
+then instead of throwing an error if Global isn't available,
 return nil."
   (interactive)
   (require 'inversion)
diff --git a/lisp/cedet/cedet-idutils.el b/lisp/cedet/cedet-idutils.el
index e071265c143..ee8e432ddd9 100644
--- a/lisp/cedet/cedet-idutils.el
+++ b/lisp/cedet/cedet-idutils.el
@@ -84,7 +84,7 @@ Note: Scope is not yet supported."
 
 (defun cedet-idutils-fnid-call (flags)
   "Call ID Utils fnid with the list of FLAGS.
-Return the created buffer with with program output."
+Return the created buffer with program output."
   (let ((b (get-buffer-create "*CEDET fnid*"))
         (cd default-directory)
         )
@@ -112,7 +112,7 @@ Return the created buffer with with program output."
 
 (defun cedet-idutils-mkid-call (flags)
   "Call ID Utils mkid with the list of FLAGS.
-Return the created buffer with with program output."
+Return the created buffer with program output."
   (let ((b (get-buffer-create "*CEDET mkid*"))
         (cd default-directory)
         )
@@ -163,8 +163,8 @@ the error code."
 
 (defun cedet-idutils-version-check (&optional noerror)
   "Check the version of the installed ID Utils command.
-If optional programatic argument NOERROR is non-nil, then
-instead of throwing an error if Global isn't available, then
+If optional programmatic argument NOERROR is non-nil,
+then instead of throwing an error if Global isn't available,
 return nil."
   (interactive)
   (require 'inversion)
diff --git a/lisp/cedet/cedet.el b/lisp/cedet/cedet.el
index d7645bc97ed..9ccf74de27a 100644
--- a/lisp/cedet/cedet.el
+++ b/lisp/cedet/cedet.el
@@ -75,7 +75,7 @@
 This is used by `semantic-mode' and `global-ede-mode'.")
 
 (defun cedet-version ()
-  "Display all active versions of CEDET and Dependent packages.
+  "Display all active versions of CEDET and dependent packages.
 
 The PACKAGE column is the name of a given package from CEDET.
 
@@ -85,7 +85,7 @@ See `cedet-packages' for details.
 FILE VERSION is the version number found in the source file
 for the specified PACKAGE.
 
-LOADED VERSION is the version of PACKAGE current loaded in Emacs
+LOADED VERSION is the version of PACKAGE currently loaded in Emacs
 memory and (presumably) running in this Emacs instance.  Value is X
 if the package has not been loaded."
   (interactive)
diff --git a/lisp/cedet/data-debug.el b/lisp/cedet/data-debug.el
index e50e9993af0..329d1c608c2 100644
--- a/lisp/cedet/data-debug.el
+++ b/lisp/cedet/data-debug.el
@@ -916,7 +916,7 @@ If PARENT is non-nil, it is somehow related as a parent to thing."
   (skip-chars-forward " *-><[]" (point-at-eol)))
 
 (defun data-debug-prev ()
-  "Go to the next line in the Ddebug buffer."
+  "Go to the previous line in the Ddebug buffer."
   (interactive)
   (forward-line -1)
   (beginning-of-line)
@@ -972,7 +972,7 @@ Do nothing if already expanded."
 
 (defun data-debug-contract-current-line ()
   "Contract the current line (if possible).
-Do nothing if already expanded."
+Do nothing if already contracted."
   (when (and (data-debug-current-line-expanded-p)
              ;; Don't contract if the current line is not expandable.
              (get-text-property (point) 'ddebug-function))
diff --git a/lisp/cedet/ede.el b/lisp/cedet/ede.el
index 987351a25e0..741e1ffbe5f 100644
--- a/lisp/cedet/ede.el
+++ b/lisp/cedet/ede.el
@@ -214,7 +214,7 @@ Argument LIST-O-O is the list of objects to choose from."
     (and obj (obj-of-class-p obj ede-target))))
 
 (defun ede-buffer-belongs-to-project-p ()
-  "Return non-nil if this buffer belongs to at least one target."
+  "Return non-nil if this buffer belongs to at least one project."
   (if (or (null ede-object) (consp ede-object)) nil
     (obj-of-class-p ede-object ede-project)))
 
@@ -243,7 +243,7 @@ Argument MENU-DEF is the menu definition to use."
               ede-obj (if (listp ede-object) ede-object (list ede-object)))
         ;; First, collect the build items from the project
         (setq newmenu (append newmenu (ede-menu-items-build obj t)))
-        ;; Second, Declare the current target menu items
+        ;; Second, declare the current target menu items
         (if (and ede-obj (ede-menu-obj-of-class-p ede-target))
             (while ede-obj
               (setq newmenu (append newmenu
@@ -264,7 +264,7 @@ Argument MENU-DEF is the menu definition to use."
           (setq targets (cdr targets)))
         ;; Fourth, build sub projects.
         ;; -- nerp
-        ;; Fifth, Add make distribution
+        ;; Fifth, add make distribution
         (append newmenu (list [ "Make distribution" ede-make-dist t ]))
         )))))
 
@@ -512,7 +512,7 @@ an EDE controlled project."
   "Look for a target that wants to own the current file.
 Follow the preference set with `ede-auto-add-method' and get the list
 of objects with the `ede-want-file-p' method."
-  (if ede-object (error "Ede-object already defined for %s" (buffer-name)))
+  (if ede-object (error "ede-object already defined for %s" (buffer-name)))
   (if (or (eq ede-auto-add-method 'never)
           (ede-ignore-file (buffer-file-name)))
       nil
@@ -566,7 +566,7 @@ Argument FILE is the file or directory to load a project from."
     (ede-load-project-file (file-name-directory file))))
 
 (defun ede-new (type &optional name)
-  "Create a new project starting of project type TYPE.
+  "Create a new project starting from project type TYPE.
 Optional argument NAME is the name to give this project."
   (interactive
    (list (completing-read "Project Type: "
@@ -642,7 +642,7 @@ Optional argument NAME is the name to give this project."
 
 (defun ede-invoke-method (sym &rest args)
   "Invoke method SYM on the current buffer's project object.
-ARGS are additional arguments to pass to method sym."
+ARGS are additional arguments to pass to method SYM."
   (if (not ede-object)
       (error "Cannot invoke %s for %s" (symbol-name sym)
              (buffer-name)))
@@ -815,7 +815,7 @@ Argument FNND is an argument."
   (error "remove-file not supported by %s" (object-name ot)))
 
 (defmethod project-edit-file-target ((ot ede-target))
-  "Edit the target OT associated w/ this file."
+  "Edit the target OT associated with this file."
   (find-file (oref (ede-current-project) file)))
 
 (defmethod project-new-target ((proj ede-project) &rest args)
@@ -857,7 +857,7 @@ Argument COMMAND is the command to use for compiling the target."
   (error "Dist-files is not supported by %s" (object-name this)))
 
 (defmethod project-rescan ((this ede-project))
-  "Rescan the EDE proj project THIS."
+  "Rescan the EDE project THIS."
   (error "Rescanning a project is not supported by %s" (object-name this)))
 
 (defun ede-ecb-project-paths ()
@@ -879,7 +879,7 @@ On success, return the added project."
   (when (not proj)
     (error "No project created to add to master list"))
   (when (not (eieio-object-p proj))
-    (error "Attempt to add Non-object to master project list"))
+    (error "Attempt to add non-object to master project list"))
   (when (not (obj-of-class-p proj ede-project-placeholder))
     (error "Attempt to add a non-project to the ede projects list"))
   (add-to-list 'ede-projects proj)
@@ -1157,7 +1157,7 @@ See also `ede-map-all-subprojects'."
   (mapcar proc (oref this subproj)))
 
 (defmethod ede-map-all-subprojects ((this ede-project) allproc)
-  "For object THIS, execute PROC on THIS and  all subprojects.
+  "For object THIS, execute PROC on THIS and all subprojects.
 This function also applies PROC to sub-sub projects.
 See also `ede-map-subprojects'."
   (apply 'append
diff --git a/lisp/cedet/ede/autoconf-edit.el b/lisp/cedet/ede/autoconf-edit.el
index bd4a5a627a9..c6545dd9015 100644
--- a/lisp/cedet/ede/autoconf-edit.el
+++ b/lisp/cedet/ede/autoconf-edit.el
@@ -191,7 +191,7 @@ This is to make it compatible with `autoconf-find-last-macro'.
 Assume that MACRO doesn't appear in the buffer yet, so search
 the ordering list `autoconf-preferred-macro-order'."
   ;; Search this list backwards.. heh heh heh
-  ;; This lets us do a reverse search easilly.
+  ;; This lets us do a reverse search easily.
   (let ((ml (member macro (reverse autoconf-preferred-macro-order))))
     (if (not ml) (error "Don't know how to position for %s yet" macro))
     (setq ml (cdr ml))
diff --git a/lisp/cedet/ede/files.el b/lisp/cedet/ede/files.el
index 6179d304464..f17dfd85fdf 100644
--- a/lisp/cedet/ede/files.el
+++ b/lisp/cedet/ede/files.el
@@ -249,7 +249,7 @@ Do this whenever a new project is created, as opposed to loaded."
   "Return a project description object if DIR has a project.
 Optional argument FORCE means to ignore a hash-hit of 'nomatch.
 This depends on an up to date `ede-project-class-files' variable.
-Any directory that contains the file .ede-ignore will allways
+Any directory that contains the file .ede-ignore will always
 return nil."
   (when (not (file-exists-p (expand-file-name ".ede-ignore" dir)))
     (let* ((dirtest (expand-file-name dir))
diff --git a/lisp/cedet/ede/generic.el b/lisp/cedet/ede/generic.el
index 7efe534a640..69570771546 100644
--- a/lisp/cedet/ede/generic.el
+++ b/lisp/cedet/ede/generic.el
@@ -43,7 +43,7 @@
 ;;
 ;; Customization:
 ;;
-;; Since these projects are all so increadibly generic, a user will
+;; Since these projects are all so incredibly generic, a user will
 ;; need to configure some aspects of the project by hand.  In order to
 ;; enable this without configuring the project objects directly (which
 ;; are auto-generated) a special ede-generic-config object is defined to
@@ -359,7 +359,7 @@ the new configuration."
 (defun ede-generic-new-autoloader (internal-name external-name
                                                  projectfile class)
   "Add a new EDE Autoload instance for identifying a generic project.
-INTERNAL-NAME is a long name that identifies thsi project type.
+INTERNAL-NAME is a long name that identifies this project type.
 EXTERNAL-NAME is a shorter human readable name to describe the project.
 PROJECTFILE is a file name that identifies a project of this type to EDE, such as
 a Makefile, or SConstruct file.
diff --git a/lisp/cedet/ede/pconf.el b/lisp/cedet/ede/pconf.el
index 05290158189..ae503e836d8 100644
--- a/lisp/cedet/ede/pconf.el
+++ b/lisp/cedet/ede/pconf.el
@@ -82,7 +82,7 @@ don't do it.  A value of nil means to just do it.")
                       (directory-file-name
                        (ede-subproject-relative-path sp top-level-project-local)))))
             (when (string= dir "./") (setq dir ""))
-            ;; Use concat, because expand-file-name removes the relativeness.
+            ;; Use concat, because expand-file-name removes the relativity.
             (concat dir "Makefile") )))))
     ;;
     ;; NOTE TO SELF.  TURN THIS INTO THE OFFICIAL LIST
diff --git a/lisp/cedet/ede/proj-comp.el b/lisp/cedet/ede/proj-comp.el
index ae5796e042b..84bf8ebf1a0 100644
--- a/lisp/cedet/ede/proj-comp.el
+++ b/lisp/cedet/ede/proj-comp.el
@@ -97,8 +97,8 @@ use the same autoconf form.")
    (objectextention :initarg :objectextention
                     :type string
                     :documentation
-                    "A string which is the extention used for object files.
-For example, C code uses .o on unix, and Emacs Lisp uses .elc.")
+                    "A string which is the extension used for object files.
+For example, C code uses .o on Unix, and Emacs Lisp uses .elc.")
    )
   "A program used to compile or link a program via a Makefile.
 Contains everything needed to output code into a Makefile, or autoconf
diff --git a/lisp/cedet/ede/proj-shared.el b/lisp/cedet/ede/proj-shared.el
index ec514194e33..4e233f56a12 100644
--- a/lisp/cedet/ede/proj-shared.el
+++ b/lisp/cedet/ede/proj-shared.el
@@ -61,7 +61,7 @@ Use ldlibs to add addition libraries.")
 ;                          "$(CC_SHARED) -shared $(CFLAGS) $(LDFLAGS) -L. -o $@ $^")
 ;                         )
 ;        :commands '("$(C_SHARED_LINK) %s")
-         ;; @TODO - addative modification of autoconf.
+         ;; @TODO - additive modification of autoconf.
          :autoconf '("AC_PROG_LIBTOOL")
          )
   "Compiler for C sourcecode.")
@@ -108,7 +108,7 @@ Use ldlibs to add addition libraries.")
          :variables '(("CXX_SHARED" . "g++")
                       ("CXX_SHARED_COMPILE" .
                        "$(CXX_SHARED) -shared $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)"))
-         ;; @TODO - addative modification of autoconf.
+         ;; @TODO - additive modification of autoconf.
          :autoconf '("AC_PROG_LIBTOOL")
          )
   "Compiler for C sourcecode.")
diff --git a/lisp/cedet/ede/proj.el b/lisp/cedet/ede/proj.el
index 79022be6a5f..a77bb02218b 100644
--- a/lisp/cedet/ede/proj.el
+++ b/lisp/cedet/ede/proj.el
@@ -546,7 +546,7 @@ You may need to add support for this type of file."
                        (file-name-extension (car sources))
                      "")))
           ))
-      ;; Return the disovered compilers
+      ;; Return the discovered compilers.
       comp)))
 
 (defmethod ede-proj-linkers ((obj ede-proj-target))
@@ -580,7 +580,7 @@ Converts all symbols into the objects to be used."
             (while (and avail (not (eieio-instance-inheritor-slot-boundp (car avail) 'sourcetype)))
               (setq avail (cdr avail)))
             (setq link (cdr avail)))))
-      ;; Return the disovered linkers
+      ;; Return the discovered linkers.
       link)))
 
 
diff --git a/lisp/cedet/ede/project-am.el b/lisp/cedet/ede/project-am.el
index 316309092e7..033a486f1a7 100644
--- a/lisp/cedet/ede/project-am.el
+++ b/lisp/cedet/ede/project-am.el
@@ -284,7 +284,7 @@ buffer being in order to provide a smart default target type."
                 (progn (forward-line -1)
                        (end-of-line)
                        (insert "\n"))
-              ;; If the above search fails, thats ok.  We'd just want to be at
+              ;; If the above search fails, that's ok.  We'd just want to be at
               ;; point-min anyway.
               )
             (makefile-insert-macro (car (cdr (cdr ntype))))))
diff --git a/lisp/cedet/inversion.el b/lisp/cedet/inversion.el
index 065ac6d0559..35841d2a6b2 100644
--- a/lisp/cedet/inversion.el
+++ b/lisp/cedet/inversion.el
@@ -199,12 +199,12 @@ not an indication of new features or bug fixes."
              (= v1-1 v2-1)
              (= v1-2 v2-2)
              (= v1-3 v2-3)
-             v1-4 v2-4          ; all or nothin if elt - is =
+             v1-4 v2-4          ; all or nothing if elt - is =
              (< v1-4 v2-4))
         (and (= v1-0 v2-0)
              (= v1-1 v2-1)
              (= v1-2 v2-2)
-             v1-3 v2-3          ; all or nothin if elt - is =
+             v1-3 v2-3          ; all or nothing if elt - is =
              (< v1-3 v2-3))
         (and (= v1-1 v2-1)
              (< v1-2 v2-2))
@@ -216,14 +216,14 @@ not an indication of new features or bug fixes."
         )))
 
 (defun inversion-check-version (version incompatible-version
-                                        minimum &rest reserved)
+                                minimum &rest reserved)
   "Check that a given version meets the minimum requirement.
 VERSION, INCOMPATIBLE-VERSION and MINIMUM are of similar format to
 return entries of `inversion-decode-version', or a classic version
 string.  INCOMPATIBLE-VERSION can be nil.
 RESERVED arguments are kept for a later use.
 Return:
-- nil if everything is ok
+- nil if everything is ok.
 - 'outdated if VERSION is less than MINIMUM.
 - 'incompatible if VERSION is not backward compatible with MINIMUM.
 - t if the check failed."
@@ -374,7 +374,7 @@ Return nil when VERSION-STRING was not found."
       (with-temp-buffer
         ;; The 3000 is a bit arbitrary, but should cut down on
         ;; fileio as version info usually is at the very top
-        ;; of a file.  AFter a long commentary could be bad.
+        ;; of a file.  After a long commentary could be bad.
         (insert-file-contents-literally file nil 0 3000)
         (goto-char (point-min))
         (when (re-search-forward (format tag package 'version) nil t)
diff --git a/lisp/cedet/mode-local.el b/lisp/cedet/mode-local.el
index 0e7657642c2..511a3cd1d8b 100644
--- a/lisp/cedet/mode-local.el
+++ b/lisp/cedet/mode-local.el
@@ -36,7 +36,7 @@
 ;;
 ;; You should use a mode-local variable or override to allow extension
 ;; only if you expect a mode author to provide that extension.  If a
-;; user might wish to customize a give variable or function then
+;; user might wish to customize a given variable or function then
 ;; the existing customization mechanism should be used.
 
 ;; To Do:
@@ -55,7 +55,7 @@
 FUNCTION does not have arguments; when it is entered `current-buffer'
 is the currently selected file buffer.
 If optional argument PREDICATE is non nil, only select file buffers
-for which the function PREDICATE return non-nil.
+for which the function PREDICATE returns non-nil.
 If optional argument BUFFERS is non-nil, it is a list of buffers to
 walk through.  It defaults to `buffer-list'."
   (dolist (b (or buffers (buffer-list)))
@@ -146,7 +146,7 @@ local variables have been defined."
   (mode-local-map-mode-buffers #'activate-mode-local-bindings mode))
 
 (defmacro define-child-mode (mode parent &optional docstring)
-  "Make major mode MODE inherits behavior from PARENT mode.
+  "Make major mode MODE inherit behavior from PARENT mode.
 DOCSTRING is optional and not used.
 To work properly, this should be put after PARENT mode local variables
 definition."
@@ -523,11 +523,11 @@ See also the function `define-overload'."
       result)))
 
 (defmacro define-overloadable-function (name args docstring &rest body)
-  "Define a new function, as with `defun' which can be overloaded.
+  "Define a new function, as with `defun', which can be overloaded.
 NAME is the name of the function to create.
 ARGS are the arguments to the function.
 DOCSTRING is a documentation string to describe the function.  The
-docstring will automatically had details about its overload symbol
+docstring will automatically have details about its overload symbol
 appended to the end.
 BODY is code that would be run when there is no override defined.  The
 default is to call the function `NAME-default' with the appropriate
diff --git a/lisp/cedet/pulse.el b/lisp/cedet/pulse.el
index e3d2bd967b6..4929feb0302 100644
--- a/lisp/cedet/pulse.el
+++ b/lisp/cedet/pulse.el
@@ -36,7 +36,7 @@
 ;;
 ;; `pulse-momentary-highlight-one-line' - Pulse a single line at POINT.
 ;; `pulse-momentary-highlight-region' - Pulse a region.
-;; `pulse-momentary-highlight-overlay' - Pulse an overlay
+;; `pulse-momentary-highlight-overlay' - Pulse an overlay.
 ;;      These three functions will just blink the specified area if
 ;;      the version of Emacs you are using doesn't support pulsing.
 ;;
@@ -65,7 +65,7 @@ background color.
 If the value is nil, highlight with an unchanging color until a
 key is pressed.
 If the value is `never', do no coloring at all.
-Any other value means to the default pulsing behavior.
+Any other value means to do the default pulsing behavior.
 
 If `pulse-flag' is non-nil, but `pulse-available-p' is nil, then
 this flag is ignored."
@@ -163,7 +163,7 @@ Return t if there is more drift to do, nil if completed."
 
 (defun pulse (&optional face)
   "Pulse the colors on our highlight face.
-If optional FACE is provide, reset the face to FACE color,
+If optional FACE is provided, reset the face to FACE color,
 instead of `pulse-highlight-start-face'.
 Be sure to call `pulse-reset-face' after calling pulse."
   (unwind-protect
diff --git a/lisp/cedet/semantic.el b/lisp/cedet/semantic.el
index 639b46ad2cf..337413caf75 100644
--- a/lisp/cedet/semantic.el
+++ b/lisp/cedet/semantic.el
@@ -344,7 +344,7 @@ to use Semantic, and `semantic-init-hook' is run."
     ;; don't go along for the ride.
     (add-hook 'clone-indirect-buffer-hook 'semantic-clear-toplevel-cache
               nil t)
-    ;; Specify that this function has done it's work.  At this point
+    ;; Specify that this function has done its work.  At this point
     ;; we can consider that semantic is active in this buffer.
     (setq semantic-new-buffer-fcn-was-run t)
     ;; Here are some buffer local variables we can initialize ourselves
@@ -378,7 +378,7 @@ Do not set this yourself.  Call `semantic-debug'.")
 
 (defun semantic-elapsed-time (start end)
   "Copied from elp.el.  Was `elp-elapsed-time'.
-Argument START and END bound the time being calculated."
+Arguments START and END bound the time being calculated."
   (float-time (time-subtract end start)))
 
 (defun bovinate (&optional clear)
@@ -431,13 +431,13 @@ will be silently ignored.
 
 Optional arguments:
 NONTERMINAL is the rule to start parsing at.
-DEPTH specifies the lexical depth to descend for parser that use
+DEPTH specifies the lexical depth to descend for parsers that use
 lexical analysis as their first step.
 RETURNONERROR specifies that parsing should stop on the first
 unmatched syntax encountered.  When nil, parsing skips the syntax,
 adding it to the unmatched syntax cache.
 
-Must return a list of semantic tags wich have been cooked
+Must return a list of semantic tags which have been cooked
 \(repositioned properly) but which DO NOT HAVE OVERLAYS associated
 with them.  When overloading this function, use `semantic--tag-expand'
 to cook raw tags.")
@@ -680,7 +680,7 @@ Does nothing if the current buffer doesn't need reparsing."
                     (save-excursion (semantic-fetch-tags))
                     nil)
               ;; If we are here, it is because the lexical step failed,
-              ;; proably due to unterminated lists or something like that.
+              ;; probably due to unterminated lists or something like that.
 
               ;; We do nothing, and just wait for the next idle timer
               ;; to go off.  In the meantime, remember this, and make sure
@@ -960,7 +960,7 @@ Throw away all the old tags, and recreate the tag database."
     '("--"))
   (define-key navigate-menu [senator-go-to-up-reference]
     '(menu-item "Parent Tag" senator-go-to-up-reference
-                :help "Navigate up one reference by tag."))
+                :help "Navigate up one reference by tag"))
   (define-key navigate-menu [senator-next-tag]
     '(menu-item "Next Tag" senator-next-tag
                 :help "Go to the next tag"))
@@ -971,7 +971,7 @@ Throw away all the old tags, and recreate the tag database."
   ;; Top level menu items:
   (define-key cedet-menu-map [semantic-force-refresh]
     '(menu-item "Reparse Buffer" semantic-force-refresh
-                :help "Force a full reparse of the current buffer."
+                :help "Force a full reparse of the current buffer"
                 :visible semantic-mode))
   (define-key cedet-menu-map [semantic-edit-menu]
     `(menu-item "Edit Tags" ,edit-menu
diff --git a/lisp/cedet/semantic/analyze.el b/lisp/cedet/semantic/analyze.el
index 43e998b852e..ef09ea13b42 100644
--- a/lisp/cedet/semantic/analyze.el
+++ b/lisp/cedet/semantic/analyze.el
@@ -57,7 +57,7 @@
 ;;
 ;; context - A semantic datatype representing a point in a buffer.
 ;;
-;; constriant - If a context specifies a specific datatype is needed,
+;; constraint - If a context specifies a specific datatype is needed,
 ;;       that is a constraint.
 ;; constants - Some datatypes define elements of themselves as a
 ;;       constant.  These need to be returned as there would be no
@@ -161,7 +161,7 @@ be just a string in some circumstances.")
 (defclass semantic-analyze-context-return (semantic-analyze-context)
   () ; No extra data.
   "Analysis class for return data.
-Return data methods identify the requred type by the return value
+Return data methods identify the required type by the return value
 of the parent function.")
 
 ;;; METHODS
@@ -254,7 +254,7 @@ Optional argument THROWSYM specifies a symbol the throw on non-recoverable error
         (fname nil)
         (miniscope (when scope (clone scope)))
         )
-    ;; First order check.  Is this wholely contained in the typecache?
+    ;; First order check.  Is this wholly contained in the typecache?
     (setq tmp (semanticdb-typecache-find sequence))
 
     (if tmp
diff --git a/lisp/cedet/semantic/analyze/fcn.el b/lisp/cedet/semantic/analyze/fcn.el
index eae6d013400..967e5c59cda 100644
--- a/lisp/cedet/semantic/analyze/fcn.el
+++ b/lisp/cedet/semantic/analyze/fcn.el
@@ -157,7 +157,7 @@ Almost all searches use the same arguments."
 ;;
 
 (define-overloadable-function semantic-analyze-dereference-metatype (type scope &optional type-declaration)
-  ;; todo - move into typecahe!!
+  ;; todo - move into typecache!!
   "Return a concrete type tag based on input TYPE tag.
 A concrete type is an actual declaration of a memory description,
 such as a structure, or class.  A meta type is an alias,
diff --git a/lisp/cedet/semantic/bovine/c-by.el b/lisp/cedet/semantic/bovine/c-by.el
index 31489a4f625..99429f01acd 100644
--- a/lisp/cedet/semantic/bovine/c-by.el
+++ b/lisp/cedet/semantic/bovine/c-by.el
@@ -1,6 +1,6 @@
 ;;; semantic/bovine/c-by.el --- Generated parser support file
 
-;;; Copyright (C) 1999-2011 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2011 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/cedet/semantic/bovine/c.el b/lisp/cedet/semantic/bovine/c.el
index d8b004df1bd..4da23498cfc 100644
--- a/lisp/cedet/semantic/bovine/c.el
+++ b/lisp/cedet/semantic/bovine/c.el
@@ -298,7 +298,7 @@ Moves completely over balanced #if blocks."
         ;; @TODO - can we use the new c-scan-conditionals
         (c-forward-conditional 1))
        ((looking-at "^\\s-*#\\s-*elif")
-        ;; We need to let the preprocessor analize this one.
+        ;; We need to let the preprocessor analyze this one.
         (beginning-of-line)
         (setq done t)
         )
@@ -344,7 +344,7 @@ Uses known macro tables in SPP to determine what block to skip."
                  (string= sym "0"))
             (and ifdef (not (semantic-lex-spp-symbol-p sym)))
             (and ifndef (semantic-lex-spp-symbol-p sym)))
-        ;; The if indecates to skip this preprocessor section
+        ;; The if indicates to skip this preprocessor section.
         (let ((pt nil))
           ;; (message "%s %s yes" ift sym)
           (beginning-of-line)
@@ -650,7 +650,7 @@ as for the parent."
                 (setq depth 0)
 
                 ;; This is a copy of semantic-parse-region-default where we
-                ;; are doing something special with the lexication of the
+                ;; are doing something special with the lexing of the
                 ;; contents of the semantic-list token.  Stuff not used by C
                 ;; removed.
                 (let ((tokstream
@@ -816,7 +816,7 @@ now.
     ;;
     ;; will create 2 toplevel tags, one is type A, and the other variable B
     ;; where the :type of B is just a type tag A that is a prototype, and
-    ;; the actual struct info of A is it's own toplevel tag.
+    ;; the actual struct info of A is its own toplevel tag.
     (when (or (semantic-tag-of-class-p tag 'function)
               (semantic-tag-of-class-p tag 'variable))
       (let* ((basetype (semantic-tag-type tag))
@@ -954,7 +954,7 @@ now.
                              (nth 1 (car names)) ; name
                              "typedef"
                              (semantic-tag-type-members tag)
-                             ;; parent is just tbe name of what
+                             ;; parent is just the name of what
                              ;; is passed down as a tag.
                              (list
                               (semantic-tag-name
@@ -1311,7 +1311,7 @@ Optional PARENT and COLOR as specified with
   "Return non-nil if TAG is considered abstract.
 PARENT is tag's parent.
 In C, a method is abstract if it is `virtual', which is already
-handled.  A class is abstract iff it's destructor is virtual."
+handled.  A class is abstract iff its destructor is virtual."
   (cond
    ((eq (semantic-tag-class tag) 'type)
     (require 'semantic/find)
@@ -1591,7 +1591,7 @@ DO NOT return the list of tags encompassing point."
         (setq tagreturn (cons (semantic-tag-type (car (semanticdb-find-result-nth tmp idx))) tagreturn))
         (setq idx (1+ idx)))
       )
-    ;; Use the encompased types around point to also look for using statements.
+    ;; Use the encompassed types around point to also look for using statements.
     ;;(setq tagreturn (cons "bread_name" tagreturn))
     (while (cdr tagsaroundpoint)  ; don't search the last one
       (setq tmp (semantic-find-tags-by-class 'using (semantic-tag-components (car tagsaroundpoint))))
diff --git a/lisp/cedet/semantic/bovine/debug.el b/lisp/cedet/semantic/bovine/debug.el
index 9ca7409e335..684db1e7bbf 100644
--- a/lisp/cedet/semantic/bovine/debug.el
+++ b/lisp/cedet/semantic/bovine/debug.el
@@ -114,7 +114,7 @@ LEXTOKEN, is a token returned by the lexer which is being matched."
               :documentation
               "An error condition caught in an action.")
    )
-  "Debugger frame representaion of a lisp error thrown during parsing.")
+  "Debugger frame representation of a lisp error thrown during parsing.")
 
 (defun semantic-create-bovine-debug-error-frame (condition)
   "Create an error frame for bovine debugger.
diff --git a/lisp/cedet/semantic/bovine/el.el b/lisp/cedet/semantic/bovine/el.el
index 2151e9ef53b..98f744dca6e 100644
--- a/lisp/cedet/semantic/bovine/el.el
+++ b/lisp/cedet/semantic/bovine/el.el
@@ -863,7 +863,7 @@ fields and such to, but that is for some other day."
 In Emacs Lisp, a prototype for something may start (autoload ...).
 This is certainly not expected if this is used to display a summary.
 Make up something else.  When we go to write something that needs
-a real Emacs Lisp protype, we can fix it then."
+a real Emacs Lisp prototype, we can fix it then."
   (let ((class (semantic-tag-class tag))
         (name (semantic-format-tag-name tag parent color))
         )
diff --git a/lisp/cedet/semantic/complete.el b/lisp/cedet/semantic/complete.el
index 41a569564d0..7e01b88f60b 100644
--- a/lisp/cedet/semantic/complete.el
+++ b/lisp/cedet/semantic/complete.el
@@ -1023,9 +1023,9 @@ Output must be in semanticdb Find result format."
 
 (defmethod semantic-collector-try-completion-whitespace
   ((obj semantic-collector-abstract) prefix)
-  "For OBJ, do whatepsace completion based on PREFIX.
+  "For OBJ, do whitespace completion based on PREFIX.
 This implies that if there are two completions, one matching
-the test \"preifx\\>\", and one not, the one matching the full
+the test \"prefix\\>\", and one not, the one matching the full
 word version of PREFIX will be chosen, and that text returned.
 This function requires that `semantic-collector-calculate-completions'
 has been run first."
@@ -1478,7 +1478,7 @@ one in the source buffer."
          (tag (cdr nt))
          (table (car nt))
         )
-    ;; If we fail to normalize, resete.
+    ;; If we fail to normalize, reset.
     (when (not tag) (setq table rtable tag rtag))
     ;; Do the focus.
     (let ((buf (or (semantic-tag-buffer tag)
diff --git a/lisp/cedet/semantic/db-find.el b/lisp/cedet/semantic/db-find.el
index 35aef5d16ef..a651e08d53c 100644
--- a/lisp/cedet/semantic/db-find.el
+++ b/lisp/cedet/semantic/db-find.el
@@ -210,7 +210,7 @@ This class will cache data derived during various searches.")
   "Synchronize the search index IDX with some NEW-TAGS."
   ;; Reset our parts.
   (semantic-reset idx)
-  ;; Notify dependants by clearning their indicies.
+  ;; Notify dependants by clearing their indices.
   (semanticdb-notify-references
    (oref idx table)
    (lambda (tab me)
@@ -224,7 +224,7 @@ This class will cache data derived during various searches.")
   (if (semantic-find-tags-by-class 'include new-tags)
       (progn
         (semantic-reset idx)
-        ;; Notify dependants by clearning their indicies.
+        ;; Notify dependants by clearing their indices.
         (semanticdb-notify-references
          (oref idx table)
          (lambda (tab me)
@@ -234,7 +234,7 @@ This class will cache data derived during various searches.")
     (when (oref idx type-cache)
       (when (semanticdb-partial-synchronize (oref idx type-cache) new-tags)
         ;; If the synchronize returns true, we need to notify.
-        ;; Notify dependants by clearning their indicies.
+        ;; Notify dependants by clearing their indices.
         (semanticdb-notify-references
          (oref idx table)
          (lambda (tab me)
@@ -405,10 +405,10 @@ Default action as described in `semanticdb-find-translate-path'."
         ;; do a caching lookup.
         (let ((index (semanticdb-get-table-index table)))
           (if (semanticdb-find-need-cache-update-p table)
-              ;; Lets go look up our indicies
+              ;; Let's go look up our indices.
               (let ((ans (semanticdb-find-translate-path-includes--internal path)))
                 (oset index include-path ans)
-                ;; Once we have our new indicies set up, notify those
+                ;; Once we have our new indices set up, notify those
                 ;; who depend on us if we found something for them to
                 ;; depend on.
                 (when ans (semanticdb-refresh-references table))
@@ -575,7 +575,7 @@ a new path from the provided PATH."
           (setq ans (semanticdb-file-table
                      (car systemdb)
                      ;; I would expect most omniscient to return the same
-                     ;; thing reguardless of filename, but we may have
+                     ;; thing regardless of filename, but we may have
                      ;; one that can return a table of all things the
                      ;; current file needs.
                      (buffer-file-name (current-buffer))))
@@ -675,7 +675,7 @@ Included databases are filtered based on `semanticdb-find-default-throttle'."
      ;;
      ;; NOTE: Not used if EDE is active!
      ((and (semanticdb-find-throttle-active-p 'project)
-           ;; And dont do this if it is a system include.  Not supported by all languages,
+           ;; And don't do this if it is a system include.  Not supported by all languages,
            ;; but when it is, this is a nice fast way to skip this step.
            (not (semantic-tag-include-system-p includetag))
            ;; Don't do this if we have an EDE project.
diff --git a/lisp/cedet/semantic/db-javascript.el b/lisp/cedet/semantic/db-javascript.el
index 213216cee1a..e662290340d 100644
--- a/lisp/cedet/semantic/db-javascript.el
+++ b/lisp/cedet/semantic/db-javascript.el
@@ -137,7 +137,7 @@ Create one of our special tables that can act as an intermediary."
 
 (defmethod semanticdb-get-tags ((table semanticdb-table-javascript ))
   "Return the list of tags belonging to TABLE."
-  ;; NOTE: Omniscient databases probably don't want to keep large tabes
+  ;; NOTE: Omniscient databases probably don't want to keep large tables
   ;;       lolly-gagging about.  Keep internal Emacs tables empty and
   ;;       refer to alternate databases when you need something.
   semanticdb-javascript-tags)
@@ -151,7 +151,7 @@ local variable."
 
 ;;; Usage
 ;;
-;; Unlike other tables, an omniscent database does not need to
+;; Unlike other tables, an omniscient database does not need to
 ;; be associated with a path.  Use this routine to always add ourselves
 ;; to a search list.
 (define-mode-local-override semanticdb-find-translate-path javascript-mode
diff --git a/lisp/cedet/semantic/db-typecache.el b/lisp/cedet/semantic/db-typecache.el
index a4c4bd99f26..7d23ad17009 100644
--- a/lisp/cedet/semantic/db-typecache.el
+++ b/lisp/cedet/semantic/db-typecache.el
@@ -368,7 +368,7 @@ a master list."
                   (semanticdb-typecache-merge-streams
                    incstream
                    ;; Getting the cache from this table will also cause this
-                   ;; file to update its cache from its decendents.
+                   ;; file to update its cache from its descendants.
                    ;;
                    ;; In theory, caches are only built for most includes
                    ;; only once (in the loop before this one), so this ends
diff --git a/lisp/cedet/semantic/db.el b/lisp/cedet/semantic/db.el
index c9013ed8c90..3d2128db29a 100644
--- a/lisp/cedet/semantic/db.el
+++ b/lisp/cedet/semantic/db.el
@@ -636,7 +636,7 @@ The file associated with OBJ does not need to be in a buffer."
   (when (featurep 'semantic/lex-spp)
     (oset table lexical-table (semantic-lex-spp-save-table)))
 
-  ;; Incremental parser doesn't mokey around with this.
+  ;; Incremental parser doesn't monkey around with this.
   (oset table unmatched-syntax semantic-unmatched-syntax-cache)
 
   ;; Synchronize the index
diff --git a/lisp/cedet/semantic/debug.el b/lisp/cedet/semantic/debug.el
index ecab73a80dc..6db47f8b0be 100644
--- a/lisp/cedet/semantic/debug.el
+++ b/lisp/cedet/semantic/debug.el
@@ -175,7 +175,7 @@ TOKEN is a lexical token."
   "For IFACE, highlight NONTERM in the parser buffer.
 NONTERM is the name of the rule currently being processed that shows up
 as a nonterminal (or tag) in the source buffer.
-If RULE and MATCH indicies are specified, highlight those also."
+If RULE and MATCH indices are specified, highlight those also."
   (set-buffer (oref iface :parser-buffer))
 
   (let* ((rules (semantic-find-tags-by-class 'nonterminal (current-buffer)))
@@ -519,22 +519,22 @@ down to your parser later."
   )
 
 (defmethod semantic-debug-parser-go ((parser semantic-debug-parser))
-  "Continue executiong in this PARSER until the next breakpoint."
+  "Continue execution in this PARSER until the next breakpoint."
   (setq semantic-debug-user-command 'go)
   )
 
 (defmethod semantic-debug-parser-fail ((parser semantic-debug-parser))
-  "Continue executiong in this PARSER until the next breakpoint."
+  "Continue execution in this PARSER until the next breakpoint."
   (setq semantic-debug-user-command 'fail)
   )
 
 (defmethod semantic-debug-parser-quit ((parser semantic-debug-parser))
-  "Continue executiong in this PARSER until the next breakpoint."
+  "Continue execution in this PARSER until the next breakpoint."
   (setq semantic-debug-user-command 'quit)
   )
 
 (defmethod semantic-debug-parser-abort ((parser semantic-debug-parser))
-  "Continue executiong in this PARSER until the next breakpoint."
+  "Continue execution in this PARSER until the next breakpoint."
   (setq semantic-debug-user-command 'abort)
   )
 
diff --git a/lisp/cedet/semantic/edit.el b/lisp/cedet/semantic/edit.el
index 4ac2733a34f..3fbcf6d932f 100644
--- a/lisp/cedet/semantic/edit.el
+++ b/lisp/cedet/semantic/edit.el
@@ -392,7 +392,7 @@ See `semantic-edits-change-leaf-tag' for details on parents."
               ;; There are no tags left, and all tags originally
               ;; found are encompassed by the change.  Setup our list
               ;; from the cache
-              (setq list-to-search semantic--buffer-cache);; We have a tag ouside the list.  Check for
+              (setq list-to-search semantic--buffer-cache);; We have a tag outside the list.  Check for
             ;; We know we have a parent because it would
             ;; completely cover the change.  A tag can only
             ;; do that if it is a parent after we get here.
@@ -549,7 +549,7 @@ This function is for internal use by `semantic-edits-incremental-parser'."
                       ;; is not the first change for this
                       ;; iteration, and it starts before the end
                       ;; of current parse region, then it is
-                      ;; encompased within the bounds of tags
+                      ;; encompassed within the bounds of tags
                       ;; modified by the previous iteration's
                       ;; change.
                       (< (semantic-overlay-start (car changes))
@@ -649,7 +649,7 @@ This function is for internal use by `semantic-edits-incremental-parser'."
                     parent-tag (aref tmp 2))
               ;; We can calculate parse begin/end by checking
               ;; out what is in TAGS.  The one near start is
-              ;; always first.  Make sure the reprase includes
+              ;; always first.  Make sure the reparse includes
               ;; the `whitespace' around the snarfed tags.
               ;; Since cache-list is positioned properly, use it
               ;; to find that boundary.
@@ -707,7 +707,7 @@ This function is for internal use by `semantic-edits-incremental-parser'."
       ;; since that is how the multi-tag parser works.  Grab
       ;; the reparse symbol from the first of the returned tags.
       ;;
-      ;; Feb '06 - If repase-symbol is nil, then they are top level
+      ;; Feb '06 - If reparse-symbol is nil, then they are top level
       ;;     tags.  (I'm guessing.)  Is this right?
       (setq reparse-symbol
             (semantic--tag-get-property (car (or tags cache-list))
@@ -859,7 +859,7 @@ pre-positioned to a convenient location."
           (setq cacheend chil)
           (while (and cacheend (not (eq last (car cacheend))))
             (setq cacheend (cdr cacheend)))
-          ;; The splicable part is after cacheend.. so move cacheend
+          ;; The spliceable part is after cacheend.. so move cacheend
           ;; one more tag.
           (setq cacheend (cdr cacheend))
           ;; Splice the found end tag into the cons cell
diff --git a/lisp/cedet/semantic/fw.el b/lisp/cedet/semantic/fw.el
index ca3015c5941..479044ec518 100644
--- a/lisp/cedet/semantic/fw.el
+++ b/lisp/cedet/semantic/fw.el
@@ -251,7 +251,7 @@ later installation should be done in MODE hook."
 
 (defmacro semantic-exit-on-input (symbol &rest forms)
   "Using SYMBOL as an argument to `throw', execute FORMS.
-If FORMS includes a call to `semantic-thow-on-input', then
+If FORMS includes a call to `semantic-throw-on-input', then
 if a user presses any key during execution, this form macro
 will exit with the value passed to `semantic-throw-on-input'.
 If FORMS completes, then the return value is the same as `progn'."
diff --git a/lisp/cedet/semantic/grammar-wy.el b/lisp/cedet/semantic/grammar-wy.el
index acaad49f6af..879fdd92331 100644
--- a/lisp/cedet/semantic/grammar-wy.el
+++ b/lisp/cedet/semantic/grammar-wy.el
@@ -22,8 +22,7 @@
 
 ;;; Commentary:
 ;;
-;; This file is generated from the grammar file semantic-grammar.wy in
-;; the upstream CEDET repository.
+;; This file was generated from admin/grammars/grammar.wy.
 
 ;;; Code:
 
@@ -113,296 +112,296 @@
      '((DEFAULT-PREC NO-DEFAULT-PREC KEYWORD LANGUAGEMODE LEFT NONASSOC PACKAGE PREC PUT QUOTEMODE RIGHT SCOPESTART START TOKEN TYPE USE-MACROS STRING SYMBOL PERCENT_PERCENT CHARACTER PREFIXED_LIST SEXP PROLOGUE EPILOGUE PAREN_BLOCK BRACE_BLOCK LPAREN RPAREN LBRACE RBRACE COLON SEMI OR LT GT)
        nil
        (grammar
-        ((prologue))
-        ((epilogue))
-        ((declaration))
-        ((nonterminal))
-        ((PERCENT_PERCENT)))
+        ((prologue))
+        ((epilogue))
+        ((declaration))
+        ((nonterminal))
+        ((PERCENT_PERCENT)))
        (prologue
-        ((PROLOGUE)
-         (wisent-raw-tag
-          (semantic-tag-new-code "prologue" nil))))
+        ((PROLOGUE)
+         (wisent-raw-tag
+          (semantic-tag-new-code "prologue" nil))))
        (epilogue
-        ((EPILOGUE)
-         (wisent-raw-tag
-          (semantic-tag-new-code "epilogue" nil))))
+        ((EPILOGUE)
+         (wisent-raw-tag
+          (semantic-tag-new-code "epilogue" nil))))
        (declaration
-        ((decl)
-         (eval $1)))
+        ((decl)
+         (eval $1)))
        (decl
-        ((default_prec_decl))
-        ((no_default_prec_decl))
-        ((languagemode_decl))
-        ((package_decl))
-        ((precedence_decl))
-        ((put_decl))
-        ((quotemode_decl))
-        ((scopestart_decl))
-        ((start_decl))
-        ((keyword_decl))
-        ((token_decl))
-        ((type_decl))
-        ((use_macros_decl)))
+        ((default_prec_decl))
+        ((no_default_prec_decl))
+        ((languagemode_decl))
+        ((package_decl))
+        ((precedence_decl))
+        ((put_decl))
+        ((quotemode_decl))
+        ((scopestart_decl))
+        ((start_decl))
+        ((keyword_decl))
+        ((token_decl))
+        ((type_decl))
+        ((use_macros_decl)))
        (default_prec_decl
-         ((DEFAULT-PREC)
-          `(wisent-raw-tag
-            (semantic-tag "default-prec" 'assoc :value
-                          '("t")))))
+         ((DEFAULT-PREC)
+          `(wisent-raw-tag
+            (semantic-tag "default-prec" 'assoc :value
+                          '("t")))))
        (no_default_prec_decl
-        ((NO-DEFAULT-PREC)
-         `(wisent-raw-tag
-           (semantic-tag "default-prec" 'assoc :value
-                         '("nil")))))
+        ((NO-DEFAULT-PREC)
+         `(wisent-raw-tag
+           (semantic-tag "default-prec" 'assoc :value
+                         '("nil")))))
        (languagemode_decl
-        ((LANGUAGEMODE symbols)
-         `(wisent-raw-tag
-           (semantic-tag ',(car $2)
-                         'languagemode :rest ',(cdr $2)))))
+        ((LANGUAGEMODE symbols)
+         `(wisent-raw-tag
+           (semantic-tag ',(car $2)
+                         'languagemode :rest ',(cdr $2)))))
        (package_decl
-        ((PACKAGE SYMBOL)
-         `(wisent-raw-tag
-           (semantic-tag-new-package ',$2 nil))))
+        ((PACKAGE SYMBOL)
+         `(wisent-raw-tag
+           (semantic-tag-new-package ',$2 nil))))
        (precedence_decl
-        ((associativity token_type_opt items)
-         `(wisent-raw-tag
-           (semantic-tag ',$1 'assoc :type ',$2 :value ',$3))))
+        ((associativity token_type_opt items)
+         `(wisent-raw-tag
+           (semantic-tag ',$1 'assoc :type ',$2 :value ',$3))))
        (associativity
-        ((LEFT)
-         (progn "left"))
-        ((RIGHT)
-         (progn "right"))
-        ((NONASSOC)
-         (progn "nonassoc")))
+        ((LEFT)
+         (progn "left"))
+        ((RIGHT)
+         (progn "right"))
+        ((NONASSOC)
+         (progn "nonassoc")))
        (put_decl
-        ((PUT put_name put_value)
-         `(wisent-raw-tag
-           (semantic-tag ',$2 'put :value ',(list $3))))
-        ((PUT put_name put_value_list)
-         `(wisent-raw-tag
-           (semantic-tag ',$2 'put :value ',$3)))
-        ((PUT put_name_list put_value)
-         `(wisent-raw-tag
-           (semantic-tag ',(car $2)
-                         'put :rest ',(cdr $2)
-                         :value ',(list $3))))
-        ((PUT put_name_list put_value_list)
-         `(wisent-raw-tag
-           (semantic-tag ',(car $2)
-                         'put :rest ',(cdr $2)
-                         :value ',$3))))
+        ((PUT put_name put_value)
+         `(wisent-raw-tag
+           (semantic-tag ',$2 'put :value ',(list $3))))
+        ((PUT put_name put_value_list)
+         `(wisent-raw-tag
+           (semantic-tag ',$2 'put :value ',$3)))
+        ((PUT put_name_list put_value)
+         `(wisent-raw-tag
+           (semantic-tag ',(car $2)
+                         'put :rest ',(cdr $2)
+                         :value ',(list $3))))
+        ((PUT put_name_list put_value_list)
+         `(wisent-raw-tag
+           (semantic-tag ',(car $2)
+                         'put :rest ',(cdr $2)
+                         :value ',$3))))
        (put_name_list
-        ((BRACE_BLOCK)
-         (mapcar 'semantic-tag-name
-                 (semantic-parse-region
-                  (car $region1)
-                  (cdr $region1)
-                  'put_names 1))))
+        ((BRACE_BLOCK)
+         (mapcar 'semantic-tag-name
+                 (semantic-parse-region
+                  (car $region1)
+                  (cdr $region1)
+                  'put_names 1))))
        (put_names
-        ((LBRACE)
-         nil)
-        ((RBRACE)
-         nil)
-        ((put_name)
-         (wisent-raw-tag
-          (semantic-tag $1 'put-name))))
+        ((LBRACE)
+         nil)
+        ((RBRACE)
+         nil)
+        ((put_name)
+         (wisent-raw-tag
+          (semantic-tag $1 'put-name))))
        (put_name
-        ((SYMBOL))
-        ((token_type)))
+        ((SYMBOL))
+        ((token_type)))
        (put_value_list
-        ((BRACE_BLOCK)
-         (mapcar 'semantic-tag-code-detail
-                 (semantic-parse-region
-                  (car $region1)
-                  (cdr $region1)
-                  'put_values 1))))
+        ((BRACE_BLOCK)
+         (mapcar 'semantic-tag-code-detail
+                 (semantic-parse-region
+                  (car $region1)
+                  (cdr $region1)
+                  'put_values 1))))
        (put_values
-        ((LBRACE)
-         nil)
-        ((RBRACE)
-         nil)
-        ((put_value)
-         (wisent-raw-tag
-          (semantic-tag-new-code "put-value" $1))))
+        ((LBRACE)
+         nil)
+        ((RBRACE)
+         nil)
+        ((put_value)
+         (wisent-raw-tag
+          (semantic-tag-new-code "put-value" $1))))
        (put_value
-        ((SYMBOL any_value)
-         (cons $1 $2)))
+        ((SYMBOL any_value)
+         (cons $1 $2)))
        (scopestart_decl
-        ((SCOPESTART SYMBOL)
-         `(wisent-raw-tag
-           (semantic-tag ',$2 'scopestart))))
+        ((SCOPESTART SYMBOL)
+         `(wisent-raw-tag
+           (semantic-tag ',$2 'scopestart))))
        (quotemode_decl
-        ((QUOTEMODE SYMBOL)
-         `(wisent-raw-tag
-           (semantic-tag ',$2 'quotemode))))
+        ((QUOTEMODE SYMBOL)
+         `(wisent-raw-tag
+           (semantic-tag ',$2 'quotemode))))
        (start_decl
-        ((START symbols)
-         `(wisent-raw-tag
-           (semantic-tag ',(car $2)
-                         'start :rest ',(cdr $2)))))
+        ((START symbols)
+         `(wisent-raw-tag
+           (semantic-tag ',(car $2)
+                         'start :rest ',(cdr $2)))))
        (keyword_decl
-        ((KEYWORD SYMBOL string_value)
-         `(wisent-raw-tag
-           (semantic-tag ',$2 'keyword :value ',$3))))
+        ((KEYWORD SYMBOL string_value)
+         `(wisent-raw-tag
+           (semantic-tag ',$2 'keyword :value ',$3))))
        (token_decl
-        ((TOKEN token_type_opt SYMBOL string_value)
-         `(wisent-raw-tag
-           (semantic-tag ',$3 ',(if $2 'token 'keyword)
-                         :type ',$2 :value ',$4)))
-        ((TOKEN token_type_opt symbols)
-         `(wisent-raw-tag
-           (semantic-tag ',(car $3)
-                         'token :type ',$2 :rest ',(cdr $3)))))
+        ((TOKEN token_type_opt SYMBOL string_value)
+         `(wisent-raw-tag
+           (semantic-tag ',$3 ',(if $2 'token 'keyword)
+                         :type ',$2 :value ',$4)))
+        ((TOKEN token_type_opt symbols)
+         `(wisent-raw-tag
+           (semantic-tag ',(car $3)
+                         'token :type ',$2 :rest ',(cdr $3)))))
        (token_type_opt
-        (nil)
-        ((token_type)))
+        (nil)
+        ((token_type)))
        (token_type
-        ((LT SYMBOL GT)
-         (progn $2)))
+        ((LT SYMBOL GT)
+         (progn $2)))
        (type_decl
-        ((TYPE token_type plist_opt)
-         `(wisent-raw-tag
-           (semantic-tag ',$2 'type :value ',$3))))
+        ((TYPE token_type plist_opt)
+         `(wisent-raw-tag
+           (semantic-tag ',$2 'type :value ',$3))))
        (plist_opt
-        (nil)
-        ((plist)))
+        (nil)
+        ((plist)))
        (plist
-        ((plist put_value)
-         (append
-          (list $2)
-          $1))
-        ((put_value)
-         (list $1)))
+        ((plist put_value)
+         (append
+          (list $2)
+          $1))
+        ((put_value)
+         (list $1)))
        (use_name_list
-        ((BRACE_BLOCK)
-         (mapcar 'semantic-tag-name
-                 (semantic-parse-region
-                  (car $region1)
-                  (cdr $region1)
-                  'use_names 1))))
+        ((BRACE_BLOCK)
+         (mapcar 'semantic-tag-name
+                 (semantic-parse-region
+                  (car $region1)
+                  (cdr $region1)
+                  'use_names 1))))
        (use_names
-        ((LBRACE)
-         nil)
-        ((RBRACE)
-         nil)
-        ((SYMBOL)
-         (wisent-raw-tag
-          (semantic-tag $1 'use-name))))
+        ((LBRACE)
+         nil)
+        ((RBRACE)
+         nil)
+        ((SYMBOL)
+         (wisent-raw-tag
+          (semantic-tag $1 'use-name))))
        (use_macros_decl
-        ((USE-MACROS SYMBOL use_name_list)
-         `(wisent-raw-tag
-           (semantic-tag "macro" 'macro :type ',$2 :value ',$3))))
+        ((USE-MACROS SYMBOL use_name_list)
+         `(wisent-raw-tag
+           (semantic-tag "macro" 'macro :type ',$2 :value ',$3))))
        (string_value
-        ((STRING)
-         (read $1)))
+        ((STRING)
+         (read $1)))
        (any_value
-        ((SYMBOL))
-        ((STRING))
-        ((PAREN_BLOCK))
-        ((PREFIXED_LIST))
-        ((SEXP)))
+        ((SYMBOL))
+        ((STRING))
+        ((PAREN_BLOCK))
+        ((PREFIXED_LIST))
+        ((SEXP)))
        (symbols
-        ((lifo_symbols)
-         (nreverse $1)))
+        ((lifo_symbols)
+         (nreverse $1)))
        (lifo_symbols
-        ((lifo_symbols SYMBOL)
-         (cons $2 $1))
-        ((SYMBOL)
-         (list $1)))
+        ((lifo_symbols SYMBOL)
+         (cons $2 $1))
+        ((SYMBOL)
+         (list $1)))
        (nonterminal
-        ((SYMBOL
-          (setq semantic-grammar-wy--nterm $1 semantic-grammar-wy--rindx 0)
-          COLON rules SEMI)
-         (wisent-raw-tag
-          (semantic-tag $1 'nonterminal :children $4))))
+        ((SYMBOL
+          (setq semantic-grammar-wy--nterm $1 semantic-grammar-wy--rindx 0)
+          COLON rules SEMI)
+         (wisent-raw-tag
+          (semantic-tag $1 'nonterminal :children $4))))
        (rules
-        ((lifo_rules)
-         (apply 'nconc
-                (nreverse $1))))
+        ((lifo_rules)
+         (apply 'nconc
+                (nreverse $1))))
        (lifo_rules
-        ((lifo_rules OR rule)
-         (cons $3 $1))
-        ((rule)
-         (list $1)))
+        ((lifo_rules OR rule)
+         (cons $3 $1))
+        ((rule)
+         (list $1)))
        (rule
-        ((rhs)
-         (let*
-             ((nterm semantic-grammar-wy--nterm)
-              (rindx semantic-grammar-wy--rindx)
-              (rhs $1)
-              comps prec action elt)
-           (setq semantic-grammar-wy--rindx
-                 (1+ semantic-grammar-wy--rindx))
-           (while rhs
-             (setq elt
-                   (car rhs)
-                   rhs
-                   (cdr rhs))
-             (cond
-              ((vectorp elt)
-               (if prec
-                   (error "Duplicate %%prec in `%s:%d' rule" nterm rindx))
-               (setq prec
-                     (aref elt 0)))
-              ((consp elt)
-               (if
-                   (or action comps)
-                   (setq comps
-                         (cons elt comps)
-                         semantic-grammar-wy--rindx
-                         (1+ semantic-grammar-wy--rindx))
-                 (setq action
-                       (car elt))))
-              (t
-               (setq comps
-                     (cons elt comps)))))
-           (wisent-cook-tag
-            (wisent-raw-tag
-             (semantic-tag
-              (format "%s:%d" nterm rindx)
-              'rule :type
-              (if comps "group" "empty")
-              :value comps :prec prec :expr action))))))
+        ((rhs)
+         (let*
+             ((nterm semantic-grammar-wy--nterm)
+              (rindx semantic-grammar-wy--rindx)
+              (rhs $1)
+              comps prec action elt)
+           (setq semantic-grammar-wy--rindx
+                 (1+ semantic-grammar-wy--rindx))
+           (while rhs
+             (setq elt
+                   (car rhs)
+                   rhs
+                   (cdr rhs))
+             (cond
+              ((vectorp elt)
+               (if prec
+                   (error "Duplicate %%prec in `%s:%d' rule" nterm rindx))
+               (setq prec
+                     (aref elt 0)))
+              ((consp elt)
+               (if
+                   (or action comps)
+                   (setq comps
+                         (cons elt comps)
+                         semantic-grammar-wy--rindx
+                         (1+ semantic-grammar-wy--rindx))
+                 (setq action
+                       (car elt))))
+              (t
+               (setq comps
+                     (cons elt comps)))))
+           (wisent-cook-tag
+            (wisent-raw-tag
+             (semantic-tag
+              (format "%s:%d" nterm rindx)
+              'rule :type
+              (if comps "group" "empty")
+              :value comps :prec prec :expr action))))))
        (rhs
-        (nil)
-        ((rhs item)
-         (cons $2 $1))
-        ((rhs action)
-         (cons
-          (list $2)
-          $1))
-        ((rhs PREC item)
-         (cons
-          (vector $3)
-          $1)))
+        (nil)
+        ((rhs item)
+         (cons $2 $1))
+        ((rhs action)
+         (cons
+          (list $2)
+          $1))
+        ((rhs PREC item)
+         (cons
+          (vector $3)
+          $1)))
        (action
-        ((PAREN_BLOCK))
-        ((PREFIXED_LIST))
-        ((BRACE_BLOCK)
-         (format "(progn\n%s)"
-                 (let
-                     ((s $1))
-                   (if
-                       (string-match "^{[
\n     ]*" s)
-                       (setq s
-                             (substring s
-                                        (match-end 0))))
-                   (if
-                       (string-match "[
\n       ]*}$" s)
-                       (setq s
-                             (substring s 0
-                                        (match-beginning 0))))
-                   s))))
+        ((PAREN_BLOCK))
+        ((PREFIXED_LIST))
+        ((BRACE_BLOCK)
+         (format "(progn\n%s)"
+                 (let
+                     ((s $1))
+                   (if
+                       (string-match "^{[
\n     ]*" s)
+                       (setq s
+                             (substring s
+                                        (match-end 0))))
+                   (if
+                       (string-match "[
\n       ]*}$" s)
+                       (setq s
+                             (substring s 0
+                                        (match-beginning 0))))
+                   s))))
        (items
-        ((lifo_items)
-         (nreverse $1)))
+        ((lifo_items)
+         (nreverse $1)))
        (lifo_items
-        ((lifo_items item)
-         (cons $2 $1))
-        ((item)
-         (list $1)))
+        ((lifo_items item)
+         (cons $2 $1))
+        ((item)
+         (list $1)))
        (item
-        ((SYMBOL))
-        ((CHARACTER))))
+        ((SYMBOL))
+        ((CHARACTER))))
      '(grammar prologue epilogue declaration nonterminal rule put_names put_values use_names)))
   "Parser table.")
 
@@ -411,10 +410,10 @@
   (semantic-install-function-overrides
    '((parse-stream . wisent-parse-stream)))
   (setq semantic-parser-name "LALR"
-        semantic--parse-table semantic-grammar-wy--parse-table
-        semantic-debug-parser-source "semantic-grammar.wy"
-        semantic-flex-keywords-obarray semantic-grammar-wy--keyword-table
-        semantic-lex-types-obarray semantic-grammar-wy--token-table)
+        semantic--parse-table semantic-grammar-wy--parse-table
+        semantic-debug-parser-source "semantic-grammar.wy"
+        semantic-flex-keywords-obarray semantic-grammar-wy--keyword-table
+        semantic-lex-types-obarray semantic-grammar-wy--token-table)
   ;; Collect unmatched syntax lexical tokens
   (semantic-make-local-hook 'wisent-discarding-token-functions)
   (add-hook 'wisent-discarding-token-functions
diff --git a/lisp/cedet/semantic/grammar.el b/lisp/cedet/semantic/grammar.el
index 1d1184e534f..98b1ab55c32 100644
--- a/lisp/cedet/semantic/grammar.el
+++ b/lisp/cedet/semantic/grammar.el
@@ -104,10 +104,10 @@ It ignores whitespaces, newlines and comments."
   ;; regexp match semicolons inside strings!
   semantic-lex-ignore-comments
   ;; Must detect prefixed list before punctuation because prefix chars
-  ;; are also punctuations!
+  ;; are also punctuation!
   semantic-grammar-wy--<qlist>-sexp-analyzer
-  ;; Must detect punctuations after comments because the semicolon can
-  ;; be a punctuation or a comment start!
+  ;; Must detect punctuation after comments because the semicolon can
+  ;; be punctuation or a comment start!
   semantic-grammar-wy--<punctuation>-string-analyzer
   semantic-grammar-wy--<block>-block-analyzer
   semantic-grammar-wy--<sexp>-sexp-analyzer)
diff --git a/lisp/cedet/semantic/html.el b/lisp/cedet/semantic/html.el
index 137759d46ac..a7d150ec4a9 100644
--- a/lisp/cedet/semantic/html.el
+++ b/lisp/cedet/semantic/html.el
@@ -126,7 +126,7 @@ html parser.  PNT is the new point to set."
 NAME is the name of this section.
 MEMBERS is a list of semantic tags representing the elements that make
 up this section.
-LEVEL is the levelling level.
+LEVEL is the leveling level.
 START and END define the location of data described by the tag."
   (let ((anchorp (eq level 11)))
     (append (semantic-tag name
diff --git a/lisp/cedet/semantic/ia-sb.el b/lisp/cedet/semantic/ia-sb.el
index 95a68673b8c..edd62cc5ca5 100644
--- a/lisp/cedet/semantic/ia-sb.el
+++ b/lisp/cedet/semantic/ia-sb.el
@@ -348,7 +348,7 @@ TEXT TAG and INDENT are the details."
           (insert (semantic-tag-name tag))
           (if movepoint (setq movepoint (point)))
           ;; I'd like to use this to add fancy () or what not at the end
-          ;; but we need the parent file whih requires an upgrade to the
+          ;; but we need the parent file which requires an upgrade to the
           ;; analysis tool.
           ;;(semantic-insert-foreign-tag tag ??))
           )
diff --git a/lisp/cedet/semantic/idle.el b/lisp/cedet/semantic/idle.el
index b49d1db1ad5..4b3a51e79f7 100644
--- a/lisp/cedet/semantic/idle.el
+++ b/lisp/cedet/semantic/idle.el
@@ -245,7 +245,7 @@ And also manages services that depend on tag values."
         ;; services.  Stop on keypress.
 
         ;; NOTE ON COMMENTED SAFE HERE
-        ;; We used to not execute the services if the buffer wsa
+        ;; We used to not execute the services if the buffer was
         ;; unparseable.  We now assume that they are lexically
         ;; safe to do, because we have marked the buffer unparseable
         ;; if there was a problem.
@@ -254,11 +254,11 @@ And also manages services that depend on tag values."
           (save-excursion
             (semantic-throw-on-input 'idle-queue)
             (when semantic-idle-scheduler-verbose-flag
-              (message "IDLE: execture service %s..." service))
+              (message "IDLE: execute service %s..." service))
             (semantic-safe (format "Idle Service Error %s: %%S" service)
               (funcall service))
             (when semantic-idle-scheduler-verbose-flag
-              (message "IDLE: execture service %s...done" service))
+              (message "IDLE: execute service %s...done" service))
             )))
         ;;)
       ;; Finally loop over remaining buffers, trying to update them as
@@ -515,7 +515,7 @@ Does nothing if the current buffer doesn't need reparsing."
                         (save-excursion (semantic-fetch-tags))
                         nil)
                   ;; If we are here, it is because the lexical step failed,
-                  ;; proably due to unterminated lists or something like that.
+                  ;; probably due to unterminated lists or something like that.
 
                   ;; We do nothing, and just wait for the next idle timer
                   ;; to go off.  In the meantime, remember this, and make sure
diff --git a/lisp/cedet/semantic/imenu.el b/lisp/cedet/semantic/imenu.el
index 033c34e1b83..7566c08f13a 100644
--- a/lisp/cedet/semantic/imenu.el
+++ b/lisp/cedet/semantic/imenu.el
@@ -368,7 +368,7 @@ Optional argument PARENT is a tag parent of STREAM."
                      semantic-imenu-expandable-tag-classes)
                children
                )
-          ;; to keep an homogeneous menu organisation, type menu items
+          ;; to keep an homogeneous menu organization, type menu items
           ;; always have a sub-menu with at least the *definition*
           ;; item (even if the tag has no type components)
           (progn
diff --git a/lisp/cedet/semantic/lex-spp.el b/lisp/cedet/semantic/lex-spp.el
index 8009a257a7b..cf82da303ce 100644
--- a/lisp/cedet/semantic/lex-spp.el
+++ b/lisp/cedet/semantic/lex-spp.el
@@ -452,7 +452,7 @@ continue processing recursively."
          ;; If val is nil, that's probably wrong.
          ;; Found a system header case where this was true.
          ((null val) "")
-         ;; Debug wierd stuff.
+         ;; Debug weird stuff.
          (t (debug)))
         ))
      ((stringp txt)
@@ -821,7 +821,7 @@ STR occurs in the current buffer between BEG and END."
 ;; a macro.
 
 (defun semantic-lex-spp-first-token-arg-list (token)
-  "If TOKEN is a semantic-list, turn it into a an SPP ARG LIST."
+  "If TOKEN is a semantic-list, turn it into an SPP ARG LIST."
   (when (and (consp token)
              (symbolp (car token))
              (eq 'semantic-list (car token)))
@@ -1067,7 +1067,7 @@ of type `spp-macro-undef' is to be created."
 ;;
 ;; These analyzers help a language define how include files
 ;; are identified.  These are ONLY for languages that perform
-;; an actual textual includesion, and not for imports.
+;; an actual textual inclusion, and not for imports.
 ;;
 ;; This section is supposed to allow the macros from the headers to be
 ;; added to the local dynamic macro table, but that hasn't been
diff --git a/lisp/cedet/semantic/lex.el b/lisp/cedet/semantic/lex.el
index 4da3be98f37..dab5c444fae 100644
--- a/lisp/cedet/semantic/lex.el
+++ b/lisp/cedet/semantic/lex.el
@@ -165,7 +165,7 @@
 ;;
 ;; %type  <punctuation> syntax "\\(\\s.\\|\\s$\\|\\s'\\)+" matchdatatype string
 ;;
-;; ;; Some punctuations based on the type defines above
+;; ;; Some punctuation based on the type defines above
 ;;
 ;; %token <punctuation> NOT         "!"
 ;; %token <punctuation> NOTEQ       "!="
@@ -1248,7 +1248,7 @@ they are comment end characters) AND when you want whitespace tokens."
   (if (eq (semantic-lex-token-class (car semantic-lex-token-stream))
           'whitespace)
       ;; Merge whitespace tokens together if they are adjacent.  Two
-      ;; whitespace tokens may be sperated by a comment which is not in
+      ;; whitespace tokens may be separated by a comment which is not in
       ;; the token stream.
       (setcdr (semantic-lex-token-bounds (car semantic-lex-token-stream))
               (match-end 0))
@@ -1271,7 +1271,7 @@ they are comment end characters)."
   (if (eq (semantic-lex-token-class (car semantic-lex-token-stream))
           'whitespace)
       ;; Merge whitespace tokens together if they are adjacent.  Two
-      ;; whitespace tokens may be sperated by a comment which is not in
+      ;; whitespace tokens may be separated by a comment which is not in
       ;; the token stream.
       (progn
         (setq semantic-lex-end-point (match-end 0))
@@ -1313,7 +1313,7 @@ and number formats."
 
 (define-lex-analyzer semantic-lex-punctuation-type
   "Detect and create a punctuation type token.
-Recognized punctuations are defined in the current table of lexical
+Recognized punctuation is defined in the current table of lexical
 types, as the value of the `punctuation' token type."
   (and (looking-at "\\(\\s.\\|\\s$\\|\\s'\\)+")
        (let* ((key (match-string 0))
@@ -1362,11 +1362,11 @@ Return either a paren token or a semantic list token depending on
     ))
 
 (define-lex-simple-regex-analyzer semantic-lex-open-paren
-  "Detect and create an open parenthisis token."
+  "Detect and create an open parenthesis token."
   "\\s(" 'open-paren 0  (setq semantic-lex-current-depth (1+ semantic-lex-current-depth)))
 
 (define-lex-simple-regex-analyzer semantic-lex-close-paren
-  "Detect and create a close paren token."
+  "Detect and create a close parenthesis token."
   "\\s)" 'close-paren 0 (setq semantic-lex-current-depth (1- semantic-lex-current-depth)))
 
 (define-lex-regex-analyzer semantic-lex-string
diff --git a/lisp/cedet/semantic/sb.el b/lisp/cedet/semantic/sb.el
index d9a3ede360d..8c3d6c17cf4 100644
--- a/lisp/cedet/semantic/sb.el
+++ b/lisp/cedet/semantic/sb.el
@@ -87,7 +87,7 @@ Restore the old current buffer when completed."
 ;;    @ type
 ;;    = default value
 ;;
-;;  +> keywrd Type
+;;  +> keyword Type
 ;;   +> type part
 ;;
 ;;  +>  -> click to see additional information
diff --git a/lisp/cedet/semantic/scope.el b/lisp/cedet/semantic/scope.el
index 16deb245527..ea4903c70ea 100644
--- a/lisp/cedet/semantic/scope.el
+++ b/lisp/cedet/semantic/scope.el
@@ -303,7 +303,7 @@ are from nesting data types."
                    (miniscope (semantic-scope-cache "mini"))
                    ptag)
 
-              ;; Find the next entry in the refereneced type for
+              ;; Find the next entry in the referenced type for
               ;; our function, and append to return list till our
               ;; returnlist is empty.
               (while snlist
diff --git a/lisp/cedet/semantic/senator.el b/lisp/cedet/semantic/senator.el
index 5399d4d5649..b4618d1c18f 100644
--- a/lisp/cedet/semantic/senator.el
+++ b/lisp/cedet/semantic/senator.el
@@ -179,8 +179,8 @@ source."
     (goto-char (semantic-tag-start tag))
     (when (re-search-forward (concat
                               ;; The tag name is expected to be
-                              ;; between word delimiters, whitespaces,
-                              ;; or punctuations.
+                              ;; between word delimiters, whitespace,
+                              ;; or punctuation.
                               "\\(\\<\\|\\s-+\\|\\s.\\)"
                               (regexp-quote name)
                               "\\(\\>\\|\\s-+\\|\\s.\\)")
diff --git a/lisp/cedet/semantic/sort.el b/lisp/cedet/semantic/sort.el
index c3d8b26810c..a4126e1384b 100644
--- a/lisp/cedet/semantic/sort.el
+++ b/lisp/cedet/semantic/sort.el
@@ -229,7 +229,7 @@ unmodified as components of their parent tags."
     (mapc (lambda (tag)
             (let ((components (semantic-tag-components tag)))
               (if (and components
-                       ;; unpositined tags can be hazardous to
+                       ;; unpositioned tags can be hazardous to
                        ;; completion.  Do we need any type of tag
                        ;; here?  - EL
                        (semantic-tag-with-position-p (car components)))
diff --git a/lisp/cedet/semantic/symref.el b/lisp/cedet/semantic/symref.el
index 61006802c0d..cbae9f85573 100644
--- a/lisp/cedet/semantic/symref.el
+++ b/lisp/cedet/semantic/symref.el
@@ -324,7 +324,7 @@ Use the  `semantic-symref-hit-tags' method to get this list.")
       (setq ans (list (car files))
             files (cdr files))
       (dolist (F files)
-        ;; This algorithm for uniqing the file list depends on the
+        ;; This algorithm for uniquifying the file list depends on the
         ;; tool in question providing all the hits in the same file
         ;; grouped together.
         (when (not (string= F (car ans)))
diff --git a/lisp/cedet/semantic/symref/list.el b/lisp/cedet/semantic/symref/list.el
index a09928c7dfc..53422541c47 100644
--- a/lisp/cedet/semantic/symref/list.el
+++ b/lisp/cedet/semantic/symref/list.el
@@ -24,7 +24,7 @@
 ;; Provide a simple user facing API to finding symbol references.
 ;;
 ;; This UI is the base of some refactoring tools.  For any refactor,
-;; the user will execture [FIXME what?] `semantic-symref' in a tag.
+;; the user will execute `semantic-symref' in a tag.
 ;; Once that data is collected, the output will be listed in a buffer.
 ;; In the output buffer, the user can then initiate different
 ;; refactoring operations.
@@ -103,7 +103,7 @@ Display the references in`semantic-symref-results-mode'."
     (when (not res) (error "No references found"))
     (semantic-symref-result-get-tags res t)
     (message "Gathering References...done")
-    ;; Build a refrences buffer.
+    ;; Build a references buffer.
     (let ((buff (get-buffer-create
                  (format "*Symref %s" str)))
           )
@@ -401,7 +401,7 @@ BUTTON is the button that was clicked."
 
 ;;; UTILS
 ;;
-;; List mode utils for understadning the current line
+;; List mode utils for understanding the current line
 
 (defun semantic-symref-list-on-hit-p ()
   "Return the line number if the cursor is on a buffer line with a hit.
diff --git a/lisp/cedet/semantic/tag-file.el b/lisp/cedet/semantic/tag-file.el
index d118d9b6203..86fa382a766 100644
--- a/lisp/cedet/semantic/tag-file.el
+++ b/lisp/cedet/semantic/tag-file.el
@@ -125,7 +125,7 @@ Depends on `semantic-dependency-include-path' for searching.  Always searches
           (tag-fname nil))
       (cond ((semantic-tag-in-buffer-p tag)
              ;; If the tag has an overlay and buffer associated with it,
-             ;; switch to that buffer so that we get the right override metohds.
+             ;; switch to that buffer so that we get the right override methods.
              (set-buffer (semantic-tag-buffer tag)))
             ((semantic-tag-file-name tag)
              ;; If it didn't have a buffer, but does have a file
diff --git a/lisp/cedet/semantic/tag-ls.el b/lisp/cedet/semantic/tag-ls.el
index 4d001322108..2f585cbdf45 100644
--- a/lisp/cedet/semantic/tag-ls.el
+++ b/lisp/cedet/semantic/tag-ls.el
@@ -195,7 +195,7 @@ See `semantic-tag-static-p'."
 ;;;###autoload
 (define-overloadable-function semantic-tag-prototype-p (tag)
   "Return non nil if TAG is a prototype.
-For some laguages, such as C, a prototype is a declaration of
+For some languages, such as C, a prototype is a declaration of
 something without an implementation."
   )
 
diff --git a/lisp/cedet/semantic/tag.el b/lisp/cedet/semantic/tag.el
index cf3f5b603c8..f8538ef7901 100644
--- a/lisp/cedet/semantic/tag.el
+++ b/lisp/cedet/semantic/tag.el
@@ -919,7 +919,7 @@ That is the value of the attribute `:system-flag'."
   "Return a filename representation of TAG.
 The default action is to return the `semantic-tag-name'.
 Some languages do not use full filenames in their include statements.
-Override this method to translate the code represenation
+Override this method to translate the code representation
 into a filename.  (A relative filename if necessary.)
 
 See `semantic-dependency-tag-file' to expand an include
@@ -1162,7 +1162,7 @@ This function is for internal use only."
        (semantic-tag-components-with-overlays tag)))))
 
 (defun semantic--tag-unlink-cache-from-buffer ()
-  "Convert all tags in the current cache to use overlay proxys.
+  "Convert all tags in the current cache to use overlay proxies.
 This function is for internal use only."
   (require 'semantic)
   (semantic--tag-unlink-list-from-buffer
diff --git a/lisp/cedet/semantic/texi.el b/lisp/cedet/semantic/texi.el
index c2f080ce75b..78d5569c2a7 100644
--- a/lisp/cedet/semantic/texi.el
+++ b/lisp/cedet/semantic/texi.el
@@ -262,7 +262,7 @@ can handle the @menu environment.")
       (let ((parenthetical (semantic-up-context-default))
             )
         (when (not parenthetical)
-          ;; We are in parenthises.  Are they the types of parens
+          ;; We are in parentheses.  Are they the types of parens
           ;; belonging to a texinfo construct?
           (forward-word -1)
           (when (looking-at "@\\w+{")
@@ -483,7 +483,7 @@ that start with that symbol."
 ;; This section provides specialized access into texinfo files.
 ;; Because texinfo files often directly refer to functions and programs
 ;; it is useful to access the texinfo file from the C code for document
-;; maintainance.
+;; maintenance.
 (defun semantic-texi-associated-files (&optional buffer)
   "Find texinfo files associated with BUFFER."
   (save-excursion
diff --git a/lisp/cedet/semantic/wisent/javat-wy.el b/lisp/cedet/semantic/wisent/javat-wy.el
index 38c19387440..562b0da6caa 100644
--- a/lisp/cedet/semantic/wisent/javat-wy.el
+++ b/lisp/cedet/semantic/wisent/javat-wy.el
@@ -19,12 +19,11 @@
 
 ;;; Commentary:
 ;;
-;; This file was generated from etc/java-tags.wy.
+;; This file was generated from admin/grammars/java-tags.wy.
 
 ;;; Code:
 
 (require 'semantic/lex)
-
 
 ;;; Prologue
 ;;
@@ -396,7 +395,7 @@
         ((SEMICOLON))
         ((block)))
        (block
-           ((BRACE_BLOCK)))
+        ((BRACE_BLOCK)))
        (formal_parameter_list
         ((PAREN_BLOCK)
          (semantic-parse-region
@@ -557,7 +556,7 @@
    '((parse-stream . wisent-parse-stream)))
   (setq semantic-parser-name "LALR"
         semantic--parse-table wisent-java-tags-wy--parse-table
-        semantic-debug-parser-source "wisent-java-tags.wy"
+        semantic-debug-parser-source "java-tags.wy"
         semantic-flex-keywords-obarray wisent-java-tags-wy--keyword-table
         semantic-lex-types-obarray wisent-java-tags-wy--token-table)
   ;; Collect unmatched syntax lexical tokens
@@ -567,10 +566,6 @@
 
 
 ;;; Analyzers
-;;
-(define-lex-keyword-type-analyzer wisent-java-tags-wy--<keyword>-keyword-analyzer
-  "keyword analyzer for <keyword> tokens."
-  "\\(\\sw\\|\\s_\\)+")
 
 (define-lex-block-type-analyzer wisent-java-tags-wy--<block>-block-analyzer
   "block analyzer for <block> tokens."
@@ -583,23 +578,6 @@
     ("]" RBRACK))
   )
 
-(define-lex-regex-type-analyzer wisent-java-tags-wy--<symbol>-regexp-analyzer
-  "regexp analyzer for <symbol> tokens."
-  "\\(\\sw\\|\\s_\\)+"
-  nil
-  'IDENTIFIER)
-
-(define-lex-sexp-type-analyzer wisent-java-tags-wy--<string>-sexp-analyzer
-  "sexp analyzer for <string> tokens."
-  "\\s\""
-  'STRING_LITERAL)
-
-(define-lex-regex-type-analyzer wisent-java-tags-wy--<number>-regexp-analyzer
-  "regexp analyzer for <number> tokens."
-  semantic-lex-number-expression
-  nil
-  'NUMBER_LITERAL)
-
 (define-lex-string-type-analyzer wisent-java-tags-wy--<punctuation>-string-analyzer
   "string analyzer for <punctuation> tokens."
   "\\(\\s.\\|\\s$\\|\\s'\\)+"
@@ -645,12 +623,33 @@
     (NOT . "!"))
   'punctuation)
 
+(define-lex-regex-type-analyzer wisent-java-tags-wy--<symbol>-regexp-analyzer
+  "regexp analyzer for <symbol> tokens."
+  "\\(\\sw\\|\\s_\\)+"
+  nil
+  'IDENTIFIER)
+
 (define-lex-regex-type-analyzer wisent-java-tags-wy--<unicode>-regexp-analyzer
   "regexp analyzer for <unicode> tokens."
   "\\\\u[0-9a-f][0-9a-f][0-9a-f][0-9a-f]"
   nil
   'unicodecharacter)
 
+(define-lex-regex-type-analyzer wisent-java-tags-wy--<number>-regexp-analyzer
+  "regexp analyzer for <number> tokens."
+  semantic-lex-number-expression
+  nil
+  'NUMBER_LITERAL)
+
+(define-lex-sexp-type-analyzer wisent-java-tags-wy--<string>-sexp-analyzer
+  "sexp analyzer for <string> tokens."
+  "\\s\""
+  'STRING_LITERAL)
+
+(define-lex-keyword-type-analyzer wisent-java-tags-wy--<keyword>-keyword-analyzer
+  "keyword analyzer for <keyword> tokens."
+  "\\(\\sw\\|\\s_\\)+")
+
 
 ;;; Epilogue
 ;;
@@ -669,7 +668,7 @@ It ignores whitespaces, newlines and comments."
   wisent-java-tags-wy--<symbol>-regexp-analyzer
   wisent-java-tags-wy--<punctuation>-string-analyzer
   wisent-java-tags-wy--<block>-block-analyzer
-  ;; In theory, unicode chars should be turned into normal chars
+  ;; In theory, Unicode chars should be turned into normal chars
   ;; and then combined into regular ascii keywords and text.  This
   ;; analyzer just keeps these things from making the lexer go boom.
   wisent-java-tags-wy--<unicode>-regexp-analyzer
diff --git a/lisp/cedet/semantic/wisent/js-wy.el b/lisp/cedet/semantic/wisent/js-wy.el
index b523db8771b..c8dded08d1f 100644
--- a/lisp/cedet/semantic/wisent/js-wy.el
+++ b/lisp/cedet/semantic/wisent/js-wy.el
@@ -1,7 +1,7 @@
 ;;; semantic/wisent/js-wy.el --- Generated parser support file
 
 ;; Copyright (C) 2005, 2009-2011  Free Software Foundation, Inc.
-;; Copyright (C) Ecma International.
+;; Copyright (C) 1998-2011 Ecma International
 
 ;; This file is part of GNU Emacs.
 
@@ -20,9 +20,45 @@
 
 ;;; Commentary:
 ;;
-;; This file was generated from etc/grammars/javascript-jv.wy.
+;; This file was generated from admin/grammars/js.wy.
+
+;; It is derived from the grammar in the ECMAScript Language
+;; Specification published at
+;;
+;; http://www.ecma-international.org/publications/standards/Ecma-262.htm
+;;
+;; and redistributed under the following license:
+;;
+;; Redistribution and use in source and binary forms, with or without
+;; modification, are permitted provided that the following conditions
+;; are met:
+;;
+;; 1. Redistributions of source code must retain the above copyright
+;; notice, this list of conditions and the following disclaimer.
+;;
+;; 2. Redistributions in binary form must reproduce the above
+;; copyright notice, this list of conditions and the following
+;; disclaimer in the documentation and/or other materials provided
+;; with the distribution.
+;;
+;; 3. Neither the name of the authors nor Ecma International may be
+;; used to endorse or promote products derived from this software
+;; without specific prior written permission.  THIS SOFTWARE IS
+;; PROVIDED BY THE ECMA INTERNATIONAL "AS IS" AND ANY EXPRESS OR
+;; IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+;; WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+;; ARE DISCLAIMED. IN NO EVENT SHALL ECMA INTERNATIONAL BE LIABLE FOR
+;; ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+;; CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+;; OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+;; BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+;; LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+;; (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+;; USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+;; DAMAGE.
 
 ;;; Code:
+
 (require 'semantic/lex)
 
 ;;; Prologue
@@ -370,7 +406,7 @@
    '((parse-stream . wisent-parse-stream)))
   (setq semantic-parser-name "LALR"
         semantic--parse-table wisent-javascript-jv-wy--parse-table
-        semantic-debug-parser-source "wisent-javascript-jv.wy"
+        semantic-debug-parser-source "js.wy"
         semantic-flex-keywords-obarray wisent-javascript-jv-wy--keyword-table
         semantic-lex-types-obarray wisent-javascript-jv-wy--token-table)
   ;; Collect unmatched syntax lexical tokens
@@ -380,38 +416,6 @@
 
 
 ;;; Analyzers
-;;
-(define-lex-keyword-type-analyzer wisent-javascript-jv-wy--<keyword>-keyword-analyzer
-  "keyword analyzer for <keyword> tokens."
-  "\\(\\sw\\|\\s_\\)+")
-
-(define-lex-block-type-analyzer wisent-javascript-jv-wy--<block>-block-analyzer
-  "block analyzer for <block> tokens."
-  "\\s(\\|\\s)"
-  '((("(" OPEN_PARENTHESIS PAREN_BLOCK)
-     ("{" START_BLOCK BRACE_BLOCK)
-     ("[" OPEN_SQ_BRACKETS BRACK_BLOCK))
-    (")" CLOSE_PARENTHESIS)
-    ("}" END_BLOCK)
-    ("]" CLOSE_SQ_BRACKETS))
-  )
-
-(define-lex-regex-type-analyzer wisent-javascript-jv-wy--<symbol>-regexp-analyzer
-  "regexp analyzer for <symbol> tokens."
-  "\\(\\sw\\|\\s_\\)+"
-  nil
-  'VARIABLE)
-
-(define-lex-sexp-type-analyzer wisent-javascript-jv-wy--<string>-sexp-analyzer
-  "sexp analyzer for <string> tokens."
-  "\\s\""
-  'STRING)
-
-(define-lex-regex-type-analyzer wisent-javascript-jv-wy--<number>-regexp-analyzer
-  "regexp analyzer for <number> tokens."
-  semantic-lex-number-expression
-  nil
-  'NUMBER)
 
 (define-lex-string-type-analyzer wisent-javascript-jv-wy--<punctuation>-string-analyzer
   "string analyzer for <punctuation> tokens."
@@ -458,6 +462,38 @@
     (ASSIGN_SYMBOL . "="))
   'punctuation)
 
+(define-lex-block-type-analyzer wisent-javascript-jv-wy--<block>-block-analyzer
+  "block analyzer for <block> tokens."
+  "\\s(\\|\\s)"
+  '((("(" OPEN_PARENTHESIS PAREN_BLOCK)
+     ("{" START_BLOCK BRACE_BLOCK)
+     ("[" OPEN_SQ_BRACKETS BRACK_BLOCK))
+    (")" CLOSE_PARENTHESIS)
+    ("}" END_BLOCK)
+    ("]" CLOSE_SQ_BRACKETS))
+  )
+
+(define-lex-regex-type-analyzer wisent-javascript-jv-wy--<symbol>-regexp-analyzer
+  "regexp analyzer for <symbol> tokens."
+  "\\(\\sw\\|\\s_\\)+"
+  nil
+  'VARIABLE)
+
+(define-lex-regex-type-analyzer wisent-javascript-jv-wy--<number>-regexp-analyzer
+  "regexp analyzer for <number> tokens."
+  semantic-lex-number-expression
+  nil
+  'NUMBER)
+
+(define-lex-sexp-type-analyzer wisent-javascript-jv-wy--<string>-sexp-analyzer
+  "sexp analyzer for <string> tokens."
+  "\\s\""
+  'STRING)
+
+(define-lex-keyword-type-analyzer wisent-javascript-jv-wy--<keyword>-keyword-analyzer
+  "keyword analyzer for <keyword> tokens."
+  "\\(\\sw\\|\\s_\\)+")
+
 
 ;;; Epilogue
 ;;
diff --git a/lisp/cedet/semantic/wisent/python-wy.el b/lisp/cedet/semantic/wisent/python-wy.el
index 36965757a14..2445d7162a7 100644
--- a/lisp/cedet/semantic/wisent/python-wy.el
+++ b/lisp/cedet/semantic/wisent/python-wy.el
@@ -20,7 +20,58 @@
 
 ;;; Commentary:
 ;;
-;; This file was generated from etc/grammars/python.wy.
+;; This file was generated from admin/grammars/python.wy.
+;; It is derived in part from the Python grammar, used under the
+;; following license:
+;;
+;; PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
+;; --------------------------------------------
+;; 1. This LICENSE AGREEMENT is between the Python Software Foundation
+;; ("PSF"), and the Individual or Organization ("Licensee") accessing
+;; and otherwise using this software ("Python") in source or binary
+;; form and its associated documentation.
+;;
+;; 2. Subject to the terms and conditions of this License Agreement,
+;; PSF hereby grants Licensee a nonexclusive, royalty-free, world-wide
+;; license to reproduce, analyze, test, perform and/or display
+;; publicly, prepare derivative works, distribute, and otherwise use
+;; Python alone or in any derivative version, provided, however, that
+;; PSF's License Agreement and PSF's notice of copyright, i.e.,
+;; "Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+;; 2009, 2010 Python Software Foundation; All Rights Reserved" are
+;; retained in Python alone or in any derivative version prepared by
+;; Licensee.
+;;
+;; 3. In the event Licensee prepares a derivative work that is based
+;; on or incorporates Python or any part thereof, and wants to make
+;; the derivative work available to others as provided herein, then
+;; Licensee hereby agrees to include in any such work a brief summary
+;; of the changes made to Python.
+;;
+;; 4. PSF is making Python available to Licensee on an "AS IS"
+;; basis.  PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
+;; IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND
+;; DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
+;; FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT
+;; INFRINGE ANY THIRD PARTY RIGHTS.
+;;
+;; 5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
+;; FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS A
+;; RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON, OR
+;; ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
+;;
+;; 6. This License Agreement will automatically terminate upon a
+;; material breach of its terms and conditions.
+;;
+;; 7. Nothing in this License Agreement shall be deemed to create any
+;; relationship of agency, partnership, or joint venture between PSF
+;; and Licensee.  This License Agreement does not grant permission to
+;; use PSF trademarks or trade name in a trademark sense to endorse or
+;; promote products or services of Licensee, or any third party.
+;;
+;; 8. By copying, installing or otherwise using Python, Licensee
+;; agrees to be bound by the terms and conditions of this License
+;; Agreement.
 
 ;;; Code:
 
@@ -664,7 +715,7 @@
    '((parse-stream . wisent-parse-stream)))
   (setq semantic-parser-name "LALR"
         semantic--parse-table wisent-python-wy--parse-table
-        semantic-debug-parser-source "wisent-python.wy"
+        semantic-debug-parser-source "python.wy"
         semantic-flex-keywords-obarray wisent-python-wy--keyword-table
         semantic-lex-types-obarray wisent-python-wy--token-table)
   ;; Collect unmatched syntax lexical tokens
@@ -675,10 +726,6 @@
 
 ;;; Analyzers
 
-(define-lex-keyword-type-analyzer wisent-python-wy--<keyword>-keyword-analyzer
-  "keyword analyzer for <keyword> tokens."
-  "\\(\\sw\\|\\s_\\)+")
-
 (define-lex-block-type-analyzer wisent-python-wy--<block>-block-analyzer
   "block analyzer for <block> tokens."
   "\\s(\\|\\s)"
@@ -690,18 +737,6 @@
     ("]" RBRACK))
   )
 
-(define-lex-regex-type-analyzer wisent-python-wy--<symbol>-regexp-analyzer
-  "regexp analyzer for <symbol> tokens."
-  "\\(\\sw\\|\\s_\\)+"
-  nil
-  'NAME)
-
-(define-lex-regex-type-analyzer wisent-python-wy--<number>-regexp-analyzer
-  "regexp analyzer for <number> tokens."
-  semantic-lex-number-expression
-  nil
-  'NUMBER_LITERAL)
-
 (define-lex-string-type-analyzer wisent-python-wy--<punctuation>-string-analyzer
   "string analyzer for <punctuation> tokens."
   "\\(\\s.\\|\\s$\\|\\s'\\)+"
@@ -745,6 +780,22 @@
     (LTLTEQ . "<<="))
   'punctuation)
 
+(define-lex-regex-type-analyzer wisent-python-wy--<symbol>-regexp-analyzer
+  "regexp analyzer for <symbol> tokens."
+  "\\(\\sw\\|\\s_\\)+"
+  nil
+  'NAME)
+
+(define-lex-regex-type-analyzer wisent-python-wy--<number>-regexp-analyzer
+  "regexp analyzer for <number> tokens."
+  semantic-lex-number-expression
+  nil
+  'NUMBER_LITERAL)
+
+(define-lex-keyword-type-analyzer wisent-python-wy--<keyword>-keyword-analyzer
+  "keyword analyzer for <keyword> tokens."
+  "\\(\\sw\\|\\s_\\)+")
+
 
 ;;; Epilogue
 ;;
diff --git a/lisp/cedet/semantic/wisent/python.el b/lisp/cedet/semantic/wisent/python.el
index 1f52e9eb3b6..c73033ce0ac 100644
--- a/lisp/cedet/semantic/wisent/python.el
+++ b/lisp/cedet/semantic/wisent/python.el
@@ -43,7 +43,7 @@
 ;; The 'r' prefix means raw, i.e., normal backslash substitutions are
 ;; to be suppressed.  For example, r"01\n34" is a string with six
 ;; characters 0, 1, \, n, 3 and 4.  The 'u' prefix means the following
-;; string is a unicode.
+;; string is Unicode.
 (defconst wisent-python-string-re
   (concat (regexp-opt '("r" "u" "ur" "R" "U" "UR" "Ur" "uR") t)
           "?['\"]")
diff --git a/lisp/cedet/srecode/args.el b/lisp/cedet/srecode/args.el
index d8e02f978b2..73445fbf13d 100644
--- a/lisp/cedet/srecode/args.el
+++ b/lisp/cedet/srecode/args.el
@@ -32,7 +32,7 @@
 ;;; :blank
 ;;
 ;; Using :blank means that the template should force blank lines
-;; before and after the template, reguardless of where the insertion
+;; before and after the template, regardless of where the insertion
 ;; is occurring.
 (defun srecode-semantic-handle-:blank (dict)
   "Add macros into the dictionary DICT specifying blank line spacing.
@@ -185,4 +185,3 @@ do not contain any text from preceding or following text."
 (provide 'srecode/args)
 
 ;;; srecode/args.el ends here
-
diff --git a/lisp/cedet/srecode/ctxt.el b/lisp/cedet/srecode/ctxt.el
index f392379347a..11d84e96f41 100644
--- a/lisp/cedet/srecode/ctxt.el
+++ b/lisp/cedet/srecode/ctxt.el
@@ -64,7 +64,7 @@ Some useful context values used by the provided srecode templates are:
      \"comment\"  - In a comment in a block of code
      -- these items show up at the end of the context list. --
      \"public\", \"protected\", \"private\" -
-                  In or near a section of public/pritected/private entries.
+                  In or near a section of public/protected/private entries.
   \"code\" - In a block of code.
      \"string\" - In a string in a block of code
      \"comment\"  - In a comment in a block of code
diff --git a/lisp/cedet/srecode/dictionary.el b/lisp/cedet/srecode/dictionary.el
index 62ceff82448..1575ce7ae3b 100644
--- a/lisp/cedet/srecode/dictionary.el
+++ b/lisp/cedet/srecode/dictionary.el
@@ -437,7 +437,7 @@ The root dictionary is usually for a current or active insertion."
 ;;; COMPOUND VALUE METHODS
 ;;
 ;; Compound values must provide at least the toString method
-;; for use in converting the compound value into sometehing insertable.
+;; for use in converting the compound value into something insertable.
 
 (defmethod srecode-compound-toString ((cp srecode-dictionary-compound-value)
                                       function
diff --git a/lisp/cedet/srecode/document.el b/lisp/cedet/srecode/document.el
index caf1ddebdb2..e25905ead83 100644
--- a/lisp/cedet/srecode/document.el
+++ b/lisp/cedet/srecode/document.el
@@ -122,7 +122,7 @@ RESULT is a string."
     ("read" . "Reads from")
     ("reset" . "Resets the parameters and returns")
     ("scan" . "Scans the ")
-    ("setup\\|init\\(iallize\\)?" . "Initializes the ")
+    ("setup\\|init\\(ialize\\)?" . "Initializes the ")
     ("select" . "Chooses the ")
     ("send" . "Sends a")
     ("re?c\\(v\\|ieves?\\)" . "Receives a ")
@@ -698,7 +698,7 @@ allocating something based on its type."
                                  (cdr (car al)))))
             (setq al nil)))
       (setq al (cdr al)))
-    ;; add tailers to names which are obviously returning something.
+    ;; add trailers to names which are obviously returning something.
     (if tailit
         (progn
           (setq al srecode-document-autocomment-return-last-alist)
diff --git a/lisp/cedet/srecode/fields.el b/lisp/cedet/srecode/fields.el
index f13fb17ca8f..f4d34a0f2ab 100644
--- a/lisp/cedet/srecode/fields.el
+++ b/lisp/cedet/srecode/fields.el
@@ -324,7 +324,7 @@ Try to use this to provide useful completion when available.")
   )
 
 (defvar srecode-field-replication-max-size 100
-  "Maximum size of a field before cancelling replication.")
+  "Maximum size of a field before canceling replication.")
 
 (defun srecode-field-mod-hook (ol after start end &optional pre-len)
   "Modification hook for the field overlay.
diff --git a/lisp/cedet/srecode/find.el b/lisp/cedet/srecode/find.el
index d9765ebd449..b947c63f4dd 100644
--- a/lisp/cedet/srecode/find.el
+++ b/lisp/cedet/srecode/find.el
@@ -238,7 +238,7 @@ Optional argument HASH is the hash table to fill in."
            (tabs (when mt (oref mt :tables)))
            )
       (while tabs
-        ;; Exclude templates for a perticular application.
+        ;; Exclude templates for a particular application.
         (when (and (not (oref (car tabs) :application))
                    (srecode-template-table-in-project-p (car tabs)))
           (maphash (lambda (key temp)
diff --git a/lisp/cedet/srecode/insert.el b/lisp/cedet/srecode/insert.el
index 9fbfc5dc042..bbf8b881c4d 100644
--- a/lisp/cedet/srecode/insert.el
+++ b/lisp/cedet/srecode/insert.el
@@ -312,7 +312,7 @@ occur in your template.")
           (setq doit nil)))
       (goto-char pm)
       )
-    ;; Do indentation reguardless of the newline.
+    ;; Do indentation regardless of the newline.
     (when (and (eq i t) inbuff)
       (indent-according-to-mode)
       (goto-char pm))
@@ -946,7 +946,7 @@ with the dictionaries found in the dictionary."
 ;; It will first insert the included template, then insert the embedded
 ;; template wherever the $^$ in the included template was.
 ;;
-;; Since it uses dual inheretance, it will magically get the end-matching
+;; Since it uses dual inheritance, it will magically get the end-matching
 ;; behavior of #, with the including feature of >.
 ;;
 (defclass srecode-template-inserter-include-wrap (srecode-template-inserter-include srecode-template-inserter-section-start)
diff --git a/lisp/cedet/srecode/srt-wy.el b/lisp/cedet/srecode/srt-wy.el
index 2fb8e7665e9..5bd202093e9 100644
--- a/lisp/cedet/srecode/srt-wy.el
+++ b/lisp/cedet/srecode/srt-wy.el
@@ -18,13 +18,12 @@
 ;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
-
-;; Generated from srecode-template.wy in the CEDET repository.
+;;
+;; This file was generated from admin/grammars/srecode-template.wy.
 
 ;;; Code:
 
 (require 'semantic/lex)
-
 
 ;;; Prologue
 ;;
@@ -206,10 +205,12 @@
 
 
 ;;; Analyzers
-;;
-(define-lex-keyword-type-analyzer srecode-template-wy--<keyword>-keyword-analyzer
-  "keyword analyzer for <keyword> tokens."
-  "\\(\\sw\\|\\s_\\)+")
+
+(define-lex-string-type-analyzer srecode-template-wy--<punctuation>-string-analyzer
+  "string analyzer for <punctuation> tokens."
+  "\\s.+"
+  nil
+  'punctuation)
 
 (define-lex-regex-type-analyzer srecode-template-wy--<symbol>-regexp-analyzer
   "regexp analyzer for <symbol> tokens."
@@ -217,22 +218,20 @@
   nil
   'symbol)
 
-(define-lex-sexp-type-analyzer srecode-template-wy--<string>-sexp-analyzer
-  "sexp analyzer for <string> tokens."
-  "\\s\""
-  'string)
-
 (define-lex-regex-type-analyzer srecode-template-wy--<number>-regexp-analyzer
   "regexp analyzer for <number> tokens."
   semantic-lex-number-expression
   nil
   'number)
 
-(define-lex-string-type-analyzer srecode-template-wy--<punctuation>-string-analyzer
-  "string analyzer for <punctuation> tokens."
-  "\\s.+"
-  nil
-  'punctuation)
+(define-lex-sexp-type-analyzer srecode-template-wy--<string>-sexp-analyzer
+  "sexp analyzer for <string> tokens."
+  "\\s\""
+  'string)
+
+(define-lex-keyword-type-analyzer srecode-template-wy--<keyword>-keyword-analyzer
+  "keyword analyzer for <keyword> tokens."
+  "\\(\\sw\\|\\s_\\)+")
 
 
 ;;; Epilogue
diff --git a/lisp/cedet/srecode/texi.el b/lisp/cedet/srecode/texi.el
index acfc2486711..df90f6c464f 100644
--- a/lisp/cedet/srecode/texi.el
+++ b/lisp/cedet/srecode/texi.el
@@ -244,7 +244,7 @@ that class.
  `function' => @dfn{function}
  `variable' => @code{variable}
  `class'    => @code{class} @xref{class}
- `unknown'  => @code{unknonwn}
+ `unknown'  => @code{unknown}
  \"text\"     => ``text''
  'quoteme   => @code{quoteme}
  non-nil    => non-@code{nil}