merge trunk

2 files changed, 10 insertions, 2 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 5ab3c1ab5b8..873681ad0d4 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,11 @@
+2012-10-17  Glenn Morris  <rgm@gnu.org>
+
+        * mini.texi (Repetition): Further copyedit.
+
+2012-10-17  Dani Moncayo  <dmoncayo@gmail.com>
+
+        * mini.texi (Repetition): Copyedit.
+
 2012-10-16  Juri Linkov  <juri@jurta.org>
 
         * search.texi (Query Replace): Document multi-buffer replacement
diff --git a/doc/emacs/mini.texi b/doc/emacs/mini.texi
index cb47a966f64..0036b67f174 100644
--- a/doc/emacs/mini.texi
+++ b/doc/emacs/mini.texi
@@ -683,13 +683,13 @@ the text for that expression.  Even if you don't know Lisp, it will
 probably be obvious which command is displayed for repetition.  If you
 type just @key{RET}, that repeats the command unchanged.  You can also
 change the command by editing the Lisp expression before you execute
-it.  The repeated command is added to the front of the command history
+it.  The executed command is added to the front of the command history
 unless it is identical to the most recent item.
 
   Once inside the minibuffer for @kbd{C-x @key{ESC} @key{ESC}}, you
 can use the usual minibuffer history commands (@pxref{Minibuffer
 History}) to move through the history list.  After finding the desired
-previous command, you can edit its expression as usual and then repeat
+previous command, you can edit its expression as usual and then execute
 it by typing @key{RET}.
 
 @vindex isearch-resume-in-command-history