From a80a1304ff86b8cf493265696d517aea2cf7a703 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Sun, 27 Feb 2022 02:52:20 +0000
Subject:  Prepare for 2.2.4.0; add -N option to s6-dumpenv

Signed-off-by: Laurent Bercot <ska@appnovation.com>
---
 doc/index.html      | 4 ++--
 doc/s6-dumpenv.html | 8 +++++++-
 doc/upgrade.html    | 7 +++++++
 3 files changed, 16 insertions(+), 3 deletions(-)

(limited to 'doc')

diff --git a/doc/index.html b/doc/index.html
index 96036ca..d4530f1 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -74,7 +74,7 @@ on the wrong page. I apologize for the confusion.
  <li> A POSIX-compliant system with a standard C development environment </li>
  <li> GNU make, version 3.81 or later </li>
  <li> <a href="//skarnet.org/software/skalibs/">skalibs</a> version
-2.11.1.0 or later. It's a build-time requirement. It's also a run-time
+2.11.2.0 or later. It's a build-time requirement. It's also a run-time
 requirement if you link against the shared version of the skalibs
 library. </li>
 </ul>
@@ -90,7 +90,7 @@ library. </li>
 
 <ul>
  <li> The current released version of s6-portable-utils is
-<a href="s6-portable-utils-2.2.3.4.tar.gz">2.2.3.4</a>. </li>
+<a href="s6-portable-utils-2.2.4.0.tar.gz">2.2.4.0</a>. </li>
  <li> Alternatively, you can checkout a copy of the
 <a href="//git.skarnet.org/cgi-bin/cgit.cgi/s6-portable-utils/">s6-portable-utils
 git repository</a>:
diff --git a/doc/s6-dumpenv.html b/doc/s6-dumpenv.html
index 1c89ddc..6400d47 100644
--- a/doc/s6-dumpenv.html
+++ b/doc/s6-dumpenv.html
@@ -25,7 +25,7 @@
 <h2> Interface </h2>
 
 <pre>
-     s6-dumpenv [ -m <em>mode</em> ] <em>dir</em>
+     s6-dumpenv [ -N | -n ] [ -m <em>mode</em> ] <em>dir</em>
 </pre>
 
 <ul>
@@ -40,6 +40,12 @@ that it has, it creates a file <em>dir</em>/<em>x</em> containing
 <h2> Options </h2>
 
 <ul>
+ <li> <tt>-N</tt>&nbsp;: chomp. Write the environment variables with an
+extra newline at the end, so the environment can be retrieved via
+<tt>s6-envdir -Lf <em>dir</em></tt>. </li>
+ <li> <tt>-n</tt>&nbsp;: Write the environment variables as is; the
+environment will be retrieved via <tt>s6-envdir -Lfn <em>dir</em></tt>.
+This is the default. </li>
  <li> <tt>-m</tt>&nbsp;<em>mode</em>&nbsp;: create <em>dir</em> with
 mode <em>mode</em> if it doesn't exist yet. Default is 0755. </li>
 </ul>
diff --git a/doc/upgrade.html b/doc/upgrade.html
index 8193a1e..24077e3 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -18,6 +18,13 @@
 
 <h1> What has changed in s6-portable-utils </h1>
 
+<h2> in 2.2.4.0 </h2>
+
+<ul>
+ <li> <a href="//skarnet.org/software/skalibs/">skalibs</a>
+dependency bumped to 2.11.2.0. </li>
+</ul>
+
 <h2> in 2.2.3.4 </h2>
 
 <ul>
-- 
cgit 1.4.1