From 3ff1721c219479ec51479970f1d81a3aa17e9b50 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 7 Mar 2023 13:04:21 +0100 Subject: [PATCH 1/3] =?UTF-8?q?doc:=20replace=20wrong=20=C3=A1=20prepositi?= =?UTF-8?q?on=20by=20=C3=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- NEWS | 2 +- TODO | 2 +- src/libsystemd/sd-bus/bus-creds.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/NEWS b/NEWS index 4ef7fb2af31..a2a9aa351f2 100644 --- a/NEWS +++ b/NEWS @@ -698,7 +698,7 @@ CHANGES WITH 252 🎃: * ConditionKernelVersion= checks that use the '=' or '!=' operators will now do simple string comparisons (instead of version comparisons - á la stverscmp()). Version comparisons are still done for the + à la stverscmp()). Version comparisons are still done for the ordering operators '<', '>', '<=', '>='. Moreover, if no operator is specified, a shell-style glob match is now done. This creates a minor incompatibility compared to older systemd versions when the '*', '?', diff --git a/TODO b/TODO index 3727b3cab07..541c02cb12f 100644 --- a/TODO +++ b/TODO @@ -718,7 +718,7 @@ Features: what to do if support ended * pam_systemd: on interactive logins, maybe show SUPPORT_END information at - login time, á la motd + login time, à la motd * sd-boot: instead of unconditionally deriving the ESP to search boot loader spec entries in from the paths of sd-boot binary, let's optionally allow it diff --git a/src/libsystemd/sd-bus/bus-creds.c b/src/libsystemd/sd-bus/bus-creds.c index 6e53e942dff..a06f6e659ac 100644 --- a/src/libsystemd/sd-bus/bus-creds.c +++ b/src/libsystemd/sd-bus/bus-creds.c @@ -661,8 +661,8 @@ static int has_cap(sd_bus_creds *c, size_t offset, int capability) { if ((unsigned) capability > lc) return 0; - /* If the last cap is 63, then there are 64 caps defined, and we need 2 entries á 32bit hence. * - * If the last cap is 64, then there are 65 caps defined, and we need 3 entries á 32bit hence. */ + /* If the last cap is 63, then there are 64 caps defined, and we need 2 entries à 32bit hence. * + * If the last cap is 64, then there are 65 caps defined, and we need 3 entries à 32bit hence. */ sz = DIV_ROUND_UP(lc+1, 32LU); return !!(c->capability[offset * sz + CAP_TO_INDEX((uint32_t) capability)] & CAP_TO_MASK_CORRECTED((uint32_t) capability)); From e6faa51a8498b36953620a37bab3ce009353c21a Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 7 Mar 2023 13:06:14 +0100 Subject: [PATCH 2/3] doc: replace wrong idiom in homed comment --- src/home/homework-luks.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/home/homework-luks.c b/src/home/homework-luks.c index 2ea98878537..8912b3df524 100644 --- a/src/home/homework-luks.c +++ b/src/home/homework-luks.c @@ -2980,8 +2980,8 @@ static int resize_fs_loop( return r; /* For now, when we fail to shrink an ext4 image we'll not try again via the - * bisection logic. We might add that later, but give this involves shelling out - * multiple programs it's a bit too cumbersome to my taste. */ + * bisection logic. We might add that later, but given this involves shelling out + * multiple programs, it's a bit too cumbersome for my taste. */ worked = true; current_fs_size = try_fs_size; From 18fe76eba59dc494597b07e0114899b69f92cc12 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 7 Mar 2023 12:51:31 +0100 Subject: [PATCH 3/3] doc: correct wrong use "'s" contractions --- .github/ISSUE_TEMPLATE/bug_report.yml | 2 +- docs/NETWORK_ONLINE.md | 2 +- man/systemd-dissect.xml | 2 +- src/basic/chase-symlinks.c | 2 +- src/core/job.c | 2 +- src/core/unit.c | 2 +- src/home/homed-manager.c | 2 +- src/shared/bus-unit-util.c | 2 +- units/systemd-time-wait-sync.service.in | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 3a3dbb70e88..898fa33ec4e 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -26,7 +26,7 @@ body: id: distro attributes: label: Used distribution - description: Used distribution and it's version + description: Used distribution and its version placeholder: Fedora 36 validations: required: false diff --git a/docs/NETWORK_ONLINE.md b/docs/NETWORK_ONLINE.md index a8d929e4ab4..e97d8f4f309 100644 --- a/docs/NETWORK_ONLINE.md +++ b/docs/NETWORK_ONLINE.md @@ -152,7 +152,7 @@ For details, see the next question. ## What does "up" actually mean? -The services that are ordered before `network-online.target` define it's +The services that are ordered before `network-online.target` define its meaning. *Usually* means that all configured network devices are up and have an IP address assigned, but details may vary. In particular, configuration may affect which interfaces are taken into account. diff --git a/man/systemd-dissect.xml b/man/systemd-dissect.xml index 6549aa92c85..8dd1305761b 100644 --- a/man/systemd-dissect.xml +++ b/man/systemd-dissect.xml @@ -149,7 +149,7 @@ a directory where an OS image was mounted. All mounted partitions will be recursively unmounted, and the underlying loop device will be - removed, along with all it's partition sub-devices. + removed, along with all its partition sub-devices. diff --git a/src/basic/chase-symlinks.c b/src/basic/chase-symlinks.c index 8a769e08e81..f134d369253 100644 --- a/src/basic/chase-symlinks.c +++ b/src/basic/chase-symlinks.c @@ -135,7 +135,7 @@ int chase_symlinks_at( * Algorithmically this operates on two path buffers: "done" are the components of the path we * already processed and resolved symlinks, "." and ".." of. "todo" are the components of the path we * still need to process. On each iteration, we move one component from "todo" to "done", processing - * it's special meaning each time. We always keep an O_PATH fd to the component we are currently + * its special meaning each time. We always keep an O_PATH fd to the component we are currently * processing, thus keeping lookup races to a minimum. * * Suggested usage: whenever you want to canonicalize a path, use this function. Pass the absolute diff --git a/src/core/job.c b/src/core/job.c index 032554a0ac5..334fbf770e4 100644 --- a/src/core/job.c +++ b/src/core/job.c @@ -1001,7 +1001,7 @@ int job_finish_and_invalidate(Job *j, JobResult result, bool recursive, bool alr } /* A special check to make sure we take down anything RequisiteOf= if we aren't active. This is when - * the verify-active job merges with a satisfying job type, and then loses it's invalidation effect, + * the verify-active job merges with a satisfying job type, and then loses its invalidation effect, * as the result there is JOB_DONE for the start job we merged into, while we should be failing the * depending job if the said unit isn't in fact active. Oneshots are an example of this, where going * directly from activating to inactive is success. diff --git a/src/core/unit.c b/src/core/unit.c index a67dceb31fa..f5544cbd924 100644 --- a/src/core/unit.c +++ b/src/core/unit.c @@ -905,7 +905,7 @@ static int unit_reserve_dependencies(Unit *u, Unit *other) { /* Let's reserve some space in the dependency hashmaps so that later on merging the units cannot * fail. * - * First make some room in the per dependency type hashmaps. Using the summed size of both unit's + * First make some room in the per dependency type hashmaps. Using the summed size of both units' * hashmaps is an estimate that is likely too high since they probably use some of the same * types. But it's never too low, and that's all we need. */ diff --git a/src/home/homed-manager.c b/src/home/homed-manager.c index 76b038caddb..84b5618671c 100644 --- a/src/home/homed-manager.c +++ b/src/home/homed-manager.c @@ -1626,7 +1626,7 @@ void manager_revalidate_image(Manager *m, Home *h) { assert(h); /* Frees an automatically discovered image, if it's synthetic and its image disappeared. Unmounts any - * image if it's mounted but it's image vanished. */ + * image if it's mounted but its image vanished. */ if (h->current_operation || !ordered_set_isempty(h->pending_operations)) return; diff --git a/src/shared/bus-unit-util.c b/src/shared/bus-unit-util.c index badd61656c6..6966cfd8389 100644 --- a/src/shared/bus-unit-util.c +++ b/src/shared/bus-unit-util.c @@ -2757,7 +2757,7 @@ int unit_load_state(sd_bus *bus, const char *name, char **load_state) { if (!path) return log_oom(); - /* This function warns on it's own, because otherwise it'd be awkward to pass + /* This function warns on its own, because otherwise it'd be awkward to pass * the dbus error message around. */ r = sd_bus_get_property_string( diff --git a/units/systemd-time-wait-sync.service.in b/units/systemd-time-wait-sync.service.in index 8ef3db0d5df..d14491a01e5 100644 --- a/units/systemd-time-wait-sync.service.in +++ b/units/systemd-time-wait-sync.service.in @@ -11,7 +11,7 @@ Description=Wait Until Kernel Time Synchronized Documentation=man:systemd-time-wait-sync.service(8) -# Note that this tool doesn't need CAP_SYS_TIME itself, but it's primary +# Note that this tool doesn't need CAP_SYS_TIME itself, but its primary # usecase is to run in conjunction with a local NTP service such as # systemd-timesyncd.service, which is conditioned this way. There might be # niche usecases where running this service independently is desired, but let's