diff --git a/NEWS b/NEWS index 6db192a06d8..814e3e47e90 100644 --- a/NEWS +++ b/NEWS @@ -282,9 +282,9 @@ CHANGES WITH 249 in spe: * A new ConditionOSRelease= setting has been added to unit files to check os-release(5) fields. The "=", "!=", "<", "<=", ">=", ">" operators may be used to check if some field has some specific value - or do a aphanumerical comparison. Equality comparisons are useful for - fields like ID, but relative comparisons for fields like VERSION_ID - or IMAGE_VERSION. + or do an alphanumerical comparison. Equality comparisons are useful + for fields like ID, but relative comparisons for fields like + VERSION_ID or IMAGE_VERSION. * hostnamed gained a new Describe() D-Bus method that returns a JSON serialization of the host data it exposes. This is exposed via @@ -1332,7 +1332,7 @@ CHANGES WITH 247: all system calls known at the time systemd was built. * Behaviour of system call filter allow lists has changed slightly: - system calls that are contained in @known will result in a EPERM by + system calls that are contained in @known will result in EPERM by default, while those not contained in it result in ENOSYS. This should improve compatibility because known system calls will thus be communicated as prohibited, while unknown (and thus newer ones) will @@ -5803,7 +5803,7 @@ CHANGES WITH 233: * sd-id128 gained a new API for generating unique IDs for the host in a way that does not leak the machine ID. Specifically, sd_id128_get_machine_app_specific() derives an ID based on the - machine ID a in well-defined, non-reversible, stable way. This is + machine ID in a well-defined, non-reversible, stable way. This is useful whenever an identifier for the host is needed but where the identifier shall not be useful to identify the system beyond the scope of the application itself. (Internally this uses HMAC-SHA256 as @@ -8053,7 +8053,7 @@ CHANGES WITH 220: * udev will no longer create device symlinks for all block devices by default. A deny list for excluding special block devices from this - logic has been turned into a allow list that requires picking block + logic has been turned into an allow list that requires picking block devices explicitly that require device symlinks. * A new (currently still internal) API sd-device.h has been diff --git a/docs/USERDB_AND_DESKTOPS.md b/docs/USERDB_AND_DESKTOPS.md index a19f746a26f..babaaaf3c7e 100644 --- a/docs/USERDB_AND_DESKTOPS.md +++ b/docs/USERDB_AND_DESKTOPS.md @@ -56,7 +56,7 @@ and only switches back to the shell's UI after the user re-authenticated there. Note that this change in behavior is a good idea in any case, and does not create any dependencies on `systemd-homed` or systemd-specific APIs. It's simply a change of behavior regarding use of existing APIs, not a suggested -hook-up to a any new API. +hook-up to any new APIs. A display manager which supports this kind of out-of-context screen lock operation needs to inform systemd-homed about this so that systemd-homed knows diff --git a/docs/USER_RECORD.md b/docs/USER_RECORD.md index 11ab31b9331..73dfc5bec41 100644 --- a/docs/USER_RECORD.md +++ b/docs/USER_RECORD.md @@ -685,11 +685,11 @@ in full). The following fields are defined in this section: -`matchMachineId` → An array of strings with each a formatted 128bit ID in +`matchMachineId` → An array of strings that are formatted 128bit IDs in hex. If any of the specified IDs match the system's local machine ID (i.e. matches `/etc/machine-id`) the fields in this object are honored. -`matchHostname` → An array of string with a each a valid hostname. If any of +`matchHostname` → An array of strings that are valid hostnames. If any of the specified hostnames match the system's local hostname, the fields in this object are honored. If both `matchHostname` and `matchMachineId` are used within the same array entry, the object is honored when either match succeeds, diff --git a/man/busctl.xml b/man/busctl.xml index 912f3026414..cc5a6508ef6 100644 --- a/man/busctl.xml +++ b/man/busctl.xml @@ -122,7 +122,7 @@ emit OBJECT INTERFACE SIGNAL SIGNATURE ARGUMENT - Emit a signal. Takes a object path, interface name and method name. If parameters + Emit a signal. Takes an object path, interface name and method name. If parameters shall be passed, a signature string is required, followed by the arguments, individually formatted as strings. For details on the formatting used, see below. To specify the destination of the signal, use the option. diff --git a/man/sd_bus_set_fd.xml b/man/sd_bus_set_fd.xml index 14c87a2ae10..a79458a5340 100644 --- a/man/sd_bus_set_fd.xml +++ b/man/sd_bus_set_fd.xml @@ -45,7 +45,7 @@ sd_bus_set_fd() sets the file descriptors used to communicate by a bus connection object. Both input_fd and output_fd must be valid file descriptors, referring to stream-based file objects (e.g. a stream socket, a pair of pipes or - FIFOs, or a even a TTY device). input_fd must be readable, and + FIFOs, or even a TTY device). input_fd must be readable, and output_fd must be writable. The same file descriptor may be used (and typically is used) as both the input and the output file descriptor. This function must be called before the bus connection is started via diff --git a/man/sd_event_source_set_ratelimit.xml b/man/sd_event_source_set_ratelimit.xml index 754bfbe3b21..ac8529074af 100644 --- a/man/sd_event_source_set_ratelimit.xml +++ b/man/sd_event_source_set_ratelimit.xml @@ -121,7 +121,7 @@ -ENOEXEC - sd_event_source_get_ratelimit() was called on a event source + sd_event_source_get_ratelimit() was called on an event source that doesn't have rate limiting configured. diff --git a/man/systemd.link.xml b/man/systemd.link.xml index 3323b028de5..1093e2e0b84 100644 --- a/man/systemd.link.xml +++ b/man/systemd.link.xml @@ -144,7 +144,7 @@ Property= - A whitespace-separated list of udev property name with its value after a equal + A whitespace-separated list of udev property names with their values after equals sign (=). If multiple properties are specified, the test results are ANDed. If the list is prefixed with a "!", the test is inverted. If a value contains white spaces, then please quote whole key and value pair. If a value contains quotation, then diff --git a/man/systemd.netdev.xml b/man/systemd.netdev.xml index 11442f2b828..1d1d71786fa 100644 --- a/man/systemd.netdev.xml +++ b/man/systemd.netdev.xml @@ -1108,7 +1108,7 @@ KeyFile= - Takes a absolute path to a file which contains a 128-bit key encoded in a hexadecimal string, + Takes an absolute path to a file which contains a 128-bit key encoded in a hexadecimal string, which will be used in the transmission channel. When this option is specified, Key= is ignored. Note that the file must be readable by the user systemd-network, so it should be, e.g., owned by diff --git a/man/systemd.network.xml b/man/systemd.network.xml index c2364cc345c..77d7ce5c18b 100644 --- a/man/systemd.network.xml +++ b/man/systemd.network.xml @@ -944,7 +944,7 @@ IPv6Token=prefixstable:2002:da8:1:: VXLAN= Xfrm= - The name of a IPVLAN, IPVTAP, L2TP, MACsec, MACVLAN, MACVTAP, tunnel, VLAN, VXLAN, or + The name of an IPVLAN, IPVTAP, L2TP, MACsec, MACVLAN, MACVTAP, tunnel, VLAN, VXLAN, or Xfrm to be created on the link. See systemd.netdev5. This option may be specified more than once. @@ -3495,7 +3495,7 @@ IPv6Token=prefixstable:2002:da8:1:: VirtualQueues= - Specifies the number of virtual queues. Takes a integer in the range 1…16. Defaults to unset + Specifies the number of virtual queues. Takes an integer in the range 1…16. Defaults to unset and kernel's default is used. diff --git a/shell-completion/zsh/_systemd-nspawn b/shell-completion/zsh/_systemd-nspawn index 11c86df06c0..384e3f2c308 100644 --- a/shell-completion/zsh/_systemd-nspawn +++ b/shell-completion/zsh/_systemd-nspawn @@ -28,7 +28,7 @@ _arguments \ '--private-network[Disconnect networking of the container from the host.]' \ '--network-interface=[Assign the specified network interface to the container.]: : _net_interfaces' \ '--network-macvlan=[Create a "macvlan" interface of the specified Ethernet network interface and add it to the container.]: : _net_interfaces' \ - '--network-ipvlan=[Create a ipvlan network interface based on an existing network interface to the container.]: : _net_interfaces' \ + '--network-ipvlan=[Create an "ipvlan" network interface based on an existing network interface to the container.]: : _net_interfaces' \ {--network-veth,-n}'[Create a virtual Ethernet link (veth) between host and container.]' \ '--network-bridge=[Adds the host side of the Ethernet link created with --network-veth to the specified bridge.]: : _net_interfaces' \ {--port=,-p+}'[Expose a container IP port on the host.]: : _message port' \ diff --git a/src/basic/conf-files.c b/src/basic/conf-files.c index f8c997673a6..edd73b04775 100644 --- a/src/basic/conf-files.c +++ b/src/basic/conf-files.c @@ -92,7 +92,7 @@ static int files_add( if (flags & (CONF_FILES_REGULAR|CONF_FILES_DIRECTORY)) if (!((flags & CONF_FILES_DIRECTORY) && S_ISDIR(st.st_mode)) && !((flags & CONF_FILES_REGULAR) && S_ISREG(st.st_mode))) { - log_debug("Ignoring '%s/%s', as it is not a of the right type.", dirpath, de->d_name); + log_debug("Ignoring '%s/%s', as it does not have the right type.", dirpath, de->d_name); continue; } diff --git a/src/basic/hashmap.c b/src/basic/hashmap.c index 34fed69d997..9ed69bd3d27 100644 --- a/src/basic/hashmap.c +++ b/src/basic/hashmap.c @@ -112,7 +112,7 @@ assert_cc(IDX_FIRST == _IDX_SWAP_END); assert_cc(IDX_FIRST == _IDX_ITERATOR_FIRST); /* Storage space for the "swap" buckets. - * All entry types can fit into a ordered_hashmap_entry. */ + * All entry types can fit into an ordered_hashmap_entry. */ struct swap_entries { struct ordered_hashmap_entry e[_IDX_SWAP_END - _IDX_SWAP_BEGIN]; }; diff --git a/src/basic/hashmap.h b/src/basic/hashmap.h index f7ade2e774f..eafc08f6586 100644 --- a/src/basic/hashmap.h +++ b/src/basic/hashmap.h @@ -224,7 +224,7 @@ static inline int ordered_hashmap_remove_and_replace(OrderedHashmap *h, const vo return hashmap_remove_and_replace(PLAIN_HASHMAP(h), old_key, new_key, value); } -/* Since merging data from a OrderedHashmap into a Hashmap or vice-versa +/* Since merging data from an OrderedHashmap into a Hashmap or vice-versa * should just work, allow this by having looser type-checking here. */ int _hashmap_merge(Hashmap *h, Hashmap *other); #define hashmap_merge(h, other) _hashmap_merge(PLAIN_HASHMAP(h), PLAIN_HASHMAP(other)) diff --git a/src/core/execute.c b/src/core/execute.c index a83b1b56948..af24f9f7135 100644 --- a/src/core/execute.c +++ b/src/core/execute.c @@ -6251,7 +6251,7 @@ int exec_runtime_acquire(Manager *m, const ExecContext *c, const char *id, bool rt = hashmap_get(m->exec_runtime_by_id, id); if (rt) - /* We already have a ExecRuntime object, let's increase the ref count and reuse it */ + /* We already have an ExecRuntime object, let's increase the ref count and reuse it */ goto ref; if (!create) { diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c index b0f24695409..7dbc58f950d 100644 --- a/src/core/load-fragment.c +++ b/src/core/load-fragment.c @@ -3195,7 +3195,7 @@ int config_parse_syscall_filter( /* Allow nothing but the ones listed */ c->syscall_allow_list = true; - /* Accept default syscalls if we are on a allow_list */ + /* Accept default syscalls if we are on an allow_list */ r = seccomp_parse_syscall_filter( "@default", -1, c->syscall_filter, SECCOMP_PARSE_PERMISSIVE|SECCOMP_PARSE_ALLOW_LIST, diff --git a/src/gpt-auto-generator/gpt-auto-generator.c b/src/gpt-auto-generator/gpt-auto-generator.c index 705e138b8d2..10aa2d98a1e 100644 --- a/src/gpt-auto-generator/gpt-auto-generator.c +++ b/src/gpt-auto-generator/gpt-auto-generator.c @@ -633,7 +633,7 @@ static int add_root_mount(void) { int r; if (!is_efi_boot()) { - log_debug("Not a EFI boot, not creating root mount."); + log_debug("Not an EFI boot, not creating root mount."); return 0; } diff --git a/src/libudev/libudev-enumerate.c b/src/libudev/libudev-enumerate.c index 33bd360188f..2dc695bd03f 100644 --- a/src/libudev/libudev-enumerate.c +++ b/src/libudev/libudev-enumerate.c @@ -93,7 +93,7 @@ static struct udev_enumerate *udev_enumerate_free(struct udev_enumerate *udev_en * udev_enumerate_ref: * @udev_enumerate: context * - * Take a reference of a enumeration context. + * Take a reference of an enumeration context. * * Returns: the passed enumeration context **/ diff --git a/src/login/logind.h b/src/login/logind.h index 49d1f5f957c..761763a4762 100644 --- a/src/login/logind.h +++ b/src/login/logind.h @@ -72,7 +72,7 @@ struct Manager { * this is != 0 and encodes what is being done */ InhibitWhat action_what; - /* If a shutdown/suspend was delayed due to a inhibitor this + /* If a shutdown/suspend was delayed due to an inhibitor this contains the unit name we are supposed to start after the delay is over */ const char *action_unit; diff --git a/src/network/networkd-ipv6-proxy-ndp.c b/src/network/networkd-ipv6-proxy-ndp.c index f82aa7ea4cc..a332eaefac0 100644 --- a/src/network/networkd-ipv6-proxy-ndp.c +++ b/src/network/networkd-ipv6-proxy-ndp.c @@ -47,7 +47,7 @@ static int ipv6_proxy_ndp_address_configure_handler(sd_netlink *rtnl, sd_netlink return 1; } -/* send a request to the kernel to add a IPv6 Proxy entry to the neighbour table */ +/* send a request to the kernel to add an IPv6 Proxy entry to the neighbour table */ static int ipv6_proxy_ndp_address_configure( const struct in6_addr *address, Link *link, diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c index c0a1da3851f..04685fecbaf 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c @@ -368,7 +368,7 @@ static int help(void) { " Create a macvlan network interface based on an\n" " existing network interface to the container\n" " --network-ipvlan=INTERFACE\n" - " Create a ipvlan network interface based on an\n" + " Create an ipvlan network interface based on an\n" " existing network interface to the container\n" " -n --network-veth Add a virtual Ethernet connection between host\n" " and container\n" diff --git a/src/resolve/resolved-dns-server.c b/src/resolve/resolved-dns-server.c index 3ba771726cb..e7a4bce71a4 100644 --- a/src/resolve/resolved-dns-server.c +++ b/src/resolve/resolved-dns-server.c @@ -533,7 +533,7 @@ DnsServerFeatureLevel dns_server_possible_feature_level(DnsServer *s) { DNS_SERVER_FEATURE_LEVEL_IS_DNSSEC(s->possible_feature_level) && dns_server_get_dnssec_mode(s) != DNSSEC_YES) { - /* RRSIG data was missing on a EDNS0 packet with DO bit set. This means the server + /* RRSIG data was missing on an EDNS0 packet with DO bit set. This means the server * doesn't augment responses with DNSSEC RRs. If so, let's better not ask the server * for it anymore, after all some servers generate different replies depending if an * OPT RR is in the query or not. If we are in strict DNSSEC mode, don't allow such diff --git a/src/shared/bus-map-properties.h b/src/shared/bus-map-properties.h index 2a766e3cc02..e9f4a92ff23 100644 --- a/src/shared/bus-map-properties.h +++ b/src/shared/bus-map-properties.h @@ -14,7 +14,7 @@ struct bus_properties_map { enum { BUS_MAP_STRDUP = 1 << 0, /* If set, each "s" message is duplicated. Thus, each pointer needs to be freed. */ - BUS_MAP_BOOLEAN_AS_BOOL = 1 << 1, /* If set, each "b" message is written to a bool pointer. If not set, "b" is written to a int pointer. */ + BUS_MAP_BOOLEAN_AS_BOOL = 1 << 1, /* If set, each "b" message is written to a bool pointer. If not set, "b" is written to an int pointer. */ }; int bus_map_id128(sd_bus *bus, const char *member, sd_bus_message *m, sd_bus_error *error, void *userdata); diff --git a/src/shared/firewall-util-nft.c b/src/shared/firewall-util-nft.c index ecabc5fc404..e68978d777f 100644 --- a/src/shared/firewall-util-nft.c +++ b/src/shared/firewall-util-nft.c @@ -561,7 +561,7 @@ static int nft_add_element(sd_netlink *nfnl, sd_netlink_message **ret, /* * Ideally there would be an API that provides: * - * 1) a init function to add the main ruleset skeleton + * 1) an init function to add the main ruleset skeleton * 2) a function that populates the sets with all known address/port pairs to s/dnat for * 3) a function that can remove address/port pairs again. * diff --git a/src/shared/format-table.c b/src/shared/format-table.c index 85d38ae8f81..c4c34395417 100644 --- a/src/shared/format-table.c +++ b/src/shared/format-table.c @@ -2694,7 +2694,7 @@ int table_print_with_pager( assert(t); - /* A all-in-one solution for showing tables, and turning on a pager first. Also optionally suppresses + /* An all-in-one solution for showing tables, and turning on a pager first. Also optionally suppresses * the table header and logs about any error. */ if (json_format_flags & (JSON_FORMAT_OFF|JSON_FORMAT_PRETTY|JSON_FORMAT_PRETTY_AUTO)) diff --git a/src/shared/json.c b/src/shared/json.c index ea4b46ff261..c52460a3ece 100644 --- a/src/shared/json.c +++ b/src/shared/json.c @@ -4242,7 +4242,7 @@ int json_dispatch_uid_gid(const char *name, JsonVariant *variant, JsonDispatchFl } if (!json_variant_is_unsigned(variant)) - return json_log(variant, flags, SYNTHETIC_ERRNO(EINVAL), "JSON field '%s' is not a integer.", strna(name)); + return json_log(variant, flags, SYNTHETIC_ERRNO(EINVAL), "JSON field '%s' is not an integer.", strna(name)); k = json_variant_unsigned(variant); if (k > UINT32_MAX || !uid_is_valid(k)) diff --git a/src/shared/user-record.c b/src/shared/user-record.c index de949c57e36..17460ceaf67 100644 --- a/src/shared/user-record.c +++ b/src/shared/user-record.c @@ -708,7 +708,7 @@ static int json_dispatch_tasks_or_memory_max(const char *name, JsonVariant *vari } if (!json_variant_is_unsigned(variant)) - return json_log(variant, flags, SYNTHETIC_ERRNO(EINVAL), "JSON field '%s' is not a integer.", strna(name)); + return json_log(variant, flags, SYNTHETIC_ERRNO(EINVAL), "JSON field '%s' is not an integer.", strna(name)); k = json_variant_unsigned(variant); if (k <= 0 || k >= UINT64_MAX) @@ -728,7 +728,7 @@ static int json_dispatch_weight(const char *name, JsonVariant *variant, JsonDisp } if (!json_variant_is_unsigned(variant)) - return json_log(variant, flags, SYNTHETIC_ERRNO(EINVAL), "JSON field '%s' is not a integer.", strna(name)); + return json_log(variant, flags, SYNTHETIC_ERRNO(EINVAL), "JSON field '%s' is not an integer.", strna(name)); k = json_variant_unsigned(variant); if (k <= CGROUP_WEIGHT_MIN || k >= CGROUP_WEIGHT_MAX) diff --git a/src/shutdown/shutdown.c b/src/shutdown/shutdown.c index 29b24906a6f..a98cfc4d8ae 100644 --- a/src/shutdown/shutdown.c +++ b/src/shutdown/shutdown.c @@ -489,7 +489,7 @@ int main(int argc, char *argv[]) { if (!changed && umount_log_level == LOG_INFO && !can_initrd) { /* There are things we cannot get rid of. Loop one more time * with LOG_ERR to inform the user. Note that we don't need - * to do this if there is a initrd to switch to, because that + * to do this if there is an initrd to switch to, because that * one is likely to get rid of the remaining mounts. If not, * it will log about them. */ umount_log_level = LOG_ERR; diff --git a/src/sysusers/sysusers.c b/src/sysusers/sysusers.c index 6472d73cfee..a18634d2549 100644 --- a/src/sysusers/sysusers.c +++ b/src/sysusers/sysusers.c @@ -1588,7 +1588,7 @@ static int parse_line(const char *fname, unsigned line, const char *buffer) { if (!resolved_id) return log_error_errno(SYNTHETIC_ERRNO(EINVAL), - "[%s:%u] Lines of type 'r' require a ID range in the third field.", + "[%s:%u] Lines of type 'r' require an ID range in the third field.", fname, line); if (description || home || shell) diff --git a/src/tty-ask-password-agent/tty-ask-password-agent.c b/src/tty-ask-password-agent/tty-ask-password-agent.c index 08e191faf02..59b144972b8 100644 --- a/src/tty-ask-password-agent/tty-ask-password-agent.c +++ b/src/tty-ask-password-agent/tty-ask-password-agent.c @@ -531,7 +531,7 @@ static int parse_argv(int argc, char *argv[]) { /* * To be able to ask on all terminal devices of /dev/console the devices are collected. If more than one - * device is found, then on each of the terminals a inquiring task is forked. Every task has its own session + * device is found, then on each of the terminals an inquiring task is forked. Every task has its own session * and its own controlling terminal. If one of the tasks does handle a password, the remaining tasks will be * terminated. */ diff --git a/src/udev/ata_id/ata_id.c b/src/udev/ata_id/ata_id.c index 0284630fa0b..1fc27f4b642 100644 --- a/src/udev/ata_id/ata_id.c +++ b/src/udev/ata_id/ata_id.c @@ -297,7 +297,7 @@ static void disk_identify_fixup_uint16 (uint8_t identify[512], unsigned offset_w * disk_identify: * @fd: File descriptor for the block device. * @out_identify: Return location for IDENTIFY data. - * @out_is_packet_device: Return location for whether returned data is from a IDENTIFY PACKET DEVICE. + * @out_is_packet_device: Return location for whether returned data is from an IDENTIFY PACKET DEVICE. * * Sends the IDENTIFY DEVICE or IDENTIFY PACKET DEVICE command to the * device represented by @fd. If successful, then the result will be