Merge from origin/emacs-25

dacde7e * etc/AUTHORS: Update the AUTHORS file
478ca5d ; fix changelog entries
2b7d006 ; make change-history-commit
851decb * lisp/dired-aux.el: Require cl-lib.  (Bug#22613)
47896c8 ; Improve commentary in insdel.c
53ca1e1 Index tilde characters in names of backup files
d97f522 Document deprecation of hi-lock-mode's 'C-x w' bindings
b55f06d ; * etc/NEWS: Use double spaces to end a sentence.
28bb214 Announce that the `C-x w' bindings are deprecated
1c98f98 Suppress GNUstep hardening
d82f24b Fix redisplay after a large insertion
85a2753 Revert "Fix gnus-group-get-new-news-this-group on group with
        closed server"
e8e3db0 ; Improve merge documentation in CONTRIBUTE
5be9989 * lib-src/make-docfile.c: Include stdarg.h.
c95ebbf Extend gpm-mouse-mode's doc string and doc to point out
        limitations.

3 files changed, 13 insertions, 2 deletions

diff --git a/doc/emacs/display.texi b/doc/emacs/display.texi
index 1b75a15427c..e3b24033a1a 100644
--- a/doc/emacs/display.texi
+++ b/doc/emacs/display.texi
@@ -924,7 +924,10 @@ mode for all buffers, use @kbd{M-x global-hi-lock-mode} or place
 
   Hi Lock mode works like Font Lock mode (@pxref{Font Lock}), except
 that you specify explicitly the regular expressions to highlight.  You
-control them with these commands:
+control them with the commands described below.  (The key bindings
+below that begin with @kbd{C-x w} are deprecated in favor of the
+global @kbd{M-s h} bindings, and will be removed in some future Emacs
+version.)
 
 @table @kbd
 @item M-s h r @var{regexp} @key{RET} @var{face} @key{RET}
diff --git a/doc/emacs/files.texi b/doc/emacs/files.texi
index 3d5562dcc47..ab20d4a18f9 100644
--- a/doc/emacs/files.texi
+++ b/doc/emacs/files.texi
@@ -530,11 +530,16 @@ another from the newly saved contents if you save again.
 
 @node Backup Names
 @subsubsection Single or Numbered Backups
+@cindex backup file names
+@cindex names of backup files
 
+@cindex @file{~}, in names of backup files
+@cindex tilde (@file{~}) at end of backup file name
   When Emacs makes a backup file, its name is normally constructed by
 appending @samp{~} to the file name being edited; thus, the backup
 file for @file{eval.c} would be @file{eval.c~}.
 
+@cindex @file{~/.emacs.d/%backup%~}
   If access control stops Emacs from writing backup files under the
 usual names, it writes the backup file as @file{~/.emacs.d/%backup%~}.
 Only one such file can exist, so only the most recently made such
diff --git a/doc/emacs/frames.texi b/doc/emacs/frames.texi
index 5fbe0fc5774..35b3f83ab33 100644
--- a/doc/emacs/frames.texi
+++ b/doc/emacs/frames.texi
@@ -1275,7 +1275,10 @@ again.
 @findex gpm-mouse-mode
   In the console on GNU/Linux, you can use @kbd{M-x gpm-mouse-mode} to
 enable mouse support.  You must have the gpm server installed and
-running on your system in order for this to work.
+running on your system in order for this to work.  Note that when
+this mode is enabled, you cannot use the mouse to transfer text
+between Emacs and other programs which use GPM.  This is due to
+limitations in GPM and the Linux kernel.
 
 @iftex
 @xref{MS-DOS Mouse,,,emacs-xtra,Specialized Emacs Features},