aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/emacs/ChangeLog3
-rw-r--r--doc/emacs/cmdargs.texi13
-rw-r--r--doc/emacs/frames.texi8
3 files changed, 17 insertions, 7 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index c168c51127..8bec8ad313 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,5 +1,8 @@
2014-06-08 Glenn Morris <[email protected]>
+ * frames.texi (Frame Commands): Copyedits re M-F10, F11.
+ * cmdargs.texi (Window Size X): Copyedits.
+
* ack.texi (Acknowledgments):
* emacs.texi (Acknowledgments): Updates.
diff --git a/doc/emacs/cmdargs.texi b/doc/emacs/cmdargs.texi
index ce7af79076..8b3654dae6 100644
--- a/doc/emacs/cmdargs.texi
+++ b/doc/emacs/cmdargs.texi
@@ -901,30 +901,33 @@ the initial frame.
@itemx --fullscreen
@opindex --fullscreen
@cindex fullscreen, command-line argument
-Specify that width and height shall be the size of the screen. Normally
-no window manager decorations are shown.
+Specify that width and height should be that of the screen. Normally
+no window manager decorations are shown. (After starting Emacs,
+you can toggle this state using @key{F11}, @code{toggle-frame-fullscreen}.)
@item -mm
@opindex -mm
@itemx --maximized
@opindex --maximized
@cindex maximized, command-line argument
-Specify that the Emacs frame shall be maximized. This normally
+Specify that the Emacs frame should be maximized. This normally
means that the frame has window manager decorations.
+(After starting Emacs, you can toggle this state using @kbd{M-F10},
+@code{toggle-frame-maximized}.)
@item -fh
@opindex -fh
@itemx --fullheight
@opindex --fullheight
@cindex fullheight, command-line argument
-Specify that the height shall be the height of the screen.
+Specify that the height should be the height of the screen.
@item -fw
@opindex -fw
@itemx --fullwidth
@opindex --fullwidth
@cindex fullwidth, command-line argument
-Specify that the width shall be the width of the screen.
+Specify that the width should be the width of the screen.
@end table
@noindent
diff --git a/doc/emacs/frames.texi b/doc/emacs/frames.texi
index cd8347369d..036e8cf65e 100644
--- a/doc/emacs/frames.texi
+++ b/doc/emacs/frames.texi
@@ -457,12 +457,16 @@ Delete all frames on the current terminal, except the selected one.
@item M-<F10>
@kindex M-<F10>
@findex toggle-frame-maximized
-Toggle maximization state of the current frame.
+Toggle the maximization state of the current frame. When a frame is
+maximized, it fills the screen.
@item <F11>
@kindex <F11>
@findex toggle-frame-fullscreen
-Toggle fullscreen mode of the current frame.
+Toggle fullscreen mode for the current frame. (The difference
+between ``fullscreen'' and ``maximized'' is normally that the former
+hides window manager decorations, giving slightly more screen space to
+Emacs itself.)
@end table
The @kbd{C-x 5 0} (@code{delete-frame}) command deletes the selected