[Emacs-diffs] master 49614ec: Correct .dir-locals-2.el description

[Robert Pluim]

branch: master
commit 49614ec8002c7b424a4d794b5e7491f0959280fd
Author: Robert Pluim <address@hidden>
Commit: Robert Pluim <address@hidden>

    Correct .dir-locals-2.el description
    
    * doc/lispref/variables.texi (Directory Local Variables): Correct
    description of .dir-locals-2.el functioning.  (Bug#37640)
---
 doc/lispref/variables.texi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/lispref/variables.texi b/doc/lispref/variables.texi
index 76bda787..f92540d 100644
--- a/doc/lispref/variables.texi
+++ b/doc/lispref/variables.texi
@@ -2003,7 +2003,7 @@ files, Emacs uses the settings from the deepest file it 
finds starting
 from the file's directory and moving up the directory tree.  This
 constant is also used to derive the name of a second dir-locals file
 @file{.dir-locals-2.el}.  If this second dir-locals file is present,
-then that is loaded instead of @file{.dir-locals.el}.  This is useful
+then that is loaded in addition to @file{.dir-locals.el}.  This is useful
 when @file{.dir-locals.el} is under version control in a shared
 repository and cannot be used for personal customizations.  The file
 specifies local variables as a specially formatted list; see