Improved terminal emulation (Piotr Esden-Tempski).

[qemu] / qemu-doc.texi

diff --git a/qemu-doc.texi b/qemu-doc.texi
index fdf8ba2..114e2ce 100644 (file)
--- a/qemu-doc.texi
+++ b/qemu-doc.texi
@@ -47,7 +47,7 @@ For system emulation, the following hardware targets are supported:
 @item Sun4m (32-bit Sparc processor)
 @item Sun4u (64-bit Sparc processor, in progress)
 @item Malta board (32-bit MIPS processor)
-@item ARM Integrator/CP (ARM1026E processor)
+@item ARM Integrator/CP (ARM926E or 1026E processor)
 @end itemize
 
 For user emulation, x86, PowerPC, ARM, MIPS, and Sparc32/64 CPUs are supported.
@@ -252,11 +252,15 @@ Network options:
 
 @table @option
 
-@item -net nic[,vlan=n][,macaddr=addr]
+@item -net nic[,vlan=n][,macaddr=addr][,model=type]
 Create a new Network Interface Card and connect it to VLAN @var{n} (@var{n}
 = 0 is the default). The NIC is currently an NE2000 on the PC
 target. Optionally, the MAC address can be changed. If no
 @option{-net} option is specified, a single NIC is created.
+Qemu can emulate several different models of network card.  Valid values for
+@var{type} are @code{ne2k_pci}, @code{ne2k_isa}, @code{rtl8139},
+@code{smc91c111} and @code{lance}.  Not all devices are supported on all
+targets.
 
 @item -net user[,vlan=n]
 Use the user mode network stack which requires no administrator
@@ -1379,7 +1383,7 @@ devices:
 
 @itemize @minus
 @item
-ARM1026E CPU
+ARM926E or ARM1026E CPU
 @item
 Two PL011 UARTs
 @item