Merge from origin/emacs-25

5569e64 ; Spelling fixes
24a5f57 * lisp/net/eww.el (eww-tag-meta): Handle single quoted URLs (...
9b89896 * lisp/progmodes/sql.el (sql-product-alist): Doc tweak
69b50f5 * lisp/progmodes/sql.el (sql-product-alist): Doc fix.  (Bug#2...
42eae54 Improve documentation of dabbrevs
b0ade0d Clarify that easy-menu-add is a nop (Bug#25382)
3c69f2c * lisp/textmodes/rst.el (rst-package-emacs-version-alist): Fi...

# Conflicts:
#	lisp/textmodes/rst.el

diff --cc lisp/net/eww.el
Simple merge

diff --cc lisp/progmodes/sql.el
Simple merge

diff --cc lisp/textmodes/rst.el
index 261e98eabced07146bdfed3560b4e9d80ba7da49,7fbacbe358c444b9075dd315b6e92e734aa9e09d..9143f97dce03231aa2359b65ff8af88dd66f3152
--- 1/lisp/textmodes/rst.el
--- 2/lisp/textmodes/rst.el
+++ b/lisp/textmodes/rst.el
@@@ -293,12 -267,7 +293,12 @@@ in parentheses follows the development 
      ("1.3.0" . "24.3")
      ("1.3.1" . "24.3")
      ("1.4.0" . "24.3")
-     ("1.4.1" . "24.5")
+     ("1.4.1" . "25.1")
 +    ("1.4.2" . "24.5")
 +    ("1.5.0" . "26.1")
 +    ("1.5.1" . "26.2")
 +    ("1.5.2" . "26.2")
 +    ;; Whatever the Emacs version is this rst.el version ends up in.
      ))
  
  (unless (assoc rst-official-version rst-package-emacs-version-alist)

diff --cc src/buffer.c
Simple merge