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.

2 files changed, 13 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):
diff --git a/lisp/info.el b/lisp/info.el
index bbce55f6216..c45b7f9cb3e 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -30,6 +30,15 @@
 ;; This distinction is to support indexing of computer programming
 ;; language terms that may contain ":" but not ": ".
 
+;; The commands in this file should start either with "Info-" or with
+;; "info-".  The capitalized version is for commands that are bound to
+;; keys, and therefore are unlikely to be invoked by name via "M-x";
+;; the lower-case version is for commands invoked by name.  This
+;; arrangement makes completion of "info-" commands work better,
+;; because the "Info-" commands (of which there are a lot) don't get
+;; in the way.  Please adhere to this convention when you add commands
+;; here.
+
 ;;; Code:
 
 (eval-when-compile (require 'cl-lib))