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