X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd.netdev.xml;h=bf1d24e0aff10a79443a790beac7354a44ecdf40;hb=94655a1670aef827eee6751c986da4bb4ecee6d4;hp=26cc6158c95bc6fae7dda531a318a6a9a4b8a63f;hpb=eac684ef1c29684b1bcd27a89c38c202e568e469;p=elogind.git

diff --git a/man/systemd.netdev.xml b/man/systemd.netdev.xml
index 26cc6158c..bf1d24e0a 100644
--- a/man/systemd.netdev.xml
+++ b/man/systemd.netdev.xml
@@ -78,6 +78,11 @@
                 <filename>/usr/lib</filename>, pointing to <filename>/dev/null</filename>,
                 disables the configuration file entirely.</para>
 
+        </refsect1>
+
+        <refsect1>
+                <title>[Match] Section Options</title>
+
                 <para>A virtual network device is only created if the
                 <literal>[Match]</literal> section matches the current
                 environment, or if the section is empty. The following keys are accepted:</para>
@@ -127,6 +132,11 @@
                                 </varlistentry>
                         </variablelist>
 
+        </refsect1>
+
+        <refsect1>
+                <title>[NetDev] Section Options</title>
+
                         <para>The <literal>[NetDev]</literal> section accepts the following
                         keys:</para>
 
@@ -142,12 +152,18 @@
                                         <term><varname>Kind=</varname></term>
                                         <listitem>
                                                 <para>The netdev kind. Currently, <literal>bridge</literal>,
-                                                <literal>bond</literal> and <literal>vlan</literal>
-                                                are supported. This option is compulsory.</para>
+                                                <literal>bond</literal>, <literal>vlan</literal> and
+                                                <literal>macvlan</literal> are supported. This option
+                                                is compulsory.</para>
                                         </listitem>
                                 </varlistentry>
                         </variablelist>
 
+        </refsect1>
+
+        <refsect1>
+                <title>[VLAN] Section Options</title>
+
                         <para>The <literal>[VLAN]</literal> section only applies for netdevs of kind <literal>vlan</literal>,
                         and accepts the following key:</para>
 
@@ -163,6 +179,26 @@
 
         </refsect1>
 
+        <refsect1>
+                <title>[MACVLAN] Section Options</title>
+
+                        <para>The <literal>[MACVLAN]</literal> section only applies for netdevs of kind
+                        <literal>macvlan</literal>, and accepts the following key:</para>
+
+                        <variablelist class='network-directives'>
+                                <varlistentry>
+                                        <term><varname>Mode=</varname></term>
+                                        <listitem>
+                                                <para>The MACVLAN mode to use. The supported options are
+                                                <literal>private</literal>, <literal>vepa</literal>,
+                                                <literal>bridge</literal> and <literal>passthru</literal>.
+                                                </para>
+                                        </listitem>
+                                </varlistentry>
+                        </variablelist>
+
+        </refsect1>
+
         <refsect1>
                 <title>Example</title>
                 <example>
@@ -193,7 +229,8 @@ Id=1</programlisting>
                 <title>See Also</title>
                 <para>
                         <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-                        <citerefentry><refentrytitle>systemd-networkd</refentrytitle><manvolnum>8</manvolnum></citerefentry>
+                        <citerefentry><refentrytitle>systemd-networkd</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+                        <citerefentry><refentrytitle>systemd.network</refentrytitle><manvolnum>5</manvolnum></citerefentry>
                 </para>
         </refsect1>