update

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1047 c046a42c-6fe2-441c-8c8c-71466251a162

2 files changed, 11 insertions, 2 deletions

diff --git a/Changelog b/Changelog
index 5658c0bd00..9d18ec65fd 100644
--- a/Changelog
+++ b/Changelog
@@ -2,6 +2,12 @@ version 0.6.1:
 
   - Mac OS X port (Pierre d'Herbemont)
   - Virtual console support
+  - Better monitor line edition
+  - New block device layer 
+  - New 'qcow' growable disk image support with AES encryption and
+    transparent decompression
+  - VMware 3 and 4 read-only disk image support (untested)
+  - Support for up to 4 serial ports
 
 version 0.6.0:
 
diff --git a/qemu-doc.texi b/qemu-doc.texi
index d3c0a1625b..ba3ade8618 100644
--- a/qemu-doc.texi
+++ b/qemu-doc.texi
@@ -120,8 +120,8 @@ Floppy disk
 @item 
 NE2000 PCI network adapters
 @item
-Serial port
-@item 
+Serial ports
+@item
 Soundblaster 16 card
 @end itemize
 
@@ -270,6 +270,9 @@ void device
 The default device is @code{vc} in graphical mode and @code{stdio} in
 non graphical mode.
 
+This option can be used several times to simulate up to 4 serials
+ports.
+
 @item -monitor dev
 Redirect the monitor to host device @var{dev} (same devices as the
 serial port).