Fix use of @key in Texinfo manuals

* doc/misc/efaq-w32.texi (Location of init file):
* doc/misc/org.texi (Editing source code, Export settings)
(Closing items, Drawers, Structure editing):
* doc/misc/gnus.texi (Spam and Ham Processors, Terminology):
* doc/misc/calc.texi (Keypad Functions Menu, Keypad Binary Menu)
(Keypad Vectors Menu, Keypad Main Menu, Basic Arithmetic)
(Symbolic Mode):
* doc/misc/sc.texi (Electric References):
* doc/misc/info.texi (Help-^L):
* doc/misc/reftex.texi (Reference Styles):
* doc/misc/idlwave.texi (Troubleshooting, Examining Variables)
(Lesson III---User Catalog, Using the Shell):
* doc/misc/eshell.texi (Bugs and ideas):
* doc/misc/ada-mode.texi (Automatic Casing):
* doc/misc/ediff.texi (Selective Browsing):
* doc/misc/vip.texi (Customizing Constants):
* doc/misc/pcl-cvs.texi (Selected files):
* doc/misc/efaq.texi (Replying to the sender of a message)
(Basic keys, No Meta key, Matching parentheses)
(Origin of the term Emacs, Installing Texinfo documentation)
(Learning how to do something, Emacs manual, Extended commands):
* doc/misc/viper.texi (Rudimentary Changes):
* doc/misc/tramp.texi (Frequently Asked Questions):
* doc/emacs/kmacro.texi (Basic Keyboard Macro):
* doc/emacs/frames.texi (Frame Commands):
* doc/emacs/msdos.texi (Windows Keyboard):
* doc/emacs/search.texi (Query Replace):
* doc/lispintro/emacs-lisp-intro.texi (Keybindings)
(Note for Novices):
* doc/lispref/tips.texi (Key Binding Conventions): Fix use of
@key.  For the details, see
http://lists.gnu.org/archive/html/emacs-devel/2018-04/msg00390.html.

1 files changed, 5 insertions, 5 deletions

diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi
index b79432e7196..ebc4c7f009b 100644
--- a/doc/lispintro/emacs-lisp-intro.texi
+++ b/doc/lispintro/emacs-lisp-intro.texi
@@ -914,17 +914,17 @@ the command in parentheses, like this: @kbd{M-C-\}
 @kbd{M-C-\}.  (You can, if you wish, change the keys that are typed to
 invoke the command; this is called @dfn{rebinding}.  @xref{Keymaps, ,
 Keymaps}.)  The abbreviation @kbd{M-C-\} means that you type your
-@key{META} key, @key{CTRL} key and @key{\} key all at the same time.
+@key{META} key, @key{CTRL} key and @kbd{\} key all at the same time.
 (On many modern keyboards the @key{META} key is labeled
 @key{ALT}.)
 Sometimes a combination like this is called a keychord, since it is
 similar to the way you play a chord on a piano.  If your keyboard does
 not have a @key{META} key, the @key{ESC} key prefix is used in place
 of it.  In this case, @kbd{M-C-\} means that you press and release your
-@key{ESC} key and then type the @key{CTRL} key and the @key{\} key at
+@key{ESC} key and then type the @key{CTRL} key and the @kbd{\} key at
 the same time.  But usually @kbd{M-C-\} means press the @key{CTRL} key
 along with the key that is labeled @key{ALT} and, at the same time,
-press the @key{\} key.
+press the @kbd{\} key.
 
 In addition to typing a lone keychord, you can prefix what you type
 with @kbd{C-u}, which is called the @dfn{universal argument}.  The
@@ -17109,8 +17109,8 @@ This also shows how to set a key globally, for all modes.
 The command is @code{global-set-key}.  It is followed by the
 keybinding.  In a @file{.emacs} file, the keybinding is written as
 shown: @code{\C-c} stands for Control-C, which means to press the
-control key and the @key{c} key at the same time.  The @code{w} means
-to press the @key{w} key.  The keybinding is surrounded by double
+control key and the @kbd{c} key at the same time.  The @code{w} means
+to press the @kbd{w} key.  The keybinding is surrounded by double
 quotation marks.  In documentation, you would write this as
 @w{@kbd{C-c w}}.  (If you were binding a @key{META} key, such as
 @kbd{M-c}, rather than a @key{CTRL} key, you would write