Merge pull request #14105 from keszybz/man-directives-cleanup

[thirdparty/systemd.git] / man / systemd.service.xml

diff --git a/man/systemd.service.xml b/man/systemd.service.xml
index ce7b8474208cba98774997bb805db94d511430cd..db28e3e272958cf14b52981ce15606c5eea9fa40 100644 (file)
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -63,19 +63,6 @@
     <para>The <citerefentry><refentrytitle>systemd-run</refentrytitle><manvolnum>1</manvolnum></citerefentry>
     command allows creating <filename>.service</filename> and <filename>.scope</filename> units dynamically
     and transiently from the command line.</para>
-
-    <para>In addition to the various drop-in behaviors described in
-    <citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
-    services also support a top-level drop-in with <filename>-.service.d/</filename> that allows
-    altering or adding to the settings of all services on the system.
-    The formatting and precedence of applying drop-in configurations follow what is defined in
-    <citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
-    However, configurations in <filename>-.service.d/</filename> have the lowest precedence compared to settings
-    in the service specific override directories. For example, for <filename>foo-bar-baz.service</filename>,
-    drop-ins in <filename>foo-bar-baz.service.d/</filename> override the ones in
-    <filename>foo-bar-.service.d/</filename>, which override the ones <filename>foo-.service.d/</filename>,
-    which override the ones in <filename>-.service.d/</filename>.
-    </para>
   </refsect1>
 
   <refsect1>
@@ -587,8 +574,8 @@
       <varlistentry>
         <term><varname>TimeoutStopSec=</varname></term>
         <listitem><para>This option serves two purposes. First, it configures the time to wait for each
-        <constant>ExecStop=</constant> command. If any of them times out, subsequent <constant>ExecStop=</constant> commands
-        are skipped and the service will be terminated by <constant>SIGTERM</constant>. If no <constant>ExecStop=</constant>
+        <varname>ExecStop=</varname> command. If any of them times out, subsequent <varname>ExecStop=</varname> commands
+        are skipped and the service will be terminated by <constant>SIGTERM</constant>. If no <varname>ExecStop=</varname>
         commands are specified, the service gets the <constant>SIGTERM</constant> immediately. Second, it configures the time
         to wait for the service itself to stop. If it doesn't terminate in the specified time, it will be forcibly terminated
         by <constant>SIGKILL</constant> (see <varname>KillMode=</varname> in
@@ -1342,8 +1329,8 @@ WantedBy=multi-user.target</programlisting>
       <para><varname>Type=</varname><option>oneshot</option> are the
       only service units that may have more than one
       <varname>ExecStart=</varname> specified. For units with multiple
-      commands (<varname noindex="true">Type=oneshot</varname>), all commands will be run again.</para>
-      <para> For <varname noindex="true">Type=oneshot</varname>, <varname>Restart=</varname><option>always</option>
+      commands (<varname index="false">Type=oneshot</varname>), all commands will be run again.</para>
+      <para> For <varname index="false">Type=oneshot</varname>, <varname>Restart=</varname><option>always</option>
       and <varname>Restart=</varname><option>on-success</option> are <emphasis>not</emphasis> allowed.</para>
     </example>