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

13 files changed, 30 insertions, 25 deletions

diff --git a/lisp/cedet/ede/locate.el b/lisp/cedet/ede/locate.el
index 38d23883951..8564719c810 100644
--- a/lisp/cedet/ede/locate.el
+++ b/lisp/cedet/ede/locate.el
@@ -124,12 +124,12 @@ based on `ede-locate-setup-options'."
   t)
 
 (cl-defmethod ede-locate-flush-hash ((loc ede-locate-base))
-  "For LOC, flush hashtable and start from scratch."
+  "For LOC, flush hash table and start from scratch."
   (oset loc hash (make-hash-table :test 'equal)))
 
 (cl-defmethod ede-locate-file-in-hash ((loc ede-locate-base)
                                     filestring)
-  "For LOC, is the file FILESTRING in our hashtable?"
+  "For LOC, is the file FILESTRING in our hash table?"
   (gethash filestring (oref loc hash)))
 
 (cl-defmethod ede-locate-add-file-to-hash ((loc ede-locate-base)
diff --git a/lisp/cedet/semantic/db-typecache.el b/lisp/cedet/semantic/db-typecache.el
index 366af60034c..76382a30dd1 100644
--- a/lisp/cedet/semantic/db-typecache.el
+++ b/lisp/cedet/semantic/db-typecache.el
@@ -56,7 +56,7 @@
    (stream :initform nil
            :documentation
            "The searchable tag stream for this cache.
-NOTE: Can I get rid of this?  Use a hashtable instead?")
+NOTE: Can I get rid of this?  Use a hash table instead?")
    (dependants :initform nil
                :documentation
                "Any other object that is dependent on typecache results.
diff --git a/lisp/emacs-lisp/eieio-core.el b/lisp/emacs-lisp/eieio-core.el
index 52577adefac..624dccef075 100644
--- a/lisp/emacs-lisp/eieio-core.el
+++ b/lisp/emacs-lisp/eieio-core.el
@@ -460,7 +460,7 @@ See `defclass' for more information."
                           (cl--slot-descriptor-initform (aref slots i)))))
       (setf (eieio--class-class-allocation-values newc) v))
 
-    ;; Attach slot symbols into a hashtable, and store the index of
+    ;; Attach slot symbols into a hash table, and store the index of
     ;; this slot as the value this table.
     (let* ((slots (eieio--class-slots newc))
            ;; (cslots (eieio--class-class-slots newc))
diff --git a/lisp/emulation/edt.el b/lisp/emulation/edt.el
index 6bda15bf98d..f408ff73106 100644
--- a/lisp/emulation/edt.el
+++ b/lisp/emulation/edt.el
@@ -497,7 +497,7 @@ Argument NUM is the number of EOL marks to move."
 ;;; of line, etc.) it takes a bit of special handling.
 ;;;
 ;;; The variable edt-word-entities contains a list of characters which
-;;; are to be viewed as distinct words where ever they appear in the
+;;; are to be viewed as distinct words wherever they appear in the
 ;;; buffer.  This emulates the EDT line mode command SET ENTITY WORD.
 
 
diff --git a/lisp/erc/erc-backend.el b/lisp/erc/erc-backend.el
index 54c17bf73d9..288e8efe73e 100644
--- a/lisp/erc/erc-backend.el
+++ b/lisp/erc/erc-backend.el
@@ -108,7 +108,7 @@
 ;;;; Variables and options
 
 (defvar erc-server-responses (make-hash-table :test #'equal)
-  "Hashtable mapping server responses to their handler hooks.")
+  "Hash table mapping server responses to their handler hooks.")
 
 (cl-defstruct (erc-response (:conc-name erc-response.))
   (unparsed "" :type string)
@@ -1061,7 +1061,7 @@ See also `erc-server-responses'."
 (defun erc-call-hooks (process message)
   "Call hooks associated with MESSAGE in PROCESS.
 
-Finds hooks by looking in the `erc-server-responses' hashtable."
+Finds hooks by looking in the `erc-server-responses' hash table."
   (let ((hook (or (erc-get-hook (erc-response.command message))
                   'erc-default-server-functions)))
     (run-hook-with-args-until-success hook process message)
@@ -1218,7 +1218,7 @@ add things to `%s' instead."
        (put ',fn-name 'definition-name ',name)
        (put ',hook-name 'definition-name ',name)
 
-       ;; Hashtable map of responses to hook variables
+       ;; Hash table map of responses to hook variables
        ,@(cl-loop for response in (cons name aliases)
                   for var in (cons hook-name var-alternates)
                   collect `(puthash ,(format "%s" response) ',var
diff --git a/lisp/international/ucs-normalize.el b/lisp/international/ucs-normalize.el
index ac2a0d9e778..cf2e81e20f2 100644
--- a/lisp/international/ucs-normalize.el
+++ b/lisp/international/ucs-normalize.el
@@ -227,7 +227,7 @@
     table))
 
 (defvar ucs-normalize-decomposition-pair-to-primary-composite nil
-  "Hashtable of decomposed pair to primary composite.
+  "Hash table of decomposed pair to primary composite.
 Note that Hangul are excluded.")
   (setq ucs-normalize-decomposition-pair-to-primary-composite
         (ucs-normalize-make-hash-table-from-alist
diff --git a/lisp/language/ind-util.el b/lisp/language/ind-util.el
index deea48933c8..f7424ecd84f 100644
--- a/lisp/language/ind-util.el
+++ b/lisp/language/ind-util.el
@@ -39,7 +39,7 @@
 (eval-and-compile
 
 (defun indian-regexp-of-hashtbl-keys (hashtbl)
-  "Returns the regular expression of hashtable keys."
+  "Return the regular expression of hash table keys."
   (let (keys)
     (maphash (lambda (key val) (push key keys)) hashtbl)
     (regexp-opt keys)))
diff --git a/lisp/mh-e/mh-search.el b/lisp/mh-e/mh-search.el
index 6e607444ad8..d5a2d779b21 100644
--- a/lisp/mh-e/mh-search.el
+++ b/lisp/mh-e/mh-search.el
@@ -1859,7 +1859,7 @@ PROC is used to convert the value to actual data."
 (defun mh-index-update-maps (folder &optional origin-map)
   "Annotate all as yet unannotated messages in FOLDER with their MD5 hash.
 As a side effect msg -> checksum map is updated. Optional
-argument ORIGIN-MAP is a hashtable which maps each message in the
+argument ORIGIN-MAP is a hash table which maps each message in the
 index folder to the original folder and message from whence it
 was copied. If present the checksum -> (origin-folder,
 origin-index) map is updated too."
@@ -1913,7 +1913,7 @@ origin-index) map is updated too."
 (defun mh-index-update-single-msg (msg checksum origin-map)
   "Update various maps for one message.
 MSG is a index folder message, CHECKSUM its MD5 hash and
-ORIGIN-MAP, if non-nil, a hashtable containing which maps each
+ORIGIN-MAP, if non-nil, a hash table containing which maps each
 message in the index folder to the folder and message that it was
 copied from. The function updates the hash tables
 `mh-index-msg-checksum-map' and `mh-index-checksum-origin-map'.
diff --git a/lisp/mh-e/mh-thread.el b/lisp/mh-e/mh-thread.el
index e6acdba8b30..2a37cfc9e42 100644
--- a/lisp/mh-e/mh-thread.el
+++ b/lisp/mh-e/mh-thread.el
@@ -89,11 +89,11 @@
   (real-child-p t))
 
 (defvar mh-thread-id-hash nil
-  "Hashtable used to canonicalize message identifiers.")
+  "Hash table used to canonicalize message identifiers.")
 (make-variable-buffer-local 'mh-thread-id-hash)
 
 (defvar mh-thread-subject-hash nil
-  "Hashtable used to canonicalize subject strings.")
+  "Hash table used to canonicalize subject strings.")
 (make-variable-buffer-local 'mh-thread-subject-hash)
 
 (defvar mh-thread-id-table nil
@@ -109,11 +109,11 @@
 (make-variable-buffer-local 'mh-thread-id-index-map)
 
 (defvar mh-thread-subject-container-hash nil
-  "Hashtable used to group messages by subject.")
+  "Hash table used to group messages by subject.")
 (make-variable-buffer-local 'mh-thread-subject-container-hash)
 
 (defvar mh-thread-duplicates nil
-  "Hashtable used to associate messages with the same message identifier.")
+  "Hash table used to associate messages with the same message identifier.")
 (make-variable-buffer-local 'mh-thread-duplicates)
 
 (defvar mh-thread-history ()
diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el
index 1bb48314bc8..15f6df742cc 100644
--- a/lisp/net/browse-url.el
+++ b/lisp/net/browse-url.el
@@ -365,10 +365,7 @@ If non-nil, then open the URL in a new tab rather than a new window if
 (defcustom browse-url-firefox-new-window-is-tab nil
   "Whether to open up new windows in a tab or a new window.
 If non-nil, then open the URL in a new tab rather than a new window if
-`browse-url-firefox' is asked to open it in a new window.
-
-This option is currently ignored on MS-Windows, since the necessary
-functionality is not available there."
+`browse-url-firefox' is asked to open it in a new window."
   :type 'boolean
   :group 'browse-url)
 
diff --git a/lisp/simple.el b/lisp/simple.el
index d915ee2eb63..fe613255ab0 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -6783,9 +6783,13 @@ are interchanged."
   (transpose-subr 'forward-word arg))
 
 (defun transpose-sexps (arg)
-  "Like \\[transpose-words] but applies to sexps.
-Does not work on a sexp that point is in the middle of
-if it is a list or string."
+  "Like \\[transpose-chars] (`transpose-chars'), but applies to sexps.
+Unlike `transpose-words', point must be between the two sexps and not
+in the middle of a sexp to be transposed.
+With non-zero prefix arg ARG, effect is to take the sexp before point
+and drag it forward past ARG other sexps (backward if ARG is negative).
+If ARG is zero, the sexps ending at or after point and at or after mark
+are interchanged."
   (interactive "*p")
   (transpose-subr
    (lambda (arg)
diff --git a/lisp/subr.el b/lisp/subr.el
index fd46a818df9..ebcb1fd4b82 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -910,7 +910,7 @@ KEY is a string or vector representing a sequence of keystrokes."
 
 (defun substitute-key-definition (olddef newdef keymap &optional oldmap prefix)
   "Replace OLDDEF with NEWDEF for any keys in KEYMAP now defined as OLDDEF.
-In other words, OLDDEF is replaced with NEWDEF where ever it appears.
+In other words, OLDDEF is replaced with NEWDEF wherever it appears.
 Alternatively, if optional fourth argument OLDMAP is specified, we redefine
 in KEYMAP as NEWDEF those keys which are defined as OLDDEF in OLDMAP.
 
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index ac020d09539..2ddf4e19e1f 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -959,7 +959,11 @@ use."
 If FILE is already registered, return the
 backend of FILE.  If FILE is not registered, then the
 first backend in `vc-handled-backends' that declares itself
-responsible for FILE is returned."
+responsible for FILE is returned.
+
+Note that if FILE is a symbolic link, it will not be resolved --
+the responsible backend system for the symbolic link itself will
+be reported."
   (or (and (not (file-directory-p file)) (vc-backend file))
       (catch 'found
         ;; First try: find a responsible backend.  If this is for registration,