From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 20 Sep 2012 17:12:23 +0000 (+0200)
Subject: fix typos
X-Git-Tag: v190~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a98d5d64720bdf32e3b5f72f896b583e23f730ad;p=thirdparty%2Fsystemd.git

fix typos
---

diff --git a/NEWS b/NEWS
index ec563888115..ea225c6ab8c 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 3989c2e0ce8..68076d97353 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=