From: Michael Albinus <michael.albinus@gmx.de>
Date: Wed, 9 Sep 2020 17:29:18 +0000 (+0200)
Subject: Adapt Tramp doc
X-Git-Tag: emacs-28.0.90~6167
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9de9976de003b94d7496a55d4d643ac31514d520;p=emacs.git

Adapt Tramp doc

* doc/misc/tramp.texi (Remote shell setup):
Mention password-word-equivalents.

* lisp/net/tramp.el (tramp-password-prompt-regexp): Fix docstring.
---

diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index bdf3b403d80..538f85f35da 100644
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -2280,6 +2280,12 @@ example below:
 @end group
 @end lisp
 
+@vindex password-word-equivalents
+This variable is, by default, initialised from
+@code{password-word-equivalents} when @value{tramp} is loaded, and it
+is usually more convenient to add new passphrases to that variable
+instead of altering this variable.
+
 Similar localization may be necessary for handling wrong password
 prompts, for which @value{tramp} uses @code{tramp-wrong-passwd-regexp}.
 
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 2ae28b8758f..7fd48b29a9f 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -585,7 +585,7 @@ This regexp must match both `tramp-initial-end-of-output' and
 The regexp should match at end of buffer.
 
 This variable is, by default, initialised from
-`password-word-equivalents' when tramp is loaded, and it is
+`password-word-equivalents' when Tramp is loaded, and it is
 usually more convenient to add new passphrases to that variable
 instead of altering this variable.