diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2021-06-10 04:41:08 +0900 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2021-07-09 19:10:07 +0200 |
| commit | 1e7703ae5e5404b7536195c5f84b340bcec64824 (patch) | |
| tree | 470a3f3990dd088f990c4b091325e9a9e18fd09f | |
| parent | 4710af357715aed1e56e2e2e9bec8453f4fe729e (diff) | |
| download | systemd-1e7703ae5e5404b7536195c5f84b340bcec64824.tar.gz | |
man: merge several settings about netdev
(cherry picked from commit 85bc4c080d8264c7d7e233c9e0f304c8d650f126)
| -rw-r--r-- | man/systemd.network.xml | 75 |
1 files changed, 10 insertions, 65 deletions
diff --git a/man/systemd.network.xml b/man/systemd.network.xml index eb1e555f1e..268631e2eb 100644 --- a/man/systemd.network.xml +++ b/man/systemd.network.xml @@ -872,73 +872,27 @@ IPv6Token=prefixstable:2002:da8:1::</programlisting></para> </para></listitem> </varlistentry> <varlistentry> - <term><varname>Bridge=</varname></term> - <listitem> - <para>The name of the bridge to add the link to. See - <citerefentry><refentrytitle>systemd.netdev</refentrytitle><manvolnum>5</manvolnum></citerefentry>. - </para> - </listitem> - </varlistentry> - <varlistentry> + <term><varname>BatmanAdvanced=</varname></term> <term><varname>Bond=</varname></term> - <listitem> - <para>The name of the bond to add the link to. See - <citerefentry><refentrytitle>systemd.netdev</refentrytitle><manvolnum>5</manvolnum></citerefentry>. - </para> - </listitem> - </varlistentry> - <varlistentry> + <term><varname>Bridge=</varname></term> <term><varname>VRF=</varname></term> <listitem> - <para>The name of the VRF to add the link to. See + <para>The name of the B.A.T.M.A.N. Advanced, bond, bridge, or VRF interface to add the link + to. See <citerefentry><refentrytitle>systemd.netdev</refentrytitle><manvolnum>5</manvolnum></citerefentry>. </para> </listitem> </varlistentry> <varlistentry> - <term><varname>VLAN=</varname></term> - <listitem> - <para>The name of a VLAN to create on the link. See - <citerefentry><refentrytitle>systemd.netdev</refentrytitle><manvolnum>5</manvolnum></citerefentry>. - This option may be specified more than once.</para> - </listitem> - </varlistentry> - <varlistentry> <term><varname>IPVLAN=</varname></term> - <listitem> - <para>The name of a IPVLAN to create on the link. See - <citerefentry><refentrytitle>systemd.netdev</refentrytitle><manvolnum>5</manvolnum></citerefentry>. - This option may be specified more than once.</para> - </listitem> - </varlistentry> - <varlistentry> + <term><varname>MACsec=</varname></term> <term><varname>MACVLAN=</varname></term> - <listitem> - <para>The name of a MACVLAN to create on the link. See - <citerefentry><refentrytitle>systemd.netdev</refentrytitle><manvolnum>5</manvolnum></citerefentry>. - This option may be specified more than once.</para> - </listitem> - </varlistentry> - <varlistentry> - <term><varname>VXLAN=</varname></term> - <listitem> - <para>The name of a VXLAN to create on the link. See - <citerefentry><refentrytitle>systemd.netdev</refentrytitle><manvolnum>5</manvolnum></citerefentry>. - This option may be specified more than once.</para> - </listitem> - </varlistentry> - <varlistentry> <term><varname>Tunnel=</varname></term> + <term><varname>VLAN=</varname></term> + <term><varname>VXLAN=</varname></term> <listitem> - <para>The name of a Tunnel to create on the link. See - <citerefentry><refentrytitle>systemd.netdev</refentrytitle><manvolnum>5</manvolnum></citerefentry>. - This option may be specified more than once.</para> - </listitem> - </varlistentry> - <varlistentry> - <term><varname>MACsec=</varname></term> - <listitem> - <para>The name of a MACsec device to create on the link. See + <para>The name of a IPVLAN, MACsec, MACVLAN, tunnel, VLAN, or VXLAN to be created on the + link. See <citerefentry><refentrytitle>systemd.netdev</refentrytitle><manvolnum>5</manvolnum></citerefentry>. This option may be specified more than once.</para> </listitem> @@ -1015,16 +969,7 @@ IPv6Token=prefixstable:2002:da8:1::</programlisting></para> </para> </listitem> </varlistentry> - <varlistentry> - <term><varname>BatmanAdvanced=</varname></term> - <listitem> - <para>The name of the B.A.T.M.A.N. Advanced interface to add the link to. See - <citerefentry><refentrytitle>systemd.netdev</refentrytitle><manvolnum>5</manvolnum></citerefentry>. - </para> - </listitem> - </varlistentry> - </variablelist> - + </variablelist> </refsect1> <refsect1> |