Merge from origin/emacs-26

a933ebe Improve commentary in info.el
94e84a9 ; Further wording fix in tramp.texi
a5a0b11 Fix wording in tramp.texi
2933242 * doc/misc/tramp.texi (Remote shell setup): Fix typo.

1 files changed, 4 insertions, 3 deletions

diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index 83585038a8f..420fef7164c 100644
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -1931,7 +1931,7 @@ Another possibility is to check the environment variable
 to the version of the parent Emacs process, @xref{Interactive Shell, ,
 , emacs}.  @value{tramp} adds its own package version to this string,
 which could be used for further tests in an inferior shell.  The
-string of that environment variable loooks always like
+string of that environment variable looks always like
 
 @example
 @group
@@ -3811,8 +3811,9 @@ Abbreviation list expansion can be used to reduce typing long file names:
 The reduced typing: @kbd{C-x C-f /xy @key{RET}}.
 
 @strong{Note} that file name cannot be edited here because the
-environment variables are not expanded during editing in the
-minibuffer.
+abbreviations are not expanded during editing in the minibuffer.
+Furthermore, the abbreviation is not expanded during @key{TAB}
+completion.
 
 @item
 Define own abbreviation (2):