From d238709c14c89884b2fdfc72c8228a4f30874df1 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Thu, 27 Jun 2019 09:54:20 +0200 Subject: [PATCH] docs: fix typos and duplicate words s/and and/and/ s/explicity/explicitly/ s/that that/that/ s/the the/the/ s/is is/it is/ s/overriden/overridden/ --- NEWS | 4 ++-- TODO | 2 +- docs/AUTOMATIC_BOOT_ASSESSMENT.md | 2 +- docs/BLOCK_DEVICE_LOCKING.md | 2 +- docs/CODING_STYLE.md | 2 +- docs/ENVIRONMENT.md | 2 +- man/systemd-system.conf.xml | 2 +- man/systemd.net-naming-scheme.xml | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/NEWS b/NEWS index d4a60c9d06..dbe87297bb 100644 --- a/NEWS +++ b/NEWS @@ -107,7 +107,7 @@ CHANGES WITH 243 in spe: * A new setting NUMAPolicy= may be used to set process memory allocation policy. Setting can be specified in system.conf and hence will set the default policy for PID1. Default policy can be - overriden on per-service basis. Related setting NUMAMask= is used to + overridden on per-service basis. Related setting NUMAMask= is used to specify NUMA node mask that should be associated with the selected policy. … @@ -938,7 +938,7 @@ CHANGES WITH 240: up a private /dev/ file system containing devices nodes — but when these are opened they don't work. - At this point is is recommended that container managers utilizing + At this point it is recommended that container managers utilizing user namespaces that intend to run systemd in the payload explicitly block mknod() with seccomp or similar, so that the graceful fallback logic works again. diff --git a/TODO b/TODO index d54e5ddeaf..0637a24274 100644 --- a/TODO +++ b/TODO @@ -75,7 +75,7 @@ Features: safe_fork() is to fork(). And then make revert the RLIMIT_NOFILE soft limit to 1K implicitly, unless explicitly opted-out. -* rework seccomp/nnp logic that that even if User= is used in combination with +* rework seccomp/nnp logic that even if User= is used in combination with a seccomp option we don't have to set NNP. For that, change uid first whil keeping CAP_SYS_ADMIN, then apply seccomp, the drop cap. diff --git a/docs/AUTOMATIC_BOOT_ASSESSMENT.md b/docs/AUTOMATIC_BOOT_ASSESSMENT.md index 6f7182a4b3..1ef4bdcfe1 100644 --- a/docs/AUTOMATIC_BOOT_ASSESSMENT.md +++ b/docs/AUTOMATIC_BOOT_ASSESSMENT.md @@ -97,7 +97,7 @@ Here's an example walkthrough of how this all fits together. see the `+1-2` tag, and rename the file to `4.14.11-300.fc27.x86_64+0-3.conf` and boot it. -6. If this boot also fails, on the next boot the boot loader will see the the +6. If this boot also fails, on the next boot the boot loader will see the tag `+0-3`, i.e. the counter reached zero. At this point the entry will be considered "bad", and ordered to the end of the list of entries. The next newest boot entry is now tried, i.e. the system automatically reverted back diff --git a/docs/BLOCK_DEVICE_LOCKING.md b/docs/BLOCK_DEVICE_LOCKING.md index 58178ad2f7..5509b41942 100644 --- a/docs/BLOCK_DEVICE_LOCKING.md +++ b/docs/BLOCK_DEVICE_LOCKING.md @@ -34,7 +34,7 @@ formatting tools to safely and easily take exclusive ownership of a block device while operating: before starting work on the block device, they should take an `LOCK_EX` lock on it. This has two effects: first of all, in case `systemd-udevd` is still processing the device the tool will wait for it to -finish. Second, after the lock is taken, it can be sure that that +finish. Second, after the lock is taken, it can be sure that `systemd-udevd` will refrain from processing the block device, and thus all other client applications subscribed to it won't get device notifications from potentially half-written data either. After the operation is complete the diff --git a/docs/CODING_STYLE.md b/docs/CODING_STYLE.md index 517bd2b41d..bf7ba3ea69 100644 --- a/docs/CODING_STYLE.md +++ b/docs/CODING_STYLE.md @@ -206,7 +206,7 @@ title: Coding Style numeric. Specifically, if you have an `int b` and it's only used in a boolean sense, by all means check its state with `if (b) …` — but if `b` can actually have more than two semantic values, and you want to compare for non-zero, - then please write that explicity with `if (b != 0) …`. This helps readability + then please write that explicitly with `if (b != 0) …`. This helps readability as the value range and semantical behaviour is directly clear from the condition check. As a special addition: when dealing with pointers which you want to check for non-NULL-ness, you may also use downgrade-to-bool feature. diff --git a/docs/ENVIRONMENT.md b/docs/ENVIRONMENT.md index f72ed20dd0..e81eaf2a35 100644 --- a/docs/ENVIRONMENT.md +++ b/docs/ENVIRONMENT.md @@ -217,7 +217,7 @@ systemd itself: systemd-remount-fs: -* `$SYSTEMD_REMOUNT_ROOT_RW=1` — if set and and no entry for the root directory +* `$SYSTEMD_REMOUNT_ROOT_RW=1` — if set and no entry for the root directory exists in /etc/fstab (this file always takes precedence), then the root directory is remounted writable. This is primarily used by systemd-gpt-auto-generator to ensure the root partition is mounted writable diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml index 9de04a7879..10eeb7e690 100644 --- a/man/systemd-system.conf.xml +++ b/man/systemd-system.conf.xml @@ -120,7 +120,7 @@ Configures the NUMA node mask that will be associated with the selected NUMA policy. Note that and NUMA policies don't require explicit NUMA node mask and - value of the option can be empty. Similarly to NUMAPolicy=, value can be overriden + value of the option can be empty. Similarly to NUMAPolicy=, value can be overridden by individual services in unit files, see systemd.exec5. diff --git a/man/systemd.net-naming-scheme.xml b/man/systemd.net-naming-scheme.xml index 4caac11156..91ad57df03 100644 --- a/man/systemd.net-naming-scheme.xml +++ b/man/systemd.net-naming-scheme.xml @@ -37,7 +37,7 @@ schemes". The default naming scheme is chosen at compilation time. Usually this will be the latest implemented version, but it is also possible to set one of the older versions to preserve compatibility. This may be useful for example for distributions, which may introduce new versions of - systemd in stable releases without changing the naming scheme. The naming scheme may also be overriden + systemd in stable releases without changing the naming scheme. The naming scheme may also be overridden using the net.naming-scheme= kernel command line switch, see systemd-udevd.service8. Available naming schemes are described below.