Merge branch 'master' into feature/tramp-thread-safe

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

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

diff --cc doc/misc/tramp.texi
Simple merge

diff --cc etc/NEWS
index ea363c4b62656c3396ff56f58de5b4636542a6e7,fa8a7afd523d1b440223b41fd52fab604cc89f06..36bee818517d6ed5b8ff76ef1db99eefefacddd0
--- 1/etc/NEWS
--- 2/etc/NEWS
+++ b/etc/NEWS
@@@ -554,11 -597,8 +606,11 @@@ process.  It now accepts signals specif
  
  ** Tramp
  
 +---
 +*** Tramp is now thread-safe.
 +
  +++
- *** New connection method "owncloud", which allows to access OwnCloud
+ *** New connection method "nextcloud", which allows to access OwnCloud
  or NextCloud hosted files and directories.
  
  +++

diff --cc lisp/files.el
Simple merge

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

diff --cc lisp/subr.el
Simple merge

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