diff options
| -rw-r--r-- | NEWS | 6 | ||||
| -rw-r--r-- | TODO | 2 | ||||
| -rw-r--r-- | man/org.freedesktop.resolve1.xml | 2 | ||||
| -rw-r--r-- | src/home/pam_systemd_home.c | 2 | ||||
| -rw-r--r-- | src/shared/calendarspec.c | 2 | ||||
| -rw-r--r-- | src/shared/dissect-image.c | 2 | ||||
| -rw-r--r-- | src/udev/udev-builtin-net_id.c | 3 | ||||
| -rw-r--r-- | src/udev/udevadm-trigger.c | 2 | ||||
| -rw-r--r-- | test/sd-script.py | 2 |
9 files changed, 11 insertions, 12 deletions
@@ -3809,7 +3809,7 @@ CHANGES WITH 237: by default even when owned by root and read-only. This behaviour was inherited from older tools, but there have been requests to remove it, and it's not obvious why this restriction was made in the first - place. Please speak up now, if you are aware of software that reqires + place. Please speak up now, if you are aware of software that requires this behaviour, otherwise we'll remove the restriction in v238. * A new environment variable $SYSTEMD_OFFLINE is now understood by @@ -6907,7 +6907,7 @@ CHANGES WITH 220: * New /etc/fstab options x-systemd.requires= and x-systemd.requires-mounts-for= are now supported to express additional dependencies for mounts. This is useful for - journalling file systems that support external journal + journaling file systems that support external journal devices or overlay file systems that require underlying file systems to be mounted. @@ -7521,7 +7521,7 @@ CHANGES WITH 218: * nspawn's --link-journal= switch gained two new values "try-guest" and "try-host" that work like "guest" and "host", but do not fail if the host has no persistent - journalling enabled. -j is now equivalent to + journaling enabled. -j is now equivalent to --link-journal=try-guest. * macvlan network devices created by nspawn will now have @@ -1008,7 +1008,7 @@ Features: - logind: when the power button is pressed short, just popup a logout dialog. If it is pressed for 1s, do the usual shutdown. Inspiration are Macs here. - - expose "Locked" property on logind sesison objects + - expose "Locked" property on logind session objects - maybe allow configuration of the StopTimeout for session scopes - rename session scope so that it includes the UID. THat way the session scope can be arranged freely in slices and we don't have diff --git a/man/org.freedesktop.resolve1.xml b/man/org.freedesktop.resolve1.xml index 41562360a0..860a14877d 100644 --- a/man/org.freedesktop.resolve1.xml +++ b/man/org.freedesktop.resolve1.xml @@ -329,7 +329,7 @@ node /org/freedesktop/resolve1 { <listitem><para>Alternatively, leave both the service name and type empty and specify the full domain name of the SRV record (i.e. prefixed with the service type) in the domain parameter. (No IDNA - coversion is applied in this mode.)</para></listitem> + conversion is applied in this mode.)</para></listitem> </orderedlist> <para>The <varname>family</varname> parameter of the <function>ResolveService()</function> method encodes diff --git a/src/home/pam_systemd_home.c b/src/home/pam_systemd_home.c index a91df91447..64dc532577 100644 --- a/src/home/pam_systemd_home.c +++ b/src/home/pam_systemd_home.c @@ -898,7 +898,7 @@ _public_ PAM_EXTERN int pam_sm_acct_mgmt( return PAM_NEW_AUTHTOK_REQD; case -EOWNERDEAD: - (void) pam_prompt(handle, PAM_ERROR_MSG, NULL, "Password expired, change requird."); + (void) pam_prompt(handle, PAM_ERROR_MSG, NULL, "Password expired, change required."); return PAM_NEW_AUTHTOK_REQD; case -EKEYREJECTED: diff --git a/src/shared/calendarspec.c b/src/shared/calendarspec.c index 7162592fbf..c23a91eeed 100644 --- a/src/shared/calendarspec.c +++ b/src/shared/calendarspec.c @@ -27,7 +27,7 @@ /* An arbitrary limit on the length of the chains of components. We don't want to * build a very long linked list, which would be slow to iterate over and might cause * our stack to overflow. It's unlikely that legitimate uses require more than a few - * linked compenents anyway. */ + * linked components anyway. */ #define CALENDARSPEC_COMPONENTS_MAX 240 /* Let's make sure that the microsecond component is safe to be stored in an 'int' */ diff --git a/src/shared/dissect-image.c b/src/shared/dissect-image.c index ea94881efa..113538bb97 100644 --- a/src/shared/dissect-image.c +++ b/src/shared/dissect-image.c @@ -1672,7 +1672,7 @@ static int verity_can_reuse( #if HAVE_CRYPT_ACTIVATE_BY_SIGNED_KEY /* Ensure that, if signatures are supported, we only reuse the device if the previous mount used the * same settings, so that a previous unsigned mount will not be reused if the user asks to use - * signing for the new one, and viceversa. */ + * signing for the new one, and vice versa. */ if (!!verity->root_hash_sig != !!(crypt_params.flags & CRYPT_VERITY_ROOT_HASH_SIGNATURE)) return log_debug_errno(SYNTHETIC_ERRNO(EINVAL), "Error opening verity device, it already exists but signature settings are not the same."); #endif diff --git a/src/udev/udev-builtin-net_id.c b/src/udev/udev-builtin-net_id.c index d06a8c7156..872833ebbc 100644 --- a/src/udev/udev-builtin-net_id.c +++ b/src/udev/udev-builtin-net_id.c @@ -474,8 +474,7 @@ static int names_platform(sd_device *dev, struct netnames *names, bool test) { /* Platform devices are named after ACPI table match, and instance id * eg. "/sys/devices/platform/HISI00C2:00"); - * The Vendor (3 or 4 char), followed by hexdecimal model number : instance id. - */ + * The Vendor (3 or 4 char), followed by hexadecimal model number : instance id. */ DISABLE_WARNING_FORMAT_NONLITERAL; if (sscanf(syspath, pattern, vendor, &model, &instance, ðid) != 4) diff --git a/src/udev/udevadm-trigger.c b/src/udev/udevadm-trigger.c index 5c74184c33..f7ca88195d 100644 --- a/src/udev/udevadm-trigger.c +++ b/src/udev/udevadm-trigger.c @@ -51,7 +51,7 @@ static int exec_list(sd_device_enumerator *e, const char *action, Set **settle_s "Failed to write '%s' to '%s'%s: %m", action, filename, ignore ? ", ignoring" : ""); if (IN_SET(r, -EACCES, -EROFS)) - /* Inovoked by unpriviledged user, or read only filesystem. Return earlier. */ + /* Inovoked by unprivileged user, or read only filesystem. Return earlier. */ return r; if (ret == 0 && !ignore) ret = r; diff --git a/test/sd-script.py b/test/sd-script.py index c695c2e2cd..7662b12ab8 100644 --- a/test/sd-script.py +++ b/test/sd-script.py @@ -7,7 +7,7 @@ # # Run after sys-script.py # Usage: sd-script.py <directory> <num> -# <num> is the number of device nodes (disks + partititions) +# <num> is the number of device nodes (disks + partitions) # to create in addition to what sys-script.py already did. # The script can be run several times in a row if <num> is increased, # adding yet more device entries. |