Merge branch 'v3.7' into v3.11

# Conflicts:
#	settings/network.rst
This commit is contained in:
RichardG867
2025-06-29 23:09:07 -03:00

View File

@@ -22,11 +22,7 @@ Network emulation mode to use on this card. See :doc:`../hardware/network` for m
Interface
^^^^^^^^^
Host network adapter to use for PCap mode on this card. If no adapters appear on this list, make sure that:
* A WinPcap-compatible driver is installed;
* The installed driver is compatible with your version of Windows;
* At least one compatible (wired) network adapter is present.
Host network adapter to use for PCap mode on this card. If no adapters appear in this list, make sure PCap is :ref:`enabled on your host and a supported network connection is present <hardware/network:PCap>`.
Adapter
^^^^^^^