diff options
| -rw-r--r-- | TODO | 2 | ||||
| -rw-r--r-- | man/crypttab.xml | 2 | ||||
| -rw-r--r-- | man/systemd.network.xml | 2 | ||||
| -rw-r--r-- | src/home/homed-manager.h | 2 | ||||
| -rw-r--r-- | src/nspawn/nspawn.c | 4 | ||||
| -rw-r--r-- | src/resolve/resolved-dns-scope.c | 2 | ||||
| -rw-r--r-- | src/shared/bootspec.c | 2 | ||||
| -rw-r--r-- | src/shared/cryptsetup-util.c | 2 |
8 files changed, 9 insertions, 9 deletions
@@ -473,7 +473,7 @@ Features: * Add support for extra verity configuration options to systemd-repart (FEC, hash type, etc) -* chase_symlinks(): take inspiraton from path_extract_filename() and return +* chase_symlinks(): take inspiration from path_extract_filename() and return O_DIRECTORY if input path contains trailing slash. * chase_symlinks(): refuse resolution if trailing slash is specified on input, diff --git a/man/crypttab.xml b/man/crypttab.xml index cbbb8ab2a9..896a62358d 100644 --- a/man/crypttab.xml +++ b/man/crypttab.xml @@ -781,7 +781,7 @@ and use this to determine which key to send, allowing a single listening socket to serve keys for multiple volumes. If the PKCS#11 logic is used (see above), the socket source name is picked in similar fashion, except that the literal string <literal>/cryptsetup-pkcs11/</literal> is used. And similarly for - FIDO2 (<literal>/cryptsetup-fido2/</literal>) and TPM2 (<literal>/cryptsetup-tpm2/</literal>). A diffent + FIDO2 (<literal>/cryptsetup-fido2/</literal>) and TPM2 (<literal>/cryptsetup-tpm2/</literal>). A different path component is used so that services providing key material know that the secret key was not requested directly, but instead an encrypted key that will be decrypted via the PKCS#11/FIDO2/TPM2 logic to acquire the final secret key.</para> diff --git a/man/systemd.network.xml b/man/systemd.network.xml index 6a7ab696a3..7b30bd2e78 100644 --- a/man/systemd.network.xml +++ b/man/systemd.network.xml @@ -2335,7 +2335,7 @@ allow my_server_t localnet_peer_t:peer recv;</programlisting> <listitem> <para>Takes a boolean. Specifies whether to add an address from the delegated prefixes which are received from the WAN interface by the DHCPv6 Prefix Delegation. When true (on LAN - interfce), the EUI-64 algorithm will be used by default to form an interface identifier from + interface), the EUI-64 algorithm will be used by default to form an interface identifier from the delegated prefixes. See also <varname>Token=</varname> setting below. Defaults to yes. </para> </listitem> diff --git a/src/home/homed-manager.h b/src/home/homed-manager.h index 18e7542e13..20bbb4cfeb 100644 --- a/src/home/homed-manager.h +++ b/src/home/homed-manager.h @@ -59,7 +59,7 @@ struct Manager { char *userdb_service; EVP_PKEY *private_key; /* actually a pair of private and public key */ - Hashmap *public_keys; /* key name [char*] → publick key [EVP_PKEY*] */ + Hashmap *public_keys; /* key name [char*] → public key [EVP_PKEY*] */ RebalanceState rebalance_state; usec_t rebalance_interval_usec; diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c index ea425f009e..1e0c8a2448 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c @@ -1249,7 +1249,7 @@ static int parse_argv(int argc, char *argv[]) { arg_uid_range = UINT32_C(0x10000); } else if (streq(optarg, "identity")) { - /* identitiy: User namespaces on, UID range is map the 0…0xFFFF range to + /* identity: User namespaces on, UID range is map the 0…0xFFFF range to * itself, i.e. we don't actually map anything, but do take benefit of * isolation of capability sets. */ arg_userns_mode = USER_NAMESPACE_FIXED; @@ -3727,7 +3727,7 @@ static int outer_child( * place, so that we can make changes to its mount structure (for example, to implement * --volatile=) without this interfering with our ability to access files such as * /etc/localtime to copy into the container. Note that we use a fixed place for this - * (instead of a temporary directory, since we are living in our own mount namspace here + * (instead of a temporary directory, since we are living in our own mount namespace here * already, and thus don't need to be afraid of colliding with anyone else's mounts). */ (void) mkdir_p("/run/systemd/nspawn-root", 0755); diff --git a/src/resolve/resolved-dns-scope.c b/src/resolve/resolved-dns-scope.c index 82f0c8f621..635763954b 100644 --- a/src/resolve/resolved-dns-scope.c +++ b/src/resolve/resolved-dns-scope.c @@ -690,7 +690,7 @@ DnsScopeMatch dns_scope_good_domain( } /* If there's a true search domain defined for this scope, and the query is single-label, - * then let's resolve things here, prefereably. Note that LLMNR considers itself + * then let's resolve things here, preferably. Note that LLMNR considers itself * authoritative for single-label names too, at the same preference, see below. */ if (has_search_domains && dns_name_is_single_label(domain)) return DNS_SCOPE_YES_BASE + 1; diff --git a/src/shared/bootspec.c b/src/shared/bootspec.c index 789b89ea93..56274a0d4d 100644 --- a/src/shared/bootspec.c +++ b/src/shared/bootspec.c @@ -1268,7 +1268,7 @@ static void boot_entry_file_list( int status = chase_symlinks_and_access(p, root, CHASE_PREFIX_ROOT|CHASE_PROHIBIT_SYMLINKS, F_OK, NULL, NULL); /* Note that this shows two '/' between the root and the file. This is intentional to highlight (in - * the abscence of color support) to the user that the boot loader is only interested in the second + * the absence of color support) to the user that the boot loader is only interested in the second * part of the file. */ printf("%13s%s %s%s/%s", strempty(field), field ? ":" : " ", ansi_grey(), root, ansi_normal()); diff --git a/src/shared/cryptsetup-util.c b/src/shared/cryptsetup-util.c index f697429852..c6614d3579 100644 --- a/src/shared/cryptsetup-util.c +++ b/src/shared/cryptsetup-util.c @@ -208,7 +208,7 @@ int dlopen_cryptsetup(void) { /* libcryptsetup added crypt_reencrypt() in 2.2.0, and marked it obsolete in 2.4.0, replacing it with * crypt_reencrypt_run(), which takes one extra argument but is otherwise identical. The old call is * still available though, and given we want to support 2.2.0 for a while longer, we'll stick to the - * old symbol. Howerver, the old symbols now has a GCC deprecation decorator, hence let's turn off + * old symbol. However, the old symbols now has a GCC deprecation decorator, hence let's turn off * warnings about this for now. */ DISABLE_WARNING_DEPRECATED_DECLARATIONS; |