summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2020-04-22 08:41:38 +0200
committerGitHub <noreply@github.com>2020-04-22 08:41:38 +0200
commit2807b68019597efb997e469face1ec35fa1fba46 (patch)
tree1ebc42788d8d57e93bd07fbe70c8a1506f9de39b /man
parenta00f28c55402cd66c62a86962e821fbd76a4d165 (diff)
parent86b52a39581d3e1805d939492daa6aa19130ddb7 (diff)
downloadsystemd-2807b68019597efb997e469face1ec35fa1fba46.tar.gz
Merge pull request #15520 from mrc0mmand/various-codebase-improvements
tree-wide: various codebase improvements
Diffstat (limited to 'man')
-rw-r--r--man/bootup.xml2
-rw-r--r--man/homectl.xml8
-rw-r--r--man/journalctl.xml2
-rw-r--r--man/pam_systemd_home.xml2
-rw-r--r--man/sd-login.xml2
-rw-r--r--man/sd_bus_message_sensitive.xml2
-rw-r--r--man/sd_hwdb_get.xml2
-rw-r--r--man/sd_id128_get_machine.xml2
-rw-r--r--man/systemd.exec.xml2
-rw-r--r--man/systemd.network.xml4
-rw-r--r--man/systemd.service.xml10
-rw-r--r--man/yubikey-crypttab.sh4
12 files changed, 21 insertions, 21 deletions
diff --git a/man/bootup.xml b/man/bootup.xml
index 5a0a3c2871..8cee4b419e 100644
--- a/man/bootup.xml
+++ b/man/bootup.xml
@@ -170,7 +170,7 @@ emergency.service | | |
user units. For non-graphical sessions, <filename>default.target</filename> is used. Whenever the user
logs into a graphical session, the login manager will start the
<filename>graphical-session.target</filename> target that is used to pull in units required for the
- grahpical session. A number of targets (shown on the right side) are started when specific hardware is
+ graphical session. A number of targets (shown on the right side) are started when specific hardware is
available to the user.</para>
<programlisting>
diff --git a/man/homectl.xml b/man/homectl.xml
index 2d99af93b1..6cec7a13c8 100644
--- a/man/homectl.xml
+++ b/man/homectl.xml
@@ -50,7 +50,7 @@
<listitem><para>An individual LUKS2 encrypted loopback file for a user, stored in
<filename>/home/*.home</filename>. At login the file system contained in this files is mounted, after
the LUKS2 encrypted volume has been attached. The user's password is identical to the encryption
- passphrase of the LUKS2 volume. Access to data without preceeding user authentication is thus not
+ passphrase of the LUKS2 volume. Access to data without preceding user authentication is thus not
possible, even for the system administrator. This storage mechanism provides the strongest data
security and is thus recommended.</para></listitem>
@@ -267,7 +267,7 @@
matching the user in name and numeric UID/GID. Thus any groups listed here must be registered
independently, for example with <citerefentry
project='man-pages'><refentrytitle>groupadd</refentrytitle><manvolnum>8</manvolnum></citerefentry>. If
- non-existant groups that are listed there are ignored. This option may be used more than once, in
+ non-existent groups that are listed there are ignored. This option may be used more than once, in
which case all specified group lists are combined.</para></listitem>
</varlistentry>
@@ -467,7 +467,7 @@
project='man-pages'><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></citerefentry> or a
similar tool. Use <option>--rlimit=LIMIT_NPROC=</option> to place a limit on the tasks actually
running under the UID of the user, thus excluding any child processes that might have changed user
- identity. This controls the <varname>TasksMax=</varname> settting of the per-user systemd slice unit
+ identity. This controls the <varname>TasksMax=</varname> setting of the per-user systemd slice unit
<filename>user-$UID.slice</filename>. See
<citerefentry><refentrytitle>systemd.resource-control</refentrytitle><manvolnum>5</manvolnum></citerefentry>
for further details.</para></listitem>
@@ -707,7 +707,7 @@
<varlistentry>
<term><command>passwd</command> <replaceable>USER</replaceable></term>
- <listitem><para>Change the password of the specified home direcory/user account.</para></listitem>
+ <listitem><para>Change the password of the specified home directory/user account.</para></listitem>
</varlistentry>
<varlistentry>
diff --git a/man/journalctl.xml b/man/journalctl.xml
index 1e5f95e19d..d6d475ed97 100644
--- a/man/journalctl.xml
+++ b/man/journalctl.xml
@@ -631,7 +631,7 @@
<varlistentry>
<term><option>--case-sensitive<optional>=BOOLEAN</optional></option></term>
- <listitem><para>Make pattern matching case sensitive or case insenstive.</para>
+ <listitem><para>Make pattern matching case sensitive or case insensitive.</para>
</listitem>
</varlistentry>
diff --git a/man/pam_systemd_home.xml b/man/pam_systemd_home.xml
index 5e3641c903..d952c98dc1 100644
--- a/man/pam_systemd_home.xml
+++ b/man/pam_systemd_home.xml
@@ -70,7 +70,7 @@
<para>Turning this option on by default is highly recommended for all sessions, but only if the
service managing these sessions correctly implements the aforementioned re-authentication. Note that
- the re-authentication must take place from a component runing outside of the user's context, so that
+ the re-authentication must take place from a component running outside of the user's context, so that
it does not require access to the user's home directory for operation. Traditionally, most desktop
environments do not implement screen locking this way, and need to be updated
accordingly.</para></listitem>
diff --git a/man/sd-login.xml b/man/sd-login.xml
index 2787bd7474..ecc6e28a84 100644
--- a/man/sd-login.xml
+++ b/man/sd-login.xml
@@ -194,7 +194,7 @@
<listitem><para>When set to <literal>1</literal>, this device automatically
generates a new and independent seat, which is named after the path of the
- device. This is set for specialized USB hubs like the Plugable devices, which when
+ device. This is set for specialized USB hubs like the Pluggable devices, which when
plugged in should create a hotplug seat without further configuration.</para>
</listitem>
</varlistentry>
diff --git a/man/sd_bus_message_sensitive.xml b/man/sd_bus_message_sensitive.xml
index a4a732cfd1..8f3e8aeb8e 100644
--- a/man/sd_bus_message_sensitive.xml
+++ b/man/sd_bus_message_sensitive.xml
@@ -50,7 +50,7 @@
<refsect1>
<title>Return Value</title>
- <para>On success, theis functions return 0 or a positive integer. On failure, it returns a
+ <para>On success, this functions return 0 or a positive integer. On failure, it returns a
negative errno-style error code.</para>
<refsect2>
diff --git a/man/sd_hwdb_get.xml b/man/sd_hwdb_get.xml
index 58e6e57e0f..ded8721537 100644
--- a/man/sd_hwdb_get.xml
+++ b/man/sd_hwdb_get.xml
@@ -86,7 +86,7 @@
<para>The <function>SD_HWDB_FOREACH_PROPERTY</function> macro combines
<function>sd_hwdb_seek()</function> and <function>sd_hwdb_enumerate()</function>. No error handling is
- performed and interation simply stops on error. See the example below.</para>
+ performed and iteration simply stops on error. See the example below.</para>
</refsect1>
<refsect1>
diff --git a/man/sd_id128_get_machine.xml b/man/sd_id128_get_machine.xml
index e665f7343f..bb85d8839f 100644
--- a/man/sd_id128_get_machine.xml
+++ b/man/sd_id128_get_machine.xml
@@ -66,7 +66,7 @@
file. This function caches the machine ID internally to make retrieving the machine ID a cheap operation. This ID
may be used wherever a unique identifier for the local system is needed. However, it is recommended to use this ID
as-is only in trusted environments. In untrusted environments it is recommended to derive an application specific
- ID from this machine ID, in an irreversable (cryptographically secure) way. To make this easy
+ ID from this machine ID, in an irreversible (cryptographically secure) way. To make this easy
<function>sd_id128_get_machine_app_specific()</function> is provided, see below.</para>
<para><function>sd_id128_get_machine_app_specific()</function> is similar to
diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
index 4d85b6aec0..3e2ae93bf0 100644
--- a/man/systemd.exec.xml
+++ b/man/systemd.exec.xml
@@ -1634,7 +1634,7 @@ RestrictNamespaces=~cgroup net</programlisting>
points of the file system namespace created for each process of this unit. Other file system namespacing unit
settings (see the discussion in <varname>PrivateMounts=</varname> above) will implicitly disable mount and
unmount propagation from the unit's processes towards the host by changing the propagation setting of all mount
- points in the unit's file system namepace to <option>slave</option> first. Setting this option to
+ points in the unit's file system namespace to <option>slave</option> first. Setting this option to
<option>shared</option> does not reestablish propagation in that case.</para>
<para>If not set – but file system namespaces are enabled through another file system namespace unit setting –
diff --git a/man/systemd.network.xml b/man/systemd.network.xml
index 864dd6500b..3bf54e1379 100644
--- a/man/systemd.network.xml
+++ b/man/systemd.network.xml
@@ -622,7 +622,7 @@
trigger the start of the DHCPv6 client if the relevant flags are set in the RA data, or if no
routers are found on the link. The default is to disable RA reception for bridge devices or when IP
forwarding is enabled, and to enable it otherwise. Cannot be enabled on bond devices and when link
- local adressing is disabled.</para>
+ local addressing is disabled.</para>
<para>Further settings for the IPv6 RA support may be configured in the
<literal>[IPv6AcceptRA]</literal> section, see below.</para>
@@ -1625,7 +1625,7 @@
<varlistentry>
<term><varname>SendDecline=</varname></term>
<listitem>
- <para>A boolen. When <literal>true</literal>, DHCPv4 clients receives IP address from DHCP server.
+ <para>A boolean. When <literal>true</literal>, DHCPv4 clients receives IP address from DHCP server.
After new IP is received, DHCPv4 performs IPv4 Duplicate Address Detection. If duplicate use of IP is detected
the DHCPv4 client rejects the IP by sending a DHCPDECLINE packet DHCP clients try to obtain an IP address again.
See <ulink url="https://tools.ietf.org/html/rfc5227">RFC 5224</ulink>.
diff --git a/man/systemd.service.xml b/man/systemd.service.xml
index 9f99feaef0..398fd69b46 100644
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -199,7 +199,7 @@
option is used without <varname>RemainAfterExit=</varname> the service will never enter
<literal>active</literal> unit state, but directly transition from <literal>activating</literal>
to <literal>deactivating</literal> or <literal>dead</literal> since no process is configured that
- shall run continously. In particular this means that after a service of this type ran (and which
+ shall run continuously. In particular this means that after a service of this type ran (and which
has <varname>RemainAfterExit=</varname> not set) it will not show up as started afterwards, but
as dead.</para></listitem>
@@ -568,7 +568,7 @@
<para>If a service of <varname>Type=notify</varname> sends <literal>EXTEND_TIMEOUT_USEC=…</literal>, this may cause
the start time to be extended beyond <varname>TimeoutStartSec=</varname>. The first receipt of this message
- must occur before <varname>TimeoutStartSec=</varname> is exceeded, and once the start time has exended beyond
+ must occur before <varname>TimeoutStartSec=</varname> is exceeded, and once the start time has extended beyond
<varname>TimeoutStartSec=</varname>, the service manager will allow the service to continue to start, provided
the service repeats <literal>EXTEND_TIMEOUT_USEC=…</literal> within the interval specified until the service
startup status is finished by <literal>READY=1</literal>. (see
@@ -595,7 +595,7 @@
<para>If a service of <varname>Type=notify</varname> sends <literal>EXTEND_TIMEOUT_USEC=…</literal>, this may cause
the stop time to be extended beyond <varname>TimeoutStopSec=</varname>. The first receipt of this message
- must occur before <varname>TimeoutStopSec=</varname> is exceeded, and once the stop time has exended beyond
+ must occur before <varname>TimeoutStopSec=</varname> is exceeded, and once the stop time has extended beyond
<varname>TimeoutStopSec=</varname>, the service manager will allow the service to continue to stop, provided
the service repeats <literal>EXTEND_TIMEOUT_USEC=…</literal> within the interval specified, or terminates itself
(see <citerefentry><refentrytitle>sd_notify</refentrytitle><manvolnum>3</manvolnum></citerefentry>).
@@ -624,7 +624,7 @@
<para>If a service of <varname>Type=notify</varname> handles <constant>SIGABRT</constant> itself (instead of relying
on the kernel to write a core dump) it can send <literal>EXTEND_TIMEOUT_USEC=…</literal> to
extended the abort time beyond <varname>TimeoutAbortSec=</varname>. The first receipt of this message
- must occur before <varname>TimeoutAbortSec=</varname> is exceeded, and once the abort time has exended beyond
+ must occur before <varname>TimeoutAbortSec=</varname> is exceeded, and once the abort time has extended beyond
<varname>TimeoutAbortSec=</varname>, the service manager will allow the service to continue to abort, provided
the service repeats <literal>EXTEND_TIMEOUT_USEC=…</literal> within the interval specified, or terminates itself
(see <citerefentry><refentrytitle>sd_notify</refentrytitle><manvolnum>3</manvolnum></citerefentry>).
@@ -650,7 +650,7 @@
<para>If a service of <varname>Type=notify</varname> sends <literal>EXTEND_TIMEOUT_USEC=…</literal>, this may cause
the runtime to be extended beyond <varname>RuntimeMaxSec=</varname>. The first receipt of this message
- must occur before <varname>RuntimeMaxSec=</varname> is exceeded, and once the runtime has exended beyond
+ must occur before <varname>RuntimeMaxSec=</varname> is exceeded, and once the runtime has extended beyond
<varname>RuntimeMaxSec=</varname>, the service manager will allow the service to continue to run, provided
the service repeats <literal>EXTEND_TIMEOUT_USEC=…</literal> within the interval specified until the service
shutdown is achieved by <literal>STOPPING=1</literal> (or termination). (see
diff --git a/man/yubikey-crypttab.sh b/man/yubikey-crypttab.sh
index 9e65bae621..c0717b364e 100644
--- a/man/yubikey-crypttab.sh
+++ b/man/yubikey-crypttab.sh
@@ -1,4 +1,4 @@
-# Make sure noone can read the files we generate but us
+# Make sure no one can read the files we generate but us
umask 077
# Destroy any old key on the Yubikey (careful!)
@@ -40,7 +40,7 @@ shred -u plaintext.bin plaintext.base64
rm pubkey.pem
# Test: Let's run systemd-cryptsetup to test if this all worked. The option string should contain the full
-# PKCS#11 URI we have in the clipboard, it tells the tool how to decypher the encrypted LUKS key.
+# PKCS#11 URI we have in the clipboard, it tells the tool how to decipher the encrypted LUKS key.
sudo systemd-cryptsetup attach mytest /dev/sdXn /etc/encrypted-luks-key.bin 'pkcs11-uri=pkcs11:…'
# If that worked, let's now add the same line persistently to /etc/crypttab, for the future.