From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1F3yOP-0001jP-Ep
	for qemu-devel@nongnu.org; Tue, 31 Jan 2006 11:30:09 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1F3yOL-0001gz-PE
	for qemu-devel@nongnu.org; Tue, 31 Jan 2006 11:30:07 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1F3yOK-0001gd-HO
	for qemu-devel@nongnu.org; Tue, 31 Jan 2006 11:30:04 -0500
Received: from [65.74.133.5] (helo=mail.codesourcery.com)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_AES_256_CBC_SHA:32) (Exim 4.52) id 1F3yMp-0001xo-QO
	for qemu-devel@nongnu.org; Tue, 31 Jan 2006 11:28:32 -0500
From: Paul Brook <paul@codesourcery.com>
Date: Tue, 31 Jan 2006 16:26:51 +0000
MIME-Version: 1.0
Content-Type: text/plain;
  charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
Message-Id: <200601311626.51875.paul@codesourcery.com>
Subject: [Qemu-devel] [patch] Misleading -net documentation
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

The qemu documentation implies that "-net user" is the default. It's actually 
"-net user -net nic". The patch below clarifies the documentation. I've also 
moved the description of the default to -net none as that seems a more 
logical place for it.

Paul

Index: qemu-doc.texi
===================================================================
RCS file: /sources/qemu/qemu/qemu-doc.texi,v
retrieving revision 1.78
diff -u -p -r1.78 qemu-doc.texi
--- qemu-doc.texi	19 Dec 2005 22:12:34 -0000	1.78
+++ qemu-doc.texi	31 Jan 2006 16:09:02 -0000
@@ -260,8 +260,7 @@ target. Optionally, the MAC address can 
 
 @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
 
 @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