Merge from origin/emacs-25

[gnu-emacs] / doc / misc / todo-mode.texi

diff --git a/doc/misc/todo-mode.texi b/doc/misc/todo-mode.texi
index f58965cadab7e28ffa3cace37b2944fbbe387c8c..d68af9a23a0f0dbb75ad22b7e966c1aa09afe756 100644 (file)
--- a/doc/misc/todo-mode.texi
+++ b/doc/misc/todo-mode.texi
@@ -2,14 +2,14 @@
 @c %**start of header
 @setfilename ../../info/todo-mode.info
 @settitle Todo Mode User Manual
+@include docstyle.texi
 @syncodeindex fn cp
 @syncodeindex vr cp
 @syncodeindex ky cp
-@documentencoding UTF-8
 @c %**end of header
 
 @copying
-Copyright @copyright{} 2013-2015 Free Software Foundation, Inc.
+Copyright @copyright{} 2013-2016 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -702,13 +702,13 @@ prompt, after typing @kbd{i} to invoke @code{todo-insert-item}, looks
 like this:
 
 @example
-Press a key (so far `i'):  @{ i=>default p=>copy @} @{ y=>diary k=>nonmarking @} @{ c=>calendar d=>date n=>dayname @} t=>time @{ h=>here r=>region @}
+Press a key (so far @kbd{i}):  @{ i=>default p=>copy @} @{ y=>diary k=>nonmarking @} @{ c=>calendar d=>date n=>dayname @} t=>time @{ h=>here r=>region @}
 @end example
 
 @noindent If you now type @kbd{y}, the prompt changes to this:
 
 @example
-Press a key (so far `i y'):  y=>diary:GO! @{ c=>calendar d=>date n=>dayname @} t=>time @{ h=>here r=>region @}
+Press a key (so far @kbd{i y}):  y=>diary:GO! @{ c=>calendar d=>date n=>dayname @} t=>time @{ h=>here r=>region @}
 @end example
 
 @noindent Notice that the pair @samp{k=>nonmarking} is now absent, since it
@@ -892,7 +892,7 @@ is on a done item, this displays the following prompt in the echo
 area:
 
 @example
-Press a key (so far `e'): c=>add/edit comment d=>delete comment
+Press a key (so far @kbd{e}): c=>add/edit comment d=>delete comment
 @end example
 
 @noindent
@@ -903,7 +903,7 @@ echo area, and you can continue or complete the invocation only by
 typing one of the listed keys:
 
 @example
-Press a key (so far `e'): e=>edit h=>header m=>multiline y=>diary k=>nonmarking d=>date t=>time
+Press a key (so far @kbd{e}): e=>edit h=>header m=>multiline y=>diary k=>nonmarking d=>date t=>time
 @end example
 
 As noted above, passing the @samp{date} parameter does not complete
@@ -912,7 +912,7 @@ following prompt, and typing any of these keys does complete the
 invocation:
 
 @example
-Press a key (so far `e d'): f=>full c=>calendar a=>today n=>dayname y=>year m=>month d=>daynum
+Press a key (so far @kbd{e d}): f=>full c=>calendar a=>today n=>dayname y=>year m=>month d=>daynum
 @end example
 
 In addition to the item-level invocations @kbd{e y}, to change the