cgroups: simplify CPUQuota= logic

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

diff --git a/man/systemd.link.xml b/man/systemd.link.xml
index debe65ee5663bfce352874df5681d2572fe6220b..f73182aca9da124a80ecae6c63586038d5be2ee1 100644 (file)
--- a/man/systemd.link.xml
+++ b/man/systemd.link.xml
@@ -53,12 +53,12 @@
         <refsect1>
                 <title>Description</title>
 
-                <para>Network link configuration is performed by the <literal>net_setup_link</literal>
+                <para>Network link configuration is performed by the <command>net_setup_link</command>
                 udev builtin.</para>
 
                 <para>The link files are read from the files located in the
                 system network directory <filename>/usr/lib/systemd/network</filename>,
-                the volatile runtime network directory <filename>/run/systemd/network</filename>
+                the volatile runtime network directory <filename>/run/systemd/network</filename>,
                 and the local administration network directory <filename>/etc/systemd/network</filename>.
                 Link files must have the extension <filename>.link</filename>; other extensions are ignored.
                 All link files are collectively sorted and processed in lexical order,
@@ -101,7 +101,7 @@
                                 <listitem>
                                         <para>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
+                                        of its parent device, or if that is not set, the
                                         driver as exposed by <literal>ethtool -i</literal>
                                         of the device itself.</para>
                                 </listitem>
@@ -186,7 +186,7 @@
                                                         <listitem>
                                                                 <para>If the hardware has a persistent
                                                                 MAC address, as most hardware should,
-                                                                and this is used by the kernel, nothing
+                                                                and if it is used by the kernel, nothing
                                                                 is done. Otherwise, a new MAC address
                                                                 is generated which is guaranteed to be
                                                                 the same on every boot for the given
@@ -236,8 +236,8 @@
                                                         <listitem>
                                                                 <para>The name is set based on entries in
                                                                 the udev's Hardware Database with the key
-                                                                <literal>ID_NET_NAME_FROM_DATABASE</literal>
-                                                                .</para>
+                                                                <literal>ID_NET_NAME_FROM_DATABASE</literal>.
+                                                                </para>
                                                         </listitem>
                                                 </varlistentry>
                                                 <varlistentry>
@@ -245,8 +245,8 @@
                                                         <listitem>
                                                                 <para>The name is set based on information given by
                                                                 the firmware for on-board devices, as exported by
-                                                                the udev property <literal>ID_NET_NAME_ONBOARD</literal>
-                                                                .</para>
+                                                                the udev property <literal>ID_NET_NAME_ONBOARD</literal>.
+                                                                </para>
                                                         </listitem>
                                                 </varlistentry>
                                                 <varlistentry>
@@ -254,8 +254,8 @@
                                                         <listitem>
                                                                 <para>The name is set based on information given by
                                                                 the firmware for hot-plug devices, as exported by
-                                                                the udev property <literal>ID_NET_NAME_SLOT</literal>
-                                                                .</para>
+                                                                the udev property <literal>ID_NET_NAME_SLOT</literal>.
+                                                                </para>
                                                         </listitem>
                                                 </varlistentry>
                                                 <varlistentry>
@@ -329,7 +329,7 @@
                                                 <varlistentry>
                                                         <term><literal>magic</literal></term>
                                                         <listitem>
-                                                                <para>Wake on receipt of a magic packet
+                                                                <para>Wake on receipt of a magic packet.
                                                                 </para>
                                                         </listitem>
                                                 </varlistentry>
@@ -348,25 +348,23 @@
         <refsect1>
                 <title>Example</title>
                 <example>
-                        <title>/etc/systemd/network/bridge.netdev</title>
-
-                        <programlisting>[NetDev]
-Name=bridge0
-Kind=bridge</programlisting>
-                </example>
-        </refsect1>
-
-        <refsect1>
-                <title>Example</title>
-                <example>
-                        <title>/etc/systemd/network/vlan1.netdev</title>
+                        <title>/etc/systemd/network/wireless.link</title>
 
-                        <programlisting>[NetDev]
-Name=vlan1
-Kind=vlan
+                        <programlisting>[Match]
+MACAddress=12:34:56:78:9a:bc
+Driver=brcmsmac
+Path=pci-0000:02:00.0-*
+Type=wlan
+Virtualization=no
+Host=my-laptop
+Architecture=x86-64
 
-[VLAN]
-Id=1</programlisting>
+[Link]
+Name=wireless0
+MTUBytes=1450
+BitsPerSecond=10M
+WakeOnLan=magic
+MACAddress=cb:a9:87:65:43:21</programlisting>
                 </example>
         </refsect1>