diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/faq.html | 2 | ||||
| -rw-r--r-- | doc/overview.html | 2 | ||||
| -rw-r--r-- | doc/s6-rc-compile.html | 4 | ||||
| -rw-r--r-- | doc/s6-rc-init.html | 2 | ||||
| -rw-r--r-- | doc/s6-rc-update.html | 6 | ||||
| -rw-r--r-- | doc/upgrade.html | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/doc/faq.html b/doc/faq.html index 17ba7c5..9977f59 100644 --- a/doc/faq.html +++ b/doc/faq.html @@ -281,7 +281,7 @@ using OpenRC </li> </ul> <p> - You can now run compile your s6-rc service database, and use the + You can now compile your s6-rc service database, and use the <a href="s6-rc.html">s6-rc</a> engine as your service manager. Transitions will use your original init scripts, and the supervision features of <a href="//skarnet.org/software/s6/">s6</a> will diff --git a/doc/overview.html b/doc/overview.html index 9b375cf..87a33bb 100644 --- a/doc/overview.html +++ b/doc/overview.html @@ -188,7 +188,7 @@ will always respect the dependency graph. </p> <p> - The s6-rc command is the central for machine state changes, and it is + The s6-rc command is the engine for machine state changes, and it is also true for shutdown. When shutting a machine down, all the services managed by s6-rc should be brought down in the proper order (via the <tt>s6-rc -da change</tt> command). Once all those services have been diff --git a/doc/s6-rc-compile.html b/doc/s6-rc-compile.html index 719d219..e1ad82b 100644 --- a/doc/s6-rc-compile.html +++ b/doc/s6-rc-compile.html @@ -363,7 +363,7 @@ that the pipes are not broken whenever one element in the chain dies. <p> A service can only be declared as a producer for <em>one</em> other -services, but it can be declared as a consumer for several other +service, but it can be declared as a consumer for several other services: the <em>consumer-for</em> can have several lines. This means that one service can only send its output to one consumer, but it can read its input from several producers. If there are several @@ -404,7 +404,7 @@ can be moved around in the filesystem, provided the insides remain untouched. </li> <li> Once a compiled database is live (i.e. it has services running on it, following an invocation of <a href="s6-rc-init.html">s6-rc-init</a> or -<a href="s6-rc-update.html">s6-rc-update</a>, it <em>must not move anymore</em>, +<a href="s6-rc-update.html">s6-rc-update</a>), it <em>must not move anymore</em>, and it must not be deleted. The only way to "free" such a compiled database for displacement or deletion is to replace it as the live one via another call to <a href="s6-rc-update.html">s6-rc-update</a>. </li> diff --git a/doc/s6-rc-init.html b/doc/s6-rc-init.html index c71c3b5..afe10cd 100644 --- a/doc/s6-rc-init.html +++ b/doc/s6-rc-init.html @@ -134,7 +134,7 @@ invocations. The reason for this behaviour is that similarly named, directory (<em>live</em><tt>:<em>suffix</em></tt>) and updates the live state by atomically changing the target of the <em>live</em> symlink - so <em>live</em> will not change names, whereas -the real directory may.) </li> +the real directory may. </li> <li> Similarly, it is recommended that administrators store their compiled service databases into some versioned directory, and that <em>compiled</em> be a symbolic link to the database currently in diff --git a/doc/s6-rc-update.html b/doc/s6-rc-update.html index 5b52a6b..0883a22 100644 --- a/doc/s6-rc-update.html +++ b/doc/s6-rc-update.html @@ -281,18 +281,18 @@ process in charge of it will still show up in the process list as <tt>s6-supervise <em>oldname</em></tt>. This is purely cosmetic and will have no impact on the service; nevertheless, if you wish to avoid that, simply force a restart on every longrun you rename. </li> - <li> After a s6-rc-update invocation, the old compiled service database + <li> After an s6-rc-update invocation, the old compiled service database is left unchanged where it was, and the new compiled service database is used in-place. If the machine is rebooted, the <a href="s6-rc-init.html">s6-rc-init</a> invocation will still boot on the old compiled unless more work is performed. It is recommended to keep a <tt>current</tt> symbolic link to the current compiled, to always <a href="s6-rc-init.html">s6-rc-init</a> on <tt>current</tt>, and to -make <tt>current</tt> a link to the new compiled right after a s6-rc-update +make <tt>current</tt> a link to the new compiled right after an s6-rc-update invocation. </li> <li> s6-rc-update is the only way to "free" the old compiled database for displacement or deletion. A live compiled database must not be -tampered with. After a s6-rc-update invocation, the old database isn't +tampered with. After an s6-rc-update invocation, the old database isn't live anymore and can be moved or deleted; instead, <em>newdb</em> is live. </li> </ul> diff --git a/doc/upgrade.html b/doc/upgrade.html index 6c66f1e..0872086 100644 --- a/doc/upgrade.html +++ b/doc/upgrade.html @@ -203,7 +203,7 @@ dependency bumped to 2.5.1.0. </li> dependency bumped to 2.8.0.0. </li> <li> <a href="s6-rc-compile.html">s6-rc-compile</a> does not support the <tt>-u</tt> or <tt>-g</tt> options anymore; instead, at any time, the user who can operate -a s6-rc database is the user who owns the supervision tree. </li> +an s6-rc database is the user who owns the supervision tree. </li> <li> Everything now builds as PIC by default no matter the toolchain's settings. Use the <tt>--disable-all-pic</tt> configure option to build executables and static libraries as non-PIC. </li> |