summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog3
-rw-r--r--qemu-doc.texi6
2 files changed, 6 insertions, 3 deletions
diff --git a/Changelog b/Changelog
index d3ed8892d7..f0e8839c67 100644
--- a/Changelog
+++ b/Changelog
@@ -20,6 +20,9 @@ version 0.6.1:
- SPARC system emulation (Blue Swirl)
- Automatic Samba configuration for host file access from Windows.
- '-loadvm' and '-full-screen' options
+ - ne2000 savevm support (Johannes Schindelin)
+ - Ctrl-Alt is now the default grab key. Ctrl-Alt-[0-9] switches to
+ the virtual consoles.
version 0.6.0:
diff --git a/qemu-doc.texi b/qemu-doc.texi
index d7159a603e..c262ee7e9c 100644
--- a/qemu-doc.texi
+++ b/qemu-doc.texi
@@ -360,10 +360,10 @@ Start right away with a saved state (@code{loadvm} in monitor)
During the graphical emulation, you can use the following keys:
@table @key
-@item Ctrl-Shift-f
+@item Ctrl-Alt-f
Toggle full screen
-@item Ctrl-Shift-Fn
+@item Ctrl-Alt-n
Switch to virtual console 'n'. Standard console mappings are:
@table @emph
@item 1
@@ -374,7 +374,7 @@ Monitor
Serial port
@end table
-@item Ctrl-Shift
+@item Ctrl-Alt
Toggle mouse and keyboard grab.
@end table