2 files changed, 7 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 84d58421f7e..04977ca9f14 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2009-06-17  Glenn Morris  <rgm@gnu.org>
+
+        * files.el (dir-locals-set-directory-class): Fix doc typo.
+
 2009-06-17  Kenichi Handa  <handa@m17n.org>
 
         * international/mule-diag.el (list-character-sets): Change
@@ -564,7 +568,8 @@
 
 2009-04-11  Chong Yidong  <cyd@stupidchicken.com>
 
-        * files.el (dir-locals-directory-cache): Change format to include
+        * files.el (dir-locals-directory-cache):  Rename from
+        dir-locals-directory-alist.  Change format to include
         the mtime of the directory-local variables file (Bug#2833).
         (dir-locals-set-directory-class): New arg mtime.  Store it in
         dir-locals-directory-cache.
diff --git a/lisp/files.el b/lisp/files.el
index 4e81b6ad52d..921724d8a79 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -3246,7 +3246,7 @@ Return the new variables list."
 DIRECTORY is the name of a directory, a string.
 CLASS is the name of a project class, a symbol.
 MTIME is either the modification time of the directory-local
-variables file that defined this this class, or nil.
+variables file that defined this class, or nil.
 
 When a file beneath DIRECTORY is visited, the mode-specific
 variables from CLASS are applied to the buffer.  The variables