X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd.network.xml;h=5d7518b34880682456ba4096b70300706d3b93ca;hb=124f2f9b6f66db00942b5882d68aa8fa8857865e;hp=b8facdc0af99debad22342866c7c2ee8f18fd039;hpb=798d3a524ea57aaf40cb53858aaa45ec702f012d;p=elogind.git

diff --git a/man/systemd.network.xml b/man/systemd.network.xml
index b8facdc0a..5d7518b34 100644
--- a/man/systemd.network.xml
+++ b/man/systemd.network.xml
@@ -107,15 +107,16 @@
         <varlistentry>
           <term><varname>Path=</varname></term>
           <listitem>
-            <para>The persistent path, as exposed by the udev
-            property <literal>ID_PATH</literal>. May contain shell
-            style globs.</para>
+            <para>A whitespace-separated list of shell-style globs
+            matching the persistent path, as exposed by the udev
+            property <literal>ID_PATH</literal>.</para>
           </listitem>
         </varlistentry>
         <varlistentry>
           <term><varname>Driver=</varname></term>
           <listitem>
-            <para>The driver currently bound to the device, as
+            <para>A whitespace-separated list of shell-style globs
+            matching the driver currently bound to the device, as
             exposed by the udev property <literal>DRIVER</literal>
             of its parent device, or if that is not set the driver
             as exposed by <literal>ethtool -i</literal> of the
@@ -125,16 +126,17 @@
         <varlistentry>
           <term><varname>Type=</varname></term>
           <listitem>
-            <para>The device type, as exposed by the udev property
+            <para>A whitespace-separated list of shell-style globs
+            matching the device type, as exposed by the udev property
             <literal>DEVTYPE</literal>.</para>
           </listitem>
         </varlistentry>
         <varlistentry>
           <term><varname>Name=</varname></term>
           <listitem>
-            <para>The device name, as exposed by the udev property
-            <literal>INTERFACE</literal>. May contain shell style
-            globs.</para>
+            <para>A whitespace-separated list of shell-style globs
+            matching the device name, as exposed by the udev property
+            <literal>INTERFACE</literal>.</para>
           </listitem>
         </varlistentry>
         <varlistentry>
@@ -236,10 +238,12 @@
           </listitem>
         </varlistentry>
         <varlistentry>
-          <term><varname>IPv4LL=</varname></term>
+          <term><varname>LinkLocalAddressing=</varname></term>
           <listitem>
-            <para>A boolean. When true, enables IPv4 link-local support.
-            </para>
+            <para>Enables link-local address autoconfiguration. Accepts
+            <literal>yes</literal>, <literal>no</literal>,
+            <literal>ipv4</literal>, or <literal>ipv6</literal>. Defaults to
+            <literal>ipv6</literal>.</para>
           </listitem>
         </varlistentry>
         <varlistentry>
@@ -251,6 +255,14 @@
             </para>
           </listitem>
         </varlistentry>
+        <varlistentry>
+          <term><varname>IPv6Token=</varname></term>
+          <listitem>
+            <para>An IPv6 address with the top 64 bits unset. When set, indicates the
+            64 bits interface part of SLAAC IPv6 addresses for this link. By default
+            it is autogenerated.</para>
+          </listitem>
+        </varlistentry>
         <varlistentry>
           <term><varname>LLMNR=</varname></term>
           <listitem>
@@ -267,6 +279,17 @@
             </para>
           </listitem>
         </varlistentry>
+        <varlistentry>
+          <term><varname>BindCarrier=</varname></term>
+          <listitem>
+            <para>A port or a list of ports. When set, controls the
+            behaviour of the current interface. When all ports in the list
+            are in an operational down state, the current interface is brought
+            down. When at least one port has carrier, the current interface
+            is brought up.
+            </para>
+          </listitem>
+        </varlistentry>
         <varlistentry>
           <term><varname>Address=</varname></term>
           <listitem>
@@ -467,6 +490,14 @@
             <para>The metric of the route. An unsigned integer</para>
           </listitem>
         </varlistentry>
+        <varlistentry>
+          <term><varname>Scope=</varname></term>
+          <listitem>
+            <para>The scope of the route. One of the values <literal>global</literal>,
+            <literal>link</literal> or <literal>host</literal>. Defaults to
+            <literal>global</literal>.</para>
+          </listitem>
+        </varlistentry>
       </variablelist>
   </refsect1>
 
@@ -532,6 +563,14 @@
             false.</para>
           </listitem>
         </varlistentry>
+        <varlistentry>
+          <term><varname>ClientIdentifier=</varname></term>
+          <listitem>
+            <para>DHCP client identifier to use. Either <literal>mac</literal>
+            to use the MAC address of the link or <literal>duid</literal>
+            (the default) to use a RFC4361-compliant Client ID.</para>
+          </listitem>
+        </varlistentry>
         <varlistentry>
           <term><varname>VendorClassIdentifier=</varname></term>
           <listitem>