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/systemd.unit.xml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'man/systemd.unit.xml') 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