* tramp.texi (History): Mention ADB.

(Inline methods): Add `adb' method.

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index f5e5007c58d4a697d0f39cce871677ae53ae1993..639a461b21e23e656fe82ae737a67cdd54ba1070 100644 (file)
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-04  Michael Albinus  <michael.albinus@gmx.de>
+
+       * tramp.texi (History): Mention ADB.
+       (Inline methods): Add `adb' method.
+
 2012-12-03  Michael Albinus  <michael.albinus@gmx.de>
 
        * tramp.texi (Top, Obtaining Tramp): Replace CVS by Git.

diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index 020a6e55833dcf7f39def5a24b3a1c35aebfbe07..708478ca8e9861b238b6d0d370bb1890e0e3e74c 100644 (file)
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -452,7 +452,8 @@ GVFS integration started in February 2009.
 Remote commands on Windows hosts are available since September 2011.
 @end ifset
 Ad-hoc multi-hop methods (with a changed syntax) have been reenabled
-in November 2011.
+in November 2011.  In November 2012, Juergen Hoetzel's
+@file{tramp-adb.el} has been added.
 
 In December 2001, @value{tramp} has been added to the XEmacs package
 repository.  Being part of the Emacs repository happened in June 2002,
@@ -741,6 +742,16 @@ expects PuTTY session names, calling @samp{plink -load @var{session}
 hasn't defined a user name.  Different port numbers must be defined in
 the session.
 
+
+@item @option{adb}
+@cindex method adb
+@cindex adb method
+
+This special method uses the Android Debug Bridge for connecting
+Android devices.  The Android Debug Bridge, part of the Android SDK,
+must be installed locally.  The variable @var{tramp-adb-sdk-dir} must
+be set to its installation directory.
+
 @end table