X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsystemd.unit.xml;h=2e298ca04f06caaa6318735a288c1bb4512eca9e;hp=5d6f6eb1416ecbf2b8c619d29ff9975090e6691e;hb=d55192add75584f55932ad463ee6b4cc30370c63;hpb=59fccdc587bc179c1638916ee16a24099f94f81f

diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
index 5d6f6eb14..2e298ca04 100644
--- a/man/systemd.unit.xml
+++ b/man/systemd.unit.xml
@@ -211,6 +211,10 @@
                 template <literal>.d/</literal> subdirectory and reads
                 its <literal>.conf</literal> files.</para>
 
+                <!-- Note that we do not document .include here, as we
+                     consider it mostly obsolete, and want people to
+                     use .d/ drop-ins instead. -->
+
                 <para>Note that while systemd offers a flexible
                 dependency system between units it is recommended to
                 use this functionality only sparingly and instead rely
@@ -950,7 +954,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 +1238,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 +1282,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>,