summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Mack <github@zonque.org>2015-09-07 23:16:14 +0200
committerDaniel Mack <github@zonque.org>2015-09-07 23:16:14 +0200
commit4df0514d299e349ce1d0649209155b9e83a23539 (patch)
treed44128c8322bd41c6c80faabc617b05831d86a75
parentd6d056a19fa245f94ba93354864ba8b25ca108ea (diff)
parent4f76ef0423a30ee672891056aeb5df2422947e1d (diff)
Merge pull request #1193 from phomes/typos
man: typo fixes
-rw-r--r--man/systemd-nspawn.xml4
-rw-r--r--man/systemd.nspawn.xml6
2 files changed, 5 insertions, 5 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
diff --git a/man/systemd.nspawn.xml b/man/systemd.nspawn.xml
index ac0b911373..7bfafb424f 100644
--- a/man/systemd.nspawn.xml
+++ b/man/systemd.nspawn.xml
@@ -103,7 +103,7 @@
<filename>/etc/systemd/nspawn/</filename> and
<filename>/run/systemd/nspawn/</filename>. If found in these
directories its settings are read and all of them take full effect
- (but are possibly overriden by corresponding command line
+ (but are possibly overridden by corresponding command line
arguments). If not found the file will then be searched next to
the image file or in the immediate parent of the root directory of
the container. If the file is found there only a subset of the
@@ -195,7 +195,7 @@
<citerefentry><refentrytitle>capabilities</refentrytitle><manvolnum>7</manvolnum></citerefentry>
for details). The <varname>Capability=</varname> setting
specifies additional capabilities to pass on top of the
- default set of capabilites. The
+ default set of capabilities. The
<varname>DropCapability=</varname> setting specifies
capabilities to drop from the default set. These settings
correspond to the <option>--capability=</option> and
@@ -280,7 +280,7 @@
<listitem><para>Adds a <literal>tmpfs</literal> mount to the
container. Takes a path or a pair of path and option string,
- separated by a colon. This option may be used mutiple times to
+ separated by a colon. This option may be used multiple times to
configure multiple <literal>tmpfs</literal> mounts. This
option is equivalent to the command line switch
<option>--tmpfs=</option>, see