s6

commit 9bf94d170fd0d5540be8c6337f53ed71dbca268a
parent 8c96f385ce022072661a0011dc99a973e0a3f425
Author: Laurent Bercot <ska-skaware@skarnet.org>
Date:   Sun,  7 Jan 2024 21:23:53 +0000

 Remove s6-tcpserver[4|6] mentions from doc (now unified)

Signed-off-by: Laurent Bercot <ska@appnovation.com>

Diffstat:
M
doc/s6-connlimit.html
 | 
7
+++----
M
doc/s6-envuidgid.html
 | 
2
+-
M
doc/socket-activation.html
 | 
10
++++------

3 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/doc/s6-connlimit.html b/doc/s6-connlimit.html
@@ -46,9 +46,8 @@ no maximum number of connections has been defined. </li>
 <h2> Usage </h2>
 
 <p>
- The <a href="//skarnet.org/software/s6-networking/s6-tcpserver4.html">s6-tcpserver4</a> and
-<a href="//skarnet.org/software/s6-networking/s6-tcpserver6.html">s6-tcpserver6</a> programs
-define the PROTO environment variable to "TCP", and spawn every child server with the TCPCONNNUM environment
+ The <a href="//skarnet.org/software/s6-networking/s6-tcpserver.html">s6-tcpserver</a> program
+defines the PROTO environment variable to "TCP", and spawns every child server with the TCPCONNNUM environment
 variable set to the number of connections from the same IP address.
  The <a href="//skarnet.org/software/s6-networking/s6-tcpserver-access.html">s6-tcpserver-access</a> program
 can set environment variables depending on the client's IP address. If the
@@ -72,7 +71,7 @@ of client connections by UID.
 </p>
 
 <pre>
-     s6-tcpserver4 -v2 -c1000 -C40 1.2.3.4 80 \
+     s6-tcpserver -v2 -c1000 -C40 1.2.3.4 80 \
      s6-tcpserver-access -v2 -RHl0 -i <em>dir</em> \
      s6-connlimit \
      <em>prog...</em>
diff --git a/doc/s6-envuidgid.html b/doc/s6-envuidgid.html
@@ -78,7 +78,7 @@ supplementary groups. </li>
  <li> s6-envuidgid is useful when running a program that must start as root but can
 drop its privileges later. Such a program can read its new uid/gid/groups info
 from the UID, GID and GIDLIST environment variables. Super-servers such as
-<a href="//skarnet.org/software/s6-networking/s6-tcpserver4.html">s6-tcpserver4</a>
+<a href="//skarnet.org/software/s6-networking/s6-tcpserver.html">s6-tcpserver</a>
 make use of this. </li>
 </ul>
 
diff --git a/doc/socket-activation.html b/doc/socket-activation.html
@@ -34,9 +34,8 @@ because doing so is bad engineering.
 However, it <em>will</em> help you set up super-servers. The
 <a href="s6-ipcserver.html">s6-ipcserver</a>
 program, for Unix domain sockets, as well as the
-<a href="//skarnet.org/software/s6-networking/s6-tcpserver4.html">s6-tcpserver4</a> and
-<a href="//skarnet.org/software/s6-networking/s6-tcpserver6.html">s6-tcpserver6</a>
-programs, for TCP INET domain sockets (available in the
+<a href="//skarnet.org/software/s6-networking/s6-tcpserver.html">s6-tcpserver</a>
+program, for TCP INET domain sockets (available in the
 <a href="//skarnet.org/software/s6-networking/">s6-networking</a>
 package) are super-servers you can use to
 your heart's content. They are even wrappers around simpler programs,
@@ -56,9 +55,8 @@ never lose logs:
 <a href="s6-svscan.html">s6-svscan</a>. </li>
   <li> ways to open your sockets and bind them as early as you want in
 your boot process, and make them accept client connections later:
-<a href="s6-ipcserver-socketbinder.html">s6-ipcserver-socketbinder</a>,
-<a href="//skarnet.org/software/s6-networking/s6-tcpserver4-socketbinder.html">s6-tcpserver4-socketbinder</a> and
-<a href="//skarnet.org/software/s6-networking/s6-tcpserver6-socketbinder.html">s6-tcpserver6-socketbinder</a>.
+<a href="s6-ipcserver-socketbinder.html">s6-ipcserver-socketbinder</a> and
+<a href="//skarnet.org/software/s6-networking/s6-tcpserver-socketbinder.html">s6-tcpserver-socketbinder</a>.
  </li>
  <li> A supervision infrastructure that can start as many services in parallel
 as you want: