2 files changed, 35 insertions, 3 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index d24f2b593d4..41eb17415b7 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,8 @@
+2013-02-20  Michael Albinus  <michael.albinus@gmx.de>
+
+        * tramp.texi (Android shell setup): Improve.  Reported by Thierry
+        Volpiatto <thierry.volpiatto@gmail.com>.
+
 2013-02-16  Michael Albinus  <michael.albinus@gmx.de>
 
         * tramp.texi (Top, Configuration): Insert section `Android shell
diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index 77a4f632cff..807e6b4db29 100644
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -2016,7 +2016,7 @@ local machine.
 
 When an @command{sshd} process runs on the Android device, like
 provided by the @code{SSHDroid} app, any @option{ssh}-based method can
-be used.  However, this requires some special settings.
+be used.  This requires some special settings.
 
 The default shell @code{/bin/sh} does not exist.  Instead, you shall
 use just @code{sh}, which invokes the shell installed on the device.
@@ -2031,23 +2031,50 @@ You can instruct @value{tramp} by this form:
 with @samp{192.168.0.26} being the IP address of your Android device.
 
 The user settings for the @code{$PATH} environment variable must be
-preserved.  Add this setting:
+preserved.  It has also been reported, that the commands in
+@file{/system/xbin} are better suited than the ones in
+@file{/system/bin}.  Add these setting:
 
 @lisp
 (add-to-list 'tramp-remote-path 'tramp-own-remote-path)
+(add-to-list 'tramp-remote-path "/system/xbin")
 @end lisp
 
+@noindent
 If the Android device is not @samp{rooted}, you must give the shell a
-writable directory for temporary files.  You could use this setting:
+writable directory for temporary files:
 
 @lisp
 (add-to-list 'tramp-remote-process-environment "TMPDIR=$HOME")
 @end lisp
 
+@noindent
 Now you shall be able to open a remote connection with @kbd{C-x C-f
 @trampfn{ssh, , 192.168.0.26#2222, }}, given that @command{sshd}
 listens on port @samp{2222}.
 
+It is also recommended to add a corresponding entry to your
+@file{~/.ssh/config} for that connection, like
+
+@example
+Host android
+     HostName 192.168.0.26
+     User root
+     Port 2222
+@end example
+
+@noindent
+In this case, you must change the setting for the remote shell to
+
+@lisp
+(add-to-list 'tramp-connection-properties
+             (list (regexp-quote "android") "remote-shell" "sh"))
+@end lisp
+
+@noindent
+You would open the connection with @kbd{C-x C-f @trampfn{ssh, ,
+android, }} then.
+
 
 @node Auto-save and Backup
 @section Auto-save and Backup configuration