Merge remote-tracking branch 'origin/master' into feature/tramp-thread-safe

diff --cc doc/lispref/files.texi
Simple merge

diff --cc etc/NEWS
index 5fd24395bac4156212223811496675e28a29a6e7,49b7fcd8c215fe18add0cacc7636676524eb2764..fd1ed3ec9dbbc17c8bf3f5f2ef37f1b977334c4c
--- 1/etc/NEWS
--- 2/etc/NEWS
+++ b/etc/NEWS
@@@ -130,11 -145,20 +155,23 @@@ To revert to the previous behaviour
  unconditionally aborts the current edebug instrumentation with the
  supplied error message.
  
+ +++
+ ** ElDoc
+ 
+ *** New hook 'eldoc-documentation-functions' to be used for registering
+ doc string functions.  This makes the results of all doc string
+ functions accessible to the user through the existing single function hook
+ 'eldoc-documentation-function'.
+ 
+ *** 'eldoc-documentation-function' is now a user option.
+ Modes should use the new hook instead of this user option to register
+ their backends.
+ 
  ** Tramp
  
 +---
 +*** Tramp is now thread-safe.
 +
  +++
  *** New connection method "media", which allows accessing media devices
  like cell phones, tablets or cameras.

diff --cc lisp/files.el
Simple merge

diff --cc lisp/net/tramp-compat.el
Simple merge

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

diff --cc lisp/simple.el
Simple merge

diff --cc test/lisp/net/tramp-tests.el
Simple merge