X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd.link.xml;h=05effc3b713c1a1e7c0ff6beb1e6dfcc311ab9d6;hb=e2d7c1a0758ce80d7cb439745deefefdffd67655;hp=718eb8efdb5bceb35f3537c41f45a29a52978c6a;hpb=d86dd07d462fb8502b1c7b4a9a4df4fba8318bdd;p=elogind.git

diff --git a/man/systemd.link.xml b/man/systemd.link.xml
index 718eb8efd..05effc3b7 100644
--- a/man/systemd.link.xml
+++ b/man/systemd.link.xml
@@ -76,6 +76,10 @@
                 <literal>[Link]</literal> section specifying how the device should be
                 configured. The first (in lexical order) of the link files that matches
                 a given device is applied.</para>
+        </refsect1>
+
+        <refsect1>
+                <title>[Match] Section Options</title>
 
                 <para>A link file is said to match a device if each of the entries in the
                 <literal>[Match]</literal> section matches, or if the section is empty.
@@ -101,7 +105,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>
@@ -156,6 +160,11 @@
                         </varlistentry>
                 </variablelist>
 
+        </refsect1>
+
+        <refsect1>
+                <title>[Link] Section Options</title>
+
                 <para>The <literal>[Link]</literal> section accepts the following
                 keys:</para>
 
@@ -186,7 +195,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 +245,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 +254,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 +263,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 +338,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 +357,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>