Skip to content

Commit 26598be

Browse files
authored
Merge pull request systemd#3798 from keszybz/news-and-man-tweaks
News and man tweaks
2 parents 43eb109 + 93f07c8 commit 26598be

File tree

3 files changed

+12
-15
lines changed

3 files changed

+12
-15
lines changed

NEWS

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -201,9 +201,9 @@ CHANGES WITH 231:
201201
decrease systemd footprint both in memory during runtime and on
202202
disk. Note that the shared library is not for public use, and is
203203
neither API not ABI stable, but is likely to change with every new
204-
released version. Packagers need to make sure that any package built
205-
from the systemd sources has a strict versioned dependency on the
206-
right package for this shared library.
204+
released update. Packagers need to make sure that binaries
205+
linking to libsystemd-shared.so are updated in step with the
206+
library.
207207

208208
* Configuration for "mkosi" is now part of the systemd
209209
repository. mkosi is a tool to easily build legacy-free OS images,

man/systemctl.xml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -996,12 +996,11 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service
996996
unit configuration diectory, however they point to the single template unit file they are instantiated
997997
from.</para>
998998

999-
<para>This command expects either valid unit names (in which case appropriate unit files for these names
1000-
are automatically searched in the various unit file directories), or absolute paths to unit files (in which
1001-
case these files are read directly). If a specified unit file is located outside of the unit file
1002-
directories searched automatically, an additional symlink is created, linking it into the unit
1003-
configuration path, thus ensuring it is automatically found when requested by commands such as
1004-
<command>start</command>.</para>
999+
<para>This command expects either valid unit names (in which case various unit file directories are
1000+
automatically searched for unit files with appropriate names), or absolute paths to unit files (in which
1001+
case these files are read directly). If a specified unit file is located outside of the usual unit file
1002+
directories, an additional symlink is created, linking it into the unit configuration path, thus ensuring
1003+
it is found when requested by commands such as <command>start</command>.</para>
10051004

10061005
<para>This command will print the file system operations executed. This output may be suppressed by passing
10071006
<option>--quiet</option>.

man/systemd-nspawn.xml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -73,11 +73,9 @@
7373
since it fully virtualizes the file system hierarchy, as well as the process tree, the various IPC subsystems and
7474
the host and domain name.</para>
7575

76-
<para>Like <citerefentry
77-
project='man-pages'><refentrytitle>chroot</refentrytitle><manvolnum>1</manvolnum></citerefentry> the
78-
<command>systemd-nspawn</command> command may be invoked on any directory tree containing an operating system tree,
76+
<para><command>systemd-nspawn</command> may be invoked on any directory tree containing an operating system tree,
7977
using the <option>--directory=</option> command line option. By using the <option>--machine=</option> option an OS
80-
tree is automatically searched in a couple of locations, most importantly in
78+
tree is automatically searched for in a couple of locations, most importantly in
8179
<filename>/var/lib/machines</filename>, the suggested directory to place container images installed on the
8280
system.</para>
8381

@@ -935,8 +933,8 @@
935933
<literal>tmpfs</literal> instance, and
936934
<filename>/usr</filename> from the OS tree is mounted into it
937935
in read-only mode (the system thus starts up with read-only OS
938-
resources, but pristine state and configuration, any changes
939-
to the either are lost on shutdown). When the mode parameter
936+
image, but pristine state and configuration, any changes
937+
are lost on shutdown). When the mode parameter
940938
is specified as <option>state</option>, the OS tree is
941939
mounted read-only, but <filename>/var</filename> is mounted as
942940
a <literal>tmpfs</literal> instance into it (the system thus

0 commit comments

Comments
 (0)