From 0b8c296416c0c02d7fd613d08944e4f8944b8f0f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 29 Jun 2021 09:47:53 +0200 Subject: [PATCH] units: adjust Descriptions of various units In general, it's not very usuful to repeat the unit name as the description. Especially when the word is a common name and if somebody doesn't understand the meaning immediately, they are not going to gain anything from the repeat either, e.g. "halt", "swap". In the status-unit-format=combined output parentheses are used around Description, so avoid using parenthesis in the Description itself. (cherry picked from commit 4fd3fc66396026f81fd5b27746f2faf8a9a7b9ee) --- units/bluetooth.target | 2 +- units/final.target | 2 +- units/getty-pre.target | 2 +- units/halt.target | 2 +- units/hibernate.target | 2 +- units/local-fs-pre.target | 2 +- units/network-pre.target | 2 +- units/paths.target | 2 +- units/poweroff.target | 2 +- units/printer.target | 2 +- units/reboot.target | 2 +- units/remote-fs-pre.target | 2 +- units/shutdown.target | 2 +- units/slices.target | 2 +- units/sockets.target | 2 +- units/swap.target | 2 +- units/systemd-halt.service | 2 +- units/systemd-networkd.service.in | 2 +- units/systemd-poweroff.service | 2 +- units/systemd-reboot.service | 2 +- units/systemd-suspend.service.in | 2 +- units/timers.target | 2 +- units/tmp.mount | 2 +- 23 files changed, 23 insertions(+), 23 deletions(-) diff --git a/units/bluetooth.target b/units/bluetooth.target index 8333c2332f..ab23c850c6 100644 --- a/units/bluetooth.target +++ b/units/bluetooth.target @@ -8,6 +8,6 @@ # (at your option) any later version. [Unit] -Description=Bluetooth +Description=Bluetooth Support Documentation=man:systemd.special(7) StopWhenUnneeded=yes diff --git a/units/final.target b/units/final.target index 34f6069dd1..4c86ca7935 100644 --- a/units/final.target +++ b/units/final.target @@ -8,7 +8,7 @@ # (at your option) any later version. [Unit] -Description=Final Step +Description=Late Boot Services Documentation=man:systemd.special(7) DefaultDependencies=no RefuseManualStart=yes diff --git a/units/getty-pre.target b/units/getty-pre.target index 5cf0875fae..663011de1d 100644 --- a/units/getty-pre.target +++ b/units/getty-pre.target @@ -8,6 +8,6 @@ # (at your option) any later version. [Unit] -Description=Login Prompts (Pre) +Description=Preparation for Logins Documentation=man:systemd.special(7) man:systemd-getty-generator(8) Documentation=http://0pointer.de/blog/projects/serial-console.html diff --git a/units/halt.target b/units/halt.target index b06758bf95..bfa5f23e1d 100644 --- a/units/halt.target +++ b/units/halt.target @@ -8,7 +8,7 @@ # (at your option) any later version. [Unit] -Description=Halt +Description=System Halt Documentation=man:systemd.special(7) DefaultDependencies=no Requires=systemd-halt.service diff --git a/units/hibernate.target b/units/hibernate.target index 9ec6f2a6b1..838c5a3e9b 100644 --- a/units/hibernate.target +++ b/units/hibernate.target @@ -8,7 +8,7 @@ # (at your option) any later version. [Unit] -Description=Hibernate +Description=System Hibernation Documentation=man:systemd.special(7) DefaultDependencies=no Requires=systemd-hibernate.service diff --git a/units/local-fs-pre.target b/units/local-fs-pre.target index bffa7e95dd..8e0f4b8ffb 100644 --- a/units/local-fs-pre.target +++ b/units/local-fs-pre.target @@ -8,6 +8,6 @@ # (at your option) any later version. [Unit] -Description=Local File Systems (Pre) +Description=Preparation for Local File Systems Documentation=man:systemd.special(7) RefuseManualStart=yes diff --git a/units/network-pre.target b/units/network-pre.target index 70279dacdb..f92449b50b 100644 --- a/units/network-pre.target +++ b/units/network-pre.target @@ -8,7 +8,7 @@ # (at your option) any later version. [Unit] -Description=Network (Pre) +Description=Preparation for Network Documentation=man:systemd.special(7) Documentation=https://www.freedesktop.org/wiki/Software/systemd/NetworkTarget RefuseManualStart=yes diff --git a/units/paths.target b/units/paths.target index 1bec148bee..fb8dc64320 100644 --- a/units/paths.target +++ b/units/paths.target @@ -8,5 +8,5 @@ # (at your option) any later version. [Unit] -Description=Paths +Description=Path Units Documentation=man:systemd.special(7) diff --git a/units/poweroff.target b/units/poweroff.target index e97f058fdc..c17c123dfe 100644 --- a/units/poweroff.target +++ b/units/poweroff.target @@ -8,7 +8,7 @@ # (at your option) any later version. [Unit] -Description=Power-Off +Description=System Power Off Documentation=man:systemd.special(7) DefaultDependencies=no Requires=systemd-poweroff.service diff --git a/units/printer.target b/units/printer.target index c695669c5c..043bfbd61e 100644 --- a/units/printer.target +++ b/units/printer.target @@ -8,6 +8,6 @@ # (at your option) any later version. [Unit] -Description=Printer +Description=Printer Support Documentation=man:systemd.special(7) StopWhenUnneeded=yes diff --git a/units/reboot.target b/units/reboot.target index a900c90dcf..5ad941935e 100644 --- a/units/reboot.target +++ b/units/reboot.target @@ -8,7 +8,7 @@ # (at your option) any later version. [Unit] -Description=Reboot +Description=System Reboot Documentation=man:systemd.special(7) DefaultDependencies=no Requires=systemd-reboot.service diff --git a/units/remote-fs-pre.target b/units/remote-fs-pre.target index bba5e0ce7c..1ede280eff 100644 --- a/units/remote-fs-pre.target +++ b/units/remote-fs-pre.target @@ -8,6 +8,6 @@ # (at your option) any later version. [Unit] -Description=Remote File Systems (Pre) +Description=Preparation for Remote File Systems Documentation=man:systemd.special(7) RefuseManualStart=yes diff --git a/units/shutdown.target b/units/shutdown.target index 582ae6ba27..8b3c0b6989 100644 --- a/units/shutdown.target +++ b/units/shutdown.target @@ -8,7 +8,7 @@ # (at your option) any later version. [Unit] -Description=Shutdown +Description=System Shutdown Documentation=man:systemd.special(7) DefaultDependencies=no RefuseManualStart=yes diff --git a/units/slices.target b/units/slices.target index 4517e35fc5..72701bd2a8 100644 --- a/units/slices.target +++ b/units/slices.target @@ -8,7 +8,7 @@ # (at your option) any later version. [Unit] -Description=Slices +Description=Slice Units Documentation=man:systemd.special(7) Wants=-.slice system.slice After=-.slice system.slice diff --git a/units/sockets.target b/units/sockets.target index c6e20d7760..e53d1ebb7d 100644 --- a/units/sockets.target +++ b/units/sockets.target @@ -8,5 +8,5 @@ # (at your option) any later version. [Unit] -Description=Sockets +Description=Socket Units Documentation=man:systemd.special(7) diff --git a/units/swap.target b/units/swap.target index bcdd98815b..1f2160765a 100644 --- a/units/swap.target +++ b/units/swap.target @@ -8,5 +8,5 @@ # (at your option) any later version. [Unit] -Description=Swap +Description=Swaps Documentation=man:systemd.special(7) diff --git a/units/systemd-halt.service b/units/systemd-halt.service index 37bfe285c0..3ce976f539 100644 --- a/units/systemd-halt.service +++ b/units/systemd-halt.service @@ -8,7 +8,7 @@ # (at your option) any later version. [Unit] -Description=Halt +Description=System Halt Documentation=man:systemd-halt.service(8) DefaultDependencies=no Requires=shutdown.target umount.target final.target diff --git a/units/systemd-networkd.service.in b/units/systemd-networkd.service.in index d5b0a9b96e..c8e98b0d43 100644 --- a/units/systemd-networkd.service.in +++ b/units/systemd-networkd.service.in @@ -8,7 +8,7 @@ # (at your option) any later version. [Unit] -Description=Network Service +Description=Network Configuration Documentation=man:systemd-networkd.service(8) ConditionCapability=CAP_NET_ADMIN DefaultDependencies=no diff --git a/units/systemd-poweroff.service b/units/systemd-poweroff.service index bb2ddb0e73..bfdc213108 100644 --- a/units/systemd-poweroff.service +++ b/units/systemd-poweroff.service @@ -8,7 +8,7 @@ # (at your option) any later version. [Unit] -Description=Power-Off +Description=System Power Off Documentation=man:systemd-halt.service(8) DefaultDependencies=no Requires=shutdown.target umount.target final.target diff --git a/units/systemd-reboot.service b/units/systemd-reboot.service index b50a792b0e..562b1bff90 100644 --- a/units/systemd-reboot.service +++ b/units/systemd-reboot.service @@ -8,7 +8,7 @@ # (at your option) any later version. [Unit] -Description=Reboot +Description=System Reboot Documentation=man:systemd-halt.service(8) DefaultDependencies=no Requires=shutdown.target umount.target final.target diff --git a/units/systemd-suspend.service.in b/units/systemd-suspend.service.in index 40cc83e192..0df9ee734f 100644 --- a/units/systemd-suspend.service.in +++ b/units/systemd-suspend.service.in @@ -8,7 +8,7 @@ # (at your option) any later version. [Unit] -Description=Suspend +Description=System Suspend Documentation=man:systemd-suspend.service(8) DefaultDependencies=no Requires=sleep.target diff --git a/units/timers.target b/units/timers.target index 99f82e3b80..2e626be753 100644 --- a/units/timers.target +++ b/units/timers.target @@ -8,7 +8,7 @@ # (at your option) any later version. [Unit] -Description=Timers +Description=Timer Units Documentation=man:systemd.special(7) DefaultDependencies=no diff --git a/units/tmp.mount b/units/tmp.mount index a8e5851632..516bd1621c 100644 --- a/units/tmp.mount +++ b/units/tmp.mount @@ -8,7 +8,7 @@ # (at your option) any later version. [Unit] -Description=Temporary Directory (/tmp) +Description=Temporary Directory /tmp Documentation=https://systemd.io/TEMPORARY_DIRECTORIES Documentation=man:file-hierarchy(7) Documentation=https://www.freedesktop.org/wiki/Software/systemd/APIFileSystems -- 2.25.1