From: Ruben Kerkhof Date: Sat, 30 Aug 2014 15:13:16 +0000 (+0200) Subject: Fix a few more typos X-Git-Tag: v217~699 X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=06b643e7f5a3b79005dd57497897ab7255fe3659;hp=b12942e67ecbea0b852d4ab8df1d34b04e9853f8 Fix a few more typos --- diff --git a/CODING_STYLE b/CODING_STYLE index a3fc26c1e..05b5ecf89 100644 --- a/CODING_STYLE +++ b/CODING_STYLE @@ -155,7 +155,7 @@ function or a "non-logging" function. "Logging" functions do logging on their own, "non-logging" function never log on their own and expect their callers to log. All functions in "library" code, - i.e. in src/shared/ and suchlike must be "non-logging". Everytime a + i.e. in src/shared/ and suchlike must be "non-logging". Every time a "logging" function calls a "non-logging" function, it should log about the resulting errors. If a "logging" function calls another "logging" function, then it should not generate log messages, so diff --git a/NEWS b/NEWS index 2fca2cdc9..f52ee027a 100644 --- a/NEWS +++ b/NEWS @@ -1613,7 +1613,7 @@ CHANGES WITH 208: kernel, and on seats that are not seat0. * A new kernel command line option luks.options= is understood - now which allows specifiying LUKS options for usage for LUKS + now which allows specifying LUKS options for usage for LUKS encrypted partitions specified with luks.uuid=. * tmpfiles.d(5) snippets may now use specifier expansion in diff --git a/man/file-hierarchy.xml b/man/file-hierarchy.xml index 523846b64..9d96cff00 100644 --- a/man/file-hierarchy.xml +++ b/man/file-hierarchy.xml @@ -914,7 +914,7 @@ ~/.local/lib/package - Private, static vendor resources of the package, compatible wih any architecture, or any other kind of read-only vendor data. + Private, static vendor resources of the package, compatible with any architecture, or any other kind of read-only vendor data. ~/.local/lib/arch-id/package diff --git a/man/kernel-command-line.xml b/man/kernel-command-line.xml index d872e6d5b..3263b77ce 100644 --- a/man/kernel-command-line.xml +++ b/man/kernel-command-line.xml @@ -358,7 +358,7 @@ Enables resume from hibernation using the specified device. All fstab5-like - pathes are supported. For details, see + paths are supported. For details, see systemd-hibernate-resume-generator8. diff --git a/man/sd_bus_creds_get_pid.xml b/man/sd_bus_creds_get_pid.xml index 5a848576f..40ed81ecb 100644 --- a/man/sd_bus_creds_get_pid.xml +++ b/man/sd_bus_creds_get_pid.xml @@ -405,7 +405,7 @@ along with systemd; If not, see . -ENXIO - An error occured in parsing cgroup paths. + An error occurred in parsing cgroup paths. libsystemd might be out of sync with the running systemd version. diff --git a/man/sd_bus_creds_new_from_pid.xml b/man/sd_bus_creds_new_from_pid.xml index 406769b21..bc94c4409 100644 --- a/man/sd_bus_creds_new_from_pid.xml +++ b/man/sd_bus_creds_new_from_pid.xml @@ -149,7 +149,7 @@ along with systemd; If not, see . and other functions which correspond directly to the constants listed above. - A mask of fields which were actually sucessfully set + A mask of fields which were actually successfully set (acquired from /proc, etc.) can be retrieved with sd_bus_creds_get_mask(). If the credentials object was created with @@ -162,7 +162,7 @@ along with systemd; If not, see . object will not be destroyed until sd_bus_creds_unref has been called as many times plus once more. Once the reference count has dropped to zero, - c cannot be used anymore, so futher + c cannot be used anymore, so further calls to sd_bus_creds_ref(c) or sd_bus_creds_unref(c) are illegal. diff --git a/man/sd_bus_error.xml b/man/sd_bus_error.xml index 3317eadc3..7f4160753 100644 --- a/man/sd_bus_error.xml +++ b/man/sd_bus_error.xml @@ -252,7 +252,7 @@ along with systemd; If not, see . D-Bus error names are available as constants SD_BUS_ERROR_FAILED, etc., listed above. If name is NULL, it is - assumed that no error occured, and 0 is returned. This means that + assumed that no error occurred, and 0 is returned. This means that this function may be conveniently used in a return statement. diff --git a/man/sd_bus_message_append_basic.xml b/man/sd_bus_message_append_basic.xml index da9202005..7c5f1e9dd 100644 --- a/man/sd_bus_message_append_basic.xml +++ b/man/sd_bus_message_append_basic.xml @@ -95,7 +95,7 @@ along with systemd; If not, see . y SD_BUS_TYPE_BYTE - unsigned interger + unsigned integer 1 byte @@ -200,7 +200,7 @@ along with systemd; If not, see . valid Unicode string encoded as UTF-8. In case of the two latter types, the additional requirements for a D-Bus object path or type signature should be satisfied. Those requirements should be - verified by the recepient of the message. + verified by the recipient of the message. diff --git a/man/systemd-hibernate-resume-generator.xml b/man/systemd-hibernate-resume-generator.xml index 1a4b99ced..e010c23df 100644 --- a/man/systemd-hibernate-resume-generator.xml +++ b/man/systemd-hibernate-resume-generator.xml @@ -71,7 +71,7 @@ resume= Takes a path to the resume - device. Both persistent block device pathes like + device. Both persistent block device paths like /dev/disk/by-foo/bar and fstab5-style specifiers like FOO=bar diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml index aea50559f..820a79bc2 100644 --- a/man/systemd-nspawn.xml +++ b/man/systemd-nspawn.xml @@ -668,7 +668,7 @@ as tmpfs instance into it (the system thus starts up with read-only OS resources and - configuration, but prestine state, any + configuration, but pristine state, any changes to the latter are lost on shutdown). When the mode parameter is specified as no diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml index af103ff14..707d582b4 100644 --- a/man/systemd.exec.xml +++ b/man/systemd.exec.xml @@ -1059,7 +1059,7 @@ namespace. Note that means that file systems mounted on the host might stay - mounted continously in the unit's + mounted continuously in the unit's namespace, and thus keep the device busy. Note that the file system namespace related options diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml index 238029a25..8394fa81a 100644 --- a/man/systemd.socket.xml +++ b/man/systemd.socket.xml @@ -513,7 +513,7 @@ KeepAliveProbes= - Takes interger as argument. It's the number of unacknowledged probes to + Takes integer as argument. It's the number of unacknowledged probes to send before considering the connection dead and notifying the application layer. This controls the TCP_KEEPCNT socket option (see socket7 diff --git a/src/core/unit.c b/src/core/unit.c index 56102b360..b5c318294 100644 --- a/src/core/unit.c +++ b/src/core/unit.c @@ -3425,7 +3425,7 @@ int unit_setup_exec_runtime(Unit *u) { offset = UNIT_VTABLE(u)->exec_runtime_offset; assert(offset > 0); - /* Check if ther already is an ExecRuntime for this unit? */ + /* Check if there already is an ExecRuntime for this unit? */ rt = (ExecRuntime**) ((uint8_t*) u + offset); if (*rt) return 0; diff --git a/src/journal/test-compress-benchmark.c b/src/journal/test-compress-benchmark.c index 8975e29b1..b3bc3ec2f 100644 --- a/src/journal/test-compress-benchmark.c +++ b/src/journal/test-compress-benchmark.c @@ -61,7 +61,7 @@ static void test_compress_decompress(const char* label, int r; r = compress(text, i, buf, &j); - /* assume compresion must be succesful except for small inputs */ + /* assume compression must be successful except for small inputs */ assert(r == 0 || (i < 2048 && r == -ENOBUFS)); /* check for overwrites */ assert(buf[i] == 0); diff --git a/src/libsystemd-network/sd-icmp6-nd.c b/src/libsystemd-network/sd-icmp6-nd.c index 243f06a85..bbb4531dd 100644 --- a/src/libsystemd-network/sd-icmp6-nd.c +++ b/src/libsystemd-network/sd-icmp6-nd.c @@ -212,7 +212,7 @@ static int icmp6_router_advertisment_recv(sd_event_source *s, int fd, if (ra.nd_ra_flags_reserved & ND_RA_FLAG_MANAGED) event = ICMP6_EVENT_ROUTER_ADVERTISMENT_MANAGED; - log_icmp6_nd(nd, "Received Router Advertisment flags %s/%s", + log_icmp6_nd(nd, "Received Router Advertisement flags %s/%s", (ra.nd_ra_flags_reserved & ND_RA_FLAG_MANAGED)? "MANAGED": "none", (ra.nd_ra_flags_reserved & ND_RA_FLAG_OTHER)? "OTHER": diff --git a/src/libsystemd-terminal/term-page.c b/src/libsystemd-terminal/term-page.c index 7ae90e2cd..ae73cdf62 100644 --- a/src/libsystemd-terminal/term-page.c +++ b/src/libsystemd-terminal/term-page.c @@ -42,7 +42,7 @@ * support Unicode combining-characters, therefore this gets more complicated. * Characters themselves are represented by a "term_char_t" object. It * should be treated as a normal integer and passed by value. The - * sorrounding struct is just to hide the internals. A term-char can contain a + * surrounding struct is just to hide the internals. A term-char can contain a * base character together with up to 2 combining-chars in a single integer. * Only if you need more combining-chars (very unlikely!) a term-char is a * pointer to an allocated storage. This requires you to always free term-char @@ -1012,7 +1012,7 @@ void term_line_append_combchar(term_line *line, unsigned int pos_x, uint32_t ucs * @age: current age for all modifications * @keep_protected: true if protected cells should be kept * - * This is the standard erase operation. It clears all cells in the targetted + * This is the standard erase operation. It clears all cells in the targeted * area and re-initializes them. Cells to the right are not shifted left, you * must use DELETE to achieve that. Cells outside the visible area are skipped. * diff --git a/src/libsystemd-terminal/term-screen.c b/src/libsystemd-terminal/term-screen.c index a19c684d2..67f9056d5 100644 --- a/src/libsystemd-terminal/term-screen.c +++ b/src/libsystemd-terminal/term-screen.c @@ -455,7 +455,7 @@ static uint32_t screen_map(term_screen *screen, uint32_t val) { /* * Command Handlers - * This is the inofficial documentation of all the TERM_CMD_* definitions. Each + * This is the unofficial documentation of all the TERM_CMD_* definitions. Each * handled command has a separate function with an extensive comment on the * semantics of the command. * Note that many semantics are unknown and need to be verified. This is mostly @@ -1040,7 +1040,7 @@ static int screen_DECELR(term_screen *screen, const term_seq *seq) { /* * DECELR - enable-locator-reporting * This changes the locator-reporting mode. @args[0] specifies the mode - * to set, 0 disables locator-reporting, 1 enables it continously, 2 + * to set, 0 disables locator-reporting, 1 enables it continuously, 2 * enables it for a single report. @args[1] specifies the * precision-mode. 0 and 2 set the reporting to cell-precision, 1 sets * pixel-precision. diff --git a/src/libsystemd-terminal/test-term-page.c b/src/libsystemd-terminal/test-term-page.c index bba83ee40..9e338776e 100644 --- a/src/libsystemd-terminal/test-term-page.c +++ b/src/libsystemd-terminal/test-term-page.c @@ -263,7 +263,7 @@ static void test_term_char_allocating(void) { * in the range 'A'-'Z', 'a'-'z'. All those are combined and used as term_char_t * on this cell. Any numbers in the description are combined and are used as * cell-age. - * The occurance of a '*'-symbol marks the cell as bold, '/' marks it as italic. + * The occurrence of a '*'-symbol marks the cell as bold, '/' marks it as italic. * You can use those characters multiple times, but only the first one has an * effect. * For further symbols, see parse_attr(). diff --git a/src/libsystemd/sd-bus/kdbus.h b/src/libsystemd/sd-bus/kdbus.h index 3751f9ca2..65f76e9cf 100644 --- a/src/libsystemd/sd-bus/kdbus.h +++ b/src/libsystemd/sd-bus/kdbus.h @@ -486,7 +486,7 @@ enum kdbus_policy_type { * policy entries for a name. The provided name * is not activated and not registered with the * name database, it only allows unprivileged - * connections to aquire a name, talk or discover + * connections to acquire a name, talk or discover * a service * @KDBUS_HELLO_MONITOR: Special-purpose connection to monitor * bus traffic diff --git a/src/shared/architecture.h b/src/shared/architecture.h index 71c79b154..353d49bed 100644 --- a/src/shared/architecture.h +++ b/src/shared/architecture.h @@ -28,7 +28,7 @@ /* A cleaned up architecture definition. We don't want to get lost in * processor features, models, generations or even ABIs. Hence we * focus on general family, and distuignish word width and - * endianess. */ + * endianness. */ typedef enum Architecture { ARCHITECTURE_X86 = 0,