diff options
| -rw-r--r-- | docs/CODING_STYLE.md | 2 | ||||
| -rw-r--r-- | docs/PREDICTABLE_INTERFACE_NAMES.md | 2 | ||||
| -rw-r--r-- | man/sd_bus_add_object.xml | 2 | ||||
| -rw-r--r-- | src/core/manager.h | 2 | ||||
| -rw-r--r-- | src/hostname/hostnamectl.c | 2 | ||||
| -rw-r--r-- | src/libsystemd/sd-bus/bus-socket.c | 4 | ||||
| -rw-r--r-- | src/libsystemd/sd-bus/sd-bus.c | 2 | ||||
| -rw-r--r-- | src/udev/dmi_memory_id/dmi_memory_id.c | 2 |
8 files changed, 9 insertions, 9 deletions
diff --git a/docs/CODING_STYLE.md b/docs/CODING_STYLE.md index 4792f270c5..34e04ed735 100644 --- a/docs/CODING_STYLE.md +++ b/docs/CODING_STYLE.md @@ -297,7 +297,7 @@ SPDX-License-Identifier: LGPL-2.1-or-later with a more brutal `assert()`. We are more forgiving to public users than for ourselves! Note that `assert()` and `assert_return()` really only should be used for detecting programming errors, not for runtime errors. `assert()` and - `assert_return()` by usage of `_likely_()` inform the compiler that he should + `assert_return()` by usage of `_likely_()` inform the compiler that it should not expect these checks to fail, and they inform fellow programmers about the expected validity and range of parameters. diff --git a/docs/PREDICTABLE_INTERFACE_NAMES.md b/docs/PREDICTABLE_INTERFACE_NAMES.md index ddd7d29643..ae16d7211d 100644 --- a/docs/PREDICTABLE_INTERFACE_NAMES.md +++ b/docs/PREDICTABLE_INTERFACE_NAMES.md @@ -54,7 +54,7 @@ With this new scheme you now get: * The same on all distributions that adopted systemd/udev * It's easy to opt out of the scheme (see below) -Does this have any drawbacks? Yes, it does. Previously it was practically guaranteed that hosts equipped with a single ethernet card only had a single `eth0` interface. With this new scheme in place, an administrator now has to check first what the local interface name is before he can invoke commands on it where previously he had a good chance that `eth0` was the right name. +Does this have any drawbacks? Yes, it does. Previously it was practically guaranteed that hosts equipped with a single ethernet card only had a single `eth0` interface. With this new scheme in place, an administrator now has to check first what the local interface name is before they can invoke commands on it, where previously they had a good chance that `eth0` was the right name. ## I don't like this, how do I disable this? diff --git a/man/sd_bus_add_object.xml b/man/sd_bus_add_object.xml index 31a3344bbd..54683e4f11 100644 --- a/man/sd_bus_add_object.xml +++ b/man/sd_bus_add_object.xml @@ -508,7 +508,7 @@ <varlistentry> <term><constant>SD_BUS_VTABLE_METHOD_NO_REPLY</constant></term> - <listitem><para>Mark his vtable entry as a method that will not return a reply using the + <listitem><para>Mark this vtable entry as a method that will not return a reply using the <constant>org.freedesktop.DBus.Method.NoReply</constant> annotation in introspection data. </para></listitem> </varlistentry> diff --git a/src/core/manager.h b/src/core/manager.h index c9230cb5c4..a6b27c3777 100644 --- a/src/core/manager.h +++ b/src/core/manager.h @@ -195,7 +195,7 @@ struct Manager { sd_event *event; - /* This maps PIDs we care about to units that are interested in. We allow multiple units to he interested in + /* This maps PIDs we care about to units that are interested in. We allow multiple units to be interested in * the same PID and multiple PIDs to be relevant to the same unit. Since in most cases only a single unit will * be interested in the same PID we use a somewhat special encoding here: the first unit interested in a PID is * stored directly in the hashmap, keyed by the PID unmodified. If there are other units interested too they'll diff --git a/src/hostname/hostnamectl.c b/src/hostname/hostnamectl.c index 26869a8d71..b525aaa642 100644 --- a/src/hostname/hostnamectl.c +++ b/src/hostname/hostnamectl.c @@ -442,7 +442,7 @@ static int set_hostname(int argc, char **argv, void *userdata) { * dot if there is one. If it was not valid, then it will be made fully valid by truncating, dropping * multiple dots, and dropping weird chars. Note that we clean the name up only if we also are * supposed to set the pretty name. If the pretty name is not being set we assume the user knows what - * he does and pass the name as-is. */ + * they are doing and pass the name as-is. */ h = strdup(hostname); if (!h) return log_oom(); diff --git a/src/libsystemd/sd-bus/bus-socket.c b/src/libsystemd/sd-bus/bus-socket.c index a603764c27..bce123ae1c 100644 --- a/src/libsystemd/sd-bus/bus-socket.c +++ b/src/libsystemd/sd-bus/bus-socket.c @@ -301,8 +301,8 @@ static int verify_external_token(sd_bus *b, const char *p, size_t l) { uid_t u; int r; - /* We don't do any real authentication here. Instead, we if - * the owner of this bus wanted authentication he should have + /* We don't do any real authentication here. Instead, if + * the owner of this bus wanted authentication they should have * checked SO_PEERCRED before even creating the bus object. */ if (!b->anonymous_auth && !b->ucred_valid) diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c index 968b37e826..9e1d29cc1d 100644 --- a/src/libsystemd/sd-bus/sd-bus.c +++ b/src/libsystemd/sd-bus/sd-bus.c @@ -3283,7 +3283,7 @@ static int bus_poll(sd_bus *bus, bool need_more, uint64_t timeout_usec) { return e; if (need_more) - /* The caller really needs some more data, he doesn't + /* The caller really needs some more data, they don't * care about what's already read, or any timeouts * except its own. */ e |= POLLIN; diff --git a/src/udev/dmi_memory_id/dmi_memory_id.c b/src/udev/dmi_memory_id/dmi_memory_id.c index 14b893ae8f..67861cd364 100644 --- a/src/udev/dmi_memory_id/dmi_memory_id.c +++ b/src/udev/dmi_memory_id/dmi_memory_id.c @@ -539,7 +539,7 @@ static void dmi_table_decode(const uint8_t *buf, size_t len, uint16_t num) { /* If a short entry is found (less than 4 bytes), not only it * is invalid, but we cannot reliably locate the next entry. - * Better stop at this point, and let the user know his/her + * Better stop at this point, and let the user know their * table is broken. */ if (h.length < 4) break; |