[systemd-commits] 2 commits - man/systemd.exec.xml man/systemd.service.xml man/systemd.unit.xml

[Lennart Poettering]

 man/systemd.exec.xml    |    5 +++++
 man/systemd.service.xml |   36 ++++++++++++++++++++++--------------
 man/systemd.unit.xml    |    5 +++--
 3 files changed, 30 insertions(+), 16 deletions(-)

New commits:
commit a70d9a77d9dc9efd2a122ef73095733b6fe6acdf
Author: Barry Scott <barry.scott at onelan.co.uk>
Date:   Mon Oct 3 11:50:10 2011 +0100

    man: .include directive does not include as textual include it includes by parsing the include file.
    
    This means that section headers must be used inside of
    a .include file otherwise all the lines are ignored.

diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
index bf8de32..e47c146 100644
--- a/man/systemd.unit.xml
+++ b/man/systemd.unit.xml
@@ -121,8 +121,9 @@
 
                 <para>If a line starts with <option>.include</option>
                 followed by a file name, the specified file will be
-                read as if its contents were listed in place of the
-                <option>.include</option> directive.</para>
+                parsed at this point. Make sure that the file that is
+                included has the appropiate section headers before
+                any directives.</para>
 
                 <para>Along with a unit file
                 <filename>foo.service</filename> a directory

commit 7734f77373a871ffb755a99b381fd93682052b8c
Author: Barry Scott <barry.scott at onelan.co.uk>
Date:   Mon Oct 3 11:50:09 2011 +0100

    man: for ExecStart= provide more details on env var substitution and how that turns into arguments.
    
    For EnvironmentFile= explain that double quotes can be used
    to protect whitespace.

diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
index 609484b..230c4a3 100644
--- a/man/systemd.exec.xml
+++ b/man/systemd.exec.xml
@@ -279,6 +279,11 @@
                                 assignments. Empty lines and lines
                                 starting with ; or # will be ignored,
                                 which may be used for commenting. The
+                                parser strips leading and
+                                trailing whitespace from the values
+                                of assignments, unless you use
+                                double quotes (").
+                                The
                                 argument passed should be an absolute
                                 file name, optionally prefixed with
                                 "-", which indicates that if the file
diff --git a/man/systemd.service.xml b/man/systemd.service.xml
index 4f11020..7b6f12d 100644
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -311,20 +311,28 @@
                                 main process of the daemon. The
                                 command line accepts % specifiers as
                                 described in
-                                <citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>. On
-                                top of that basic environment variable
-                                substitution is supported, where
-                                <literal>${FOO}</literal> is replaced
-                                by the string value of the environment
-                                variable of the same name. Also
-                                <literal>$FOO</literal> may appear as
-                                separate word on the command line in
-                                which case the variable is replaced by
-                                its value split at whitespaces. Note
-                                that the first argument (i.e. the
-                                binary to execute) may not be a
-                                variable, and must be a literal and
-                                absolute path name.</para></listitem>
+                                <citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para>
+
+                                <para>On top of that basic environment
+                                variable substitution is
+                                supported. Use
+                                <literal>${FOO}</literal> as part of a
+                                word, or as word of its own on the
+                                command line, in which case it will be
+                                replaced by the value of the
+                                environment variable including all
+                                whitespace it contains, resulting in a
+                                single argument.  Use
+                                <literal>$FOO</literal> as a separate
+                                word on the command line, in which
+                                case it will be replaced by the value
+                                of the environment variable split up
+                                at whitespace, resulting in no or more
+                                arguments. Note that the first
+                                argument (i.e. the program to execute)
+                                may not be a variable, and must be a
+                                literal and absolute path
+                                name.</para></listitem>
                         </varlistentry>
 
                         <varlistentry>