Merge branch 'upstream-fixes' into debian

This commit is contained in:
Michael Biebl 2013-02-09 15:50:17 +01:00
commit 2d7f4ccfee
2 changed files with 2 additions and 2 deletions

View File

@ -75,7 +75,7 @@
<option>ExecStartPre=</option>,
<option>ExecStartPost=</option>,
<option>ExecStopPre=</option> and
<option>ExecStoptPost=</option> commands are executed
<option>ExecStopPost=</option> commands are executed
in.</para>
<para>For each socket file a matching service file

View File

@ -761,7 +761,7 @@ static int dot_one_property(const char *name, const char *prop, DBusMessageIter
"RequiresOverridable", "[color=\"black\"]",
"Requisite", "[color=\"darkblue\"]",
"RequisiteOverridable", "[color=\"darkblue\"]",
"Wants", "[color=\"darkgrey\"]",
"Wants", "[color=\"grey66\"]",
"Conflicts", "[color=\"red\"]",
"ConflictedBy", "[color=\"red\"]",
"After", "[color=\"green\"]"