Merge commit '949f97f7f9' into core-update-new-2chris-core-updates-no-duplicates-attempt

Change-Id: Ibbd851541da42cc052ba58195fee033daadd57e5

Conflicts:
	gnu/local.mk
	gnu/packages/bioinformatics.scm
	gnu/packages/dictionaries.scm
	gnu/packages/display-managers.scm
	gnu/packages/engineering.scm
	gnu/packages/geo.scm
	gnu/packages/gl.scm
	gnu/packages/glib.scm
	gnu/packages/gnome-xyz.scm
	gnu/packages/gnome.scm
	gnu/packages/gtk.scm
	gnu/packages/image-processing.scm
	gnu/packages/linux.scm
	gnu/packages/llvm.scm
	gnu/packages/mail.scm
	gnu/packages/patches/eudev-rules-directory.patch
	gnu/packages/plotutils.scm
	gnu/packages/sdl.scm
	gnu/packages/syndication.scm

1 files changed, 9 insertions, 9 deletions

diff --git a/doc/guix-cookbook.texi b/doc/guix-cookbook.texi
index e7ef5fa784..3bc63cba7a 100644
--- a/doc/guix-cookbook.texi
+++ b/doc/guix-cookbook.texi
@@ -64,9 +64,11 @@ its API, and related concepts.
 @c how to join your own translation team and how to report issues with the
 @c translation.
 This manual is also available in French (@pxref{Top,,, guix-cookbook.fr,
-Livre de recettes de GNU Guix}), German (@pxref{Top,,,
-guix-cookbook.de, GNU-Guix-Kochbuch}) and Slovak (@pxref{Top,,,
-guix-cookbook.sk, Receptár GNU Guix}).  If you would like to translate
+Livre de recettes de GNU Guix}), German (@pxref{Top,,, guix-cookbook.de,
+GNU-Guix-Kochbuch}), Korean (@pxref{Top,,, guix-cookbook.ko, GNU Guix 쿡북}),
+Brazilian Portuguese (@pxref{Top,,, guix-cookbook.pt_BR,
+Livro de Receitas do GNU Guix}) and Slovak (@pxref{Top,,, guix-cookbook.sk,
+Receptár GNU Guix}).  If you would like to translate
 this document in your native language, consider joining
 @uref{https://translate.fedoraproject.org/projects/guix/documentation-cookbook,
 Weblate} (@pxref{Translating Guix,,, guix, GNU Guix reference
@@ -2546,7 +2548,6 @@ is below. Save the resulting file as @file{guix-config.scm}.
 (use-service-modules networking
                      ssh)
 (use-package-modules admin
-                     certs
                      package-management
                      ssh
                      tls)
@@ -2584,8 +2585,7 @@ is below. Save the resulting file as @file{guix-config.scm}.
                 (home-directory "/home/janedoe"))
                %base-user-accounts))
 
-  (packages (cons* nss-certs            ;for HTTPS access
-                   openssh-sans-x
+  (packages (cons* openssh-sans-x
                    %base-packages))
 
   (services (cons*
@@ -2794,7 +2794,7 @@ here is a sample:
 @lisp
 (use-modules (gnu) (guix))
 (use-service-modules networking ssh vpn virtualization sysctl admin mcron)
-(use-package-modules ssh certs tls tmux vpn virtualization)
+(use-package-modules ssh tls tmux vpn virtualization)
 
 (operating-system
   (host-name "kimsufi")
@@ -2846,7 +2846,7 @@ root ALL=(ALL) ALL
 guix ALL=(ALL) NOPASSWD:ALL\n"))
 
   ;; Globally-installed packages.
-  (packages (cons* tmux nss-certs gnutls wireguard-tools %base-packages))
+  (packages (cons* tmux gnutls wireguard-tools %base-packages))
   (services
    (cons*
     (service static-networking-service-type
@@ -3803,7 +3803,7 @@ the guest.
 
 @quotation Important
 By default, a single MAC address is used for all guests, unless
-provided.  Failing to provided different MAC addresses to each virtual
+provided.  Failing to provide different MAC addresses to each virtual
 machine making use of the bridge would cause networking issues.
 @end quotation