summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Pitt <martin.pitt@ubuntu.com>2016-07-04 17:24:38 +0200
committerGitHub <noreply@github.com>2016-07-04 17:24:38 +0200
commitf05b26634644cb17a0c76fb9c7a018e9d6feaf2f (patch)
tree3343fc136c9f6f7346ca2e5ce10f91e81fd5a525
parent57681e84ce7c44ebc442bc3e7e22d487c4ce703a (diff)
parente8644ece7b28c7b8449344d6c647d9b4558d28b1 (diff)
Merge pull request #3652 from torstehu/fix-typo
treewide: fix typos and add manpage interlinking.
-rw-r--r--NEWS2
-rw-r--r--man/busctl.xml6
-rw-r--r--man/sd_bus_get_fd.xml2
-rw-r--r--man/systemd-nspawn.xml4
-rw-r--r--man/systemd.netdev.xml2
-rw-r--r--src/login/logind-core.c2
-rw-r--r--src/nspawn/nspawn-network.c2
7 files changed, 11 insertions, 9 deletions
diff --git a/NEWS b/NEWS
index e4efb476c6..7a0d1d573e 100644
--- a/NEWS
+++ b/NEWS
@@ -851,7 +851,7 @@ CHANGES WITH 227:
files controlled by the number of files that shall remain,
in addition to the already existing control by size and by
date. This is useful as journal interleaving performance
- degrades with too many seperate journal files, and allows
+ degrades with too many separate journal files, and allows
putting an effective limit on them. The new setting defaults
to 100, but this may be changed by setting SystemMaxFiles=
and RuntimeMaxFiles= in journald.conf. Also, the
diff --git a/man/busctl.xml b/man/busctl.xml
index b71a174634..052a33097f 100644
--- a/man/busctl.xml
+++ b/man/busctl.xml
@@ -119,8 +119,10 @@
<term><option>--match=<replaceable>MATCH</replaceable></option></term>
<listitem><para>When showing messages being exchanged, show only the
- subset matching <replaceable>MATCH</replaceable>.</para></listitem>
- <!-- TODO: link to sd_bus_add_match when it is written? -->
+ subset matching <replaceable>MATCH</replaceable>.
+ See
+ <citerefentry><refentrytitle>sd_bus_add_match</refentrytitle><manvolnum>3</manvolnum></citerefentry>.
+ </para></listitem>
</varlistentry>
<varlistentry>
diff --git a/man/sd_bus_get_fd.xml b/man/sd_bus_get_fd.xml
index 49162a6e65..9f7019069f 100644
--- a/man/sd_bus_get_fd.xml
+++ b/man/sd_bus_get_fd.xml
@@ -68,7 +68,7 @@
project='die-net'><refentrytitle>select</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
<citerefentry
project='die-net'><refentrytitle>poll</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
- or similar functions to wait for incmming messages.
+ or similar functions to wait for incoming messages.
</para>
<para>
diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml
index c436f42948..cb0468fbf5 100644
--- a/man/systemd-nspawn.xml
+++ b/man/systemd-nspawn.xml
@@ -109,9 +109,9 @@
service in the background. In this mode each container instance runs as its own service instance; a default
template unit file <filename>systemd-nspawn@.service</filename> is provided to make this easy, taking the container
name as instance identifier. Note that different default options apply when <command>systemd-nspawn</command> is
- invoked by the template unit file than interactively on the commnd line. Most importanly the template unit file
+ invoked by the template unit file than interactively on the command line. Most importantly the template unit file
makes use of the <option>--boot</option> which is not the default in case <command>systemd-nspawn</command> is
- invoked from the interactive command line. Further differences with the defaults are documented dalong with the
+ invoked from the interactive command line. Further differences with the defaults are documented along with the
various supported options below.</para>
<para>The <citerefentry><refentrytitle>machinectl</refentrytitle><manvolnum>1</manvolnum></citerefentry> tool may
diff --git a/man/systemd.netdev.xml b/man/systemd.netdev.xml
index 2be1efee2f..571e9aa946 100644
--- a/man/systemd.netdev.xml
+++ b/man/systemd.netdev.xml
@@ -163,7 +163,7 @@
<entry>A virtual extensible LAN (vxlan), for connecting Cloud computing deployments.</entry></row>
<row><entry><varname>vrf</varname></entry>
- <entry>A Virtual Routing and Forwarding (<ulink url="https://www.kernel.org/doc/Documentation/networking/vrf.txt">VRF</ulink>) interface to create seperate routing and forwarding domains.</entry></row>
+ <entry>A Virtual Routing and Forwarding (<ulink url="https://www.kernel.org/doc/Documentation/networking/vrf.txt">VRF</ulink>) interface to create separate routing and forwarding domains.</entry></row>
</tbody>
</tgroup>
diff --git a/src/login/logind-core.c b/src/login/logind-core.c
index cbf8d757fe..eff5a4a36f 100644
--- a/src/login/logind-core.c
+++ b/src/login/logind-core.c
@@ -496,7 +496,7 @@ static int manager_count_external_displays(Manager *m) {
continue;
/* Ignore internal displays: the type is encoded in
- * the sysfs name, as the second dash seperated item
+ * the sysfs name, as the second dash separated item
* (the first is the card name, the last the connector
* number). We implement a whitelist of external
* displays here, rather than a whitelist, to ensure
diff --git a/src/nspawn/nspawn-network.c b/src/nspawn/nspawn-network.c
index 8da47a2ca6..428cc04de0 100644
--- a/src/nspawn/nspawn-network.c
+++ b/src/nspawn/nspawn-network.c
@@ -350,7 +350,7 @@ int setup_bridge(const char *veth_name, const char *bridge_name, bool create) {
if (create) {
/* We take a system-wide lock here, so that we can safely check whether there's still a member in the
- * bridge before removing it, without risking interferance from other nspawn instances. */
+ * bridge before removing it, without risking interference from other nspawn instances. */
r = make_lock_file("/run/systemd/nspawn-network-zone", LOCK_EX, &bridge_lock);
if (r < 0)