summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2012-09-20 19:12:23 +0200
committerLennart Poettering <lennart@poettering.net>2012-09-20 19:12:23 +0200
commita98d5d64720bdf32e3b5f72f896b583e23f730ad (patch)
tree8217bb3111146d07f059c12f40344cc1b0359a5c
parentupdate TODO (diff)
downloadsystemd-a98d5d64720bdf32e3b5f72f896b583e23f730ad.tar.gz
systemd-a98d5d64720bdf32e3b5f72f896b583e23f730ad.tar.bz2
systemd-a98d5d64720bdf32e3b5f72f896b583e23f730ad.zip
fix typos
-rw-r--r--NEWS6
-rw-r--r--src/core/system.conf2
2 files changed, 4 insertions, 4 deletions
diff --git a/NEWS b/NEWS
index ec5638881..ea225c6ab 100644
--- a/NEWS
+++ b/NEWS
@@ -65,9 +65,9 @@ CHANGES WITH 190:
various projects outside of systemd that provide bindings
for languages such as PHP or Lua.
- * Many conditions will not resolve specifiers such as %i. They
- are also available in PathChanged= and related directives of
- .path units.
+ * Many conditions will now resolve specifiers such as %i. In
+ addition, PathChanged= and related directives of .path units
+ now support specifiers as well.
* There's now a new RPM macro definition for the system preset
dir: %_presetdir.
diff --git a/src/core/system.conf b/src/core/system.conf
index 3989c2e0c..68076d973 100644
--- a/src/core/system.conf
+++ b/src/core/system.conf
@@ -20,7 +20,7 @@
#DefaultControllers=cpu
#DefaultStandardOutput=journal
#DefaultStandardError=inherit
-#JoinControllers=cpu,cpuacct,cpuset net_cls,netprio
+#JoinControllers=cpu,cpuacct,cpuset net_cls,net_prio
#RuntimeWatchdogSec=0
#ShutdownWatchdogSec=10min
#CapabilityBoundingSet=