Merge pull request #17549 from yuwata/tiny-fixes

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

diff --git a/man/systemd-hwdb.xml b/man/systemd-hwdb.xml
index 9a58776af2985ca6e3343413b3a3ff30e6e1028c..70c052ef8d7dac4d391f471c09d6ccffe700fb02 100644 (file)
--- a/man/systemd-hwdb.xml
+++ b/man/systemd-hwdb.xml
@@ -1,28 +1,14 @@
-<?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+<?xml version='1.0'?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+<!-- SPDX-License-Identifier: LGPL-2.1-or-later -->
+
+<refentry id="systemd-hwdb" conditional="ENABLE_HWDB"
+          xmlns:xi="http://www.w3.org/2001/XInclude">
 
-<refentry id="systemd-hwdb" conditional="ENABLE_HWDB">
   <refentryinfo>
     <title>systemd-hwdb</title>
     <productname>systemd</productname>
-    <authorgroup>
-      <author>
-        <contrib>Developer</contrib>
-        <firstname>Kay</firstname>
-        <surname>Sievers</surname>
-        <email>kay@vrfy.org</email>
-      </author>
-      <author>
-        <contrib>Developer</contrib>
-        <firstname>Tom</firstname>
-        <surname>Gundersen</surname>
-        <email>teg@jklm.no</email>
-      </author>
-    </authorgroup>
   </refentryinfo>
 
   <refmeta>
@@ -51,25 +37,27 @@
   <refsect1><title>Options</title>
     <variablelist>
       <varlistentry>
-        <term><option>-h</option></term>
-        <term><option>--help</option></term>
+        <term><option>--usr</option></term>
         <listitem>
-          <para>Print help text.</para>
+          <para>Generate in /usr/lib/udev instead of /etc/udev.</para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term><option>--usr</option></term>
+        <term><option>-r</option></term>
+        <term><option>--root=<replaceable>PATH</replaceable></option></term>
         <listitem>
-          <para>Generate in &udevlibexecdir; instead of /etc/udev.</para>
+          <para>Alternate root path in the filesystem.</para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term><option>-r</option></term>
-        <term><option>--root=<replaceable>PATH</replaceable></option></term>
+        <term><option>-s</option></term>
+        <term><option>--strict</option></term>
         <listitem>
-          <para>Alternative root path in the filesystem.</para>
+          <para>When updating, return non-zero exit value on any parsing error.</para>
         </listitem>
       </varlistentry>
+
+      <xi:include href="standard-options.xml" xpointer="help" />
     </variablelist>
 
     <refsect2><title>systemd-hwdb