summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
Diffstat (limited to 'man')
-rw-r--r--man/systemctl.xml11
-rw-r--r--man/systemd-nspawn.xml10
2 files changed, 9 insertions, 12 deletions
diff --git a/man/systemctl.xml b/man/systemctl.xml
index c7b830b7fb..e7880d24f7 100644
--- a/man/systemctl.xml
+++ b/man/systemctl.xml
@@ -996,12 +996,11 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service
unit configuration diectory, however they point to the single template unit file they are instantiated
from.</para>
- <para>This command expects either valid unit names (in which case appropriate unit files for these names
- are automatically searched in the various unit file directories), or absolute paths to unit files (in which
- case these files are read directly). If a specified unit file is located outside of the unit file
- directories searched automatically, an additional symlink is created, linking it into the unit
- configuration path, thus ensuring it is automatically found when requested by commands such as
- <command>start</command>.</para>
+ <para>This command expects either valid unit names (in which case various unit file directories are
+ automatically searched for unit files with appropriate names), or absolute paths to unit files (in which
+ case these files are read directly). If a specified unit file is located outside of the usual unit file
+ directories, an additional symlink is created, linking it into the unit configuration path, thus ensuring
+ it is found when requested by commands such as <command>start</command>.</para>
<para>This command will print the file system operations executed. This output may be suppressed by passing
<option>--quiet</option>.
diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml
index cb0468fbf5..9b623c8353 100644
--- a/man/systemd-nspawn.xml
+++ b/man/systemd-nspawn.xml
@@ -73,11 +73,9 @@
since it fully virtualizes the file system hierarchy, as well as the process tree, the various IPC subsystems and
the host and domain name.</para>
- <para>Like <citerefentry
- project='man-pages'><refentrytitle>chroot</refentrytitle><manvolnum>1</manvolnum></citerefentry> the
- <command>systemd-nspawn</command> command may be invoked on any directory tree containing an operating system tree,
+ <para><command>systemd-nspawn</command> may be invoked on any directory tree containing an operating system tree,
using the <option>--directory=</option> command line option. By using the <option>--machine=</option> option an OS
- tree is automatically searched in a couple of locations, most importantly in
+ tree is automatically searched for in a couple of locations, most importantly in
<filename>/var/lib/machines</filename>, the suggested directory to place container images installed on the
system.</para>
@@ -935,8 +933,8 @@
<literal>tmpfs</literal> instance, and
<filename>/usr</filename> from the OS tree is mounted into it
in read-only mode (the system thus starts up with read-only OS
- resources, but pristine state and configuration, any changes
- to the either are lost on shutdown). When the mode parameter
+ image, but pristine state and configuration, any changes
+ are lost on shutdown). When the mode parameter
is specified as <option>state</option>, the OS tree is
mounted read-only, but <filename>/var</filename> is mounted as
a <literal>tmpfs</literal> instance into it (the system thus