Commit 4be456f1265f6c3e971920cdf567c070f2fb65d2

Authored by ths
1 parent e91c8a77

Documentation spelling fixes, by Mark Glines.


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2928 c046a42c-6fe2-441c-8c8c-71466251a162
Showing 2 changed files with 22 additions and 21 deletions
qemu-doc.texi
@@ -368,7 +368,7 @@ for a list of available devices for your target. @@ -368,7 +368,7 @@ for a list of available devices for your target.
368 368
369 @item -net user[,vlan=n][,hostname=name] 369 @item -net user[,vlan=n][,hostname=name]
370 Use the user mode network stack which requires no administrator 370 Use the user mode network stack which requires no administrator
371 -priviledge to run. @option{hostname=name} can be used to specify the client 371 +privilege to run. @option{hostname=name} can be used to specify the client
372 hostname reported by the builtin DHCP server. 372 hostname reported by the builtin DHCP server.
373 373
374 @item -net tap[,vlan=n][,fd=h][,ifname=name][,script=file] 374 @item -net tap[,vlan=n][,fd=h][,ifname=name][,script=file]
@@ -423,7 +423,8 @@ correct multicast setup for these hosts). @@ -423,7 +423,8 @@ correct multicast setup for these hosts).
423 @item 423 @item
424 mcast support is compatible with User Mode Linux (argument @option{eth@var{N}=mcast}), see 424 mcast support is compatible with User Mode Linux (argument @option{eth@var{N}=mcast}), see
425 @url{http://user-mode-linux.sf.net}. 425 @url{http://user-mode-linux.sf.net}.
426 -@item Use @option{fd=h} to specify an already opened UDP multicast socket. 426 +@item
  427 +Use @option{fd=h} to specify an already opened UDP multicast socket.
427 @end enumerate 428 @end enumerate
428 429
429 Example: 430 Example:
@@ -576,7 +577,7 @@ name pipe @var{filename} @@ -576,7 +577,7 @@ name pipe @var{filename}
576 @item COMn 577 @item COMn
577 [Windows only] Use host serial port @var{n} 578 [Windows only] Use host serial port @var{n}
578 @item udp:[remote_host]:remote_port[@@[src_ip]:src_port] 579 @item udp:[remote_host]:remote_port[@@[src_ip]:src_port]
579 -This implements UDP Net Console. When @var{remote_host} or @var{src_ip} are not specified they default to @code{0.0.0.0}. When not using a specifed @var{src_port} a random port is automatically chosen. 580 +This implements UDP Net Console. When @var{remote_host} or @var{src_ip} are not specified they default to @code{0.0.0.0}. When not using a specified @var{src_port} a random port is automatically chosen.
580 581
581 If you just want a simple readonly console you can use @code{netcat} or 582 If you just want a simple readonly console you can use @code{netcat} or
582 @code{nc}, by starting qemu with: @code{-serial udp::4555} and nc as: 583 @code{nc}, by starting qemu with: @code{-serial udp::4555} and nc as:
@@ -609,7 +610,7 @@ the TCP Net Console is sent to @var{host} at the @var{port}. If you use @@ -609,7 +610,7 @@ the TCP Net Console is sent to @var{host} at the @var{port}. If you use
609 the @var{server} option QEMU will wait for a client socket application 610 the @var{server} option QEMU will wait for a client socket application
610 to connect to the port before continuing, unless the @code{nowait} 611 to connect to the port before continuing, unless the @code{nowait}
611 option was specified. The @code{nodelay} option disables the Nagle buffering 612 option was specified. The @code{nodelay} option disables the Nagle buffering
612 -algoritm. If @var{host} is omitted, 0.0.0.0 is assumed. Only 613 +algorithm. If @var{host} is omitted, 0.0.0.0 is assumed. Only
613 one TCP connection at a time is accepted. You can use @code{telnet} to 614 one TCP connection at a time is accepted. You can use @code{telnet} to
614 connect to the corresponding character device. 615 connect to the corresponding character device.
615 @table @code 616 @table @code
@@ -692,7 +693,7 @@ Output log in /tmp/qemu.log @@ -692,7 +693,7 @@ Output log in /tmp/qemu.log
692 Force hard disk 0 physical geometry (1 <= @var{c} <= 16383, 1 <= 693 Force hard disk 0 physical geometry (1 <= @var{c} <= 16383, 1 <=
693 @var{h} <= 16, 1 <= @var{s} <= 63) and optionally force the BIOS 694 @var{h} <= 16, 1 <= @var{s} <= 63) and optionally force the BIOS
694 translation mode (@var{t}=none, lba or auto). Usually QEMU can guess 695 translation mode (@var{t}=none, lba or auto). Usually QEMU can guess
695 -all thoses parameters. This option is useful for old MS-DOS disk 696 +all those parameters. This option is useful for old MS-DOS disk
696 images. 697 images.
697 698
698 @item -L path 699 @item -L path
@@ -929,7 +930,7 @@ data. Its syntax is: @option{/@{count@}@{format@}@{size@}} @@ -929,7 +930,7 @@ data. Its syntax is: @option{/@{count@}@{format@}@{size@}}
929 is the number of items to be dumped. 930 is the number of items to be dumped.
930 931
931 @item format 932 @item format
932 -can be x (hexa), d (signed decimal), u (unsigned decimal), o (octal), 933 +can be x (hex), d (signed decimal), u (unsigned decimal), o (octal),
933 c (char) or i (asm instruction). 934 c (char) or i (asm instruction).
934 935
935 @item size 936 @item size
@@ -1118,7 +1119,7 @@ devices. We describe here the usage for QEMU version &gt;= 0.8.3. @@ -1118,7 +1119,7 @@ devices. We describe here the usage for QEMU version &gt;= 0.8.3.
1118 @subsubsection Linux 1119 @subsubsection Linux
1119 1120
1120 On Linux, you can directly use the host device filename instead of a 1121 On Linux, you can directly use the host device filename instead of a
1121 -disk image filename provided you have enough proviledge to access 1122 +disk image filename provided you have enough privileges to access
1122 it. For example, use @file{/dev/cdrom} to access to the CDROM or 1123 it. For example, use @file{/dev/cdrom} to access to the CDROM or
1123 @file{/dev/fd0} for the floppy. 1124 @file{/dev/fd0} for the floppy.
1124 1125
@@ -1145,7 +1146,7 @@ line option or modify the device permissions accordingly). @@ -1145,7 +1146,7 @@ line option or modify the device permissions accordingly).
1145 1146
1146 @table @code 1147 @table @code
1147 @item CD 1148 @item CD
1148 -The prefered syntax is the drive letter (e.g. @file{d:}). The 1149 +The preferred syntax is the drive letter (e.g. @file{d:}). The
1149 alternate syntax @file{\\.\d:} is supported. @file{/dev/cdrom} is 1150 alternate syntax @file{\\.\d:} is supported. @file{/dev/cdrom} is
1150 supported as an alias to the first CDROM drive. 1151 supported as an alias to the first CDROM drive.
1151 1152
@@ -1209,11 +1210,11 @@ What you should @emph{never} do: @@ -1209,11 +1210,11 @@ What you should @emph{never} do:
1209 @node pcsys_network 1210 @node pcsys_network
1210 @section Network emulation 1211 @section Network emulation
1211 1212
1212 -QEMU can simulate several networks cards (PCI or ISA cards on the PC 1213 +QEMU can simulate several network cards (PCI or ISA cards on the PC
1213 target) and can connect them to an arbitrary number of Virtual Local 1214 target) and can connect them to an arbitrary number of Virtual Local
1214 Area Networks (VLANs). Host TAP devices can be connected to any QEMU 1215 Area Networks (VLANs). Host TAP devices can be connected to any QEMU
1215 VLAN. VLAN can be connected between separate instances of QEMU to 1216 VLAN. VLAN can be connected between separate instances of QEMU to
1216 -simulate large networks. For simpler usage, a non priviledged user mode 1217 +simulate large networks. For simpler usage, a non privileged user mode
1217 network stack can replace the TAP device to have a basic network 1218 network stack can replace the TAP device to have a basic network
1218 connection. 1219 connection.
1219 1220
@@ -1253,7 +1254,7 @@ so download OpenVPN from : @url{http://openvpn.net/}. @@ -1253,7 +1254,7 @@ so download OpenVPN from : @url{http://openvpn.net/}.
1253 1254
1254 By using the option @option{-net user} (default configuration if no 1255 By using the option @option{-net user} (default configuration if no
1255 @option{-net} option is specified), QEMU uses a completely user mode 1256 @option{-net} option is specified), QEMU uses a completely user mode
1256 -network stack (you don't need root priviledge to use the virtual 1257 +network stack (you don't need root privilege to use the virtual
1257 network). The virtual network configuration is the following: 1258 network). The virtual network configuration is the following:
1258 1259
1259 @example 1260 @example
@@ -1276,7 +1277,7 @@ the address 10.0.2.2 and verify that you got an address in the range @@ -1276,7 +1277,7 @@ the address 10.0.2.2 and verify that you got an address in the range
1276 10.0.2.x from the QEMU virtual DHCP server. 1277 10.0.2.x from the QEMU virtual DHCP server.
1277 1278
1278 Note that @code{ping} is not supported reliably to the internet as it 1279 Note that @code{ping} is not supported reliably to the internet as it
1279 -would require root priviledges. It means you can only ping the local 1280 +would require root privileges. It means you can only ping the local
1280 router (10.0.2.2). 1281 router (10.0.2.2).
1281 1282
1282 When using the built-in TFTP server, the router is also the TFTP 1283 When using the built-in TFTP server, the router is also the TFTP
@@ -1465,7 +1466,7 @@ cannot simulate exactly. @@ -1465,7 +1466,7 @@ cannot simulate exactly.
1465 When using a 2.6 guest Linux kernel, verify that the 4G/4G patch is 1466 When using a 2.6 guest Linux kernel, verify that the 4G/4G patch is
1466 not activated because QEMU is slower with this patch. The QEMU 1467 not activated because QEMU is slower with this patch. The QEMU
1467 Accelerator Module is also much slower in this case. Earlier Fedora 1468 Accelerator Module is also much slower in this case. Earlier Fedora
1468 -Core 3 Linux kernel (< 2.6.9-1.724_FC3) were known to incorporte this 1469 +Core 3 Linux kernel (< 2.6.9-1.724_FC3) were known to incorporate this
1469 patch by default. Newer kernels don't have it. 1470 patch by default. Newer kernels don't have it.
1470 1471
1471 @subsection Windows 1472 @subsection Windows
@@ -1547,7 +1548,7 @@ problem. @@ -1547,7 +1548,7 @@ problem.
1547 1548
1548 QEMU is a generic emulator and it emulates many non PC 1549 QEMU is a generic emulator and it emulates many non PC
1549 machines. Most of the options are similar to the PC emulator. The 1550 machines. Most of the options are similar to the PC emulator. The
1550 -differences are mentionned in the following sections. 1551 +differences are mentioned in the following sections.
1551 1552
1552 @menu 1553 @menu
1553 * QEMU PowerPC System emulator:: 1554 * QEMU PowerPC System emulator::
@@ -1760,8 +1761,8 @@ PL050 KMI with PS/2 keyboard and mouse. @@ -1760,8 +1761,8 @@ PL050 KMI with PS/2 keyboard and mouse.
1760 @item 1761 @item
1761 PCI host bridge. Note the emulated PCI bridge only provides access to 1762 PCI host bridge. Note the emulated PCI bridge only provides access to
1762 PCI memory space. It does not provide access to PCI IO space. 1763 PCI memory space. It does not provide access to PCI IO space.
1763 -This means some devices (eg. ne2k_pci NIC) are not useable, and others  
1764 -(eg. rtl8139 NIC) are only useable when the guest drivers use the memory 1764 +This means some devices (eg. ne2k_pci NIC) are not usable, and others
  1765 +(eg. rtl8139 NIC) are only usable when the guest drivers use the memory
1765 mapped control registers. 1766 mapped control registers.
1766 @item 1767 @item
1767 PCI OHCI USB controller. 1768 PCI OHCI USB controller.
@@ -1859,9 +1860,9 @@ The following OS are supported in user space emulation: @@ -1859,9 +1860,9 @@ The following OS are supported in user space emulation:
1859 1860
1860 @itemize @minus 1861 @itemize @minus
1861 @item 1862 @item
1862 -Linux (refered as qemu-linux-user) 1863 +Linux (referred as qemu-linux-user)
1863 @item 1864 @item
1864 -Mac OS X/Darwin (refered as qemu-darwin-user) 1865 +Mac OS X/Darwin (referred as qemu-darwin-user)
1865 @end itemize 1866 @end itemize
1866 1867
1867 @node Linux User space emulator 1868 @node Linux User space emulator
@@ -2119,7 +2120,7 @@ in particular on x86 ones, @emph{gcc 4.x is not supported}. If your @@ -2119,7 +2120,7 @@ in particular on x86 ones, @emph{gcc 4.x is not supported}. If your
2119 Linux distribution includes a gcc 4.x compiler, you can usually 2120 Linux distribution includes a gcc 4.x compiler, you can usually
2120 install an older version (it is invoked by @code{gcc32} or 2121 install an older version (it is invoked by @code{gcc32} or
2121 @code{gcc34}). The QEMU configure script automatically probes for 2122 @code{gcc34}). The QEMU configure script automatically probes for
2122 -these older versions so that usally you don't have to do anything. 2123 +these older versions so that usually you don't have to do anything.
2123 2124
2124 @node Windows 2125 @node Windows
2125 @section Windows 2126 @section Windows
@@ -2171,7 +2172,7 @@ Configure QEMU for Windows cross compilation: @@ -2171,7 +2172,7 @@ Configure QEMU for Windows cross compilation:
2171 ./configure --enable-mingw32 2172 ./configure --enable-mingw32
2172 @end example 2173 @end example
2173 If necessary, you can change the cross-prefix according to the prefix 2174 If necessary, you can change the cross-prefix according to the prefix
2174 -choosen for the MinGW tools with --cross-prefix. You can also use 2175 +chosen for the MinGW tools with --cross-prefix. You can also use
2175 --prefix to set the Win32 install path. 2176 --prefix to set the Win32 install path.
2176 2177
2177 @item You can install QEMU in the installation directory by typing 2178 @item You can install QEMU in the installation directory by typing
qemu-img.texi
@@ -89,7 +89,7 @@ Commit the changes recorded in @var{filename} in its base image. @@ -89,7 +89,7 @@ Commit the changes recorded in @var{filename} in its base image.
89 @item convert [-c] [-e] [-f @var{fmt}] @var{filename} [-O @var{output_fmt}] @var{output_filename} 89 @item convert [-c] [-e] [-f @var{fmt}] @var{filename} [-O @var{output_fmt}] @var{output_filename}
90 90
91 Convert the disk image @var{filename} to disk image @var{output_filename} 91 Convert the disk image @var{filename} to disk image @var{output_filename}
92 -using format @var{output_fmt}. It can be optionnaly encrypted 92 +using format @var{output_fmt}. It can be optionally encrypted
93 (@code{-e} option) or compressed (@code{-c} option). 93 (@code{-e} option) or compressed (@code{-c} option).
94 94
95 Only the format @code{qcow} supports encryption or compression. The 95 Only the format @code{qcow} supports encryption or compression. The