remove sysvinit and var-log docs

[elogind.git] / man / systemd.network.xml

diff --git a/man/systemd.network.xml b/man/systemd.network.xml
index 9b3a92d266e9b5e2ebb2ad6ce8c3d2f04fb0aef8..087e9e2156324f2baec2ae225f4daf4efba335ce 100644 (file)
--- 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,7 +238,7 @@
           </listitem>
         </varlistentry>
         <varlistentry>
-          <term><varname>LinkLocal=</varname></term>
+          <term><varname>LinkLocalAddressing=</varname></term>
           <listitem>
             <para>Enables link-local address autoconfiguration. Accepts
             <literal>yes</literal>, <literal>no</literal>,
@@ -253,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>
@@ -269,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>
@@ -276,7 +297,7 @@
             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>.
+            <citerefentry project='man-pages'><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.
@@ -302,7 +323,7 @@
           <listitem>
             <para>The gateway address, which must be in the format
             described in
-            <citerefentry><refentrytitle>inet_pton</refentrytitle><manvolnum>3</manvolnum></citerefentry>.
+            <citerefentry project='man-pages'><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>
@@ -313,7 +334,7 @@
           <listitem>
             <para>A DNS server address, which must be in the format
             described in
-            <citerefentry><refentrytitle>inet_pton</refentrytitle><manvolnum>3</manvolnum></citerefentry>.
+            <citerefentry project='man-pages'><refentrytitle>inet_pton</refentrytitle><manvolnum>3</manvolnum></citerefentry>.
             This option may be specified more than once.</para>
           </listitem>
         </varlistentry>
@@ -419,7 +440,7 @@
           <listitem>
             <para>The broadcast address, which must be in the format
             described in
-            <citerefentry><refentrytitle>inet_pton</refentrytitle><manvolnum>3</manvolnum></citerefentry>.
+            <citerefentry project='man-pages'><refentrytitle>inet_pton</refentrytitle><manvolnum>3</manvolnum></citerefentry>.
             This key only applies to IPv4 addresses. If it is not
             given, it is derived from the <literal>Address</literal>
             key.</para>
@@ -493,6 +514,14 @@
             any statically configured ones.</para>
           </listitem>
         </varlistentry>
+        <varlistentry>
+          <term><varname>UseNTP=</varname></term>
+          <listitem>
+            <para>When true (the default), the NTP servers received
+            from the DHCP server will be used by systemd-timesyncd
+            and take precedence over any statically configured ones.</para>
+          </listitem>
+        </varlistentry>
         <varlistentry>
           <term><varname>UseMTU=</varname></term>
           <listitem>
@@ -542,6 +571,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>
@@ -633,7 +670,7 @@ Gateway=192.168.0.1</programlisting>
 Name=en*
 
 [Network]
-DHCP=both</programlisting>
+DHCP=yes</programlisting>
     </example>
 
     <example>