Merge from trunk

[gnu-emacs] / doc / emacs / mark.texi

diff --git a/doc/emacs/mark.texi b/doc/emacs/mark.texi
index 217d5b1b06d4ce556f3db46dade2183959f50a96..b426020b7c6e9bc93ae6372c68028b045f8399f5 100644 (file)
--- a/doc/emacs/mark.texi
+++ b/doc/emacs/mark.texi
@@ -1,6 +1,6 @@
 @c This is part of the Emacs manual.
-@c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2001, 2002,
-@c   2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2011
+@c   Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @node Mark, Killing, Help, Top
 @chapter The Mark and the Region
@@ -41,13 +41,13 @@ if the variable @code{highlight-nonselected-windows} is
 non-@code{nil}, each window highlights its own region.
 
 @menu
-* Setting Mark::       Commands to set the mark.
-* Marking Objects::    Commands to put region around textual units.
-* Using Region::       Summary of ways to operate on contents of the region.
-* Mark Ring::          Previous mark positions saved so you can go back there.
+* Setting Mark::        Commands to set the mark.
+* Marking Objects::     Commands to put region around textual units.
+* Using Region::        Summary of ways to operate on contents of the region.
+* Mark Ring::           Previous mark positions saved so you can go back there.
 * Global Mark Ring::    Previous mark positions in various buffers.
 * Shift Selection::     Using shifted cursor motion keys.
-* Persistent Mark::    Keeping the mark active all the time.
+* Persistent Mark::     Keeping the mark active all the time.
 @end menu
 
 @node Setting Mark
@@ -80,7 +80,7 @@ Set the mark at point if the mark is inactive, then move point.
 character in @acronym{ASCII}; usually, typing @kbd{C-@key{SPC}} on a
 text terminal gives the character @kbd{C-@@}.  This key is also bound
 to @code{set-mark-command}, so unless you are unlucky enough to have
-an text terminal that behaves differently, you might as well think of
+a text terminal that behaves differently, you might as well think of
 @kbd{C-@@} as @kbd{C-@key{SPC}}.}.  This sets the mark where point is,
 and activates it.  You can then move point away, leaving the mark
 behind.
@@ -446,7 +446,3 @@ mode only until the mark is deactivated.  One reason you may want to
 use them is that some commands operate on the entire buffer instead of
 the region when Transient Mark mode is off.  Enabling Transient Mark
 mode momentarily gives you a way to use these commands on the region.
-
-@ignore
-   arch-tag: f35e4d82-911b-4cfc-a3d7-3c87b2abba20
-@end ignore