From c3150e36d6e3d8392c5801a19b7f63daa5551f37 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Mon, 27 Nov 2017 12:44:40 +0000
Subject:  Add s6_fdholder_start/end, prepare for 2.6.2.0

---
 doc/index.html             |  6 +++---
 doc/libs6/s6-fdholder.html | 22 ++++++++++++++++++++++
 doc/upgrade.html           |  9 +++++++++
 3 files changed, 34 insertions(+), 3 deletions(-)

(limited to 'doc')

diff --git a/doc/index.html b/doc/index.html
index cf41453..330d56e 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -83,11 +83,11 @@ with s6</a> </li>
  <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.6.0.1 or later. It's a build-time requirement. It's also a run-time
+2.6.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>
  <li> <a href="//skarnet.org/software/execline/">execline</a> version
-2.3.0.3 or later. It's a build-time and run-time requirement. </li>
+2.3.0.4 or later. It's a build-time and run-time requirement. </li>
 </ul>
 
 <h3> Licensing </h3>
@@ -100,7 +100,7 @@ library. </li>
 <h3> Download </h3>
 
 <ul>
- <li> The current released version of s6 is <a href="s6-2.6.1.1.tar.gz">2.6.1.1</a>. </li>
+ <li> The current released version of s6 is <a href="s6-2.6.2.0.tar.gz">2.6.2.0</a>. </li>
  <li> Alternatively, you can checkout a copy of the
 <a href="//git.skarnet.org/cgi-bin/cgit.cgi/s6/">s6
 git repository</a>:
diff --git a/doc/libs6/s6-fdholder.html b/doc/libs6/s6-fdholder.html
index af6df38..0a2413b 100644
--- a/doc/libs6/s6-fdholder.html
+++ b/doc/libs6/s6-fdholder.html
@@ -91,6 +91,28 @@ started by <a href="../s6-ipcclient.html">s6-ipcclient</a>, both fds 6
 and 7 are open (and refer to the same socket), so you should close both.
 </p>
 
+<p>
+ Alternatively, if your connection to s6-fdholderd has not been created yet,
+you can use the following functions:
+</p>
+
+<h4> <code> int s6_fdholder_start (s6_fdholder_t *a, char const *path, tain_t const *deadline, tain_t *stamp) </code> </h4>
+
+<p>
+ Starts a session with a <a href="../s6-fdholderd.html">s6-fdholderd</a>
+instance listening on <em>path</em>. <em>a</em> must be initialized to
+S6_FDHOLDER_ZERO before calling this function. On success, returns nonzero
+and <em>a</em> can be used as a handle for the next <tt>s6_fdholder_*</tt>
+function calls. On failure, returns 0, and sets errno.
+</p>
+
+<h4> <code> void s6_fdholder_end (s6_fdholder_t *a) </code> </h4>
+
+<p>
+ Ends the current session and frees all allocated resources. If needed,
+<em>a</em> is immediately reusable for another <tt>s6_fdholder_start</tt> call.
+</p>
+
 <h3> Storing a fd </h3>
 
 <pre>
diff --git a/doc/upgrade.html b/doc/upgrade.html
index 58d349a..8f5db8d 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -18,6 +18,15 @@
 
 <h1> What has changed in s6 </h1>
 
+<h2> in 2.6.2.0 </h2>
+
+<ul>
+ <li> skalibs dependency bumped to 2.6.2.0. </li>
+ <li> execline dependency bumped to 2.3.0.4. </li>
+ <li> New <a href="libs6/s6-fdholder.html">s6_fdholder</a> functions:
+s6_fdholder_start(), s6_fdholder_end(). </li>
+</ul>
+
 <h2> in 2.6.1.1 </h2>
 
 <ul>
-- 
cgit v1.2.3