summaryrefslogtreecommitdiffstats
path: root/qemu-doc.texi
diff options
context:
space:
mode:
authorMichael S. Tsirkin2011-06-14 16:51:11 +0200
committerMichael S. Tsirkin2011-06-15 17:27:15 +0200
commitbefeac45d4d9afb587eca9a27d975db4a7950960 (patch)
treeaab24c856a3ea944e287d7f2591bb4bab6a56eb4 /qemu-doc.texi
parentprint meaningful error message in case of --disable-vhost-net (diff)
parentconfigure: Detect and don't try to use older libcurl (diff)
downloadqemu-befeac45d4d9afb587eca9a27d975db4a7950960.tar.gz
qemu-befeac45d4d9afb587eca9a27d975db4a7950960.tar.xz
qemu-befeac45d4d9afb587eca9a27d975db4a7950960.zip
Merge remote-tracking branch 'origin/master' into pci
Conflicts: hw/virtio-pci.c
Diffstat (limited to 'qemu-doc.texi')
-rw-r--r--qemu-doc.texi6
1 files changed, 5 insertions, 1 deletions
diff --git a/qemu-doc.texi b/qemu-doc.texi
index 86e017ccfa..47e1991712 100644
--- a/qemu-doc.texi
+++ b/qemu-doc.texi
@@ -278,7 +278,11 @@ targets do not need a disk image.
@c man begin OPTIONS
-During the graphical emulation, you can use the following keys:
+During the graphical emulation, you can use special key combinations to change
+modes. The default key mappings are shown below, but if you use @code{-alt-grab}
+then the modifier is Ctrl-Alt-Shift (instead of Ctrl-Alt) and if you use
+@code{-ctrl-grab} then the modifier is the right Ctrl key (instead of Ctrl-Alt):
+
@table @key
@item Ctrl-Alt-f
@kindex Ctrl-Alt-f