summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/emacs/ChangeLog3
-rw-r--r--doc/emacs/dired.texi2
-rw-r--r--doc/emacs/rmail.texi2
-rw-r--r--doc/misc/ChangeLog8
-rw-r--r--doc/misc/ebrowse.texi8
-rw-r--r--doc/misc/erc.texi2
-rw-r--r--doc/misc/ses.texi2
-rw-r--r--doc/misc/todo-mode.texi2
-rw-r--r--doc/misc/woman.texi2
9 files changed, 21 insertions, 10 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 993028d0b19..f277526aea6 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,5 +1,8 @@
2014-06-08 Glenn Morris <rgm@gnu.org>
+ * dired.texi (Marks vs Flags):
+ * rmail.texi (Rmail Scrolling): Markup fixes re SPC.
+
* help.texi (Help, Misc Help): Copyedits.
* screen.texi (Menu Bar): Copyedits.
diff --git a/doc/emacs/dired.texi b/doc/emacs/dired.texi
index 4e9dfd5d12a..c7dace619e9 100644
--- a/doc/emacs/dired.texi
+++ b/doc/emacs/dired.texi
@@ -522,7 +522,7 @@ flags on all the files that have no marks, while unflagging all those
that already have @samp{D} flags:
@example
-* c D t * c SPC D * c t SPC
+* c D t * c @key{SPC} D * c t @key{SPC}
@end example
This assumes that no files were already marked with @samp{t}.
diff --git a/doc/emacs/rmail.texi b/doc/emacs/rmail.texi
index 6ba252393f6..72f3034a837 100644
--- a/doc/emacs/rmail.texi
+++ b/doc/emacs/rmail.texi
@@ -114,7 +114,7 @@ Scroll to end of message (@code{rmail-end-of-message}).
@kindex S-SPC @r{(Rmail)}
Since the most common thing to do while reading a message is to
scroll through it by screenfuls, Rmail makes @key{SPC} and @key{DEL}
-(or @key{S-SPC}) do the same as @kbd{C-v} (@code{scroll-up-command})
+(or @kbd{S-@key{SPC}}) do the same as @kbd{C-v} (@code{scroll-up-command})
and @kbd{M-v} (@code{scroll-down-command}) respectively.
@kindex . @r{(Rmail)}
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index ca0a3c4faa5..332d048603f 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,11 @@
+2014-06-08 Glenn Morris <rgm@gnu.org>
+
+ * ebrowse.texi (Source Display, Finding/Viewing):
+ * erc.texi (Sample Session):
+ * ses.texi (The Basics):
+ * todo-mode.texi (Moving and Deleting Items):
+ * woman.texi (Navigation): Markup fixes re SPC, RET.
+
2014-05-24 Paul Eggert <eggert@cs.ucla.edu>
Specify coding if Latin-1 Emacs would misinterpret (Bug#17575).
diff --git a/doc/misc/ebrowse.texi b/doc/misc/ebrowse.texi
index 77e221d3c83..9ff3e28e99d 100644
--- a/doc/misc/ebrowse.texi
+++ b/doc/misc/ebrowse.texi
@@ -475,13 +475,13 @@ You can view or find a class declaration when the cursor is on a class
name.
@table @kbd
-@item SPC
+@item @key{SPC}
This command views the class declaration if the database
contains information about it. If you don't parse the entire source
you are working on, some classes will only be known to exist but the
location of their declarations and definitions will not be known.
-@item RET
+@item @key{RET}
Works like @kbd{SPC}, except that it finds the class
declaration rather than viewing it, so that it is ready for
editing.
@@ -876,7 +876,7 @@ context menu.
@cindex declaration of a member, in member buffers
@table @kbd
-@item RET
+@item @key{RET}
This command finds the definition of the member the cursor is on.
Finding involves roughly the same as the standard Emacs tags facility
does---loading the file and searching for a regular expression matching
@@ -885,7 +885,7 @@ the member.
@item f
This command finds the declaration of the member the cursor is on.
-@item SPC
+@item @key{SPC}
This is the same command as @kbd{RET}, but views the member definition
instead of finding the member's source file.
diff --git a/doc/misc/erc.texi b/doc/misc/erc.texi
index f21b9d5cbd4..4cb5eaed604 100644
--- a/doc/misc/erc.texi
+++ b/doc/misc/erc.texi
@@ -150,7 +150,7 @@ then a bunch of other messages that describe the current IRC server.
@item Join the #emacs channel
-In that buffer, type ``/join SPC #emacs'' and hit @kbd{RET}. Depending
+In that buffer, type ``/join @key{SPC} #emacs'' and hit @kbd{RET}. Depending
on how you've set up ERC, either a new buffer for ``#emacs'' will be
displayed, or a new buffer called ``#emacs'' will be created in the
background. If the latter, switch to the ``#emacs'' buffer. You will
diff --git a/doc/misc/ses.texi b/doc/misc/ses.texi
index fb4d0887c68..2e1159a98fe 100644
--- a/doc/misc/ses.texi
+++ b/doc/misc/ses.texi
@@ -223,7 +223,7 @@ range A1-A2. Many @acronym{SES} commands operate only on single cells, not
ranges.
@table @kbd
-@item C-SPC
+@item C-@key{SPC}
@itemx C-@@
Set mark at point (@code{set-mark-command}).
diff --git a/doc/misc/todo-mode.texi b/doc/misc/todo-mode.texi
index 44ea7fbf06e..d178e2a2e28 100644
--- a/doc/misc/todo-mode.texi
+++ b/doc/misc/todo-mode.texi
@@ -1029,7 +1029,7 @@ modified form of @code{y-or-n-p}, which by default only accepts @kbd{y}
or @kbd{Y}, but not @key{SPC}, as an affirmative answer. This is to
diminish the risk of unintentionally executing the command, which is
especially important with commands that do deletion, since there is no
-Todo command to undo a deletion. If you want to be able to use SPC for
+Todo command to undo a deletion. If you want to be able to use @key{SPC} for
confirmation, enable the option @code{todo-y-with-space}.
@end quotation
diff --git a/doc/misc/woman.texi b/doc/misc/woman.texi
index 565d9177d4e..5a63d3523f6 100644
--- a/doc/misc/woman.texi
+++ b/doc/misc/woman.texi
@@ -630,7 +630,7 @@ the @code{man} key bindings.
Scroll the man page up the window (@code{scroll-up}).
@item @key{DEL}
-@itemx @key{S-SPC}
+@itemx @kbd{S-@key{SPC}}
@kindex DEL
@kindex S-SPC
@findex scroll-down