diff options
| author | Daniel Mack <github@zonque.org> | 2015-09-07 23:16:14 +0200 |
|---|---|---|
| committer | Daniel Mack <github@zonque.org> | 2015-09-07 23:16:14 +0200 |
| commit | 4df0514d299e349ce1d0649209155b9e83a23539 (patch) | |
| tree | d44128c8322bd41c6c80faabc617b05831d86a75 /man/systemd-nspawn.xml | |
| parent | d6d056a19fa245f94ba93354864ba8b25ca108ea (diff) | |
| parent | 4f76ef0423a30ee672891056aeb5df2422947e1d (diff) | |
Merge pull request #1193 from phomes/typos
man: typo fixes
Diffstat (limited to 'man/systemd-nspawn.xml')
| -rw-r--r-- | man/systemd-nspawn.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml index b1d68b9ecd..bc5dacd98f 100644 --- a/man/systemd-nspawn.xml +++ b/man/systemd-nspawn.xml @@ -794,12 +794,12 @@ <filename>/etc/systemd/nspawn/</filename> and <filename>/run/systemd/nspawn/</filename>. If it is found there, its settings are read and used. If it is not found - there it is subequently searched in the same directory as the + there it is subsequently searched in the same directory as the image file or in the immediate parent of the root directory of the container. In this case, if the file is found its settings will be also read and used, but potentially unsafe settings are ignored. Note that in both these cases settings on the - command line take precendence over the corresponding settings + command line take precedence over the corresponding settings from loaded <filename>.nspawn</filename> files, if both are specified. Unsafe settings are considered all settings that elevate the container's privileges or grant access to |