summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Herrmann <dh.herrmann@googlemail.com>2015-09-08 13:23:24 +0200
committerDavid Herrmann <dh.herrmann@googlemail.com>2015-09-08 13:23:24 +0200
commit2b3b433dbb301d4b233150d54e498e00ed7c9d21 (patch)
tree5bb81b2c7f58a2edc8563def1bdc6ee2cee9950d
parenta7adabc96ef9c34b6e05404169158c8eee6dce76 (diff)
parentdc61b7e45d89a69f0469ab7b3289cdde7fcc55ab (diff)
Merge pull request #1201 from torstehu/fix-typo
treewide: fix typos
-rw-r--r--man/systemd-gpt-auto-generator.xml2
-rw-r--r--src/journal/journald-kmsg.c2
-rw-r--r--src/login/pam_systemd.c2
-rw-r--r--src/resolve/resolved-dns-packet.h2
4 files changed, 4 insertions, 4 deletions
diff --git a/man/systemd-gpt-auto-generator.xml b/man/systemd-gpt-auto-generator.xml
index 27ec72c986..f569ea3cde 100644
--- a/man/systemd-gpt-auto-generator.xml
+++ b/man/systemd-gpt-auto-generator.xml
@@ -69,7 +69,7 @@
units are explicitly configured (for example, listed in
<citerefentry
project='man-pages'><refentrytitle>fstab</refentrytitle><manvolnum>5</manvolnum></citerefentry>),
- the units this generator creates are overriden, but additional
+ the units this generator creates are overridden, but additional
automatic dependencies might be created.</para>
<para>This generator will only look for root partitions on the
diff --git a/src/journal/journald-kmsg.c b/src/journal/journald-kmsg.c
index e5be7f7766..51fe3aa50a 100644
--- a/src/journal/journald-kmsg.c
+++ b/src/journal/journald-kmsg.c
@@ -190,7 +190,7 @@ static void dev_kmsg_record(Server *s, const char *p, size_t l) {
for (j = 0; l > 0 && j < N_IOVEC_KERNEL_FIELDS; j++) {
char *m;
- /* Meta data fields attached */
+ /* Metadata fields attached */
if (*k != ' ')
break;
diff --git a/src/login/pam_systemd.c b/src/login/pam_systemd.c
index 71c84d8e0a..f66f1ce842 100644
--- a/src/login/pam_systemd.c
+++ b/src/login/pam_systemd.c
@@ -185,7 +185,7 @@ static int export_legacy_dbus_address(
if (asprintf(&s, KERNEL_USER_BUS_ADDRESS_FMT ";" UNIX_USER_BUS_ADDRESS_FMT, uid, runtime) < 0)
goto error;
} else {
- /* FIXME: We *realy* should move the access() check into the
+ /* FIXME: We *really* should move the access() check into the
* daemons that spawn dbus-daemon, instead of forcing
* DBUS_SESSION_BUS_ADDRESS= here. */
diff --git a/src/resolve/resolved-dns-packet.h b/src/resolve/resolved-dns-packet.h
index 5628e579ad..fbbabaf232 100644
--- a/src/resolve/resolved-dns-packet.h
+++ b/src/resolve/resolved-dns-packet.h
@@ -78,7 +78,7 @@ struct DnsPacket {
DnsQuestion *question;
DnsAnswer *answer;
- /* Packet reception meta data */
+ /* Packet reception metadata */
int ifindex;
int family, ipproto;
union in_addr_union sender, destination;