From 0ca7c064eb23d30187a1870176ab07f96c7cf3ed Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Thu, 17 Sep 2015 11:09:00 +0000
Subject:  - fix interpretation of 0 timeout in s6-maximumtime  - rc for
 2.0.5.2

---
 doc/index.html          | 2 +-
 doc/s6-maximumtime.html | 7 +++++++
 doc/upgrade.html        | 8 +++++++-
 3 files changed, 15 insertions(+), 2 deletions(-)

(limited to 'doc')

diff --git a/doc/index.html b/doc/index.html
index be6f1f3..b879dd7 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -77,7 +77,7 @@ library. </li>
 
 <ul>
  <li> The current released version of s6-portable-utils is
-<a href="s6-portable-utils-2.0.5.1.tar.gz">2.0.5.1</a>. </li>
+<a href="s6-portable-utils-2.0.5.2.tar.gz">2.0.5.2</a>. </li>
  <li> Alternatively, you can checkout a copy of the s6-portable-utils git repository:
 <pre> git clone git://git.skarnet.org/s6-portable-utils </pre> </li>
 </ul>
diff --git a/doc/s6-maximumtime.html b/doc/s6-maximumtime.html
index d99ea88..650309a 100644
--- a/doc/s6-maximumtime.html
+++ b/doc/s6-maximumtime.html
@@ -50,5 +50,12 @@ s6-maximumtime sends it a signal and exits 99 with a message. </li>
  <li> <tt>-2</tt>&nbsp;: on timeout, send a SIGUSR2 </li>
 </ul>
 
+<h2> Notes </h2>
+
+<ul>
+ <li> If <em>milli</em> is 0, then it's interpreted as infinite: no time
+limit will be enforced. </li>
+</ul>
+
 </body>
 </html>
diff --git a/doc/upgrade.html b/doc/upgrade.html
index a8be650..8816eba 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -18,10 +18,16 @@
 
 <h1> What has changed in s6-portable-utils </h1>
 
+<h2> in 2.0.5.2 </h2>
+
+<ul>
+ <li> Bugfix release, no changes. </li>
+</ul>
+
 <h2> in 2.0.5.1 </h2>
 
 <ul>
- <li> skalibs dependency bumped to 2.3.4.0. </li>
+ <li> skalibs dependency bumped to 2.3.6.1. </li>
 </ul>
 
 <h2> in 2.0.5.0 </h2>
-- 
cgit v1.2.3