summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2013-12-14 17:30:25 -0500
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2013-12-14 17:33:10 -0500
commit6baf995c17a95ca0d6b5ad0b1f1667c956574816 (patch)
tree915d75a9d7699e5bec79633387efe8d4f23a25fc
parentec6039bc08f8e77f92427afec048e4f8ac4b81a8 (diff)
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.
-rw-r--r--man/systemd.service.xml6
-rw-r--r--man/systemd.unit.xml11
2 files changed, 12 insertions, 5 deletions
diff --git a/man/systemd.service.xml b/man/systemd.service.xml
index 103c495fbe..f6b9fe2965 100644
--- 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
- 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
diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
index 35dd4c78c4..8d6acc7b02 100644
--- a/man/systemd.unit.xml
+++ b/man/systemd.unit.xml
@@ -120,6 +120,17 @@
<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>