aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorGlenn Morris2014-06-07 18:14:58 -0700
committerGlenn Morris2014-06-07 18:14:58 -0700
commit881aae56532c30d56d2f5eb021a11cc9c980b261 (patch)
tree9e22cc68214f3db6edd27b4248730f717d05a733 /doc
parent6cbdfa0115a57bae3dda291a146d51402e9bf6fc (diff)
downloademacs-881aae56532c30d56d2f5eb021a11cc9c980b261.tar.gz
emacs-881aae56532c30d56d2f5eb021a11cc9c980b261.zip
Doc tweak re fullscreen/maximize
* doc/emacs/frames.texi (Frame Commands): Copyedits re M-F10, F11. * doc/emacs/cmdargs.texi (Window Size X): Copyedits.
Diffstat (limited to 'doc')
-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 c168c51127a..8bec8ad313a 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,5 +1,8 @@
12014-06-08 Glenn Morris <rgm@gnu.org> 12014-06-08 Glenn Morris <rgm@gnu.org>
2 2
3 * frames.texi (Frame Commands): Copyedits re M-F10, F11.
4 * cmdargs.texi (Window Size X): Copyedits.
5
3 * ack.texi (Acknowledgments): 6 * ack.texi (Acknowledgments):
4 * emacs.texi (Acknowledgments): Updates. 7 * emacs.texi (Acknowledgments): Updates.
5 8
diff --git a/doc/emacs/cmdargs.texi b/doc/emacs/cmdargs.texi
index ce7af79076e..8b3654dae68 100644
--- a/doc/emacs/cmdargs.texi
+++ b/doc/emacs/cmdargs.texi
@@ -901,30 +901,33 @@ the initial frame.
901@itemx --fullscreen 901@itemx --fullscreen
902@opindex --fullscreen 902@opindex --fullscreen
903@cindex fullscreen, command-line argument 903@cindex fullscreen, command-line argument
904Specify that width and height shall be the size of the screen. Normally 904Specify that width and height should be that of the screen. Normally
905no window manager decorations are shown. 905no window manager decorations are shown. (After starting Emacs,
906you can toggle this state using @key{F11}, @code{toggle-frame-fullscreen}.)
906 907
907@item -mm 908@item -mm
908@opindex -mm 909@opindex -mm
909@itemx --maximized 910@itemx --maximized
910@opindex --maximized 911@opindex --maximized
911@cindex maximized, command-line argument 912@cindex maximized, command-line argument
912Specify that the Emacs frame shall be maximized. This normally 913Specify that the Emacs frame should be maximized. This normally
913means that the frame has window manager decorations. 914means that the frame has window manager decorations.
915(After starting Emacs, you can toggle this state using @kbd{M-F10},
916@code{toggle-frame-maximized}.)
914 917
915@item -fh 918@item -fh
916@opindex -fh 919@opindex -fh
917@itemx --fullheight 920@itemx --fullheight
918@opindex --fullheight 921@opindex --fullheight
919@cindex fullheight, command-line argument 922@cindex fullheight, command-line argument
920Specify that the height shall be the height of the screen. 923Specify that the height should be the height of the screen.
921 924
922@item -fw 925@item -fw
923@opindex -fw 926@opindex -fw
924@itemx --fullwidth 927@itemx --fullwidth
925@opindex --fullwidth 928@opindex --fullwidth
926@cindex fullwidth, command-line argument 929@cindex fullwidth, command-line argument
927Specify that the width shall be the width of the screen. 930Specify that the width should be the width of the screen.
928@end table 931@end table
929 932
930@noindent 933@noindent
diff --git a/doc/emacs/frames.texi b/doc/emacs/frames.texi
index cd8347369d3..036e8cf65eb 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.
457@item M-<F10> 457@item M-<F10>
458@kindex M-<F10> 458@kindex M-<F10>
459@findex toggle-frame-maximized 459@findex toggle-frame-maximized
460Toggle maximization state of the current frame. 460Toggle the maximization state of the current frame. When a frame is
461maximized, it fills the screen.
461 462
462@item <F11> 463@item <F11>
463@kindex <F11> 464@kindex <F11>
464@findex toggle-frame-fullscreen 465@findex toggle-frame-fullscreen
465Toggle fullscreen mode of the current frame. 466Toggle fullscreen mode for the current frame. (The difference
467between ``fullscreen'' and ``maximized'' is normally that the former
468hides window manager decorations, giving slightly more screen space to
469Emacs itself.)
466@end table 470@end table
467 471
468 The @kbd{C-x 5 0} (@code{delete-frame}) command deletes the selected 472 The @kbd{C-x 5 0} (@code{delete-frame}) command deletes the selected