Merge from trunk.

10 files changed, 58 insertions, 34 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index ae732a7db0f..8a275b9e359 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,11 @@
+2011-07-11  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * mark.texi (Setting Mark): Clarify what's meant by "Shifted
+        motion keys" (bug#3503).
+
+        * emacs.texi: Change all the register node names from "RegPos"
+        (etc.) to "Positional Registers" (etc.) (bug#3314).
+
 2011-07-11  Chong Yidong  <cyd@stupidchicken.com>
 
         * killing.texi (Killing, Deletion and Killing, Killing by Lines)
diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi
index a35736f4fe7..2591f56a168 100644
--- a/doc/emacs/emacs.texi
+++ b/doc/emacs/emacs.texi
@@ -338,13 +338,13 @@ Killing and Yanking on Graphical Displays
 
 Registers
 
-* RegPos::              Saving positions in registers.
-* RegText::             Saving text in registers.
-* RegRect::             Saving rectangles in registers.
-* RegConfig::           Saving window configurations in registers.
-* RegNumbers::          Numbers in registers.
-* RegFiles::            File names in registers.
-* Bookmarks::           Bookmarks are like registers, but persistent.
+* Position Registers::      Saving positions in registers.
+* Text Registers::          Saving text in registers.
+* Rectangle Registers::     Saving rectangles in registers.
+* Configuration Registers:: Saving window configurations in registers.
+* Number Registers::        Numbers in registers.
+* File Registers::          File names in registers.
+* Bookmarks::               Bookmarks are like registers, but persistent.
 
 Controlling the Display
 
diff --git a/doc/emacs/killing.texi b/doc/emacs/killing.texi
index 38124fc315a..6be40c85832 100644
--- a/doc/emacs/killing.texi
+++ b/doc/emacs/killing.texi
@@ -758,8 +758,7 @@ rectangle and then yank it beside the first line of the list.
 @xref{Two-Column}, for another way to edit multi-column text.
 
   You can also copy rectangles into and out of registers with @kbd{C-x r
-r @var{r}} and @kbd{C-x r i @var{r}}.  @xref{RegRect,,Rectangle
-Registers}.
+r @var{r}} and @kbd{C-x r i @var{r}}.  @xref{Rectangle Registers}.
 
 @kindex C-x r o
 @findex open-rectangle
diff --git a/doc/emacs/kmacro.texi b/doc/emacs/kmacro.texi
index c52381a663c..ac81377aec9 100644
--- a/doc/emacs/kmacro.texi
+++ b/doc/emacs/kmacro.texi
@@ -332,8 +332,8 @@ numbers stored in registers.
 
   If you use a register as a counter, incrementing it on each
 repetition of the macro, that accomplishes the same thing as a
-keyboard macro counter.  @xref{RegNumbers}.  For most purposes, it is
-simpler to use a keyboard macro counter.
+keyboard macro counter.  @xref{Number Registers}.  For most purposes,
+it is simpler to use a keyboard macro counter.
 
 @node Keyboard Macro Query
 @section Executing Macros with Variations
diff --git a/doc/emacs/mark.texi b/doc/emacs/mark.texi
index b426020b7c6..6d3ed351e43 100644
--- a/doc/emacs/mark.texi
+++ b/doc/emacs/mark.texi
@@ -68,10 +68,11 @@ Set point and the mark around the text you drag across.
 @item Mouse-3
 Set the mark at point, then move point to where you click
 (@code{mouse-save-then-kill}).
-@item @samp{Shifted motion keys}
-Set the mark at point if the mark is inactive, then move point.
 @end table
 
+Also, the shifted motion keys (for example, @key{S-Right}) will set
+the mark at point if the mark is inactive, then move point.
+
 @kindex C-SPC
 @kindex C-@@
 @findex set-mark-command
@@ -307,8 +308,8 @@ is non-@code{nil} by default.
 
   If you want to move back to the same place over and over, the mark
 ring may not be convenient enough.  If so, you can record the position
-in a register for later retrieval (@pxref{RegPos,, Saving Positions in
-Registers}).
+in a register for later retrieval (@pxref{Position Registers,, Saving
+Positions in Registers}).
 
 @node Global Mark Ring
 @section The Global Mark Ring
diff --git a/doc/emacs/regs.texi b/doc/emacs/regs.texi
index 42ce85c7ee1..b4b9fd252e1 100644
--- a/doc/emacs/regs.texi
+++ b/doc/emacs/regs.texi
@@ -35,16 +35,16 @@ Bookmarks are similar enough in spirit to registers that they
 seem to belong in this chapter.
 
 @menu
-* Position: RegPos.           Saving positions in registers.
-* Text: RegText.              Saving text in registers.
-* Rectangle: RegRect.         Saving rectangles in registers.
-* Configurations: RegConfig.  Saving window configurations in registers.
-* Numbers: RegNumbers.        Numbers in registers.
-* Files: RegFiles.            File names in registers.
-* Bookmarks::                 Bookmarks are like registers, but persistent.
+* Position Registers::       Saving positions in registers.
+* Text Registers::           Saving text in registers.
+* Rectangle Registers::      Saving rectangles in registers.
+* Configuration Registers::  Saving window configurations in registers.
+* Number Registers::         Numbers in registers.
+* File Registers::           File names in registers.
+* Bookmarks::                Bookmarks are like registers, but persistent.
 @end menu
 
-@node RegPos
+@node Position Registers
 @section Saving Positions in Registers
 @cindex saving position in a register
 
@@ -76,7 +76,7 @@ was saved from has been killed, @kbd{C-x r j} tries to create the buffer
 again by visiting the same file.  Of course, this works only for buffers
 that were visiting files.
 
-@node RegText
+@node Text Registers
 @section Saving Text in Registers
 @cindex saving text in a register
 
@@ -123,7 +123,7 @@ the region text to the text in the register instead of
 after, but with a numeric argument (@kbd{C-u}) it puts point after the
 text and the mark before.
 
-@node RegRect
+@node Rectangle Registers
 @section Saving Rectangles in Registers
 @cindex saving rectangle in a register
 
@@ -150,7 +150,7 @@ one.
   See also the command @code{sort-columns}, which you can think of
 as sorting a rectangle.  @xref{Sorting}.
 
-@node RegConfig
+@node Configuration Registers
 @section Saving Window Configurations in Registers
 @cindex saving window configuration in a register
 
@@ -178,7 +178,7 @@ restore a frame configuration, any existing frames not included in the
 configuration become invisible.  If you wish to delete these frames
 instead, use @kbd{C-u C-x r j @var{r}}.
 
-@node RegNumbers
+@node Number Registers
 @section Keeping Numbers in Registers
 @cindex saving number in a register
 
@@ -205,7 +205,7 @@ register contents into the buffer.  @kbd{C-x r +} with no numeric
 argument increments the register value by 1; @kbd{C-x r n} with no
 numeric argument stores zero in the register.
 
-@node RegFiles
+@node File Registers
 @section Keeping File Names in Registers
 @cindex saving file name in a register
 
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index c265b9e878d..f9ab82e7966 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,16 @@
+2011-07-11  Deniz Dogan  <deniz@dogan.se>
+
+        * commands.texi (Prefix Command Arguments): Remove excessive
+        apostrophe.
+
+2011-07-11  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * syntax.texi (Syntax Descriptors): Clarify that the ". 23" syntax
+        description is a string (bug#3313).
+
+        * frames.texi (Display Feature Testing): Try to explain what all
+        the visual classes mean (bug#3042).
+
 2011-07-10  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * modes.texi (Mode Line Variables): Document `mode-line-remote'
diff --git a/doc/lispref/commands.texi b/doc/lispref/commands.texi
index dccc2fa571c..e76b2bafd79 100644
--- a/doc/lispref/commands.texi
+++ b/doc/lispref/commands.texi
@@ -3012,7 +3012,7 @@ An integer, which stands for itself.
 
 @item
 A list of one element, which is an integer.  This form of prefix
-argument results from one or a succession of @kbd{C-u}'s with no
+argument results from one or a succession of @kbd{C-u}s with no
 digits.  The numeric value is the integer in the list, but some
 commands make a distinction between such a list and an integer alone.
 
diff --git a/doc/lispref/frames.texi b/doc/lispref/frames.texi
index ee765a7e1d0..7dc6934c7d9 100644
--- a/doc/lispref/frames.texi
+++ b/doc/lispref/frames.texi
@@ -2446,10 +2446,13 @@ For a tty display, it is log to base two of the number of colors supported.
 @end defun
 
 @defun display-visual-class &optional display
-This function returns the visual class for the screen.  The value is one
-of the symbols @code{static-gray}, @code{gray-scale},
-@code{static-color}, @code{pseudo-color}, @code{true-color}, and
-@code{direct-color}.
+This function returns the visual class for the screen.  The value is
+one of the symbols @code{static-gray} (a limited, unchangeable number
+of grays), @code{gray-scale} (a full range of grays),
+@code{static-color} (a limited, unchangeable number of colors),
+@code{pseudo-color} (a limited number of colors), @code{true-color} (a
+full range of colors), and @code{direct-color} (a full range of
+colors).
 @end defun
 
 @defun display-color-cells &optional display
diff --git a/doc/lispref/syntax.texi b/doc/lispref/syntax.texi
index 6582a8dfb0c..31ee7eb4e7d 100644
--- a/doc/lispref/syntax.texi
+++ b/doc/lispref/syntax.texi
@@ -108,7 +108,7 @@ Then come the characters for any desired flags.  If no matching
 character or flags are needed, one character is sufficient.
 
   For example, the syntax descriptor for the character @samp{*} in C
-mode is @samp{@w{. 23}} (i.e., punctuation, matching character slot
+mode is @code{". 23"} (i.e., punctuation, matching character slot
 unused, second character of a comment-starter, first character of a
 comment-ender), and the entry for @samp{/} is @samp{@w{. 14}} (i.e.,
 punctuation, matching character slot unused, first character of a