diff options
Diffstat (limited to 'man')
| -rw-r--r-- | man/custom-html.xsl | 12 | ||||
| -rw-r--r-- | man/hwdb.xml | 4 | ||||
| -rw-r--r-- | man/systemctl.xml | 1 | ||||
| -rw-r--r-- | man/systemd-udevd.service.xml | 2 | ||||
| -rw-r--r-- | man/systemd.link.xml | 8 | ||||
| -rw-r--r-- | man/systemd.netdev.xml | 4 | ||||
| -rw-r--r-- | man/systemd.network.xml | 4 | ||||
| -rw-r--r-- | man/udev.xml | 7 |
8 files changed, 17 insertions, 25 deletions
diff --git a/man/custom-html.xsl b/man/custom-html.xsl index 5730bed4a1..0856c1f29c 100644 --- a/man/custom-html.xsl +++ b/man/custom-html.xsl @@ -232,18 +232,6 @@ </xsl:attribute> <xsl:text>Python </xsl:text> </a>· - <a> - <xsl:attribute name="href"> - <xsl:text>../libudev/index.html</xsl:text> - </xsl:attribute> - <xsl:text>libudev </xsl:text> - </a>· - <a> - <xsl:attribute name="href"> - <xsl:text>../libudev/index.html</xsl:text> - </xsl:attribute> - <xsl:text>gudev </xsl:text> - </a> <span style="float:right"> <xsl:text>systemd </xsl:text> diff --git a/man/hwdb.xml b/man/hwdb.xml index b3602ac5da..e6215df738 100644 --- a/man/hwdb.xml +++ b/man/hwdb.xml @@ -50,10 +50,10 @@ regardless of the directories in which they live. However, files with identical filenames replace each other. Files in <filename>/etc</filename> have the highest priority, files in <filename>/run</filename> take precedence - over files with the same name in <filename>/usr/lib</filename>. This can be + over files with the same name in <filename>&rootprefix;/lib</filename>. This can be used to override a system-supplied hwdb file with a local file if needed; a symlink in <filename>/etc</filename> with the same name as a hwdb file in - <filename>/usr/lib</filename>, pointing to <filename>/dev/null</filename>, + <filename>&rootprefix;/lib</filename>, pointing to <filename>/dev/null</filename>, disables the hwdb file entirely. hwdb files must have the extension <filename>.hwdb</filename>; other extensions are ignored.</para> diff --git a/man/systemctl.xml b/man/systemctl.xml index 35f47de52c..409b6f0895 100644 --- a/man/systemctl.xml +++ b/man/systemctl.xml @@ -1733,6 +1733,7 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service <varname>$VISUAL</varname> are present or if it is set to an empty string or if their execution failed, systemctl will try to execute well known editors in this order: + <citerefentry project='die-net'><refentrytitle>editor</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry project='die-net'><refentrytitle>nano</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry project='die-net'><refentrytitle>vim</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry project='die-net'><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></citerefentry>. diff --git a/man/systemd-udevd.service.xml b/man/systemd-udevd.service.xml index c0d323033c..7a4b62aaf1 100644 --- a/man/systemd-udevd.service.xml +++ b/man/systemd-udevd.service.xml @@ -106,7 +106,7 @@ <term><option>--event-timeout=</option></term> <listitem> <para>Set the number of seconds to wait for events to finish. After - this time the event will be terminated. The default is 30 seconds.</para> + this time the event will be terminated. The default is 180 seconds.</para> </listitem> </varlistentry> diff --git a/man/systemd.link.xml b/man/systemd.link.xml index 75cf6e1953..723364f4d1 100644 --- a/man/systemd.link.xml +++ b/man/systemd.link.xml @@ -70,10 +70,10 @@ However, files with identical filenames replace each other. Files in <filename>/etc</filename> have the highest priority, files in <filename>/run</filename> take precedence over files with the same - name in <filename>/usr/lib</filename>. This can be used to + name in <filename>&rootprefix;/lib</filename>. This can be used to override a system-supplied link file with a local file if needed; a symlink in <filename>/etc</filename> with the same name as a - link file in <filename>/usr/lib</filename>, pointing to + link file in <filename>&rootprefix;/lib</filename>, pointing to <filename>/dev/null</filename>, disables the link file entirely.</para> @@ -232,7 +232,9 @@ <para>If the kernel is using a random MAC address, nothing is done. Otherwise, a new address is randomly generated each time the device appears, typically at - boot.</para> + boot. Either way the random address will have the + <literal>unicast</literal> and + <literal>locally administered</literal> bits set.</para> </listitem> </varlistentry> </variablelist> diff --git a/man/systemd.netdev.xml b/man/systemd.netdev.xml index 6cd77abd04..786c7d478a 100644 --- a/man/systemd.netdev.xml +++ b/man/systemd.netdev.xml @@ -81,10 +81,10 @@ identical filenames replace each other. Files in <filename>/etc</filename> have the highest priority, files in <filename>/run</filename> take precedence over files with the same - name in <filename>/usr/lib</filename>. This can be used to + name in <filename>&rootprefix;/lib</filename>. This can be used to override a system-supplied configuration file with a local file if needed; a symlink in <filename>/etc</filename> with the same name - as a configuration file in <filename>/usr/lib</filename>, pointing + as a configuration file in <filename>&rootprefix;/lib</filename>, pointing to <filename>/dev/null</filename>, disables the configuration file entirely.</para> diff --git a/man/systemd.network.xml b/man/systemd.network.xml index 0b9781fb8b..bd061c270a 100644 --- a/man/systemd.network.xml +++ b/man/systemd.network.xml @@ -77,10 +77,10 @@ identical filenames replace each other. Files in <filename>/etc</filename> have the highest priority, files in <filename>/run</filename> take precedence over files with the same - name in <filename>/usr/lib</filename>. This can be used to + name in <filename>&rootprefix;/lib</filename>. This can be used to override a system-supplied configuration file with a local file if needed; a symlink in <filename>/etc</filename> with the same name - as a configuration file in <filename>/usr/lib</filename>, pointing + as a configuration file in <filename>&rootprefix;/lib</filename>, pointing to <filename>/dev/null</filename>, disables the configuration file entirely.</para> diff --git a/man/udev.xml b/man/udev.xml index f7ebaad4bc..70f4f59c08 100644 --- a/man/udev.xml +++ b/man/udev.xml @@ -65,10 +65,10 @@ regardless of the directories in which they live. However, files with identical filenames replace each other. Files in <filename>/etc</filename> have the highest priority, files in <filename>/run</filename> take precedence - over files with the same name in <filename>/usr/lib</filename>. This can be + over files with the same name in <filename>&rootprefix;/lib</filename>. This can be used to override a system-supplied rules file with a local file if needed; a symlink in <filename>/etc</filename> with the same name as a rules file in - <filename>/usr/lib</filename>, pointing to <filename>/dev/null</filename>, + <filename>&rootprefix;/lib</filename>, pointing to <filename>/dev/null</filename>, disables the rules file entirely. Rule files must have the extension <filename>.rules</filename>; other extensions are ignored.</para> @@ -472,7 +472,8 @@ <varlistentry> <term><literal>program</literal></term> <listitem> - <para>Execute an external program specified as the assigned value and + <para>Execute an external program specified as the assigned + value and if it returns successfully import its output, which must be in environment key format. Path specification, command/argument separation, and quoting work like in <varname>RUN</varname>.</para> |