From da25e02913586beff35f19c11311b58463f25ebc Mon Sep 17 00:00:00 2001 From: Zbigniew Jędrzejewski-Szmek Date: Wed, 10 Feb 2016 19:49:40 -0500 Subject: man: follow up fixes for #2575 --- man/systemctl.xml | 19 +++++++------------ man/systemd.unit.xml | 18 +++++++++--------- 2 files changed, 16 insertions(+), 21 deletions(-) diff --git a/man/systemctl.xml b/man/systemctl.xml index 50eb939313..1480bf8380 100644 --- a/man/systemctl.xml +++ b/man/systemctl.xml @@ -1698,24 +1698,19 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service Parameter Syntax - Unit commands listed above take either a single unit name - (designated as NAME), or multiple - unit specifications (designated as - PATTERN...). In the first case, the - unit name with or without a suffix must be given. If the suffix - is not specified ("abbreviated"), systemctl will append a suitable suffix, - .service by default, and a type-specific - suffix in case of commands which operate only on specific unit - types. For example, + Unit commands listed above take either a single unit name (designated as NAME), + or multiple unit specifications (designated as PATTERN...). In the first case, the + unit name with or without a suffix must be given. If the suffix is not specified (unit name is "abbreviated"), + systemctl will append a suitable suffix, .service by default, and a type-specific suffix in + case of commands which operate only on specific unit types. For example, # systemctl start sshd and # systemctl start sshd.service are equivalent, as are # systemctl isolate default and # systemctl isolate default.target - Note that (absolute) paths to device nodes are automatically - converted to device unit names, and other (absolute) paths to - mount unit names. + Note that (absolute) paths to device nodes are automatically converted to device unit names, and other (absolute) + paths to mount unit names. # systemctl status /dev/sda # systemctl status /home are equivalent to: diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml index 16aded89d1..5794681963 100644 --- a/man/systemd.unit.xml +++ b/man/systemd.unit.xml @@ -180,12 +180,12 @@ Along with a unit file foo.service, a "drop-in" directory foo.service.d/ may exist. All files with the suffix .conf from this - directory will be parsed after the file itself is parsed. This is useful to alter or add configuration settings to - a unit, without having to modify their unit files. Make sure that the file that is included has the appropriate - section headers before any directive. Note that for instanced units, this logic will first look for the instance - .d/ subdirectory and read its .conf files, followed by the template - .d/ subdirectory and reads its .conf files. Also note that settings from the - [Install] section are not available in drop-in unit files, and have no effect. + directory will be parsed after the file itself is parsed. This is useful to alter or add configuration settings for + a unit, without having to modify unit files. Each drop-in file must have appropriate section headers. Note that for + instantiated units, this logic will first look for the instance .d/ subdirectory and read its + .conf files, followed by the template .d/ subdirectory and the + .conf files there. Also note that settings from the [Install] section are not + honoured in drop-in unit files, and have no effect. In addition to /etc/systemd/system, the drop-in .conf files for system services @@ -1067,9 +1067,9 @@ Similar to the ConditionArchitecture=, ConditionVirtualization=, …, condition settings described above, these settings add assertion checks to the start-up of the unit. However, unlike the conditions settings, any assertion setting - that is not met results in failure of the start job it was triggered by (which means this is logged about - loudly). Use assertion expressions for units that cannot operate when specific requirements are not met, and - where this is something the administrator or user should look into. + that is not met results in failure of the start job (which means this is logged loudly). Use assertion + expressions for units that cannot operate when specific requirements are not met, and when this is something + the administrator or user should look into. -- cgit v1.2.3-54-g00ecf