Merge from origin/emacs-25

66dea65 ; * doc/lispref/windows.texi (Window Parameters): Grammar twe...

2 files changed, 5 insertions, 5 deletions

diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi
index b2b57642434..36bccdd30a1 100644
--- a/doc/lispref/windows.texi
+++ b/doc/lispref/windows.texi
@@ -4395,11 +4395,11 @@ values instead of the actual margin widths for determining whether a
 window can be split or shrunk horizontally.
 
 Emacs never auto-adjusts the margins of any window after splitting or
-resizing it.  It is sole responsibility of the application that has set
+resizing it.  It is the sole responsibility of any application setting
 this parameter to adjust the margins of this window as well as those of
 any new window that inherits this window's margins due to a split.
-Both, @code{window-configuration-change-hook} and
-@code{window-size-change-functions} (@pxref{Window Hooks}), should be
+Both @code{window-configuration-change-hook} and
+@code{window-size-change-functions} (@pxref{Window Hooks}) should be
 employed for this purpose.
 
 This parameter was introduced in Emacs version 25.1 to support
diff --git a/etc/NEWS b/etc/NEWS
index 1c3c036fbbe..694a0eadff5 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -2215,9 +2215,9 @@ frames.
 'window-divider-default-places', 'window-divider-default-bottom-width'
 and 'window-divider-default-right-width'.
 
-*** When a window is shrunk horizontally its margins are no more removed
+*** When a window is shrunk horizontally its margins are no longer removed
 automatically.  Rather, Emacs refuses to split or resize windows when
-this would cause margins to no more fit into the width reserved for the
+this would cause margins to no longer fit into the width reserved for the
 corresponding window.  An application can override this behavior for a
 particular window by setting that window's 'min-margins' parameter.  As
 a consequence, the application becomes fully responsible for trimming