From 039af320d9b116a325ee55ebab2edf60f3bdc252 Mon Sep 17 00:00:00 2001 From: bellard Date: Wed, 1 Feb 2006 21:30:55 +0000 Subject: [PATCH] clearer -net doc (Paul Brook) git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1732 c046a42c-6fe2-441c-8c8c-71466251a162 --- qemu-doc.texi | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/qemu-doc.texi b/qemu-doc.texi index 97cb49af1..fdf8ba2d4 100644 --- a/qemu-doc.texi +++ b/qemu-doc.texi @@ -260,8 +260,7 @@ target. Optionally, the MAC address can be changed. If no @item -net user[,vlan=n] Use the user mode network stack which requires no administrator -priviledge to run. This is the default if no @option{-net} option is -specified. +priviledge to run. @item -net tap[,vlan=n][,fd=h][,ifname=name][,script=file] Connect the host TAP network interface @var{name} to VLAN @var{n} and @@ -334,8 +333,8 @@ qemu linux.img -net nic,macaddr=52:54:00:12:34:56 -net socket,mcast=239.192.168. @item -net none Indicate that no network devices should be configured. It is used to -override the default configuration which is activated if no -@option{-net} options are provided. +override the default configuration (@option{-net nic -net user}) which +is activated if no @option{-net} options are provided. @item -tftp prefix When using the user mode network stack, activate a built-in TFTP