summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2014-11-06 13:59:41 +0100
committerLennart Poettering <lennart@poettering.net>2014-11-06 14:21:11 +0100
commit90a2ec10f2d43a8530aae856013518eb567c4039 (patch)
treec848a862b8c238785fffdb3b5b39d2c3020e3ad9
parent651c33185eeb449385b471fffa8882a163c496f0 (diff)
man: don't document ConditionNull=/AssertNull= as the are not particularly useful and simply confusing
-rw-r--r--man/systemd.unit.xml16
1 files changed, 5 insertions, 11 deletions
diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
index 5d6f6eb141..dddcf09e3d 100644
--- a/man/systemd.unit.xml
+++ b/man/systemd.unit.xml
@@ -950,7 +950,11 @@
<term><varname>ConditionDirectoryNotEmpty=</varname></term>
<term><varname>ConditionFileNotEmpty=</varname></term>
<term><varname>ConditionFileIsExecutable=</varname></term>
- <term><varname>ConditionNull=</varname></term>
+
+ <!-- We don't document ConditionNull=
+ here as it is not particularly
+ useful and probably just
+ confusing. -->
<listitem><para>Before starting a unit
verify that the specified condition is
@@ -1230,15 +1234,6 @@
exists, is a regular file and marked
executable.</para>
- <para>Finally,
- <varname>ConditionNull=</varname> may
- be used to add a constant condition
- check value to the unit. It takes a
- boolean argument. If set to
- <varname>false</varname>, the condition
- will always fail, otherwise
- succeed.</para>
-
<para>If multiple conditions are
specified, the unit will be executed if
all of them apply (i.e. a logical AND
@@ -1283,7 +1278,6 @@
<term><varname>AssertDirectoryNotEmpty=</varname></term>
<term><varname>AssertFileNotEmpty=</varname></term>
<term><varname>AssertFileIsExecutable=</varname></term>
- <term><varname>AssertNull=</varname></term>
<listitem><para>Similar to the
<varname>ConditionArchitecture=</varname>,