summaryrefslogtreecommitdiff
path: root/man/systemd.preset.xml
diff options
context:
space:
mode:
Diffstat (limited to 'man/systemd.preset.xml')
-rw-r--r--man/systemd.preset.xml27
1 files changed, 13 insertions, 14 deletions
diff --git a/man/systemd.preset.xml b/man/systemd.preset.xml
index a692053876..16db8cd85b 100644
--- a/man/systemd.preset.xml
+++ b/man/systemd.preset.xml
@@ -86,7 +86,7 @@
<para>If no preset files exist, <command>systemctl
preset</command> will enable all units that are
installed by default. If this is not desired and all
- units shall rather be disabled it is necessary to ship
+ units shall rather be disabled, it is necessary to ship
a preset file with a single, catchall
"<filename>disable *</filename>" line. (See example 1,
below.)</para>
@@ -109,7 +109,7 @@
by default, <literal>disable</literal> to disable
units by default.</para>
- <para>If multiple lines apply to a unit name the
+ <para>If multiple lines apply to a unit name, the
first matching one takes precedence over all
others.</para>
@@ -125,20 +125,19 @@
<filename>/etc/</filename> are reserved for the local
administrator, who may use this logic to override the
preset files installed by vendor packages. All preset
- files are sorted by their filename in alphabetical
+ files are sorted by their filename in lexicographic
order, regardless in which of the directories they
- reside, to guarantee that a specific preset file takes
- precedence over another file with an alphabetically
- earlier name, if both files contain lines that apply
- to the same unit names. It is recommended to prefix
- all file names with two-digit number, to simplify
- ordering.</para>
+ reside. If multiple files specify the same unit name,
+ the entry in the file with the lexicographically earliest
+ name will be applied. It is recommended to prefix all
+ filenames with a two-digit number and a dash, to simplify
+ the ordering of the files.</para>
<para>If the administrator wants to disable a preset
- file supplied by the vendor the recommended way is to
+ file supplied by the vendor, the recommended way is to
place a symlink to <filename>/dev/null</filename> in
<filename>/etc/systemd/system-preset/</filename>
- bearing the same file name.</para>
+ bearing the same filename.</para>
</refsect1>
<refsect1>
@@ -150,8 +149,8 @@
<programlisting>disable *</programlisting>
</example>
- <para>This disables all units. Due to the file name
- prefix <literal>99-</literal> it will be read last and
+ <para>This disables all units. Due to the filename
+ prefix <literal>99-</literal>, it will be read last and
hence can easily be overridden by spin or
administrator preset policy or suchlike.</para>
@@ -187,7 +186,7 @@ disable *</programlisting>
<para>This enables three specific services and
disables all others. This is useful for administrators
to specifically select the units to enable, and
- disable all others. Due to the file name prefix
+ disable all others. Due to the filename prefix
<literal>00-</literal> it will be read early and hence
overrides all other preset policy files.</para>
</refsect1>