X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd.network.xml;h=8a39fc4fa4e12339e1ec0057fe6317c50c7bd688;hb=e0aa3726103448097e5ad7cc6f427e142103a321;hp=1ba4f4a971652d70a4b1878efdbeff03efcd94c9;hpb=eac684ef1c29684b1bcd27a89c38c202e568e469;p=elogind.git

diff --git a/man/systemd.network.xml b/man/systemd.network.xml
index 1ba4f4a97..8a39fc4fa 100644
--- a/man/systemd.network.xml
+++ b/man/systemd.network.xml
@@ -188,6 +188,15 @@
                                                 <para>A boolean. When true, enables basic DHCPv4 support.</para>
                                         </listitem>
                                 </varlistentry>
+                                <varlistentry>
+                                        <term><varname>IPv4LL=</varname></term>
+                                        <listitem>
+                                                <para>A boolean. When true, enables IPv4 link-local support.
+                                                If <literal>DHCP=</literal> is also true, IPv4 link-local
+                                                address will be removed upon acquiring a DHCP lease.
+                                                </para>
+                                        </listitem>
+                                </varlistentry>
                                 <varlistentry>
                                         <term><varname>Address=</varname></term>
                                         <listitem>
@@ -195,8 +204,10 @@
                                                 separated by a <literal>/</literal> character. Specify this
                                                 key more than once to configure several addresses.
                                                 The format of the address must be as described in
-                                                <citerefentry><refentrytitle>inet_pton</refentrytitle><manvolnum>3</manvolnum></citerefentry>
-                                                . This is a short-hand for an [Address] section only containing an Address key (see below).
+                                                <citerefentry><refentrytitle>inet_pton</refentrytitle><manvolnum>3</manvolnum></citerefentry>.
+                                                This is a short-hand for an [Address] section only containing
+                                                an Address key (see below). This option may be specified
+                                                more than once.
                                                 </para>
                                         </listitem>
                                 </varlistentry>
@@ -204,16 +215,17 @@
                                         <term><varname>Gateway=</varname></term>
                                         <listitem>
                                                 <para>The gateway address, which must be in the format described in
-                                                <citerefentry><refentrytitle>inet_pton</refentrytitle><manvolnum>3</manvolnum></citerefentry>
-                                                . This is a short-hand for a [Route] section only containing a Gateway key.</para>
+                                                <citerefentry><refentrytitle>inet_pton</refentrytitle><manvolnum>3</manvolnum></citerefentry>.
+                                                This is a short-hand for a [Route] section only containing a Gateway
+                                                key. This option may be specified more than once.</para>
                                         </listitem>
                                 </varlistentry>
                                 <varlistentry>
                                         <term><varname>DNS=</varname></term>
                                         <listitem>
                                                 <para>A DNS server address, which must be in the format described in
-                                                <citerefentry><refentrytitle>inet_pton</refentrytitle><manvolnum>3</manvolnum></citerefentry>
-                                                .</para>
+                                                <citerefentry><refentrytitle>inet_pton</refentrytitle><manvolnum>3</manvolnum></citerefentry>.
+                                                This option may be specified more than once.</para>
                                         </listitem>
                                 </varlistentry>
                                 <varlistentry>
@@ -235,6 +247,13 @@
                                                 may be specified more than once.</para>
                                         </listitem>
                                 </varlistentry>
+                                <varlistentry>
+                                        <term><varname>MACVLAN=</varname></term>
+                                        <listitem>
+                                                <para>The name of a MACVLAN to create on the link. This option
+                                                may be specified more than once.</para>
+                                        </listitem>
+                                </varlistentry>
                         </variablelist>
 
                         <para>An <literal>[Address]</literal> section accepts the following keys.