[systemd-commits] 2 commits - TODO man/systemd.service.xml

[Lennart Poettering]

 TODO                    |    1 +
 man/systemd.service.xml |   14 +++++++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

New commits:
commit 6ffd3337867076067955ec4d5d1a0cde521d9b86
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed Jul 4 00:12:13 2012 +0200

    man: clarify that StartLimitInterval= also applies to manual starts

diff --git a/man/systemd.service.xml b/man/systemd.service.xml
index 564c792..60155e6 100644
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -756,10 +756,14 @@
                                 are allowed (defaults to 5). These
                                 configuration options are particularly
                                 useful in conjunction with
-                                <varname>Restart=</varname>. Note that
-                                units which are configured for
-                                <varname>Restart=</varname> and which
-                                reach the start limit are not
+                                <varname>Restart=</varname>, however
+                                apply to all kinds of starts
+                                (including manual), not just those
+                                triggered by the
+                                <varname>Restart=</varname> logic.
+                                Note that units which are configured
+                                for <varname>Restart=</varname> and
+                                which reach the start limit are not
                                 attempted to be restarted anymore,
                                 however they may still be restarted
                                 manually at a later point from which

commit f1c8f75b38def5b2e21a83b245c5392563fba7ef
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed Jul 4 00:07:33 2012 +0200

    man: explain StartLimitRate= in conjunction with Restart= a bit better

diff --git a/TODO b/TODO
index b42f2ff..5748289 100644
--- a/TODO
+++ b/TODO
@@ -42,6 +42,7 @@ Features:
 * Document:
         - PID 1 D-Bus API
         - Journal C API manual pages
+        - scheduled shutdown API
 
 * wiki: document logind's PreparingForShutdown, PreparingForSleep
 
diff --git a/man/systemd.service.xml b/man/systemd.service.xml
index 69060a5..564c792 100644
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -756,7 +756,15 @@
                                 are allowed (defaults to 5). These
                                 configuration options are particularly
                                 useful in conjunction with
-                                <varname>Restart=</varname>.</para></listitem>
+                                <varname>Restart=</varname>. Note that
+                                units which are configured for
+                                <varname>Restart=</varname> and which
+                                reach the start limit are not
+                                attempted to be restarted anymore,
+                                however they may still be restarted
+                                manually at a later point from which
+                                point on the restart logic is again
+                                activated.</para></listitem>
                         </varlistentry>
 
                         <varlistentry>