Merge from emacs-24; up to 2012-12-22T19:09:52Z!rgm@gnu.org

2 files changed, 6 insertions, 1 deletions

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 355d0b57be5..c4f45d02a05 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,7 @@
+2013-02-24  Eli Zaretskii  <eliz@gnu.org>
+
+        * files.texi (Magic File Names): Improve wording and indexing.
+
 2013-02-21  Glenn Morris  <rgm@gnu.org>
 
         * display.texi (Multi-Frame Images): Minor rephrasing.
diff --git a/doc/lispref/files.texi b/doc/lispref/files.texi
index be44590f2ec..971e38f20b7 100644
--- a/doc/lispref/files.texi
+++ b/doc/lispref/files.texi
@@ -2681,7 +2681,7 @@ no prefix argument is given, and @code{nil} otherwise.
 
   You can implement special handling for certain file names.  This is
 called making those names @dfn{magic}.  The principal use for this
-feature is in implementing remote file names (@pxref{Remote Files,,
+feature is in implementing access to remote files (@pxref{Remote Files,,
 Remote Files, emacs, The GNU Emacs Manual}).
 
   To define a kind of magic file name, you must supply a regular
@@ -2689,6 +2689,7 @@ expression to define the class of names (all those that match the
 regular expression), plus a handler that implements all the primitive
 Emacs file operations for file names that match.
 
+@cindex file handler
 @vindex file-name-handler-alist
   The variable @code{file-name-handler-alist} holds a list of handlers,
 together with regular expressions that determine when to apply each