auto upstream

2 files changed, 10 insertions, 0 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index d1b5aac955d..48db23a59e2 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
+2013-02-14  Michael Albinus  <michael.albinus@gmx.de>
+
+        * NEWS: Tramp methods "scpc" and "rsyncc" are discontinued.
+
 2013-02-11  Michael Albinus  <michael.albinus@gmx.de>
 
         * NEWS: Add autorevert changes.
diff --git a/etc/NEWS b/etc/NEWS
index 770ebc17ac0..98824220cec 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -186,10 +186,16 @@ space, no spaces, or reverting to the original spacing.  Like
 leave different number of spaces.
 
 ** Tramp
+
 +++
 *** New connection method "adb", which allows to access Android
 devices by the Android Debug Bridge.  The variable `tramp-adb-sdk-dir'
 must be set to the Android SDK installation directory.
+
+*** The connection methods "scpc" and "rsyncc" are discontinued.  The
+ssh option "ControlMaster=auto" is set automatically in all ssh-based
+methods, when possible.
+
 +++
 *** Handlers for `file-acl' and `set-file-acl' for remote machines
 which support POSIX ACLs.