daandemeyer / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
9fc0f6
From 69924ed702e14592ba0aae1510fca652c7d306df Mon Sep 17 00:00:00 2001
9fc0f6
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
9fc0f6
Date: Sat, 14 Dec 2013 17:30:25 -0500
9fc0f6
Subject: [PATCH] man: remove advice to avoid setting the same var more than
9fc0f6
 once
9fc0f6
9fc0f6
So far the compatibility with .desktop settings hasn't been imporant
9fc0f6
at all, and we do not want people to write convoluted unit
9fc0f6
files.
9fc0f6
---
9fc0f6
 man/systemd.service.xml |  6 +-----
9fc0f6
 man/systemd.unit.xml    | 11 +++++++++++
9fc0f6
 2 files changed, 12 insertions(+), 5 deletions(-)
9fc0f6
9fc0f6
diff --git a/man/systemd.service.xml b/man/systemd.service.xml
9fc0f6
index ca297ba..8f9137c 100644
9fc0f6
--- a/man/systemd.service.xml
9fc0f6
+++ b/man/systemd.service.xml
9fc0f6
@@ -321,11 +321,7 @@
9fc0f6
                                 (these semicolons must be passed as
9fc0f6
                                 separate words). Alternatively, this
9fc0f6
                                 directive may be specified more than
9fc0f6
-                                once with the same effect. However,
9fc0f6
-                                the latter syntax is not recommended
9fc0f6
-                                for compatibility with parsers
9fc0f6
-                                suitable for XDG
9fc0f6
-                                <filename>.desktop</filename> files.
9fc0f6
+                                once with the same effect.
9fc0f6
                                 Lone semicolons may be escaped as
9fc0f6
                                 <literal>\;</literal>. If the empty
9fc0f6
                                 string is assigned to this option, the
9fc0f6
diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
9fc0f6
index 029392c..77127ff 100644
9fc0f6
--- a/man/systemd.unit.xml
9fc0f6
+++ b/man/systemd.unit.xml
9fc0f6
@@ -120,6 +120,17 @@
9fc0f6
                 <citerefentry><refentrytitle>systemd.scope</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
9fc0f6
                 </para>
9fc0f6
 
9fc0f6
+                <para>Various settings are allowed to be specified
9fc0f6
+                more than once, in which case the interpretation
9fc0f6
+                depends on the setting. Often, multiple settings form
9fc0f6
+                a list, and setting to an empty value "resets", which
9fc0f6
+                means that previous assignments are ignored. When this
9fc0f6
+                is allowed, it is mentioned in the description of the
9fc0f6
+                setting. Note that using multiple assignments to the
9fc0f6
+                same value makes the unit file incompatible with
9fc0f6
+                parsers for the XDG <filename>.desktop</filename> file
9fc0f6
+                format.</para>
9fc0f6
+
9fc0f6
                 <para>Unit files are loaded from a set of paths
9fc0f6
                 determined during compilation, described in the next section.
9fc0f6
                 </para>