tree-wide: fix typo in comments and NEWS

diff --git a/NEWS b/NEWS
index 5c3d5eb84155d85d3060ff351587247a87d8f305..9b1fc3543d1ae9776b9aec8eb9f60557cb27673a 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1966,7 +1966,7 @@ CHANGES WITH 231:
           with future releases) that the components link to. This should
           decrease systemd footprint both in memory during runtime and on
           disk. Note that the shared library is not for public use, and is
-          neither API not ABI stable, but is likely to change with every new
+          neither API nor ABI stable, but is likely to change with every new
           released update. Packagers need to make sure that binaries
           linking to libsystemd-shared.so are updated in step with the
           library.

diff --git a/src/basic/time-util.h b/src/basic/time-util.h
index e720688c2b5ba05fd4c58096100b78e8d23ab843..f9c34a3e154f86dcd4d36ff57d93af2d5edcd8a4 100644 (file)
--- a/src/basic/time-util.h
+++ b/src/basic/time-util.h
@@ -183,5 +183,5 @@ static inline usec_t usec_sub_signed(usec_t timestamp, int64_t delta) {
 /* With a 32bit time_t we can't go beyond 2038... */
 #define USEC_TIMESTAMP_FORMATTABLE_MAX ((usec_t) 2147483647000000)
 #else
-#error "Yuck, time_t is neither 4 not 8 bytes wide?"
+#error "Yuck, time_t is neither 4 nor 8 bytes wide?"
 #endif

diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c
index 998134ec8c3597927fa7f32109792d9778299cb2..a1d3ea2fb5f86e033c1a1a67ba6ca585b8b2805e 100644 (file)
--- a/src/shared/bus-util.c
+++ b/src/shared/bus-util.c
@@ -838,7 +838,7 @@ int bus_print_property(const char *name, sd_bus_message *m, bool value, bool all
                                         printf("%s=", name);
 
                                 /* This property has multiple space-separated values, so
-                                 * neither spaces not newlines can be allowed in a value. */
+                                 * neither spaces nor newlines can be allowed in a value. */
                                 good = str[strcspn(str, " \n")] == '\0';
 
                                 printf("%s%s", first ? "" : " ", good ? str : "[unprintable]");