summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
Diffstat (limited to 'man')
-rw-r--r--man/journalctl.xml2
-rw-r--r--man/journald.conf.xml2
-rw-r--r--man/kernel-install.xml6
-rw-r--r--man/logind.conf.xml2
-rw-r--r--man/machine-id.xml2
-rw-r--r--man/nss-myhostname.xml2
6 files changed, 8 insertions, 8 deletions
diff --git a/man/journalctl.xml b/man/journalctl.xml
index 3db5e5dab6..4bbc288b7a 100644
--- a/man/journalctl.xml
+++ b/man/journalctl.xml
@@ -171,7 +171,7 @@
implied pager tool. This implies
<option>-n1000</option> to guarantee
that the pager won't buffer logs of
- unbounded size. This may be overriden
+ unbounded size. This may be overridden
with an explicit <option>-n</option>
with some other numeric value on the
command line. Note that this option is
diff --git a/man/journald.conf.xml b/man/journald.conf.xml
index 6ba583b31d..0797deb115 100644
--- a/man/journald.conf.xml
+++ b/man/journald.conf.xml
@@ -183,7 +183,7 @@
messages is generated. This rate
limiting is applied per-service, so
that two services which log do not
- interfere with each others'
+ interfere with each other's
limits. Defaults to 200 messages in
10s. The time specification for
<varname>RateLimitInterval=</varname>
diff --git a/man/kernel-install.xml b/man/kernel-install.xml
index 4634680b39..df3549dcb7 100644
--- a/man/kernel-install.xml
+++ b/man/kernel-install.xml
@@ -131,7 +131,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
<filename>/proc/cmdline</filename>
</term>
<listitem>
- <para>The contents of the file <filename>/etc/kernel/cmdline</filename> specifies the kernel command line to use.
+ <para>The content of the file <filename>/etc/kernel/cmdline</filename> specifies the kernel command line to use.
If that file does not exist, <filename>/proc/cmdline</filename> is used.</para>
</listitem>
</varlistentry>
@@ -140,7 +140,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
<filename>/etc/machine-id</filename>
</term>
<listitem>
- <para>The contents of the file specifies the machine identifaction &lt;MACHINE-ID>.</para>
+ <para>The content of the file specifies the machine identification &lt;MACHINE-ID>.</para>
</listitem>
</varlistentry>
<varlistentry>
@@ -148,7 +148,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
<filename>/etc/os-release</filename>
</term>
<listitem>
- <para>The contents of the file specifies the the operating system id &lt;OS-ID>.</para>
+ <para>The content of the file specifies the operating system id &lt;OS-ID>.</para>
</listitem>
</varlistentry>
</variablelist>
diff --git a/man/logind.conf.xml b/man/logind.conf.xml
index b0dd20f2a4..47ee0e73ff 100644
--- a/man/logind.conf.xml
+++ b/man/logind.conf.xml
@@ -163,7 +163,7 @@
will execute the action after all
sessions reported that they are idle,
and no idle inhibitor lock is active,
- and subsquently the time configured
+ and subsequently the time configured
with <varname>IdleActionSec=</varname>
(see below) has passed.</para>
</listitem>
diff --git a/man/machine-id.xml b/man/machine-id.xml
index 153ae4da2c..1e558a6178 100644
--- a/man/machine-id.xml
+++ b/man/machine-id.xml
@@ -75,7 +75,7 @@
logic as the D-Bus machine ID.</para>
<para>Programs may use this ID to identify the host
- with a globally unique ID in the network, that does
+ with a globally unique ID in the network, which does
not change even if the local network configuration
changes. Due to this and its greater length it is
a more useful replacement for the
diff --git a/man/nss-myhostname.xml b/man/nss-myhostname.xml
index 3fc91ee792..c0e2b828be 100644
--- a/man/nss-myhostname.xml
+++ b/man/nss-myhostname.xml
@@ -68,7 +68,7 @@
<filename>/etc</filename> file system and is fragile because the file
might be edited by the administrator at the same time. <command>nss-myhostname</command>
simply returns all locally configure public IP addresses, or -- if none
- are configured -- the IPv4 address 127.0.0.2 (wich is on the local
+ are configured -- the IPv4 address 127.0.0.2 (which is on the local
loopback) and the IPv6 address ::1 (which is the local host) for
whatever system hostname is configured locally. Patching
<filename>/etc/hosts</filename> is thus no longer necessary.</para>