2 files changed, 7 insertions, 1 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 987a1115e91..451e422ae5a 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,7 @@
+2012-06-06  Michael Albinus  <michael.albinus@gmx.de>
+
+        * custom.texi (Directory Variables): Mention enable-remote-dir-locals.
+
 2012-05-28  Glenn Morris  <rgm@gnu.org>
 
         * ack.texi, building.texi, calendar.texi, custom.texi:
diff --git a/doc/emacs/custom.texi b/doc/emacs/custom.texi
index 5226a458c28..f5657a65001 100644
--- a/doc/emacs/custom.texi
+++ b/doc/emacs/custom.texi
@@ -1283,7 +1283,9 @@ specified in @file{.dir-locals.el}, as though they had been defined as
 file-local variables for that file (@pxref{File Variables}).  Emacs
 searches for @file{.dir-locals.el} starting in the directory of the
 visited file, and moving up the directory tree.  To avoid slowdown,
-this search is skipped for remote files.
+this search is skipped for remote files.  If needed, the search can be
+extended for remote files by setting the variable
+@code{enable-remote-dir-locals} to @code{t}.
 
   The @file{.dir-locals.el} file should hold a specially-constructed
 list, which maps major mode names (symbols) to alists