slirp is enabled by default

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

1 files changed, 6 insertions, 6 deletions

diff --git a/qemu-doc.texi b/qemu-doc.texi
index 94c1ccf190..dfa3639277 100644
--- a/qemu-doc.texi
+++ b/qemu-doc.texi
@@ -597,12 +597,10 @@ Linux distribution.
 
 @subsection Using the user mode network stack
 
-This is @emph{experimental} (version 0.5.4). You must configure qemu
-with @code{--enable-slirp}. Then by using the option
-@option{-user-net} or if you have no tun/tap init script, QEMU uses a
-completely user mode network stack (you don't need root priviledge to
-use the virtual network). The virtual network configuration is the
-following:
+By using the option @option{-user-net} or if you have no tun/tap init
+script, QEMU uses a completely user mode network stack (you don't need
+root priviledge to use the virtual network). The virtual network
+configuration is the following:
 
 @example
 
@@ -625,6 +623,8 @@ Note that @code{ping} is not supported reliably to the internet as it
 would require root priviledges. It means you can only ping the local
 router (10.0.2.2).
 
+The user mode network is currently only supported on a Unix host.
+
 @node direct_linux_boot
 @section Direct Linux Boot