Merge branch 'master' into mesa-updates

Change-Id: I0c6e2410c51335c68634738be030e374f5b492e9

1 files changed, 9 insertions, 2 deletions

diff --git a/doc/contributing.texi b/doc/contributing.texi
index 9e9b89782c..7337f4bd58 100644
--- a/doc/contributing.texi
+++ b/doc/contributing.texi
@@ -76,15 +76,17 @@ all the dependencies and appropriate environment variables are set up to
 hack on Guix:
 
 @example
-guix shell -D guix --pure
+guix shell -D guix -CPW
 @end example
 
 or even, from within a Git worktree for Guix:
 
 @example
-guix shell --pure
+guix shell -CPW
 @end example
 
+If @option{-C} (short for @option{--container}) is not supported on your
+system, try @command{--pure} instead of @option{-CPW}.
 @xref{Invoking guix shell}, for more information on that command.
 
 If you are unable to use Guix when building Guix from a checkout, the
@@ -1682,6 +1684,11 @@ command to submit patches.  To list the available actions of the script,
 you can invoke it via the @command{etc/teams.scm help} command.  For
 more information regarding teams, @pxref{Teams}.
 
+@quotation Note
+On foreign distros, you might have to use @command{./pre-inst-env git
+send-email} for @file{etc/teams.scm} to work.
+@end quotation
+
 @unnumberedsubsubsec Multiple Patches
 @anchor{Multiple Patches}
 @cindex cover letter