Merge from origin/emacs-25

d31298d Fix documentation of `window-combination-resize'
2086f4c Typo fixes in elisp manual

diff --cc doc/lispref/sequences.texi
Simple merge

diff --cc doc/lispref/strings.texi
Simple merge

diff --cc doc/lispref/windows.texi
Simple merge

diff --cc src/window.c
Simple merge