Merge branch 'master' into core-updates

 Conflicts:
	gnu/local.mk
	gnu/packages/backup.scm
	gnu/packages/emacs-xyz.scm
	gnu/packages/guile.scm
	gnu/packages/lisp.scm
	gnu/packages/openldap.scm
	gnu/packages/package-management.scm
	gnu/packages/web.scm
	gnu/packages/xorg.scm

2 files changed, 15 insertions, 7 deletions

diff --git a/doc/guix-cookbook.texi b/doc/guix-cookbook.texi
index 82700a48ad..f58d18d47c 100644
--- a/doc/guix-cookbook.texi
+++ b/doc/guix-cookbook.texi
@@ -13,6 +13,7 @@ Copyright @copyright{} 2019 Efraim Flashner@*
 Copyright @copyright{} 2019 Pierre Neidhardt@*
 Copyright @copyright{} 2020 Oleg Pykhalov@*
 Copyright @copyright{} 2020 Matthew Brooks@*
+Copyright @copyright{} 2020 Marcin Karpezo@*
 
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.3 or
@@ -1575,7 +1576,7 @@ available for inclusion into the initrd.
 @cindex stumpwm
 
 You could install StumpWM with a Guix system by adding
-@code{stumpwm-checkout} and optionally @code{`(,stumpwm-checkout "lib")}
+@code{stumpwm} and optionally @code{`(,stumpwm "lib")}
 packages to a system configuration file, e.g.@: @file{/etc/config.scm}.
 
 An example configuration can look like this:
@@ -1586,7 +1587,7 @@ An example configuration can look like this:
 
 (operating-system
   ;; …
-  (packages (append (list sbcl stumpwm-checkout `(,stumpwm-checkout "lib"))
+  (packages (append (list sbcl stumpwm `(,stumpwm "lib"))
                     %base-packages)))
 @end lisp
 
@@ -1601,7 +1602,7 @@ module @code{sbcl-stumpwm-ttf-fonts}, adding it to Guix system packages:
 
 (operating-system
   ;; …
-  (packages (append (list sbcl stumpwm-checkout `(,stumpwm-checkout "lib"))
+  (packages (append (list sbcl stumpwm `(,stumpwm "lib"))
                     sbcl-stumpwm-ttf-fonts font-dejavu %base-packages)))
 @end lisp
 
diff --git a/doc/guix.texi b/doc/guix.texi
index 6613a4af13..26b4652f67 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -63,7 +63,7 @@ Copyright @copyright{} 2018, 2019 Florian Pelz@*
 Copyright @copyright{} 2018 Laura Lazzati@*
 Copyright @copyright{} 2018 Alex Vong@*
 Copyright @copyright{} 2019 Josh Holland@*
-Copyright @copyright{} 2019 Diego Nicola Barbato@*
+Copyright @copyright{} 2019, 2020 Diego Nicola Barbato@*
 Copyright @copyright{} 2019 Ivan Petkov@*
 Copyright @copyright{} 2019 Jakob L. Kreuze@*
 Copyright @copyright{} 2019 Kyle Andrews@*
@@ -5118,7 +5118,7 @@ guix pack -f squashfs bash guile emacs geiser
 @noindent
 The result is a SquashFS file system image that can either be mounted or
 directly be used as a file system container image with the
-@uref{https://singularity.lbl.gov, Singularity container execution
+@uref{https://www.sylabs.io/docs/, Singularity container execution
 environment}, using commands like @command{singularity shell} or
 @command{singularity exec}.
 
@@ -8830,7 +8830,7 @@ $ guix environment --no-grafts -C foo --ad-hoc strace gdb
 Here, @command{guix environment -C} creates a container and spawns a new
 shell in it (@pxref{Invoking guix environment}).  The @command{--ad-hoc
 strace gdb} part adds the @command{strace} and @command{gdb} commands to
-the container, which would may find handy while debugging.  The
+the container, which you may find handy while debugging.  The
 @option{--no-grafts} option makes sure we get the exact same
 environment, with ungrafted packages (@pxref{Security Updates}, for more
 info on grafts).
@@ -16290,6 +16290,13 @@ sound server.  It exists to allow system overrides of the default settings
 via @code{pulseaudio-configuration}, see below.
 
 @quotation Warning
+This service overrides per-user configuration files.  If you want
+PulseAudio to honor configuraton files in @file{~/.config/pulse} you
+have to unset the environment variables @code{PULSE_CONFIG} and
+@code{PULSE_CLIENTCONFIG} in your @file{~/.bash_profile}.
+@end quotation
+
+@quotation Warning
 This service on its own does not ensure, that the @code{pulseaudio} package
 exists on your machine.  It merely adds configuration files for it, as
 detailed below.  In the (admittedly unlikely) case, that you find yourself
@@ -26592,7 +26599,7 @@ like
 
 @lisp
 (bootloader
- (grub-configuration
+ (bootloader-configuration
  ;; @dots{}
  (theme (grub-theme
          (inherit %default-theme)