Merge from emacs-24; up to 2012-04-30T11:57:47Z!sdl.web@gmail.com

2 files changed, 12 insertions, 4 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index f7feb62e0f1..117bbfc21c8 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,11 @@
+2012-06-29  Glenn Morris  <rgm@gnu.org>
+
+        * fixit.texi (Undo): Grammar fixes.  (Bug#11779)
+
+2012-06-29  Michael Witten  <mfwitten@gmail.com>  (tiny change)
+
+        * fixit.texi (Undo): Fix typo.  (Bug#11775)
+
 2012-06-27  Glenn Morris  <rgm@gnu.org>
 
         * ack.texi (Acknowledgments): Tiny update.
diff --git a/doc/emacs/fixit.texi b/doc/emacs/fixit.texi
index 8f75c5e151c..b9199eba553 100644
--- a/doc/emacs/fixit.texi
+++ b/doc/emacs/fixit.texi
@@ -35,7 +35,7 @@ These were described earlier in this manual.  @xref{Erasing}.
   The @dfn{undo} command reverses recent changes in the buffer's text.
 Each buffer records changes individually, and the undo command always
 applies to the current buffer.  You can undo all the changes in a
-buffer for as far as back its records go.  Usually, each editing
+buffer for as far back as the buffer's records go.  Usually, each editing
 command makes a separate entry in the undo records, but some commands
 such as @code{query-replace} divide their changes into multiple
 entries for flexibility in undoing.  Consecutive character insertion
@@ -109,9 +109,9 @@ Emacs to hold text that users don't normally look at or edit.
 @vindex undo-strong-limit
 @vindex undo-outer-limit
 @cindex undo limit
-  When the undo records for a buffer becomes too large, Emacs discards
-the oldest undo records from time to time (during @dfn{garbage
-collection}).  You can specify how much undo records to keep by
+  When the undo information for a buffer becomes too large, Emacs discards
+the oldest records from time to time (during @dfn{garbage
+collection}).  You can specify how much undo information to keep by
 setting the variables @code{undo-limit}, @code{undo-strong-limit}, and
 @code{undo-outer-limit}.  Their values are expressed in bytes.