man: merge two sections into two subsections of one section

Those are very close subjects that are a good fit for one section.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2018-04-18 10:04:10 +02:00
parent 75695fb798
commit aed5cb03db
12 changed files with 343 additions and 294 deletions
+6 -2
View File
@@ -76,6 +76,9 @@
</refsect1> </refsect1>
<refsect1> <refsect1>
<title>Automatic Dependencies</title>
<refsect2>
<title>Implicit Dependencies</title> <title>Implicit Dependencies</title>
<para>The following dependencies are implicitly added:</para> <para>The following dependencies are implicitly added:</para>
@@ -88,9 +91,9 @@
<listitem><para>An implicit <varname>Before=</varname> dependency is created <listitem><para>An implicit <varname>Before=</varname> dependency is created
between an automount unit and the mount unit it activates.</para></listitem> between an automount unit and the mount unit it activates.</para></listitem>
</itemizedlist> </itemizedlist>
</refsect1> </refsect2>
<refsect1> <refsect2>
<title>Default Dependencies</title> <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>
@@ -100,6 +103,7 @@
<varname>Conflicts=</varname> on <filename>umount.target</filename> in order to be stopped during <varname>Conflicts=</varname> on <filename>umount.target</filename> in order to be stopped during
shutdown.</para></listitem> shutdown.</para></listitem>
</itemizedlist> </itemizedlist>
</refsect2>
</refsect1> </refsect1>
<refsect1> <refsect1>
+6 -3
View File
@@ -77,10 +77,12 @@
corresponding device generates a <literal>changed</literal> event. corresponding device generates a <literal>changed</literal> event.
Other units can use <varname>ReloadPropagatedFrom=</varname> to react Other units can use <varname>ReloadPropagatedFrom=</varname> to react
to that event</para> to that event</para>
</refsect1> </refsect1>
<refsect1> <refsect1>
<title>Automatic Dependencies</title>
<refsect2>
<title>Implicit Dependencies</title> <title>Implicit Dependencies</title>
<para>Many unit types automatically acquire dependencies on device <para>Many unit types automatically acquire dependencies on device
@@ -90,12 +92,13 @@
<varname>BindToDevice=</varname>. Similar, swap and mount units <varname>BindToDevice=</varname>. Similar, swap and mount units
acquire dependencies on the units encapsulating their backing acquire dependencies on the units encapsulating their backing
block devices.</para> block devices.</para>
</refsect1> </refsect2>
<refsect1> <refsect2>
<title>Default Dependencies</title> <title>Default Dependencies</title>
<para>There are no default dependencies for device units.</para> <para>There are no default dependencies for device units.</para>
</refsect2>
</refsect1> </refsect1>
<refsect1> <refsect1>
+10 -6
View File
@@ -102,6 +102,9 @@
</refsect1> </refsect1>
<refsect1> <refsect1>
<title>Automatic Dependencies</title>
<refsect2>
<title>Implicit Dependencies</title> <title>Implicit Dependencies</title>
<para>The following dependencies are implicitly added:</para> <para>The following dependencies are implicitly added:</para>
@@ -129,9 +132,9 @@
<citerefentry><refentrytitle>systemd.resource-control</refentrytitle><manvolnum>5</manvolnum></citerefentry>. <citerefentry><refentrytitle>systemd.resource-control</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
</para></listitem> </para></listitem>
</itemizedlist> </itemizedlist>
</refsect1> </refsect2>
<refsect1> <refsect2>
<title>Default Dependencies</title> <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>
@@ -149,10 +152,11 @@
<varname>Wants=</varname> unit is added as well.</para></listitem> <varname>Wants=</varname> unit is added as well.</para></listitem>
</itemizedlist> </itemizedlist>
<para>Mount units referring to local and network file systems are <para>Mount units referring to local and network file systems are distinguished by their file system type
distinguished by their file system type specification. In some cases this is not sufficient (for example network specification. In some cases this is not sufficient (for example network block device based mounts, such as
block device based mounts, such as iSCSI), in which case <option>_netdev</option> may be added to the mount option iSCSI), in which case <option>_netdev</option> may be added to the mount option string of the unit, which forces
string of the unit, which forces systemd to consider the mount unit a network mount.</para> systemd to consider the mount unit a network mount.</para>
</refsect2>
</refsect1> </refsect1>
<refsect1> <refsect1>
+6 -2
View File
@@ -71,6 +71,9 @@
</refsect1> </refsect1>
<refsect1> <refsect1>
<title>Automatic Dependencies</title>
<refsect2>
<title>Implicit Dependencies</title> <title>Implicit Dependencies</title>
<para>The following dependencies are implicitly added:</para> <para>The following dependencies are implicitly added:</para>
@@ -83,9 +86,9 @@
<listitem><para>An implicit <varname>Before=</varname> dependency is added <listitem><para>An implicit <varname>Before=</varname> dependency is added
between a path unit and the unit it is supposed to activate.</para></listitem> between a path unit and the unit it is supposed to activate.</para></listitem>
</itemizedlist> </itemizedlist>
</refsect1> </refsect2>
<refsect1> <refsect2>
<title>Default Dependencies</title> <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>
@@ -101,6 +104,7 @@
</itemizedlist> </itemizedlist>
<para></para> <para></para>
</refsect2>
</refsect1> </refsect1>
<refsect1> <refsect1>
+6 -2
View File
@@ -64,14 +64,17 @@
</refsect1> </refsect1>
<refsect1> <refsect1>
<title>Automatic Dependencies</title>
<refsect2>
<title>Implicit Dependencies</title> <title>Implicit Dependencies</title>
<para>Implicit dependencies may be added as result of <para>Implicit dependencies may be added as result of
resource control parameters as documented in resource control parameters as documented in
<citerefentry><refentrytitle>systemd.resource-control</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para> <citerefentry><refentrytitle>systemd.resource-control</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para>
</refsect1> </refsect2>
<refsect1> <refsect2>
<title>Default Dependencies</title> <title>Default Dependencies</title>
<para>The following dependencies are added unless <para>The following dependencies are added unless
@@ -87,6 +90,7 @@
late system shutdown should disable late system shutdown should disable
<varname>DefaultDependencies=</varname> option.</para></listitem> <varname>DefaultDependencies=</varname> option.</para></listitem>
</itemizedlist> </itemizedlist>
</refsect2>
</refsect1> </refsect1>
<refsect1> <refsect1>
+6 -2
View File
@@ -92,6 +92,9 @@
</refsect1> </refsect1>
<refsect1> <refsect1>
<title>Automatic Dependencies</title>
<refsect2>
<title>Implicit Dependencies</title> <title>Implicit Dependencies</title>
<para>The following dependencies are implicitly added:</para> <para>The following dependencies are implicitly added:</para>
@@ -115,9 +118,9 @@
<citerefentry><refentrytitle>systemd.exec</refentrytitle><manvolnum>5</manvolnum></citerefentry> <citerefentry><refentrytitle>systemd.exec</refentrytitle><manvolnum>5</manvolnum></citerefentry>
and and
<citerefentry><refentrytitle>systemd.resource-control</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para> <citerefentry><refentrytitle>systemd.resource-control</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para>
</refsect1> </refsect2>
<refsect1> <refsect2>
<title>Default Dependencies</title> <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>
@@ -141,6 +144,7 @@
<citerefentry><refentrytitle>systemd.resource-control</refentrytitle><manvolnum>5</manvolnum></citerefentry>. <citerefentry><refentrytitle>systemd.resource-control</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
</para></listitem> </para></listitem>
</itemizedlist> </itemizedlist>
</refsect2>
</refsect1> </refsect1>
<refsect1> <refsect1>
+6 -2
View File
@@ -85,6 +85,9 @@
</refsect1> </refsect1>
<refsect1> <refsect1>
<title>Automatic Dependencies</title>
<refsect2>
<title>Implicit Dependencies</title> <title>Implicit Dependencies</title>
<para>The following dependencies are implicitly added:</para> <para>The following dependencies are implicitly added:</para>
@@ -94,9 +97,9 @@
<varname>After=</varname> and <varname>Requires=</varname> on <varname>After=</varname> and <varname>Requires=</varname> on
their immediate parent slice unit.</para></listitem> their immediate parent slice unit.</para></listitem>
</itemizedlist> </itemizedlist>
</refsect1> </refsect2>
<refsect1> <refsect2>
<title>Default Dependencies</title> <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>
@@ -108,6 +111,7 @@
Only slice units involved with late system shutdown should disable Only slice units involved with late system shutdown should disable
<varname>DefaultDependencies=</varname> option.</para></listitem> <varname>DefaultDependencies=</varname> option.</para></listitem>
</itemizedlist> </itemizedlist>
</refsect2>
</refsect1> </refsect1>
<refsect1> <refsect1>
+6 -2
View File
@@ -110,6 +110,9 @@
</refsect1> </refsect1>
<refsect1> <refsect1>
<title>Automatic Dependencies</title>
<refsect2>
<title>Implicit Dependencies</title> <title>Implicit Dependencies</title>
<para>The following dependencies are implicitly added:</para> <para>The following dependencies are implicitly added:</para>
@@ -134,9 +137,9 @@
<citerefentry><refentrytitle>systemd.exec</refentrytitle><manvolnum>5</manvolnum></citerefentry> <citerefentry><refentrytitle>systemd.exec</refentrytitle><manvolnum>5</manvolnum></citerefentry>
and and
<citerefentry><refentrytitle>systemd.resource-control</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para> <citerefentry><refentrytitle>systemd.resource-control</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para>
</refsect1> </refsect2>
<refsect1> <refsect2>
<title>Default Dependencies</title> <title>Default Dependencies</title>
<para>The following dependencies are added unless <para>The following dependencies are added unless
@@ -157,6 +160,7 @@
involved with early boot or late system shutdown should disable involved with early boot or late system shutdown should disable
<varname>DefaultDependencies=</varname> option.</para></listitem> <varname>DefaultDependencies=</varname> option.</para></listitem>
</itemizedlist> </itemizedlist>
</refsect2>
</refsect1> </refsect1>
<refsect1> <refsect1>
+6 -2
View File
@@ -76,6 +76,9 @@
</refsect1> </refsect1>
<refsect1> <refsect1>
<title>Automatic Dependencies</title>
<refsect2>
<title>Implicit Dependencies</title> <title>Implicit Dependencies</title>
<para>The following dependencies are implicitly added:</para> <para>The following dependencies are implicitly added:</para>
@@ -92,9 +95,9 @@
<citerefentry><refentrytitle>systemd.exec</refentrytitle><manvolnum>5</manvolnum></citerefentry> <citerefentry><refentrytitle>systemd.exec</refentrytitle><manvolnum>5</manvolnum></citerefentry>
and and
<citerefentry><refentrytitle>systemd.resource-control</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para> <citerefentry><refentrytitle>systemd.resource-control</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para>
</refsect1> </refsect2>
<refsect1> <refsect2>
<title>Default Dependencies</title> <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>
@@ -104,6 +107,7 @@
<varname>Before=</varname> dependency on <filename>umount.target</filename> so that they are deactivated at <varname>Before=</varname> dependency on <filename>umount.target</filename> so that they are deactivated at
shutdown as well as a <varname>Before=swap.target</varname> dependency.</para></listitem> shutdown as well as a <varname>Before=swap.target</varname> dependency.</para></listitem>
</itemizedlist> </itemizedlist>
</refsect2>
</refsect1> </refsect1>
<refsect1> <refsect1>
+6 -2
View File
@@ -69,12 +69,15 @@
</refsect1> </refsect1>
<refsect1> <refsect1>
<title>Automatic Dependencies</title>
<refsect2>
<title>Implicit Dependencies</title> <title>Implicit Dependencies</title>
<para>There are no implicit dependencies for target units.</para> <para>There are no implicit dependencies for target units.</para>
</refsect1> </refsect2>
<refsect1> <refsect2>
<title>Default Dependencies</title> <title>Default Dependencies</title>
<para>The following dependencies are added unless <para>The following dependencies are added unless
@@ -93,6 +96,7 @@
<listitem><para>Target units automatically gain <varname>Conflicts=</varname> <listitem><para>Target units automatically gain <varname>Conflicts=</varname>
dependency against <filename>shutdown.target</filename>.</para></listitem> dependency against <filename>shutdown.target</filename>.</para></listitem>
</itemizedlist> </itemizedlist>
</refsect2>
</refsect1> </refsect1>
<refsect1> <refsect1>
+10
View File
@@ -82,6 +82,15 @@
</refsect1> </refsect1>
<refsect1> <refsect1>
<title>Automatic Dependencies</title>
<refsect2>
<title>Implicit Dependencies</title>
<para>There are no implicit dependencies for timer units.</para>
</refsect2>
<refsect2>
<title>Default Dependencies</title> <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>
@@ -99,6 +108,7 @@
dependency on <filename>time-sync.target</filename> to avoid being started before the system clock has been dependency on <filename>time-sync.target</filename> to avoid being started before the system clock has been
correctly set.</para></listitem> correctly set.</para></listitem>
</itemizedlist> </itemizedlist>
</refsect2>
</refsect1> </refsect1>
<refsect1> <refsect1>
+21 -21
View File
@@ -268,40 +268,40 @@
</refsect1> </refsect1>
<refsect1> <refsect1>
<title>Automatic dependencies</title>
<refsect2>
<title>Implicit Dependencies</title> <title>Implicit Dependencies</title>
<para>A number of unit dependencies are implicitly established, <para>A number of unit dependencies are implicitly established, depending on unit type and
depending on unit type and unit configuration. These implicit unit configuration. These implicit dependencies can make unit configuration file cleaner. For
dependencies can make unit configuration file cleaner. For the the implicit dependencies in each unit type, please refer to section "Implicit Dependencies"
implicit dependencies in each unit type, please refer to in respective man pages.</para>
section "Implicit Dependencies" in respective man pages.</para>
<para>For example, service units with <varname>Type=dbus</varname> <para>For example, service units with <varname>Type=dbus</varname> automatically acquire
automatically acquire dependencies of type <varname>Requires=</varname> dependencies of type <varname>Requires=</varname> and <varname>After=</varname> on
and <varname>After=</varname> on <filename>dbus.socket</filename>. See <filename>dbus.socket</filename>. See
<citerefentry><refentrytitle>systemd.service</refentrytitle><manvolnum>5</manvolnum></citerefentry> <citerefentry><refentrytitle>systemd.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>
for details.</para> for details.</para>
</refsect1> </refsect2>
<refsect1> <refsect2>
<title>Default Dependencies</title> <title>Default Dependencies</title>
<para>Default dependencies are similar to implicit dependencies, <para>Default dependencies are similar to implicit dependencies, but can be turned on and off
but can be turned on and off by setting by setting <varname>DefaultDependencies=</varname> to <varname>yes</varname> (the default) and
<varname>DefaultDependencies=</varname> to <varname>yes</varname> <varname>no</varname>, while implicit dependencies are always in effect. See section "Default
(the default) and <varname>no</varname>, while implicit dependencies Dependencies" in respective man pages for the effect of enabling
are always in effect. See section "Default Dependencies" in respective
man pages for the effect of enabling
<varname>DefaultDependencies=</varname> in each unit types.</para> <varname>DefaultDependencies=</varname> in each unit types.</para>
<para>For example, target units will complement all configured <para>For example, target units will complement all configured dependencies of type
dependencies of type <varname>Wants=</varname> or <varname>Wants=</varname> or <varname>Requires=</varname> with dependencies of type
<varname>Requires=</varname> with dependencies of type <varname>After=</varname> unless <varname>DefaultDependencies=no</varname> is set in the
<varname>After=</varname> unless <varname>DefaultDependencies=no</varname> specified units. See
is set in the specified units. See
<citerefentry><refentrytitle>systemd.target</refentrytitle><manvolnum>5</manvolnum></citerefentry> <citerefentry><refentrytitle>systemd.target</refentrytitle><manvolnum>5</manvolnum></citerefentry>
for details. Note that this behavior can be turned off by setting for details. Note that this behavior can be turned off by setting
<varname>DefaultDependencies=no</varname>.</para> <varname>DefaultDependencies=no</varname>.</para>
</refsect2>
</refsect1> </refsect1>
<refsect1> <refsect1>