Merge from origin/emacs-25

78f9af7 ; ChangeLog fixes
162e549 * admin/authors.el (authors-ignored-files): Additions.
2b31a0c In x_set_window_size restore do_pending_window_change calls
401857e Fix Alt-modified keys on some European MS-Windows keyboards
a77cf24 Document 'help-go-forward'
1ba947f Revert "Allow to customize names of executables used by grep.el"
570e0fa Revert "Don't use 'find-program'"
645f4ef Revert "Use 'grep-find-program' in check-declare.el"
aa03257 Clarify documentation of 'dired-mark-files-containing-regexp'
ce0d8c7 Make tmm-menubar work in correct order again
b8d5a8f Remove the Meta-CVS VC backend

3 files changed, 13 insertions, 3 deletions

diff --git a/doc/emacs/dired.texi b/doc/emacs/dired.texi
index 60542df1097..d2de6795c6b 100644
--- a/doc/emacs/dired.texi
+++ b/doc/emacs/dired.texi
@@ -550,7 +550,13 @@ Mark (with @samp{*}) all files whose @emph{contents} contain a match for
 the regular expression @var{regexp}
 (@code{dired-mark-files-containing-regexp}).  This command is like
 @kbd{% m}, except that it searches the file contents instead of the file
-name.
+name.  Note that if a file is visited in an Emacs buffer, this command
+will look in the buffer without revisiting the file, so the results
+might be inconsistent with the file on disk if its contents has changed
+since it was last visited.  If you don't want this, you may wish
+reverting the files you have visited in your buffers, or turning on
+the @code{auto-revert} mode in those buffers, before invoking this
+command.  @xref{Reverting}.
 
 @item C-/
 @itemx C-x u
diff --git a/doc/emacs/help.texi b/doc/emacs/help.texi
index ed813ff0bf6..172d058f857 100644
--- a/doc/emacs/help.texi
+++ b/doc/emacs/help.texi
@@ -410,6 +410,8 @@ Follow a hyperlink that you click on.
 @item C-c C-c
 Show all documentation about the symbol at point
 (@code{help-follow-symbol}).
+@item C-c C-f
+Go forward to the next help topic (@code{help-go-forward}).
 @item C-c C-b
 Go back to the previous help topic (@code{help-go-back}).
 @end table
@@ -417,15 +419,18 @@ Go back to the previous help topic (@code{help-go-back}).
 @cindex hyperlink
 @findex help-follow
 @findex help-go-back
+@findex help-go-forward
 @kindex RET @r{(Help mode)}
 @kindex C-c C-b @r{(Help mode)}
+@kindex C-c C-f @r{(Help mode)}
   When a function name, variable name, or face name (@pxref{Faces})
 appears in the documentation in the help buffer, it is normally an
 underlined @dfn{hyperlink}.  To view the associated documentation,
 move point there and type @key{RET} (@code{help-follow}), or click on
 the hyperlink with @kbd{Mouse-1} or @kbd{Mouse-2}.  Doing so replaces
 the contents of the help buffer; to retrace your steps, type @kbd{C-c
-C-b} (@code{help-go-back}).
+C-b} (@code{help-go-back}).  While retracing your steps, you can go
+forward by using @kbd{C-c C-b} (@code{help-go-forward}).
 
 @cindex URL, viewing in help
 @cindex help, viewing web pages
diff --git a/doc/misc/efaq-w32.texi b/doc/misc/efaq-w32.texi
index fe65da6d612..28c09f69744 100644
--- a/doc/misc/efaq-w32.texi
+++ b/doc/misc/efaq-w32.texi
@@ -2061,7 +2061,6 @@ Jonathan Arnold has written an
 @cindex mercurial, version control integration with Emacs
 @cindex hg, version control integration with Emacs
 @cindex monotone, version control integration with Emacs
-@cindex mcvs, version control integration with Emacs
 
 If you are using a graphical revision control tool already, check if
 it comes with command-line tools.  Many such GUI tools are just