Merge pull request #3798 from keszybz/news-and-man-tweaks

News and man tweaks

3 files changed, 12 insertions, 15 deletions

diff --git a/NEWS b/NEWS
index 0ffe025400..90e5c8f2fc 100644
--- a/NEWS
+++ b/NEWS
@@ -201,9 +201,9 @@ CHANGES WITH 231:
           decrease systemd footprint both in memory during runtime and on
           disk. Note that the shared library is not for public use, and is
           neither API not ABI stable, but is likely to change with every new
-          released version. Packagers need to make sure that any package built
-          from the systemd sources has a strict versioned dependency on the
-          right package for this shared library.
+          released update. Packagers need to make sure that binaries
+          linking to libsystemd-shared.so are updated in step with the
+          library.
 
         * Configuration for "mkosi" is now part of the systemd
           repository. mkosi is a tool to easily build legacy-free OS images,
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