summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS6
-rw-r--r--catalog/systemd.catalog.in2
-rw-r--r--docs/FILE_DESCRIPTOR_STORE.md2
-rw-r--r--src/shared/varlink-idl.c2
4 files changed, 6 insertions, 6 deletions
diff --git a/NEWS b/NEWS
index dd68a04479..0e8313f40a 100644
--- a/NEWS
+++ b/NEWS
@@ -712,9 +712,9 @@ CHANGES WITH 254:
store enabled.
* A new service option FileDescriptorStorePreserve= has been added that
- allows tuning the life-cycle of the per-service file descriptor
- store. If set to "yes", the entries in the fd store are retained even
- after the service has been fully stopped.
+ allows tuning the lifecycle of the per-service file descriptor store.
+ If set to "yes", the entries in the fd store are retained even after
+ the service has been fully stopped.
* The "systemctl clean" command may now be used to clear the fdstore of
a service.
diff --git a/catalog/systemd.catalog.in b/catalog/systemd.catalog.in
index 37b59adbdd..8591a654aa 100644
--- a/catalog/systemd.catalog.in
+++ b/catalog/systemd.catalog.in
@@ -741,7 +741,7 @@ compatibility.
Note that these automatically generated compatibility unit files cannot replace
native unit files as they generally slow down the system (by creating
unnecessary, additional synchronization points), are less robust (as SysV services
-cannot properly be life-cycle tracked or automatically restarted) and less
+cannot properly be lifecycle tracked or automatically restarted) and less
secure (as no sandboxing restrictions can be enforced).
Compatibility support for System V services in systemd is deprecated. Please
diff --git a/docs/FILE_DESCRIPTOR_STORE.md b/docs/FILE_DESCRIPTOR_STORE.md
index 7921bf4fc8..206dda7038 100644
--- a/docs/FILE_DESCRIPTOR_STORE.md
+++ b/docs/FILE_DESCRIPTOR_STORE.md
@@ -100,7 +100,7 @@ general principle of guaranteeing a pristine execution environment, a pristine
security context, and a pristine resource management context for freshly
started services, without uncontrolled "leftovers" from previous runs. For
example: leaving processes from previous runs generally negatively affects
-life-cycle management (i.e. `KillMode=none` must be set), which disables large
+lifecycle management (i.e. `KillMode=none` must be set), which disables large
parts of the service managers state tracking, resource management (as resource
counters cannot start at zero during service activation anymore, since the old
processes remaining skew them), security policies (as processes with possibly
diff --git a/src/shared/varlink-idl.c b/src/shared/varlink-idl.c
index f871c8e632..655324c6c3 100644
--- a/src/shared/varlink-idl.c
+++ b/src/shared/varlink-idl.c
@@ -379,7 +379,7 @@ VarlinkInterface* varlink_interface_free(VarlinkInterface *interface) {
return NULL;
/* So here's the thing: in most cases we want that users of this define their interface descriptions
- * in C code, and hence the definitions are constant and immutable during the life-cycle of the
+ * in C code, and hence the definitions are constant and immutable during the lifecycle of the
* system. Because of that we define all structs with const* pointers. It makes it very nice and
* straight-forward to populate these structs with literal C strings. However, in some not so common
* cases we also want to allocate these structures dynamically on the heap, when parsing interface