[PATCH 6/9] docs: Leave kernel version out of :since:

Tweak things so that the required kernel version is still listed, just not as part of the :since: tag. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com&gt; --- docs/formatdomain.rst | 4 ++-- docs/formatnetwork.rst | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index 10aa0bcebe..da6a920089 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -5119,8 +5119,8 @@ Direct attachment to physical interface Provides direct attachment of the virtual machine's NIC to the given physical interface of the host. :since:`Since 0.7.7 (QEMU and KVM only)` -This setup requires the Linux macvtap driver to be available. :since:`(Since -Linux 2.6.34.)` One of the modes 'vepa' ( `'Virtual Ethernet Port +This setup requires the Linux macvtap driver (introduced in 2.6.34) +to be available. One of the modes 'vepa' ( `'Virtual Ethernet Port Aggregator' <https://www.ieee802.org/1/files/public/docs2009/new-evb-congdon-vepa-modu...), 'bridge' or 'private' can be chosen for the operation mode of the macvtap device, 'vepa' being the default mode. The individual modes cause the delivery diff --git a/docs/formatnetwork.rst b/docs/formatnetwork.rst index c875d35982..e65570038d 100644 --- a/docs/formatnetwork.rst +++ b/docs/formatnetwork.rst @@ -127,8 +127,7 @@ to the physical LAN (if at all). bridge (in particular, the port attaching the bridge to the physical network). However, it can also cause some networking setups to stop working (e.g. vlan tagging, multicast, guest-initiated changes to MAC address) and is - not supported by older kernels. :since:`Since 1.2.11, requires kernel 3.17 or - newer` + not supported by kernels older than 3.17. :since:`Since 1.2.11` The optional ``zone`` attribute of the ``bridge`` element is used to specify the `firewalld <https://firewalld.org>`__ zone for the bridge of a network @@ -1110,7 +1109,8 @@ will be no restrictions on inbound or outbound connections). Using a macvtap "direct" connection ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -:since:`Since 0.9.4, QEMU and KVM only, requires Linux kernel 2.6.34 or newer` +:since:`Since 0.9.4, QEMU and KVM only`. Requires Linux kernel 2.6.34 or newer. + This shows how to use macvtap to connect to the physical network directly through one of a group of physical devices (without using a host bridge device). As with the host bridge network, the guests will effectively be directly -- 2.43.2