From 07a79ce4b45709f043dae5b905fd3268a242e106 Mon Sep 17 00:00:00 2001
From: David Engster <dengste@eml.cc>
Date: Thu, 3 Nov 2011 21:03:45 +0100
Subject: [PATCH] * srecode.el: * srecode/texi.el: * srecode/template.el: *
 srecode/java.el: * srecode/insert.el: * srecode/document.el: *
 srecode/dictionary.el: * srecode/compile.el: * semantic/wisent/java-tags.el:
 * semantic/texi.el: * semantic/sort.el: * semantic/lex-spp.el: *
 semantic/idle.el: * semantic/html.el: * semantic/db-typecache.el: *
 semantic/analyze/complete.el: * ede/generic.el: * ede/custom.el: *
 ede/cpp-root.el: * ede/base.el: Fix filenames in comments and headers.

* semantic/db-find.el:
* srecode/insert.el (srecode-insert-include-lookup):
* ede/proj-comp.el (ede-compilation-program): Fix it's -> its in
comments and docstrings.

* semantic/ctxt.el (semantic-end-of-context-default):
* semantic/find.el (semantic-find-tags-by-scope-protection):
* semantic/java.el (semantic-documentation-for-tag): Fix typos in
docstrings.

* semantic/db.el (semanticdb-table, semanticdb-abstract-cache)
(semanticdb-abstract-db-cache):
* semantic/decorate/include.el
(semantic-decoration-unknown-include-describe): Fix filenames in
docstring.

* semantic/ede-grammar.el (semantic-ede-grammar-compiler-wisent):
(semantic-ede-grammar-compiler-bovine): Fix requires that are
added to the grammar-make-script.
---
 lisp/cedet/ChangeLog                    | 43 +++++++++++++++++++++++++
 lisp/cedet/ede/base.el                  |  2 +-
 lisp/cedet/ede/cpp-root.el              |  2 +-
 lisp/cedet/ede/custom.el                |  2 +-
 lisp/cedet/ede/generic.el               |  2 +-
 lisp/cedet/ede/proj-comp.el             |  2 +-
 lisp/cedet/semantic/analyze/complete.el |  2 +-
 lisp/cedet/semantic/ctxt.el             |  2 +-
 lisp/cedet/semantic/db-find.el          |  4 +--
 lisp/cedet/semantic/db-typecache.el     |  4 +--
 lisp/cedet/semantic/db.el               |  6 ++--
 lisp/cedet/semantic/decorate/include.el |  2 +-
 lisp/cedet/semantic/ede-grammar.el      |  8 ++---
 lisp/cedet/semantic/find.el             |  2 +-
 lisp/cedet/semantic/html.el             |  2 +-
 lisp/cedet/semantic/idle.el             |  2 +-
 lisp/cedet/semantic/java.el             |  2 +-
 lisp/cedet/semantic/lex-spp.el          |  4 +--
 lisp/cedet/semantic/sort.el             |  6 ++--
 lisp/cedet/semantic/texi.el             |  4 +--
 lisp/cedet/semantic/wisent/java-tags.el |  2 +-
 lisp/cedet/srecode.el                   |  2 +-
 lisp/cedet/srecode/compile.el           |  2 +-
 lisp/cedet/srecode/dictionary.el        |  2 +-
 lisp/cedet/srecode/document.el          |  2 +-
 lisp/cedet/srecode/insert.el            |  4 +--
 lisp/cedet/srecode/java.el              |  2 +-
 lisp/cedet/srecode/template.el          |  2 +-
 lisp/cedet/srecode/texi.el              |  2 +-
 29 files changed, 83 insertions(+), 40 deletions(-)

diff --git a/lisp/cedet/ChangeLog b/lisp/cedet/ChangeLog
index 3dd0e6f78fd..2dc345b45da 100644
--- a/lisp/cedet/ChangeLog
+++ b/lisp/cedet/ChangeLog
@@ -1,3 +1,46 @@
+2011-11-03  David Engster  <dengste@eml.cc>
+
+	* srecode.el:
+	* srecode/texi.el:
+	* srecode/template.el:
+	* srecode/java.el:
+	* srecode/insert.el:
+	* srecode/document.el:
+	* srecode/dictionary.el:
+	* srecode/compile.el:
+	* semantic/wisent/java-tags.el:
+	* semantic/texi.el:
+	* semantic/sort.el:
+	* semantic/lex-spp.el:
+	* semantic/idle.el:
+	* semantic/html.el:
+	* semantic/db-typecache.el:
+	* semantic/analyze/complete.el:
+	* ede/generic.el:
+	* ede/custom.el:
+	* ede/cpp-root.el:
+	* ede/base.el: Fix filenames in comments and headers.
+
+	* semantic/db-find.el:
+	* srecode/insert.el (srecode-insert-include-lookup):
+	* ede/proj-comp.el (ede-compilation-program): Fix it's -> its in
+	comments and docstrings.
+
+	* semantic/ctxt.el (semantic-end-of-context-default):
+	* semantic/find.el (semantic-find-tags-by-scope-protection):
+	* semantic/java.el (semantic-documentation-for-tag): Fix typos in
+	docstrings.
+
+	* semantic/db.el (semanticdb-table, semanticdb-abstract-cache)
+	(semanticdb-abstract-db-cache):
+	* semantic/decorate/include.el
+	(semantic-decoration-unknown-include-describe): Fix filenames in
+	docstring.
+
+	* semantic/ede-grammar.el (semantic-ede-grammar-compiler-wisent):
+	(semantic-ede-grammar-compiler-bovine): Fix requires that are
+	added to the grammar-make-script.
+
 2011-10-23  Chong Yidong  <cyd@gnu.org>
 
 	* ede.el (ede-maybe-checkout): Function deleted;
diff --git a/lisp/cedet/ede/base.el b/lisp/cedet/ede/base.el
index da36919b23a..8b0bd261daf 100644
--- a/lisp/cedet/ede/base.el
+++ b/lisp/cedet/ede/base.el
@@ -413,7 +413,7 @@ Specifying PARENT is useful for sub-sub projects relative to the root project."
 (defmethod ede-subproject-p ((proj ede-project))
   "Return non-nil if PROJ is a sub project."
   ;; @TODO - Use this in more places, and also pay attention to
-  ;; metasubproject in ede-proj.el
+  ;; metasubproject in ede/proj.el
   (ede-parent-project proj))
 
 
diff --git a/lisp/cedet/ede/cpp-root.el b/lisp/cedet/ede/cpp-root.el
index 7586522355e..e4d1bf205ec 100644
--- a/lisp/cedet/ede/cpp-root.el
+++ b/lisp/cedet/ede/cpp-root.el
@@ -21,7 +21,7 @@
 
 ;;; Commentary:
 ;;
-;; NOTE: ede-cpp-root.el has been commented so as to also make it
+;; NOTE: ede/cpp-root.el has been commented so as to also make it
 ;;       useful for learning how to make similar project types.
 ;;
 ;; Not everyone can use automake, or an EDE project type.  For
diff --git a/lisp/cedet/ede/custom.el b/lisp/cedet/ede/custom.el
index a7470547cc2..fed1a1b2155 100644
--- a/lisp/cedet/ede/custom.el
+++ b/lisp/cedet/ede/custom.el
@@ -1,4 +1,4 @@
-;;; ede.el --- customization of EDE projects.
+;;; ede/custom.el --- customization of EDE projects.
 
 ;; Copyright (C) 2010-2011  Free Software Foundation, Inc.
 
diff --git a/lisp/cedet/ede/generic.el b/lisp/cedet/ede/generic.el
index 360b15499ca..7eef0a4121e 100644
--- a/lisp/cedet/ede/generic.el
+++ b/lisp/cedet/ede/generic.el
@@ -22,7 +22,7 @@
 ;;; Commentary:
 ;;
 ;; There are a lot of build systems out there, and EDE can't support
-;; them all fully.  The ede-generic.el system is the base for
+;; them all fully.  The ede/generic.el system is the base for
 ;; supporting alternate build systems in a simple way, automatically.
 ;;
 ;; The structure is for the ede-generic baseclass, which is augmented
diff --git a/lisp/cedet/ede/proj-comp.el b/lisp/cedet/ede/proj-comp.el
index 401ea15d0d6..1a2843f7651 100644
--- a/lisp/cedet/ede/proj-comp.el
+++ b/lisp/cedet/ede/proj-comp.el
@@ -83,7 +83,7 @@ For example, yacc/lex files need additional chain rules, or inferences.")
 	    :documentation
 	    "The commands used to execute this compiler.
 The object which uses this compiler will place these commands after
-it's rule definition.")
+its rule definition.")
    (autoconf :initarg :autoconf
 	     :initform nil
 	     :type list
diff --git a/lisp/cedet/semantic/analyze/complete.el b/lisp/cedet/semantic/analyze/complete.el
index bbe87f34172..ae993a743d6 100644
--- a/lisp/cedet/semantic/analyze/complete.el
+++ b/lisp/cedet/semantic/analyze/complete.el
@@ -28,7 +28,7 @@
 ;;
 ;;; History:
 ;;
-;; Code was moved here from semantic-analyze.el
+;; Code was moved here from semantic/analyze.el
 
 (require 'semantic/analyze)
 
diff --git a/lisp/cedet/semantic/ctxt.el b/lisp/cedet/semantic/ctxt.el
index 08049201756..2eddfdc1c8e 100644
--- a/lisp/cedet/semantic/ctxt.el
+++ b/lisp/cedet/semantic/ctxt.el
@@ -106,7 +106,7 @@ Return non-nil if there is no upper context."
   (let ((start (point)))
     (if (semantic-up-context)
 	t
-      ;; Go over the list, and back over the end parenthisis.
+      ;; Go over the list, and back over the end parenthesis.
       (condition-case nil
 	  (progn
 	    (forward-sexp 1)
diff --git a/lisp/cedet/semantic/db-find.el b/lisp/cedet/semantic/db-find.el
index a7335d642be..34718d1fdd2 100644
--- a/lisp/cedet/semantic/db-find.el
+++ b/lisp/cedet/semantic/db-find.el
@@ -79,13 +79,13 @@
 ;;  The PATH argument is then the most interesting argument.  It can
 ;;  have these values:
 ;;
-;;    nil - Take the current buffer, and use it's include list
+;;    nil - Take the current buffer, and use its include list
 ;;    buffer - Use that buffer's include list.
 ;;    filename - Use that file's include list.  If the file is not
 ;;        in a buffer, see of there is a semanticdb table for it.  If
 ;;        not, read that file into a buffer.
 ;;    tag - Get that tag's buffer of file file.  See above.
-;;    table - Search that table, and it's include list.
+;;    table - Search that table, and its include list.
 ;;
 ;; Search Results:
 ;;
diff --git a/lisp/cedet/semantic/db-typecache.el b/lisp/cedet/semantic/db-typecache.el
index 2a78576092a..0096c1aab09 100644
--- a/lisp/cedet/semantic/db-typecache.el
+++ b/lisp/cedet/semantic/db-typecache.el
@@ -1,4 +1,4 @@
-;;; db-typecache.el --- Manage Datatypes
+;;; semantic/db-typecache.el --- Manage Datatypes
 
 ;; Copyright (C) 2007-2011 Free Software Foundation, Inc.
 
@@ -622,4 +622,4 @@ If there isn't one, create it.
 ;; generated-autoload-load-name: "semantic/db-typecache"
 ;; End:
 
-;;; semanticdb-typecache.el ends here
+;;; semantic/db-typecache.el ends here
diff --git a/lisp/cedet/semantic/db.el b/lisp/cedet/semantic/db.el
index dca1b3bafea..65897b96adb 100644
--- a/lisp/cedet/semantic/db.el
+++ b/lisp/cedet/semantic/db.el
@@ -229,7 +229,7 @@ it is in Emacs.")
 	    :documentation
 	    "List of `semanticdb-table' objects refering to this one.
 These aren't saved, but are instead recalculated after load.
-See the file semanticdb-ref.el for how this slot is used.")
+See the file semantic/db-ref.el for how this slot is used.")
    (pointmax :initarg :pointmax
 	     :initform nil
 	     :documentation "Size of buffer when written to disk.
@@ -441,7 +441,7 @@ Tools needing a per-file cache must subclass this, and then get one as
 needed.  Cache objects are identified in semanticdb by subclass.
 In order to keep your cache up to date, be sure to implement
 `semanticdb-synchronize', and `semanticdb-partial-synchronize'.
-See the file semantic-scope.el for an example."
+See the file semantic/scope.el for an example."
   :abstract t)
 
 (defmethod semanticdb-cache-get ((table semanticdb-abstract-table)
@@ -492,7 +492,7 @@ Tools needing a database cache must subclass this, and then get one as
 needed.  Cache objects are identified in semanticdb by subclass.
 In order to keep your cache up to date, be sure to implement
 `semanticdb-synchronize', and `semanticdb-partial-synchronize'.
-See the file semantic-scope.el for an example."
+See the file semantic/scope.el for an example."
   :abstract t)
 
 (defmethod semanticdb-cache-get ((db semanticdb-project-database)
diff --git a/lisp/cedet/semantic/decorate/include.el b/lisp/cedet/semantic/decorate/include.el
index 0e0a8849d78..e984965a737 100644
--- a/lisp/cedet/semantic/decorate/include.el
+++ b/lisp/cedet/semantic/decorate/include.el
@@ -471,7 +471,7 @@ like this in your .emacs file:
   (ede-cpp-root-project \"NAME\" :file \"FILENAME\" :locate-fcn 'MYFCN)
 
 See the CEDET manual, the EDE manual, or the commentary in
-ede-cpp-root.el for more.
+ede/cpp-root.el for more.
 
 If you think this header tag is marked in error, you may need to do:
 
diff --git a/lisp/cedet/semantic/ede-grammar.el b/lisp/cedet/semantic/ede-grammar.el
index a4361053174..3a30a931d95 100644
--- a/lisp/cedet/semantic/ede-grammar.el
+++ b/lisp/cedet/semantic/ede-grammar.el
@@ -71,8 +71,8 @@ parsing different languages.")
      "@for loadpath in . ${LOADPATH}; do \\"
      "   echo \"(add-to-list 'load-path \\\"$$loadpath\\\")\" >> grammar-make-script; \\"
      "done;"
-     "@echo \"(require 'semantic-load)\" >> grammar-make-script"
-     "@echo \"(require 'semantic-grammar)\" >> grammar-make-script"
+     "@echo \"(require 'semantic/load)\" >> grammar-make-script"
+     "@echo \"(require 'semantic/grammar)\" >> grammar-make-script"
      ;; "@echo \"(setq debug-on-error t)\" >> grammar-make-script"
      "\"$(EMACS)\" -batch --no-site-file -l grammar-make-script -f semantic-grammar-batch-build-packages $^"
      )
@@ -101,8 +101,8 @@ parsing different languages.")
      "@for loadpath in . ${LOADPATH}; do \\"
      "   echo \"(add-to-list 'load-path \\\"$$loadpath\\\")\" >> grammar-make-script; \\"
      "done;"
-     "@echo \"(require 'semantic-load)\" >> grammar-make-script"
-     "@echo \"(require 'semantic-grammar)\" >> grammar-make-script"
+     "@echo \"(require 'semantic/load)\" >> grammar-make-script"
+     "@echo \"(require 'semantic/grammar)\" >> grammar-make-script"
      ;; "@echo \"(setq debug-on-error t)\" >> grammar-make-script"
      "\"$(EMACS)\" -batch --no-site-file -l grammar-make-script -f semantic-grammar-batch-build-packages $^"
      )
diff --git a/lisp/cedet/semantic/find.el b/lisp/cedet/semantic/find.el
index c62ed818945..c2d07fbcc35 100644
--- a/lisp/cedet/semantic/find.el
+++ b/lisp/cedet/semantic/find.el
@@ -333,7 +333,7 @@ Used in completion."
 
 ;;;###autoload
 (define-overloadable-function semantic-find-tags-by-scope-protection (scopeprotection parent &optional table)
-  "Find all tags accessable by SCOPEPROTECTION.
+  "Find all tags accessible by SCOPEPROTECTION.
 SCOPEPROTECTION is a symbol which can be returned by the method
 `semantic-tag-protection'.  A hard-coded order is used to determine a match.
 PARENT is a tag representing the PARENT slot needed for
diff --git a/lisp/cedet/semantic/html.el b/lisp/cedet/semantic/html.el
index 80c0a0ddb95..972ce5e26bc 100644
--- a/lisp/cedet/semantic/html.el
+++ b/lisp/cedet/semantic/html.el
@@ -222,7 +222,7 @@ tag with greater section value than LEVEL is found."
   "The children TAG expands to."
   (semantic-html-components tag))
 
-;; In semantic-imenu.el, not part of Emacs.
+;; In semantic/imenu.el, not part of Emacs.
 (defvar semantic-imenu-expandable-tag-classes)
 (defvar semantic-imenu-bucketize-file)
 (defvar semantic-imenu-bucketize-type-members)
diff --git a/lisp/cedet/semantic/idle.el b/lisp/cedet/semantic/idle.el
index f17a5471d75..1c1233303e9 100644
--- a/lisp/cedet/semantic/idle.el
+++ b/lisp/cedet/semantic/idle.el
@@ -1314,4 +1314,4 @@ mouse-3: popup context menu"
 ;; generated-autoload-load-name: "semantic/idle"
 ;; End:
 
-;;; semantic-idle.el ends here
+;;; semantic/idle.el ends here
diff --git a/lisp/cedet/semantic/java.el b/lisp/cedet/semantic/java.el
index 71a205386db..c3075634242 100644
--- a/lisp/cedet/semantic/java.el
+++ b/lisp/cedet/semantic/java.el
@@ -256,7 +256,7 @@ Optional argument COLOR indicates that color should be mixed in."
 (define-mode-local-override semantic-documentation-for-tag
   java-mode (&optional tag nosnarf)
   "Find documentation from TAG and return it as a clean string.
-Java has documentation set in a comment preceding TAG's definition.
+Java have documentation set in a comment preceding TAG's definition.
 Attempt to strip out comment syntactic sugar, unless optional argument
 NOSNARF is non-nil.
 If NOSNARF is 'lex, then return the semantic lex token."
diff --git a/lisp/cedet/semantic/lex-spp.el b/lisp/cedet/semantic/lex-spp.el
index de4cb7a9c62..e49968b07e7 100644
--- a/lisp/cedet/semantic/lex-spp.el
+++ b/lisp/cedet/semantic/lex-spp.el
@@ -1,4 +1,4 @@
-;;; lex-spp.el --- Semantic Lexical Pre-processor
+;;; semantic/lex-spp.el --- Semantic Lexical Pre-processor
 
 ;; Copyright (C) 2006-2011  Free Software Foundation, Inc.
 
@@ -1230,4 +1230,4 @@ If BUFFER is not provided, use the current buffer."
 ;; generated-autoload-load-name: "semantic/lex-spp"
 ;; End:
 
-;;; semantic-lex-spp.el ends here
+;;; semantic/lex-spp.el ends here
diff --git a/lisp/cedet/semantic/sort.el b/lisp/cedet/semantic/sort.el
index d62c3bb17d9..c3d8b26810c 100644
--- a/lisp/cedet/semantic/sort.el
+++ b/lisp/cedet/semantic/sort.el
@@ -1,4 +1,4 @@
-;;; sort.el --- Utilities for sorting and re-arranging tag tables.
+;;; semantic/sort.el --- Utilities for sorting and re-arranging tag tables.
 
 ;;; Copyright (C) 1999-2005, 2007-2011 Free Software Foundation, Inc.
 
@@ -27,7 +27,7 @@
 ;; purposes.  Re-organization may be alphabetical, or even a complete
 ;; reorganization of parents and children.
 ;;
-;; Originally written in semantic-util.el
+;; Originally written in semantic/util.el
 ;;
 
 (require 'semantic)
@@ -565,4 +565,4 @@ See `semantic-tag-external-class' for details."
 ;; generated-autoload-load-name: "semantic/sort"
 ;; End:
 
-;;; semantic-sort.el ends here
+;;; semantic/sort.el ends here
diff --git a/lisp/cedet/semantic/texi.el b/lisp/cedet/semantic/texi.el
index 66327cbe2ff..393d64e6420 100644
--- a/lisp/cedet/semantic/texi.el
+++ b/lisp/cedet/semantic/texi.el
@@ -446,7 +446,7 @@ that start with that symbol."
 
 ;;; Parser Setup
 ;;
-;; In semantic-imenu.el, not part of Emacs.
+;; In semantic/imenu.el, not part of Emacs.
 (defvar semantic-imenu-expandable-tag-classes)
 (defvar semantic-imenu-bucketize-file)
 (defvar semantic-imenu-bucketize-type-members)
@@ -592,7 +592,7 @@ Note: TYPE not yet implemented."
 ;;       (error "Could not find documentation for %s" (semantic-tag-name tag)))
 ;;
 ;;     (require 'srecode)
-;;     (require 'srecode-texi)
+;;     (require 'srecode/texi)
 ;;
 ;;     ;; If we have a string, do the replacement.
 ;;     (delete-region (semantic-tag-start tag)
diff --git a/lisp/cedet/semantic/wisent/java-tags.el b/lisp/cedet/semantic/wisent/java-tags.el
index d0647d8e271..f3d11d38512 100644
--- a/lisp/cedet/semantic/wisent/java-tags.el
+++ b/lisp/cedet/semantic/wisent/java-tags.el
@@ -77,7 +77,7 @@ This function override `get-local-variables'."
 ;;;; Semantic integration of the Java LALR parser
 ;;;;
 
-;; In semantic-imenu.el, not part of Emacs.
+;; In semantic/imenu.el, not part of Emacs.
 (defvar semantic-imenu-summary-function)
 
 ;;;###autoload
diff --git a/lisp/cedet/srecode.el b/lisp/cedet/srecode.el
index 7b499d1a5e7..5527273a3a5 100644
--- a/lisp/cedet/srecode.el
+++ b/lisp/cedet/srecode.el
@@ -31,7 +31,7 @@
 ;;
 ;; Contemplation of the simplistic problem within the scope of
 ;; semantic showed that the solution was more complex than could
-;; possibly be handled in semantic-format.el.   Semantic Recode, or
+;; possibly be handled in semantic/format.el.   Semantic Recode, or
 ;; srecode is a rich API for generating code out of semantic tags, or
 ;; recoding the tags.
 ;;
diff --git a/lisp/cedet/srecode/compile.el b/lisp/cedet/srecode/compile.el
index 0a117bad9bc..052999bf7c8 100644
--- a/lisp/cedet/srecode/compile.el
+++ b/lisp/cedet/srecode/compile.el
@@ -103,7 +103,7 @@ stack is broken."
 ;; work, and the smaller, simple inserter object is saved in
 ;; the compiled templates.
 ;;
-;; See srecode-insert.el for the specialized classes.
+;; See srecode/insert.el for the specialized classes.
 ;;
 (defclass srecode-template-inserter (eieio-named)
   ((secondname :initarg :secondname
diff --git a/lisp/cedet/srecode/dictionary.el b/lisp/cedet/srecode/dictionary.el
index 06496160b8c..521532bed33 100644
--- a/lisp/cedet/srecode/dictionary.el
+++ b/lisp/cedet/srecode/dictionary.el
@@ -1,4 +1,4 @@
-;;; srecode-dictionary.el --- Dictionary code for the semantic recoder.
+;;; srecode/dictionary.el --- Dictionary code for the semantic recoder.
 
 ;; Copyright (C) 2007-2011 Free Software Foundation, Inc.
 
diff --git a/lisp/cedet/srecode/document.el b/lisp/cedet/srecode/document.el
index bccc85fb82b..a52cadbfb2c 100644
--- a/lisp/cedet/srecode/document.el
+++ b/lisp/cedet/srecode/document.el
@@ -37,7 +37,7 @@
 ;; Document has now been ported to srecode, using the semantic recoder
 ;; as the templating engine.
 
-;; This file combines srecode-document.el and srecode-document-vars.el
+;; This file combines srecode/document.el and srecode/document-vars.el
 ;; from the CEDET repository.
 
 (require 'srecode/args)
diff --git a/lisp/cedet/srecode/insert.el b/lisp/cedet/srecode/insert.el
index 931d0b3d73e..84964a9e8b4 100644
--- a/lisp/cedet/srecode/insert.el
+++ b/lisp/cedet/srecode/insert.el
@@ -1,4 +1,4 @@
-;;; srecode/insert --- Insert srecode templates to an output stream.
+;;; srecode/insert.el --- Insert srecode templates to an output stream.
 
 ;; Copyright (C) 2005, 2007-2011  Free Software Foundation, Inc.
 
@@ -911,7 +911,7 @@ this template instance."
 	  (setq active (cdr active)))
 	(when (not tmpl)
 	  ;; If it wasn't in this context, look to see if it
-	  ;; defines it's own context
+	  ;; defines its own context
 	  (setq tmpl (srecode-template-get-table (srecode-table)
 						 templatenamepart)))
 	)
diff --git a/lisp/cedet/srecode/java.el b/lisp/cedet/srecode/java.el
index 69534e053f1..4e76c15e300 100644
--- a/lisp/cedet/srecode/java.el
+++ b/lisp/cedet/srecode/java.el
@@ -1,4 +1,4 @@
-;;; srecode-java.el --- Srecode Java support
+;;; srecode/java.el --- Srecode Java support
 
 ;; Copyright (C) 2009-2011 Free Software Foundation, Inc.
 
diff --git a/lisp/cedet/srecode/template.el b/lisp/cedet/srecode/template.el
index e0cf42b75df..5dd32a85786 100644
--- a/lisp/cedet/srecode/template.el
+++ b/lisp/cedet/srecode/template.el
@@ -1,4 +1,4 @@
-;;; srecode-template.el --- SRecoder template language parser support.
+;;; srecode/template.el --- SRecoder template language parser support.
 
 ;; Copyright (C) 2005, 2007-2011  Free Software Foundation, Inc.
 
diff --git a/lisp/cedet/srecode/texi.el b/lisp/cedet/srecode/texi.el
index 38d8e765d41..33440d04432 100644
--- a/lisp/cedet/srecode/texi.el
+++ b/lisp/cedet/srecode/texi.el
@@ -1,4 +1,4 @@
-;;; srecode-texi.el --- Srecode texinfo support.
+;;; srecode/texi.el --- Srecode texinfo support.
 
 ;; Copyright (C) 2008-2011 Free Software Foundation, Inc.
 
-- 
2.39.2