From 17afba83e8703d8fadc9d3b15fd83cb0a125b006 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <mjo@gentoo.org>
Date: Sat, 22 Nov 2014 08:18:14 -0500
Subject: [PATCH 1/2] Bug #525828: Update the wording in "Common pkg_preinst
 tasks".

The original wording here suggested unconditionally that pkg_setup()
is a better place in which to create users. We have bug #217042 that
points out that this is not usually the case, and the new text
explains the situation in which pkg_setup() is preferred.
---
 ebuild-writing/functions/pkg_preinst/text.xml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/ebuild-writing/functions/pkg_preinst/text.xml b/ebuild-writing/functions/pkg_preinst/text.xml
index 9cdeb4a..a799427 100644
--- a/ebuild-writing/functions/pkg_preinst/text.xml
+++ b/ebuild-writing/functions/pkg_preinst/text.xml
@@ -61,9 +61,11 @@ There are a few things that are often done in <c>pkg_preinst</c>:
 
 <ul>
   <li>
-  Adding users and groups. However, since <c>pkg_preinst</c> may be called 
-  after <c>src_compile</c>, <c>pkg_setup</c> is the more suitable location for
-  user creation <d/> see <uri link="::ebuild-writing/users-and-groups"/>.
+  Adding users and groups. However, note that <c>pkg_preinst</c> is
+  called after <c>src_compile</c> and <c>src_install</c>, so if the
+  new user is required in one of those phases, then <c>pkg_setup</c>
+  is a more suitable location for user creation. See <uri
+  link="::ebuild-writing/users-and-groups"/> for more information.
   </li>
   <li>
   Modifying the install image for a particular system. This function
-- 
2.0.4