X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsystemd-nspawn.xml;h=fef5c2c83a8151336b4069b5ed4f7e9873496f25;hp=1688687948ec3770ddd5727ab709a65b7fb4f301;hb=df688b23daff9382b8fa2609cfcf73315a3b896e;hpb=b2e6df73aa508cc09b1b536a2fb9f90f152b89fa

diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml
index 168868794..fef5c2c83 100644
--- a/man/systemd-nspawn.xml
+++ b/man/systemd-nspawn.xml
@@ -220,7 +220,7 @@
                                 list of capability names, see
                                 <citerefentry><refentrytitle>capabilities</refentrytitle><manvolnum>7</manvolnum></citerefentry>
                                 for more information. Note that the
-                                the following capabilities will be
+                                following capabilities will be
                                 granted in any way: CAP_CHOWN,
                                 CAP_DAC_OVERRIDE, CAP_DAC_READ_SEARCH,
                                 CAP_FOWNER, CAP_FSETID, CAP_IPC_OWNER,
@@ -248,31 +248,30 @@
                                 <literal>host</literal>,
                                 <literal>guest</literal>,
                                 <literal>auto</literal>. If
-                                <literal>no</literal> the journal is
-                                not linked. If <literal>host</literal>
+                                <literal>no</literal>, the journal is
+                                not linked. If <literal>host</literal>,
                                 the journal files are stored on the
-                                host file system (beneath the host's
-                                <filename>/var/log/journal</filename>)
-                                and a per-machine subdirectory of this
-                                directory is created and bind mounted
+                                host file system (beneath
+                                <filename>/var/log/journal/&lt;machine-id&gt;</filename>)
+                                and the subdirectory is bind-mounted
                                 into the container at the same
-                                location. If <literal>guest</literal>
+                                location. If <literal>guest</literal>,
                                 the journal files are stored on the
-                                guest file system (beneath the guest's
-                                <filename>/var/log/journal</filename>)
-                                and a per-machine subdirectory of this
-                                directory is symlinked into the host
+                                guest file system (beneath
+                                <filename>/var/log/journal/&lt;machine-id&gt;</filename>)
+                                and the subdirectory is symlinked into the host
                                 at the same location. If
-                                <literal>auto</literal> (the default)
-                                and the subdirectory of
+                                <literal>auto</literal> (the default),
+                                and the right subdirectory of
                                 <filename>/var/log/journal</filename>
-                                exists as directory it is bind mounted
-                                into the container, but nothing is
-                                done otherwise. Effectively, booting a
-                                container once with
+                                exists, it will be bind mounted
+                                into the container. If the
+                                subdirectory doesn't exist, no
+                                linking is performed. Effectively,
+                                booting a container once with
                                 <literal>guest</literal> or
                                 <literal>host</literal> will link the
-                                journal persistently if further one
+                                journal persistently if further on
                                 the default of <literal>auto</literal>
                                 is used.</para></listitem>
                         </varlistentry>