Re-generate.

2 files changed, 40 insertions, 4 deletions

diff --git a/doc/pkgsrc.html b/doc/pkgsrc.html
index 358ce1c20dd..a906e70ea8a 100644
--- a/doc/pkgsrc.html
+++ b/doc/pkgsrc.html
@@ -4356,9 +4356,32 @@ nbftp% <strong class="userinput"><code>chmod 755 .</code></strong>
 
           <p>If you want to use pkgsrc as non-root user, you can
           set some variables to make pkgsrc work under these
-          conditions. Please see <a href=
-          "http://mail-index.NetBSD.org/tech-pkg/2003/09/27/0023.html"
-          target="_top">this message</a> for more details.</p>
+          conditions. At the very least, you need to set
+          <code class="varname">UNPRIVILEGED</code> to
+          &#8220;<span class="quote">yes</span>&#8221;; this will
+          turn on unprivileged mode and set multiple related
+          variables to allow installation of packages as
+          non-root.</p>
+
+          <p>In case the defaults are not enough, you may want to
+          tune some other variables used. For example, if the
+          automatic user/group detection leads to incorrect values
+          (or not the ones you would like to use), you can change
+          them by setting <code class=
+          "varname">UNPRIVILEGED_USER</code> and <code class=
+          "varname">UNPRIVILEGED_GROUP</code> respectively.</p>
+
+          <p>As regards bootstrapping, please note that the
+          <span><strong class="command">bootstrap</strong></span>
+          script will ease non-root configuration when given the
+          &#8220;<span class=
+          "quote">--ignore-user-check</span>&#8221; flag, as it
+          will choose and use multiple default directories under
+          <code class="filename">~/pkg</code> as the installation
+          targets. These directories can be overriden by the
+          &#8220;<span class="quote">--prefix</span>&#8221; flag
+          provided by the script, as well as some others that allow
+          finer tuning of the tree layout.</p>
         </div>
 
         <div class="sect1" lang="en" xml:lang="en">
diff --git a/doc/pkgsrc.txt b/doc/pkgsrc.txt
index fe1283b756c..dea270dc53d 100644
--- a/doc/pkgsrc.txt
+++ b/doc/pkgsrc.txt
@@ -1664,7 +1664,20 @@ Utilities for people maintaining pkgsrc (or more obscure pkg utilities)
 6.4. How to use pkgsrc as non-root
 
 If you want to use pkgsrc as non-root user, you can set some variables to make
-pkgsrc work under these conditions. Please see this message for more details.
+pkgsrc work under these conditions. At the very least, you need to set
+UNPRIVILEGED to "yes"; this will turn on unprivileged mode and set multiple
+related variables to allow installation of packages as non-root.
+
+In case the defaults are not enough, you may want to tune some other variables
+used. For example, if the automatic user/group detection leads to incorrect
+values (or not the ones you would like to use), you can change them by setting
+UNPRIVILEGED_USER and UNPRIVILEGED_GROUP respectively.
+
+As regards bootstrapping, please note that the bootstrap script will ease
+non-root configuration when given the "--ignore-user-check" flag, as it will
+choose and use multiple default directories under ~/pkg as the installation
+targets. These directories can be overriden by the "--prefix" flag provided by
+the script, as well as some others that allow finer tuning of the tree layout.
 
 6.5. How to resume transfers when fetching distfiles?