From bf5b6315e7a6907c6a95564e7042f90f9aed632a Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Thu, 6 Apr 2023 17:34:06 +0000 Subject: Doc typo fixes Signed-off-by: Laurent Bercot --- doc/faq.html | 2 +- doc/overview.html | 2 +- doc/s6-rc-compile.html | 4 ++-- doc/s6-rc-init.html | 2 +- doc/s6-rc-update.html | 6 +++--- doc/upgrade.html | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) (limited to 'doc') 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

- 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 s6-rc engine as your service manager. Transitions will use your original init scripts, and the supervision features of s6 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.

- 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 s6-rc -da change 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.

A service can only be declared as a producer for one 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 consumer-for 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.

  • Once a compiled database is live (i.e. it has services running on it, following an invocation of s6-rc-init or -s6-rc-update, it must not move anymore, +s6-rc-update), it must not move anymore, 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 s6-rc-update.
  • 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 (live:suffix) and updates the live state by atomically changing the target of the live symlink - so live will not change names, whereas -the real directory may.) +the real directory may.
  • Similarly, it is recommended that administrators store their compiled service databases into some versioned directory, and that compiled 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 s6-supervise oldname. 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.
  • -
  • After a s6-rc-update invocation, the old compiled service database +
  • 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 s6-rc-init invocation will still boot on the old compiled unless more work is performed. It is recommended to keep a current symbolic link to the current compiled, to always s6-rc-init on current, and to -make current a link to the new compiled right after a s6-rc-update +make current a link to the new compiled right after an s6-rc-update invocation.
  • 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, newdb is live.
  • 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. dependency bumped to 2.8.0.0.
  • s6-rc-compile does not support the -u or -g options anymore; instead, at any time, the user who can operate -a s6-rc database is the user who owns the supervision tree.
  • +an s6-rc database is the user who owns the supervision tree.
  • Everything now builds as PIC by default no matter the toolchain's settings. Use the --disable-all-pic configure option to build executables and static libraries as non-PIC.
  • -- cgit v1.2.3