[systemd-commits] 2 commits - TODO man/systemd-system.conf.xml

[Lennart Poettering]

 TODO                        |    4 ++++
 man/systemd-system.conf.xml |   30 ++++++++++++++++--------------
 2 files changed, 20 insertions(+), 14 deletions(-)

New commits:
commit 3d3ee759e682701fce77b6559508e697e9e60fbf
Author: Lennart Poettering <lennart at poettering.net>
Date:   Thu Jun 20 23:32:13 2013 +0200

    update TODO

diff --git a/TODO b/TODO
index 0b4048b..e11e85c 100644
--- a/TODO
+++ b/TODO
@@ -28,6 +28,10 @@ Fedora 19:
 
 Features:
 
+* when creating a session or machine, automatically move the process into the root cgroup for all other hierarchies
+
+* maybe reintroduce nspawn -C?
+
 * move systemctl dump to systemd-analyze
 
 * libsystemd-logind: sd_session_is_active() and friends: verify

commit 78894537e047690f074c5067989517acc1b3c40e
Author: Lennart Poettering <lennart at poettering.net>
Date:   Thu Jun 20 23:31:21 2013 +0200

    man: fix example for DefaultEnvironment=
    
    The example mentioned Environment= rather than DefaultEnvironment=.
    
    Also made some other clean-ups.

diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml
index 5886855..48d0226 100644
--- a/man/systemd-system.conf.xml
+++ b/man/systemd-system.conf.xml
@@ -265,22 +265,23 @@
                         <varlistentry>
                                 <term><varname>DefaultEnvironment=</varname></term>
 
-                                <listitem><para>Sets systemd manager
-                                environment variables for executed
-                                processes. Takes a space-separated
-                                list of variable assignments.
-                                </para>
+                                <listitem><para>Sets manager
+                                environment variables passed to all
+                                executed processes. Takes a
+                                space-separated list of variable
+                                assignments. See
+                                <citerefentry><refentrytitle>environ</refentrytitle><manvolnum>7</manvolnum></citerefentry>
+                                for details about environment
+                                variables.</para>
 
                                 <para>Example:
-                                <programlisting>Environment="VAR1=word1 word2" VAR2=word3 "VAR3=word 5 6"</programlisting>
-                                gives three variables <literal>VAR1</literal>,
-                                <literal>VAR2</literal>, <literal>VAR3</literal>.
-                                </para>
 
-                                <para>
-                                See
-                                <citerefentry><refentrytitle>environ</refentrytitle><manvolnum>7</manvolnum></citerefentry>
-                                for details about environment variables.</para></listitem>
+                                <programlisting>DefaultEnvironment="VAR1=word1 word2" VAR2=word3 "VAR3=word 5 6"</programlisting>
+
+                                Sets three variables
+                                <literal>VAR1</literal>,
+                                <literal>VAR2</literal>,
+                                <literal>VAR3</literal>.</para></listitem>
                         </varlistentry>
 
                         <varlistentry>
@@ -323,7 +324,8 @@
                   <title>See Also</title>
                   <para>
                           <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-                          <citerefentry><refentrytitle>systemd.directives</refentrytitle><manvolnum>7</manvolnum></citerefentry>
+                          <citerefentry><refentrytitle>systemd.directives</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
+                          <citerefentry><refentrytitle>environ</refentrytitle><manvolnum>7</manvolnum></citerefentry>
                   </para>
         </refsect1>