[Emacs-diffs] emacs-24 1a941d6: Fix incorrect usage of @key in the User Manual (Bug#20135)

[Eli Zaretskii]

branch: emacs-24
commit 1a941d6c9eab9a35682408d6b85a1a98cfb6b01d
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    Fix incorrect usage of @key in the User Manual  (Bug#20135)
    
     doc/emacs/misc.texi (Term Mode):
     doc/emacs/programs.texi (Basic Indent, Custom C Indent):
     doc/emacs/mini.texi (Minibuffer History):
     doc/emacs/text.texi (Org Mode):
     doc/emacs/display.texi (View Mode): Use @kbd where @key was mistakenly
     used.
---
 doc/emacs/ChangeLog     |    9 +++++++++
 doc/emacs/display.texi  |    2 +-
 doc/emacs/mini.texi     |    2 +-
 doc/emacs/misc.texi     |    2 +-
 doc/emacs/programs.texi |    4 ++--
 doc/emacs/text.texi     |    2 +-
 6 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index b9c16c9..aba1e92 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,12 @@
+2015-03-18  Eli Zaretskii  <address@hidden>
+
+       * misc.texi (Term Mode):
+       * programs.texi (Basic Indent, Custom C Indent):
+       * mini.texi (Minibuffer History):
+       * text.texi (Org Mode):
+       * display.texi (View Mode): Use @kbd where @key was mistakenly
+       used.  (Bug#20135)
+
 2015-03-14  Eli Zaretskii  <address@hidden>
 
        * basic.texi (Moving Point): Improve indexing for HOME and END.
diff --git a/doc/emacs/display.texi b/doc/emacs/display.texi
index 34f84e7..4046d69 100644
--- a/doc/emacs/display.texi
+++ b/doc/emacs/display.texi
@@ -428,7 +428,7 @@ it.  @xref{Disabling}.
 screenfuls.  It provides commands for scrolling through the buffer
 conveniently but not for changing it.  Apart from the usual Emacs
 cursor motion commands, you can type @key{SPC} to scroll forward one
-windowful, @address@hidden or @key{DEL} to scroll backward, and @kbd{s} to
+windowful, @address@hidden or @key{DEL} to scroll backward, and @kbd{s} to
 start an incremental search.
 
 @kindex q @r{(View mode)}
diff --git a/doc/emacs/mini.texi b/doc/emacs/mini.texi
index 2a86af3..f0bedf8 100644
--- a/doc/emacs/mini.texi
+++ b/doc/emacs/mini.texi
@@ -622,7 +622,7 @@ typed @kbd{M-p}), Emacs tries fetching from a list of 
default
 arguments: values that you are likely to enter.  You can think of this
 as moving through the ``future history'' list.
 
-  If you edit the text inserted by the @kbd{M-p} or @key{M-n}
+  If you edit the text inserted by the @kbd{M-p} or @kbd{M-n}
 minibuffer history commands, this does not change its entry in the
 history list.  However, the edited argument does go at the end of the
 history list when you submit it.
diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi
index 0431e84..b3f8325 100644
--- a/doc/emacs/misc.texi
+++ b/doc/emacs/misc.texi
@@ -1306,7 +1306,7 @@ char mode.
 
 @table @kbd
 @item C-c C-c
-Send a literal @key{C-c} to the sub-shell.
+Send a literal @kbd{C-c} to the sub-shell.
 
 @item C-c @var{char}
 This is equivalent to @kbd{C-x @var{char}} in normal Emacs.  For
diff --git a/doc/emacs/programs.texi b/doc/emacs/programs.texi
index 3291754..ff7bed0 100644
--- a/doc/emacs/programs.texi
+++ b/doc/emacs/programs.texi
@@ -383,7 +383,7 @@ the preceding lines; if the region is active, @key{TAB} 
indents each
 line within the region, not just the current line.
 
   The command @key{RET} (@code{newline}), which was documented in
address@hidden Text}, does the same as @key{C-j} followed by
address@hidden Text}, does the same as @kbd{C-j} followed by
 @key{TAB}: it inserts a new line, then adjusts the line's indentation.
 
   When indenting a line that starts within a parenthetical grouping,
@@ -559,7 +559,7 @@ predefined styles, including @code{gnu}, @code{k&r}, 
@code{bsd},
 styles are primarily intended for one language, but any of them can be
 used with any of the languages supported by these modes.  To find out
 what a style looks like, select it and reindent some code, e.g., by
-typing @key{C-M-q} at the start of a function definition.
+typing @kbd{C-M-q} at the start of a function definition.
 
 @kindex C-c . @r{(C mode)}
 @findex c-set-style
diff --git a/doc/emacs/text.texi b/doc/emacs/text.texi
index 11b916a..9bc5ade 100644
--- a/doc/emacs/text.texi
+++ b/doc/emacs/text.texi
@@ -1293,7 +1293,7 @@ executed.
 
 @kindex S-TAB @r{(Org Mode)}
 @findex org-shifttab
-  Typing @key{S-TAB} (@code{org-shifttab}) anywhere in an Org mode
+  Typing @address@hidden (@code{org-shifttab}) anywhere in an Org mode
 buffer cycles the visibility of the entire outline structure, between
 (i) showing only top-level heading lines, (ii) showing all heading
 lines but no body lines, and (iii) showing everything.