From a1b74fe8fea8ff7b48a6339407451ceca02b8c5e Mon Sep 17 00:00:00 2001
From: bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>
Date: Sat, 8 May 2004 13:26:35 +0000
Subject: [PATCH] update

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@788 c046a42c-6fe2-441c-8c8c-71466251a162
---
 Changelog     |  4 +++-
 VERSION       |  2 +-
 qemu-doc.texi | 24 ++++++++++++++++--------
 3 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/Changelog b/Changelog
index 86d9d92773..bd72f97043 100644
--- a/Changelog
+++ b/Changelog
@@ -3,8 +3,10 @@ version 0.5.5:
   - SDL full screen support (initial patch by malc)
   - VGA support on PowerPC PREP
   - VBE fixes (Matthew Mastracci)
-  - PIT fixes (aka Win98 hardware probe and timer bug)
+  - PIT fixes (aka Win98 hardware probe and "VGA slowness" bug)
   - IDE master only fixes (aka Win98 CD-ROM probe bug)
+  - ARM load/store half word fix (Ulrich Hecht)
+  - FDC fixes for Win98
 
 version 0.5.4:
   
diff --git a/VERSION b/VERSION
index 167b000b4d..389faccca3 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.5.4
\ No newline at end of file
+0.5.5
\ No newline at end of file
diff --git a/qemu-doc.texi b/qemu-doc.texi
index 9dd02edd20..e769879d14 100644
--- a/qemu-doc.texi
+++ b/qemu-doc.texi
@@ -297,22 +297,30 @@ Do not start CPU at startup (you must type 'c' in the monitor).
 Output log in /tmp/qemu.log
 @end table
 
+During the graphical emulation, you can use the following keys:
+@table @key
+@item Ctrl+Shift
+Toggle mouse and keyboard grab.
+@item Ctrl+Shift-f
+Toggle full screen
+@end table
+
 During emulation, if you are using the serial console, use @key{C-a h}
 to get terminal commands:
 
 @table @key
-@item C-a h
+@item Ctrl-a h
 Print this help
-@item C-a x    
+@item Ctrl-a x    
 Exit emulatior
-@item C-a s    
+@item Ctrl-a s    
 Save disk data back to file (if -snapshot)
-@item C-a b
+@item Ctrl-a b
 Send break (magic sysrq in Linux)
-@item C-a c
+@item Ctrl-a c
 Switch between console and monitor
-@item C-a C-a
-Send C-a
+@item Ctrl-a Ctrl-a
+Send Ctrl-a
 @end table
 @c man end
 
@@ -490,7 +498,7 @@ CPU registers by prefixing them with @emph{$}.
 The disk images can simply be raw images of the hard disk. You can
 create them with the command:
 @example
-dd if=/dev/zero of=myimage bs=1024 count=mysize
+dd of=myimage bs=1024 seek=mysize count=0
 @end example
 where @var{myimage} is the image filename and @var{mysize} is its size
 in kilobytes.