[Emacs-diffs] emacs-26 c0f3e6b: Minor formatting tweak in the Emacs manual

[Eli Zaretskii]

branch: emacs-26
commit c0f3e6b56b2643730b724647df950631d73484bc
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    Minor formatting tweak in the Emacs manual
    
    * doc/emacs/custom.texi (Directory Variables): Don't have 2
    footnotes back to back, it looks bad in HTML.  (Bug#31555)
---
 doc/emacs/custom.texi | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/doc/emacs/custom.texi b/doc/emacs/custom.texi
index e64686f..141fa04 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 @address@hidden 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}.
address@hidden 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 @address@hidden
+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
address@hidden
+}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
address@hidden 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}).