aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Albinus2012-12-14 16:37:27 +0100
committerMichael Albinus2012-12-14 16:37:27 +0100
commitf0bc0bf1eb9e53cca787a59b6d6e015be9872636 (patch)
tree45a604daf34e0b12c1f6dd227633b08a7502e1a6
parent016b2a42cda75bdd42891edb6c6384928b29036e (diff)
downloademacs-f0bc0bf1eb9e53cca787a59b6d6e015be9872636.tar.gz
emacs-f0bc0bf1eb9e53cca787a59b6d6e015be9872636.zip
* tramp.texi (External methods): Move `adb' method here.
-rw-r--r--doc/misc/ChangeLog4
-rw-r--r--doc/misc/tramp.texi23
2 files changed, 17 insertions, 10 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index e569d4c5500..ecf3619db4b 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,7 @@
12012-12-14 Michael Albinus <michael.albinus@gmx.de>
2
3 * tramp.texi (External methods): Move `adb' method here.
4
12012-12-13 Glenn Morris <rgm@gnu.org> 52012-12-13 Glenn Morris <rgm@gnu.org>
2 6
3 * cl.texi (Modify Macros, Obsolete Macros): Now letf == cl-letf. 7 * cl.texi (Modify Macros, Obsolete Macros): Now letf == cl-letf.
diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index 4918321b171..317d440c0d1 100644
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -742,16 +742,6 @@ expects PuTTY session names, calling @samp{plink -load @var{session}
742hasn't defined a user name. Different port numbers must be defined in 742hasn't defined a user name. Different port numbers must be defined in
743the session. 743the session.
744 744
745
746@item @option{adb}
747@cindex method adb
748@cindex adb method
749
750This special method uses the Android Debug Bridge for connecting
751Android devices. The Android Debug Bridge, part of the Android SDK,
752must be installed locally. The variable @var{tramp-adb-sdk-dir} must
753be set to its installation directory.
754
755@end table 745@end table
756 746
757 747
@@ -1041,6 +1031,17 @@ Windows, this method isn't available. Instead, you can use UNC
1041file names like @file{//melancholia/daniel$$/.emacs}. The only 1031file names like @file{//melancholia/daniel$$/.emacs}. The only
1042disadvantage is that there's no possibility to specify another user 1032disadvantage is that there's no possibility to specify another user
1043name. 1033name.
1034
1035
1036@item @option{adb}
1037@cindex method adb
1038@cindex adb method
1039
1040This special method uses the Android Debug Bridge for connecting
1041Android devices. The Android Debug Bridge, part of the Android SDK,
1042must be installed locally. The variable @var{tramp-adb-sdk-dir} must
1043be set to its installation directory.
1044
1044@end table 1045@end table
1045 1046
1046 1047
@@ -1089,6 +1090,7 @@ phones. For the time being, @value{tramp} only supports OBEX over Bluetooth.
1089The @option{synce} method allows communication with Windows Mobile 1090The @option{synce} method allows communication with Windows Mobile
1090devices. Beside GVFS for mounting remote files and directories via 1091devices. Beside GVFS for mounting remote files and directories via
1091FUSE, it also needs the SYNCE-GVFS plugin. 1092FUSE, it also needs the SYNCE-GVFS plugin.
1093
1092@end table 1094@end table
1093 1095
1094@defopt tramp-gvfs-methods 1096@defopt tramp-gvfs-methods
@@ -1596,6 +1598,7 @@ can return user names only.
1596 1598
1597Finally, a function which parses @file{~/.netrc} like files. This 1599Finally, a function which parses @file{~/.netrc} like files. This
1598includes also @file{~/.authinfo}-style files. 1600includes also @file{~/.authinfo}-style files.
1601
1599@end table 1602@end table
1600 1603
1601If you want to keep your own data in a file, with your own structure, 1604If you want to keep your own data in a file, with your own structure,