aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorMichael Albinus2017-06-30 18:38:32 +0200
committerMichael Albinus2017-06-30 18:38:32 +0200
commitceedd86ed448b2cd27a5f96297ce7011eb1e0b97 (patch)
tree4b523bcab12ed963e2a912cb13765a455a9f0b86 /doc
parent169532b0ebc3acb0b1c943d0b3d8b569cd57ca4b (diff)
downloademacs-ceedd86ed448b2cd27a5f96297ce7011eb1e0b97.tar.gz
emacs-ceedd86ed448b2cd27a5f96297ce7011eb1e0b97.zip
Release Tramp 2.3.2
* doc/misc/tramp.texi (Android shell setup): Show default file name. Structure section. * doc/misc/trampver.texi: * lisp/net/trampver.el: Change version to "2.3.2". * test/lisp/net/tramp-tests.el (tramp-test-temporary-file-directory): Offer home directory for mock method if it doesn't exist.
Diffstat (limited to 'doc')
-rw-r--r--doc/misc/tramp.texi18
-rw-r--r--doc/misc/trampver.texi2
2 files changed, 13 insertions, 7 deletions
diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index a42dc6ed3c0..ce503aeb197 100644
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -1896,12 +1896,16 @@ where @samp{192.168.0.1} is the remote host IP address
1896@value{tramp} uses the @option{adb} method to access Android devices. 1896@value{tramp} uses the @option{adb} method to access Android devices.
1897Android devices provide a restricted shell access through an USB 1897Android devices provide a restricted shell access through an USB
1898connection. The local host must have the @command{adb} program 1898connection. The local host must have the @command{adb} program
1899installed. 1899installed. Usually, it is sufficient to open the file
1900@file{@trampfn{adb,,/}}. Then you can navigate in the filesystem via
1901@code{dired}.
1900 1902
1901Applications such as @code{SSHDroid} that run @command{sshd} process 1903Alternatively, applications such as @code{SSHDroid} that run
1902on the Android device can accept any @option{ssh}-based methods 1904@command{sshd} process on the Android device can accept any
1903provided these settings are adjusted: 1905@option{ssh}-based methods provided these settings are adjusted:
1904 1906
1907@itemize
1908@item
1905@command{sh} must be specified for remote shell since Android devices 1909@command{sh} must be specified for remote shell since Android devices
1906do not provide @command{/bin/sh}. @command{sh} will then invoke 1910do not provide @command{/bin/sh}. @command{sh} will then invoke
1907whatever shell is installed on the device with this setting: 1911whatever shell is installed on the device with this setting:
@@ -1917,6 +1921,7 @@ whatever shell is installed on the device with this setting:
1917where @samp{192.168.0.26} is the Android device's IP address. 1921where @samp{192.168.0.26} is the Android device's IP address.
1918(@pxref{Predefined connection information}). 1922(@pxref{Predefined connection information}).
1919 1923
1924@item
1920@value{tramp} requires preserving @env{PATH} environment variable from 1925@value{tramp} requires preserving @env{PATH} environment variable from
1921user settings. Android devices prefer @file{/system/xbin} path over 1926user settings. Android devices prefer @file{/system/xbin} path over
1922@file{/system/bin}. Both of these are set as follows: 1927@file{/system/bin}. Both of these are set as follows:
@@ -1928,7 +1933,7 @@ user settings. Android devices prefer @file{/system/xbin} path over
1928@end group 1933@end group
1929@end lisp 1934@end lisp
1930 1935
1931@noindent 1936@item
1932When the Android device is not @samp{rooted}, specify a writable 1937When the Android device is not @samp{rooted}, specify a writable
1933directory for temporary files: 1938directory for temporary files:
1934 1939
@@ -1936,7 +1941,7 @@ directory for temporary files:
1936(add-to-list 'tramp-remote-process-environment "TMPDIR=$HOME") 1941(add-to-list 'tramp-remote-process-environment "TMPDIR=$HOME")
1937@end lisp 1942@end lisp
1938 1943
1939@noindent 1944@item
1940Open a remote connection with the command @kbd{C-x C-f 1945Open a remote connection with the command @kbd{C-x C-f
1941@trampfn{ssh,192.168.0.26#2222,}}, where @command{sshd} is listening 1946@trampfn{ssh,192.168.0.26#2222,}}, where @command{sshd} is listening
1942on port @samp{2222}. 1947on port @samp{2222}.
@@ -1967,6 +1972,7 @@ the previous example, fix the connection properties as follows:
1967@noindent 1972@noindent
1968Open a remote connection with a more concise command @kbd{C-x C-f 1973Open a remote connection with a more concise command @kbd{C-x C-f
1969@trampfn{ssh,android,}}. 1974@trampfn{ssh,android,}}.
1975@end itemize
1970 1976
1971 1977
1972@node Auto-save and Backup 1978@node Auto-save and Backup
diff --git a/doc/misc/trampver.texi b/doc/misc/trampver.texi
index f1cb60b9d25..05b577da005 100644
--- a/doc/misc/trampver.texi
+++ b/doc/misc/trampver.texi
@@ -8,7 +8,7 @@
8@c In the Tramp GIT, the version number is auto-frobbed from 8@c In the Tramp GIT, the version number is auto-frobbed from
9@c configure.ac, so you should edit that file and run 9@c configure.ac, so you should edit that file and run
10@c "autoconf && ./configure" to change the version number. 10@c "autoconf && ./configure" to change the version number.
11@set trampver 2.3.2-pre 11@set trampver 2.3.2
12 12
13@c Other flags from configuration 13@c Other flags from configuration
14@set instprefix /usr/local 14@set instprefix /usr/local