aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Albinus2013-03-01 09:24:19 +0100
committerMichael Albinus2013-03-01 09:24:19 +0100
commit19dc8b9eb57c27df7b75c96a0a9462d4ced26afd (patch)
treea05ff675128494af4cca2cb9804f4fb10ac0f18c
parentadb7352b327b874a56680fdcc5be3136a49e4009 (diff)
downloademacs-19dc8b9eb57c27df7b75c96a0a9462d4ced26afd.tar.gz
emacs-19dc8b9eb57c27df7b75c96a0a9462d4ced26afd.zip
* NEWS: Fix Tramp "adb" entry. Extend list of discontinued Tramp methods.
-rw-r--r--etc/ChangeLog5
-rw-r--r--etc/NEWS11
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 @@
12013-03-01 Michael Albinus <michael.albinus@gmx.de>
2
3 * NEWS: Fix Tramp "adb" entry. Extend list of discontinued Tramp
4 methods.
5
12013-02-25 Paul Eggert <eggert@cs.ucla.edu> 62013-02-25 Paul Eggert <eggert@cs.ucla.edu>
2 7
3 Simplify data_start configuration (Bug#13783). 8 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.
196 196
197+++ 197+++
198*** New connection method "adb", which allows to access Android 198*** New connection method "adb", which allows to access Android
199devices by the Android Debug Bridge. The variable `tramp-adb-sdk-dir' 199devices by the Android Debug Bridge. The variable `tramp-adb-program'
200must be set to the Android SDK installation directory. 200can be used to adapt the path of the "adb" program, if needed.
201 201
202*** The connection methods "scpc" and "rsyncc" are discontinued. The 202*** The connection methods "plink1", "ssh1", "ssh2", "scp1", "scp2",
203ssh option "ControlMaster=auto" is set automatically in all ssh-based 203"scpc" and "rsyncc" are discontinued. The ssh option
204methods, when possible. 204"ControlMaster=auto" is set automatically in all ssh-based methods,
205when possible.
205 206
206+++ 207+++
207*** Handlers for `file-acl' and `set-file-acl' for remote machines 208*** Handlers for `file-acl' and `set-file-acl' for remote machines