core: ExecCondition= for services

[thirdparty/systemd.git] / man / systemd-system.conf.xml

diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml
index 9de04a7879e3cc90e7c6c9f35b0690cadb91c1cd..5b80479a0a1c85f8efea6936773381ea1c4d19fc 100644 (file)
--- a/man/systemd-system.conf.xml
+++ b/man/systemd-system.conf.xml
@@ -120,7 +120,7 @@
 
         <listitem><para>Configures the NUMA node mask that will be associated with the selected NUMA policy. Note that
         <option>default</option> and <option>local</option> NUMA policies don't require explicit NUMA node mask and
-        value of the option can be empty. Similarly to <varname>NUMAPolicy=</varname>, value can be overriden
+        value of the option can be empty. Similarly to <varname>NUMAPolicy=</varname>, value can be overridden
         by individual services in unit files, see
         <citerefentry><refentrytitle>systemd.exec</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para></listitem>
       </varlistentry>
@@ -244,6 +244,16 @@
         understood too.</para></listitem>
       </varlistentry>
 
+      <varlistentry>
+        <term><varname>StatusUnitFormat=</varname></term>
+
+        <listitem><para>Takes either <option>name</option> or <option>description</option> as the value. If
+        <option>name</option>, the system manager will use unit names in status messages, instead of the
+        longer and more informative descriptions set with <varname>Description=</varname>, see
+        <citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
+        </para></listitem>
+      </varlistentry>
+
       <varlistentry>
         <term><varname>DefaultTimerAccuracySec=</varname></term>