Merge pull request #30616 from dtardon/docbook-valid-2

DocBook validation fixes (part 2)
This commit is contained in:
Yu Watanabe 2023-12-25 20:00:23 +09:00 committed by GitHub
commit f73509d90f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 181 additions and 175 deletions

View file

@ -121,124 +121,124 @@
<paramdef>sd_bus_message_handler_t <parameter>callback</parameter></paramdef> <paramdef>sd_bus_message_handler_t <parameter>callback</parameter></paramdef>
<paramdef>void *<parameter>userdata</parameter></paramdef> <paramdef>void *<parameter>userdata</parameter></paramdef>
</funcprototype> </funcprototype>
<para>
<constant>SD_BUS_VTABLE_CAPABILITY(<replaceable>capability</replaceable>)</constant>
</para>
<para>
<constant>SD_BUS_VTABLE_START(<replaceable>flags</replaceable>)</constant>
</para>
<para>
<constant>SD_BUS_VTABLE_END</constant>
</para>
<para>
<constant>SD_BUS_METHOD_WITH_ARGS_OFFSET(<replaceable>member</replaceable>,
<replaceable>args</replaceable>,
<replaceable>result</replaceable>,
<replaceable>handler</replaceable>,
<replaceable>offset</replaceable>,
<replaceable>flags</replaceable>)
</constant>
</para>
<para>
<constant>SD_BUS_METHOD_WITH_ARGS(<replaceable>member</replaceable>,
<replaceable>args</replaceable>,
<replaceable>result</replaceable>,
<replaceable>handler</replaceable>,
<replaceable>flags</replaceable>)
</constant>
</para>
<para>
<constant>SD_BUS_METHOD_WITH_NAMES_OFFSET(<replaceable>member</replaceable>,
<replaceable>signature</replaceable>,
<replaceable>in_names</replaceable>,
<replaceable>result</replaceable>,
<replaceable>out_names</replaceable>,
<replaceable>handler</replaceable>,
<replaceable>offset</replaceable>,
<replaceable>flags</replaceable>)
</constant>
</para>
<para>
<constant>SD_BUS_METHOD_WITH_NAMES(<replaceable>member</replaceable>,
<replaceable>signature</replaceable>,
<replaceable>in_names</replaceable>,
<replaceable>result</replaceable>,
<replaceable>out_names</replaceable>,
<replaceable>handler</replaceable>,
<replaceable>flags</replaceable>)
</constant>
</para>
<para>
<constant>SD_BUS_METHOD_WITH_OFFSET(<replaceable>member</replaceable>,
<replaceable>signature</replaceable>,
<replaceable>result</replaceable>,
<replaceable>handler</replaceable>,
<replaceable>offset</replaceable>,
<replaceable>flags</replaceable>)
</constant>
</para>
<para>
<constant>SD_BUS_METHOD(<replaceable>member</replaceable>,
<replaceable>signature</replaceable>,
<replaceable>result</replaceable>,
<replaceable>handler</replaceable>,
<replaceable>flags</replaceable>)
</constant>
</para>
<para>
<constant>SD_BUS_SIGNAL_WITH_ARGS(<replaceable>member</replaceable>,
<replaceable>args</replaceable>,
<replaceable>flags</replaceable>)
</constant>
</para>
<para>
<constant>SD_BUS_SIGNAL_WITH_NAMES(<replaceable>member</replaceable>,
<replaceable>signature</replaceable>,
<replaceable>names</replaceable>,
<replaceable>flags</replaceable>)
</constant>
</para>
<para>
<constant>SD_BUS_SIGNAL(<replaceable>member</replaceable>,
<replaceable>signature</replaceable>,
<replaceable>flags</replaceable>)
</constant>
</para>
<para>
<constant>SD_BUS_WRITABLE_PROPERTY(<replaceable>member</replaceable>,
<replaceable>signature</replaceable>,
<replaceable>get</replaceable>,
<replaceable>set</replaceable>,
<replaceable>offset</replaceable>,
<replaceable>flags</replaceable>)
</constant>
</para>
<para>
<constant>SD_BUS_PROPERTY(<replaceable>member</replaceable>,
<replaceable>signature</replaceable>,
<replaceable>get</replaceable>,
<replaceable>offset</replaceable>,
<replaceable>flags</replaceable>)
</constant>
</para>
<para>
<constant>SD_BUS_PARAM(<replaceable>name</replaceable>)</constant>
</para>
<para>
<constant>SD_BUS_ARGS(<replaceable>...</replaceable>)</constant>
</para>
<para>
<constant>SD_BUS_RESULT(<replaceable>...</replaceable>)</constant>
</para>
<para>
<constant>SD_BUS_NO_ARGS</constant>
</para>
<para>
<constant>SD_BUS_NO_RESULT</constant>
</para>
</funcsynopsis> </funcsynopsis>
<para>
<constant>SD_BUS_VTABLE_CAPABILITY(<replaceable>capability</replaceable>)</constant>
</para>
<para>
<constant>SD_BUS_VTABLE_START(<replaceable>flags</replaceable>)</constant>
</para>
<para>
<constant>SD_BUS_VTABLE_END</constant>
</para>
<para>
<constant>SD_BUS_METHOD_WITH_ARGS_OFFSET(<replaceable>member</replaceable>,
<replaceable>args</replaceable>,
<replaceable>result</replaceable>,
<replaceable>handler</replaceable>,
<replaceable>offset</replaceable>,
<replaceable>flags</replaceable>)
</constant>
</para>
<para>
<constant>SD_BUS_METHOD_WITH_ARGS(<replaceable>member</replaceable>,
<replaceable>args</replaceable>,
<replaceable>result</replaceable>,
<replaceable>handler</replaceable>,
<replaceable>flags</replaceable>)
</constant>
</para>
<para>
<constant>SD_BUS_METHOD_WITH_NAMES_OFFSET(<replaceable>member</replaceable>,
<replaceable>signature</replaceable>,
<replaceable>in_names</replaceable>,
<replaceable>result</replaceable>,
<replaceable>out_names</replaceable>,
<replaceable>handler</replaceable>,
<replaceable>offset</replaceable>,
<replaceable>flags</replaceable>)
</constant>
</para>
<para>
<constant>SD_BUS_METHOD_WITH_NAMES(<replaceable>member</replaceable>,
<replaceable>signature</replaceable>,
<replaceable>in_names</replaceable>,
<replaceable>result</replaceable>,
<replaceable>out_names</replaceable>,
<replaceable>handler</replaceable>,
<replaceable>flags</replaceable>)
</constant>
</para>
<para>
<constant>SD_BUS_METHOD_WITH_OFFSET(<replaceable>member</replaceable>,
<replaceable>signature</replaceable>,
<replaceable>result</replaceable>,
<replaceable>handler</replaceable>,
<replaceable>offset</replaceable>,
<replaceable>flags</replaceable>)
</constant>
</para>
<para>
<constant>SD_BUS_METHOD(<replaceable>member</replaceable>,
<replaceable>signature</replaceable>,
<replaceable>result</replaceable>,
<replaceable>handler</replaceable>,
<replaceable>flags</replaceable>)
</constant>
</para>
<para>
<constant>SD_BUS_SIGNAL_WITH_ARGS(<replaceable>member</replaceable>,
<replaceable>args</replaceable>,
<replaceable>flags</replaceable>)
</constant>
</para>
<para>
<constant>SD_BUS_SIGNAL_WITH_NAMES(<replaceable>member</replaceable>,
<replaceable>signature</replaceable>,
<replaceable>names</replaceable>,
<replaceable>flags</replaceable>)
</constant>
</para>
<para>
<constant>SD_BUS_SIGNAL(<replaceable>member</replaceable>,
<replaceable>signature</replaceable>,
<replaceable>flags</replaceable>)
</constant>
</para>
<para>
<constant>SD_BUS_WRITABLE_PROPERTY(<replaceable>member</replaceable>,
<replaceable>signature</replaceable>,
<replaceable>get</replaceable>,
<replaceable>set</replaceable>,
<replaceable>offset</replaceable>,
<replaceable>flags</replaceable>)
</constant>
</para>
<para>
<constant>SD_BUS_PROPERTY(<replaceable>member</replaceable>,
<replaceable>signature</replaceable>,
<replaceable>get</replaceable>,
<replaceable>offset</replaceable>,
<replaceable>flags</replaceable>)
</constant>
</para>
<para>
<constant>SD_BUS_PARAM(<replaceable>name</replaceable>)</constant>
</para>
<para>
<constant>SD_BUS_ARGS(<replaceable>...</replaceable>)</constant>
</para>
<para>
<constant>SD_BUS_RESULT(<replaceable>...</replaceable>)</constant>
</para>
<para>
<constant>SD_BUS_NO_ARGS</constant>
</para>
<para>
<constant>SD_BUS_NO_RESULT</constant>
</para>
</refsynopsisdiv> </refsynopsisdiv>
<refsect1> <refsect1>

View file

@ -1,5 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE refsection PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"> "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
<!-- <!--
@ -7,10 +7,13 @@
Copyright © 2014 Josh Triplett Copyright © 2014 Josh Triplett
--> -->
<refsection> <refentry>
<title/> <refnamediv>
<refname/>
<refpurpose/>
</refnamediv>
<refsection id='confd'> <refsect1 id='confd'>
<title>Configuration Directories and Precedence</title> <title>Configuration Directories and Precedence</title>
<para>Configuration files are read from directories in <filename>/etc/</filename>, <para>Configuration files are read from directories in <filename>/etc/</filename>,
@ -38,9 +41,9 @@
way is to place a symlink to <filename>/dev/null</filename> in the configuration directory in way is to place a symlink to <filename>/dev/null</filename> in the configuration directory in
<filename>/etc/</filename>, with the same filename as the vendor configuration file. If the vendor <filename>/etc/</filename>, with the same filename as the vendor configuration file. If the vendor
configuration file is included in the initrd image, the image has to be regenerated.</para> configuration file is included in the initrd image, the image has to be regenerated.</para>
</refsection> </refsect1>
<refsection id='main-conf'> <refsect1 id='main-conf'>
<title>Configuration Directories and Precedence</title> <title>Configuration Directories and Precedence</title>
<para>The default configuration is set during compilation, so configuration is only needed when it is <para>The default configuration is set during compilation, so configuration is only needed when it is
@ -72,5 +75,5 @@
<para>To disable a configuration file supplied by the vendor, the recommended way is to place a symlink <para>To disable a configuration file supplied by the vendor, the recommended way is to place a symlink
to <filename>/dev/null</filename> in the configuration directory in <filename>/etc/</filename>, with the to <filename>/dev/null</filename> in the configuration directory in <filename>/etc/</filename>, with the
same filename as the vendor configuration file.</para> same filename as the vendor configuration file.</para>
</refsection> </refsect1>
</refsection> </refentry>

View file

@ -177,7 +177,7 @@
<cmdsynopsis> <cmdsynopsis>
<command>systemd-analyze</command> <command>systemd-analyze</command>
<arg choice="opt" rep="repeat">OPTIONS</arg> <arg choice="opt" rep="repeat">OPTIONS</arg>
<arg choice="plain">srk</arg> &gt;<arg choice="plain"><replaceable>FILE</replaceable></arg> <arg choice="plain">srk</arg>
</cmdsynopsis> </cmdsynopsis>
<cmdsynopsis> <cmdsynopsis>
<command>systemd-analyze</command> <command>systemd-analyze</command>

View file

@ -3,7 +3,7 @@
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
<!-- SPDX-License-Identifier: LGPL-2.1-or-later --> <!-- SPDX-License-Identifier: LGPL-2.1-or-later -->
<refentry id="systemd-backlight@.service" conditional='ENABLE_BACKLIGHT' <refentry id="systemd-backlight_.service" conditional='ENABLE_BACKLIGHT'
xmlns:xi="http://www.w3.org/2001/XInclude"> xmlns:xi="http://www.w3.org/2001/XInclude">
<refentryinfo> <refentryinfo>

View file

@ -3,7 +3,7 @@
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
<!-- SPDX-License-Identifier: LGPL-2.1-or-later --> <!-- SPDX-License-Identifier: LGPL-2.1-or-later -->
<refentry id="systemd-fsck@.service" xmlns:xi="http://www.w3.org/2001/XInclude"> <refentry id="systemd-fsck_.service" xmlns:xi="http://www.w3.org/2001/XInclude">
<refentryinfo> <refentryinfo>
<title>systemd-fsck@.service</title> <title>systemd-fsck@.service</title>

View file

@ -3,7 +3,7 @@
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
<!-- SPDX-License-Identifier: LGPL-2.1-or-later --> <!-- SPDX-License-Identifier: LGPL-2.1-or-later -->
<refentry id="systemd-integritysetup@.service" conditional='HAVE_LIBCRYPTSETUP' <refentry id="systemd-integritysetup_.service" conditional='HAVE_LIBCRYPTSETUP'
xmlns:xi="http://www.w3.org/2001/XInclude"> xmlns:xi="http://www.w3.org/2001/XInclude">
<refentryinfo> <refentryinfo>

View file

@ -3,7 +3,7 @@
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
<!-- SPDX-License-Identifier: LGPL-2.1-or-later --> <!-- SPDX-License-Identifier: LGPL-2.1-or-later -->
<refentry id="systemd-makefs@.service"> <refentry id="systemd-makefs_.service">
<refentryinfo> <refentryinfo>
<title>systemd-makefs@.service</title> <title>systemd-makefs@.service</title>

View file

@ -3,7 +3,7 @@
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
<!-- SPDX-License-Identifier: LGPL-2.1-or-later --> <!-- SPDX-License-Identifier: LGPL-2.1-or-later -->
<refentry id="systemd-veritysetup@.service" conditional='HAVE_LIBCRYPTSETUP' <refentry id="systemd-veritysetup_.service" conditional='HAVE_LIBCRYPTSETUP'
xmlns:xi="http://www.w3.org/2001/XInclude"> xmlns:xi="http://www.w3.org/2001/XInclude">
<refentryinfo> <refentryinfo>

View file

@ -97,8 +97,8 @@
<variablelist> <variablelist>
<varlistentry> <varlistentry>
<term><varname>ID_NET_NAME_ONBOARD=<replaceable>prefix</replaceable><constant>o</constant><replaceable>number</replaceable></varname></term> <term><varname>ID_NET_NAME_ONBOARD=</varname><replaceable>prefix</replaceable><constant>o</constant><replaceable>number</replaceable></term>
<term><varname>ID_NET_NAME_ONBOARD=<replaceable>prefix</replaceable><constant>d</constant><replaceable>number</replaceable></varname></term> <term><varname>ID_NET_NAME_ONBOARD=</varname><replaceable>prefix</replaceable><constant>d</constant><replaceable>number</replaceable></term>
<listitem><para>This name is set based on the numeric ordering information given by the firmware <listitem><para>This name is set based on the numeric ordering information given by the firmware
for on-board devices. Different schemes are used depending on the firmware type, as described in for on-board devices. Different schemes are used depending on the firmware type, as described in
@ -135,7 +135,7 @@
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term><varname>ID_NET_LABEL_ONBOARD=<replaceable>prefix</replaceable> <replaceable>label</replaceable></varname></term> <term><varname>ID_NET_LABEL_ONBOARD=</varname><replaceable>prefix</replaceable> <replaceable>label</replaceable></term>
<listitem><para>This property is set based on textual label given by the firmware for on-board <listitem><para>This property is set based on textual label given by the firmware for on-board
devices. The name consists of the prefix concatenated with the label. This is only available for devices. The name consists of the prefix concatenated with the label. This is only available for
@ -147,7 +147,7 @@
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term><varname>ID_NET_NAME_MAC=<replaceable>prefix</replaceable><constant>x</constant><replaceable>AABBCCDDEEFF</replaceable></varname></term> <term><varname>ID_NET_NAME_MAC=</varname><replaceable>prefix</replaceable><constant>x</constant><replaceable>AABBCCDDEEFF</replaceable></term>
<listitem><para>This name consists of the prefix, letter <constant>x</constant>, and 12 hexadecimal <listitem><para>This name consists of the prefix, letter <constant>x</constant>, and 12 hexadecimal
digits of the MAC address. It is available if the device has a fixed MAC address. Because this name digits of the MAC address. It is available if the device has a fixed MAC address. Because this name
@ -159,13 +159,13 @@
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term><varname>ID_NET_NAME_SLOT=<replaceable>prefix</replaceable>[<constant>P</constant><replaceable>domain</replaceable>]<constant>s</constant><replaceable>slot</replaceable>[<constant>f</constant><replaceable>function</replaceable>][<constant>n</constant><replaceable>port_name</replaceable>|<constant>d</constant><replaceable>dev_port</replaceable>]</varname></term> <term><varname>ID_NET_NAME_SLOT=</varname><replaceable>prefix</replaceable>[<constant>P</constant><replaceable>domain</replaceable>]<constant>s</constant><replaceable>slot</replaceable>[<constant>f</constant><replaceable>function</replaceable>][<constant>n</constant><replaceable>port_name</replaceable>|<constant>d</constant><replaceable>dev_port</replaceable>]</term>
<term><varname>ID_NET_NAME_SLOT=<replaceable>prefix</replaceable><constant>v</constant><replaceable>slot</replaceable></varname></term> <term><varname>ID_NET_NAME_SLOT=</varname><replaceable>prefix</replaceable><constant>v</constant><replaceable>slot</replaceable></term>
<term><varname>ID_NET_NAME_SLOT=<replaceable>prefix</replaceable><constant>x</constant><replaceable>slot</replaceable></varname></term> <term><varname>ID_NET_NAME_SLOT=</varname><replaceable>prefix</replaceable><constant>x</constant><replaceable>slot</replaceable></term>
<term><varname>ID_NET_NAME_SLOT=<replaceable>prefix</replaceable>[<constant>P</constant><replaceable>domain</replaceable>]<constant>s</constant><replaceable>slot</replaceable>[<constant>f</constant><replaceable>function</replaceable>][<constant>n</constant><replaceable>port_name</replaceable>|<constant>d</constant><replaceable>dev_port</replaceable>]<constant>b</constant><replaceable>number</replaceable></varname></term> <term><varname>ID_NET_NAME_SLOT=</varname><replaceable>prefix</replaceable>[<constant>P</constant><replaceable>domain</replaceable>]<constant>s</constant><replaceable>slot</replaceable>[<constant>f</constant><replaceable>function</replaceable>][<constant>n</constant><replaceable>port_name</replaceable>|<constant>d</constant><replaceable>dev_port</replaceable>]<constant>b</constant><replaceable>number</replaceable></term>
<term><varname>ID_NET_NAME_SLOT=<replaceable>prefix</replaceable>[<constant>P</constant><replaceable>domain</replaceable>]<constant>s</constant><replaceable>slot</replaceable>[<constant>f</constant><replaceable>function</replaceable>][<constant>n</constant><replaceable>port_name</replaceable>|<constant>d</constant><replaceable>dev_port</replaceable>]<constant>u</constant><replaceable>port</replaceable>…[<constant>c</constant><replaceable>config</replaceable>][<constant>i</constant><replaceable>interface</replaceable>]</varname></term> <term><varname>ID_NET_NAME_SLOT=</varname><replaceable>prefix</replaceable>[<constant>P</constant><replaceable>domain</replaceable>]<constant>s</constant><replaceable>slot</replaceable>[<constant>f</constant><replaceable>function</replaceable>][<constant>n</constant><replaceable>port_name</replaceable>|<constant>d</constant><replaceable>dev_port</replaceable>]<constant>u</constant><replaceable>port</replaceable>…[<constant>c</constant><replaceable>config</replaceable>][<constant>i</constant><replaceable>interface</replaceable>]</term>
<term><varname>ID_NET_NAME_SLOT=<replaceable>prefix</replaceable>[<constant>P</constant><replaceable>domain</replaceable>]<constant>s</constant><replaceable>slot</replaceable>[<constant>f</constant><replaceable>function</replaceable>][<constant>n</constant><replaceable>port_name</replaceable>|<constant>d</constant><replaceable>dev_port</replaceable>]<constant>v</constant><replaceable>slot</replaceable></varname></term> <term><varname>ID_NET_NAME_SLOT=</varname><replaceable>prefix</replaceable>[<constant>P</constant><replaceable>domain</replaceable>]<constant>s</constant><replaceable>slot</replaceable>[<constant>f</constant><replaceable>function</replaceable>][<constant>n</constant><replaceable>port_name</replaceable>|<constant>d</constant><replaceable>dev_port</replaceable>]<constant>v</constant><replaceable>slot</replaceable></term>
<term><varname>ID_NET_NAME_SLOT=<replaceable>prefix</replaceable>[<constant>P</constant><replaceable>domain</replaceable>]<constant>s</constant><replaceable>slot</replaceable>[<constant>f</constant><replaceable>function</replaceable>][<constant>n</constant><replaceable>port_name</replaceable>|<constant>d</constant><replaceable>dev_port</replaceable>]<constant>r</constant><replaceable>slot</replaceable></varname></term> <term><varname>ID_NET_NAME_SLOT=</varname><replaceable>prefix</replaceable>[<constant>P</constant><replaceable>domain</replaceable>]<constant>s</constant><replaceable>slot</replaceable>[<constant>f</constant><replaceable>function</replaceable>][<constant>n</constant><replaceable>port_name</replaceable>|<constant>d</constant><replaceable>dev_port</replaceable>]<constant>r</constant><replaceable>slot</replaceable></term>
<listitem><para>This property describes the slot position. Different schemes are used depending on <listitem><para>This property describes the slot position. Different schemes are used depending on
the bus type, as described in the table below. In case of USB, BCMA, and SR-VIO devices, the full the bus type, as described in the table below. In case of USB, BCMA, and SR-VIO devices, the full
@ -251,13 +251,13 @@
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term><varname>ID_NET_NAME_PATH=<replaceable>prefix</replaceable><constant>c</constant><replaceable>bus_id</replaceable></varname></term> <term><varname>ID_NET_NAME_PATH=</varname><replaceable>prefix</replaceable><constant>c</constant><replaceable>bus_id</replaceable></term>
<term><varname>ID_NET_NAME_PATH=<replaceable>prefix</replaceable><constant>a</constant><replaceable>vendor</replaceable><replaceable>model</replaceable><constant>i</constant><replaceable>instance</replaceable></varname></term> <term><varname>ID_NET_NAME_PATH=</varname><replaceable>prefix</replaceable><constant>a</constant><replaceable>vendor</replaceable><replaceable>model</replaceable><constant>i</constant><replaceable>instance</replaceable></term>
<term><varname>ID_NET_NAME_PATH=<replaceable>prefix</replaceable><constant>i</constant><replaceable>address</replaceable><constant>n</constant><replaceable>port_name</replaceable></varname></term> <term><varname>ID_NET_NAME_PATH=</varname><replaceable>prefix</replaceable><constant>i</constant><replaceable>address</replaceable><constant>n</constant><replaceable>port_name</replaceable></term>
<term><varname>ID_NET_NAME_PATH=<replaceable>prefix</replaceable><constant>u</constant><replaceable>port</replaceable></varname></term> <term><varname>ID_NET_NAME_PATH=</varname><replaceable>prefix</replaceable><constant>u</constant><replaceable>port</replaceable></term>
<term><varname>ID_NET_NAME_PATH=<replaceable>prefix</replaceable>[<constant>P</constant><replaceable>domain</replaceable>]<constant>p</constant><replaceable>bus</replaceable><constant>s</constant><replaceable>slot</replaceable>[<constant>f</constant><replaceable>function</replaceable>][<constant>n</constant><replaceable>phys_port_name</replaceable>|<constant>d</constant><replaceable>dev_port</replaceable>]</varname></term> <term><varname>ID_NET_NAME_PATH=</varname><replaceable>prefix</replaceable>[<constant>P</constant><replaceable>domain</replaceable>]<constant>p</constant><replaceable>bus</replaceable><constant>s</constant><replaceable>slot</replaceable>[<constant>f</constant><replaceable>function</replaceable>][<constant>n</constant><replaceable>phys_port_name</replaceable>|<constant>d</constant><replaceable>dev_port</replaceable>]</term>
<term><varname>ID_NET_NAME_PATH=<replaceable>prefix</replaceable>[<constant>P</constant><replaceable>domain</replaceable>]<constant>p</constant><replaceable>bus</replaceable><constant>s</constant><replaceable>slot</replaceable>[<constant>f</constant><replaceable>function</replaceable>][<constant>n</constant><replaceable>phys_port_name</replaceable>|<constant>d</constant><replaceable>dev_port</replaceable>]<constant>b</constant><replaceable>number</replaceable></varname></term> <term><varname>ID_NET_NAME_PATH=</varname><replaceable>prefix</replaceable>[<constant>P</constant><replaceable>domain</replaceable>]<constant>p</constant><replaceable>bus</replaceable><constant>s</constant><replaceable>slot</replaceable>[<constant>f</constant><replaceable>function</replaceable>][<constant>n</constant><replaceable>phys_port_name</replaceable>|<constant>d</constant><replaceable>dev_port</replaceable>]<constant>b</constant><replaceable>number</replaceable></term>
<term><varname>ID_NET_NAME_PATH=<replaceable>prefix</replaceable>[<constant>P</constant><replaceable>domain</replaceable>]<constant>p</constant><replaceable>bus</replaceable><constant>s</constant><replaceable>slot</replaceable>[<constant>f</constant><replaceable>function</replaceable>][<constant>n</constant><replaceable>phys_port_name</replaceable>|<constant>d</constant><replaceable>dev_port</replaceable>]<constant>u</constant><replaceable>port</replaceable>…[<constant>c</constant><replaceable>config</replaceable>][<constant>i</constant><replaceable>interface</replaceable>]</varname></term> <term><varname>ID_NET_NAME_PATH=</varname><replaceable>prefix</replaceable>[<constant>P</constant><replaceable>domain</replaceable>]<constant>p</constant><replaceable>bus</replaceable><constant>s</constant><replaceable>slot</replaceable>[<constant>f</constant><replaceable>function</replaceable>][<constant>n</constant><replaceable>phys_port_name</replaceable>|<constant>d</constant><replaceable>dev_port</replaceable>]<constant>u</constant><replaceable>port</replaceable>…[<constant>c</constant><replaceable>config</replaceable>][<constant>i</constant><replaceable>interface</replaceable>]</term>
<listitem><para>This property describes the device installation location. Different schemes are <listitem><para>This property describes the device installation location. Different schemes are
used depending on the bus type, as described in the table below. For BCMA and USB devices, PCI path used depending on the bus type, as described in the table below. For BCMA and USB devices, PCI path
@ -542,7 +542,7 @@
<variablelist> <variablelist>
<varlistentry> <varlistentry>
<term><varname>ID_NET_NAME_ALLOW=<replaceable>BOOL</replaceable></varname></term> <term><varname>ID_NET_NAME_ALLOW=</varname><replaceable>BOOL</replaceable></term>
<listitem><para>This udev property sets a fallback policy for reading a sysfs attribute. <listitem><para>This udev property sets a fallback policy for reading a sysfs attribute.
If set to <constant>0</constant> udev will not read any sysfs attribute by default, unless it is If set to <constant>0</constant> udev will not read any sysfs attribute by default, unless it is

View file

@ -151,10 +151,13 @@ CPUWeight=20 DisableControllers=cpu / \
applies to all user slices.</para> applies to all user slices.</para>
</refsect2> </refsect2>
<para>See the <ulink <refsect2>
url="https://www.freedesktop.org/wiki/Software/systemd/ControlGroupInterface">New <title/>
Control Group Interfaces</ulink> for an introduction on how to make <para>See the <ulink
use of resource control APIs from programs.</para> url="https://www.freedesktop.org/wiki/Software/systemd/ControlGroupInterface">New
Control Group Interfaces</ulink> for an introduction on how to make
use of resource control APIs from programs.</para>
</refsect2>
</refsect1> </refsect1>
<refsect1> <refsect1>
@ -1669,7 +1672,7 @@ DeviceAllow=/dev/loop-control
<member><citerefentry><refentrytitle>systemd.special</refentrytitle><manvolnum>7</manvolnum></citerefentry></member> <member><citerefentry><refentrytitle>systemd.special</refentrytitle><manvolnum>7</manvolnum></citerefentry></member>
<member><citerefentry><refentrytitle>systemd-oomd.service</refentrytitle><manvolnum>8</manvolnum></citerefentry></member> <member><citerefentry><refentrytitle>systemd-oomd.service</refentrytitle><manvolnum>8</manvolnum></citerefentry></member>
<member>The documentation for control groups and specific controllers in the Linux kernel: <member>The documentation for control groups and specific controllers in the Linux kernel:
<member><ulink url="https://docs.kernel.org/admin-guide/cgroup-v2.html">Control Groups v2</ulink></member></member> <ulink url="https://docs.kernel.org/admin-guide/cgroup-v2.html">Control Groups v2</ulink></member>
</simplelist></para> </simplelist></para>
</refsect1> </refsect1>
</refentry> </refentry>

View file

@ -83,8 +83,8 @@
</variablelist> </variablelist>
<refsect2><title>udevadm info <refsect2><title>udevadm info
<arg choice="opt"><replaceable>options</replaceable></arg> <optional><replaceable>options</replaceable></optional>
<arg choice="opt" rep="repeat"><replaceable>devpath</replaceable>|<replaceable>file</replaceable>|<replaceable>unit</replaceable></arg> <optional><replaceable>devpath</replaceable>|<replaceable>file</replaceable>|<replaceable>unit</replaceable></optional>
</title> </title>
<para>Query the udev database for device information.</para> <para>Query the udev database for device information.</para>
@ -382,8 +382,8 @@
</refsect2> </refsect2>
<refsect2><title>udevadm trigger <refsect2><title>udevadm trigger
<arg choice="opt"><replaceable>options</replaceable></arg> <optional><replaceable>options</replaceable></optional>
<arg choice="opt"><replaceable>devpath</replaceable>|<replaceable>file</replaceable>|<replaceable>unit</replaceable></arg> <optional><replaceable>devpath</replaceable>|<replaceable>file</replaceable>|<replaceable>unit</replaceable></optional>
</title> </title>
<para>Request device events from the kernel. Primarily used to replay events at system coldplug time.</para> <para>Request device events from the kernel. Primarily used to replay events at system coldplug time.</para>
@ -609,7 +609,7 @@
</refsect2> </refsect2>
<refsect2><title>udevadm settle <refsect2><title>udevadm settle
<arg choice="opt"><replaceable>options</replaceable></arg> <optional><replaceable>options</replaceable></optional>
</title> </title>
<para>Watches the udev event queue, and exits if all current events are handled.</para> <para>Watches the udev event queue, and exits if all current events are handled.</para>
<variablelist> <variablelist>
@ -732,7 +732,7 @@
</refsect2> </refsect2>
<refsect2><title>udevadm monitor <refsect2><title>udevadm monitor
<arg choice="opt"><replaceable>options</replaceable></arg> <optional><replaceable>options</replaceable></optional>
</title> </title>
<para>Listens to the kernel uevents and events sent out by a udev rule <para>Listens to the kernel uevents and events sent out by a udev rule
and prints the devpath of the event to the console. It can be used to analyze the and prints the devpath of the event to the console. It can be used to analyze the
@ -784,8 +784,8 @@
</refsect2> </refsect2>
<refsect2><title>udevadm test <refsect2><title>udevadm test
<arg choice="opt"><replaceable>options</replaceable></arg> <optional><replaceable>options</replaceable></optional>
<arg choice="opt"><replaceable>devpath</replaceable>|<replaceable>file</replaceable>|<replaceable>unit</replaceable></arg> <optional><replaceable>devpath</replaceable>|<replaceable>file</replaceable>|<replaceable>unit</replaceable></optional>
</title> </title>
<para>Simulate a udev event run for the given device, and print debug output.</para> <para>Simulate a udev event run for the given device, and print debug output.</para>
<variablelist> <variablelist>
@ -821,9 +821,9 @@
</refsect2> </refsect2>
<refsect2><title>udevadm test-builtin <refsect2><title>udevadm test-builtin
<arg choice="opt"><replaceable>options</replaceable></arg> <optional><replaceable>options</replaceable></optional>
<arg><replaceable>command</replaceable></arg> <replaceable>command</replaceable>
<arg choice="opt"><replaceable>devpath</replaceable>|<replaceable>file</replaceable>|<replaceable>unit</replaceable></arg> <optional><replaceable>devpath</replaceable>|<replaceable>file</replaceable>|<replaceable>unit</replaceable></optional>
</title> </title>
<para>Run a built-in command <replaceable>COMMAND</replaceable> <para>Run a built-in command <replaceable>COMMAND</replaceable>
for device <replaceable>DEVPATH</replaceable>, and print debug for device <replaceable>DEVPATH</replaceable>, and print debug
@ -850,8 +850,8 @@
<refsect2> <refsect2>
<title>udevadm verify <title>udevadm verify
<arg choice="opt"><replaceable>options</replaceable></arg> <optional><replaceable>options</replaceable></optional>
<arg choice="opt" rep="repeat"><replaceable>file</replaceable></arg> <optional><replaceable>file</replaceable></optional>
</title> </title>
@ -915,8 +915,8 @@
<refsect2> <refsect2>
<title>udevadm wait <title>udevadm wait
<arg choice="opt"><replaceable>options</replaceable></arg> <optional><replaceable>options</replaceable></optional>
<arg choice="opt"><replaceable>device|syspath</replaceable></arg> <optional><replaceable>device|syspath</replaceable></optional>
</title> </title>
@ -979,8 +979,8 @@
<refsect2> <refsect2>
<title>udevadm lock <title>udevadm lock
<arg choice="opt"><replaceable>options</replaceable></arg> <optional><replaceable>options</replaceable></optional>
<arg choice="opt"><replaceable>command</replaceable></arg> <optional><replaceable>command</replaceable></optional>
</title> </title>

View file

@ -203,7 +203,7 @@
<varlistentry> <varlistentry>
<term><option>--section=<replaceable>NAME</replaceable>:<replaceable>TEXT</replaceable>|<replaceable>@PATH</replaceable></option></term> <term><option>--section=<replaceable>NAME</replaceable>:<replaceable>TEXT</replaceable>|<replaceable>@PATH</replaceable></option></term>
<term><option>--section=<replaceable>NAME</replaceable>:<arg choice="plain">text|binary</arg><optional>@<replaceable>PATH</replaceable></optional></option></term> <term><option>--section=<replaceable>NAME</replaceable>:text|binary<optional>@<replaceable>PATH</replaceable></optional></option></term>
<listitem><para>For all verbs except <command>inspect</command>, the first syntax is used. <listitem><para>For all verbs except <command>inspect</command>, the first syntax is used.
Specify an arbitrary additional section <literal><replaceable>NAME</replaceable></literal>. Specify an arbitrary additional section <literal><replaceable>NAME</replaceable></literal>.

View file

@ -3,7 +3,7 @@
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
<!-- SPDX-License-Identifier: LGPL-2.1-or-later --> <!-- SPDX-License-Identifier: LGPL-2.1-or-later -->
<refentry id="user@.service"> <refentry id="user_.service">
<refentryinfo> <refentryinfo>
<title>user@.service</title> <title>user@.service</title>
<productname>systemd</productname> <productname>systemd</productname>

View file

@ -46,7 +46,7 @@ This index contains {count} entries, referring to {pages} individual manual page
def check_id(page, t): def check_id(page, t):
page_id = t.getroot().get('id') page_id = t.getroot().get('id')
if not re.search('/' + page_id + '[.]', page): if not re.search('/' + page_id + '[.]', page.translate(str.maketrans('@', '_'))):
raise ValueError(f"id='{page_id}' is not the same as page name '{page}'") raise ValueError(f"id='{page_id}' is not the same as page name '{page}'")
def make_index(pages): def make_index(pages):