You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
43 lines
2.2 KiB
43 lines
2.2 KiB
2 years ago
|
From ada95dd4f4c0014815a2c3162de6297107569b05 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Frantisek Sumsal <frantisek@sumsal.cz>
|
||
|
|
Date: Wed, 2 Nov 2022 11:48:23 +0100
|
||
|
|
Subject: [PATCH] man: use the correct 'Markers' property name for marking
|
||
|
|
units
|
||
|
|
|
||
|
|
Follow-up to c9615f7352 and 70666e28a1.
|
||
|
|
|
||
|
|
(cherry picked from commit 1ca1bb03dec9ae3e8d734bd40eeb60210ffd7a0a)
|
||
|
|
|
||
|
|
Related #2138081
|
||
|
|
---
|
||
|
|
man/org.freedesktop.systemd1.xml | 2 +-
|
||
|
|
man/systemctl.xml | 2 +-
|
||
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/man/org.freedesktop.systemd1.xml b/man/org.freedesktop.systemd1.xml
|
||
|
|
index cbd552bd99..5e08b35234 100644
|
||
|
|
--- a/man/org.freedesktop.systemd1.xml
|
||
|
|
+++ b/man/org.freedesktop.systemd1.xml
|
||
|
|
@@ -1250,7 +1250,7 @@ node /org/freedesktop/systemd1 {
|
||
|
|
"ReloadOrRestart" flavors attempt a reload if the unit supports it and use a restart otherwise.</para>
|
||
|
|
|
||
|
|
<para><function>EnqueueMarkedJobs()</function> creates reload/restart jobs for units which have been
|
||
|
|
- appropriately marked, see <varname>Marks</varname> property above. This is equivalent to calling
|
||
|
|
+ appropriately marked, see <varname>Markers</varname> property above. This is equivalent to calling
|
||
|
|
<function>TryRestartUnit()</function> or <function>ReloadOrTryRestartUnit()</function> for the marked
|
||
|
|
units.</para>
|
||
|
|
|
||
|
|
diff --git a/man/systemctl.xml b/man/systemctl.xml
|
||
|
|
index 4d4f6c3992..997925892d 100644
|
||
|
|
--- a/man/systemctl.xml
|
||
|
|
+++ b/man/systemctl.xml
|
||
|
|
@@ -2386,7 +2386,7 @@ Jan 12 10:46:45 example.com bluetoothd[8900]: gatt-time-server: Input/output err
|
||
|
|
<listitem><para>Only allowed with <command>reload-or-restart</command>. Enqueues restart jobs for all
|
||
|
|
units that have the <literal>needs-restart</literal> mark, and reload jobs for units that have the
|
||
|
|
<literal>needs-reload</literal> mark. When a unit marked for reload does not support reload, restart
|
||
|
|
- will be queued. Those properties can be set using <command>set-property Marks</command>.</para>
|
||
|
|
+ will be queued. Those properties can be set using <command>set-property Markers=…</command>.</para>
|
||
|
|
|
||
|
|
<para>Unless <option>--no-block</option> is used, <command>systemctl</command> will wait for the
|
||
|
|
queued jobs to finish.</para></listitem>
|