summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuca Boccassi <bluca@debian.org>2023-01-22 20:14:33 +0000
committerGitHub <noreply@github.com>2023-01-22 20:14:33 +0000
commite24652ac2ef12c94b803ab844531da212922a718 (patch)
treed87b8e784d637974bafb10aa217dba5fa8b98304
parentfdbbb5ffc04c48e6e1b97ddfff366672c2f8a073 (diff)
parent066991f9fe510d0b4c9530f8b455b5b32b63a554 (diff)
downloadsystemd-e24652ac2ef12c94b803ab844531da212922a718.tar.gz
Merge pull request #26146 from keszybz/two-man-page-tweaks
Two man page tweaks
-rw-r--r--man/sd_notify.xml25
-rw-r--r--man/systemd-nspawn.xml2
-rw-r--r--man/systemd.unit.xml2
3 files changed, 16 insertions, 13 deletions
diff --git a/man/sd_notify.xml b/man/sd_notify.xml
index 0ba191c0ce..8ef1c507ca 100644
--- a/man/sd_notify.xml
+++ b/man/sd_notify.xml
@@ -436,10 +436,11 @@
<para>A service could send the following after completing
initialization:</para>
- <programlisting>sd_notifyf(0, "READY=1\n"
- "STATUS=Processing requests…\n"
- "MAINPID=%lu",
- (unsigned long) getpid());</programlisting>
+ <programlisting>
+sd_notifyf(0, "READY=1\n"
+ "STATUS=Processing requests…\n"
+ "MAINPID=%lu",
+ (unsigned long) getpid());</programlisting>
</example>
<example>
@@ -447,10 +448,11 @@
<para>A service could send the following shortly before exiting, on failure:</para>
- <programlisting>sd_notifyf(0, "STATUS=Failed to start up: %s\n"
- "ERRNO=%i",
- strerror_r(errnum, (char[1024]){}, 1024),
- errnum);</programlisting>
+ <programlisting>
+sd_notifyf(0, "STATUS=Failed to start up: %s\n"
+ "ERRNO=%i",
+ strerror_r(errnum, (char[1024]){}, 1024),
+ errnum);</programlisting>
</example>
<example>
@@ -473,9 +475,10 @@
to synchronize against reception of all notifications sent before
this call is made.</para>
- <programlisting>sd_notify(0, "READY=1");
- /* set timeout to 5 seconds */
- sd_notify_barrier(0, 5 * 1000000);
+ <programlisting>
+sd_notify(0, "READY=1");
+/* set timeout to 5 seconds */
+sd_notify_barrier(0, 5 * 1000000);
</programlisting>
</example>
</refsect1>
diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml
index be2c3882d7..ca33d82a74 100644
--- a/man/systemd-nspawn.xml
+++ b/man/systemd-nspawn.xml
@@ -1386,7 +1386,7 @@ After=sys-subsystem-net-devices-ens1.device</programlisting>
</itemizedlist></para>
<para>Whichever ID mapping option is used, the same mapping will be used for users and groups IDs. If
- <option>rootidmap</option> is used, the group owning the bind mounted directory will have no effect</para>
+ <option>rootidmap</option> is used, the group owning the bind mounted directory will have no effect.</para>
<para>Note that when this option is used in combination with <option>--private-users</option>, the resulting
mount points will be owned by the <constant>nobody</constant> user. That's because the mount and its files and
diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
index 0c17d91814..91015c8f47 100644
--- a/man/systemd.unit.xml
+++ b/man/systemd.unit.xml
@@ -1245,7 +1245,7 @@
</para></listitem>
<listitem><para><literal>device-tree-compatible(<replaceable>value</replaceable>)</literal>
- matches systems with a device tree that is compatible with <literal>value</literal>.
+ matches systems with a device tree that are compatible with <literal>value</literal>.
</para></listitem>
<listitem><para><literal>smbios-field(<replaceable>field</replaceable>