From ee1c0ad436efef9d2688a48917bf77d65a0ce675 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 27 Jun 2012 01:06:35 +0200 Subject: [PATCH 1/1] man: properly document .socket units in man page --- Makefile.am | 6 ++++++ man/systemd-initctl.service.xml | 2 ++ man/systemd-journald.service.xml | 2 ++ man/systemd-shutdownd.service.xml | 2 ++ man/systemd-udevd.service.xml | 8 ++++++-- units/systemd-initctl.socket | 1 + units/systemd-journald.socket | 2 +- units/systemd-shutdownd.service.in | 2 +- units/systemd-shutdownd.socket | 1 + units/systemd-udev-control.socket | 2 +- units/systemd-udev-kernel.socket | 2 +- units/systemd-udev.service.in | 2 +- 12 files changed, 25 insertions(+), 7 deletions(-) diff --git a/Makefile.am b/Makefile.am index fc08daa53..3732258e6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -502,11 +502,14 @@ MANPAGES_ALIAS = \ man/init.1 \ man/systemd-modules-load.8 \ man/systemd-sysctl.8 \ + man/systemd-journald.socket.8 \ man/systemd-journald.8 \ man/systemd-remount-fs.8 \ man/systemd-update-utmp-shutdown.service.8 \ man/systemd-update-utmp.8 \ + man/systemd-initctl.socket.8 \ man/systemd-initctl.8 \ + man/systemd-shutdownd.socket.8 \ man/systemd-shutdownd.8 \ man/systemd-hibernate.service.8 \ man/systemd-sleep.8 \ @@ -521,11 +524,14 @@ man/poweroff.8: man/halt.8 man/init.1: man/systemd.1 man/systemd-modules-load.8: man/systemd-modules-load.service.8 man/systemd-sysctl.8: man/systemd-sysctl.service.8 +man/systemd-journald.socket.8: man/systemd-journald.service.8 man/systemd-journald.8: man/systemd-journald.service.8 man/systemd-remount-fs.8: man/systemd-remount-fs.service.8 man/systemd-update-utmp-shutdown.service.8: man/systemd-update-utmp-runlevel.service.8 man/systemd-update-utmp.8: man/systemd-update-utmp-runlevel.service.8 +man/systemd-initctl.socket.8: man/systemd-initctl.service.8 man/systemd-initctl.8: man/systemd-initctl.service.8 +man/systemd-shutdownd.socket.8: man/systemd-shutdownd.service.8 man/systemd-shutdownd.8: man/systemd-shutdownd.service.8 man/systemd-hibernate.service.8: man/systemd-suspend.service.8 man/systemd-sleep.8: man/systemd-suspend.service.8 diff --git a/man/systemd-initctl.service.xml b/man/systemd-initctl.service.xml index 92d91fcb4..d3b537d91 100644 --- a/man/systemd-initctl.service.xml +++ b/man/systemd-initctl.service.xml @@ -44,12 +44,14 @@ systemd-initctl.service + systemd-initctl.socket systemd-initctl systemd /dev/initctl Compatibility systemd-initctl.service + systemd-initctl.socket /usr/lib/systemd/systemd-initctl diff --git a/man/systemd-journald.service.xml b/man/systemd-journald.service.xml index 65f6e5260..83c59d463 100644 --- a/man/systemd-journald.service.xml +++ b/man/systemd-journald.service.xml @@ -44,12 +44,14 @@ systemd-journald.service + systemd-journald.socket systemd-journald systemd Journal Service systemd-journald.service + systemd-journald.socket /usr/lib/systemd/systemd-journald diff --git a/man/systemd-shutdownd.service.xml b/man/systemd-shutdownd.service.xml index 146495a0b..c4ace482a 100644 --- a/man/systemd-shutdownd.service.xml +++ b/man/systemd-shutdownd.service.xml @@ -44,12 +44,14 @@ systemd-shutdownd.service + systemd-shutdownd.socket systemd-shutdownd systemd scheduled shutdown daemon systemd-shutdownd.service + systemd-shutdownd.socket /usr/lib/systemd/systemd-shutdownd diff --git a/man/systemd-udevd.service.xml b/man/systemd-udevd.service.xml index 0c76d059f..c290b2fda 100644 --- a/man/systemd-udevd.service.xml +++ b/man/systemd-udevd.service.xml @@ -24,13 +24,17 @@ - systemd-udevd.service + systemd-udev.service + systemd-udev-control.socket + systemd-udev-kernel.socket systemd-udevd Device event managing daemon - systemd-udevd.service + systemd-udev.service + systemd-udev-control.socket + systemd-udev-kernel.socket /usr/lib/systemd/systemd-udevd diff --git a/units/systemd-initctl.socket b/units/systemd-initctl.socket index abafc525d..b98d5ca6e 100644 --- a/units/systemd-initctl.socket +++ b/units/systemd-initctl.socket @@ -7,6 +7,7 @@ [Unit] Description=/dev/initctl Compatibility Named Pipe +Documentation=man:systemd-initctl.service(8) DefaultDependencies=no Before=sockets.target diff --git a/units/systemd-journald.socket b/units/systemd-journald.socket index 0454e3e34..dbe8882c0 100644 --- a/units/systemd-journald.socket +++ b/units/systemd-journald.socket @@ -7,7 +7,7 @@ [Unit] Description=Journal Socket -Documentation=man:journald.conf(5) +Documentation=man:systemd-journald.service(8) man:journald.conf(5) DefaultDependencies=no Before=sockets.target syslog.target diff --git a/units/systemd-shutdownd.service.in b/units/systemd-shutdownd.service.in index f51417f58..d95174250 100644 --- a/units/systemd-shutdownd.service.in +++ b/units/systemd-shutdownd.service.in @@ -7,7 +7,7 @@ [Unit] Description=Delayed Shutdown Service -Documentation=man:systemd-shutdown.service(8) +Documentation=man:systemd-shutdownd.service(8) DefaultDependencies=no [Service] diff --git a/units/systemd-shutdownd.socket b/units/systemd-shutdownd.socket index ed6225a09..9421ce8ad 100644 --- a/units/systemd-shutdownd.socket +++ b/units/systemd-shutdownd.socket @@ -7,6 +7,7 @@ [Unit] Description=Delayed Shutdown Socket +Documentation=man:systemd-shutdownd.service(8) DefaultDependencies=no Before=sockets.target diff --git a/units/systemd-udev-control.socket b/units/systemd-udev-control.socket index e835ab6f4..e7678a049 100644 --- a/units/systemd-udev-control.socket +++ b/units/systemd-udev-control.socket @@ -7,7 +7,7 @@ [Unit] Description=udev Control Socket -Documentation=man:udev(7) man:systemd-udevd.service(8) +Documentation=man:systemd-udevd.service(8) man:udev(7) DefaultDependencies=no ConditionCapability=CAP_MKNOD diff --git a/units/systemd-udev-kernel.socket b/units/systemd-udev-kernel.socket index 321dd467f..588f9f5e4 100644 --- a/units/systemd-udev-kernel.socket +++ b/units/systemd-udev-kernel.socket @@ -7,7 +7,7 @@ [Unit] Description=udev Kernel Socket -Documentation=man:udev(7) man:systemd-udevd.service(8) +Documentation=man:systemd-udevd.service(8) man:udev(7) DefaultDependencies=no ConditionCapability=CAP_MKNOD diff --git a/units/systemd-udev.service.in b/units/systemd-udev.service.in index f02c602b7..b44487053 100644 --- a/units/systemd-udev.service.in +++ b/units/systemd-udev.service.in @@ -7,7 +7,7 @@ [Unit] Description=udev Kernel Device Manager -Documentation=man:udev(7) man:systemd-udevd.service(8) +Documentation=man:systemd-udevd.service(8) man:udev(7) Wants=systemd-udev-control.socket systemd-udev-kernel.socket After=systemd-udev-control.socket systemd-udev-kernel.socket Before=basic.target -- 2.30.2