diff --git a/man/nss-resolve.xml b/man/nss-resolve.xml
index 4e102cec26..51b228f104 100644
--- a/man/nss-resolve.xml
+++ b/man/nss-resolve.xml
@@ -63,13 +63,24 @@
hostnames via DNS.
To activate the NSS module, add resolve to the line starting with
- hosts: in /etc/nsswitch.conf. Specifcally, it is recommended to place
- resolve early in /etc/nsswitch.conf' hosts: line (but
+ hosts: in /etc/nsswitch.conf. Specifically, it is recommended to place
+ resolve early in /etc/nsswitch.conf's hosts: line (but
after the files or mymachines entries), right before the
dns entry if it exists, followed by [!UNAVAIL=return], to ensure DNS queries
are always routed via
systemd-resolved8 if it is
running, but are routed to nss-dns if this service is not available.
+
+ Note that systemd-resolved will synthesize DNS resource
+ records in a few cases, for example for the localhost and the
+ current hostname, see
+ systemd-resolved8
+ for the full list. This duplicates the functionality of
+ nss-myhostname8,
+ but it is still recommended (see examples below) to keep
+ nss-myhostname configured in
+ /etc/nsswitch.conf, to keep those names resolveable if
+ systemd-resolved is not running.
diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml
index 7014443f53..5d3212dec7 100644
--- a/man/systemd-nspawn.xml
+++ b/man/systemd-nspawn.xml
@@ -1090,6 +1090,18 @@
in a namespace container in it.
+
+ Install the OpenSUSE Tumbleweed rolling distribution
+
+ # zypper --root=/var/lib/machines/tumbleweed ar -c \
+ https://download.opensuse.org/tumbleweed/repo/oss tumbleweed
+# zypper --root=/var/lib/machines/tumbleweed refresh
+# zypper --root=/var/lib/machines/tumbleweed install --no-recommends \
+ systemd shadow zypper openSUSE-release vim
+# systemd-nspawn -M tumbleweed passwd root
+# systemd-nspawn -M tumbleweed -b
+
+
Boot into an ephemeral snapshot of the host system
@@ -1132,6 +1144,7 @@
dnf8,
debootstrap8,
pacman8,
+ zypper8,
systemd.slice5,
machinectl1,
btrfs8
diff --git a/man/systemd.service.xml b/man/systemd.service.xml
index 0678855945..da35a5205d 100644
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -916,12 +916,14 @@
Each command line is split on whitespace, with the first item being the command to
execute, and the subsequent items being the arguments. Double quotes ("…") and single quotes
- ('…') may be used, in which case everything until the next matching quote becomes part of the
- same argument. Quotes themselves are removed. C-style escapes are also supported. The table
- below contains the list of known escape patterns. Only escape patterns which match the syntax in
- the table are allowed; other patterns may be added in the future and unknown patterns will
- result in a warning. In particular, any backslashes should be doubled. Finally, a trailing
- backslash (\) may be used to merge lines.
+ ('…') may be used to wrap a whole item (the opening quote may appear only at the beginning or
+ after whitespace that is not quoted, and the closing quote must be followed by whitespace or the
+ end of line), in which case everything until the next matching quote becomes part of the same
+ argument. Quotes themselves are removed. C-style escapes are also supported. The table below
+ contains the list of known escape patterns. Only escape patterns which match the syntax in the
+ table are allowed; other patterns may be added in the future and unknown patterns will result in
+ a warning. In particular, any backslashes should be doubled. Finally, a trailing backslash
+ (\) may be used to merge lines.
This syntax is inspired by shell syntax, but only the meta-characters and expansions
described in the following paragraphs are understood, and the expansion of variables is