diff --git a/man/sd_bus_add_object.xml b/man/sd_bus_add_object.xml index b73ddc815a..7801f8825f 100644 --- a/man/sd_bus_add_object.xml +++ b/man/sd_bus_add_object.xml @@ -121,124 +121,124 @@ sd_bus_message_handler_t callback void *userdata - - - SD_BUS_VTABLE_CAPABILITY(capability) - - - - SD_BUS_VTABLE_START(flags) - - - SD_BUS_VTABLE_END - - - SD_BUS_METHOD_WITH_ARGS_OFFSET(member, - args, - result, - handler, - offset, - flags) - - - - SD_BUS_METHOD_WITH_ARGS(member, - args, - result, - handler, - flags) - - - - SD_BUS_METHOD_WITH_NAMES_OFFSET(member, - signature, - in_names, - result, - out_names, - handler, - offset, - flags) - - - - SD_BUS_METHOD_WITH_NAMES(member, - signature, - in_names, - result, - out_names, - handler, - flags) - - - - SD_BUS_METHOD_WITH_OFFSET(member, - signature, - result, - handler, - offset, - flags) - - - - SD_BUS_METHOD(member, - signature, - result, - handler, - flags) - - - - SD_BUS_SIGNAL_WITH_ARGS(member, - args, - flags) - - - - SD_BUS_SIGNAL_WITH_NAMES(member, - signature, - names, - flags) - - - - SD_BUS_SIGNAL(member, - signature, - flags) - - - - SD_BUS_WRITABLE_PROPERTY(member, - signature, - get, - set, - offset, - flags) - - - - SD_BUS_PROPERTY(member, - signature, - get, - offset, - flags) - - - - SD_BUS_PARAM(name) - - - SD_BUS_ARGS(...) - - - SD_BUS_RESULT(...) - - - SD_BUS_NO_ARGS - - - SD_BUS_NO_RESULT - + + + SD_BUS_VTABLE_CAPABILITY(capability) + + + + SD_BUS_VTABLE_START(flags) + + + SD_BUS_VTABLE_END + + + SD_BUS_METHOD_WITH_ARGS_OFFSET(member, + args, + result, + handler, + offset, + flags) + + + + SD_BUS_METHOD_WITH_ARGS(member, + args, + result, + handler, + flags) + + + + SD_BUS_METHOD_WITH_NAMES_OFFSET(member, + signature, + in_names, + result, + out_names, + handler, + offset, + flags) + + + + SD_BUS_METHOD_WITH_NAMES(member, + signature, + in_names, + result, + out_names, + handler, + flags) + + + + SD_BUS_METHOD_WITH_OFFSET(member, + signature, + result, + handler, + offset, + flags) + + + + SD_BUS_METHOD(member, + signature, + result, + handler, + flags) + + + + SD_BUS_SIGNAL_WITH_ARGS(member, + args, + flags) + + + + SD_BUS_SIGNAL_WITH_NAMES(member, + signature, + names, + flags) + + + + SD_BUS_SIGNAL(member, + signature, + flags) + + + + SD_BUS_WRITABLE_PROPERTY(member, + signature, + get, + set, + offset, + flags) + + + + SD_BUS_PROPERTY(member, + signature, + get, + offset, + flags) + + + + SD_BUS_PARAM(name) + + + SD_BUS_ARGS(...) + + + SD_BUS_RESULT(...) + + + SD_BUS_NO_ARGS + + + SD_BUS_NO_RESULT + diff --git a/man/standard-conf.xml b/man/standard-conf.xml index 0174c090e9..2f56c95fbb 100644 --- a/man/standard-conf.xml +++ b/man/standard-conf.xml @@ -1,5 +1,5 @@ - - - +<refentry> + <refnamediv> + <refname/> + <refpurpose/> + </refnamediv> - <refsection id='confd'> + <refsect1 id='confd'> <title>Configuration Directories and Precedence Configuration files are read from directories in /etc/, @@ -38,9 +41,9 @@ way is to place a symlink to /dev/null in the configuration directory in /etc/, 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. - + - + Configuration Directories and Precedence The default configuration is set during compilation, so configuration is only needed when it is @@ -72,5 +75,5 @@ To disable a configuration file supplied by the vendor, the recommended way is to place a symlink to /dev/null in the configuration directory in /etc/, with the same filename as the vendor configuration file. - - + + diff --git a/man/systemd-analyze.xml b/man/systemd-analyze.xml index 6f6f021f30..68062049c4 100644 --- a/man/systemd-analyze.xml +++ b/man/systemd-analyze.xml @@ -177,7 +177,7 @@ systemd-analyze OPTIONS - srk >FILE + srk systemd-analyze diff --git a/man/systemd-backlight@.service.xml b/man/systemd-backlight@.service.xml index 431b27bbb0..95fa518bff 100644 --- a/man/systemd-backlight@.service.xml +++ b/man/systemd-backlight@.service.xml @@ -3,7 +3,7 @@ - diff --git a/man/systemd-fsck@.service.xml b/man/systemd-fsck@.service.xml index 5f351ded35..a138bd0107 100644 --- a/man/systemd-fsck@.service.xml +++ b/man/systemd-fsck@.service.xml @@ -3,7 +3,7 @@ - + systemd-fsck@.service diff --git a/man/systemd-integritysetup@.service.xml b/man/systemd-integritysetup@.service.xml index a090b1c763..831c3690e1 100644 --- a/man/systemd-integritysetup@.service.xml +++ b/man/systemd-integritysetup@.service.xml @@ -3,7 +3,7 @@ - diff --git a/man/systemd-makefs@.service.xml b/man/systemd-makefs@.service.xml index 0b54ba3584..5447de0405 100644 --- a/man/systemd-makefs@.service.xml +++ b/man/systemd-makefs@.service.xml @@ -3,7 +3,7 @@ - + systemd-makefs@.service diff --git a/man/systemd-veritysetup@.service.xml b/man/systemd-veritysetup@.service.xml index 4a4d8d9814..a549b41b70 100644 --- a/man/systemd-veritysetup@.service.xml +++ b/man/systemd-veritysetup@.service.xml @@ -3,7 +3,7 @@ - diff --git a/man/systemd.net-naming-scheme.xml b/man/systemd.net-naming-scheme.xml index 07ab26e6f6..ed1c5ec46b 100644 --- a/man/systemd.net-naming-scheme.xml +++ b/man/systemd.net-naming-scheme.xml @@ -97,8 +97,8 @@ - ID_NET_NAME_ONBOARD=prefixonumber - ID_NET_NAME_ONBOARD=prefixdnumber + ID_NET_NAME_ONBOARD=prefixonumber + ID_NET_NAME_ONBOARD=prefixdnumber 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 @@ -135,7 +135,7 @@ - ID_NET_LABEL_ONBOARD=prefix label + ID_NET_LABEL_ONBOARD=prefix label 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 @@ -147,7 +147,7 @@ - ID_NET_NAME_MAC=prefixxAABBCCDDEEFF + ID_NET_NAME_MAC=prefixxAABBCCDDEEFF This name consists of the prefix, letter x, and 12 hexadecimal digits of the MAC address. It is available if the device has a fixed MAC address. Because this name @@ -159,13 +159,13 @@ - ID_NET_NAME_SLOT=prefix[Pdomain]sslot[ffunction][nport_name|ddev_port] - ID_NET_NAME_SLOT=prefixvslot - ID_NET_NAME_SLOT=prefixxslot - ID_NET_NAME_SLOT=prefix[Pdomain]sslot[ffunction][nport_name|ddev_port]bnumber - ID_NET_NAME_SLOT=prefix[Pdomain]sslot[ffunction][nport_name|ddev_port]uport…[cconfig][iinterface] - ID_NET_NAME_SLOT=prefix[Pdomain]sslot[ffunction][nport_name|ddev_port]vslot - ID_NET_NAME_SLOT=prefix[Pdomain]sslot[ffunction][nport_name|ddev_port]rslot + ID_NET_NAME_SLOT=prefix[Pdomain]sslot[ffunction][nport_name|ddev_port] + ID_NET_NAME_SLOT=prefixvslot + ID_NET_NAME_SLOT=prefixxslot + ID_NET_NAME_SLOT=prefix[Pdomain]sslot[ffunction][nport_name|ddev_port]bnumber + ID_NET_NAME_SLOT=prefix[Pdomain]sslot[ffunction][nport_name|ddev_port]uport…[cconfig][iinterface] + ID_NET_NAME_SLOT=prefix[Pdomain]sslot[ffunction][nport_name|ddev_port]vslot + ID_NET_NAME_SLOT=prefix[Pdomain]sslot[ffunction][nport_name|ddev_port]rslot 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 @@ -251,13 +251,13 @@ - ID_NET_NAME_PATH=prefixcbus_id - ID_NET_NAME_PATH=prefixavendormodeliinstance - ID_NET_NAME_PATH=prefixiaddressnport_name - ID_NET_NAME_PATH=prefixuport… - ID_NET_NAME_PATH=prefix[Pdomain]pbussslot[ffunction][nphys_port_name|ddev_port] - ID_NET_NAME_PATH=prefix[Pdomain]pbussslot[ffunction][nphys_port_name|ddev_port]bnumber - ID_NET_NAME_PATH=prefix[Pdomain]pbussslot[ffunction][nphys_port_name|ddev_port]uport…[cconfig][iinterface] + ID_NET_NAME_PATH=prefixcbus_id + ID_NET_NAME_PATH=prefixavendormodeliinstance + ID_NET_NAME_PATH=prefixiaddressnport_name + ID_NET_NAME_PATH=prefixuport… + ID_NET_NAME_PATH=prefix[Pdomain]pbussslot[ffunction][nphys_port_name|ddev_port] + ID_NET_NAME_PATH=prefix[Pdomain]pbussslot[ffunction][nphys_port_name|ddev_port]bnumber + ID_NET_NAME_PATH=prefix[Pdomain]pbussslot[ffunction][nphys_port_name|ddev_port]uport…[cconfig][iinterface] 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 @@ -542,7 +542,7 @@ - ID_NET_NAME_ALLOW=BOOL + ID_NET_NAME_ALLOW=BOOL This udev property sets a fallback policy for reading a sysfs attribute. If set to 0 udev will not read any sysfs attribute by default, unless it is diff --git a/man/systemd.resource-control.xml b/man/systemd.resource-control.xml index fee4971a97..a86907b2bb 100644 --- a/man/systemd.resource-control.xml +++ b/man/systemd.resource-control.xml @@ -151,10 +151,13 @@ CPUWeight=20 DisableControllers=cpu / \ applies to all user slices. - See the New - Control Group Interfaces for an introduction on how to make - use of resource control APIs from programs. + + + <para>See the <ulink + 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> @@ -1669,7 +1672,7 @@ DeviceAllow=/dev/loop-control <member><citerefentry><refentrytitle>systemd.special</refentrytitle><manvolnum>7</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><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> </refsect1> </refentry> diff --git a/man/udevadm.xml b/man/udevadm.xml index 34f7f5c387..b254a7f249 100644 --- a/man/udevadm.xml +++ b/man/udevadm.xml @@ -83,8 +83,8 @@ </variablelist> <refsect2><title>udevadm info - <arg choice="opt"><replaceable>options</replaceable></arg> - <arg choice="opt" rep="repeat"><replaceable>devpath</replaceable>|<replaceable>file</replaceable>|<replaceable>unit</replaceable></arg> + <optional><replaceable>options</replaceable></optional> + <optional><replaceable>devpath</replaceable>|<replaceable>file</replaceable>|<replaceable>unit</replaceable></optional> Query the udev database for device information. @@ -382,8 +382,8 @@ udevadm trigger - <arg choice="opt"><replaceable>options</replaceable></arg> - <arg choice="opt"><replaceable>devpath</replaceable>|<replaceable>file</replaceable>|<replaceable>unit</replaceable></arg> + <optional><replaceable>options</replaceable></optional> + <optional><replaceable>devpath</replaceable>|<replaceable>file</replaceable>|<replaceable>unit</replaceable></optional> Request device events from the kernel. Primarily used to replay events at system coldplug time. @@ -609,7 +609,7 @@ udevadm settle - <arg choice="opt"><replaceable>options</replaceable></arg> + <optional><replaceable>options</replaceable></optional> Watches the udev event queue, and exits if all current events are handled. @@ -732,7 +732,7 @@ udevadm monitor - <arg choice="opt"><replaceable>options</replaceable></arg> + <optional><replaceable>options</replaceable></optional> 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 @@ -784,8 +784,8 @@ udevadm test - <arg choice="opt"><replaceable>options</replaceable></arg> - <arg choice="opt"><replaceable>devpath</replaceable>|<replaceable>file</replaceable>|<replaceable>unit</replaceable></arg> + <optional><replaceable>options</replaceable></optional> + <optional><replaceable>devpath</replaceable>|<replaceable>file</replaceable>|<replaceable>unit</replaceable></optional> Simulate a udev event run for the given device, and print debug output. @@ -821,9 +821,9 @@ udevadm test-builtin - <arg choice="opt"><replaceable>options</replaceable></arg> - <arg><replaceable>command</replaceable></arg> - <arg choice="opt"><replaceable>devpath</replaceable>|<replaceable>file</replaceable>|<replaceable>unit</replaceable></arg> + <optional><replaceable>options</replaceable></optional> + <replaceable>command</replaceable> + <optional><replaceable>devpath</replaceable>|<replaceable>file</replaceable>|<replaceable>unit</replaceable></optional> Run a built-in command COMMAND for device DEVPATH, and print debug @@ -850,8 +850,8 @@ udevadm verify - <arg choice="opt"><replaceable>options</replaceable></arg> - <arg choice="opt" rep="repeat"><replaceable>file</replaceable></arg> + <optional><replaceable>options</replaceable></optional> + <optional><replaceable>file</replaceable></optional> … @@ -915,8 +915,8 @@ udevadm wait - <arg choice="opt"><replaceable>options</replaceable></arg> - <arg choice="opt"><replaceable>device|syspath</replaceable></arg> + <optional><replaceable>options</replaceable></optional> + <optional><replaceable>device|syspath</replaceable></optional> … @@ -979,8 +979,8 @@ udevadm lock - <arg choice="opt"><replaceable>options</replaceable></arg> - <arg choice="opt"><replaceable>command</replaceable></arg> + <optional><replaceable>options</replaceable></optional> + <optional><replaceable>command</replaceable></optional> … diff --git a/man/ukify.xml b/man/ukify.xml index 4d712d2d7c..f991ee3c06 100644 --- a/man/ukify.xml +++ b/man/ukify.xml @@ -203,7 +203,7 @@ - + For all verbs except inspect, the first syntax is used. Specify an arbitrary additional section NAME. diff --git a/man/user@.service.xml b/man/user@.service.xml index bdc2aa22f1..6d0eaa4e04 100644 --- a/man/user@.service.xml +++ b/man/user@.service.xml @@ -3,7 +3,7 @@ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> - + user@.service systemd diff --git a/tools/make-man-index.py b/tools/make-man-index.py index 579dd405c2..b4b262b508 100755 --- a/tools/make-man-index.py +++ b/tools/make-man-index.py @@ -46,7 +46,7 @@ This index contains {count} entries, referring to {pages} individual manual page def check_id(page, t): 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}'") def make_index(pages):