From f98ae7a1bc204afa4badc3593d8422a6efa977d9 Mon Sep 17 00:00:00 2001
From: Laurent Bercot
Date: Mon, 30 Mar 2020 17:21:37 +0000
Subject: heliocat's html fixes
---
doc/fifodir.html | 2 +-
doc/index.html | 9 ---------
doc/libs6/s6-fdholder.html | 2 +-
doc/libs6/s6lockd-helper.html | 4 +++-
doc/libs6/s6lockd.html | 5 +++--
doc/overview.html | 3 ---
doc/s6-accessrules-cdb-from-fs.html | 12 ++++++------
doc/s6-accessrules-fs-from-cdb.html | 6 +++---
doc/s6-connlimit.html | 2 +-
doc/s6-fdholder-getdump.html | 2 +-
doc/s6-fdholderd.html | 4 ++--
doc/s6-log.html | 2 +-
doc/s6-sudo.html | 2 +-
doc/s6-svstat.html | 1 -
doc/servicedir.html | 2 +-
doc/upgrade.html | 16 ++++++++--------
16 files changed, 32 insertions(+), 42 deletions(-)
(limited to 'doc')
diff --git a/doc/fifodir.html b/doc/fifodir.html
index 7c01ca0..811ed38 100644
--- a/doc/fifodir.html
+++ b/doc/fifodir.html
@@ -152,7 +152,7 @@ can write to the fifo
- The libftrig interface takes care of all
+ The libftrig interface takes care of all
the subtleties.
diff --git a/doc/index.html b/doc/index.html
index 4f70ad2..421646e 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -198,20 +198,14 @@ synchronization.
The s6-mkfifodir program
The s6-cleanfifodir program
-
-
-
-
-
-
@@ -225,12 +219,10 @@ synchronization.
The s6-ipcserverd program
The s6-ioconnect program
-
-
-
- The s6-fdholder-store program
- The s6-fdholder-retrieve program
diff --git a/doc/libs6/s6-fdholder.html b/doc/libs6/s6-fdholder.html
index 6aabe39..38a2343 100644
--- a/doc/libs6/s6-fdholder.html
+++ b/doc/libs6/s6-fdholder.html
@@ -67,7 +67,7 @@ tain_now_g() ;
s6_fdholder_init(&a, fd) ;
(...)
-s6_fdholder_free(&a) ;
+s6_fdholder_free(&a) ;
diff --git a/doc/libs6/s6lockd-helper.html b/doc/libs6/s6lockd-helper.html
index 1d4c558..bc3d1a5 100644
--- a/doc/libs6/s6lockd-helper.html
+++ b/doc/libs6/s6lockd-helper.html
@@ -10,10 +10,12 @@
+
libs6
s6
Software
-skarnet.org
+skarnet.org
+
The s6lockd-helper program
diff --git a/doc/libs6/s6lockd.html b/doc/libs6/s6lockd.html
index 4acfb2a..9fcb055 100644
--- a/doc/libs6/s6lockd.html
+++ b/doc/libs6/s6lockd.html
@@ -10,10 +10,12 @@
+
libs6
s6
Software
-skarnet.org
+skarnet.org
+
The s6lockd program
@@ -49,7 +51,6 @@ client with different permissions.
For once, this is the recommended setup: s6lockd creates empty
lock files, and having all s6lockd instances run under the same user
simplifies permissions management considerably.
-
diff --git a/doc/overview.html b/doc/overview.html
index 781fa70..cecdde6 100644
--- a/doc/overview.html
+++ b/doc/overview.html
@@ -304,9 +304,6 @@ provided that running it eventually results in a long-lived process with
the same PID.)
-
-
-
Some examples of s6 programs meant to be used in run scripts:
diff --git a/doc/s6-accessrules-cdb-from-fs.html b/doc/s6-accessrules-cdb-from-fs.html
index 2f435bc..9ca2bcd 100644
--- a/doc/s6-accessrules-cdb-from-fs.html
+++ b/doc/s6-accessrules-cdb-from-fs.html
@@ -21,8 +21,8 @@
s6-accessrules-cdb-from-fs compiles a directory
containing a ruleset suitable for
-s6-ipcserver-access or
-s6-tcpserver-access into a
+s6-ipcserver-access or
+s6-tcpserver-access into a
CDB file.
@@ -43,8 +43,8 @@ directory containing a ruleset into a
To be understood by s6-accessrules-cdb-from-fs,
-s6-ipcserver-access, or
-s6-tcpserver-access,
+s6-ipcserver-access, or
+s6-tcpserver-access,
dir must have a specific format.
@@ -63,9 +63,9 @@ directory containing a ruleset into a
Depending on the application, other directories can appear in dir
and be compiled into cdbfile, but
-s6-tcpserver-access only
+s6-tcpserver-access only
uses the first three, and
-s6-ipcserver-access only
+s6-ipcserver-access only
uses the last two.
diff --git a/doc/s6-accessrules-fs-from-cdb.html b/doc/s6-accessrules-fs-from-cdb.html
index 4873ce3..57aad97 100644
--- a/doc/s6-accessrules-fs-from-cdb.html
+++ b/doc/s6-accessrules-fs-from-cdb.html
@@ -21,10 +21,10 @@
s6-accessrules-fs-from-cdb decompiles a CDB database
containing a ruleset suitable for
-s6-ipcserver-access or
-s6-tcpserver-access and
+s6-ipcserver-access or
+s6-tcpserver-access and
that has been compiled with
-s6-accessrules-cdb-from-fs.
+s6-accessrules-cdb-from-fs.
Interface
diff --git a/doc/s6-connlimit.html b/doc/s6-connlimit.html
index fb7d0c2..aeb739d 100644
--- a/doc/s6-connlimit.html
+++ b/doc/s6-connlimit.html
@@ -97,7 +97,7 @@ default of 40.
- The s6-connlimit utility was once part of the
-s6-networking
+s6-networking
suite, and is mostly useful with TCP connections, which is why the
examples here involve TCP. Nevertheless, it can be used with connections
across Unix domain sockets, and that is why it has been moved to the s6
diff --git a/doc/s6-fdholder-getdump.html b/doc/s6-fdholder-getdump.html
index 46bb2b6..513d276 100644
--- a/doc/s6-fdholder-getdump.html
+++ b/doc/s6-fdholder-getdump.html
@@ -84,7 +84,7 @@ open file descriptor.
- S6_FDLIMIT_i : contains the expiration date of
the ith open file descriptor, if applicable. That date is stored in
external TAI64N
-format.
+format.
If the file descriptor is not supposed to expire, that environment variable
is not defined.
diff --git a/doc/s6-fdholderd.html b/doc/s6-fdholderd.html
index 171b1c7..4b4794b 100644
--- a/doc/s6-fdholderd.html
+++ b/doc/s6-fdholderd.html
@@ -126,8 +126,8 @@ special characters will be quoted when printed by
recommended to only use reasonable characters in identifiers: clients
should be able to know at a glance what file descriptor is represented by
an identifier. Identifiers have no special meaning to the server.
- A good convention is to use unix:/path/to/socket for
-Unix domain sockets and protocol:ip:port
+ A good convention is to use unix:path/to/socket for
+Unix domain sockets and protocol:ip:port
for INET domain sockets.
An identifier is chosen by the storing client, within the limits of
what the server authorizes it to use.
diff --git a/doc/s6-log.html b/doc/s6-log.html
index f042c70..9384fa9 100644
--- a/doc/s6-log.html
+++ b/doc/s6-log.html
@@ -452,7 +452,7 @@ error descriptor, i.e. fd 2. This is why it's open for.
When process 1 starts, the logging chain is rooted to the
machine console: anything process 1 sends to its stderr
appears, without modification, on the machine console, which should
-at any time remain the last resort place where logs are sent.
+at any time remain the last resort place where logs are sent.
Process 1 should spawn and supervise a catch-all logging
mechanism that handles logs from every service that does not
take care of its own logging. Error messages from this logging
diff --git a/doc/s6-sudo.html b/doc/s6-sudo.html
index 3fdd38f..00232cd 100644
--- a/doc/s6-sudo.html
+++ b/doc/s6-sudo.html
@@ -47,7 +47,7 @@ client's behalf.
Options
- - The -q, -Q, -v, -p and -l
+
- The -q, -Q, -v, -p and -l
options are passed to s6-ipcclient.
- The -e, -t and -T options are passed to
s6-sudoc.
diff --git a/doc/s6-svstat.html b/doc/s6-svstat.html
index d40ec3b..d90e1f1 100644
--- a/doc/s6-svstat.html
+++ b/doc/s6-svstat.html
@@ -58,7 +58,6 @@ if it is, the number of seconds that it has been.
A service reported as down and ready simply means that it is ready
to be brought up. A service is down and not ready when it is in the
cleanup phase, i.e. the ./finish script is still being executed.
-
diff --git a/doc/servicedir.html b/doc/servicedir.html
index 31bf751..7c5d613 100644
--- a/doc/servicedir.html
+++ b/doc/servicedir.html
@@ -56,7 +56,7 @@ if your service is logged, the run script should make sure that its
stderr goes into the log pipe (which is on stdout by default), which
is achieved by fdmove
-c 2 1 in execline,
-and exec 2>&1 in shell.
+and exec 2>&1 in shell.
By default, in a normal supervision tree situation, a run script's stdin will
be /dev/null, and its stdout and stderr will both be a pipe to a
catch-all logging program.
diff --git a/doc/upgrade.html b/doc/upgrade.html
index f7413f5..a26fc88 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -27,7 +27,7 @@
in 2.9.1.0
- - skalibs
+
- skalibs
dependency bumped to 2.9.2.0.
- execline
dependency bumped to 2.6.0.0. (And made optional, see below.)
@@ -38,17 +38,17 @@ disabled when execline support is disabled.
- A new '?' directive has been added to s6-log,
it declares a processor command line that is spawned with the /bin/sh
interpreter.
- - A new -X option has been added to s6-svscan
to better support s6-linux-init
installations.
- - s6-svscan now handles SIGPWR and SIGWINCH, when
diverted, on systems that define those signals.
in 2.9.0.1
- - skalibs
+
- skalibs
dependency bumped to 2.9.1.0.
- execline
dependency bumped to 2.5.3.0.
@@ -57,7 +57,7 @@ dependency bumped to 2.5.3.0.
in 2.9.0.0
- - skalibs
+
- skalibs
dependency bumped to 2.9.0.0.
- execline
dependency bumped to 2.5.2.0.
@@ -68,14 +68,14 @@ removed.
in 2.8.0.1
- - skalibs
+
- skalibs
dependency bumped to 2.8.1.0.
in 2.8.0.0
- - skalibs
+
- skalibs
dependency bumped to 2.8.0.0.
- execline
dependency bumped to 2.5.1.0.
@@ -110,7 +110,7 @@ supervision tree, then start your services again. Failure to do so
- Optional nsss support added.
- - skalibs
+
- skalibs
dependency bumped to 2.7.0.0.
- execline
dependency bumped to 2.5.0.1.
--
cgit v1.2.3