From e9dd6984076389e8cfa15b72bc62187544e49b61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 6 Jul 2020 10:49:59 +0200 Subject: tree-wide: fixes for assorted grammar and spelling issues Fixes #16363. Also includes some changes where I generalized the pattern. --- man/systemd-nspawn.xml | 46 ++++++++++++++++++++++------------------------ 1 file changed, 22 insertions(+), 24 deletions(-) (limited to 'man/systemd-nspawn.xml') diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml index e28572db6d..7b643908e0 100644 --- a/man/systemd-nspawn.xml +++ b/man/systemd-nspawn.xml @@ -531,11 +531,9 @@ - After transitioning into the container, change - to the specified user-defined in the container's user - database. Like all other systemd-nspawn features, this is not - a security feature and provides protection against accidental - destructive operations only. + After transitioning into the container, change to the specified user defined in the + container's user database. Like all other systemd-nspawn features, this is not a security feature and + provides protection against accidental destructive operations only. @@ -1167,10 +1165,9 @@ Finally, if set to auto the file is left as it is if private networking is turned on (see ). Otherwise, if - systemd-resolved.service is connectible its stub - resolv.conf file is used, and if not the host's - /etc/resolv.conf file is used. In the latter cases the file is copied if the - image is writable, and bind mounted otherwise. + systemd-resolved.service is running its stub resolv.conf + file is used, and if not the host's /etc/resolv.conf file. In the latter cases + the file is copied if the image is writable, and bind mounted otherwise. It's recommended to use copy-… or replace-… if the container shall be able to make changes to the DNS configuration on its own, deviating from the @@ -1186,19 +1183,20 @@ - Configures how /etc/localtime inside of the container (i.e. local timezone - synchronization from host to container) shall be handled. Takes one of off, - copy, bind, symlink, delete or - auto. If set to off the /etc/localtime file in the - container is left as it is included in the image, and neither modified nor bind mounted over. If set to - copy the /etc/localtime file of the host is copied into the - container. Similar, if bind is used, it is bind mounted from the host into the container. If - set to symlink a symlink from /etc/localtime in the container is - created pointing to the matching the timezone file of the container that matches the timezone setting on the - host. If set to delete the file in the container is deleted, should it exist. If set to - auto and the /etc/localtime file of the host is a symlink, then - symlink mode is used, and copy otherwise, except if the image is - read-only in which case bind is used instead. Defaults to + Configures how /etc/localtime inside of the container + (i.e. local timezone synchronization from host to container) shall be handled. Takes one of + off, copy, bind, symlink, + delete or auto. If set to off the + /etc/localtime file in the container is left as it is included in the image, and + neither modified nor bind mounted over. If set to copy the + /etc/localtime file of the host is copied into the container. Similarly, if + bind is used, the file is bind mounted from the host into the container. If set to + symlink, a symlink is created pointing from /etc/localtime in + the container to the timezone file in the container that matches the timezone setting on the host. If + set to delete, the file in the container is deleted, should it exist. If set to + auto and the /etc/localtime file of the host is a symlink, + then symlink mode is used, and copy otherwise, except if the + image is read-only in which case bind is used instead. Defaults to auto. @@ -1441,7 +1439,7 @@ This installs a minimal Fedora distribution into the directory /var/lib/machines/f&fedora_latest_version; - and then boots an OS in a namespace container in it. Because the installation + and then boots that OS in a namespace container. Because the installation is located underneath the standard /var/lib/machines/ directory, it is also possible to start the machine using systemd-nspawn -M f&fedora_latest_version;. @@ -1455,7 +1453,7 @@ This installs a minimal Debian unstable distribution into the directory ~/debian-tree/ and then - spawns a shell in a namespace container in it. + spawns a shell from this image in a namespace container. debootstrap supports Debian, -- cgit v1.2.1