2 files changed, 10 insertions, 3 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 5144738a708..c89fa60a5b5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2015-02-14  Martin Rudalics  <rudalics@gmx.at>
+
+        * xterm.c (x_frame_normalize_before_maximize): Fix doc-string.
+        Suggested by Alan Mackenzie <acm@muc.de>.
+
 2015-02-14  Eli Zaretskii  <eliz@gnu.org>
 
         * menu.c (Fx_popup_menu) [HAVE_X_WINDOWS]: Call
diff --git a/src/xterm.c b/src/xterm.c
index 0b3efe7b4b6..03c081179a6 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -11729,9 +11729,11 @@ default is nil, which is the same as `super'.  */);
   DEFVAR_BOOL ("x-frame-normalize-before-maximize",
                x_frame_normalize_before_maximize,
     doc: /* Non-nil means normalize frame before maximizing.
-If this variable is t, Emacs asks the window manager to give the frame
-intermediately its normal size whenever changing from a full-height or
-full-width state to the fully maximized one and vice versa.
+If this variable is t, Emacs first asks the window manager to give the
+frame its normal size, and only then the final state, whenever changing
+from a full-height, full-width or full-both state to the maximized one
+or when changing from the maximized to the full-height or full-width
+state.
 
 Set this variable only if your window manager cannot handle the
 transition between the various maximization states.  */);