Merge from origin/emacs-25

784602b1050 (origin/emacs-25) ; Add release notice
3a34412caae (tag: emacs-25.2) Set Emacs version to 25.2 and update AU...
56a4461a48d ; Move stray item from admin/notes/repo to CONTRIBUTE
2b0d1118199 ; CONTRIBUTE: Remove stray header.
f2ab09ec60d Fix a typo in indexing the user manual
bc55a574235 * lisp/menu-bar.el (kill-this-buffer): Doc fix.  (Bug#26466)
a6d50401b4b Document 'line-pixel-height'
0c55cf43e61 * search.c (Fre_search_forward, Fre_search_backward): Imp...
c7ed57eaef4 Mention that processes start in default-directory (Bug#18...
856ec9ffa1f * src/xdisp.c (vmessage, message): Clarify commentary.
849a0aaa1c9 Belated fixes for admin.el's M-x make-manuals-dist
84938d79698 default-directory: Remark that it must be a directory name
3f0d047d2eb Delete confuse statement in manual
ee1bd94dd0c Improve packaging documentation
fb18bff91f0 Expand manual section on quitting windows
9a737079645 Fix docstring of dabbrev-abbrev-char-regexp
afe8849bac1 * doc/misc/cl.texi (Iteration Clauses): Clarify example (...
ada79442c07 ;* doc/misc/info.texi (Choose menu subtopic): Improve ind...
d38fd9229c0 Narrow scope of modification hook renabling in org-src fo...
e0e9db4c84a ; Spelling fix

# Conflicts:
#	README
#	etc/AUTHORS
#	etc/HISTORY
#	lisp/ldefs-boot.el

2 files changed, 8 insertions, 14 deletions

diff --git a/doc/misc/cl.texi b/doc/misc/cl.texi
index 2339d576319..33b4858a45b 100644
--- a/doc/misc/cl.texi
+++ b/doc/misc/cl.texi
@@ -1976,18 +1976,6 @@ This clause iterates @var{var} over all the cons cells of @var{list}.
         @result{} ((1 2 3 4) (2 3 4) (3 4) (4))
 @end example
 
-With @code{by}, there is no real reason that the @code{on} expression
-must be a list.  For example:
-
-@example
-(cl-loop for x on first-animal by 'next-animal collect x)
-@end example
-
-@noindent
-where @code{(next-animal x)} takes an ``animal'' @var{x} and returns
-the next in the (assumed) sequence of animals, or @code{nil} if
-@var{x} was the last animal in the sequence.
-
 @item for @var{var} in-ref @var{list} by @var{function}
 This is like a regular @code{in} clause, but @var{var} becomes
 a @code{setf}-able ``reference'' onto the elements of the list
@@ -2252,8 +2240,8 @@ were non-@code{nil}, the loop returns @code{t}:
 
 @example
 (if (cl-loop for size in size-list always (> size 10))
-    (some-big-sizes)
-  (no-big-sizes))
+    (only-big-sizes)
+  (some-small-sizes))
 @end example
 
 @item never @var{condition}
diff --git a/doc/misc/info.texi b/doc/misc/info.texi
index 6f2e53aa739..3db8e8e90f1 100644
--- a/doc/misc/info.texi
+++ b/doc/misc/info.texi
@@ -1108,6 +1108,7 @@ other file with @kbd{g(@var{filename})*@key{RET}}.
 @kindex 1 @r{through} 9 @r{(Info mode)}
 @findex Info-nth-menu-item
 @cindex select @var{n}'th menu item
+@cindex menu items, select by their numbers
   If you begrudge each character of type-in which your system requires,
 you might like to use the commands @kbd{1}, @kbd{2}, @kbd{3}, @kbd{4},
 @dots{}, @kbd{9}.  They are short for the @kbd{m} command together
@@ -1116,6 +1117,11 @@ in the current node's menu; @kbd{2} goes through the second item, etc.
 In the stand-alone reader, @kbd{0} goes through the last menu item;
 this is so you need not count how many entries are there.
 
+@cindex 3rd menu item
+@cindex third menu item
+@cindex 6th menu item
+@cindex sixth menu item
+@cindex star @samp{*} before menu item
   If your display supports multiple fonts, colors or underlining, and
 you are using Emacs's Info mode to read Info files, the third, sixth
 and ninth menu items have a @samp{*} that stands out, either in color