From 5164c3b473fd7c3b72d3e98a4664fa44a18469bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Fri, 22 Jul 2016 16:31:55 -0400 Subject: man: make chroot less prominent in discussion of nspawn Not as many people use chroot as before, so make the flow a bit nicer by talking less about chroot. "change to the either" is awkward and unclear. Just remove that part, because all changes are lost, period. --- man/systemd-nspawn.xml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) 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. - Like chroot1 the - systemd-nspawn command may be invoked on any directory tree containing an operating system tree, + systemd-nspawn may be invoked on any directory tree containing an operating system tree, using the command line option. By using the 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 /var/lib/machines, the suggested directory to place container images installed on the system. @@ -935,8 +933,8 @@ tmpfs instance, and /usr 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 , the OS tree is mounted read-only, but /var is mounted as a tmpfs instance into it (the system thus -- cgit v1.2.1 From 1ecbf32ff8bc644ba59e259a5c416b31bcc6ee71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 25 Jul 2016 10:34:56 -0400 Subject: NEWS: reword the text about libshared "strict versioned dependency" suggests that version "231" of the library is stable. But the ABI or API might be changed in any patch, so reword the text to avoid using "version". --- NEWS | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/NEWS b/NEWS index 36fb84b26f..27fda1081e 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, -- cgit v1.2.1 From 93f07c87890a54c956eac38f206161071a968a55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 25 Jul 2016 10:41:04 -0400 Subject: man: use "search for unit" To "search something", in the meaning of looking for it, is valid, but "search _for_ something" is much more commonly used, especially when the meaning could be confused with "looking _through_ something" (for some other object). (C.f. "the police search a person", "the police search for a person".) Also reword the rest of the paragraph to avoid using "automatically" three times. --- man/systemctl.xml | 11 +++++------ 1 file changed, 5 insertions(+), 6 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. - 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 - start. + 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 start. This command will print the file system operations executed. This output may be suppressed by passing . -- cgit v1.2.1