diff options
author | Lennart Poettering <lennart@poettering.net> | 2018-06-12 16:00:37 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-06-12 16:00:37 +0200 |
commit | f4ea7552c109942b49cc1a3c37e959716fb8c453 (patch) | |
tree | 008d8ce6e479d79defe208cadcb2e7f39a3cdfb8 | |
parent | ceb9d454fe617741ee26847423e04ca8f2b76de8 (diff) | |
parent | e59886007e985f6f0b8146e672a32ae27d716b82 (diff) | |
download | systemd-f4ea7552c109942b49cc1a3c37e959716fb8c453.tar.gz |
Merge pull request #9270 from mbiebl/typo-fixes
NEWS: typo fixes
-rw-r--r-- | NEWS | 10 | ||||
-rw-r--r-- | doc/CGROUP_DELEGATION.md | 4 | ||||
-rw-r--r-- | doc/CODE_QUALITY.md | 2 | ||||
-rw-r--r-- | doc/CODING_STYLE | 4 | ||||
-rw-r--r-- | doc/UIDS-GIDS.md | 2 |
5 files changed, 11 insertions, 11 deletions
@@ -57,7 +57,7 @@ CHANGES WITH 239 in spe: tools, such as systemctl or loginctl. * The resolvectl/systemd-resolve tool also provides 'resolveconf' - compatiblity. It may be symlinked under the 'resolveconf' name, in + compatibility. It may be symlinked under the 'resolveconf' name, in which case it will take arguments and input compatible with the Debian and FreeBSD resolvconf tool. @@ -88,7 +88,7 @@ CHANGES WITH 239 in spe: * A new service systemd-time-sync-wait.service has been added. If enabled it will delay the time-sync.target unit at boot until time - synchronization has been recieved from the network. This + synchronization has been received from the network. This functionality is useful on systems lacking a local RTC or where it is acceptable that the boot process shall be delayed by external network services. @@ -619,7 +619,7 @@ CHANGES WITH 237: systemd.service_watchdogs= for controlling the same. * Two new "log-level" and "log-target" options for systemd-analyze were - addded that merge the now deprecated get-log-level, set-log-level and + added that merge the now deprecated get-log-level, set-log-level and get-log-target, set-log-target pairs. The deprecated options are still understood for backwards compatibility. The two new options print the current value when no arguments are given, and set them when a @@ -1188,7 +1188,7 @@ CHANGES WITH 234: (domain search list). * systemd-networkd gained support for serving IPv6 address ranges using - the Router Advertisment protocol. The new .network configuration + the Router Advertisement protocol. The new .network configuration section [IPv6Prefix] may be used to configure the ranges to serve. This is implemented based on a new, minimal, native server implementation of RA. @@ -1919,7 +1919,7 @@ CHANGES WITH 232: counted multiple times, if it takes multiple references. * sd-bus gained new API calls sd_bus_set_exit_on_disconnect() and - sd_bus_get_exit_on_disconnect(). They may be used to to make a + sd_bus_get_exit_on_disconnect(). They may be used to make a process using sd-bus automatically exit if the bus connection is severed. diff --git a/doc/CGROUP_DELEGATION.md b/doc/CGROUP_DELEGATION.md index 212283fd73..63d9d41b10 100644 --- a/doc/CGROUP_DELEGATION.md +++ b/doc/CGROUP_DELEGATION.md @@ -232,7 +232,7 @@ delegated. Let's stress one thing: delegation is available on scope and service units only. It's expressly not available on slice units. Why? Because slice units are our *inner* nodes of the cgroup trees and we freely attach service and scopes -to them. If we'd allow delegation on slice units then this would mean that that +to them. If we'd allow delegation on slice units then this would mean that both systemd and your own manager would create/delete cgroups below the slice unit and that conflicts with the single-writer rule. @@ -359,7 +359,7 @@ optional (but of course wise). Note one particular asymmetry here though: systemd will try to take possession of the root cgroup you pass to it *in* *full*, i.e. it will not only -create/remove child cgroups below it it will also attempt to manage the +create/remove child cgroups below it, it will also attempt to manage the attributes of it. OTOH as mentioned above, when delegating a cgroup tree to somebody else it only passes the rights to create/remove sub-cgroups, but will insist on managing the delegated cgroup tree's top-level attributes. Or in diff --git a/doc/CODE_QUALITY.md b/doc/CODE_QUALITY.md index a8f573e6fe..d020b19c07 100644 --- a/doc/CODE_QUALITY.md +++ b/doc/CODE_QUALITY.md @@ -29,7 +29,7 @@ available functionality: `./tools/find-tabs.sh recpatch` to fix them. (Again, grain of salt, foreign headers should usually be left unmodified.) -6. Use `ninja -C build check-api-docs` to compare the the list of exported +6. Use `ninja -C build check-api-docs` to compare the list of exported symbols of `libsystemd.so` and `libudev.so` with the list of man pages. Symbols lacking documentation are highlighted. diff --git a/doc/CODING_STYLE b/doc/CODING_STYLE index 2c1577d8aa..26928d2e2d 100644 --- a/doc/CODING_STYLE +++ b/doc/CODING_STYLE @@ -340,7 +340,7 @@ - Avoid leaving long-running child processes around, i.e. fork()s that are not followed quickly by an execv() in the child. Resource management is unclear in this case, and memory CoW will result in - unexpected penalties in the parent much much later on. + unexpected penalties in the parent much, much later on. - Don't block execution for arbitrary amounts of time using usleep() or a similar call, unless you really know what you do. Just "giving @@ -452,7 +452,7 @@ setting. - When referring to a command line option in the documentation and such, please - allways prefix with "--" or "-" (as appropriate), to indicate that it is a + always prefix with "--" or "-" (as appropriate), to indicate that it is a command line option. - When referring to a file system path that is a directory, please always diff --git a/doc/UIDS-GIDS.md b/doc/UIDS-GIDS.md index c380bbe140..7755491319 100644 --- a/doc/UIDS-GIDS.md +++ b/doc/UIDS-GIDS.md @@ -189,7 +189,7 @@ supported for the whole system, back in the days. assign has the lower 16bits all set to zero. That way, the upper 16bits become a container ID of some kind, while the lower 16bits directly encode the internal container UID. This is the way `systemd-nspawn` allocates UID ranges -(see above). Following this allocation logic ensures best compability with +(see above). Following this allocation logic ensures best compatibility with `systemd-nspawn` and all other container managers following the scheme, as it is sufficient then to check NSS for the first UID you pick regarding conflicts, as that's what they do, too. Moreover, it makes `chown()`ing container file |