shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-02-27 13:57:26 +03:00
Code

Merge pull request #1193 from phomes/typos

Browse Source 
man: typo fixes
This commit is contained in:
Daniel Mack 2015-09-07 23:16:14 +02:00
commit 4df0514d29
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
man/systemd-nspawn.xml
View File

@ -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

6
man/systemd.nspawn.xml
View File

@ -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