Merge from origin/emacs-25

0377fe2 ; Spelling fixes
f253695 Update docs for `customize-mode'
4395aaa Fix documentation of 'assoc-string' and 'compare-strings'
ab0ebb9 ; Only load .elc file in tests.
a98aa02 Error on multibyte characters in HTTP request
ea512a7 * lisp/gnus/mm-decode.el (mm-convert-shr-links): Mask keys th...
8297331 ; Revert "Ensure undo-boundary after insert-file-contents."
dc5e65b Unset GIT_DIR when calling Git commands
6cdd8f7 Ensure undo-boundary after insert-file-contents.
4793f5f Clarify documentation of 'line-spacing' and 'line-height'
5f37572 Fix removal of variables from process-environment
e5e886d * admin/authors.el (authors-ignored-files, authors-valid-file...
db0777b * admin/authors.el (authors-aliases, authors-fixed-case): Add...

# Conflicts:
#	doc/lispref/modes.texi
#	lisp/gnus/mm-decode.el

3 files changed, 16 insertions, 13 deletions

diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index 1956ee5503e..a7c1d0992de 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -1996,15 +1996,17 @@ newline.
 
   If the property value is @code{t}, the newline character has no
 effect on the displayed height of the line---the visible contents
-alone determine the height.  This is useful for tiling small images
-(or image slices) without adding blank areas between the images.
+alone determine the height.  The @code{line-spacing} property,
+described below, is also ignored in this case.  This is useful for
+tiling small images (or image slices) without adding blank areas
+between the images.
 
   If the property value is a list of the form @code{(@var{height}
 @var{total})}, that adds extra space @emph{below} the display line.
 First Emacs uses @var{height} as a height spec to control extra space
 @emph{above} the line; then it adds enough space @emph{below} the line
-to bring the total line height up to @var{total}.  In this case, the
-other ways to specify the line spacing are ignored.
+to bring the total line height up to @var{total}.  In this case, any
+value of @code{line-spacing} property for the newline is ignored.
 
 @cindex height spec
   Any other kind of property value is a height spec, which translates
@@ -2054,9 +2056,10 @@ overrides line spacings specified for the frame.
 
 @kindex line-spacing @r{(text property)}
   Finally, a newline can have a @code{line-spacing} text or overlay
-property that overrides the default frame line spacing and the buffer
-local @code{line-spacing} variable, for the display line ending in
-that newline.
+property that can enlarge the default frame line spacing and the
+buffer local @code{line-spacing} variable: if its value is larger than
+the buffer or frame defaults, that larger value is used instead, for
+the display line ending in that newline.
 
   One way or another, these mechanisms specify a Lisp value for the
 spacing of each line.  The value is a height spec, and it translates
diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi
index 1285c1c69e6..368d882a4b8 100644
--- a/doc/lispref/modes.texi
+++ b/doc/lispref/modes.texi
@@ -799,10 +799,9 @@ if @var{parent} is @code{nil}.  (Again, a @code{nil} value is
 
 @item :group
 If this is specified, the value should be the customization group for
-this mode.  (Not all major modes have one.)  Only the (still
-experimental and unadvertised) command @code{customize-mode} currently
-uses this.  @code{define-derived-mode} does @emph{not} automatically
-define the specified customization group.
+this mode.  (Not all major modes have one.)  The command
+@code{customize-mode} uses this.  @code{define-derived-mode} does
+@emph{not} automatically define the specified customization group.
 
 @item :after-hook
 This optional keyword specifies a single Lisp form to evaluate as the
diff --git a/doc/lispref/strings.texi b/doc/lispref/strings.texi
index fc356af51ba..4e4c239291e 100644
--- a/doc/lispref/strings.texi
+++ b/doc/lispref/strings.texi
@@ -668,7 +668,7 @@ The strings are compared by the numeric values of their characters.
 For instance, @var{str1} is considered less than @var{str2} if
 its first differing character has a smaller numeric value.  If
 @var{ignore-case} is non-@code{nil}, characters are converted to
-lower-case before comparing them.  Unibyte strings are converted to
+upper-case before comparing them.  Unibyte strings are converted to
 multibyte for comparison (@pxref{Text Representations}), so that a
 unibyte string and its conversion to multibyte are always regarded as
 equal.
@@ -685,7 +685,8 @@ specified portion) is less.
 This function works like @code{assoc}, except that @var{key} must be a
 string or symbol, and comparison is done using @code{compare-strings}.
 Symbols are converted to strings before testing.
-If @var{case-fold} is non-@code{nil}, it ignores case differences.
+If @var{case-fold} is non-@code{nil}, @var{key} and the elements of
+@var{alist} are converted to upper-case before comparison.
 Unlike @code{assoc}, this function can also match elements of the alist
 that are strings or symbols rather than conses.  In particular, @var{alist} can
 be a list of strings or symbols rather than an actual alist.