Merge from origin/emacs-25

acae275 ; Spelling fixes
d8fac73 Update README for precompiled windows Emacs.
23570fd Clarify documentation of 'vc-responsible-backend' wrt symlinks
f708cb2 Clarify doc string of 'transpose-sexps'
cd05b1d Fix docstring of 'browse-url-firefox-new-window-is-tab'
bdc89eb Improve documentation of 'font-lock-remove-keywords'
4a0c590 Fix documentation of the command summary key
0221b7a Mark relocation workarounds with REL_ALLOC

5 files changed, 29 insertions, 9 deletions

diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi
index 1037bd1fdd7..13668cc9269 100644
--- a/doc/emacs/maintaining.texi
+++ b/doc/emacs/maintaining.texi
@@ -223,7 +223,7 @@ basic editing operations under Bazaar.
 @cindex SRC
 @cindex src
 @item
-SRC (src) is RCS, reloaded - a specialized version-control system
+SRC (src) is RCS, reloaded---a specialized version-control system
 designed for single-file projects worked on by only one person.  It
 allows multiple files with independent version-control histories to
 exist in one directory, and is thus particularly well suited for
diff --git a/doc/lispref/files.texi b/doc/lispref/files.texi
index ecc3e03967c..cb31ca5a3de 100644
--- a/doc/lispref/files.texi
+++ b/doc/lispref/files.texi
@@ -1148,6 +1148,21 @@ compares the truenames of the two directories.  If @var{dir} does not
 name an existing directory, the return value is @code{nil}.
 @end defun
 
+@defun vc-responsible-backend file
+This function determines the responsible VC backend of the given
+@var{file}.  For example, if @file{emacs.c} is a file tracked by Git,
+@w{@code{(vc-responsible-backend "emacs.c")}} returns @samp{Git}.
+Note that if @var{file} is a symbolic link,
+@code{vc-responsible-backend} will not resolve it---the backend of the
+symbolic link file itself is reported.  To get the backend VC of the
+file to which @var{file} refers, wrap @var{file} with a symbolic link
+resolving function such as @code{file-chase-links}:
+
+@smallexample
+(vc-responsible-backend (file-chase-links "emacs.c"))
+@end smallexample
+@end defun
+
 @node File Attributes
 @subsection File Attributes
 @cindex file attributes
diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi
index 368d882a4b8..c7b6106ef5b 100644
--- a/doc/lispref/modes.texi
+++ b/doc/lispref/modes.texi
@@ -2934,7 +2934,9 @@ This function removes @var{keywords} from @code{font-lock-keywords}
 for the current buffer or for major mode @var{mode}.  As in
 @code{font-lock-add-keywords}, @var{mode} should be a major mode
 command name or @code{nil}.  All the caveats and requirements for
-@code{font-lock-add-keywords} apply here too.
+@code{font-lock-add-keywords} apply here too.  The argument
+@var{keywords} must exactly match the one used by the corresponding
+@code{font-lock-add-keywords}.
 @end defun
 
   For example, the following code adds two fontification patterns for C
diff --git a/doc/misc/ChangeLog.1 b/doc/misc/ChangeLog.1
index eb16d4ac565..93aacb521a9 100644
--- a/doc/misc/ChangeLog.1
+++ b/doc/misc/ChangeLog.1
@@ -5331,7 +5331,7 @@
 
 2010-07-09  Michael Albinus  <michael.albinus@gmx.de>
 
-        * dbus.texi (Top): Introduce Index.  Emphasize "nil" whereever
+        * dbus.texi (Top): Introduce Index.  Emphasize "nil" wherever
         forgotten.
         (Type Conversion): Precise conversion of natural numbers.
         (Errors and Events): Add "debugging" to concept index.  Add variable
diff --git a/doc/misc/info.texi b/doc/misc/info.texi
index 0a8100fec46..1b964e6b2c4 100644
--- a/doc/misc/info.texi
+++ b/doc/misc/info.texi
@@ -70,7 +70,8 @@ To read about advanced Info commands, type @kbd{n} twice.  This
 brings you to @cite{Advanced Info Commands}, skipping over the ``Getting
 Started'' chapter.
 
-Type @kbd{H} to see a summary of all available commands.
+If you are using Emacs, type @kbd{?} to see a summary of all available
+commands.  In the stand-alone Info reader, type @kbd{H} instead.
 @end ifinfo
 @end ifnottex
 
@@ -393,16 +394,18 @@ the @key{BACKSPACE} key (or @key{DEL}) many times.  You can also type
 @end format
 
 @kindex ? @r{(Info mode)}
+@kindex H @r{(stand-alone Info reader)}
 @findex Info-summary
   You have just learned a considerable number of commands.  If you
 want to use one but have trouble remembering which, you should type
-@kbd{?}, which displays a brief list of commands.  When you are
-finished looking at the list, make it go away by typing @key{SPC}
-repeatedly.
+@kbd{?} (@kbd{H} in the stand-alone Info reader), which displays a
+brief list of commands.  When you are finished looking at the list,
+make it go away by typing @key{SPC} repeatedly.
 
 @format
->> Type a @key{?} now.  Press @key{SPC} to see consecutive screenfuls of
-   the list until finished.  Then type @key{SPC} several times.  If
+>> Type a @key{?} (or @key{H} in the stand-alone Info reader) now.
+   Press @key{SPC} to see consecutive screenfuls of the list
+   until finished.  Then type @key{SPC} several times.  If
    you are using Emacs, the help will then go away automatically.
    If you are using the stand-alone Info reader, type @kbd{x} to
    return here.