tree-wide: fix typo in comments and NEWS

diff --git a/NEWS b/NEWS
index cd7c229610d00b16bd80c9c816b1c3da992feb27..d94c2241bf8d0dda9930f41dba130751e035d427 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 1662197d66c9c7a517923a9d7b44baabe0601e07..fec0511091cefffda15b11f7d53e0e0ac0471d57 100644 (file)
--- a/src/basic/time-util.h
+++ b/src/basic/time-util.h
@@ -207,5 +207,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 cf9c8eb0d212e82448b9dc99a3e8de45d829d89f..4f66bb3b7b08a4f5c177ea96cfa15afe6eacd7d7 100644 (file)
--- a/src/shared/bus-util.c
+++ b/src/shared/bus-util.c
@@ -842,7 +842,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]");