Merge from origin/emacs-25

[gnu-emacs] / doc / misc / ido.texi

diff --git a/doc/misc/ido.texi b/doc/misc/ido.texi
index 25380c08befc9af39898bad2ff7af440c80104e0..0a56bc3f4e953548a42ef6f3a1b1bac3bd8f784f 100644 (file)
--- a/doc/misc/ido.texi
+++ b/doc/misc/ido.texi
@@ -1,13 +1,13 @@
 \input texinfo    @c -*-texinfo-*-
 @setfilename ../../info/ido.info
 @settitle Interactive Do
-@documentencoding UTF-8
+@include docstyle.texi
 @include emacsver.texi
 
 @copying
 This file documents the Ido package for GNU Emacs.
 
-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
@@ -305,7 +305,7 @@ the files in that directory, simply move the directory to the head
 of the list and hit @key{RET}.
 
 To go up to the parent directory, delete any partial file name already
-specified (e.g. using @key{DEL}) and hit @key{DEL}.
+specified (e.g., using @key{DEL}) and hit @key{DEL}.
 
 @c @deffn Command ido-delete-backward-updir
 
@@ -706,7 +706,8 @@ packages.
 @noindent
 After @kbd{C-x b} (@code{ido-switch-buffer}), the buffer at the head
 of the list can be killed by pressing @kbd{C-k}.  If the buffer needs
-saving, you will be queried before the buffer is killed.
+saving, you will be queried before the buffer is killed.  @kbd{C-S-b}
+buries the buffer at the head of the list.
 
 Likewise, after @kbd{C-x C-f}, you can delete (i.e., physically
 remove) the file at the head of the list with @kbd{C-k}.  You will