diff options
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rw-r--r-- | doc/quickstart.html | 8 | ||||
| -rw-r--r-- | doc/s6-linux-init-hpr.html | 2 | ||||
| -rw-r--r-- | doc/s6-linux-init-logouthookd.html | 4 | ||||
| -rw-r--r-- | doc/s6-linux-init-shutdownd.html | 2 | ||||
| -rw-r--r-- | doc/upgrade.html | 2 | ||||
| -rw-r--r-- | doc/why.html | 2 |
7 files changed, 11 insertions, 10 deletions
@@ -10,3 +10,4 @@ Thanks to: Guillermo <gdiazhartusch@gmail.com> Muhammad Mahendra Subrata <mumahendras3@gmail.com> Leah Neukirchen <leah@vuxu.org> + Alexis <flexibeast@gmail.com> diff --git a/doc/quickstart.html b/doc/quickstart.html index 1f8cd9e..4ec6a48 100644 --- a/doc/quickstart.html +++ b/doc/quickstart.html @@ -44,17 +44,17 @@ add the <tt>-d /dev</tt> option to the <tt>s6-linux-init-maker</tt> command line <li> Reboot. Warning: use your <em>old</em> reboot command, that you saved, not the new one that has just been created by <tt>s6-linux-init-maker</tt>, because you're still running on your old init system and need to use a reboot command that matches it. </li> - <li> After the reboot: congratulations! your machine is now running a s6-based init system. </li> + <li> After the reboot: congratulations! your machine is now running an s6-based init system. </li> <li> To shut the machine down, use <tt>/sbin/shutdown</tt>, <tt>/sbin/halt</tt>, <tt>/sbin/poweroff</tt> or <tt>/sbin/reboot</tt> as usual. </li> </ol> <h2> FAQ </h2> -<h3> How do I convert a runit setup to a s6 one ? </h3> +<h3> How do I convert a runit setup to an s6 one ? </h3> <p> - A runit and a s6 setup are very similar. There are just three things you + A runit and an s6 setup are very similar. There are just three things you need to pay attention to: </p> @@ -105,7 +105,7 @@ filesystems will be unmounted and the machine will be rebooted and/or stopped. </p> <p> - So, the quickest way to port a runit setup to a s6-linux-init one is to: + So, the quickest way to port a runit setup to an s6-linux-init one is to: </p> <ul> diff --git a/doc/s6-linux-init-hpr.html b/doc/s6-linux-init-hpr.html index 4bf38cd..f0ed6fe 100644 --- a/doc/s6-linux-init-hpr.html +++ b/doc/s6-linux-init-hpr.html @@ -20,7 +20,7 @@ <p> <tt>s6-linux-init-hpr</tt> triggers the software shutdown procedure, -or, with the <tt>-f</tt> option, it perform an immediate hardware shutdown. +or, with the <tt>-f</tt> option, it performs an immediate hardware shutdown. It is normally invoked through <tt>halt</tt>, <tt>poweroff</tt> or <tt>reboot</tt> wrappers created by <a href="s6-linux-init-maker.html">s6-linux-init-maker</a>. diff --git a/doc/s6-linux-init-logouthookd.html b/doc/s6-linux-init-logouthookd.html index df18cb5..7a56a65 100644 --- a/doc/s6-linux-init-logouthookd.html +++ b/doc/s6-linux-init-logouthookd.html @@ -56,7 +56,7 @@ will definitely not do it. Some distributions use versions of <tt>login</tt> that fork the user's shell instead of execing it. When the user logs out, the <tt>login</tt> program cleans up after itself. This is a better model, but it's not -always easy to patch <tt>login</tt> to go from a "exec the shell" model to a +always easy to patch <tt>login</tt> to go from an "exec the shell" model to a "fork the shell as a child" model. </p> @@ -78,7 +78,7 @@ no program uses it. However, here's the list for completeness: </p> <ul> - <li> 0: success, whether or not there was an utmp record to clean up. </li> + <li> 0: success, whether or not there was a utmp record to clean up. </li> <li> 1: connection attempt from a non-root user. </li> <li> 2: write attempt from a (misprogrammed) client. </li> <li> 111: system call failed. </li> diff --git a/doc/s6-linux-init-shutdownd.html b/doc/s6-linux-init-shutdownd.html index a5e92ca..b0d42f4 100644 --- a/doc/s6-linux-init-shutdownd.html +++ b/doc/s6-linux-init-shutdownd.html @@ -20,7 +20,7 @@ <p> <tt>s6-linux-init-shutdownd</tt> is the daemon that manages the shutdown -procedure for a s6-linux-init installation. It is not meant to be called +procedure for an s6-linux-init installation. It is not meant to be called directly by the user. </p> diff --git a/doc/upgrade.html b/doc/upgrade.html index a459579..230d1e6 100644 --- a/doc/upgrade.html +++ b/doc/upgrade.html @@ -227,7 +227,7 @@ power off. </li> impacted binaries (<a href="s6-linux-init.html">s6-linux-init</a> and <a href="s6-linux-init-shutdownd.html">s6-linux-init-shutdownd</a>): <ul> - <li> <tt>-C</tt>: to boot a s6-based system in a container </li> + <li> <tt>-C</tt>: to boot an s6-based system in a container </li> <li> <tt>-B</tt>: to disable the catch-all logger </li> </ul> </li> </ul> diff --git a/doc/why.html b/doc/why.html index 8898cbd..cb2e756 100644 --- a/doc/why.html +++ b/doc/why.html @@ -37,7 +37,7 @@ is a good choice for s6 run scripts. </li> shell scripts. execline allows programs such as <a href="s6-linux-init-maker.html">s6-linux-init-maker</a> to generate scripts quite easily, whereas using the shell syntax would require them to understand -the full subleties of shell quoting. </li> +the full subtleties of shell quoting. </li> </ul> <li> <a href="//skarnet.org/software/s6/">s6</a>, the main dish: a process supervision suite. </li> |