1 files changed, 11 insertions, 16 deletions
diff --git a/doc/s6.html b/doc/s6.html
index 661bc65..9fb6038 100644
--- a/doc/s6.html
+++ b/doc/s6.html
@@ -63,17 +63,6 @@ command, and on the linked documentation page you can find the interpretation
 of its various exit codes.
 </p>
 
-<h2 id="env"> Environment variables </h2>
-
-<ul>
- <li> s6 reads the <code>S6_CONF</code> environment variable
-containing the absolute path to the
-<a href="s6.conf.html">configuration file</a> for the s6 command. </li>
- <li> If this variable is unset, the default is <tt>/etc/s6.conf</tt>,
-possibly overridden by the <tt>--conffile</tt> build-time configure option to
-s6-frontend. </li>
-</ul>
-
 <h2 id="options"> Global options </h2>
 
 <p>
@@ -129,12 +118,18 @@ if <tt>auto</tt>. Not all commands and subcommands will use this
 setting. Also, for pretty-printing of columns, it is recommended to
 have built s6-frontend with util-linux support. </dd>
 
+ <dt> <tt>-S</tt>, <tt>--system</tt> </dt>
+ <dd> Use the <tt>/etc/s6.conf</tt> system <a href="s6.conf.html">configuration file</tt>.
+This is the default.
+The location of the file can be overridden by the admin at install time via the
+<tt>--conffile</tt> configure option, or by the user at run time via the
+<tt>S6_CONF</tt> environment variable. </dd>
+
  <dt> <tt>-u</tt>, <tt>--user</tt> </dt>
- <dd> Override the variables defined in the configuration file with values
-built from XDG environment variables. This option only works if the XDG
-environment variables are present in the environment. This option is
-useful to address user services. You can see what values are used by
-running <tt>s6 -u version export</tt>. </dd>
+ <dd> Use the <tt>/etc/s6-user.conf</tt> system <a href="s6.conf.html">configuration file</tt>.
+The location of the file can be overridden by the admin at install time via the
+<tt>--userconffile</tt> configure option, or by the user at run time via the
+<tt>S6_USER_CONF</tt> environment variable. </dd>
 </dl>