From: Michael Albinus <michael.albinus@gmx.de>
Date: Fri, 6 Jul 2018 12:03:42 +0000 (+0200)
Subject: Tramp editorials
X-Git-Tag: emacs-26.1.90~294
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=271d1f778e76ed086d932223af889f1a210873f1;p=emacs.git

Tramp editorials

* doc/misc/tramp.texi (Android shell setup): Mention Termux.

* lisp/net/tramp-sh.el (tramp-remote-process-environment):
Use proper spelling "Tramp" in docstring.
---

diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index 4115d40340a..154dec11d8e 100644
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -2085,8 +2085,8 @@ installed.  Usually, it is sufficient to open the file
 @file{@trampfn{adb,,/}}.  Then you can navigate in the filesystem via
 @code{dired}.
 
-Alternatively, applications such as @code{SSHDroid} that run
-@command{sshd} process on the Android device can accept any
+Alternatively, applications such as @code{Termux} or @code{SSHDroid}
+that run @command{sshd} process on the Android device can accept any
 @option{ssh}-based methods provided these settings are adjusted:
 
 @itemize
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 1a31596bf9b..212be4f36a0 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -544,7 +544,7 @@ The PATH environment variable should be set via `tramp-remote-path'.
 The TERM environment variable should be set via `tramp-terminal-type'.
 
 The INSIDE_EMACS environment variable will automatically be set
-based on the TRAMP and Emacs versions, and should not be set here."
+based on the Tramp and Emacs versions, and should not be set here."
   :group 'tramp
   :version "26.1"
   :type '(repeat string))