diff options
author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2018-04-16 18:00:33 +0200 |
---|---|---|
committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2018-04-18 10:04:10 +0200 |
commit | aed5cb03db916de7e685eaf59975c41326e4f778 (patch) | |
tree | ed10cb137f09a405888c0ed23e81cd8bb54f9d58 /man/systemd.slice.xml | |
parent | 75695fb798ef34e5b1bd4a8b892f861b5d88601d (diff) | |
download | systemd-aed5cb03db916de7e685eaf59975c41326e4f778.tar.gz |
man: merge two sections into two subsections of one section
Those are very close subjects that are a good fit for one section.
Diffstat (limited to 'man/systemd.slice.xml')
-rw-r--r-- | man/systemd.slice.xml | 40 |
1 files changed, 22 insertions, 18 deletions
diff --git a/man/systemd.slice.xml b/man/systemd.slice.xml index af95455916..4e87f98c9f 100644 --- a/man/systemd.slice.xml +++ b/man/systemd.slice.xml @@ -85,29 +85,33 @@ </refsect1> <refsect1> - <title>Implicit Dependencies</title> + <title>Automatic Dependencies</title> - <para>The following dependencies are implicitly added:</para> + <refsect2> + <title>Implicit Dependencies</title> - <itemizedlist> - <listitem><para>Slice units automatically gain dependencies of type - <varname>After=</varname> and <varname>Requires=</varname> on - their immediate parent slice unit.</para></listitem> - </itemizedlist> - </refsect1> + <para>The following dependencies are implicitly added:</para> - <refsect1> - <title>Default Dependencies</title> + <itemizedlist> + <listitem><para>Slice units automatically gain dependencies of type + <varname>After=</varname> and <varname>Requires=</varname> on + their immediate parent slice unit.</para></listitem> + </itemizedlist> + </refsect2> + + <refsect2> + <title>Default Dependencies</title> - <para>The following dependencies are added unless <varname>DefaultDependencies=no</varname> is set:</para> + <para>The following dependencies are added unless <varname>DefaultDependencies=no</varname> is set:</para> - <itemizedlist> - <listitem><para>Slice units will automatically have dependencies of type <varname>Conflicts=</varname> and - <varname>Before=</varname> on - <filename>shutdown.target</filename>. These ensure that slice units are removed prior to system shutdown. - Only slice units involved with late system shutdown should disable - <varname>DefaultDependencies=</varname> option.</para></listitem> - </itemizedlist> + <itemizedlist> + <listitem><para>Slice units will automatically have dependencies of type <varname>Conflicts=</varname> and + <varname>Before=</varname> on + <filename>shutdown.target</filename>. These ensure that slice units are removed prior to system shutdown. + Only slice units involved with late system shutdown should disable + <varname>DefaultDependencies=</varname> option.</para></listitem> + </itemizedlist> + </refsect2> </refsect1> <refsect1> |