From 3c656346c91448f2a42b67e169a9fd4f62e4552e Mon Sep 17 00:00:00 2001
From: bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>
Date: Fri, 14 Jul 2006 13:13:51 +0000
Subject: [PATCH] update

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2053 c046a42c-6fe2-441c-8c8c-71466251a162
---
 VERSION       |  2 +-
 qemu-doc.texi | 18 +++++++++++++-----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/VERSION b/VERSION
index c18d72be30..53a48a1e8c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.8.1
\ No newline at end of file
+0.8.2
\ No newline at end of file
diff --git a/qemu-doc.texi b/qemu-doc.texi
index ed58501080..f7da0b37a1 100644
--- a/qemu-doc.texi
+++ b/qemu-doc.texi
@@ -250,16 +250,19 @@ with a serial console.
 @item -vnc d
 
 Normally, QEMU uses SDL to display the VGA output.  With this option,
-you can have QEMU listen on VNC display d and redirect the VGA display
-over the VNC session.  It is very useful to enable the usb tablet device
-when using this option (option @option{-usbdevice tablet}).
+you can have QEMU listen on VNC display @var{d} and redirect the VGA
+display over the VNC session.  It is very useful to enable the usb
+tablet device when using this option (option @option{-usbdevice
+tablet}). When using the VNC display, you must use the @option{-k}
+option to set the keyboard layout.
 
 @item -k language
 
 Use keyboard layout @var{language} (for example @code{fr} for
 French). This option is only needed where it is not easy to get raw PC
-keycodes (e.g. on Macs or with some X11 servers). You don't need to
-use it on PC/Linux or PC/Windows hosts.
+keycodes (e.g. on Macs, with some X11 servers or with a VNC
+display). You don't normally need to use it on PC/Linux or PC/Windows
+hosts.
 
 The available layouts are:
 @example
@@ -617,6 +620,11 @@ Cirrus Logic GD5446 PCI VGA). If your guest OS supports the VESA 2.0
 VBE extensions (e.g. Windows XP) and if you want to use high
 resolution modes (>= 1280x1024x16) then you should use this option.
 
+@item -no-acpi
+Disable ACPI (Advanced Configuration and Power Interface) support. Use
+it if your guest OS complains about ACPI problems (PC target machine
+only).
+
 @item -loadvm file
 Start right away with a saved state (@code{loadvm} in monitor)
 @end table