man: remove advice to avoid setting the same var more than once

So far the compatibility with .desktop settings hasn't been imporant
at all, and we do not want people to write convoluted unit
files.

diff --git a/man/systemd.service.xml b/man/systemd.service.xml
index 103c495fbed5dacc3bbbc338d0cd4a52b380a4d4..f6b9fe2965af863774b8c22a8db3bd67a12f3099 100644 (file)
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -321,11 +321,7 @@
                                 (these semicolons must be passed as
                                 separate words). Alternatively, this
                                 directive may be specified more than
                                 (these semicolons must be passed as
                                 separate words). Alternatively, this
                                 directive may be specified more than

-                                once with the same effect. However,
-                                the latter syntax is not recommended
-                                for compatibility with parsers
-                                suitable for XDG
-                                <filename>.desktop</filename> files.
+                                once with the same effect.

                                 Lone semicolons may be escaped as
                                 <literal>\;</literal>. If the empty
                                 string is assigned to this option, the
                                 Lone semicolons may be escaped as
                                 <literal>\;</literal>. If the empty
                                 string is assigned to this option, the

diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
index 35dd4c78c4cc00de502100bbab1847c863855a66..8d6acc7b02e092e135a6168574eb30e0e06a1892 100644 (file)
--- a/man/systemd.unit.xml
+++ b/man/systemd.unit.xml
@@ -120,6 +120,17 @@
                 <citerefentry><refentrytitle>systemd.scope</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
                 </para>
 
                 <citerefentry><refentrytitle>systemd.scope</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
                 </para>
 

+                <para>Various settings are allowed to be specified
+                more than once, in which case the interpretation
+                depends on the setting. Often, multiple settings form
+                a list, and setting to an empty value "resets", which
+                means that previous assignments are ignored. When this
+                is allowed, it is mentioned in the description of the
+                setting. Note that using multiple assignments to the
+                same value makes the unit file incompatible with
+                parsers for the XDG <filename>.desktop</filename> file
+                format.</para>
+

                 <para>Unit files are loaded from a set of paths
                 determined during compilation, described in the next section.
                 </para>
                 <para>Unit files are loaded from a set of paths
                 determined during compilation, described in the next section.
                 </para>