networkd: add support to set STP (#3903)

[thirdparty/systemd.git] / man / systemd.netdev.xml

diff --git a/man/systemd.netdev.xml b/man/systemd.netdev.xml
index 2be1efee2f121a4f5cb23c49d5a22d203b669121..e56708a64880e10e915848ba02bd9ce1b18aee68 100644 (file)
--- a/man/systemd.netdev.xml
+++ b/man/systemd.netdev.xml
@@ -124,7 +124,7 @@
           <entry>An IPv4 or IPv6 tunnel over IPv6</entry></row>
 
           <row><entry><varname>ip6gretap</varname></entry>
-          <entry>An Level 2 GRE tunnel over IPv6.</entry></row>
+          <entry>A Level 2 GRE tunnel over IPv6.</entry></row>
 
           <row><entry><varname>ipip</varname></entry>
           <entry>An IPv4 over IPv4 tunnel.</entry></row>
@@ -163,7 +163,7 @@
           <entry>A virtual extensible LAN (vxlan), for connecting Cloud computing deployments.</entry></row>
 
           <row><entry><varname>vrf</varname></entry>
-            <entry>A Virtual Routing and Forwarding (<ulink url="https://www.kernel.org/doc/Documentation/networking/vrf.txt">VRF</ulink>) interface to create seperate routing and forwarding domains.</entry></row>
+            <entry>A Virtual Routing and Forwarding (<ulink url="https://www.kernel.org/doc/Documentation/networking/vrf.txt">VRF</ulink>) interface to create separate routing and forwarding domains.</entry></row>
 
         </tbody>
       </tgroup>
@@ -343,8 +343,15 @@
             </para>
           </listitem>
         </varlistentry>
+          <varlistentry>
+          <term><varname>STP=</varname></term>
+          <listitem>
+            <para>A boolean. This enables the bridge's Spanning Tree Protocol (STP). When unset,
+            the kernel's default setting applies.
+            </para>
+          </listitem>
+        </varlistentry>
       </variablelist>
-
   </refsect1>
 
   <refsect1>
@@ -651,7 +658,7 @@
           It is used as mark-configured SAD/SPD entry as part of the lookup key (both in data
           and control path) in ip xfrm (framework used to implement IPsec protocol).
           See <ulink url="http://man7.org/linux/man-pages/man8/ip-xfrm.8.html">
-          ip-xfrm - transform configuration</ulink> for details. It is only used for VTI/VTI6
+          ip-xfrm — transform configuration</ulink> for details. It is only used for VTI/VTI6
           tunnels.</para>
         </listitem>
       </varlistentry>
@@ -808,8 +815,7 @@
           <literal>layer2</literal>,
           <literal>layer3+4</literal>,
           <literal>layer2+3</literal>,
-          <literal>encap2+3</literal>,
-          <literal>802.3ad</literal>, and
+          <literal>encap2+3</literal>, and
           <literal>encap3+4</literal>.
           </para>
         </listitem>
@@ -1143,7 +1149,7 @@ MACAddress=12:34:56:78:9a:bc</programlisting>
     </example>
     <example>
       <title>/etc/systemd/network/25-vrf.netdev</title>
-      <para>Create an VRF interface with table 42.</para>
+      <para>Create a VRF interface with table 42.</para>
       <programlisting>[NetDev]
 Name=vrf-test
 Kind=vrf