networkd: Be opportunistic when declaring link configured

[thirdparty/systemd.git] / man / hwdb.xml

diff --git a/man/hwdb.xml b/man/hwdb.xml
index 9f2aff32618446032f3fb5a86a2581df94efa97b..80939dd95df47d7d5ebbb544b7567ece6af61048 100644 (file)
--- a/man/hwdb.xml
+++ b/man/hwdb.xml
@@ -1,9 +1,8 @@
 <?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
-<?xml-stylesheet type="text/xsl" href="http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl"?>
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
   "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
-<refentry id="hwdb">
+<refentry id="hwdb" conditional="ENABLE_HWDB">
   <refentryinfo>
     <title>hwdb</title>
     <productname>systemd</productname>
@@ -41,15 +40,14 @@
 
   <refsect1><title>Hardware Database Files</title>
       <para>The hwdb files are read from the files located in the
-      system hwdb directory <filename>/usr/lib/udev/hwdb.d</filename>,
-      the volatile runtime directory <filename>/run/udev/hwdb.d</filename>
-      and the local administration directory <filename>/etc/udev/hwdb.d</filename>.
+      system hwdb directory <filename>/usr/lib/udev/hwdb.d</filename> and
+      the local administration directory <filename>/etc/udev/hwdb.d</filename>.
       All hwdb files are collectively sorted and processed in lexical order,
       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
-      used to override a system-supplied hwdb file with a local file if needed;
+      have the highest priority and take precedence over files with the same
+      name in <filename>/usr/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>,
       disables the hwdb file entirely. hwdb files must have the extension
@@ -59,7 +57,7 @@
       associated key-value pairs. Every record in the hwdb starts with one or
       more match string, specifying a shell glob to compare the database
       lookup string against. Multiple match lines are specified in additional
-      consecutive lines. Every match line is compared indivdually, they are
+      consecutive lines. Every match line is compared individually, they are
       combined by OR. Every match line must start at the first character of
       the line.</para>