diff --git a/NEWS b/NEWS index 3ca517af44..412515b6a8 100644 --- a/NEWS +++ b/NEWS @@ -115,7 +115,7 @@ CHANGES WITH 248: * The existing ConditionControlGroupController= setting has been extended with two new values "v1" and "v2". "v2" means that the - unified v2 cgroup hierachy is used, and "v1" means that legacy v1 + unified v2 cgroup hierarchy is used, and "v1" means that legacy v1 hierarchy or the hybrid hierarchy are used. * The tables of system calls in seccomp filters are now automatically diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml index cd9437c509..4d7d09c5c0 100644 --- a/man/systemd.unit.xml +++ b/man/systemd.unit.xml @@ -1470,7 +1470,7 @@ Alternatively, two special strings v1 and v2 may be specified (without any controller names). v2 will pass if the unified v2 cgroup - hierachy is used, and v1 will pass if the legacy v1 hierarchy or the hybrid + hierarchy is used, and v1 will pass if the legacy v1 hierarchy or the hybrid hierarchy are used (see the discussion of systemd.unified_cgroup_hierarchy and systemd.legacy_systemd_cgroup_controller in systemd.service5