Merge from origin/emacs-26
authorGlenn Morris <rgm@gnu.org>
Mon, 18 Jun 2018 19:14:24 +0000 (12:14 -0700)
committerGlenn Morris <rgm@gnu.org>
Mon, 18 Jun 2018 19:14:24 +0000 (12:14 -0700)
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  2 
doc/misc/tramp.texi
lisp/info.el

Simple merge
diff --cc lisp/info.el
Simple merge