[systemd-devel] [PATCH] treewide: Correct typos and spell plural of bus consistent
Torstein Husebø
torstein at huseboe.net
Mon May 11 04:49:29 PDT 2015
---
man/hwdb.xml | 2 +-
man/nss-myhostname.xml | 2 +-
man/sd_bus_creds_get_pid.xml | 2 +-
man/sd_bus_default.xml | 2 +-
man/sd_bus_message_append.xml | 2 +-
man/sd_bus_message_get_monotonic_usec.xml | 2 +-
man/sd_event_wait.xml | 2 +-
man/systemctl.xml | 2 +-
man/systemd-activate.xml | 4 ++--
man/systemd-coredump.xml | 2 +-
man/systemd-delta.xml | 2 +-
man/systemd-fstab-generator.xml | 2 +-
man/systemd-journal-remote.xml | 2 +-
man/systemd-nspawn.xml | 4 ++--
man/systemd.generator.xml | 2 +-
man/systemd.journal-fields.xml | 2 +-
man/systemd.mount.xml | 2 +-
man/systemd.netdev.xml | 6 +++---
man/systemd.service.xml | 6 +++---
src/analyze/analyze-verify.c | 2 +-
src/core/dbus.c | 2 +-
src/core/main.c | 2 +-
src/core/manager.c | 2 +-
src/gudev/gudevdevice.c | 2 +-
src/libsystemd/libsystemd.sym.m4 | 2 +-
src/libsystemd/sd-bus/bus-kernel.c | 2 +-
src/libsystemd/sd-rtnl/rtnl-message.c | 2 +-
src/locale/localectl.c | 4 ++--
src/shared/barrier.c | 2 +-
src/systemctl/systemctl.c | 4 ++--
src/test/test-sleep.c | 2 +-
src/udev/udev-builtin-keyboard.c | 2 +-
32 files changed, 40 insertions(+), 40 deletions(-)
diff --git a/man/hwdb.xml b/man/hwdb.xml
index b4460c1aee..509dab81c5 100644
--- a/man/hwdb.xml
+++ b/man/hwdb.xml
@@ -58,7 +58,7 @@
associated key-value pairs. Every record in the hwdb starts with one or
more match string, specifying a shell glob to compare the database
lookup string against. Multiple match lines are specified in additional
- consecutive lines. Every match line is compared indivdually, they are
+ consecutive lines. Every match line is compared individually, they are
combined by OR. Every match line must start at the first character of
the line.</para>
diff --git a/man/nss-myhostname.xml b/man/nss-myhostname.xml
index cf2b0200f2..2d36df6f6f 100644
--- a/man/nss-myhostname.xml
+++ b/man/nss-myhostname.xml
@@ -90,7 +90,7 @@
requires a writable <filename>/etc</filename> file system and is
fragile because the file might be edited by the administrator at
the same time. With <command>nss-myhostname</command> enabled
- changing <filename>/etc/hosts</filename> is unncessary, and on
+ changing <filename>/etc/hosts</filename> is unnecessary, and on
many systems the file becomes entirely optional.</para>
<para>To activate the NSS modules, <literal>myhostname</literal>
diff --git a/man/sd_bus_creds_get_pid.xml b/man/sd_bus_creds_get_pid.xml
index 7d68d1ee8d..4debee6124 100644
--- a/man/sd_bus_creds_get_pid.xml
+++ b/man/sd_bus_creds_get_pid.xml
@@ -453,7 +453,7 @@
<para>All functions that take a <parameter>char***</parameter>
parameter will store the answer there as an address of a an array
- of strings. Each invidividual string is NUL-terminated, and the
+ of strings. Each individual string is NUL-terminated, and the
array is NULL-terminated as a whole. It will be valid as long as
<parameter>c</parameter> remains valid, and should not be freed or
modified by the caller.</para>
diff --git a/man/sd_bus_default.xml b/man/sd_bus_default.xml
index 98ec04ecde..9db264ce59 100644
--- a/man/sd_bus_default.xml
+++ b/man/sd_bus_default.xml
@@ -143,7 +143,7 @@
recommended to use <function>sd_bus_default()</function>,
<function>sd_bus_default_user()</function>,
<function>sd_bus_default_system()</function> to connect to the
- user or system busses.</para>
+ user or system buses.</para>
<para>If the <varname>$DBUS_SESSION_BUS_ADDRESS</varname> environment
variable is set
diff --git a/man/sd_bus_message_append.xml b/man/sd_bus_message_append.xml
index 11fa07c636..c3bffbdfd9 100644
--- a/man/sd_bus_message_append.xml
+++ b/man/sd_bus_message_append.xml
@@ -87,7 +87,7 @@
Arguments corresponding to this nested sequence follow the same
rules as if they were not nested.</para>
- <para>A variant is denoted by <literal>v</literal>. Correspoding
+ <para>A variant is denoted by <literal>v</literal>. Corresponding
arguments must include a format string denoting a complete type,
and following that, arguments corresponding to the specified type.
</para>
diff --git a/man/sd_bus_message_get_monotonic_usec.xml b/man/sd_bus_message_get_monotonic_usec.xml
index 42842116a0..d74aaad7dd 100644
--- a/man/sd_bus_message_get_monotonic_usec.xml
+++ b/man/sd_bus_message_get_monotonic_usec.xml
@@ -94,7 +94,7 @@
a global, monotonically increasing sequence number to all messages
transmitted on the local system, at the time the message was sent.
This sequence number is useful for determining message send order,
- even across different busses of the local system. The sequence
+ even across different buses of the local system. The sequence
number combined with the boot ID of the system (as returned by
<citerefentry><refentrytitle>sd_id128_get_boot</refentrytitle><manvolnum>3</manvolnum></citerefentry>)
is a suitable globally unique identifier for bus messages.</para>
diff --git a/man/sd_event_wait.xml b/man/sd_event_wait.xml
index 4b7cf50b6d..835cc5deb3 100644
--- a/man/sd_event_wait.xml
+++ b/man/sd_event_wait.xml
@@ -95,7 +95,7 @@
events or a timeout. If any events are ready to be processed, it
returns a positive value, and the events should be processed with
<function>sd_event_dispatch</function>. Otherwise, the loop is
- back in the inital state and <function>sd_event_prepare</function>
+ back in the initial state and <function>sd_event_prepare</function>
should be called again.</para>
<programlisting>
diff --git a/man/systemctl.xml b/man/systemctl.xml
index 4e77af5259..4dbdfe1556 100644
--- a/man/systemctl.xml
+++ b/man/systemctl.xml
@@ -154,7 +154,7 @@
<command>list-dependencies</command>, i.e. follow
dependencies of type <varname>WantedBy=</varname>,
<varname>RequiredBy=</varname>,
- <varname>RequiredByOverrridable=</varname>,
+ <varname>RequiredByOverridable=</varname>,
<varname>PartOf=</varname>, <varname>BoundBy=</varname>,
instead of <varname>Wants=</varname> and similar.
</para>
diff --git a/man/systemd-activate.xml b/man/systemd-activate.xml
index cb68a79be7..3b854fd8ec 100644
--- a/man/systemd-activate.xml
+++ b/man/systemd-activate.xml
@@ -66,7 +66,7 @@
of the daemon per connection (inetd-style).
</para>
- <para>The daemon to launch and its options should be specifed
+ <para>The daemon to launch and its options should be specified
after options intended for <command>systemd-activate</command>.
</para>
@@ -76,7 +76,7 @@
inherited, and sockets will be passed through file descriptors 3
and higher. Sockets passed through <varname>$LISTEN_FDS</varname>
to <command>systemd-activate</command> will be passed through to
- the dameon, in the original positions. Other sockets specified
+ the daemon, in the original positions. Other sockets specified
with <option>--listen</option> will use consecutive descriptors.
</para>
</refsect1>
diff --git a/man/systemd-coredump.xml b/man/systemd-coredump.xml
index 6a7ced19a6..5da3857c08 100644
--- a/man/systemd-coredump.xml
+++ b/man/systemd-coredump.xml
@@ -64,7 +64,7 @@
<filename>/usr/lib/sysctl.d/50-coredump.conf</filename> which
configures <varname>kernel.core_pattern</varname> to invoke
<command>systemd-coredump</command>. This file may be masked or
- overriden to use a different setting following normal
+ overridden to use a different setting following normal
<citerefentry><refentrytitle>sysctl.d</refentrytitle><manvolnum>5</manvolnum></citerefentry> rules.</para>
<para>The behaviour of a specific program upon reception of a
diff --git a/man/systemd-delta.xml b/man/systemd-delta.xml
index fd81b2c907..6a6460ffaa 100644
--- a/man/systemd-delta.xml
+++ b/man/systemd-delta.xml
@@ -69,7 +69,7 @@
certain configuration files can have <literal>.d</literal>
directories which contain "drop-in" files with configuration
snippets which augment the main configuration file. "Drop-in"
- files can be overriden in the same way by placing files with the
+ files can be overridden in the same way by placing files with the
same name in a directory of higher priority (except that in case
of "drop-in" files, both the "drop-in" file name and the name of
the containing directory, which corresponds to the name of the
diff --git a/man/systemd-fstab-generator.xml b/man/systemd-fstab-generator.xml
index bdc2dc1d0e..c09ed4b4da 100644
--- a/man/systemd-fstab-generator.xml
+++ b/man/systemd-fstab-generator.xml
@@ -156,7 +156,7 @@
<listitem><para>Takes the <filename>/usr</filename> filesystem
mount options to use. If <varname>mount.usr=</varname> or
<varname>mount.usrfstype=</varname> is set, then
- <varname>mount.usrflages=</varname> will default to the value
+ <varname>mount.usrflags=</varname> will default to the value
set in <varname>rootflags=</varname>.</para>
<para>Otherwise this value will be read from the
diff --git a/man/systemd-journal-remote.xml b/man/systemd-journal-remote.xml
index d5bda635c4..ebaca2657f 100644
--- a/man/systemd-journal-remote.xml
+++ b/man/systemd-journal-remote.xml
@@ -156,7 +156,7 @@
<varname>$LISTEN_FDS</varname>/<varname>$LISTEN_PID</varname>.
In the second case, an HTTP or HTTPS server will be spawned on
this port, respectively for <option>--listen-http</option> and
- <option>--listen-https</option>. Currenntly, only POST requests
+ <option>--listen-https</option>. Currently, only POST requests
to <filename>/upload</filename> with <literal>Content-Type:
application/vnd.fdo.journal</literal> are supported.</para>
</listitem>
diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml
index fec51df9e9..88b5758d91 100644
--- a/man/systemd-nspawn.xml
+++ b/man/systemd-nspawn.xml
@@ -141,7 +141,7 @@
<replaceable>COMMAND</replaceable> specifies the program to launch
in the container, and the remaining arguments are used as
arguments for this program. If <option>-b</option> is not used and
- no arguments are specifed, a shell is launched in the
+ no arguments are specified, a shell is launched in the
container.</para>
<para>The following options are understood:</para>
@@ -727,7 +727,7 @@
<programlisting># pacstrap -c -d ~/arch-tree/ base
# systemd-nspawn -bD ~/arch-tree/</programlisting>
- <para>This installs a mimimal Arch Linux distribution into the
+ <para>This installs a minimal Arch Linux distribution into the
directory <filename>~/arch-tree/</filename> and then boots an OS
in a namespace container in it.</para>
</example>
diff --git a/man/systemd.generator.xml b/man/systemd.generator.xml
index 9b39e732e3..2285e91812 100644
--- a/man/systemd.generator.xml
+++ b/man/systemd.generator.xml
@@ -140,7 +140,7 @@
<listitem>
<para><parameter>late-dir</parameter></para>
<para>argv[3] may be used to extend the unit file tree without
- overridding any other unit files. Any native configuration
+ overriding any other unit files. Any native configuration
files supplied by the vendor or user/administrator take
precedence over the generated ones placed in this directory.
</para>
diff --git a/man/systemd.journal-fields.xml b/man/systemd.journal-fields.xml
index 7d6c5c715f..a101006a7e 100644
--- a/man/systemd.journal-fields.xml
+++ b/man/systemd.journal-fields.xml
@@ -390,7 +390,7 @@
</varlistentry>
</variablelist>
- <para>Priviledged programs (currently UID 0) may attach
+ <para>Privileged programs (currently UID 0) may attach
<varname>OBJECT_PID=</varname> to a message. This will instruct
<command>systemd-journald</command> to attach additional fields on
behalf of the caller:</para>
diff --git a/man/systemd.mount.xml b/man/systemd.mount.xml
index e102d27ab7..862f42e594 100644
--- a/man/systemd.mount.xml
+++ b/man/systemd.mount.xml
@@ -106,7 +106,7 @@
</para>
<para>Some file systems have special semantics as API file systems
- for kernel-to-userspace and userspace-to-userpace interfaces. Some
+ for kernel-to-userspace and userspace-to-userspace interfaces. Some
of them may not be changed via mount units, and cannot be
disabled. For a longer discussion see <ulink
url="http://www.freedesktop.org/wiki/Software/systemd/APIFileSystems">API
diff --git a/man/systemd.netdev.xml b/man/systemd.netdev.xml
index 3bfd01b86d..01c31c5ef5 100644
--- a/man/systemd.netdev.xml
+++ b/man/systemd.netdev.xml
@@ -256,7 +256,7 @@
<para>The maximum transmission unit in bytes to set for
the device. The usual suffixes K, M, G, are supported and
are understood to the base of 1024. This key is not
- currently suported for <literal>tun</literal> or
+ currently supported for <literal>tun</literal> or
<literal>tap</literal> devices.
</para>
</listitem>
@@ -268,7 +268,7 @@
given, one is generated based on the interface name and
the
<citerefentry><refentrytitle>machine-id</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
- This key is not currently suported for
+ This key is not currently supported for
<literal>tun</literal> or <literal>tap</literal> devices.
</para>
</listitem>
@@ -556,7 +556,7 @@
<varlistentry>
<term><varname>PacketInfo=</varname></term>
<listitem><para>Takes a boolean argument. Configures whether
- packets should be prepened with four extra bytes (two flag
+ packets should be prepended with four extra bytes (two flag
bytes and two protocol bytes). If disabled it indicates that
the packets will be pure IP packets. Defaults to
<literal>no</literal>.</para>
diff --git a/man/systemd.service.xml b/man/systemd.service.xml
index f598705633..7ff2adf4e9 100644
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -513,7 +513,7 @@
<option>on-failure</option>, the service will be restarted
when the process exits with a non-zero exit code, is
terminated by a signal (including on core dump, but excluding
- the aforementiond four signals), when an operation (such as
+ the aforementioned four signals), when an operation (such as
service reload) times out, and when the configured watchdog
timeout is triggered. If set to <option>on-abnormal</option>,
the service will be restarted when the process is terminated
@@ -891,7 +891,7 @@
<title>Command lines</title>
<para>This section describes command line parsing and
- variable and specifier substitions for
+ variable and specifier substitutions for
<varname>ExecStart=</varname>,
<varname>ExecStartPre=</varname>,
<varname>ExecStartPost=</varname>,
@@ -1131,7 +1131,7 @@ WantedBy=multi-user.target</programlisting>
<varname>Type=</varname><option>oneshot</option> exists. Units
of this type will wait until the process specified terminates
and then fall back to being inactive. The following unit will
- perform a clenaup action:</para>
+ perform a cleanup action:</para>
<programlisting>[Unit]
Description=Cleanup old Foo data
diff --git a/src/analyze/analyze-verify.c b/src/analyze/analyze-verify.c
index bfc71e3f38..4145812bc7 100644
--- a/src/analyze/analyze-verify.c
+++ b/src/analyze/analyze-verify.c
@@ -226,7 +226,7 @@ int verify_units(char **filenames, SystemdRunningAs running_as, bool check_man)
r = manager_new(running_as, true, &m);
if (r < 0)
- return log_error_errno(r, "Failed to initalize manager: %m");
+ return log_error_errno(r, "Failed to initialize manager: %m");
log_debug("Starting manager...");
diff --git a/src/core/dbus.c b/src/core/dbus.c
index 4005aac7e7..1679242be8 100644
--- a/src/core/dbus.c
+++ b/src/core/dbus.c
@@ -1116,7 +1116,7 @@ int bus_foreach_bus(
sd_bus *b;
int r, ret = 0;
- /* Send to all direct busses, unconditionally */
+ /* Send to all direct buses, unconditionally */
SET_FOREACH(b, m->private_buses, i) {
r = send_message(b, userdata);
if (r < 0)
diff --git a/src/core/main.c b/src/core/main.c
index af28ac6b24..09436774c9 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -1384,7 +1384,7 @@ int main(int argc, char *argv[]) {
r = initialize_join_controllers();
if (r < 0) {
- error_message = "Failed to initalize cgroup controllers";
+ error_message = "Failed to initialize cgroup controllers";
goto finish;
}
diff --git a/src/core/manager.c b/src/core/manager.c
index c918f191c9..dba945a1ea 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -753,7 +753,7 @@ static int manager_connect_bus(Manager *m, bool reexecuting) {
reexecuting ||
(m->running_as == SYSTEMD_USER && getenv("DBUS_SESSION_BUS_ADDRESS"));
- /* Try to connect to the busses, if possible. */
+ /* Try to connect to the buses, if possible. */
return bus_init(m, try_bus_connect);
}
diff --git a/src/gudev/gudevdevice.c b/src/gudev/gudevdevice.c
index 5530d2c421..28b229b8d8 100644
--- a/src/gudev/gudevdevice.c
+++ b/src/gudev/gudevdevice.c
@@ -993,7 +993,7 @@ g_udev_device_get_tags (GUdevDevice *device)
* g_udev_device_get_is_initialized:
* @device: A #GUdevDevice.
*
- * Gets whether @device has been initalized.
+ * Gets whether @device has been initialized.
*
* Returns: Whether @device has been initialized.
*
diff --git a/src/libsystemd/libsystemd.sym.m4 b/src/libsystemd/libsystemd.sym.m4
index 72213c2297..b443c3cfba 100644
--- a/src/libsystemd/libsystemd.sym.m4
+++ b/src/libsystemd/libsystemd.sym.m4
@@ -63,7 +63,7 @@ global:
sd_journal_open_files;
sd_journal_open_container;
- /* sd-dameon */
+ /* sd-daemon */
sd_booted;
sd_is_fifo;
sd_is_mq;
diff --git a/src/libsystemd/sd-bus/bus-kernel.c b/src/libsystemd/sd-bus/bus-kernel.c
index 8e3b64337c..d5cc8100ce 100644
--- a/src/libsystemd/sd-bus/bus-kernel.c
+++ b/src/libsystemd/sd-bus/bus-kernel.c
@@ -1593,7 +1593,7 @@ int bus_kernel_create_bus(const char *name, bool world, char **s) {
make->size += ALIGN8(n->size);
- /* The busses we create make no restrictions on what metadata
+ /* The buses we create make no restrictions on what metadata
* peers can read from incoming messages. */
n = KDBUS_ITEM_NEXT(n);
n->type = KDBUS_ITEM_ATTACH_FLAGS_RECV;
diff --git a/src/libsystemd/sd-rtnl/rtnl-message.c b/src/libsystemd/sd-rtnl/rtnl-message.c
index 4f994a10d3..bab2a4ff08 100644
--- a/src/libsystemd/sd-rtnl/rtnl-message.c
+++ b/src/libsystemd/sd-rtnl/rtnl-message.c
@@ -45,7 +45,7 @@ static int message_new_empty(sd_rtnl *rtnl, sd_rtnl_message **ret) {
/* Note that 'rtnl' is currently unused, if we start using it internally
we must take care to avoid problems due to mutual references between
- busses and their queued messages. See sd-bus.
+ buses and their queued messages. See sd-bus.
*/
m = new0(sd_rtnl_message, 1);
diff --git a/src/locale/localectl.c b/src/locale/localectl.c
index 515fca540a..8c60339e3e 100644
--- a/src/locale/localectl.c
+++ b/src/locale/localectl.c
@@ -77,7 +77,7 @@ typedef struct StatusInfo {
const char *x11_options;
} StatusInfo;
-static void print_overriden_variables(void) {
+static void print_overridden_variables(void) {
int r;
char *variables[_VARIABLE_LC_MAX] = {};
LocaleVariable j;
@@ -176,7 +176,7 @@ static int show_status(sd_bus *bus, char **args, unsigned n) {
goto fail;
}
- print_overriden_variables();
+ print_overridden_variables();
print_status_info(&info);
fail:
diff --git a/src/shared/barrier.c b/src/shared/barrier.c
index a0326ac697..436ba95989 100644
--- a/src/shared/barrier.c
+++ b/src/shared/barrier.c
@@ -138,7 +138,7 @@ int barrier_create(Barrier *b) {
* barrier_create(). The object is released and reset to invalid
* state. Therefore, it is safe to call barrier_destroy() multiple
* times or even if barrier_create() failed. However, barrier must be
- * always initalized with BARRIER_NULL.
+ * always initialized with BARRIER_NULL.
*
* If @b is NULL, this is a no-op.
*/
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index 4c45bfc1b8..e4b301af73 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -5722,10 +5722,10 @@ static int get_file_to_edit(const char *name, const char *user_home, const char
if (arg_runtime) {
if (access(path, F_OK) >= 0)
- return log_error_errno(EEXIST, "Refusing to create \"%s\" because it would be overriden by \"%s\" anyway.",
+ return log_error_errno(EEXIST, "Refusing to create \"%s\" because it would be overridden by \"%s\" anyway.",
run, path);
if (path2 && access(path2, F_OK) >= 0)
- return log_error_errno(EEXIST, "Refusing to create \"%s\" because it would be overriden by \"%s\" anyway.",
+ return log_error_errno(EEXIST, "Refusing to create \"%s\" because it would be overridden by \"%s\" anyway.",
run, path2);
*ret_path = run;
run = NULL;
diff --git a/src/test/test-sleep.c b/src/test/test-sleep.c
index 1d75d05a88..4308ddfb64 100644
--- a/src/test/test-sleep.c
+++ b/src/test/test-sleep.c
@@ -56,7 +56,7 @@ int main(int argc, char* argv[]) {
log_open();
if (getuid() != 0)
- log_warning("This program is unlikely to work for unpriviledged users");
+ log_warning("This program is unlikely to work for unprivileged users");
test_sleep();
diff --git a/src/udev/udev-builtin-keyboard.c b/src/udev/udev-builtin-keyboard.c
index b6da734a3c..ed990c58fb 100644
--- a/src/udev/udev-builtin-keyboard.c
+++ b/src/udev/udev-builtin-keyboard.c
@@ -137,7 +137,7 @@ static void override_abs(int fd, const char *devnode,
return;
}
- log_debug("keyboard: %x overriden with %"PRIi32"/%"PRIi32"/%"PRIi32"/%"PRIi32"/%"PRIi32" for \"%s\"",
+ log_debug("keyboard: %x overridden with %"PRIi32"/%"PRIi32"/%"PRIi32"/%"PRIi32"/%"PRIi32" for \"%s\"",
evcode,
absinfo.minimum, absinfo.maximum, absinfo.resolution, absinfo.fuzz, absinfo.flat,
devnode);
--
2.4.0
More information about the systemd-devel
mailing list