diff --git a/hardware/ideterqua.rst b/hardware/ideterqua.rst index d0225b0..19bd71e 100644 --- a/hardware/ideterqua.rst +++ b/hardware/ideterqua.rst @@ -58,7 +58,7 @@ The Windows 9x family will only detect and enable both additional channels durin Windows NT, 2000 and XP ^^^^^^^^^^^^^^^^^^^^^^^ -The Windows NT family (starting with 3.5) will automatically detect and enable both additional channels during installation, regardless of BIOS support. This auto-detection does not, however, work on machines with **Award BIOS**, except for the version which identifies itself as *Phoenix - AwardBIOS v6.00PG*, where it does work. +The Windows NT family (from 3.5 to XP) will automatically detect and enable both additional channels during installation, regardless of BIOS support. This auto-detection does not, however, work on machines with **Award BIOS**, except for the version which identifies itself as *Phoenix - AwardBIOS v6.00PG*, where it does work. .. note:: If you install the system to a hard disk on one of the additional channels, it will not be bootable if the BIOS doesn't support booting from these channels. diff --git a/hardware/network.rst b/hardware/network.rst index 95fa0d3..9278aa8 100644 --- a/hardware/network.rst +++ b/hardware/network.rst @@ -6,7 +6,7 @@ Networking SLiRP ----- -SLiRP creates a private network with a virtual router, allowing the emulated machine to reach the host, its network and the Internet; on the other hand, the host and other devices on its network cannot reach the emulated machine, unless :ref:`port forwarding ` is configured. This is similar to the **NAT** mode on other virtualizers. +SLiRP creates a private network with a virtual router, allowing the emulated machine to reach the host, its network and the Internet; on the other hand, the host and other devices on its network cannot reach the emulated machine, unless :ref:`port forwarding ` is configured. This is similar to the **NAT** mode on other emulators and virtualizers. The virtual router provides automatic IP configuration to the emulated machine through DHCP. If that is not an option, use the following static IP settings: @@ -22,14 +22,14 @@ The host can be reached through IP address 10.0.2.2, while other devices on the PCap ---- -PCap connects directly to one of the host's network adapters. The emulated machine must be configured as if it were a real machine on your network. This is similar to the **Bridge** mode on other virtualizers. +PCap connects directly to one of the host's network adapters. The emulated machine must be configured as if it were a real machine on your network. This is similar to the **Bridge** mode on other emulators and virtualizers. -This mode requires `Npcap `_ (or another WinPcap-compatible driver) to be installed on the host. Only **wired Ethernet network connections** are compatible; Wi-Fi and other connections will not work at all, as they do not allow PCap to listen for packets bound to the emulated machine. +This mode requires `Npcap `_ (or another WinPcap-compatible driver) to be installed on the host. Only **wired Ethernet network connections** are compatible; Wi-Fi and other connections will not work at all, as they do not allow PCap to listen for packets bound to the emulated machine's MAC address. Private PCap network ^^^^^^^^^^^^^^^^^^^^ -If you have an incompatible network connection (such as Wi-Fi), or if you wish to connect the emulated machine to the host without also connecting it to your network, a private network can be created with PCap in one of two ways: +If you have an incompatible network connection on the host (such as Wi-Fi), or if you wish to connect the emulated machine to the host without also connecting it to your network, a private network can be created with PCap in one of two ways: * Install and configure the *Microsoft KM-TEST Loopback Adapter* included with Windows. @@ -37,6 +37,8 @@ If you have an incompatible network connection (such as Wi-Fi), or if you wish t * The adapter alone only provides a direct connection to the host, with no DHCP server, therefore requiring manual IP configuration on both the host and the emulated machine. * Windows' *Internet Connection Sharing* feature can be used to connect the emulated machine to the host's network and the Internet, with DHCP for automatic IP configuration, similarly to SLiRP but with the added benefit that the host can reach the emulated machine without port forwarding. + * Port forwarding can still be performed through Internet Connection Sharing itself. + * If VMware is installed, use one of the VMnet adapters included with it. * *VMnet1* (Host-only) connects to the host only. @@ -50,7 +52,7 @@ The following advanced features can be accessed by directly editing the virtual MAC address ^^^^^^^^^^^ -All emulated network cards store their MAC address in the ``mac`` directive of their respective configuration file section. Only the suffix (last three octets) of the MAC address is stored; the prefix (first three octets) will always be the card manufacturer's `OUI `_, such as 00:E0:4C for Realtek. +Every emulated network card stores its MAC address in the ``mac`` directive of its respective configuration file section. Only the suffix (last three octets) of the MAC address can be edited; the prefix (first three octets) will always be the card manufacturer's `OUI `_, such as 00:E0:4C for Realtek. .. rubric:: Example: MAC address 00:E0:4C:35:F4:C2 for the Realtek RTL8029AS @@ -72,6 +74,8 @@ Each port forward must be assigned a number, starting at 0 and counting up (skip The host can access forwarded ports through 127.0.0.1 or its own IP address, while other devices on the network can access them through the host's IP address. +.. note:: The emulated machine's IP address must be set to 10.0.2.15 for port forwarding to work. + .. rubric:: Example: forward host TCP port 8080 to guest port 80, and host UDP port 5555 to guest port 5555 .. code-block:: none diff --git a/settings/input.rst b/settings/input.rst index bb6c166..e9db959 100644 --- a/settings/input.rst +++ b/settings/input.rst @@ -9,7 +9,7 @@ Mouse Emulate a pointing device. The following mouse types are supported: * **Bus mouse:** ISA expansion card with a mouse interface. The I/O port and IRQ used by the card are configurable. -* **Serial mouse:** connected to the serial port of your choosing. The selected serial port must be enabled in :ref:`settings/ports:Serial port 1-4`. +* **Serial mouse:** connected to the serial port of your choosing. The selected serial port must be enabled on the :ref:`Ports tab `. * **PS/2 mouse:** connected to the PS/2 port. Only available on machines with a PS/2 mouse port. The *Configure* button opens a new window with settings specific to the selected mouse type, such as the number of buttons, or the serial port for a serial mouse. diff --git a/settings/network.rst b/settings/network.rst index 9c0a49f..b7a3d76 100644 --- a/settings/network.rst +++ b/settings/network.rst @@ -9,8 +9,8 @@ Network type Network emulation mode to use. See :doc:`../hardware/network` for more information on these. * **None:** disable networking. -* **PCap:** connects directly to a host network adapter. Similar to the **Bridge** mode on other virtualizers. -* **SLiRP:** creates a private network with a virtual router. Similar to the **NAT** mode on other virtualizers. +* **PCap:** connects directly to a host network adapter. Similar to the **Bridge** mode on other emulators and virtualizers. +* **SLiRP:** creates a private network with a virtual router. Similar to the **NAT** mode on other emulators and virtualizers. PCap device -----------