Reflect s6 set changes in the doc

1 files changed, 14 insertions, 22 deletions

diff --git a/doc/s6_set.html b/doc/s6_set.html
index e376b6b..7f4cf53 100644
--- a/doc/s6_set.html
+++ b/doc/s6_set.html
@@ -97,12 +97,13 @@ By default, the command exits with an error instead of overwriting. </dd>
 <h4> Interface </h4>
 
 <pre>
-     s6 set list [ -E | -e ] [ -s <em>setname</em> ]
+     s6 set list [ -E | -e ] [ <em>setname</em> ]
 </pre>
 
 <ul>
  <li> <tt>s6 set list</tt> lists all the services in the <tt>current</tt> set,
 printing their names on stdout, one per line. </li>
+ <li> If <em>setname</em> is provided, it is listed instead of <tt>current</tt>. </li>
 </ul>
 
 <h4> Options </h4>
@@ -115,8 +116,6 @@ default. </dd>
 <dt> -e, --without-essentials </dt>
 <dd> Do not list essential services. </dd>
 
-<dt> <tt>-s <em>setname</em></tt>, <tt>--set=<em>setname</em></tt> </dt>
-<dd> List the services in the set named <em>setname</em> rather than <tt>current</tt>. </dd>
 </dl>
 
 <h3 id="status"> status </h3>
@@ -217,7 +216,6 @@ make the set inconsistent. </li>
 <h4> Options </h4>
 
 <dl>
-
 <dt> -n, --dry-run </dt>
 <dd> Do not perform the change; only show what would be done and check whether the set
 would be made inconsistent. </dd>
@@ -251,12 +249,13 @@ pulled into the change, then apply the change. </dd>
 <h4> Interface </h4>
 
 <pre>
-     s6 set check [ -F ] [ -d | -u ] [ -E | -e ] [ -s <em>setname</em> ]
+     s6 set check [ -F ] [ -d | -u ] [ -E | -e ] [ <em>setname</em> ]
 </pre>
 
 <ul>
  <li> <tt>s6 set check</tt> checks the <tt>current</tt> set for
 inconsistencies, printing anything it finds to stdout. </li>
+ <li> If <em>setname</em> is provided, it is checked instead of <tt>current</tt>. </li>
 </ul>
 
 <h4> Options </h4>
@@ -288,9 +287,6 @@ default. </dd>
 <dd> Fix the set by enabling or unmasking services. If service <tt>A</tt>
 depends on service <tt>B</tt> and <tt>A</tt> is unmasked or enabled,
 change <tt>B</tt> to be unmasked or enabled as well. </dd>
-
-<dt> <tt>-s <em>setname</em></tt>, <tt>--set=<em>setname</em></tt> </dt>
-<dd> Check the set named <em>setname</em>, rather than <tt>current</tt>. </dd>
 </dl>
 
 <h3 id="commit"> commit </h3>
@@ -298,13 +294,13 @@ change <tt>B</tt> to be unmasked or enabled as well. </dd>
 <h4> Interface </h4>
 
 <pre>
-     s6 set commit [ -f ] [ -K ] [ -D <em>defaultbundle</em> ] [ -s <em>setname</em> ]
+     s6 set commit [ -f ] [ -K ] [ -D <em>defaultbundle</em> ] [ <em>setname</em> ]
 </pre>
 
 <ul>
  <li> <tt>s6 set commit</tt>
 <a href="//skarnet.org/software/s6-rc/repodefs.html#commit">commits</a>
-the current set: it attempts to
+the <tt>current</tt> set: it attempts to
 <a href="//skarnet.org/software/s6-rc/s6-rc-compile.html">compile</a> a
 service database out of the set. </li>
  <li> This command must be run once all desired modifications have been
@@ -313,6 +309,7 @@ by a <a href="#check"><tt>s6 set check -F</tt></a> command. </li>
  <li> Once the set has been committed, in order to actually be used it must
 be installed via the <a href="s6_live.html#install"><tt>s6 live install</tt></a>
 command. </li>
+ <li> If <em>setname</em> is provided, it is committed instead of <tt>current</tt>. </li>
 </ul>
 
 <h4> Options </h4>
@@ -332,9 +329,6 @@ when the set is successfully committed. </dd>
 services and that will be started at boot time. There is generally no reason
 to change the default, which depends on the distribution and is probably called
 <tt>default</tt>. </dd>
-
-<dt> <tt>-s <em>setname</em></tt>, <tt>--set=<em>setname</em></tt> </dt>
-<dd> Commit the set named <em>setname</em>, rather than <tt>current</tt>. </dd>
 </dl>
 
 <h3 id="apply"> apply </h3>
@@ -342,7 +336,7 @@ to change the default, which depends on the distribution and is probably called
 <h4> Interface </h4>
 
 <pre>
-     s6 set apply [ -b ]  [ -D <em>defaultbundle</em> ] [ -s <em>setname</em> ] [ -t <em>timeout</em> ]
+     s6 set apply [ -b ]  [ -D <em>defaultbundle</em> ] [ -t <em>timeout</em> ] [ <em>setname</em> ]
 </pre>
 
 <ul>
@@ -350,13 +344,14 @@ to change the default, which depends on the distribution and is probably called
 in that it does several things in succession, and <em>impacts the live state</em>
 of the machine. It does the following:
   <ul>
-   <li> <em>Commit</em> the working set, just like <tt>s6 set commit</tt> </li>
-   <li> <em>Install</em> the working set, just like <tt>s6 live install</tt> </li>
+   <li> <em>Commit</em> the <tt>current</tt> set, just like <tt>s6 set commit</tt> </li>
+   <li> <em>Install</em> the <tt>current</tt> set, just like <tt>s6 live install</tt> </li>
    <li> <em>Reset</em> the live state, just like <tt>s6 live reset</tt>, so it
-matches the prescriptions of the working set exactly. </li>
+matches the prescriptions of the <tt>current</tt> set exactly. </li>
   </ul>
- In other words, <tt>s6 set apply</tt> immediately turns the working set
-into the current live state. It is a powerful command. </li>
+ In other words, <tt>s6 set apply</tt> immediately turns the <tt>current</tt> set
+into the actual live state. It is a powerful command. </li>
+ <li> If <em>setname</em> is provided, it is applied instead of <tt>current</tt>. </li>
 </ul>
 
 <h4> Options </h4>
@@ -377,9 +372,6 @@ The default depends on the distribution and is probably called <tt>default</tt>.
 invocation. This option should
 never be necessary if the services in the stores are properly managed. </dd>
 
-<dt> <tt>-s <em>setname</em></tt>, <tt>--set=<em>setname</em></tt> </dt>
-<dd> Apply the set named <em>setname</em>, rather than <tt>current</tt>. </dd>
-
 <dt> <tt>-t <em>timeout</em></tt>, <tt>--timeout=<em>timeout</em></tt> </dt>
 <dd> If installing the set and resetting the state still hasn't completed after <em>timeout</em>
 milliseconds, stop waiting and don't attempt to perform the remaining