Merge 1bd5637b56 into ba504431dc

I dedicate any and all copyright interest in this software to the
public domain.  I make this dedication for the benefit of the public at
large and to the detriment of my heirs and successors.  I intend this
dedication to be an overt act of relinquishment in perpetuity of all
present and future rights to this software under copyright law.

contrib/TRAMPOLINE

@@ -455,8 +455,8 @@ using the built-in `:doc` command.
         | Q |       chunk interactively, and replay the sequence of keys
         `---'       at will. The sequence in question is a macro: the `Q`
                     primitive will create a new one (i.e., record all the keys
-.---, .---,         hit henceforth until the escape key `<esc>` is hit), and
-|ctl|+| r |_.       the `q` primitive will replay the keys saved in the macro.
+.---, .---,         hit henceforth until `Q` is hit again), and the `q`
+|ctl|+| r |_.       primitive will replay the keys saved in the macro.
 `---' `---'  `.---,
               | @ | Notes: macros can easily be translated into a proper
               `---' script, as they are saved in the `@` register, which you