summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--man/bootup.xml2
-rw-r--r--man/crypttab.xml8
-rw-r--r--man/daemon.xml10
-rw-r--r--man/kernel-command-line.xml2
-rw-r--r--man/locale.conf.xml2
-rw-r--r--man/pam_systemd.xml4
-rw-r--r--man/sd_journal_print.xml2
-rw-r--r--man/sd_seat_get_active.xml2
-rw-r--r--man/systemctl.xml6
-rw-r--r--man/systemd.device.xml2
-rw-r--r--man/systemd.exec.xml6
-rw-r--r--man/systemd.service.xml12
-rw-r--r--man/systemd.socket.xml8
-rw-r--r--man/systemd.unit.xml2
-rw-r--r--src/core/dbus-unit.c2
-rw-r--r--src/core/transaction.c2
-rw-r--r--src/core/unit.c2
-rw-r--r--src/core/unit.h2
-rw-r--r--src/journal/journal-file.c2
-rw-r--r--src/journal/lookup3.c2
-rw-r--r--src/journal/mmap-cache.c2
-rw-r--r--src/libudev/libudev-device.c2
-rw-r--r--src/udev/udevd.c2
-rw-r--r--test/test-functions2
24 files changed, 44 insertions, 44 deletions
diff --git a/man/bootup.xml b/man/bootup.xml
index ae70c953f5..4cc4bafab7 100644
--- a/man/bootup.xml
+++ b/man/bootup.xml
@@ -111,7 +111,7 @@
target units are available, as listed on
<citerefentry><refentrytitle>systemd.special</refentrytitle><manvolnum>7</manvolnum></citerefentry>.</para>
- <para>The follow chart is a structural overview of
+ <para>The following chart is a structural overview of
these well-known units and their position in the
boot-up logic. The arrows describe which units are
pulled in and ordered before which other units. Units
diff --git a/man/crypttab.xml b/man/crypttab.xml
index 8711272a87..2a839944dc 100644
--- a/man/crypttab.xml
+++ b/man/crypttab.xml
@@ -175,7 +175,7 @@
<varlistentry>
<term><varname>verify</varname></term>
- <listitem><para> If the the encryption
+ <listitem><para> If the encryption
password is read from console, it has
to be entered twice (to prevent
typos). </para></listitem>
@@ -217,9 +217,9 @@
<term><varname>timeout=</varname></term>
<listitem><para>Specify the timeout
- for querying for a password. If not
- unit is specified in
- seconds. Supported units are s, ms,
+ for querying for a password. If no
+ unit is specified seconds is used.
+ Supported units are s, ms,
us, min, h, d.</para></listitem>
</varlistentry>
diff --git a/man/daemon.xml b/man/daemon.xml
index 9d43353f90..e3c038e46a 100644
--- a/man/daemon.xml
+++ b/man/daemon.xml
@@ -181,11 +181,11 @@
<function>exit()</function> in the
original process. The process that
invoked the daemon must be able to
- rely that this
+ rely on that this
<function>exit()</function> happens
after initialization is complete and
all external communication channels
- established and
+ are established and
accessible.</para></listitem>
</orderedlist>
@@ -196,7 +196,7 @@
compatibility with SysV systems should
implement the scheme pointed out
above. However, it is recommended to make this
- behaviour optional and configurable via a
+ behavior optional and configurable via a
command line argument, to ease debugging as
well as to simplify integration into systems
using systemd.</para>
@@ -271,7 +271,7 @@
for details.</para></listitem>
<listitem><para>As much as possible,
- rely on the init systemd's
+ rely on the init system's
functionality to limit the access of
the daemon to files, services and
other resources. i.e. in the case of
@@ -462,7 +462,7 @@
<para>New-style daemons which support socket
activation must be able to receive their
- sockets from the init system, instead of of
+ sockets from the init system, instead of
creating and binding them themselves. For
details about the programming interfaces for
this scheme provided by systemd see
diff --git a/man/kernel-command-line.xml b/man/kernel-command-line.xml
index cfc9b8599e..27f0d4036f 100644
--- a/man/kernel-command-line.xml
+++ b/man/kernel-command-line.xml
@@ -93,7 +93,7 @@
<listitem>
<para>Parameters understood by
the system and service manager
- to control system behaviour. For details see
+ to control system behavior. For details see
<citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>.</para>
</listitem>
</varlistentry>
diff --git a/man/locale.conf.xml b/man/locale.conf.xml
index 2cbcdc66de..06c0af0bf7 100644
--- a/man/locale.conf.xml
+++ b/man/locale.conf.xml
@@ -117,7 +117,7 @@
<varname>LC_TELEPHONE=</varname>,
<varname>LC_MEASUREMENT=</varname>,
<varname>LC_IDENTIFICATION=</varname>. Note that
- <varname>LC_ALL</varname> may not be be configured in
+ <varname>LC_ALL</varname> may not be configured in
this file. For details about the meaning and semantics
of these settings, refer to
<citerefentry><refentrytitle>locale</refentrytitle><manvolnum>7</manvolnum></citerefentry>.</para>
diff --git a/man/pam_systemd.xml b/man/pam_systemd.xml
index f2c1ab8ca6..27edea7779 100644
--- a/man/pam_systemd.xml
+++ b/man/pam_systemd.xml
@@ -157,7 +157,7 @@
listed in this argument will not be
subject to the effect of
<option>kill-session-processes=</option>. Note
- that that this option takes precedence
+ that this option takes precedence
over
<option>kill-only-users=</option>, and
hence whatever is listed for
@@ -272,7 +272,7 @@
in again, the directory contents will
have been lost in between, but
applications should not rely on this
- behaviour and must be able to deal with
+ behavior and must be able to deal with
stale files. To store session-private
data in this directory the user should
include the value of <varname>$XDG_SESSION_ID</varname>
diff --git a/man/sd_journal_print.xml b/man/sd_journal_print.xml
index c03762ac2c..41414bbc09 100644
--- a/man/sd_journal_print.xml
+++ b/man/sd_journal_print.xml
@@ -123,7 +123,7 @@
object of type <literal>va_list</literal> (see
<citerefentry><refentrytitle>stdarg</refentrytitle><manvolnum>3</manvolnum></citerefentry>
for more information) instead of the format string. It
- is otherwise equivalent in behaviour.</para>
+ is otherwise equivalent in behavior.</para>
<para><function>sd_journal_send()</function> may be
used to submit structured log entries to the system
diff --git a/man/sd_seat_get_active.xml b/man/sd_seat_get_active.xml
index 801c16a4bb..778f9aeaf9 100644
--- a/man/sd_seat_get_active.xml
+++ b/man/sd_seat_get_active.xml
@@ -93,7 +93,7 @@
a seat, if there is any. Returns the session
identifier and the user identifier of the Unix user
the session is belonging to. Either the session or the
- user identifier parameter can be be passed NULL, in
+ user identifier parameter can be passed NULL, in
case only one of the parameters shall be queried. The
returned string needs to be freed with the libc
<citerefentry><refentrytitle>free</refentrytitle><manvolnum>3</manvolnum></citerefentry>
diff --git a/man/systemctl.xml b/man/systemctl.xml
index c5fae825aa..fedc588766 100644
--- a/man/systemctl.xml
+++ b/man/systemctl.xml
@@ -1107,7 +1107,7 @@
mounted read-only, immediately
followed by the system halt. If
<option>--force</option> is specified
- twice the the operation is immediately
+ twice the operation is immediately
executed without terminating any
processes or unmounting any file
systems. This may result in data
@@ -1128,7 +1128,7 @@
unmounted or mounted read-only,
immediately followed by the powering
off. If <option>--force</option> is
- specified twice the the operation is
+ specified twice the operation is
immediately executed without
terminating any processes or
unmounting any file systems. This may
@@ -1149,7 +1149,7 @@
unmounted or mounted read-only,
immediately followed by the reboot. If
<option>--force</option> is specified
- twice the the operation is immediately
+ twice the operation is immediately
executed without terminating any
processes or unmounting any file
systems. This may result in data
diff --git a/man/systemd.device.xml b/man/systemd.device.xml
index 7c05ab035b..c360319d23 100644
--- a/man/systemd.device.xml
+++ b/man/systemd.device.xml
@@ -131,7 +131,7 @@
to 1 the device will be considered
plugged the moment it shows up in the
udev tree. This property has no
- influence on the behaviour when a
+ influence on the behavior when a
device disappears from the udev
tree. This option is useful to support
devices that initially show up in an
diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
index cf6ab1778e..7ab9b5c1ed 100644
--- a/man/systemd.exec.xml
+++ b/man/systemd.exec.xml
@@ -471,7 +471,7 @@
</varlistentry>
<varlistentry>
<term><varname>TTYVTDisallocate=</varname></term>
- <listitem><para>If the the terminal
+ <listitem><para>If the terminal
device specified with
<varname>TTYPath=</varname> is a
virtual console terminal try to
@@ -806,7 +806,7 @@
<listitem><para>Set a specific control
group attribute for executed
- processes, and (if needed) add the the
+ processes, and (if needed) add the
executed processes to a cgroup in the
hierarchy of the controller the
attribute belongs to. Takes two
@@ -1055,7 +1055,7 @@
<varlistentry>
<term><varname>UtmpIdentifier=</varname></term>
- <listitem><para>Takes a a four
+ <listitem><para>Takes a four
character identifier string for an
utmp/wtmp entry for this service. This
should only be set for services such
diff --git a/man/systemd.service.xml b/man/systemd.service.xml
index c547948c6e..339dea9aa5 100644
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -160,7 +160,7 @@
complete and all communication
channels set up. The child continues
to run as the main daemon
- process. This is the behaviour of
+ process. This is the behavior of
traditional UNIX daemons. If this
setting is used, it is recommended to
also use the
@@ -171,7 +171,7 @@
soon as the parent process
exits.</para>
- <para>Behaviour of
+ <para>Behavior of
<option>oneshot</option> is similar
to <option>simple</option>, however
it is expected that the process has to
@@ -180,7 +180,7 @@
is particularly useful for this type
of service.</para>
- <para>Behaviour of
+ <para>Behavior of
<option>dbus</option> is similar to
<option>simple</option>, however it is
expected that the daemon acquires a
@@ -197,7 +197,7 @@
<varname>BusName=</varname> is
specified.</para>
- <para>Behaviour of
+ <para>Behavior of
<option>notify</option> is similar to
<option>simple</option>, however it is
expected that the daemon sends a
@@ -216,7 +216,7 @@
not set, it will be implicitly set to
<option>main</option>.</para>
- <para>Behaviour of
+ <para>Behavior of
<option>idle</option> is very similar
to <option>simple</option>, however
actual execution of a the service
@@ -599,7 +599,7 @@
SIGTERM and SIGPIPE. Exit status
definitions can either be numeric exit
codes or termination signal names, and
- are are separated by spaces. Example:
+ are separated by spaces. Example:
"<literal>SuccessExitStatus=1 2 8
SIGKILL</literal>", ensures that exit
codes 1, 2, 8 and the termination
diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml
index 8a12e25cf4..6cf6c79e11 100644
--- a/man/systemd.socket.xml
+++ b/man/systemd.socket.xml
@@ -217,7 +217,7 @@
<listitem><para>Specifies a file
system FIFO to listen on. This expects
an absolute file system path as
- argument. Behaviour otherwise is very
+ argument. Behavior otherwise is very
similar to the
<varname>ListenDatagram=</varname>
directive above.</para></listitem>
@@ -228,7 +228,7 @@
<listitem><para>Specifies a special
file in the file system to listen
on. This expects an absolute file
- system path as argument. Behaviour
+ system path as argument. Behavior
otherwise is very similar to the
<varname>ListenFIFO=</varname>
directive above. Use this to open
@@ -248,7 +248,7 @@
or <varname>kobject-uevent</varname>)
as argument, optionally suffixed by a
whitespace followed by a multicast
- group integer. Behaviour otherwise is
+ group integer. Behavior otherwise is
very similar to the
<varname>ListenDatagram=</varname>
directive above.</para></listitem>
@@ -259,7 +259,7 @@
<listitem><para>Specifies a POSIX
message queue name to listen on. This
expects a valid message queue name
- (i.e. beginning with /). Behaviour
+ (i.e. beginning with /). Behavior
otherwise is very similar to the
<varname>ListenFIFO=</varname>
directive above. On Linux message
diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
index 00f6066717..e0aadf4cd3 100644
--- a/man/systemd.unit.xml
+++ b/man/systemd.unit.xml
@@ -440,7 +440,7 @@
<listitem><para>Configures requirement
dependencies, very similar in style to
<varname>Requires=</varname>, however
- in addition to this behaviour it also
+ in addition to this behavior it also
declares that this unit is stopped
when any of the units listed suddenly
disappears. Units can suddenly,
diff --git a/src/core/dbus-unit.c b/src/core/dbus-unit.c
index ad817d7ee8..fdfa5ee200 100644
--- a/src/core/dbus-unit.c
+++ b/src/core/dbus-unit.c
@@ -682,7 +682,7 @@ void bus_unit_send_change_signal(Unit *u) {
/* Send a properties changed signal. First for the
* specific type, then for the generic unit. The
* clients may rely on this order to get atomic
- * behaviour if needed. */
+ * behavior if needed. */
if (UNIT_VTABLE(u)->bus_invalidating_properties) {
diff --git a/src/core/transaction.c b/src/core/transaction.c
index 1f8d803aeb..4bce942012 100644
--- a/src/core/transaction.c
+++ b/src/core/transaction.c
@@ -392,7 +392,7 @@ static int transaction_verify_order_one(Transaction *tr, Job *j, Job *from, unsi
j->marker = from ? from : j;
j->generation = generation;
- /* We assume that the the dependencies are bidirectional, and
+ /* We assume that the dependencies are bidirectional, and
* hence can ignore UNIT_AFTER */
SET_FOREACH(u, j->unit->dependencies[UNIT_BEFORE], i) {
Job *o;
diff --git a/src/core/unit.c b/src/core/unit.c
index c9cd9ee2a0..3950c43f5e 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -1327,7 +1327,7 @@ void unit_notify(Unit *u, UnitActiveState os, UnitActiveState ns, bool reload_su
/* Note that this is called for all low-level state changes,
* even if they might map to the same high-level
* UnitActiveState! That means that ns == os is OK an expected
- * behaviour here. For example: if a mount point is remounted
+ * behavior here. For example: if a mount point is remounted
* this function will be called too! */
if (u->manager->n_reloading <= 0) {
diff --git a/src/core/unit.h b/src/core/unit.h
index 89bd61c2d8..5b4dda4cb0 100644
--- a/src/core/unit.h
+++ b/src/core/unit.h
@@ -285,7 +285,7 @@ struct UnitVTable {
* UNIT_STUB if no configuration could be found. */
int (*load)(Unit *u);
- /* If a a lot of units got created via enumerate(), this is
+ /* If a lot of units got created via enumerate(), this is
* where to actually set the state and call unit_notify(). */
int (*coldplug)(Unit *u);
diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
index 8dc0a3a669..e778e1c67c 100644
--- a/src/journal/journal-file.c
+++ b/src/journal/journal-file.c
@@ -1051,7 +1051,7 @@ void journal_file_post_change(JournalFile *f) {
__sync_synchronize();
if (ftruncate(f->fd, f->last_stat.st_size) < 0)
- log_error("Failed to to truncate file to its own size: %m");
+ log_error("Failed to truncate file to its own size: %m");
}
int journal_file_append_entry(JournalFile *f, const dual_timestamp *ts, const struct iovec iovec[], unsigned n_iovec, uint64_t *seqnum, Object **ret, uint64_t *offset) {
diff --git a/src/journal/lookup3.c b/src/journal/lookup3.c
index 31eac8c543..ee9a1834cf 100644
--- a/src/journal/lookup3.c
+++ b/src/journal/lookup3.c
@@ -14,7 +14,7 @@ if SELF_TEST is defined. You can use this free for any purpose. It's in
the public domain. It has no warranty.
You probably want to use hashlittle(). hashlittle() and hashbig()
-hash byte arrays. hashlittle() is is faster than hashbig() on
+hash byte arrays. hashlittle() is faster than hashbig() on
little-endian machines. Intel and AMD are little-endian machines.
On second thought, you probably want hashlittle2(), which is identical to
hashlittle() except it returns two 32-bit hashes for the price of one.
diff --git a/src/journal/mmap-cache.c b/src/journal/mmap-cache.c
index 2b45e375c5..7d6c6c22ba 100644
--- a/src/journal/mmap-cache.c
+++ b/src/journal/mmap-cache.c
@@ -392,7 +392,7 @@ static int mmap_cache_put(
if (st) {
/* Memory maps that are larger then the files
- underneath have undefined behaviour. Hence, clamp
+ underneath have undefined behavior. Hence, clamp
things to the file size if we know it */
if (woffset >= (uint64_t) st->st_size)
diff --git a/src/libudev/libudev-device.c b/src/libudev/libudev-device.c
index 1bef70962c..972ace5d39 100644
--- a/src/libudev/libudev-device.c
+++ b/src/libudev/libudev-device.c
@@ -1124,7 +1124,7 @@ _public_ const char *udev_device_get_sysname(struct udev_device *udev_device)
*
* Get the instance number of the device.
*
- * Returns: the trailing number string of of the device name
+ * Returns: the trailing number string of the device name
**/
_public_ const char *udev_device_get_sysnum(struct udev_device *udev_device)
{
diff --git a/src/udev/udevd.c b/src/udev/udevd.c
index b4fc624db3..35263ff135 100644
--- a/src/udev/udevd.c
+++ b/src/udev/udevd.c
@@ -1177,7 +1177,7 @@ int main(int argc, char *argv[])
}
if (systemd_fds(udev, &fd_ctrl, &fd_netlink) >= 0) {
- /* get control and netlink socket from from systemd */
+ /* get control and netlink socket from systemd */
udev_ctrl = udev_ctrl_new_from_fd(udev, fd_ctrl);
if (udev_ctrl == NULL) {
log_error("error taking over udev control socket");
diff --git a/test/test-functions b/test/test-functions
index c355423192..0587cd4feb 100644
--- a/test/test-functions
+++ b/test/test-functions
@@ -620,7 +620,7 @@ for_each_kmod_dep() {
# $1 = search only in subdirectory of /kernel/$1
# $2 = function to call with module name to filter.
# This function will be passed the full path to the module to test.
-# The behaviour of this function can vary depending on whether $hostonly is set.
+# The behavior of this function can vary depending on whether $hostonly is set.
# If it is, we will only look at modules that are already in memory.
# If it is not, we will look at all kernel modules
# This function returns the full filenames of modules that match $1
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-11-03 14:24:06 +0000