From 96d70608d25da81038ac3bfb5273852f33e27504 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Thu, 25 Jun 2015 11:53:22 +0000
Subject:  - documented s6-log change  - version: 2.1.5.0

---
 doc/index.html   | 2 +-
 doc/s6-log.html  | 8 +++++---
 doc/upgrade.html | 6 ++++++
 package/info     | 2 +-
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/doc/index.html b/doc/index.html
index 678a485..aae5399 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -101,7 +101,7 @@ library. </li>
 <h3> Download </h3>
 
 <ul>
- <li> The current released version of s6 is <a href="s6-2.1.4.0.tar.gz">2.1.4.0</a>. </li>
+ <li> The current released version of s6 is <a href="s6-2.1.5.0.tar.gz">2.1.5.0</a>. </li>
  <li> Alternatively, you can checkout a copy of the s6 git repository:
 <pre> git clone git://git.skarnet.org/s6 </pre> </li>
  <li> There's also a
diff --git a/doc/s6-log.html b/doc/s6-log.html
index 3be1f4b..6306431 100644
--- a/doc/s6-log.html
+++ b/doc/s6-log.html
@@ -35,7 +35,7 @@ s6-log reads and compiles <em>logging script</em> to an internal
 form. Then it reads its standard input, line by line, and performs actions
 on it, following the script it is given. It does its best to ensure there
 is <em>never any log loss</em>. It exits cleanly when stdin closes or when
-it receives SIGTERM.
+it receives a SIGTERM or a SIGHUP.
 </p>
 
 <h2> Options </h2>
@@ -49,8 +49,10 @@ By default, s6-log keeps reading from stdin even if its buffers still
 contain data. <tt>-b</tt> is safer, but may slow down your service; the default
 is faster, but may lead to unbound memory use if you have a lot of output to
 write to a slow file system. </li>
- <li> <tt>-p</tt>&nbsp;: protect. Do not exit on receipt of a SIGTERM; only
-exit when reading EOF on stdin. </li>
+ <li> <tt>-p</tt>&nbsp;: protect against SIGTERM. Do not exit on receipt of a
+SIGTERM; only exit on a SIGHUP or when reading EOF on stdin. This is useful
+for a logger that you really do not want to lose even if automated
+administration (e.g. the downing of a supervision tree) would kill it. </li>
  <li> <tt>-t</tt>&nbsp;: timestamp. Prepends every log line that is written to
 a logging directory with a
 <a href="http://skarnet.org/software/skalibs/libstddjb/tai.html">TAI64N</a>
diff --git a/doc/upgrade.html b/doc/upgrade.html
index a124800..b200725 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -18,6 +18,12 @@
 
 <h1> What has changed in s6 </h1>
 
+<h2> in 2.1.5.0 </h2>
+
+<ul>
+ <li> <a href="s6-log.html">s6-log</a> now exits cleanly on SIGHUP. </li>
+</ul>
+
 <h2> in 2.1.4.0 </h2>
 
 <ul>
diff --git a/package/info b/package/info
index da7ff9f..91109bb 100644
--- a/package/info
+++ b/package/info
@@ -1,4 +1,4 @@
 package=s6
-version=2.1.4.0
+version=2.1.5.0
 category=admin
 package_macro_name=S6
-- 
cgit v1.2.3