Merge from origin/emacs-26

e3f00f5 (origin/emacs-26) Clarify when to use advice-add vs add-function
c0f3e6b Minor formatting tweak in the Emacs manual
fadf653 Update comments in Intro to Emacs Lisp
52ccb24 ; * doc/os.texi (Batch Mode): use = after --eval
d65430f * etc/NEWS: Mention change in `edebug-prin1-to-string'.
ef4aec1 ; * doc/lispref/hash.texi (Defining Hash): Fix typos.
2981952 Another attempt to fix sql.el
b1b96d7 Update binding of 'M-.' in Intro to Emacs Lisp
b239a09 Fix a typo in last change in sql.el
0d8bae5 Fix capitalization of mail headers
845fe03 Fix buffer names in sql.el
a3885f5 Minor fixes in the Emacs manual
542f830 Fix a typo in rmail.texi
eb0bc6f * etc/PROBLEMS: Document Bug#31305.

Conflicts:
	doc/emacs/sending.texi
	etc/NEWS

1 files changed, 12 insertions, 10 deletions

diff --git a/doc/emacs/custom.texi b/doc/emacs/custom.texi
index d9844554e0c..dbcc4c1fd1a 100644
--- a/doc/emacs/custom.texi
+++ b/doc/emacs/custom.texi
@@ -1313,16 +1313,13 @@ accomplished with @dfn{directory-local variables}.
 
 @cindex @file{.dir-locals.el} file
   The usual way to define directory-local variables is to put a file
-named @file{.dir-locals.el}@footnote{ On MS-DOS, the name of this file
-should be @file{_dir-locals.el}, due to limitations of the DOS
-filesystems.  If the filesystem is limited to 8+3 file names, the name
-of the file will be truncated by the OS to @file{_dir-loc.el}.
-}@footnote{ You can also use @file{.dir-locals-2.el}, which
-is loaded in addition.  This is useful when @file{.dir-locals.el} is
-under version control in a shared repository and can't be used for
-personal customizations.  } in a
-directory.  Whenever Emacs visits any file in that directory or any of
-its subdirectories, it will apply the directory-local variables
+named @file{.dir-locals.el}@footnote{
+On MS-DOS, the name of this file should be @file{_dir-locals.el}, due
+to limitations of the DOS filesystems.  If the filesystem is limited
+to 8+3 file names, the name of the file will be truncated by the OS to
+@file{_dir-loc.el}.
+}in a directory.  Whenever Emacs visits any file in that directory or
+any of its subdirectories, it will apply the directory-local variables
 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
@@ -1331,6 +1328,11 @@ 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}.
 
+  You can also use @file{.dir-locals-2.el}; if found, Emacs loads it
+in addition to @file{.dir-locals.el}.  This is useful when
+@file{.dir-locals.el} is under version control in a shared repository
+and can't be used for personal customizations.
+
   The @file{.dir-locals.el} file should hold a specially-constructed
 list, which maps major mode names (symbols) to alists
 (@pxref{Association Lists,,, elisp, The Emacs Lisp Reference Manual}).