summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2015-07-29 12:40:55 +0200
committerLennart Poettering <lennart@poettering.net>2015-07-29 12:40:55 +0200
commit19a9bc49dfacf9824a94828d56b18b58701c135f (patch)
tree1de6fe50fa7bdedc20e073026d638ca218665b68
parentf5f113f66692abaf72e83698cb7b4f3690b90cf8 (diff)
parent94e5ba370aa12b47571f08112986d0b91935dee9 (diff)
Merge pull request #767 from torstehu/fix-typo
treewide: fix typos
-rw-r--r--NEWS4
-rw-r--r--src/resolve/dns-type.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/NEWS b/NEWS
index 0fbfca4ab5..9fc6cc6e00 100644
--- a/NEWS
+++ b/NEWS
@@ -475,7 +475,7 @@ CHANGES WITH 219:
decompress bz2, xz, gzip compressed downloads if necessary,
and restore sparse files on disk. The daemon uses privilege
separation to ensure the actual download logic runs with
- fewer privileges than the deamon itself. machinectl has
+ fewer privileges than the daemon itself. machinectl has
gained new commands "pull-tar", "pull-raw" and "pull-dkr" to
make the functionality of importd available to the
user. With this in place the Fedora and Ubuntu "Cloud"
@@ -566,7 +566,7 @@ CHANGES WITH 219:
* systemd now provides a way to store file descriptors
per-service in PID 1.This is useful for daemons to ensure
that fds they require are not lost during a daemon
- restart. The fds are passed to the deamon on the next
+ restart. The fds are passed to the daemon on the next
invocation in the same way socket activation fds are
passed. This is now used by journald to ensure that the
various sockets connected to all the system's stdout/stderr
diff --git a/src/resolve/dns-type.c b/src/resolve/dns-type.c
index e1087b3219..63b4b36e88 100644
--- a/src/resolve/dns-type.c
+++ b/src/resolve/dns-type.c
@@ -44,7 +44,7 @@ int dns_type_from_string(const char *s) {
return sc->id;
}
-/* XXX: find an authorotative list of all pseudo types? */
+/* XXX: find an authoritative list of all pseudo types? */
bool dns_type_is_pseudo(int n) {
return IN_SET(n, DNS_TYPE_ANY, DNS_TYPE_AXFR, DNS_TYPE_IXFR, DNS_TYPE_OPT);
}