auto upstream

2 files changed, 11 insertions, 5 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index e50d288da1c..a13ab60be36 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,8 @@
+2013-03-01  Michael Albinus  <michael.albinus@gmx.de>
+
+        * NEWS: Fix Tramp "adb" entry.  Extend list of discontinued Tramp
+        methods.
+
 2013-02-25  Paul Eggert  <eggert@cs.ucla.edu>
 
         Simplify data_start configuration (Bug#13783).
diff --git a/etc/NEWS b/etc/NEWS
index 698757b2305..d937ae70166 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -196,12 +196,13 @@ leave different number of spaces.
 
 +++
 *** 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.
+devices by the Android Debug Bridge.  The variable `tramp-adb-program'
+can be used to adapt the path of the "adb" program, if needed.
 
-*** The connection methods "scpc" and "rsyncc" are discontinued.  The
-ssh option "ControlMaster=auto" is set automatically in all ssh-based
-methods, when possible.
+*** The connection methods "plink1", "ssh1", "ssh2", "scp1", "scp2",
+"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