From: Michael Albinus <michael.albinus@gmx.de>
Date: Sun, 5 Aug 2018 17:53:42 +0000 (+0200)
Subject: Merge branch 'master' into feature/tramp-thread-safe
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8db0de97ac054366f2f0296d2665a2fcfd074d75;p=emacs.git

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

8db0de97ac054366f2f0296d2665a2fcfd074d75
diff --cc etc/NEWS
index ea363c4b626,fa8a7afd523..36bee818517
--- a/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.
  
  +++