From: Michael Vogt Date: Thu, 9 Jul 2026 10:34:01 +0000 (+0200) Subject: tree-wide: fix some double word errors like "the the" X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c944af84594d9919bbd45ec2f36e432bfe46ffee;p=thirdparty%2Fsystemd.git tree-wide: fix some double word errors like "the the" By chance (because I had this mistake in my own commit) I noticed that there are a bunch of duplicated works like "the the" in the code and man-pages. This commit fixes them and some similar issues with "and and" etc. --- diff --git a/man/homectl.xml b/man/homectl.xml index bb827d1e6ba..d3cb378e0ee 100644 --- a/man/homectl.xml +++ b/man/homectl.xml @@ -239,7 +239,7 @@ Takes a boolean argument. By default the interactive user creation via firstboot --prompt-new-user screen will show reverse color "chrome" bars at the - top and and the bottom of the terminal screen, which may be disabled by setting this option to + top and the bottom of the terminal screen, which may be disabled by setting this option to false. diff --git a/man/kernel-command-line.xml b/man/kernel-command-line.xml index 3a6a5df8200..768c7653fb4 100644 --- a/man/kernel-command-line.xml +++ b/man/kernel-command-line.xml @@ -833,7 +833,7 @@ systemd.factory_reset= - Controls whether to to boot into factory reset mode, implemented by + Controls whether to boot into factory reset mode, implemented by systemd-factory-reset-generator8, systemd-repart8, and other tools. diff --git a/man/systemd-firstboot.xml b/man/systemd-firstboot.xml index 62e7c36dfe4..7ea2a2084cc 100644 --- a/man/systemd-firstboot.xml +++ b/man/systemd-firstboot.xml @@ -382,7 +382,7 @@ Takes a boolean argument. By default the initial setup screen will show reverse color - "chrome" bars at the top and and the bottom of the terminal screen, which may be disabled by setting + "chrome" bars at the top and the bottom of the terminal screen, which may be disabled by setting this option to false. diff --git a/man/systemd-fstab-generator.xml b/man/systemd-fstab-generator.xml index 606dd33068d..0e97439e4e0 100644 --- a/man/systemd-fstab-generator.xml +++ b/man/systemd-fstab-generator.xml @@ -149,7 +149,7 @@ Takes the /usr/ filesystem to be mounted by the initrd. If mount.usrfstype= or mount.usrflags= is set, then the mount - configured via mount.usr= will default to the the same value set in + configured via mount.usr= will default to the same value set in root=. Set to dissect to explicitly request automatic /usr/ diff --git a/man/systemd-network-generator.service.xml b/man/systemd-network-generator.service.xml index 7b20f8516d0..98e7001e5de 100644 --- a/man/systemd-network-generator.service.xml +++ b/man/systemd-network-generator.service.xml @@ -108,7 +108,7 @@ as a special placeholder rather than a real interface name. Then, in combination with the MAC address provided by BOOTIF=, this is translated into a systemd.network5 file - which matches on the the provided MAC address. When rd.bootif=0 is passed, this functionality + which matches on the provided MAC address. When rd.bootif=0 is passed, this functionality is disabled, and the BOOTIF= option is ignored. See dracut.cmdline7 diff --git a/man/systemd.netdev.xml b/man/systemd.netdev.xml index 66d5334b37b..e50d4bc35d8 100644 --- a/man/systemd.netdev.xml +++ b/man/systemd.netdev.xml @@ -1060,7 +1060,7 @@ Ports=eth2 prp. Defaults to hsr. Both protocols work by sending two copies of every outgoing frame, one for each of the two - ports. The destination node receives the two frames and and keeps only the first one. If a link + ports. The destination node receives the two frames and keeps only the first one. If a link fails, only one of the two frames is received. HSR uses a ring topology where the two outgoing frames are sent in opposite directions in the ring. PRP doesn't need a specific topology, but it requires two completely redundant networks attached to the two ports. diff --git a/man/varlinkctl.xml b/man/varlinkctl.xml index 539b0ea33d7..2bf3368d0ec 100644 --- a/man/varlinkctl.xml +++ b/man/varlinkctl.xml @@ -424,7 +424,7 @@ functionality may be used to consume replies that come with associated file descriptors in a reasonable way. - Now that if is specified the the third parameter to + Now that if is specified the third parameter to call is not optional (i.e. the method call parameters). diff --git a/src/core/namespace.c b/src/core/namespace.c index 3fc0a8652db..04257d82f34 100644 --- a/src/core/namespace.c +++ b/src/core/namespace.c @@ -2628,7 +2628,7 @@ int setup_namespace(const NamespaceParameters *p, char **reterr_path) { root_mount_fd = _root_mount_fd; } - /* Try to to clone the directory mount if we have privs to, so that we can apply the + /* Try to clone the directory mount if we have privs to, so that we can apply the * MS_SLAVE propagation settings right-away. */ if (root_mount_fd < 0) { _root_mount_fd = open_tree_attr_with_fallback( diff --git a/src/fundamental/uki.h b/src/fundamental/uki.h index 627538a0eb0..b6233beeefa 100644 --- a/src/fundamental/uki.h +++ b/src/fundamental/uki.h @@ -15,7 +15,7 @@ typedef enum UnifiedSection { UNIFIED_SECTION_DTB, UNIFIED_SECTION_UNAME, UNIFIED_SECTION_SBAT, - UNIFIED_SECTION_PCRSIG, /* This is is not measured actually */ + UNIFIED_SECTION_PCRSIG, /* This is not measured actually */ UNIFIED_SECTION_PCRPKEY, UNIFIED_SECTION_PROFILE, UNIFIED_SECTION_DTBAUTO, diff --git a/src/resolve/resolved-hook.c b/src/resolve/resolved-hook.c index 9625e64fe25..7caf245f29f 100644 --- a/src/resolve/resolved-hook.c +++ b/src/resolve/resolved-hook.c @@ -23,7 +23,7 @@ * of resolution requests we keep multiple connections open thus, but not too many. */ #define HOOK_IDLE_CONNECTIONS_MAX 4U -/* Encapsulates a specific hook, i.e. bound socket in in the /run/systemd/resolve.hook/ directory */ +/* Encapsulates a specific hook, i.e. bound socket in the /run/systemd/resolve.hook/ directory */ typedef struct Hook { unsigned n_ref; diff --git a/src/shared/mstack.c b/src/shared/mstack.c index 65f38ba3b3d..c8efecca236 100644 --- a/src/shared/mstack.c +++ b/src/shared/mstack.c @@ -456,7 +456,7 @@ static int mstack_load_now(MStack *mstack, const char *dir, int dir_fd, MStackFl if (dir_fd < 0) { _dir_fd = openat(AT_FDCWD, isempty(dir) ? "." : dir, O_DIRECTORY|O_CLOEXEC); if (_dir_fd < 0) - return log_debug_errno(errno, "Failed to to open '%s': %m", dir); + return log_debug_errno(errno, "Failed to open '%s': %m", dir); dir_fd = _dir_fd; } else { diff --git a/src/shared/varlink-io.systemd.Login.c b/src/shared/varlink-io.systemd.Login.c index 3b5a1a59c76..e6fe21eb0f2 100644 --- a/src/shared/varlink-io.systemd.Login.c +++ b/src/shared/varlink-io.systemd.Login.c @@ -26,7 +26,7 @@ SD_VARLINK_DEFINE_ENUM_TYPE( SD_VARLINK_DEFINE_ENUM_VALUE(user_early_light), SD_VARLINK_FIELD_COMMENT("Display manager greeter screen used for login"), SD_VARLINK_DEFINE_ENUM_VALUE(greeter), - SD_VARLINK_FIELD_COMMENT("Similar, but a a lock screen"), + SD_VARLINK_FIELD_COMMENT("Similar, but a lock screen"), SD_VARLINK_DEFINE_ENUM_VALUE(lock_screen), SD_VARLINK_FIELD_COMMENT("Background session (that has no TTY, VT, Seat)"), SD_VARLINK_DEFINE_ENUM_VALUE(background), diff --git a/src/shared/varlink-io.systemd.Resolve.Hook.c b/src/shared/varlink-io.systemd.Resolve.Hook.c index 6fe847ec37c..d247f7688e8 100644 --- a/src/shared/varlink-io.systemd.Resolve.Hook.c +++ b/src/shared/varlink-io.systemd.Resolve.Hook.c @@ -39,7 +39,7 @@ static SD_VARLINK_DEFINE_METHOD( ResolveRecord, SD_VARLINK_FIELD_COMMENT("The question being looked up, i.e. a combination of resource record keys. Note that unlike DNS " "queries on the wire these lookups can carry multiple key requests, albeit closely related ones. " - "Specifically, lookups for A+AAAA for the the same hostname are submitted as one question, as " + "Specifically, lookups for A+AAAA for the same hostname are submitted as one question, as " "are lookups for TXT+SRV when doing DNS-SD resolution. Moreover, when looking up resources with " "non-ASCII characters, they are placed together in a single question, once with labels encoded in " "UTF-8, and once in IDNA. Hook implementations must be able to deal with these and other similar " diff --git a/src/udev/udev-builtin-blkid.c b/src/udev/udev-builtin-blkid.c index 0a75ee8dcfe..dcba83a5bd4 100644 --- a/src/udev/udev-builtin-blkid.c +++ b/src/udev/udev-builtin-blkid.c @@ -187,7 +187,7 @@ static int find_gpt_root(UdevEvent *event, blkid_probe pr, const char *loop_back * hence no need to bother with searching for ESP/XBOOTLDR */ need_esp_or_xbootldr = false; } else - /* We now know the the ESP/xbootldr UUID, but we cannot be sure yet it's on this block + /* We now know the ESP/xbootldr UUID, but we cannot be sure yet it's on this block * device, hence look for it among partitions now */ need_esp_or_xbootldr = true; } else {