From b79f817b1bec4f7e39a1ed8b9d42a0c191c22ef5 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 22 Jun 2012 10:38:40 +0200 Subject: [PATCH] man: refer to udevd by its service name not binary name Since the binary name is now hidden away in /usr/lib/ the primary user handle for the udev service is the unit name, hence change the man page to be available under the unit name, and make the binary name an alias for it. --- Makefile.am | 3 +++ man/{systemd-udevd.xml => systemd-udevd.service.xml} | 9 +++++++-- man/udev.xml | 4 ++-- man/udevadm.xml | 2 +- units/systemd-udev-control.socket | 3 +-- units/systemd-udev-kernel.socket | 3 +-- units/systemd-udev-settle.service.in | 3 +-- units/systemd-udev-trigger.service.in | 3 +-- units/systemd-udev.service.in | 3 +-- 9 files changed, 18 insertions(+), 15 deletions(-) rename man/{systemd-udevd.xml => systemd-udevd.service.xml} (95%) diff --git a/Makefile.am b/Makefile.am index 69a842b77c..e1e02b7286 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1424,6 +1424,9 @@ libudev_private_la_LIBADD = \ MANPAGES += \ man/udev.7 \ man/udevadm.8 \ + man/systemd-udevd.service.8 + +MANPAGES_ALIAS += \ man/systemd-udevd.8 udev-confdirs: diff --git a/man/systemd-udevd.xml b/man/systemd-udevd.service.xml similarity index 95% rename from man/systemd-udevd.xml rename to man/systemd-udevd.service.xml index 79f917e5ff..09b4744239 100644 --- a/man/systemd-udevd.xml +++ b/man/systemd-udevd.service.xml @@ -24,12 +24,16 @@ - systemd-udevdevent managing daemon + systemd-udevd.service + systemd-udevd + Device event managing daemon + systemd-logind.service + - systemd-udevd + /usr/lib/systemd/systemd-udevd @@ -38,6 +42,7 @@ + Description diff --git a/man/udev.xml b/man/udev.xml index bd0dec6a6a..b5c7cd4be4 100644 --- a/man/udev.xml +++ b/man/udev.xml @@ -41,7 +41,7 @@ names provide a way to reliably identify devices based on their properties or current configuration. - The udev daemon, systemd-udevd + The udev daemon, systemd-udevd.service 8, receives device uevents directly from the kernel whenever a device is added or removed from the system, or it changes its state. When udev receives a device event, it matches its configured set of rules @@ -691,7 +691,7 @@ See Also - systemd-udevd8 + systemd-udevd.service8 , udevadm8 diff --git a/man/udevadm.xml b/man/udevadm.xml index d0cd9220fc..b46a5f5915 100644 --- a/man/udevadm.xml +++ b/man/udevadm.xml @@ -463,7 +463,7 @@ udev7 - systemd-udevd8 + systemd-udevd.service8 diff --git a/units/systemd-udev-control.socket b/units/systemd-udev-control.socket index 5b25e06708..e835ab6f4c 100644 --- a/units/systemd-udev-control.socket +++ b/units/systemd-udev-control.socket @@ -7,8 +7,7 @@ [Unit] Description=udev Control Socket -Documentation=man:udev(7) -Documentation=man:systemd-udevd(8) +Documentation=man:udev(7) man:systemd-udevd.service(8) DefaultDependencies=no ConditionCapability=CAP_MKNOD diff --git a/units/systemd-udev-kernel.socket b/units/systemd-udev-kernel.socket index 68c23a662f..321dd467fa 100644 --- a/units/systemd-udev-kernel.socket +++ b/units/systemd-udev-kernel.socket @@ -7,8 +7,7 @@ [Unit] Description=udev Kernel Socket -Documentation=man:udev(7) -Documentation=man:systemd-udevd(8) +Documentation=man:udev(7) man:systemd-udevd.service(8) DefaultDependencies=no ConditionCapability=CAP_MKNOD diff --git a/units/systemd-udev-settle.service.in b/units/systemd-udev-settle.service.in index 2c4c129bab..004b316180 100644 --- a/units/systemd-udev-settle.service.in +++ b/units/systemd-udev-settle.service.in @@ -17,8 +17,7 @@ [Unit] Description=udev Wait for Complete Device Initialization -Documentation=man:udev(7) -Documentation=man:systemd-udevd(8) +Documentation=man:udev(7) man:systemd-udevd.service(8) DefaultDependencies=no Wants=systemd-udev.service After=systemd-udev-trigger.service diff --git a/units/systemd-udev-trigger.service.in b/units/systemd-udev-trigger.service.in index 2f34d53aae..9d3f43e673 100644 --- a/units/systemd-udev-trigger.service.in +++ b/units/systemd-udev-trigger.service.in @@ -7,8 +7,7 @@ [Unit] Description=udev Coldplug all Devices -Documentation=man:udev(7) -Documentation=man:systemd-udevd(8) +Documentation=man:udev(7) man:systemd-udevd.service(8) Wants=systemd-udev.service After=systemd-udev-kernel.socket systemd-udev-control.socket DefaultDependencies=no diff --git a/units/systemd-udev.service.in b/units/systemd-udev.service.in index a78dc8b606..f02c602b78 100644 --- a/units/systemd-udev.service.in +++ b/units/systemd-udev.service.in @@ -7,8 +7,7 @@ [Unit] Description=udev Kernel Device Manager -Documentation=man:udev(7) -Documentation=man:systemd-udevd(8) +Documentation=man:udev(7) man:systemd-udevd.service(8) Wants=systemd-udev-control.socket systemd-udev-kernel.socket After=systemd-udev-control.socket systemd-udev-kernel.socket Before=basic.target