From 6b2752526b6237b54dc399d20fe560370281800c Mon Sep 17 00:00:00 2001
From: Mark H Weaver <mhw@netris.org>
Date: Sat, 21 Apr 2018 05:20:24 -0400
Subject: [PATCH 001/275] gnu: uget: Remove duplicate 'native-inputs' field.

* gnu/packages/bittorrent.scm (uget)[native-inputs]: Remove duplicate
field initializer.
---
 gnu/packages/bittorrent.scm | 2 --
 1 file changed, 2 deletions(-)

diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm
index ae9b3bc62d..9df4f097ac 100644
--- a/gnu/packages/bittorrent.scm
+++ b/gnu/packages/bittorrent.scm
@@ -315,8 +315,6 @@ Aria2 can be manipulated via built-in JSON-RPC and XML-RPC interfaces.")
                (base32
                 "0919cf7lfk1djdl003cahqjvafdliv7v2l8r5wg95n4isqggdk75"))))
     (build-system gnu-build-system)
-    (native-inputs
-     `(("intltool" ,intltool)))
     (inputs
      `(("curl" ,curl)
        ("gtk+" ,gtk+)

From 0ccb104354a1f4824f56d579aa574e3c9df7737f Mon Sep 17 00:00:00 2001
From: Mark H Weaver <mhw@netris.org>
Date: Sat, 21 Apr 2018 05:22:00 -0400
Subject: [PATCH 002/275] gnu: go-github-com-vitrun-qart-qr: Remove duplicate
 'description' field.

* gnu/packages/syncthing.scm (go-github-com-vitrun-qart-qr)[description]:
Remove duplicate 'description' field.
---
 gnu/packages/syncthing.scm | 2 --
 1 file changed, 2 deletions(-)

diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm
index 4a584b1f9a..ea24be2058 100644
--- a/gnu/packages/syncthing.scm
+++ b/gnu/packages/syncthing.scm
@@ -857,8 +857,6 @@ implements arithmetic over the Galois Field GF(256).")
        `(#:import-path "github.com/vitrun/qart/qr"
          #:unpack-path "github.com/vitrun/qart"))
       (synopsis "Qart component for generating QR codes")
-      (description "This package, a component of @code{qart}, provides
-@code{qr}, for QR code generation.")
       (description "This package provides a library for embedding
 human-meaningful graphics in QR codes.  However, instead of scribbling on
 redundant pieces and relying on error correction to preserve the meaning,

From 841f833171c59054d3d32430f9107431d440df71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20=C4=8Cech?= <sleep_walker@gnu.org>
Date: Sat, 21 Apr 2018 17:37:12 +0200
Subject: [PATCH 003/275] gnu: python-onetimepass: Make python-six a propagated
 input.

* gnu/packages/python.scm (python-onetimepass)[inputs]: Move python-six from
here...
[propagated-inputs]: ...to here.
---
 gnu/packages/python.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index c033123a35..f36e4c770d 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -13139,7 +13139,7 @@ in Python.  You can simply type pybtex instead of bibtex.")
        (sha256
         (base32 "09vagxgbq78wvq4xbikmn2hpqqsa2i96kqsmphf7dqynfv0dlsd5"))))
     (build-system python-build-system)
-    (inputs `(("python-six" ,python-six)))
+    (propagated-inputs `(("python-six" ,python-six)))
     (home-page "https://github.com/tadeck/onetimepass/")
     (synopsis "One-time password library")
     (description "Python one-time password library for HMAC-based (HOTP) and

From c80629e7c2840c72effe398b351af9038f9cd44a Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Sat, 21 Apr 2018 23:04:11 +0300
Subject: [PATCH 004/275] gnu: freefall: Fix compilation error.

* gnu/packages/linux.scm (freefall)[arguments]: Add make-flag to set
CC=gcc.
---
 gnu/packages/linux.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index e28f09fda9..1d9585e7f1 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -3307,7 +3307,8 @@ disks and SD cards.  This package provides the userland utilities.")
                       (substitute* "freefall.c"
                         (("alarm\\(2\\)") "alarm(5)")))))
        #:make-flags (list (string-append "PREFIX="
-                                         (assoc-ref %outputs "out")))
+                                         (assoc-ref %outputs "out"))
+                          "CC=gcc")
        #:tests? #f)) ;no tests
     (home-page (package-home-page linux-libre))
     (synopsis "Free-fall protection for spinning laptop hard drives")

From 785f40dfbc5e8511a1c6ed9cd8d8b40e0f03a857 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Sat, 21 Apr 2018 23:22:43 +0300
Subject: [PATCH 005/275] gnu: spindle: Limit supported systems.

* gnu/packages/admin.scm (spindle)[supported-system]: New field.
---
 gnu/packages/admin.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 5b47d5faec..8d32518973 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -2596,4 +2596,6 @@ launch daemons into the relevant nodes.")
      "Spindle is a tool for improving the performance of dynamic library and
 Python loading in HPC environments.")
     (home-page "https://github.com/hpc/Spindle")
+    ;; This package supports x86_64 and PowerPC64
+    (supported-systems '("x86_64-linux"))
     (license license:lgpl2.1)))

From c43ea99b3986c9db21ed32219e64e9848b1c001b Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Sat, 21 Apr 2018 08:27:43 +0200
Subject: [PATCH 006/275] gnu: r-minimal: Update to 3.4.4.

* gnu/packages/statistics.scm (r-minimal): Update to 3.4.4.
---
 gnu/packages/statistics.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index cb839a85a3..dc422c3647 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -115,7 +115,7 @@ be output in text, PostScript, PDF or HTML.")
 (define-public r-minimal
   (package
     (name "r-minimal")
-    (version "3.4.3")
+    (version "3.4.4")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://cran/src/base/R-"
@@ -123,7 +123,7 @@ be output in text, PostScript, PDF or HTML.")
                                   version ".tar.gz"))
               (sha256
                (base32
-                "09pl0w01fr09bsrwd7nz2r5psysj0z93w4chz3hm2havvqqvhg3s"))))
+                "0dq3jsnwsb5j3fhl0wi3p5ycv8avf8s5j1y4ap3d2mkjmcppvsdk"))))
     (build-system gnu-build-system)
     (arguments
      `(#:disallowed-references (,tzdata-for-tests)

From ac6672d539d49f296d21f89bb1f5dead8aea1fa2 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Sat, 21 Apr 2018 08:28:00 +0200
Subject: [PATCH 007/275] gnu: r-cluster: Update to 2.0.7-1.

* gnu/packages/statistics.scm (r-cluster): Update to 2.0.7-1.
---
 gnu/packages/statistics.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index dc422c3647..1e784c9b63 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -361,14 +361,14 @@ k-nearest neighbour, Learning Vector Quantization and Self-Organizing Maps.")
 (define-public r-cluster
   (package
     (name "r-cluster")
-    (version "2.0.7")
+    (version "2.0.7-1")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "cluster" version))
        (sha256
         (base32
-         "0nf2hnsv5rhw6399b4gk1rj5c8hfc6ajfnkh3qbwfx3cz4asrg45"))))
+         "1grxbifbc4nwig25dmjgkympnbzb4al0w6k1c0ibdhpk1h4l20di"))))
     (build-system r-build-system)
     (inputs
      `(("gfortran" ,gfortran)))

From 6fa9cf1abb99f8b71ae7a38fdd0b09736c700a57 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Sat, 21 Apr 2018 08:28:11 +0200
Subject: [PATCH 008/275] gnu: r-nlme: Update to 3.1-137.

* gnu/packages/statistics.scm (r-nlme): Update to 3.1-137.
---
 gnu/packages/statistics.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index 1e784c9b63..8b2e4f70ff 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -488,14 +488,14 @@ and operations on them using LAPACK and SuiteSparse.")
 (define-public r-nlme
   (package
     (name "r-nlme")
-    (version "3.1-131.1")
+    (version "3.1-137")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "nlme" version))
        (sha256
         (base32
-         "1xafi670a9jzb52kqxkacxfmy0viac3aql5byfq86kgkgla2sg0y"))))
+         "11vyxxc0n36vb8d8g02zr0402ymicvbifwdsqm7gy9iqqnwrn101"))))
     (build-system r-build-system)
     (propagated-inputs
      `(("r-lattice" ,r-lattice)))

From 1aa2ad5b32aec7b76b8731aa2533990158641fc3 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Sat, 21 Apr 2018 08:28:22 +0200
Subject: [PATCH 009/275] gnu: r-survival: Update to 2.42-3.

* gnu/packages/statistics.scm (r-survival): Update to 2.42-3.
---
 gnu/packages/statistics.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index 8b2e4f70ff..fc52b5b38b 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -593,14 +593,14 @@ analysis.")
 (define-public r-survival
   (package
     (name "r-survival")
-    (version "2.41-3")
+    (version "2.42-3")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "survival" version))
        (sha256
         (base32
-         "07cnr0hnki6ybbjll54l4s5lllhk19vni5f8m0mvsfp99ls7qygk"))))
+         "15pasbfzmg2r5bfpsadp9ia4cpybqz6n1kwm7ma02ykzf7bk4xx0"))))
     (build-system r-build-system)
     (propagated-inputs
      `(("r-matrix" ,r-matrix)))

From ff91ed7d56b106711b56ffb94ddfd4cef26894df Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Sat, 21 Apr 2018 08:31:51 +0200
Subject: [PATCH 010/275] gnu: r-rsqlite: Update to 2.1.0.

* gnu/packages/statistics.scm (r-rsqlite): Update to 2.1.0.
---
 gnu/packages/statistics.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index fc52b5b38b..3cad681b2a 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -2694,13 +2694,13 @@ a column in data frame.")
 (define-public r-rsqlite
   (package
     (name "r-rsqlite")
-    (version "2.0")
+    (version "2.1.0")
     (source (origin
               (method url-fetch)
               (uri (cran-uri "RSQLite" version))
               (sha256
                (base32
-                "1xpg1i1jkzkzv44k512k90c2vvl960pl2d4a3spwcha6yclyc3vz"))))
+                "0hknfqcgijdapx1ryy20zy68qmm8wsb1hjx4n4hmkgl552z82q5d"))))
     (properties `((upstream-name . "RSQLite")))
     (build-system r-build-system)
     (propagated-inputs

From 4184649940a5302a7af2375bae8e7b4fa18b6972 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Sat, 21 Apr 2018 08:32:04 +0200
Subject: [PATCH 011/275] gnu: r-xml: Update to .

* gnu/packages/statistics.scm (r-xml): Update to .
---
 gnu/packages/statistics.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index 3cad681b2a..6a2777a10f 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -2766,13 +2766,13 @@ ldap, and also supports cookies, redirects, authentication, etc.")
 (define-public r-xml
   (package
     (name "r-xml")
-    (version "3.98-1.10")
+    (version "3.98-1.11")
     (source (origin
               (method url-fetch)
               (uri (cran-uri "XML" version))
               (sha256
                (base32
-                "1faza9bbllp67lf1yv1sllxc3iv8llz52m9diazhq322iqbh97m1"))))
+                "18izvlg2x9mzr6yb3yf02ghwbyn00frki3av4lpc44r22m4djnsh"))))
     (properties
      `((upstream-name . "XML")))
     (build-system r-build-system)

From 30d76d442ae616cdf1db2544d75ce66a810eac6e Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Sat, 21 Apr 2018 08:32:16 +0200
Subject: [PATCH 012/275] gnu: r-futile-options: Update to 1.0.1.

* gnu/packages/statistics.scm (r-futile-options): Update to 1.0.1.
---
 gnu/packages/statistics.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index 6a2777a10f..a49eb1880b 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -2854,13 +2854,13 @@ safety.")
 (define-public r-futile-options
   (package
     (name "r-futile-options")
-    (version "1.0.0")
+    (version "1.0.1")
     (source (origin
               (method url-fetch)
               (uri (cran-uri "futile.options" version))
               (sha256
                (base32
-                "1hp82h6xqq5cck67h7lpf22n3j7mg3v1mla5y5ivnzrrb7iyr17f"))))
+                "0w15agpi88y3qkv6fl72zy2pzyplzgvnj41a4ixhg64mw1sck73s"))))
     (properties
      `((upstream-name . "futile.options")))
     (build-system r-build-system)

From 75a40e89d938d3da2bc0c9657beb15ad95e4ccbf Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Sat, 21 Apr 2018 08:32:29 +0200
Subject: [PATCH 013/275] gnu: r-lme4: Update to 1.1-17.

* gnu/packages/statistics.scm (r-lme4): Update to 1.1-17.
---
 gnu/packages/statistics.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index a49eb1880b..a76f1cbfc7 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -5071,14 +5071,14 @@ algorithms.")
 (define-public r-lme4
   (package
     (name "r-lme4")
-    (version "1.1-16")
+    (version "1.1-17")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "lme4" version))
        (sha256
         (base32
-         "0p5x9ki4dq8058mc7k9wdnlh60z1xa3wk2nmf71wl7w59m4szh92"))))
+         "0czwdy1s8h3slaw73pz0h8qmqczf5135fz6i46i2dv1ql2pbq49x"))))
     (build-system r-build-system)
     (native-inputs
      `(("r-rcpp" ,r-rcpp)

From 4fe0efddfe81a73f7193059b7a590c526cc3bb53 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Sat, 21 Apr 2018 08:32:50 +0200
Subject: [PATCH 014/275] gnu: r-htmlwidgets: Update to 1.2.

* gnu/packages/web.scm (r-htmlwidgets): Update to 1.2.
---
 gnu/packages/web.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 050e1a1229..05e119e71d 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -3893,13 +3893,13 @@ directory.")
 (define-public r-htmlwidgets
   (package
     (name "r-htmlwidgets")
-    (version "1.0")
+    (version "1.2")
     (source (origin
               (method url-fetch)
               (uri (cran-uri "htmlwidgets" version))
               (sha256
                (base32
-                "09lkmzh35l1420sg0dyh4vgyishqx3g8xmgs2y9z7lbi09xgwwwr"))))
+                "04c4d0mfcy3dkdlbxnaccpdgxvyxfdwfmmh5djim6v9hyg0j2z8s"))))
     (build-system r-build-system)
     (propagated-inputs
      `(("r-htmltools" ,r-htmltools)

From 61c868e1f5ae6857c40af5056bf9f639da1b1610 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Sat, 21 Apr 2018 08:33:03 +0200
Subject: [PATCH 015/275] gnu: r-shinydashboard: Update to 0.7.0.

* gnu/packages/web.scm (r-shinydashboard): Update to 0.7.0.
---
 gnu/packages/web.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 05e119e71d..2b5085600b 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -5434,13 +5434,13 @@ responsive, and powerful applications with minimal effort.")
 (define-public r-shinydashboard
   (package
     (name "r-shinydashboard")
-    (version "0.6.1")
+    (version "0.7.0")
     (source (origin
               (method url-fetch)
               (uri (cran-uri "shinydashboard" version))
               (sha256
                (base32
-                "14zi7g5wrngy6lwi9xpvaid7727m6rfdijbb89al9likfhjqzqqy"))))
+                "10yqcqqcxgfqwkmscqwvvgr710im583qsqnsqkfpisjvkqp10yqb"))))
     (build-system r-build-system)
     ;; The directory inst/AdminLTE/ contains a minified JavaScript file.
     ;; Regenerate it from the included sources.

From 2bcf5fd337983ddb5cd4f10fb040f8491df72903 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Sat, 21 Apr 2018 08:33:17 +0200
Subject: [PATCH 016/275] gnu: r-subplex: Update to 1.5-4.

* gnu/packages/maths.scm (r-subplex): Update to 1.5-4.
---
 gnu/packages/maths.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index f4ebd886be..353aa41167 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -3830,14 +3830,14 @@ analysed.")
 (define-public r-subplex
   (package
     (name "r-subplex")
-    (version "1.5-2")
+    (version "1.5-4")
     (source
     (origin
       (method url-fetch)
       (uri (cran-uri "subplex" version))
       (sha256
        (base32
-        "1v9xrnkapnq7v1jbhlg32ignklzf2vn8rqpayc8pzk8wvz53r33g"))))
+        "10cbgbx1bgsax5z7gz6716g360xpq4mvq19cf4qqrxv02mmwz57z"))))
     (build-system r-build-system)
     (native-inputs
      `(("gfortran" ,gfortran)))

From 8cf7b28ffef6ef59c8733f5e186e65967a83af3d Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Sat, 21 Apr 2018 08:33:33 +0200
Subject: [PATCH 017/275] gnu: r-igraph: Update to 1.2.1.

* gnu/packages/graph.scm (r-igraph): Update to 1.2.1.
[inputs]: Add glpk and zlib.
[propagated-inputs]: Remove r-irlba.
---
 gnu/packages/graph.scm | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/graph.scm b/gnu/packages/graph.scm
index 74fbe9e84e..a9ee949855 100644
--- a/gnu/packages/graph.scm
+++ b/gnu/packages/graph.scm
@@ -98,23 +98,24 @@ more.")
 (define-public r-igraph
   (package
     (name "r-igraph")
-    (version "1.1.2")
+    (version "1.2.1")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "igraph" version))
        (sha256
         (base32
-         "1v26wyk52snh8z6m5p7yqwcd9dbqifhm57j112i9x53ppi0npcc9"))))
+         "1hcr6b1lz030lgay1bz8y8sxaf2j93ds8n8gsqr6qhssz141hd2m"))))
     (build-system r-build-system)
     (native-inputs
      `(("gfortran" ,gfortran)))
     (inputs
      `(("gmp" ,gmp)
-       ("libxml2" ,libxml2)))
+       ("glpk" ,glpk)
+       ("libxml2" ,libxml2)
+       ("zlib" ,zlib)))
     (propagated-inputs
-     `(("r-irlba" ,r-irlba)
-       ("r-magrittr" ,r-magrittr)
+     `(("r-magrittr" ,r-magrittr)
        ("r-matrix" ,r-matrix)
        ("r-pkgconfig" ,r-pkgconfig)))
     (home-page "http://igraph.org")

From 5895f238d746dfaebb4e80c25c8e954dc681a302 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Sat, 21 Apr 2018 08:34:06 +0200
Subject: [PATCH 018/275] gnu: r-maps: Update to 3.3.0.

* gnu/packages/geo.scm (r-maps): Update to 3.3.0.
---
 gnu/packages/geo.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index 9c7c071db0..46389de779 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -499,14 +499,14 @@ development.")
 (define-public r-maps
   (package
    (name "r-maps")
-   (version "3.2.0")
+   (version "3.3.0")
    (source
      (origin
        (method url-fetch)
        (uri (cran-uri "maps" version))
        (sha256
         (base32
-         "0577f3b5d3a7djl7r0miy9mzr6xq6jb32p8nyrma7m2azasbwyj3"))))
+         "05i2ppl5z4p8rawgqmy3z4ia05fcblpq1vvrmrkgkkpdlhczx6hr"))))
    (build-system r-build-system)
    (home-page "https://cran.r-project.org/web/packages/maps")
    (synopsis "Draw geographical maps")

From 2ef5ab87491cda162f2198a56b1fe450141ce42c Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Sat, 21 Apr 2018 08:34:15 +0200
Subject: [PATCH 019/275] gnu: r-mapproj: Update to 1.2.6.

* gnu/packages/geo.scm (r-mapproj): Update to 1.2.6.
---
 gnu/packages/geo.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index 46389de779..0ec3d6e756 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -518,14 +518,14 @@ Projection code and larger maps are in separate packages ('mapproj' and
 (define-public r-mapproj
   (package
    (name "r-mapproj")
-   (version "1.2-5")
+   (version "1.2.6")
    (source
      (origin
        (method url-fetch)
        (uri (cran-uri "mapproj" version))
        (sha256
         (base32
-         "0rjz37r4rizk2c6jaf54f0kfb60dqv6b262cnhiwjl55d4x6l0pk"))))
+         "1rggww8cbwv0vzlj5afzhbsbngg4bzj5znbkz7wmxsbshfbsm9b2"))))
    (build-system r-build-system)
    (propagated-inputs `(("r-maps" ,r-maps)))
    (home-page "https://cran.r-project.org/web/packages/mapproj")

From 3db5d04cccc4b0a05e51ba5bd369b0530a82bc61 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Sat, 21 Apr 2018 08:34:43 +0200
Subject: [PATCH 020/275] gnu: r-vegan: Update to 2.5-1.

* gnu/packages/bioinformatics.scm (r-vegan): Update to 2.5-1.
[propagated-inputs]: Add r-knitr.
---
 gnu/packages/bioinformatics.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 0e9e6b13fd..6cfe251d15 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -6083,19 +6083,20 @@ information as possible.")
 (define-public r-vegan
   (package
     (name "r-vegan")
-    (version "2.4-6")
+    (version "2.5-1")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "vegan" version))
        (sha256
         (base32
-         "175mqr42mmxy98gpf3rky8alnkw3w1k90ggdw3cispl36841p76w"))))
+         "0pynr02d1xngda6c3va8fc4nxpgfkawhzcnz1ws4dnarp9b1w90r"))))
     (build-system r-build-system)
     (native-inputs
      `(("gfortran" ,gfortran)))
     (propagated-inputs
      `(("r-cluster" ,r-cluster)
+       ("r-knitr" ,r-knitr)
        ("r-lattice" ,r-lattice)
        ("r-mass" ,r-mass)
        ("r-mgcv" ,r-mgcv)

From 4207770218f2041c34e0061bb21bdf081fb76ec0 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Sat, 21 Apr 2018 08:34:55 +0200
Subject: [PATCH 021/275] gnu: r-dexseq: Update to 1.24.4.

* gnu/packages/bioinformatics.scm (r-dexseq): Update to 1.24.4.
---
 gnu/packages/bioinformatics.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 6cfe251d15..460fbc473f 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -6252,14 +6252,14 @@ distribution.")
 (define-public r-dexseq
   (package
     (name "r-dexseq")
-    (version "1.24.3")
+    (version "1.24.4")
     (source
      (origin
        (method url-fetch)
        (uri (bioconductor-uri "DEXSeq" version))
        (sha256
         (base32
-         "0xip73hlbr3zry9d7ly9vvvsbb3xjcmfa09lr9fdy528dwjrf084"))))
+         "1a80yv742fx5c7qav7imsdybphf0d5bixsqyf8w5zng7fk8j16d5"))))
     (properties `((upstream-name . "DEXSeq")))
     (build-system r-build-system)
     (propagated-inputs

From 0bd5c7b859cef32defedc04181bbe7bd8c4f7c70 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Sat, 21 Apr 2018 08:35:04 +0200
Subject: [PATCH 022/275] gnu: r-genomicalignments: Update to 1.14.2.

* gnu/packages/bioinformatics.scm (r-genomicalignments): Update to 1.14.2.
---
 gnu/packages/bioinformatics.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 460fbc473f..21a2400ba2 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -7590,13 +7590,13 @@ samples.")
 (define-public r-genomicalignments
   (package
     (name "r-genomicalignments")
-    (version "1.14.1")
+    (version "1.14.2")
     (source (origin
               (method url-fetch)
               (uri (bioconductor-uri "GenomicAlignments" version))
               (sha256
                (base32
-                "033p6fw46sn7w2yyn14nb9qcnkf30cl0nv6zh014ixflm3iifz39"))))
+                "1659nj1xps7vliy5955i51x6hvrf16n1z0dfh10mmpaaswn2d2mv"))))
     (properties
      `((upstream-name . "GenomicAlignments")))
     (build-system r-build-system)

From fc6d3e26064bbdc1edce8797f0b08820406b5692 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Sat, 21 Apr 2018 08:35:20 +0200
Subject: [PATCH 023/275] gnu: r-ggbio: Update to 1.26.1.

* gnu/packages/bioinformatics.scm (r-ggbio): Update to 1.26.1.
---
 gnu/packages/bioinformatics.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 21a2400ba2..00c2ec37da 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -10171,14 +10171,14 @@ effort and encourages consistency.")
 (define-public r-ggbio
   (package
     (name "r-ggbio")
-    (version "1.26.0")
+    (version "1.26.1")
     (source
      (origin
        (method url-fetch)
        (uri (bioconductor-uri "ggbio" version))
        (sha256
         (base32
-         "1bqxfqy0hff87ax92z4lfbjz01ndrz7x8pzm6dlkdmi52p30krm9"))))
+         "1xlmlngn27iwnr21s9di4059kav1a7c1sajx08wja8yn8f7j06hp"))))
     (build-system r-build-system)
     (propagated-inputs
      `(("r-annotationdbi" ,r-annotationdbi)

From 8defca1d943fd5ed2164e07e307f54e2888276eb Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Sat, 21 Apr 2018 08:35:31 +0200
Subject: [PATCH 024/275] gnu: r-gprofiler: Update to 0.6.6.

* gnu/packages/bioinformatics.scm (r-gprofiler): Update to 0.6.6.
---
 gnu/packages/bioinformatics.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 00c2ec37da..46a8eb2a67 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -10223,14 +10223,14 @@ interval to data view, mismatch pileup, and several splicing summaries.")
 (define-public r-gprofiler
   (package
     (name "r-gprofiler")
-    (version "0.6.4")
+    (version "0.6.6")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "gProfileR" version))
        (sha256
         (base32
-         "1cka02zbz1rbppm782qpxk1xn9qxbrv2gp5rgf970j906hxm2y0b"))))
+         "1n6cj12j102b4x9vhyl4dljp1i0r43p23cnhqbx4als2xfxdlqgi"))))
     (properties `((upstream-name . "gProfileR")))
     (build-system r-build-system)
     (propagated-inputs

From fb1dcfac46f075fe217b88c0b66f916588fd8886 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Sat, 21 Apr 2018 08:35:42 +0200
Subject: [PATCH 025/275] gnu: r-erma: Update to 0.10.1.

* gnu/packages/bioinformatics.scm (r-erma): Update to 0.10.1.
---
 gnu/packages/bioinformatics.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 46a8eb2a67..7ee5a5f486 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -10341,14 +10341,14 @@ several related annotation packages.")
 (define-public r-erma
   (package
     (name "r-erma")
-    (version "0.10.0")
+    (version "0.10.1")
     (source
      (origin
        (method url-fetch)
        (uri (bioconductor-uri "erma" version))
        (sha256
         (base32
-         "0gcfs9g8vvdv5vmq9b21kd8sq5mizjj49nfzd4in9zvp4b9v7x1g"))))
+         "1fi8nc6fbd7i4p9i9hli31xplmdpsxqcdrb8v3nf8fx9klllbdav"))))
     (build-system r-build-system)
     (propagated-inputs
      `(("r-annotationdbi" ,r-annotationdbi)

From b6d7deca559c4476b4c3165b096a4386ddf66db6 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Sat, 21 Apr 2018 08:35:55 +0200
Subject: [PATCH 026/275] gnu: r-ldblock: Update to 1.8.1.

* gnu/packages/bioinformatics.scm (r-ldblock): Update to 1.8.1.
---
 gnu/packages/bioinformatics.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 7ee5a5f486..1b1b95442f 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -10377,14 +10377,14 @@ by Ernst and Kellis.")
 (define-public r-ldblock
   (package
     (name "r-ldblock")
-    (version "1.8.0")
+    (version "1.8.1")
     (source
      (origin
        (method url-fetch)
        (uri (bioconductor-uri "ldblock" version))
        (sha256
         (base32
-         "18nfsixh6d2wfrb9laqsgly5w1frzihhak683k0p8fdf51h4aqba"))))
+         "1q8dz8wcq1r7kr635s9q21g36sxkdybk8khhpa4p57qv8r0gppl0"))))
     (build-system r-build-system)
     (propagated-inputs
      `(("r-erma" ,r-erma)

From 80323c3c13c90003bf2c8081c0bf9d95fa44e18a Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Sat, 21 Apr 2018 08:36:05 +0200
Subject: [PATCH 027/275] gnu: r-hitc: Update to 1.22.1.

* gnu/packages/bioinformatics.scm (r-hitc): Update to 1.22.1.
---
 gnu/packages/bioinformatics.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 1b1b95442f..57b3fd5d8e 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -10594,13 +10594,13 @@ assays such as Hi-C.")
 (define-public r-hitc
   (package
     (name "r-hitc")
-    (version "1.22.0")
+    (version "1.22.1")
     (source (origin
               (method url-fetch)
               (uri (bioconductor-uri "HiTC" version))
               (sha256
                (base32
-                "0288xa1jy6nzvz2ha07csmp6dirjw5r7p9vy69q2wsbyzr02ymkp"))))
+                "0da1jw9my2n2gihs31zyn14wwr23d8v2vij39ll7rm6fma3ydfbl"))))
     (properties `((upstream-name . "HiTC")))
     (build-system r-build-system)
     (propagated-inputs

From aeca5f0c5bc074c2a77082f7685e578f170db09c Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Sat, 21 Apr 2018 08:36:15 +0200
Subject: [PATCH 028/275] gnu: r-scran: Update to 1.6.9.

* gnu/packages/bioinformatics.scm (r-scran): Update to 1.6.9.
---
 gnu/packages/bioinformatics.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 57b3fd5d8e..a000d9d1fc 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -10842,14 +10842,14 @@ quality control.")
 (define-public r-scran
   (package
     (name "r-scran")
-    (version "1.6.8")
+    (version "1.6.9")
     (source
      (origin
        (method url-fetch)
        (uri (bioconductor-uri "scran" version))
        (sha256
         (base32
-         "07wniyrh2fhhkz28v0bfgpvpi1hkkn2cvhacrvvvck142j79944x"))))
+         "0cs64cnf0xjcgmawr210y99j3gxs6aqgh8081n9827kkqnx2y5dm"))))
     (build-system r-build-system)
     (propagated-inputs
      `(("r-beachmat" ,r-beachmat)

From 41e8bd77f3645c61adba01b1291aa370fdb88362 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Sat, 21 Apr 2018 08:37:51 +0200
Subject: [PATCH 029/275] gnu: r-selectr: Update to 0.4-1.

* gnu/packages/cran.scm (r-selectr): Update to 0.4-1.
[propagated-inputs]: Add r-r6.
---
 gnu/packages/cran.scm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 0ac35a909b..1bd995df94 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -113,16 +113,18 @@ scraping tasks, inspired by libraries like @code{BeautifulSoup}.")
 (define-public r-selectr
   (package
     (name "r-selectr")
-    (version "0.3-2")
+    (version "0.4-1")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "selectr" version))
        (sha256
         (base32
-         "0kdrj64rqg4z6hg92y9r2h602a2i73r5rnlpg23ys33d5d32n8jy"))))
+         "1jp27rxks4w29l47k42869hp8hnkzq2rnvsqbr44wd19fqb2zm4b"))))
     (build-system r-build-system)
-    (propagated-inputs `(("r-stringr" ,r-stringr)))
+    (propagated-inputs
+     `(("r-stringr" ,r-stringr)
+       ("r-r6" ,r-r6)))
     (home-page "https://sjp.co.nz/projects/selectr/")
     (synopsis "Translate CSS selectors to XPath expressions")
     (description

From 1d612cefc83c4c330ed825d5837a9958e0105c75 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Sat, 21 Apr 2018 08:38:13 +0200
Subject: [PATCH 030/275] gnu: r-readxl: Update to 1.1.0.

* gnu/packages/cran.scm (r-readxl): Update to 1.1.0.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 1bd995df94..9dde1e8981 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -192,14 +192,14 @@ that.")
 (define-public r-readxl
   (package
     (name "r-readxl")
-    (version "1.0.0")
+    (version "1.1.0")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "readxl" version))
        (sha256
         (base32
-         "1bf7gxw9r11m4llyymplxiaa4gzgyj4bwmwad5in756pzq3jzmpv"))))
+         "05ii8knrg4jji6h7bv6bfpn279b6x52yrskdx5rv7b0hcpy22gdn"))))
     (build-system r-build-system)
     (propagated-inputs
      `(("r-cellranger" ,r-cellranger)

From 0e947804464c9ff729b79f93664572181653b54b Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Sat, 21 Apr 2018 08:38:28 +0200
Subject: [PATCH 031/275] gnu: r-plogr: Update to 0.2.0.

* gnu/packages/cran.scm (r-plogr): Update to 0.2.0.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 9dde1e8981..39d4add137 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -406,14 +406,14 @@ initiative to bring PASSTEC 2000 functionalities to R.")
 (define-public r-plogr
   (package
     (name "r-plogr")
-    (version "0.1-1")
+    (version "0.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "plogr" version))
        (sha256
         (base32
-         "13zliqlbkl8b04k9ga0sx5jsh7k867gracgl84l2a9kcqy9mqx92"))))
+         "0a8dhzlna79ggyhfr0nncgh15a9n6r0dsz664pz0ah323wpblqqf"))))
     (build-system r-build-system)
     (home-page "https://github.com/krlmlr/plogr")
     (synopsis "R bindings for the plog C++ logging library")

From dfd7299957ea42853e12e7bdfef2e1a792341c92 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Sat, 21 Apr 2018 08:38:39 +0200
Subject: [PATCH 032/275] gnu: r-rcpp: Update to 0.12.16.

* gnu/packages/cran.scm (r-rcpp): Update to 0.12.16.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 39d4add137..8316f3958b 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -426,13 +426,13 @@ error stream.")
 (define-public r-rcpp
   (package
     (name "r-rcpp")
-    (version "0.12.15")
+    (version "0.12.16")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "Rcpp" version))
        (sha256
-        (base32 "1pnv6sl4vdn69ygmgrb1b3gsigfdcfb56wnzikic93l8gkvdsvxv"))))
+        (base32 "1rm8hcy72p1jvxikvmkwg20pjqmvmfvqb45lfghmddp2adp67qfl"))))
     (build-system r-build-system)
     (home-page "http://www.rcpp.org")
     (synopsis "Seamless R and C++ integration")

From eb575e95fbb3ed3296a6fb5fd90e252a495be11b Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Sat, 21 Apr 2018 08:38:50 +0200
Subject: [PATCH 033/275] gnu: r-bindr: Update to 0.1.1.

* gnu/packages/cran.scm (r-bindr): Update to 0.1.1.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 8316f3958b..cda56e66b2 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -450,14 +450,14 @@ and Francois (2011, JSS), and the book by Eddelbuettel (2013, Springer); see
 (define-public r-bindr
   (package
     (name "r-bindr")
-    (version "0.1")
+    (version "0.1.1")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "bindr" version))
        (sha256
         (base32
-         "0d95ifm0x4mrfzi20xf39f5pzd7rfzqsld0vjqf6xzga5rhnd8fc"))))
+         "1l05fpk2yql3jka321c0bdgx6mqq9pvfrg2844lbjfpbgjkmqy3w"))))
     (build-system r-build-system)
     (home-page "https://github.com/krlmlr/bindr")
     (synopsis "Parametrized active bindings")

From 9f17c0560f0d6be11d0bb4cc751ac1c08e54f88c Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Sat, 21 Apr 2018 08:38:59 +0200
Subject: [PATCH 034/275] gnu: r-bindrcpp: Update to 0.2.2.

* gnu/packages/cran.scm (r-bindrcpp): Update to 0.2.2.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index cda56e66b2..75eaad82ae 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -469,14 +469,14 @@ where the bound function accepts additional arguments.")
 (define-public r-bindrcpp
   (package
     (name "r-bindrcpp")
-    (version "0.2")
+    (version "0.2.2")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "bindrcpp" version))
        (sha256
         (base32
-         "0l1l22zl87wiyl79m3gj2vlxmkhxvrkl4alhyy08h55q7hqs3vyh"))))
+         "0rz4ibjdjsxl99ff3ha79z7cnjmilx4rx58fk9kk7ld9xc4hf4s8"))))
     (build-system r-build-system)
     (propagated-inputs
      `(("r-bindr" ,r-bindr)

From cf0da489ff7e650fcfa501e4c7a60aa6ae4bd0dd Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Sat, 21 Apr 2018 08:39:10 +0200
Subject: [PATCH 035/275] gnu: r-globaloptions: Update to 0.0.13.

* gnu/packages/cran.scm (r-globaloptions): Update to 0.0.13.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 75eaad82ae..38d0167a4d 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -556,14 +556,14 @@ ellipses, circles, cylinders, arrows, ...")
 (define-public r-globaloptions
   (package
     (name "r-globaloptions")
-    (version "0.0.12")
+    (version "0.0.13")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "GlobalOptions" version))
        (sha256
         (base32
-         "1abpc03cfvazbwj2sx6qgngs5pgpzysvxkana20hyvb4n7ws77f0"))))
+         "04jvha0mafslqz5nr99xjylg9n2x31gj9v4mgyg7qcmfwpqyw3ch"))))
     (properties `((upstream-name . "GlobalOptions")))
     (build-system r-build-system)
     (home-page "https://github.com/jokergoo/GlobalOptions")

From 9ebfdcd36c75cfa96cd5ff4fad10ec17e4103c6d Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Sat, 21 Apr 2018 08:39:25 +0200
Subject: [PATCH 036/275] gnu: r-rmpi: Update to 0.6-7.

* gnu/packages/cran.scm (r-rmpi): Update to 0.6-7.
[native-inputs]: Add pkg-config.
---
 gnu/packages/cran.scm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 38d0167a4d..8b22b55d06 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -938,19 +938,21 @@ matrices.")
 (define-public r-rmpi
   (package
     (name "r-rmpi")
-    (version "0.6-6")
+    (version "0.6-7")
     (source (origin
               (method url-fetch)
               (uri (cran-uri "Rmpi" version))
               (sha256
                (base32
-                "0fm6z049aaq2c9xagm8n64d9560hg9d8hyb0m359fii672nhkz6q"))))
+                "1b62gs7w1xqadqd7ir41jnxlcf14gcqfxd0915kn9ckdlsdrh0sw"))))
     (properties `((upstream-name . "Rmpi")))
     (build-system r-build-system)
     (arguments
      `(#:configure-flags '("--configure-args=\"--with-Rmpi-type=OPENMPI\"")))
     (inputs
      `(("openmpi" ,openmpi)))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
     (home-page "http://www.stats.uwo.ca/faculty/yu/Rmpi")
     (synopsis "R interface to message-passing interface (MPI)")
     (description

From 3e00e3a88514879a7800380c4d83792a4ceaffda Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Sat, 21 Apr 2018 08:40:16 +0200
Subject: [PATCH 037/275] gnu: r-lava: Update to 1.6.1.

* gnu/packages/cran.scm (r-lava): Update to 1.6.1.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 8b22b55d06..b94c85f820 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -1368,14 +1368,14 @@ available in a vignette.")
 (define-public r-lava
   (package
     (name "r-lava")
-    (version "1.6")
+    (version "1.6.1")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "lava" version))
        (sha256
         (base32
-         "02xf5d968raz9gnq5ywy04wz29xpdyca1hm79vbbg1mcxvzdl1dz"))))
+         "11k9npmzp3nk2qx0h1dwwfc37j4ddd9y54bppxby0ffnb8qlpw1k"))))
     (build-system r-build-system)
     (propagated-inputs
      `(("r-numderiv" ,r-numderiv)

From 9ee81a36aa483fac61e32d8d5acba60295b2d5e0 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Sat, 21 Apr 2018 08:40:38 +0200
Subject: [PATCH 038/275] gnu: r-prodlim: Update to 2018.04.18.

* gnu/packages/cran.scm (r-prodlim): Update to 2018.04.18.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index b94c85f820..7fb52e0691 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -1415,14 +1415,14 @@ regression using Kernel Ridge Regression.")
 (define-public r-prodlim
   (package
     (name "r-prodlim")
-    (version "1.6.1")
+    (version "2018.04.18")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "prodlim" version))
        (sha256
         (base32
-         "0m51rkivx1zr6whdqwj66jpnkmp4385m06kkha3dp8qqf4jna9iz"))))
+         "1aslq87sqwikh8chxc378r38146y7kv79zz0kcq3j93ivx7va8jb"))))
     (build-system r-build-system)
     (propagated-inputs
      `(("r-kernsmooth" ,r-kernsmooth)

From 2ab8cbcd1f5c6fd5141809583fc29ef8b8ec9b57 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Sat, 21 Apr 2018 08:41:02 +0200
Subject: [PATCH 039/275] gnu: r-stringdist: Update to 0.9.4.7.

* gnu/packages/cran.scm (r-stringdist): Update to 0.9.4.7.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 7fb52e0691..1d55781596 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -1765,14 +1765,14 @@ color labels, layout, etc.")
 (define-public r-stringdist
   (package
     (name "r-stringdist")
-    (version "0.9.4.6")
+    (version "0.9.4.7")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "stringdist" version))
        (sha256
         (base32
-         "0j5b7hr53nr9xq44famkpwzi4khix93ffani5pwldqkf8bpdvhci"))))
+         "1qg80wmcrpkba9njvgjdg15bgw7ddks40kkfh5x61as9lhchy4i4"))))
     (build-system r-build-system)
     (home-page "https://github.com/markvanderloo/stringdist")
     (synopsis "Approximate string matching and string distance functions")

From 1d310349bbf195a15fe9862407af5c17a631bdd6 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Sat, 21 Apr 2018 08:41:24 +0200
Subject: [PATCH 040/275] gnu: r-xts: Update to 0.10-2.

* gnu/packages/cran.scm (r-xts): Update to 0.10-2.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 1d55781596..b01b4041e0 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -1990,14 +1990,14 @@ training models for classification or ranking.")
 (define-public r-xts
   (package
     (name "r-xts")
-    (version "0.10-1")
+    (version "0.10-2")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "xts" version))
        (sha256
         (base32
-         "1j9ddh9v9081zrqlpylsk13fldilhjdyaw6r6pa726fhgnrsf8a2"))))
+         "1i11fczks4lh8rpi6xbm9bm7f3jpcp6xw03kv178g3n3361qhmc1"))))
     (build-system r-build-system)
     (propagated-inputs `(("r-zoo" ,r-zoo)))
     (native-inputs `(("gfortran" ,gfortran)))

From cb9f404187ef5fb8c2ba0e472e226ca4cc4d7b9d Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Sat, 21 Apr 2018 08:41:42 +0200
Subject: [PATCH 041/275] gnu: r-tinytex: Update to 0.5.

* gnu/packages/cran.scm (r-tinytex): Update to 0.5.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index b01b4041e0..5da02ecb13 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -2559,14 +2559,14 @@ terminals.")
 (define-public r-tinytex
   (package
     (name "r-tinytex")
-    (version "0.3")
+    (version "0.5")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "tinytex" version))
        (sha256
         (base32
-         "0mhxlr4709mca9jshnah5i7yjyy6k12s933619p7p9c8nbqj39cn"))))
+         "1pg4jfyvandjwz3lmr38pbqi9d045iwkk3xklhsfhhxq6aviq9p7"))))
     (build-system r-build-system)
     (home-page "https://github.com/yihui/tinytex")
     (synopsis "Helper functions for TeX Live and compiling LaTeX documents")

From d087f47d61f9a8dd3513aa622e678f6435bef24f Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Sat, 21 Apr 2018 08:42:06 +0200
Subject: [PATCH 042/275] gnu: r-quantmod: Update to 0.4-13.

* gnu/packages/cran.scm (r-quantmod): Update to 0.4-13.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 5da02ecb13..78e48df686 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -2779,14 +2779,14 @@ Cambridge University Press, 1993.")
 (define-public r-quantmod
   (package
     (name "r-quantmod")
-    (version "0.4-12")
+    (version "0.4-13")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "quantmod" version))
        (sha256
         (base32
-         "0y7gh0k1s10vdsfch8777avbhf99mc9crikvx7ahqrw0j631vmhq"))))
+         "16aldg96z7amp5mr90nb8127yy04gxsihfr26km5p3cx3j117yv0"))))
     (build-system r-build-system)
     (propagated-inputs
      `(("r-curl" ,r-curl)

From 7bd6ecd7fa6c698a75b828a194a90560fdfe31a7 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Sat, 21 Apr 2018 08:42:20 +0200
Subject: [PATCH 043/275] gnu: r-psych: Update to 1.8.3.3.

* gnu/packages/cran.scm (r-psych): Update to 1.8.3.3.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 78e48df686..789a81cd57 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -3327,14 +3327,14 @@ It also includes interpolation functions.")
 (define-public r-psych
   (package
     (name "r-psych")
-    (version "1.7.8")
+    (version "1.8.3.3")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "psych" version))
        (sha256
         (base32
-         "0daismb8pdk392vdy304hqx0m3jx62gx3a0hygjygc125rhfla7k"))))
+         "1zhp8j81nkzd65168zdw9ylypb9n07ajan21x0wqcn8jdbg970sg"))))
     (build-system r-build-system)
     (propagated-inputs
      `(("r-foreign" ,r-foreign)

From 2acc0e5f8f8b1147e4a35adf0566d4324521b290 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Sat, 21 Apr 2018 08:42:36 +0200
Subject: [PATCH 044/275] gnu: r-gsubfn: Update to 0.7.

* gnu/packages/cran.scm (r-gsubfn): Update to 0.7.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 789a81cd57..bddeb66660 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -3358,14 +3358,14 @@ serve as a useful front end for structural equation modeling.")
 (define-public r-gsubfn
   (package
     (name "r-gsubfn")
-    (version "0.6-6")
+    (version "0.7")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "gsubfn" version))
        (sha256
         (base32
-         "196x4c3ihf4q3i0v7b1xa6jm8jjld2rsx00qz03n90wfnjdx5idv"))))
+         "00j6b8b6xsx6v370h220x233rpk6asca78165y3d48jpwvwisdc9"))))
     (build-system r-build-system)
     (propagated-inputs `(("r-proto" ,r-proto)))
     (home-page "http://gsubfn.googlecode.com")

From f1c7a2428044136b41a2cc6cd344c4c7c20d5a22 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Sat, 21 Apr 2018 09:21:49 +0200
Subject: [PATCH 045/275] gnu: Add r-cardata.

* gnu/packages/statistics.scm (r-cardata): New variable.
---
 gnu/packages/statistics.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index a76f1cbfc7..55b087cd78 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -5123,6 +5123,26 @@ modification of F-tests for linear mixed effects models and a parametric
 bootstrap test for generalized linear mixed models.")
     (license license:gpl2+)))
 
+(define-public r-cardata
+  (package
+    (name "r-cardata")
+    (version "3.0-1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (cran-uri "carData" version))
+       (sha256
+        (base32
+         "193pdwgw6gk19v7swk1kwphg3vqdmpsgi555g9nyz93sa39j7r8j"))))
+    (properties `((upstream-name . "carData")))
+    (build-system r-build-system)
+    (home-page "https://r-forge.r-project.org/projects/car/")
+    (synopsis "Data Sets for the book Companion to Applied Regression")
+    (description
+     "This package provides datasets to accompany J. Fox and S. Weisberg, An R
+Companion to Applied Regression, Third Edition, Sage.")
+    (license license:gpl2+)))
+
 (define-public r-car
   (package
     (name "r-car")

From ce4e81cb868307ab9ab84c4b07596a57ad0e57c8 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Sat, 21 Apr 2018 09:22:14 +0200
Subject: [PATCH 046/275] gnu: Add r-magic.

* gnu/packages/cran.scm (r-magic): New variable.
---
 gnu/packages/cran.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index bddeb66660..2f4b2e5367 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -1480,6 +1480,29 @@ Engineering and Computational Finance\" and for managing chronological and
 calendar objects.")
     (license license:gpl2+)))
 
+(define-public r-magic
+  (package
+    (name "r-magic")
+    (version "1.5-8")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (cran-uri "magic" version))
+       (sha256
+        (base32
+         "083cgpp3v03li0h8597b3g21pd9lkbmn9pyssblnhc800mpc52vz"))))
+    (build-system r-build-system)
+    (propagated-inputs
+     `(("r-abind" ,r-abind)))
+    (home-page "https://github.com/RobinHankin/magic.git")
+    (synopsis "Create and investigate magic squares")
+    (description
+     "This package provides a collection of efficient, vectorized algorithms
+for the creation and investigation of magic squares and hypercubes, including
+a variety of functions for the manipulation and analysis of arbitrarily
+dimensioned arrays.")
+    (license license:gpl2)))
+
 (define-public r-ddalpha
   (package
     (name "r-ddalpha")

From 9604429d7bf76ce39b600dde120bc4b372af54a4 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Sat, 21 Apr 2018 09:22:24 +0200
Subject: [PATCH 047/275] gnu: Add r-geometry.

* gnu/packages/cran.scm (r-geometry): New variable.
---
 gnu/packages/cran.scm | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 2f4b2e5367..1c540a3c46 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -1503,6 +1503,36 @@ a variety of functions for the manipulation and analysis of arbitrarily
 dimensioned arrays.")
     (license license:gpl2)))
 
+(define-public r-geometry
+  (package
+    (name "r-geometry")
+    (version "0.3-6")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (cran-uri "geometry" version))
+       (sha256
+        (base32
+         "0s09vi0rr0smys3an83mz6fk41bplxyz4myrbiinf4qpk6n33qib"))))
+    (build-system r-build-system)
+    (propagated-inputs `(("r-magic" ,r-magic)))
+    (home-page "http://geometry.r-forge.r-project.org/")
+    (synopsis "Mesh generation and surface tesselation")
+    (description
+     "This package makes the qhull library available in R, in a similar manner
+as in Octave.  Qhull computes convex hulls, Delaunay triangulations, halfspace
+intersections about a point, Voronoi diagrams, furthest-site Delaunay
+triangulations, and furthest-site Voronoi diagrams.  It runs in 2-d, 3-d, 4-d,
+and higher dimensions.  It implements the Quickhull algorithm for computing
+the convex hull.  Qhull does not support constrained Delaunay triangulations,
+or mesh generation of non-convex objects, but the package does include some R
+functions that allow for this.  Currently the package only gives access to
+Delaunay triangulation and convex hull computation.")
+    ;; The Qhull sources are included and are distributed under a custom
+    ;; non-copyleft license.  The R sources are released under GPL version 2.
+    (license (list license:gpl2
+                   (license:non-copyleft "http://www.qhull.org/COPYING.txt")))))
+
 (define-public r-ddalpha
   (package
     (name "r-ddalpha")

From 4f18423358f4dc9ee2bab9b4617fe42c3c71ef5e Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Sat, 21 Apr 2018 09:22:34 +0200
Subject: [PATCH 048/275] gnu: r-ddalpha: Update to 1.3.2.

* gnu/packages/cran.scm (r-ddalpha): Update to 1.3.2.
[propagated-inputs]: Add r-geometry.
---
 gnu/packages/cran.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 1c540a3c46..0ee8693896 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -1536,18 +1536,19 @@ Delaunay triangulation and convex hull computation.")
 (define-public r-ddalpha
   (package
     (name "r-ddalpha")
-    (version "1.3.1.1")
+    (version "1.3.2")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "ddalpha" version))
        (sha256
         (base32
-         "13w8ir5rd80rka4mq343zd4wn93vfw870lzfqrd3cxgwb1bwcw7y"))))
+         "1i2zcz20zy9xd42kdz09njbkq07mj2pp6f07z6dnwi5hrmvhbh9r"))))
     (build-system r-build-system)
     (propagated-inputs
      `(("r-bh" ,r-bh)
        ("r-class" ,r-class)
+       ("r-geometry" ,r-geometry)
        ("r-mass" ,r-mass)
        ("r-rcpp" ,r-rcpp)
        ("r-robustbase" ,r-robustbase)

From 0edd2fd18622e4263f36164eac082be31581105c Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Sat, 21 Apr 2018 09:23:06 +0200
Subject: [PATCH 049/275] gnu: r-ggridges: Update to 0.5.0.

* gnu/packages/cran.scm (r-ggridges): Update to 0.5.0.
[propagated-inputs]: Add r-withr.
---
 gnu/packages/cran.scm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 0ee8693896..8d15415b1a 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -2230,19 +2230,20 @@ plotting.  a three dimensional point cloud.")
 (define-public r-ggridges
   (package
     (name "r-ggridges")
-    (version "0.4.1")
+    (version "0.5.0")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "ggridges" version))
        (sha256
         (base32
-         "0kfa3icqdalqdg1klxjrhfl7if35d3wnsiyl86bprw5dyqyh3lh3"))))
+         "1znvsbl3px8dddpjgdrygnpz4s685wizi0jnjvx2hrz58i0chjqj"))))
     (build-system r-build-system)
     (propagated-inputs
      `(("r-ggplot2" ,r-ggplot2)
        ("r-plyr" ,r-plyr)
-       ("r-scales" ,r-scales)))
+       ("r-scales" ,r-scales)
+       ("r-withr" ,r-withr)))
     (home-page "https://github.com/clauswilke/ggridges")
     (synopsis "Ridgeline plots in ggplot2")
     (description

From 4b1f7a3e905026a55492d4db177a988dd1f2ca21 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Sat, 21 Apr 2018 09:23:31 +0200
Subject: [PATCH 050/275] gnu: Add r-openxlsx.

* gnu/packages/cran.scm (r-openxlsx): New variable.
---
 gnu/packages/cran.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 8d15415b1a..94f7489efc 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -3763,3 +3763,26 @@ selection, and goodness-of-fit.  Cross-validation tools are also available for
 measuring the accuracy of ABC estimates, and to calculate the
 misclassification probabilities of different models.")
     (license license:gpl3+)))
+
+(define-public r-openxlsx
+  (package
+    (name "r-openxlsx")
+    (version "4.0.17")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (cran-uri "openxlsx" version))
+       (sha256
+        (base32
+         "1mq4lasp12kc30sxcsmz9gskd114l8s7z7wd6svv2nm8qllrhsqi"))))
+    (build-system r-build-system)
+    (propagated-inputs `(("r-rcpp" ,r-rcpp)))
+    (home-page "https://github.com/awalker89/openxlsx")
+    (synopsis "Read, write and edit XLSX files")
+    (description
+     "This package simplifies the creation of Excel @code{.xlsx} files by
+providing a high level interface to writing, styling and editing worksheets.
+Through the use of Rcpp, read/write times are comparable to the @code{xlsx}
+and @code{XLConnect} packages with the added benefit of removing the
+dependency on Java.")
+    (license license:gpl3)))

From c9920f25976bd947311023056f58c716a65da6c9 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Sat, 21 Apr 2018 09:23:42 +0200
Subject: [PATCH 051/275] gnu: Add r-rio.

* gnu/packages/cran.scm (r-rio): New variable.
---
 gnu/packages/cran.scm | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 94f7489efc..0b54ed0c0f 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -3786,3 +3786,37 @@ Through the use of Rcpp, read/write times are comparable to the @code{xlsx}
 and @code{XLConnect} packages with the added benefit of removing the
 dependency on Java.")
     (license license:gpl3)))
+
+(define-public r-rio
+  (package
+    (name "r-rio")
+    (version "0.5.10")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (cran-uri "rio" version))
+       (sha256
+        (base32
+         "158xg3vj0glk3fslwi6fywwmfym2b6kn3fdmjligdfy5lf68khix"))))
+    (build-system r-build-system)
+    (propagated-inputs
+     `(("r-curl" ,r-curl)
+       ("r-data-table" ,r-data-table)
+       ("r-foreign" ,r-foreign)
+       ("r-haven" ,r-haven)
+       ("r-openxlsx" ,r-openxlsx)
+       ("r-readxl" ,r-readxl)
+       ("r-tibble" ,r-tibble)))
+    (home-page "https://github.com/leeper/rio")
+    (synopsis "Swiss-army knife for data I/O")
+    (description
+     "This package provides streamlined data import and export infrastructure
+by making assumptions that the user is probably willing to make: @code{import}
+and @code{export} determine the data structure from the file extension,
+reasonable defaults are used for data import and export (e.g.,
+@code{stringsAsFactors=FALSE}), web-based import is natively
+supported (including from SSL/HTTPS), compressed files can be read directly
+without explicit decompression, and fast import packages are used where
+appropriate.  An additional convenience function, @code{convert}, provides a
+simple method for converting between file types.")
+    (license license:gpl2)))

From 08dac3d9e674b1412edd000f55caaef45ae0ab4c Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Sat, 21 Apr 2018 09:23:50 +0200
Subject: [PATCH 052/275] gnu: Add r-maptools.

* gnu/packages/cran.scm (r-maptools): New variable.
---
 gnu/packages/cran.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 0b54ed0c0f..12f848974c 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -3820,3 +3820,31 @@ without explicit decompression, and fast import packages are used where
 appropriate.  An additional convenience function, @code{convert}, provides a
 simple method for converting between file types.")
     (license license:gpl2)))
+
+(define-public r-maptools
+  (package
+    (name "r-maptools")
+    (version "0.9-2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (cran-uri "maptools" version))
+       (sha256
+        (base32
+         "075lmb3b62171cw2dg8fv1vwmvfzg39r1ji7jwb8s5k9dz88ry1v"))))
+    (build-system r-build-system)
+    (propagated-inputs
+     `(("r-foreign" ,r-foreign)
+       ("r-lattice" ,r-lattice)
+       ("r-sp" ,r-sp)))
+    (home-page "http://r-forge.r-project.org/projects/maptools/")
+    (synopsis "Tools for reading and handling spatial objects")
+    (description
+     "This package provides a set of tools for manipulating and reading
+geographic data, in particular ESRI Shapefiles.  It includes binary access to
+GSHHG shoreline files.  The package also provides interface wrappers for
+exchanging spatial objects with other R packages.")
+    ;; The C source files from shapelib are released under the Expat license.
+    ;; The R code is released under GPL version 2 or later.
+    (license (list license:gpl2+
+                   license:expat))))

From 500224cb4cce6872f595ef0652991bfb606f12c3 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Sat, 21 Apr 2018 09:24:06 +0200
Subject: [PATCH 053/275] gnu: r-car: Update to 3.0-0.

* gnu/packages/statistics.scm (r-car): Update to 3.0-0.
[propagated-inputs]: Add r-abind, r-cardata, r-lme4, r-maptools, r-nlme, and
r-rio.
---
 gnu/packages/statistics.scm | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index 55b087cd78..891274f0e2 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -5146,21 +5146,27 @@ Companion to Applied Regression, Third Edition, Sage.")
 (define-public r-car
   (package
     (name "r-car")
-    (version "2.1-6")
+    (version "3.0-0")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "car" version))
        (sha256
         (base32
-         "14l4d9j87xnb0bz2wgqqbxnlnbcdfb5vx2fw6kdxj91kyrk6lhnj"))))
+         "1ks2jaav8lbxhzw56vpbnysjk3pvpmqh6avd574k0bha1226k81h"))))
     (build-system r-build-system)
     (propagated-inputs
-     `(("r-mass" ,r-mass)
+     `(("r-abind" ,r-abind)
+       ("r-cardata" ,r-cardata)
+       ("r-lme4" ,r-lme4)
+       ("r-maptools" ,r-maptools)
+       ("r-mass" ,r-mass)
        ("r-mgcv" ,r-mgcv)
+       ("r-nlme" ,r-nlme)
        ("r-nnet" ,r-nnet)
        ("r-pbkrtest" ,r-pbkrtest)
-       ("r-quantreg" ,r-quantreg)))
+       ("r-quantreg" ,r-quantreg)
+       ("r-rio" ,r-rio)))
     (home-page "https://r-forge.r-project.org/projects/car/")
     (synopsis "Companion to applied regression")
     (description

From 284179bbb395000957be4b891be5cf1f76d88c39 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Sat, 21 Apr 2018 09:27:09 +0200
Subject: [PATCH 054/275] gnu: Add r-later.

* gnu/packages/cran.scm (r-later): New variable.
---
 gnu/packages/cran.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 12f848974c..cc81815bdb 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -3848,3 +3848,26 @@ exchanging spatial objects with other R packages.")
     ;; The R code is released under GPL version 2 or later.
     (license (list license:gpl2+
                    license:expat))))
+
+(define-public r-later
+  (package
+    (name "r-later")
+    (version "0.7.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (cran-uri "later" version))
+       (sha256
+        (base32
+         "0z9jymmclkq9zcg1fd8p6gsnm5z1sn3n9pfz3bs03qjrkbizgrvz"))))
+    (build-system r-build-system)
+    (propagated-inputs
+     `(("r-bh" ,r-bh)
+       ("r-rcpp" ,r-rcpp)
+       ("r-rlang" ,r-rlang)))
+    (home-page "https://github.com/r-lib/later")
+    (synopsis "Utilities for delaying function execution")
+    (description
+     "This package provides tools to execute arbitrary R or C functions some
+time after the current time, after the R execution stack has emptied.")
+    (license license:gpl2+)))

From d9d66ba963bafaac706044b23407794167f69eab Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Sat, 21 Apr 2018 09:27:17 +0200
Subject: [PATCH 055/275] gnu: Add r-promises.

* gnu/packages/cran.scm (r-promises): New variable.
---
 gnu/packages/cran.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index cc81815bdb..88be6b3d44 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -3871,3 +3871,31 @@ exchanging spatial objects with other R packages.")
      "This package provides tools to execute arbitrary R or C functions some
 time after the current time, after the R execution stack has emptied.")
     (license license:gpl2+)))
+
+(define-public r-promises
+  (package
+    (name "r-promises")
+    (version "1.0.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (cran-uri "promises" version))
+       (sha256
+        (base32
+         "0n2mlv6bvfb4yhgcml696l9vkbw21pz0smqylivr606z99rwgny2"))))
+    (build-system r-build-system)
+    (propagated-inputs
+     `(("r-later" ,r-later)
+       ("r-magrittr" ,r-magrittr)
+       ("r-r6" ,r-r6)
+       ("r-rcpp" ,r-rcpp)
+       ("r-rlang" ,r-rlang)))
+    (home-page "https://rstudio.github.io/promises")
+    (synopsis "Abstractions for promise-based asynchronous programming")
+    (description
+     "This package provides fundamental abstractions for doing asynchronous
+programming in R using promises.  Asynchronous programming is useful for
+allowing a single R process to orchestrate multiple tasks in the background
+while also attending to something else.  Semantics are similar to JavaScript
+promises, but with a syntax that is idiomatic R.")
+    (license license:expat)))

From 5150a52d036e4853a64a05b1ef37b89fb6b8757f Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Sat, 21 Apr 2018 09:27:35 +0200
Subject: [PATCH 056/275] gnu: r-httpuv: Update to 1.4.0.

* gnu/packages/web.scm (r-httpuv): Update to 1.4.0.
[propagated-inputs]: Add r-bh, r-later, and r-promises.
---
 gnu/packages/web.scm | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 2b5085600b..f6e9c9c8fe 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -3785,15 +3785,19 @@ CDF, Atom 0.3, and Atom 1.0 feeds.")
 (define-public r-httpuv
   (package
     (name "r-httpuv")
-    (version "1.3.6.2")
+    (version "1.4.0")
     (source (origin
               (method url-fetch)
               (uri (cran-uri "httpuv" version))
               (sha256
                (base32
-                "0h3hkw575b211bxma23inbq1565wkhiapgasd539h219apqs534f"))))
+                "076blaj0vzwfgx212lvgscczmiy9n13izdshrm6xb9vpcmklm95m"))))
     (build-system r-build-system)
     (native-inputs `(("r-rcpp" ,r-rcpp)))
+    (propagated-inputs
+     `(("r-bh" ,r-bh)
+       ("r-later" ,r-later)
+       ("r-promises" ,r-promises)))
     (home-page "https://github.com/rstudio/httpuv")
     (synopsis "HTTP and WebSocket server library for R")
     (description

From 6ab97ed56a08a161dce54b790aa7d134546bcbd1 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Sat, 21 Apr 2018 22:24:40 +0200
Subject: [PATCH 057/275] gnu: r-lambda-r: Update to 1.2.2.

* gnu/packages/statistics.scm (r-lambda-r): Update to 1.2.2.
[arguments]: Remove.
[native-inputs]: Remove.
[propagated-inputs]: Add r-formatr.
---
 gnu/packages/statistics.scm | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index 891274f0e2..f3fa7271a7 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -2820,28 +2820,17 @@ plotted and compared with the asymptotic curve.")
 (define-public r-lambda-r
   (package
     (name "r-lambda-r")
-    (version "1.2")
+    (version "1.2.2")
     (source (origin
               (method url-fetch)
               (uri (cran-uri "lambda.r" version))
               (sha256
                (base32
-                "0vql32np716dpd0kjn7s7wgawd02ysgp2a5il4kb19nlw661ii3x"))))
+                "05cfaq9dbgdnmmj3d6ggmsw300qgiw8k7f6h6k0ylv63cf3v6pkq"))))
     (properties `((upstream-name . "lambda.r")))
     (build-system r-build-system)
-    (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-after 'check 'delete-test-log
-           ;; The test report contains time stamps and is not important for
-           ;; the installed package.
-           (lambda* (#:key outputs #:allow-other-keys)
-             (delete-file-recursively
-              (string-append (assoc-ref outputs "out")
-                             "/site-library/lambda.r/unitTests"))
-             #t)))))
-    (native-inputs
-     `(("r-runit" ,r-runit)))
+    (propagated-inputs
+     `(("r-formatr" ,r-formatr)))
     (home-page "https://cran.r-project.org/web/packages/lambda.r")
     (synopsis "Functional programming extension for R")
     (description

From 3cf9ae2f758d130fe4e9dcb3535bd5b8b4bb0377 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Sat, 21 Apr 2018 22:25:43 +0200
Subject: [PATCH 058/275] gnu: Add r-dosnow.

* gnu/packages/cran.scm (r-dosnow): New variable.
---
 gnu/packages/cran.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 88be6b3d44..ec1f2e10f4 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -3899,3 +3899,27 @@ allowing a single R process to orchestrate multiple tasks in the background
 while also attending to something else.  Semantics are similar to JavaScript
 promises, but with a syntax that is idiomatic R.")
     (license license:expat)))
+
+(define-public r-dosnow
+  (package
+    (name "r-dosnow")
+    (version "1.0.16")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (cran-uri "doSNOW" version))
+       (sha256
+        (base32
+         "13ir4a8252h4yvp5ir9xnwack1kn58i4ny6sf2qdc12zspn3850n"))))
+    (properties `((upstream-name . "doSNOW")))
+    (build-system r-build-system)
+    (propagated-inputs
+     `(("r-foreach" ,r-foreach)
+       ("r-iterators" ,r-iterators)
+       ("r-snow" ,r-snow)))
+    (home-page "https://cran.r-project.org/web/packages/doSNOW")
+    (synopsis "Foreach parallel adaptor for the snow package")
+    (description
+     "This package provides a parallel backend for the @code{%dopar%} function
+using the @code{snow} package.")
+    (license license:gpl2)))

From c36ce4763550deb521009ed3c5e83911e4e85005 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Sat, 21 Apr 2018 22:25:50 +0200
Subject: [PATCH 059/275] gnu: r-seurat: Update to 2.3.0.

* gnu/packages/bioinformatics.scm (r-seurat): Update to 2.3.0.
[propagated-inputs]: Add r-cluster, r-dosnow, r-fitdistrplus, r-foreach,
r-lmtest, r-png, and r-rann.
---
 gnu/packages/bioinformatics.scm | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index a000d9d1fc..a060139755 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -9638,13 +9638,13 @@ and irregular enzymatic cleavages, mass measurement accuracy, etc.")
 (define-public r-seurat
   (package
     (name "r-seurat")
-    (version "2.2.1")
+    (version "2.3.0")
     (source (origin
               (method url-fetch)
               (uri (cran-uri "Seurat" version))
               (sha256
                (base32
-                "1sr82nf38hq07avrfn8vlrzjq7dfm4pcr8l1nh6mnglcql2bk9z2"))
+                "0kp3lw1s896zkjd6x2wp8qcg7wnm5b40g8vihps13f1m7j4nx7r0"))
               ;; Delete pre-built jar.
               (snippet
                '(begin (delete-file "inst/java/ModularityOptimizer.jar")
@@ -9674,11 +9674,15 @@ Main-Class: ModularityOptimizer\n")))
     (propagated-inputs
      `(("r-ape" ,r-ape)
        ("r-caret" ,r-caret)
+       ("r-cluster" ,r-cluster)
        ("r-cowplot" ,r-cowplot)
        ("r-diffusionmap" ,r-diffusionmap)
+       ("r-dosnow" ,r-dosnow)
        ("r-dplyr" ,r-dplyr)
        ("r-dtw" ,r-dtw)
+       ("r-fitdistrplus" ,r-fitdistrplus)
        ("r-fnn" ,r-fnn)
+       ("r-foreach" ,r-foreach)
        ("r-fpc" ,r-fpc)
        ("r-gdata" ,r-gdata)
        ("r-ggplot2" ,r-ggplot2)
@@ -9690,13 +9694,16 @@ Main-Class: ModularityOptimizer\n")))
        ("r-igraph" ,r-igraph)
        ("r-irlba" ,r-irlba)
        ("r-lars" ,r-lars)
+       ("r-lmtest" ,r-lmtest)
        ("r-mass" ,r-mass)
        ("r-matrix" ,r-matrix)
        ("r-metap" ,r-metap)
        ("r-mixtools" ,r-mixtools)
        ("r-pbapply" ,r-pbapply)
        ("r-plotly" ,r-plotly)
+       ("r-png" ,r-png)
        ("r-ranger" ,r-ranger)
+       ("r-rann" ,r-rann)
        ("r-rcolorbrewer" ,r-rcolorbrewer)
        ("r-rcpp" ,r-rcpp)
        ("r-rcppeigen" ,r-rcppeigen)

From 2cf42ec611810e2ff7c3ed42192128e3d6a2478b Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Sat, 21 Apr 2018 23:07:10 +0200
Subject: [PATCH 060/275] gnu: r-httpuv: Update to 1.4.1.

* gnu/packages/web.scm (r-httpuv): Update to 1.4.1.
---
 gnu/packages/web.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index f6e9c9c8fe..2b88e6920d 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -3785,13 +3785,13 @@ CDF, Atom 0.3, and Atom 1.0 feeds.")
 (define-public r-httpuv
   (package
     (name "r-httpuv")
-    (version "1.4.0")
+    (version "1.4.1")
     (source (origin
               (method url-fetch)
               (uri (cran-uri "httpuv" version))
               (sha256
                (base32
-                "076blaj0vzwfgx212lvgscczmiy9n13izdshrm6xb9vpcmklm95m"))))
+                "1pndv0h870ygibk0bmg9ayzkls60jqscrsyk39k29gy2pvm9ha5y"))))
     (build-system r-build-system)
     (native-inputs `(("r-rcpp" ,r-rcpp)))
     (propagated-inputs

From e33498b86835beb6c85376e5763426406afb3e94 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Sun, 22 Apr 2018 09:42:14 +0300
Subject: [PATCH 061/275] gnu: cran.scm: Add missing module.

This is a follow-up to 9ebfdcd36c75cfa96cd5ff4fad10ec17e4103c6d.

* gnu/packages/cran.scm: Import pkg-config.
---
 gnu/packages/cran.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index ec1f2e10f4..9dc075ffb8 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -35,6 +35,7 @@
   #:use-module (gnu packages maths)
   #:use-module (gnu packages mpi)
   #:use-module (gnu packages perl)
+  #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages statistics)
   #:use-module (gnu packages web))
 

From f1104d900978900addad731dfec4e0e6e5765fbe Mon Sep 17 00:00:00 2001
From: Chris Marusich <cmmarusich@gmail.com>
Date: Sat, 16 Dec 2017 00:52:42 -0800
Subject: [PATCH 062/275] services: Add dhcpd-service-type and
 <dhcpd-configuration>.

* doc/guix.texi (Networking Services): Document it.
* gnu/services/networking.scm (dhcpd-service-type): Add it.
(dhcpd-configuration, dhcpd-configuration?): Add it.
(dhcpd-configuration-package): Add it.
(dhcpd-configuration-config-file): Add it.
(dhcpd-configuration-version): Add it.
(dhcpd-configuration-run-directory): Add it.
(dhcpd-configuration-lease-file): Add it.
(dhcpd-configuration-pid-file): Add it.
(dhcpd-configuration-interfaces): Add it.
* gnu/tests/networking.scm (minimal-dhcpd-v4-config-file)
(dhcpd-v4-configuration, %dhcpd-os, run-dhcpd-test, %test-dhcpd): New
variables.
---
 doc/guix.texi               | 45 +++++++++++++++++
 gnu/services/networking.scm | 78 +++++++++++++++++++++++++++++
 gnu/tests/networking.scm    | 97 ++++++++++++++++++++++++++++++++++++-
 3 files changed, 219 insertions(+), 1 deletion(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index 1bf9685542..75886e94b3 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -10694,6 +10694,51 @@ Return a service that runs @var{dhcp}, a Dynamic Host Configuration
 Protocol (DHCP) client, on all the non-loopback network interfaces.
 @end deffn
 
+@deffn {Scheme Procedure} dhcpd-service-type
+This type defines a service that runs a DHCP daemon.  To create a
+service of this type, you must supply a @code{<dhcpd-configuration>}.
+For example:
+
+@example
+(service dhcpd-service-type
+         (dhcpd-configuration
+          (config-file (local-file "my-dhcpd.conf"))
+          (interfaces '("enp0s25"))))
+@end example
+@end deffn
+
+@deftp {Data Type} dhcpd-configuration
+@table @asis
+@item @code{package} (default: @code{isc-dhcp})
+The package that provides the DHCP daemon.  This package is expected to
+provide the daemon at @file{sbin/dhcpd} relative to its output
+directory.  The default package is the
+@uref{http://www.isc.org/products/DHCP, ISC's DHCP server}.
+@item @code{config-file} (default: @code{#f})
+The configuration file to use.  This is required.  It will be passed to
+@code{dhcpd} via its @code{-cf} option.  This may be any ``file-like''
+object (@pxref{G-Expressions, file-like objects}).  See @code{man
+dhcpd.conf} for details on the configuration file syntax.
+@item @code{version} (default: @code{"4"})
+The DHCP version to use.  The ISC DHCP server supports the values ``4'',
+``6'', and ``4o6''.  These correspond to the @code{dhcpd} program
+options @code{-4}, @code{-6}, and @code{-4o6}.  See @code{man dhcpd} for
+details.
+@item @code{run-directory} (default: @code{"/run/dhcpd"})
+The run directory to use.  At service activation time, this directory
+will be created if it does not exist.
+@item @code{pid-file} (default: @code{"/run/dhcpd/dhcpd.pid"})
+The PID file to use.  This corresponds to the @code{-pf} option of
+@code{dhcpd}.  See @code{man dhcpd} for details.
+@item @code{interfaces} (default: @code{'()})
+The names of the network interfaces on which dhcpd should listen for
+broadcasts.  If this list is not empty, then its elements (which must be
+strings) will be appended to the @code{dhcpd} invocation when starting
+the daemon.  It may not be necessary to explicitly specify any
+interfaces here; see @code{man dhcpd} for details.
+@end table
+@end deftp
+
 @defvr {Scheme Variable} static-networking-service-type
 This is the type for statically-configured network interfaces.
 @c TODO Document <static-networking> data structures.
diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm
index 6ac440fd26..be34f32395 100644
--- a/gnu/services/networking.scm
+++ b/gnu/services/networking.scm
@@ -57,6 +57,18 @@
             static-networking-service
             static-networking-service-type
             dhcp-client-service
+
+            dhcpd-service-type
+            dhcpd-configuration
+            dhcpd-configuration?
+            dhcpd-configuration-package
+            dhcpd-configuration-config-file
+            dhcpd-configuration-version
+            dhcpd-configuration-run-directory
+            dhcpd-configuration-lease-file
+            dhcpd-configuration-pid-file
+            dhcpd-configuration-interfaces
+
             %ntp-servers
 
             ntp-configuration
@@ -341,6 +353,72 @@ to handle."
 Protocol (DHCP) client, on all the non-loopback network interfaces."
   (service dhcp-client-service-type dhcp))
 
+(define-record-type* <dhcpd-configuration>
+  dhcpd-configuration make-dhcpd-configuration
+  dhcpd-configuration?
+  (package   dhcpd-configuration-package ;<package>
+             (default isc-dhcp))
+  (config-file   dhcpd-configuration-config-file ;file-like
+                 (default #f))
+  (version dhcpd-configuration-version ;"4", "6", or "4o6"
+              (default "6"))
+  (run-directory dhcpd-configuration-run-directory
+                 (default "/run/dhcpd"))
+  (lease-file dhcpd-configuration-lease-file
+              (default "/var/db/dhcpd.leases"))
+  (pid-file dhcpd-configuration-pid-file
+            (default "/run/dhcpd/dhcpd.pid"))
+  ;; list of strings, e.g. (list "enp0s25")
+  (interfaces dhcpd-configuration-interfaces
+              (default '())))
+
+(define dhcpd-shepherd-service
+  (match-lambda
+    (($ <dhcpd-configuration> package config-file version run-directory
+                              lease-file pid-file interfaces)
+     (unless config-file
+       (error "Must supply a config-file"))
+     (list (shepherd-service
+            ;; Allow users to easily run multiple versions simultaneously.
+            (provision (list (string->symbol
+                              (string-append "dhcpv" version "-daemon"))))
+            (documentation (string-append "Run the DHCPv" version " daemon"))
+            (requirement '(networking))
+            (start #~(make-forkexec-constructor
+                      '(#$(file-append package "/sbin/dhcpd")
+                        #$(string-append "-" version)
+                        "-lf" #$lease-file
+                        "-pf" #$pid-file
+                        "-cf" #$config-file
+                        #$@interfaces)
+                      #:pid-file #$pid-file))
+            (stop #~(make-kill-destructor)))))))
+
+(define dhcpd-activation
+  (match-lambda
+    (($ <dhcpd-configuration> package config-file version run-directory
+                              lease-file pid-file interfaces)
+     (with-imported-modules '((guix build utils))
+       #~(begin
+           (unless (file-exists? #$run-directory)
+             (mkdir #$run-directory))
+           ;; According to the DHCP manual (man dhcpd.leases), the lease
+           ;; database must be present for dhcpd to start successfully.
+           (unless (file-exists? #$lease-file)
+             (with-output-to-file #$lease-file
+               (lambda _ (display ""))))
+           ;; Validate the config.
+           (invoke
+            #$(file-append package "/sbin/dhcpd") "-t" "-cf"
+            #$config-file))))))
+
+(define dhcpd-service-type
+  (service-type
+   (name 'dhcpd)
+   (extensions
+    (list (service-extension shepherd-root-service-type dhcpd-shepherd-service)
+          (service-extension activation-service-type dhcpd-activation)))))
+
 (define %ntp-servers
   ;; Default set of NTP servers. These URLs are managed by the NTP Pool project.
   ;; Within Guix, Leo Famulari <leo@famulari.name> is the administrative contact
diff --git a/gnu/tests/networking.scm b/gnu/tests/networking.scm
index d7d9166fa7..171c636e5f 100644
--- a/gnu/tests/networking.scm
+++ b/gnu/tests/networking.scm
@@ -29,7 +29,7 @@
   #:use-module (gnu packages bash)
   #:use-module (gnu packages networking)
   #:use-module (gnu services shepherd)
-  #:export (%test-inetd %test-openvswitch))
+  #:export (%test-inetd %test-openvswitch %test-dhcpd))
 
 (define %inetd-os
   ;; Operating system with 2 inetd services.
@@ -243,3 +243,98 @@ port 7, and a dict service on port 2628."
    (name "openvswitch")
    (description "Test a running OpenvSwitch configuration.")
    (value (run-openvswitch-test))))
+
+
+;;;
+;;; DHCP Daemon
+;;;
+
+(define minimal-dhcpd-v4-config-file
+  (plain-file "dhcpd.conf"
+              "\
+default-lease-time 600;
+max-lease-time 7200;
+
+subnet 192.168.1.0 netmask 255.255.255.0 {
+ range 192.168.1.100 192.168.1.200;
+ option routers 192.168.1.1;
+ option domain-name-servers 192.168.1.2, 192.168.1.3;
+ option domain-name \"dummy.domain.name.abc123xyz\";
+}
+"))
+
+(define dhcpd-v4-configuration
+  (dhcpd-configuration
+   (config-file minimal-dhcpd-v4-config-file)
+   (version "4")
+   (interfaces '("eth0"))))
+
+(define %dhcpd-os
+  (simple-operating-system
+   (static-networking-service "eth0" "192.168.1.4"
+                              #:netmask "255.255.255.0"
+                              #:gateway "192.168.1.1"
+                              #:name-servers '("192.168.1.2" "192.168.1.3"))
+   (service dhcpd-service-type dhcpd-v4-configuration)))
+
+(define (run-dhcpd-test)
+  (define os
+    (marionette-operating-system %dhcpd-os
+                                 #:imported-modules '((gnu services herd))))
+
+  (define test
+    (with-imported-modules '((gnu build marionette))
+      #~(begin
+          (use-modules (gnu build marionette)
+                       (ice-9 popen)
+                       (ice-9 rdelim)
+                       (srfi srfi-64))
+
+          (define marionette
+            (make-marionette (list #$(virtual-machine os))))
+
+          (mkdir #$output)
+          (chdir #$output)
+
+          (test-begin "dhcpd")
+
+          (test-assert "pid file exists"
+            (marionette-eval
+             '(file-exists?
+               #$(dhcpd-configuration-pid-file dhcpd-v4-configuration))
+             marionette))
+
+          (test-assert "lease file exists"
+            (marionette-eval
+             '(file-exists?
+               #$(dhcpd-configuration-lease-file dhcpd-v4-configuration))
+             marionette))
+
+          (test-assert "run directory exists"
+            (marionette-eval
+             '(file-exists?
+               #$(dhcpd-configuration-run-directory dhcpd-v4-configuration))
+             marionette))
+
+          (test-assert "dhcpd is alive"
+            (marionette-eval
+             '(begin
+                (use-modules (gnu services herd)
+                             (srfi srfi-1))
+                (live-service-running
+                 (find (lambda (live)
+                         (memq 'dhcpv4-daemon
+                               (live-service-provision live)))
+                       (current-services))))
+             marionette))
+
+          (test-end)
+          (exit (= (test-runner-fail-count (test-runner-current)) 0)))))
+
+  (gexp->derivation "dhcpd-test" test))
+
+(define %test-dhcpd
+  (system-test
+   (name "dhcpd")
+   (description "Test a running DHCP daemon configuration.")
+   (value (run-dhcpd-test))))

From f347c24acc14e080dc2801561edca0d525a90257 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Sun, 22 Apr 2018 12:18:31 +0300
Subject: [PATCH 063/275] gnu: freeimage: Use bundled libjxr.

* gnu/packages/image.scm (freeimage)[source]: Don't delete bundled
LibJXR directory.
[arguments]: Modify make-flags to not include external jxrlib.
[inputs]: Remove libjxr.
* gnu/packages/patches/freeimage-unbundle.patch: Modify to not unbundle
libjxr.
---
 gnu/packages/image.scm                        |  8 +++++---
 gnu/packages/patches/freeimage-unbundle.patch | 18 +++---------------
 2 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index e27b9223dd..7ed18cf1a6 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -724,7 +724,8 @@ supplies a generic doubly-linked list and some string functions.")
                 (for-each
                   (lambda (dir)
                     (delete-file-recursively (string-append "Source/" dir)))
-                  '("LibJPEG" "LibJXR" "LibOpenJPEG" "LibPNG" "LibRawLite"
+                  '("LibJPEG" "LibOpenJPEG" "LibPNG" "LibRawLite"
+                    ;; "LibJXR"
                     "LibWebP" "OpenEXR" "ZLib"))))
             (patches (search-patches "freeimage-unbundle.patch"
                                      "freeimage-CVE-2015-0852.patch"
@@ -760,14 +761,15 @@ supplies a generic doubly-linked list and some string functions.")
             ;; We need '-fpermissive' for Source/FreeImage.h.
             ;; libjxr doesn't have a pkg-config file.
             (string-append "CFLAGS+=-O2 -fPIC -fvisibility=hidden -fpermissive "
-                           "-I" (assoc-ref %build-inputs "libjxr") "/include/jxrlib"))
+                           ;"-I" (assoc-ref %build-inputs "libjxr") "/include/jxrlib"
+                           ))
       #:tests? #f)) ; no check target
    (native-inputs
     `(("pkg-config" ,pkg-config)
       ("unzip" ,unzip)))
    (inputs
     `(("libjpeg" ,libjpeg)
-      ("libjxr" ,libjxr)
+      ;("libjxr" ,libjxr)
       ("libpng" ,libpng)
       ("libraw" ,libraw)
       ("libtiff" ,libtiff)
diff --git a/gnu/packages/patches/freeimage-unbundle.patch b/gnu/packages/patches/freeimage-unbundle.patch
index 2727d9fbda..ca907d3276 100644
--- a/gnu/packages/patches/freeimage-unbundle.patch
+++ b/gnu/packages/patches/freeimage-unbundle.patch
@@ -25,7 +25,7 @@ diff -rupN FreeImage/gensrclist.sh FreeImage-new/gensrclist.sh
  #!/bin/sh
  
 -DIRLIST=". Source Source/Metadata Source/FreeImageToolkit Source/LibJPEG Source/LibPNG Source/LibTIFF4 Source/ZLib Source/LibOpenJPEG Source/OpenEXR Source/OpenEXR/Half Source/OpenEXR/Iex Source/OpenEXR/IlmImf Source/OpenEXR/IlmThread Source/OpenEXR/Imath Source/OpenEXR/IexMath Source/LibRawLite Source/LibRawLite/dcraw Source/LibRawLite/internal Source/LibRawLite/libraw Source/LibRawLite/src Source/LibWebP Source/LibJXR Source/LibJXR/common/include Source/LibJXR/image/sys Source/LibJXR/jxrgluelib"
-+DIRLIST=". Source Source/Metadata Source/FreeImageToolkit"
++DIRLIST=". Source Source/Metadata Source/FreeImageToolkit Source/LibJXR Source/LibJXR/common/include Source/LibJXR/image/sys Source/LibJXR/jxrgluelib"
  
  echo "VER_MAJOR = 3" > Makefile.srcs
  echo "VER_MINOR = 17.0" >> Makefile.srcs
@@ -90,8 +90,8 @@ diff -rupN FreeImage/Makefile.gnu FreeImage-new/Makefile.gnu
 -# LibJXR
 -CXXFLAGS += -D__ANSI__
 -CXXFLAGS += $(INCLUDE)
-+override CFLAGS += $(INCLUDE) -D__ANSI__ -I/usr/include/jxrlib $(shell pkg-config --cflags OpenEXR libopenjp2 libraw libpng libtiff-4 libwebp libwebpmux zlib)
-+override LDFLAGS += -ljpeg -ljpegxr -ljxrglue $(shell pkg-config --libs OpenEXR libopenjp2 libraw libpng libtiff-4 libwebp libwebpmux zlib)
++override CFLAGS += $(INCLUDE) -D__ANSI__ $(shell pkg-config --cflags OpenEXR libopenjp2 libraw libpng libtiff-4 libwebp libwebpmux zlib)
++override LDFLAGS += -ljpeg $(shell pkg-config --libs OpenEXR libopenjp2 libraw libpng libtiff-4 libwebp libwebpmux zlib)
  
  ifeq ($(shell sh -c 'uname -m 2>/dev/null || echo not'),x86_64)
 -	CFLAGS += -fPIC
@@ -215,18 +215,6 @@ diff -rupN FreeImage/Source/FreeImage/PluginJPEG.cpp FreeImage-new/Source/FreeIm
  }
  
  #include "FreeImage.h"
-diff -rupN FreeImage/Source/FreeImage/PluginJXR.cpp FreeImage-new/Source/FreeImage/PluginJXR.cpp
---- FreeImage/Source/FreeImage/PluginJXR.cpp	2015-03-02 02:07:08.000000000 +0100
-+++ FreeImage-new/Source/FreeImage/PluginJXR.cpp	2015-09-05 02:13:52.043353343 +0200
-@@ -23,7 +23,7 @@
- #include "Utilities.h"
- #include "../Metadata/FreeImageTag.h"
- 
--#include "../LibJXR/jxrgluelib/JXRGlue.h"
-+#include <JXRGlue.h>
- 
- // ==========================================================
- // Plugin Interface
 diff -rupN FreeImage/Source/FreeImage/PluginPNG.cpp FreeImage-new/Source/FreeImage/PluginPNG.cpp
 --- FreeImage/Source/FreeImage/PluginPNG.cpp	2015-03-10 20:16:12.000000000 +0100
 +++ FreeImage-new/Source/FreeImage/PluginPNG.cpp	2015-09-05 02:13:52.044353363 +0200

From 5c1052039e52949cdff080961c3e3cc95d5cf6a6 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Sun, 22 Apr 2018 15:56:42 +0300
Subject: [PATCH 064/275] gnu: gcompris-qt: Update to 0.90.

* gnu/packages/education.scm (gcompris-qt): Update to 0.90.
[source, home-page]: Use https.
[arguments]: Add 'wrap-executable phase to declare the QT_PLUGIN_PATH
and QML2_IMPORT_PATH without needing propagated inputs.
[native-inputs]: Add qttools.
[inputs]: Remove qt, add qtbase, qtdeclarative, qtgraphicaleffects,
qtmultimedia, qtquickcontrols, qtsensors, qtsvg, qtxmlpatterns.
---
 gnu/packages/education.scm | 43 ++++++++++++++++++++++++++++++--------
 1 file changed, 34 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm
index e8fb1e64d6..58f06c3106 100644
--- a/gnu/packages/education.scm
+++ b/gnu/packages/education.scm
@@ -2,7 +2,7 @@
 ;;; Copyright © 2016 Danny Milosavljevic <dannym@scratchpost.org>
 ;;; Copyright © 2016, 2017 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com>
-;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -107,29 +107,54 @@ of categories with some of the activities available in that category.
 (define-public gcompris-qt
   (package
     (name "gcompris-qt")
-    (version "0.70")
+    (version "0.90")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "http://gcompris.net/download/qt/src/gcompris-qt-"
+               "https://gcompris.net/download/qt/src/gcompris-qt-"
                version ".tar.xz"))
         (sha256
          (base32
-          "01r7i8dmwb2nlfyp0y0mzs8yydmvn5gq7xn1w7g21lysak1mliwa"))))
+          "1i5adxnhig849qxwi3c4v7r84q6agx1zxkd69fh4y7lcmq2qiaza"))))
     (build-system cmake-build-system)
     (arguments
-      ;; Qml_box2d is unmaintained and not actually required for building
-     '(#:configure-flags (list "-DQML_BOX2D_MODULE=disabled")
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'install 'wrap-executable
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             (let ((out (assoc-ref outputs "out")))
+               (wrap-program (string-append out "/bin/gcompris-qt")
+                 `("QT_PLUGIN_PATH" ":" prefix
+                   ,(map (lambda (label)
+                           (string-append (assoc-ref inputs label)
+                                          "/lib/qt5/plugins"))
+                         '("qtbase" "qtdeclarative" "qtmultimedia" "qtsvg")))
+                 `("QML2_IMPORT_PATH" ":" prefix
+                   ,(map (lambda (label)
+                           (string-append (assoc-ref inputs label)
+                                          "/lib/qt5/qml"))
+                         '("qtdeclarative" "qtgraphicaleffects"
+                           "qtmultimedia" "qtquickcontrols"))))
+               #t))))
+       #:configure-flags (list "-DQML_BOX2D_MODULE=disabled")
        #:tests? #f)) ; no test target
     (native-inputs
      `(("extra-cmake-modules" ,extra-cmake-modules)
        ("gettext" ,gettext-minimal)
-       ("perl" ,perl)))
+       ("perl" ,perl)
+       ("qttools" ,qttools)))
     (inputs
      `(("python-2" ,python-2)
-       ("qt" ,qt))) ; Cannot find qtquick at runtime with modular qt.
-    (home-page "http://gcompris.net/index-en.html")
+       ("qtbase" ,qtbase)
+       ("qtdeclarative" ,qtdeclarative)
+       ("qtgraphicaleffects" ,qtgraphicaleffects)
+       ("qtmultimedia" ,qtmultimedia)
+       ("qtquickcontrols" ,qtquickcontrols)
+       ("qtsensors" ,qtsensors)
+       ("qtsvg" ,qtsvg)
+       ("qtxmlpatterns" ,qtxmlpatterns)))
+    (home-page "https://gcompris.net/index-en.html")
     (synopsis "Educational games for small children")
     (description
      "Gcompris offers a large collection of educational games for small

From 3ae45eb435121b89ba79c9aa0b9bdf21c0b18841 Mon Sep 17 00:00:00 2001
From: Leo Famulari <leo@famulari.name>
Date: Sun, 22 Apr 2018 13:30:16 -0400
Subject: [PATCH 065/275] audacity: Update to 2.2.2.

* gnu/packages/audio.scm (audacity): Update to 2.2.2.
---
 gnu/packages/audio.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 4456540c4d..d468899065 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -284,14 +284,15 @@ engineers, musicians, soundtrack editors and composers.")
 (define-public audacity
   (package
     (name "audacity")
-    (version "2.2.1")
+    (version "2.2.2")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "https://github.com/audacity/audacity/archive"
                            "/Audacity-" version ".tar.gz"))
        (sha256
-        (base32 "1n05r8b4rnf9fas0py0is8cm97s3h65dgvqkk040aym5d1x6wd7z"))
+        (base32
+         "18q7i77ynihx7xp45lz2lv0k0wrh6736pcrivlpwrxjgbvyqx7km"))
        (patches (search-patches "audacity-build-with-system-portaudio.patch"))
        (modules '((guix build utils)))
        (snippet

From 3d7f9cbe75918b8afb0353557cf8f4f1263def1c Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Sun, 22 Apr 2018 22:59:46 +0200
Subject: [PATCH 066/275] gnu: pigx-chipseq: Update to 0.0.15.

* gnu/packages/bioinformatics.scm (pigx-chipseq): Update to 0.0.15.
---
 gnu/packages/bioinformatics.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index a060139755..3e93d94651 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -12822,7 +12822,7 @@ expression report comparing samples in an easily configurable manner.")
 (define-public pigx-chipseq
   (package
     (name "pigx-chipseq")
-    (version "0.0.10")
+    (version "0.0.15")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://github.com/BIMSBbioinfo/pigx_chipseq/"
@@ -12830,7 +12830,7 @@ expression report comparing samples in an easily configurable manner.")
                                   "/pigx_chipseq-" version ".tar.gz"))
               (sha256
                (base32
-                "13w99bkr0w4j28ms0yzpl1x6fkpdqay0vh495q3x20bcilsjwnf1"))))
+                "11v9v3vyda0sv4cl45nki7mm4v4bjfcdq7a70kcvi9h465nq66wg"))))
     (build-system gnu-build-system)
     (arguments
      `(#:tests? #f ; parts of the tests rely on access to the network

From b8a251d76ec2255ce9a80022f4b439689366f73a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Thu, 19 Apr 2018 17:19:02 +0200
Subject: [PATCH 067/275] gnu: libfive: Snippet returns a Boolean.

Reported by Mark H Weaver <mhw@netris.org>.

* gnu/packages/engineering.scm (libfive)[source](snippet): Return #t.
---
 gnu/packages/engineering.scm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index 2f4e8cef52..52d0010693 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -3,7 +3,7 @@
 ;;; Copyright © 2015 Federico Beffa <beffa@fbengineering.ch>
 ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2016 David Thompson <davet@gnu.org>
-;;; Copyright © 2016, 2017 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2016, 2017 Theodoros Foradis <theodoros@foradis.org>
 ;;; Copyright © 2017 Julien Lepiller <julien@lepiller.eu>
 ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
@@ -583,7 +583,9 @@ as well as pick-place files.")
                 (file-name (git-file-name name version))
                 (snippet
                  ;; Remove bundled catch since we provide our own.
-                 '(delete-file "libfive/test/catch.hpp"))))
+                 '(begin
+                    (delete-file "libfive/test/catch.hpp")
+                    #t))))
       (build-system cmake-build-system)
       (arguments
        `(#:test-target "libfive-test"

From 479c0e3f60f54e3c3a02f71efeb49119e20d2a96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sun, 22 Apr 2018 23:14:42 +0200
Subject: [PATCH 068/275] build: Fix possible race condition in 'test-env'.

Reported by Mark H Weaver <mhw@netris.org>.

* build-aux/test-env.in: Add 'guile' invocation before 'guix download'
invocation to make sure 'guix-daemon' is listening.
---
 build-aux/test-env.in | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/build-aux/test-env.in b/build-aux/test-env.in
index 4a422cf607..52082c650f 100644
--- a/build-aux/test-env.in
+++ b/build-aux/test-env.in
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # GNU Guix --- Functional package management for GNU
-# Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org>
+# Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
 #
 # This file is part of GNU Guix.
 #
@@ -118,6 +118,18 @@ then
     bootstrap_directory="@abs_top_builddir@/gnu/packages/bootstrap/@guix_system@"
     if [ -d "$bootstrap_directory" ]
     then
+	# Make sure 'guix-daemon' is listening before invoking 'guix
+	# download'.
+	"@abs_top_builddir@/pre-inst-env" "@GUILE@" -c \
+	     '(use-modules (guix))
+(let loop ((i 10))
+  (catch #t
+    (lambda () (open-connection))
+    (lambda (key . args)
+      (if (zero? i)
+          (apply throw key args)
+          (begin (usleep 500000) (loop (- i 1)))))))'
+
 	for file in "$bootstrap_directory"/guile-*
 	do
 	    "@abs_top_builddir@/pre-inst-env"			\

From c51e592d6c5d68ba6e21c925cfed9ed1fe06ef3d Mon Sep 17 00:00:00 2001
From: Konrad Hinsen <konrad.hinsen@fastmail.net>
Date: Fri, 13 Apr 2018 16:28:09 +0200
Subject: [PATCH 069/275] gnu: Add emacs-elisp-slime-nav.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/emacs.scm (emacs-elisp-slime-nav): New variable.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
 gnu/packages/emacs.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index b2fd069d3a..3ddca5be4a 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -7932,3 +7932,25 @@ name and password.  To skip it press a @key{Return} key.
 You could get a Epkg package list by invoking @code{epkg-list-packages} in
 Emacs.")
       (license license:gpl3+))))
+
+(define-public emacs-elisp-slime-nav
+  (package
+    (name "emacs-elisp-slime-nav")
+    (version "0.9")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://github.com/purcell/elisp-slime-nav/archive/"
+                           version ".tar.gz"))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "1vq7ym1q47p97gxrv45c9gm96d23xbp237vkmakikj6grngxjfb2"))))
+    (build-system emacs-build-system)
+    (home-page "https://github.com/purcell/elisp-slime-nav")
+    (synopsis "Make @code{M-.} and @code{M-,} work for elisp like they do in SLIME")
+    (description
+     "This package provides SLIME's convenient @code{M-.}and @code{M-,} navigation
+in @code{emacs-lisp-mode}, together with an elisp equivalent of
+@code{slime-describe-symbol}.")
+    (license license:gpl3+)))

From 01224157b7714ff5a7931475943f9479d09c62a3 Mon Sep 17 00:00:00 2001
From: Pierre Langlois <pierre.langlois@gmx.com>
Date: Sat, 21 Apr 2018 10:37:20 +0100
Subject: [PATCH 070/275] gnu: Add ocproxy.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/vpn.scm (ocproxy): New variable.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
 gnu/packages/vpn.scm | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm
index 070b695651..6ba3677a90 100644
--- a/gnu/packages/vpn.scm
+++ b/gnu/packages/vpn.scm
@@ -6,6 +6,7 @@
 ;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2017 Julien Lepiller <julien@lepiller.eu>
+;;; Copyright © 2018 Pierre Langlois <pierre.langlois@gmx.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -32,9 +33,11 @@
   #:use-module (gnu packages)
   #:use-module (gnu packages base)
   #:use-module (gnu packages check)
+  #:use-module (gnu packages autotools)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages gnupg)
+  #:use-module (gnu packages libevent)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
@@ -206,6 +209,39 @@ example for writing your own.  For example, @command{vpnc-script-sshd} contains
 the entire VPN in a network namespace accessible only through SSH.")
       (license license:gpl2+))))
 
+(define-public ocproxy
+  (package
+    (name "ocproxy")
+    (version "1.60")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "https://github.com/cernekee/ocproxy/archive/v"
+                    version ".tar.gz"))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1b4rg3xq5jnrp2l14sw0msan8kqhdxmsd7gpw9lkiwvxy13pcdm7"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("autoconf" ,autoconf)
+       ("automake" ,automake)))
+    (inputs
+     `(("libevent" ,libevent)))
+    (arguments
+     '(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'autogen
+           (lambda _ (invoke "sh" "autogen.sh"))))))
+    (home-page "https://github.com/cernekee/ocproxy")
+    (synopsis "OpenConnect proxy")
+    (description
+     "User-level @dfn{SOCKS} and port forwarding proxy for OpenConnect based
+on LwIP.  When using ocproxy, OpenConnect only handles network activity that
+the user specifically asks to proxy, so the @dfn{VPN} interface no longer
+\"hijacks\" all network traffic on the host.")
+    (license license:bsd-3)))
+
 (define-public openconnect
   (package
    (name "openconnect")

From 0ed7498a460af9b0175d3f6919858d0d40d5ccc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= <iyzsong@member.fsf.org>
Date: Sun, 22 Apr 2018 11:08:29 +0800
Subject: [PATCH 071/275] gnu: Add src.

* gnu/packages/version-control.scm (src): New variable.
---
 gnu/packages/version-control.scm | 50 ++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 71ede4f549..b82abaf9ed 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -18,6 +18,7 @@
 ;;; Copyright © 2017, 2018 Marius Bakke <mbakke@fastmail.com>
 ;;; Copyright © 2017 Stefan Reichör <stefan@xsteve.at>
 ;;; Copyright © 2017 Oleg Pykhalov <go.wigust@gmail.com>
+;;; Copyright © 2018 Sou Bunnbu <iyzsong@member.fsf.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1912,3 +1913,52 @@ repository is the centre, directories are branches and files are leaves.
 Contributors to the source code appear and disappear as they contribute to
 specific files and directories.")
     (license license:gpl3+)))
+
+(define-public src
+  (package
+    (name "src")
+    (version "1.18")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "http://www.catb.org/~esr/src/src-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0n0skhvya8w2az45h2gsafxy8m2mvqas64nrgxifcmrzfv0rf26c"))))
+    (build-system gnu-build-system)
+    (arguments
+     '(#:make-flags
+       (list (string-append "prefix=" (assoc-ref %outputs "out")))
+       #:phases
+       (modify-phases %standard-phases
+         (delete 'configure)            ; no 'configure' script
+         (add-after 'install 'wrap-program
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             (let* ((out  (assoc-ref outputs "out"))
+                    (prog (string-append out "/bin/src"))
+                    (rcs  (assoc-ref inputs "rcs")))
+               (wrap-program prog
+                 `("PATH" ":" prefix (,(string-append rcs "/bin"))))
+               #t)))
+         (replace 'check
+           (lambda _
+             (setenv "HOME" (getenv "TMPDIR"))
+             (invoke "git" "config" "--global" "user.name" "guix")
+             (invoke "git" "config" "--global" "user.email" "guix")
+             (invoke "./srctest"))))))
+    (native-inputs
+     ;; For testing.
+     `(("git" ,git)
+       ("perl" ,perl)))
+    (inputs
+     `(("python" ,python-wrapper)
+       ("rcs" ,rcs)))
+    (synopsis "Simple revision control")
+    (home-page "http://www.catb.org/~esr/src/")
+    (description
+     "SRC (or src) is simple revision control, a version-control system for
+single-file projects by solo developers and authors.  It modernizes the
+venerable RCS, hence the anagrammatic acronym.  The design is tuned for use
+cases like all those little scripts in your @file{~/bin} directory, or a
+directory full of HOWTOs.")
+    (license license:bsd-2)))

From de7f03ce0a45cc82da856a11595e9132f78a0605 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= <iyzsong@member.fsf.org>
Date: Sun, 22 Apr 2018 19:30:08 +0800
Subject: [PATCH 072/275] gnu: Add runc.

* gnu/packages/virtualization.scm (runc): New variable.
---
 gnu/packages/virtualization.scm | 61 ++++++++++++++++++++++++++++++++-
 1 file changed, 60 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index 55ace5a56d..59b4c63293 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -8,6 +8,7 @@
 ;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com>
 ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2018 Danny Milosavljevic <dannym@scratchpost.org>
+;;; Copyright © 2018 Sou Bunnbu <iyzsong@member.fsf.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -41,6 +42,7 @@
   #:use-module (gnu packages gl)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gnome)
+  #:use-module (gnu packages golang)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages image)
   #:use-module (gnu packages libusb)
@@ -63,9 +65,11 @@
   #:use-module (gnu packages xdisorg)
   #:use-module (gnu packages xml)
   #:use-module (guix build-system gnu)
+  #:use-module (guix build-system go)
   #:use-module (guix build-system python)
   #:use-module (guix download)
-  #:use-module ((guix licenses) #:select (gpl2 gpl2+ gpl3+ lgpl2.1 lgpl2.1+))
+  #:use-module ((guix licenses) #:select (gpl2 gpl2+ gpl3+ lgpl2.1 lgpl2.1+
+                                               asl2.0))
   #:use-module (guix packages)
   #:use-module (guix utils)
   #:use-module (srfi srfi-1))
@@ -772,3 +776,58 @@ monitor/GPU.")
    ;; This package requires SSE instructions.
    (supported-systems '("i686-linux" "x86_64-linux"))
    (license gpl2+)))
+
+(define-public runc
+  (package
+    (name "runc")
+    (version "1.0.0-rc5")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "https://github.com/opencontainers/runc/releases/"
+                    "download/v" version "/runc.tar.xz"))
+              (sha256
+               (base32
+                "081avdzwnqpk368wbaihlzsypaxpj42d7699h7jgp0fks14x4103"))))
+    (build-system go-build-system)
+    (arguments
+     '(#:import-path "github.com/opencontainers/runc"
+       #:install-source? #f
+       #:tests? #f                      ; FIXME: 20/139 tests fail.
+       #:phases
+       (modify-phases %standard-phases
+         (replace 'unpack
+           (lambda* (#:key source import-path #:allow-other-keys)
+             ;; Unpack the tarball into 'runc' instead of 'runc-1.0.0-rc5'.
+             (let ((dest (string-append "src/" import-path)))
+               (mkdir-p dest)
+               (invoke "tar" "-C" (string-append "src/" import-path)
+                       "--strip-components=1"
+                       "-xvf" source))))
+         (replace 'build
+           (lambda* (#:key import-path #:allow-other-keys)
+             (chdir (string-append "src/" import-path))
+             ;; XXX: requires 'go-md2man'.
+             ;; (invoke "make" "man")
+             (invoke "make")))
+         ;; (replace 'check
+         ;;   (lambda _
+         ;;     (invoke "make" "localunittest")))
+         (replace 'install
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let ((out (assoc-ref outputs "out")))
+              (invoke "make" "install" "install-bash"
+                      (string-append "PREFIX=" out))))))))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (inputs
+     `(("libseccomp" ,libseccomp)))
+    (synopsis "Open container initiative runtime")
+    (home-page "https://www.opencontainers.org/")
+    (description
+     "@command{runc} is a command line client for running applications
+packaged according to the
+@uref{https://github.com/opencontainers/runtime-spec/blob/master/spec.md, Open
+Container Initiative (OCI) format} and is a compliant implementation of the
+Open Container Initiative specification.")
+    (license asl2.0)))

From 5e5d6613a3837586ccab51cd988b44c7df99253b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Mon, 23 Apr 2018 14:33:11 +0200
Subject: [PATCH 073/275] download: Use ungrafted tools in 'url-fetch/tarbomb'
 and 'url-fetch/zipbomb'.

Fixes <https://bugs.gnu.org/31085>.
Reported by Diego Nicola Barbato <dnbarbato@posteo.de>.

* guix/download.scm (url-fetch/tarbomb): Pass #:graft? #f to
'gexp->derivation'.
(url-fetch/zipbomb): Likewise.
---
 guix/download.scm | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/guix/download.scm b/guix/download.scm
index 5044534bf5..7aa6c03665 100644
--- a/guix/download.scm
+++ b/guix/download.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2013, 2014, 2015 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2015 Federico Beffa <beffa@fbengineering.ch>
 ;;; Copyright © 2016 Alex Griffin <a@ajgrf.com>
@@ -509,6 +509,8 @@ own.  This helper makes it easier to deal with \"tar bombs\"."
                                       #:system system
                                       #:guile guile)))
     ;; Take the tar bomb, and simply unpack it as a directory.
+    ;; Use ungrafted tar/gzip so that the resulting tarball doesn't depend on
+    ;; whether grafts are enabled.
     (gexp->derivation (or name file-name)
                       #~(begin
                           (mkdir #$output)
@@ -516,6 +518,7 @@ own.  This helper makes it easier to deal with \"tar bombs\"."
                           (chdir #$output)
                           (zero? (system* (string-append #$tar "/bin/tar")
                                           "xf" #$drv)))
+                      #:graft? #f
                       #:local-build? #t)))
 
 (define* (url-fetch/zipbomb url hash-algo hash
@@ -539,12 +542,15 @@ own.  This helper makes it easier to deal with \"zip bombs\"."
                                       #:system system
                                       #:guile guile)))
     ;; Take the zip bomb, and simply unpack it as a directory.
+    ;; Use ungrafted unzip so that the resulting tarball doesn't depend on
+    ;; whether grafts are enabled.
     (gexp->derivation (or name file-name)
                       #~(begin
                           (mkdir #$output)
                           (chdir #$output)
                           (zero? (system* (string-append #$unzip "/bin/unzip")
                                           #$drv)))
+                      #:graft? #f
                       #:local-build? #t)))
 
 (define* (download-to-store store url #:optional (name (basename url))

From 06079c196c426cd84242c4e55b7227bcc5ecf290 Mon Sep 17 00:00:00 2001
From: Rutger Helling <rhelling@mykolab.com>
Date: Mon, 23 Apr 2018 08:07:10 +0200
Subject: [PATCH 074/275] gnu: ffmpeg: Update to 4.0.

* gnu/packages/video.scm (ffmpeg): Update to 4.0.
* gnu/packages/video.scm (ffmpeg@3.4): New variable.
* gnu/packages/video.scm (ffmpeg-git): Remove variable.
* gnu/packages/video.scm (mpv)[inputs]: Build with ffmpeg instead of ffmpeg-git.
* gnu/packages/gstreamer.scm (gst-libav)[inputs]: Build with ffmpeg@3.4 instead
of ffmpeg.
* gnu/packages/messaging.scm (qtox)[inputs]: Build with ffmpeg@3.4 instead of
ffmpeg.
* gnu/packages/emulators.scm (dolphin-emu)[inputs]: Build with ffmpeg@3.4
instead of ffmpeg.
* gnu/packages/gnunet.scm (libextractor)[inputs]: Build with ffmpeg@3.4 instead
of ffmpeg.
---
 gnu/packages/emulators.scm |  2 +-
 gnu/packages/gnunet.scm    |  2 +-
 gnu/packages/gstreamer.scm |  2 +-
 gnu/packages/messaging.scm |  2 +-
 gnu/packages/video.scm     | 37 +++++++++++++++----------------------
 5 files changed, 19 insertions(+), 26 deletions(-)

diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm
index 79947059bd..75b191c067 100644
--- a/gnu/packages/emulators.scm
+++ b/gnu/packages/emulators.scm
@@ -186,7 +186,7 @@
          ("bluez" ,bluez)
          ("curl" ,curl)
          ("eudev" ,eudev)
-         ("ffmpeg" ,ffmpeg)
+         ("ffmpeg" ,ffmpeg-3.4)
          ("font-wqy-microhei" ,font-wqy-microhei)
          ("freetype" ,freetype)
          ("glew" ,glew)
diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm
index b6062625c0..880fb9f09e 100644
--- a/gnu/packages/gnunet.scm
+++ b/gnu/packages/gnunet.scm
@@ -88,7 +88,7 @@
     `(("exiv2" ,exiv2)
       ("bzip2" ,bzip2)
       ("flac" ,flac)
-      ("ffmpeg" ,ffmpeg)
+      ("ffmpeg" ,ffmpeg-3.4)
       ("file" ,file)                           ;libmagic, for the MIME plug-in
       ("glib" ,glib)
       ("gstreamer" ,gstreamer)
diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm
index 6747c388d5..4eef9e741d 100644
--- a/gnu/packages/gstreamer.scm
+++ b/gnu/packages/gstreamer.scm
@@ -403,7 +403,7 @@ distribution problems in some jurisdictions, e.g. due to patent threats.")
        ("python" ,python)))
     (inputs
      `(("gst-plugins-base" ,gst-plugins-base)
-       ("ffmpeg" ,ffmpeg)
+       ("ffmpeg" ,ffmpeg-3.4)
        ("orc" ,orc)
        ("zlib" ,zlib)))
     (home-page "https://gstreamer.freedesktop.org/")
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 2b3284ba6f..237a315239 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -913,7 +913,7 @@ instant messenger with audio and video chat capabilities.")
                    ,(list (string-append (assoc-ref inputs "qtsvg")
                                          "/lib/qt5/plugins/"))))))))))
     (inputs
-     `(("ffmpeg" ,ffmpeg)
+     `(("ffmpeg" ,ffmpeg-3.4)
        ("filteraudio" ,filteraudio)
        ("glib" ,glib)
        ("gtk+" ,gtk+-2)
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index e959accf6a..1966d44dfd 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -597,14 +597,14 @@ standards (MPEG-2, MPEG-4 ASP/H.263, MPEG-4 AVC/H.264, and VC-1/VMW3).")
 (define-public ffmpeg
   (package
     (name "ffmpeg")
-    (version "3.4.2")
+    (version "4.0")
     (source (origin
              (method url-fetch)
              (uri (string-append "https://ffmpeg.org/releases/ffmpeg-"
                                  version ".tar.xz"))
              (sha256
               (base32
-               "0h6prjn1ijkzzhkyj8mazp0wpx7m0n9ycadjxagf9czqirbyk4ib"))))
+               "0gx4ngnhi5glmxh38603qy5n6vq8bl1cr4sqd1xff95i82pmv57d"))))
     (build-system gnu-build-system)
     (inputs
      `(("fontconfig" ,fontconfig)
@@ -770,6 +770,18 @@ convert and stream audio and video.  It includes the libavcodec
 audio/video codec library.")
     (license license:gpl2+)))
 
+(define-public ffmpeg-3.4
+  (package
+    (inherit ffmpeg)
+    (version "3.4.2")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append "https://ffmpeg.org/releases/ffmpeg-"
+                                 version ".tar.xz"))
+             (sha256
+              (base32
+               "0h6prjn1ijkzzhkyj8mazp0wpx7m0n9ycadjxagf9czqirbyk4ib"))))))
+
 (define-public ffmpeg-2.8
   (package
     (inherit ffmpeg)
@@ -790,25 +802,6 @@ audio/video codec library.")
                     flag))
               ,flags))))))
 
-;; Annoyingly enough, the latest mpv release does not build with the stable
-;; release of ffmpeg. Use a git commit until the situation is fixed.
-(define-public ffmpeg-git
-  (let ((commit "3f887440677328c9cfed97ad81d14051ffa32aae")
-        (revision "1"))
-    (package
-     (inherit ffmpeg)
-     (name "ffmpeg-git")
-     (version (string-append "3.4-" revision "." (string-take commit 9)))
-     (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/FFmpeg/FFmpeg.git")
-                    (commit commit)))
-              (file-name (string-append name "-" version "-checkout"))
-              (sha256
-               (base32
-                "1b7n3g4m2rbvrwsgbfl8wl91z42g1ld42clwxs8qpl9ny5rwz6sq")))))))
-
 (define-public vlc
   (package
     (name "vlc")
@@ -1032,7 +1025,7 @@ SVCD, DVD, 3ivx, DivX 3/4/5, WMV and H.264 movies.")
     (inputs
      `(("alsa-lib" ,alsa-lib)
        ("enca" ,enca)
-       ("ffmpeg" ,ffmpeg-git)
+       ("ffmpeg" ,ffmpeg)
        ("jack" ,jack-1)
        ("ladspa" ,ladspa)
        ("lcms" ,lcms)

From 050e5756781cdfed2d790e15c67bc48c9aced131 Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Sun, 22 Apr 2018 16:01:28 +0200
Subject: [PATCH 075/275] gnu: Add wpa-supplicant-gui.

* gnu/packages/admin.scm (wpa-supplicant-gui): New public variable.
---
 gnu/packages/admin.scm | 50 +++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 49 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 8d32518973..1dc5d2b241 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -18,7 +18,7 @@
 ;;; Copyright © 2017 Ben Sturmfels <ben@sturm.com.au>
 ;;; Copyright © 2017 Ethan R. Jones <doubleplusgood23@gmail.com>
 ;;; Copyright © 2017 Christopher Allan Webber <cwebber@dustycloud.org>
-;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
+;;; Copyright © 2017, 2018 Marius Bakke <mbakke@fastmail.com>
 ;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net>
 ;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr>
 ;;;
@@ -58,6 +58,8 @@
   #:use-module (gnu packages lua)
   #:use-module (gnu packages guile)
   #:use-module (gnu packages gettext)
+  #:use-module (gnu packages imagemagick)
+  #:use-module (gnu packages inkscape)
   #:use-module (gnu packages pcre)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages perl-check)
@@ -76,6 +78,7 @@
   #:use-module (gnu packages python)
   #:use-module (gnu packages python-crypto)
   #:use-module (gnu packages python-web)
+  #:use-module (gnu packages qt)
   #:use-module (gnu packages terminals)
   #:use-module (gnu packages texinfo)
   #:use-module (gnu packages groff)
@@ -1136,6 +1139,51 @@ This package provides the 'wpa_supplicant' daemon and the 'wpa_cli' command.")
                            (string-append dir "/wpa_supplicant.conf")))
               #t))))))))
 
+(define-public wpa-supplicant-gui
+  (package
+    (inherit wpa-supplicant)
+    (name "wpa-supplicant-gui")
+    (inputs `(("qtbase" ,qtbase)
+              ("qtsvg" ,qtsvg)
+              ,@(package-inputs wpa-supplicant)))
+    (native-inputs
+     ;; For icons.
+     `(("imagemagick" ,imagemagick)
+       ("inkscape" ,inkscape)
+       ,@(package-native-inputs wpa-supplicant)))
+    (arguments
+     `(#:phases (modify-phases %standard-phases
+                  (add-after 'unpack 'chdir
+                    (lambda _
+                      (chdir "wpa_supplicant/wpa_gui-qt4")
+                      #t))
+                  (delete 'configure)
+                  (replace 'build
+                    (lambda _
+                      (invoke "qmake" "wpa_gui.pro")
+                      (invoke "make" "-j" (number->string (parallel-job-count)))
+                      (invoke "make" "-C" "icons")))
+                  (replace 'install
+                    (lambda* (#:key inputs outputs #:allow-other-keys)
+                      (let ((out (assoc-ref outputs "out"))
+                            (qt '("qtbase" "qtsvg")))
+                        (substitute* "wpa_gui.desktop"
+                          (("Exec=wpa_gui")
+                           (string-append "Exec=" out "/bin/wpa_gui")))
+                        (install-file "wpa_gui" (string-append out "/bin"))
+                        (install-file "wpa_gui.desktop"
+                                      (string-append out "/share/applications"))
+                        (copy-recursively "icons/hicolor"
+                                          (string-append out "/share/icons/hicolor"))
+                        (wrap-program (string-append out "/bin/wpa_gui")
+                          `("QT_PLUGIN_PATH" ":" prefix
+                            ,(map (lambda (label)
+                                    (string-append (assoc-ref inputs label)
+                                                   "/lib/qt5/plugins/"))
+                                  qt)))
+                        #t))))))
+    (synopsis "Graphical user interface for WPA supplicant")))
+
 (define-public wakelan
   (package
     (name "wakelan")

From b981f77722ed296aa1198a4de61115db7dfc30a1 Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Mon, 23 Apr 2018 01:11:23 +0200
Subject: [PATCH 076/275] gnu: libwebp: Update to 1.0.0.

* gnu/packages/image.scm (libwebp): Update to 1.0.0.
[source]: Change to GIT-FETCH.
[arguments]: Add 'bootstrap' phase.
---
 gnu/packages/image.scm | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index 7ed18cf1a6..bbfd621a93 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -846,16 +846,18 @@ multi-dimensional image processing.")
 (define-public libwebp
   (package
     (name "libwebp")
-    (version "0.6.1")
+    (version "1.0.0")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append
-             "http://downloads.webmproject.org/releases/webp/libwebp-" version
-             ".tar.gz"))
+       ;; No tarballs are provided for >0.6.1.
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://chromium.googlesource.com/webm/libwebp")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
        (sha256
         (base32
-         "1ayq2zq0zbgf5yizbm32zh7p1vb8kibw74am6am1n5cz5mw3ql06"))))
+         "1w8jzdbr1s4238ygyrlxryycss3f2z6d9amxdq8m82nl3l6skar4"))))
     (build-system gnu-build-system)
     (inputs
      `(("freeglut" ,freeglut)
@@ -863,10 +865,18 @@ multi-dimensional image processing.")
        ("libjpeg" ,libjpeg)
        ("libpng" ,libpng)
        ("libtiff" ,libtiff)))
+    (native-inputs
+     `(("autoconf" ,autoconf)
+       ("automake" ,automake)
+       ("libtool" ,libtool)))
     (arguments
      '(#:configure-flags '("--enable-libwebpmux"
                            "--enable-libwebpdemux"
-                           "--enable-libwebpdecoder")))
+                           "--enable-libwebpdecoder")
+       #:phases (modify-phases %standard-phases
+                  (add-after 'unpack 'bootstrap
+                    (lambda _
+                      (invoke "autoreconf" "-vif"))))))
     (home-page "https://developers.google.com/speed/webp/")
     (synopsis "Lossless and lossy image compression")
     (description

From 14534d7fcdb545ac7d5a4c58633886dac4ed262a Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Mon, 23 Apr 2018 01:14:40 +0200
Subject: [PATCH 077/275] gnu: feh: Update to 2.26.

* gnu/packages/image-viewers.scm (feh): Update to 2.26.
---
 gnu/packages/image-viewers.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm
index ae7ae0f519..1f0a9e46e1 100644
--- a/gnu/packages/image-viewers.scm
+++ b/gnu/packages/image-viewers.scm
@@ -59,7 +59,7 @@
 (define-public feh
   (package
     (name "feh")
-    (version "2.25.1")
+    (version "2.26")
     (home-page "https://feh.finalrewind.org/")
     (source (origin
               (method url-fetch)
@@ -67,7 +67,7 @@
                                   name "-" version ".tar.bz2"))
               (sha256
                (base32
-                "197sm78bm33dvahr5nxqkbmpmdn4b13ahc9mrgn1l7n104bg4phc"))))
+                "11kckzwk3b734l0n4j41k40liq1v2lbbj1gzir5qc386g7fvzmmi"))))
     (build-system gnu-build-system)
     (arguments
      '(#:phases (modify-phases %standard-phases (delete 'configure))

From 89f9ffffe5ed15a9c8ff73e82211670d0f4c078b Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Mon, 23 Apr 2018 18:25:27 +0200
Subject: [PATCH 078/275] gnu: slop: Update to 7.4.

* gnu/packages/xdisorg.scm (slop): Update to 7.4.
---
 gnu/packages/xdisorg.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index 5855273ab8..51844d8a70 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -499,7 +499,7 @@ of the screen selected by mouse.")
 (define-public slop
   (package
     (name "slop")
-    (version "7.3.49")
+    (version "7.4")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -508,7 +508,7 @@ of the screen selected by mouse.")
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "0gxi174vi13ldjaf776s2jcdyy379lnwwml29nk1bkzj5d5gpghm"))))
+                "1kpdrikgpjb4fpxalb6pjcih5njv1w9cnrjj5612ywdv1q5mjs48"))))
     (build-system cmake-build-system)
     (arguments
      '(#:tests? #f)) ; no "check" target

From 0b909ab6bb8a8520ebb7d1293e419589d213b5f3 Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Mon, 23 Apr 2018 18:25:47 +0200
Subject: [PATCH 079/275] gnu: maim: Update to 5.5.

* gnu/packages/xdisorg.scm (maim): Update to 5.5.
---
 gnu/packages/xdisorg.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index 51844d8a70..8c0ca25972 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -532,7 +532,7 @@ selection's dimensions to stdout.")
 (define-public maim
   (package
     (name "maim")
-    (version "5.4.68")
+    (version "5.5")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -541,7 +541,7 @@ selection's dimensions to stdout.")
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "0f54s7csrxjd5r9anqqa92diwmzdplpws3llmbr6g3c0l6bp8815"))))
+                "02blbimjdckbcb04crhv0k2vxnp3rcgskyq66sk0v13l2h52849v"))))
     (build-system cmake-build-system)
     (arguments
      '(#:tests? #f))            ; no "check" target

From bb5c508c12db269017cec41350f30ac1e3edd644 Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Mon, 23 Apr 2018 18:18:41 +0200
Subject: [PATCH 080/275] gnu: Use ffmpeg@3.4 in packages not ready for 4.0.

* gnu/packages/cdrom.scm (dvdstyler)[inputs]: Change FFMPEG with FFMPEG-3.4.
* gnu/packages/video.scm (mlt, motion, simplescreenrecorder)[inputs]: Likewise.
* gnu/packages/music.scm (moc, pianobar)[inputs]: Likewise.
---
 gnu/packages/cdrom.scm | 2 +-
 gnu/packages/music.scm | 4 ++--
 gnu/packages/video.scm | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm
index 3d35ff51f4..5f9117c637 100644
--- a/gnu/packages/cdrom.scm
+++ b/gnu/packages/cdrom.scm
@@ -392,7 +392,7 @@ capacity is user-selectable.")
        ("fontconfig" ,fontconfig)
        ("libexif" ,libexif)
        ("libjpeg" ,libjpeg)
-       ("ffmpeg" ,ffmpeg)))
+       ("ffmpeg" ,ffmpeg-3.4)))
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("flex" ,flex)
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index aea7395d41..c27055e0c1 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -2391,7 +2391,7 @@ tune-in sender list from @url{http://opml.radiotime.com}.")
        ("curl" ,curl)
        ("libgcrypt" ,libgcrypt)
        ("json-c" ,json-c)
-       ("ffmpeg" ,ffmpeg)))
+       ("ffmpeg" ,ffmpeg-3.4)))
     (native-inputs
      `(("pkg-config" ,pkg-config)))
     (home-page "http://6xq.net/projects/pianobar/")
@@ -2792,7 +2792,7 @@ available memory.")
      `(("alsa-lib" ,alsa-lib)
        ("curl" ,curl)
        ("faad2" ,faad2)
-       ("ffmpeg" ,ffmpeg)
+       ("ffmpeg" ,ffmpeg-3.4)
        ("file" ,file)
        ("jack" ,jack-1)
        ("libid3tag" ,libid3tag)
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 1966d44dfd..dc5a375664 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -1847,7 +1847,7 @@ from sites like Twitch.tv and pipes them into a video player of choice.")
             #t)))))
     (inputs
      `(("alsa-lib" ,alsa-lib)
-       ("ffmpeg" ,ffmpeg)
+       ("ffmpeg" ,ffmpeg-3.4)
        ("fftw" ,fftw)
        ("libxml2" ,libxml2)
        ("jack" ,jack-1)
@@ -2082,7 +2082,7 @@ making @dfn{screencasts}.")
     ;; As a result, they are omitted. Please add them back if problems appear.
     (inputs
      `(("alsa-lib" ,alsa-lib)
-       ("ffmpeg" ,ffmpeg)
+       ("ffmpeg" ,ffmpeg-3.4)
        ("glu" ,glu)
        ("jack" ,jack-1)
        ("libxi" ,libxi)
@@ -2794,7 +2794,7 @@ It counts more than 100 plugins.")
        ("pkg-config" ,pkg-config)))
     (inputs
      `(("libjpeg" ,libjpeg)
-       ("ffmpeg" ,ffmpeg)
+       ("ffmpeg" ,ffmpeg-3.4)
        ("sqlite" ,sqlite)))
     (arguments
      '(#:phases (modify-phases %standard-phases

From 2784b35f90a7e659ae30c0e24380ecea42557f7d Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Mon, 23 Apr 2018 19:55:58 +0200
Subject: [PATCH 081/275] gnu: moc: Remove obsolete snippet.

* gnu/packages/music.scm (moc)[source](snippet): Remove.
---
 gnu/packages/music.scm | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index c27055e0c1..4a7a3157dd 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -2780,13 +2780,7 @@ available memory.")
                                   name "-" version ".tar.bz2"))
               (sha256
                (base32
-                "026v977kwb0wbmlmf6mnik328plxg8wykfx9ryvqhirac0aq39pk"))
-              (modules '((guix build utils)))
-              (snippet
-               ;; Remove use of __DATE__ and __TIME__ for reproducibility.
-               '(substitute* "main.c"
-                  (("printf \\(\"            Built : %s\", __DATE__\\);") "")
-                  (("printf \\(\" %s\", __TIME__\\);") "")))))
+                "026v977kwb0wbmlmf6mnik328plxg8wykfx9ryvqhirac0aq39pk"))))
     (build-system gnu-build-system)
     (inputs
      `(("alsa-lib" ,alsa-lib)

From 845688f0096abe2eeba032f594108430d69fc8e8 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 23 Apr 2018 22:32:03 +0200
Subject: [PATCH 082/275] gnu: grammalecte: Update to 0.6.4.

* gnu/packages/dictionaries.scm (grammalecte): Update to 0.6.4.
[arguments]: Remove unnecessary fix.
---
 gnu/packages/dictionaries.scm | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/gnu/packages/dictionaries.scm b/gnu/packages/dictionaries.scm
index 965002a94d..55f250182d 100644
--- a/gnu/packages/dictionaries.scm
+++ b/gnu/packages/dictionaries.scm
@@ -213,7 +213,7 @@ It comes with a German-English dictionary with approximately 270,000 entries.")
 (define-public grammalecte
   (package
     (name "grammalecte")
-    (version "0.6.3.1")
+    (version "0.6.4")
     (source
      (origin
        (method url-fetch/zipbomb)
@@ -221,21 +221,8 @@ It comes with a German-English dictionary with approximately 270,000 entries.")
                            "Grammalecte-fr-v" version ".zip"))
        (sha256
         (base32
-         "0jlzrhpx9qvjdq679w188p86x09yfjf3l0h4scjl9w26yyp53gr8"))))
+         "13var1gi3gb2bwi7k21bn2pla0rs17cd7kc3mc5a2nsyqgsrzxfw"))))
     (build-system python-build-system)
-    (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'fix-setup
-           ;; Fix typos in "setup.py".  In particular, add the new
-           ;; "graphspell" module introduced in 0.6.2.  Reported upstream:
-           ;; <https://www.dicollecte.org/thread.php?prj=fr&t=709>
-           (lambda _
-             (substitute* "setup.py"
-               (("packages=\\['grammalecte', 'grammalecte.fr'\\],")
-                "packages=['grammalecte', 'grammalecte.fr', 'grammalecte.graphspell'],")
-               (("_dictionaries/French.bdic") "graphspell/_dictionaries/fr.bdic"))
-             #t)))))
     (home-page "https://www.dicollecte.org")
     (synopsis  "French spelling and grammar checker")
     (description "Grammalecte is a grammar checker dedicated to the French

From d5a48184d11763bc40bc4347a9b0368193982489 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Mon, 23 Apr 2018 18:16:45 +0200
Subject: [PATCH 083/275] gnu: fortune-mod: Use a stable URL for the CMake
 rules.

* gnu/packages/games.scm (fortune-mod)[inputs]: Use a stable URL for
"cmake-rules".
---
 gnu/packages/games.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index f34beae3df..e5f8350f6a 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -4898,7 +4898,8 @@ Strife, Chex Quest, and fan-created games like Harmony, Hacx and Freedoom.")
         ,(origin
            (method url-fetch)
            (uri (string-append "https://bitbucket.org/shlomif/shlomif-cmake-modules/"
-                               "raw/default/shlomif-cmake-modules/Shlomif_Common.cmake"))
+                               "raw/c505713d7a7cda608f97f01577e5868a711b883e/"
+                               "shlomif-cmake-modules/Shlomif_Common.cmake"))
            (sha256
             (base32 "0kx9s1qqhhzprp1w3b67xmsns0n0v506bg5hgrshxaxpy6lqiwb2"))))))
     (home-page "http://www.shlomifish.org/open-source/projects/fortune-mod/")

From d4bd876267d334e54f88429362464268961174c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Tue, 24 Apr 2018 09:52:24 +0200
Subject: [PATCH 084/275] gnu: hop: Update hash of source tarball, which was
 modified in place.

Fixes <https://bugs.gnu.org/30804>.
Reported by Tobias Geerinckx-Rice <me@tobias.gr>.

* gnu/packages/scheme.scm (hop)[source]: Update sha256.
---
 gnu/packages/scheme.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm
index c9e1a15255..daa46f7101 100644
--- a/gnu/packages/scheme.scm
+++ b/gnu/packages/scheme.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2013, 2014, 2015, 2016, 2018 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
 ;;; Copyright © 2015, 2016 Federico Beffa <beffa@fbengineering.ch>
 ;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net>
@@ -300,7 +300,7 @@ Scheme and C programs and between Scheme and Java programs.")
                                  version ".tar.gz"))
              (sha256
               (base32
-               "09m7pahjsp7wxzd20cdph9j3mgf2nq5dyckcjljcd40m25v85kks"))))
+               "0bvq79vxcpgwydwi923cxb5w9isx2x8r3d0xndbdhacmmsw1m811"))))
     (build-system gnu-build-system)
     (arguments
      `(#:test-target "test"

From 230bd4bb608bd2538fba26c8e89af53d7976f40a Mon Sep 17 00:00:00 2001
From: Rutger Helling <rhelling@mykolab.com>
Date: Tue, 24 Apr 2018 10:03:05 +0200
Subject: [PATCH 085/275] gnu: c-toxcore: Update to 0.2.2.

* gnu/packages/messaging.scm (c-toxcore): Update to 0.2.2.
[arguments]: Disable tests.
---
 gnu/packages/messaging.scm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 237a315239..cce64f7346 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -802,7 +802,7 @@ protocols.")
 (define-public c-toxcore
   (package
     (name "c-toxcore")
-    (version "0.1.11")
+    (version "0.2.2")
     (source
      (origin
        (method url-fetch)
@@ -811,7 +811,10 @@ protocols.")
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "040vwihl1r5159vzimmnff75iqfg53vhnfi5wcb3cd0c2r51idl5"))))
+         "18bfqx0ylbas9gs91rkspf04l5fjjcl0mxm1gfs2d59bv65mvcm3"))))
+    (arguments
+     `(#:tests? #f)) ; FIXME: Testsuite seems to stay stuck on test 3. Disable
+                     ; for now.
     (build-system cmake-build-system)
     (native-inputs
      `(("pkg-config" ,pkg-config)))

From c11df2e879b7e5fb40187325a1d32435cb918ca6 Mon Sep 17 00:00:00 2001
From: Rutger Helling <rhelling@mykolab.com>
Date: Tue, 24 Apr 2018 10:05:06 +0200
Subject: [PATCH 086/275] gnu: utox: Update to 0.17.0.

* gnu/packages/messaging.scm (utox): Update to 0.17.0.
[source]: Use git-fetch instead of url-fetch.
[arguments]: Add "-DENABLE_TESTS=on" configure-flag.
---
 gnu/packages/messaging.scm | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index cce64f7346..1839b2910d 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -832,23 +832,26 @@ messenger protocol.")
 (define-public utox
   (package
    (name "utox")
-   (version "0.16.1")
+   (version "0.17.0")
    (source
     (origin
-     (method url-fetch)
-     (uri (string-append "https://github.com/uTox/uTox/archive/v"
-                         version ".tar.gz"))
-     (file-name (string-append name "-" version ".tar.gz"))
+     (method git-fetch)
+     (uri (git-reference
+           (url "https://github.com/uTox/uTox.git")
+           (commit "v0.17.0")
+           (recursive? #t))) ;; Needed for 'minini' git submodule.
+     (file-name (string-append name "-" version "-checkout"))
      (sha256
       (base32
-       "14xl72y4w1x2kk0cvkcr9pmywllm0r9w2grjqiknwn95pw6yxz6q"))))
+       "12wbq883il7ikldayh8hm0cjfrkp45vn05xx9s1jbfz6gmkidyar"))))
    (build-system cmake-build-system)
    (arguments
-    `(#:phases
+    `(#:configure-flags '("-DENABLE_TESTS=on")
+      #:phases
       (modify-phases %standard-phases
         (add-before 'build 'patch-absolute-filename-libgtk-3
           (lambda* (#:key inputs outputs #:allow-other-keys)
-            (substitute* "../uTox-0.16.1/src/xlib/gtk.c"
+            (substitute* "../source/src/xlib/gtk.c"
                          (("libgtk-3.so")
                          (string-append (assoc-ref inputs "gtk+")
                                         "/lib/libgtk-3.so")))))

From 089abfc1431bd3e2a2c82c841942be3be2ad0134 Mon Sep 17 00:00:00 2001
From: Rutger Helling <rhelling@mykolab.com>
Date: Tue, 24 Apr 2018 10:05:52 +0200
Subject: [PATCH 087/275] gnu: qtox: Update to 1.15.0.

* gnu/packages/messaging.scm (qtox): Update to 1.15.0.
---
 gnu/packages/messaging.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 1839b2910d..e3c3634179 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -890,14 +890,14 @@ instant messenger with audio and video chat capabilities.")
 (define-public qtox
   (package
     (name "qtox")
-    (version "1.13.0")
+    (version "1.15.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://github.com/qTox/qTox/archive/v"
                                   version ".tar.gz"))
               (sha256
                (base32
-                "0dyplmlqhg4zbg7hdzp3iqppn9xgp7pds5k6w6byjcqhb9zv91ca"))
+                "0bmnx6m33qn9nx40yy268x4wnvv2y7bvm41hzrlbhsiaph7kg583"))
               (file-name (string-append name "-" version ".tar.gz"))))
     (build-system cmake-build-system)
     (arguments

From c0069835b1616e8de6733a9c4782b975050769d7 Mon Sep 17 00:00:00 2001
From: Rutger Helling <rhelling@mykolab.com>
Date: Tue, 24 Apr 2018 10:06:32 +0200
Subject: [PATCH 088/275] gnu: toxic: Update to 0.8.2.

* gnu/packages/messaging.scm (toxic): Update to 0.8.2.
---
 gnu/packages/messaging.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index e3c3634179..fd1c330cea 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -1536,14 +1536,14 @@ building the IRC clients and bots.")
 (define-public toxic
   (package
     (name "toxic")
-    (version "0.8.0")
+    (version "0.8.2")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://github.com/JFreegman/toxic/archive/v"
                                   version ".tar.gz"))
               (sha256
                (base32
-                "0166lqb47f4kj34mhi57aqmnk9mh4hsicmbdsj6ag54sy1zicy20"))
+                "1dx6z7k0zpsd7dpysdy23f0hnm49qlikb0mq8fg0y01dsz9vxgak"))
               (file-name (git-file-name name version))))
     (build-system gnu-build-system)
     (arguments

From b45bfc9ca825cdeff67c61459ee417592e34d073 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= <iyzsong@member.fsf.org>
Date: Tue, 24 Apr 2018 17:28:50 +0800
Subject: [PATCH 089/275] gnu: android-udev-rules: Update to 20180112.

* gnu/packages/android.scm (android-udev-rules): Update to 20180112.
---
 gnu/packages/android.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm
index 637cda0205..92de9736f1 100644
--- a/gnu/packages/android.scm
+++ b/gnu/packages/android.scm
@@ -341,7 +341,7 @@ Images.")
 (define-public android-udev-rules
   (package
     (name "android-udev-rules")
-    (version "20171113")
+    (version "20180112")
     (source
      (origin
        (method git-fetch)
@@ -350,7 +350,7 @@ Images.")
              (commit version)))
        (file-name (string-append name "-" version "-checkout"))
        (sha256
-        (base32 "11gcnk6wjc2sw05hwi4xphvx9ksmkpvsdziaczymqxkaads3f1dy"))))
+        (base32 "13gj79nnd04szqlrrzzkdr6wi1fky08pi7x8xfbg0jj3d3v0giah"))))
     (build-system trivial-build-system)
     (native-inputs `(("source" ,source)))
     (arguments

From be65267f93d9c1981000b4fcbaffc477b452b568 Mon Sep 17 00:00:00 2001
From: Rutger Helling <rhelling@mykolab.com>
Date: Tue, 24 Apr 2018 12:13:12 +0200
Subject: [PATCH 090/275] gnu: virt-viewer: Update to 6.0.

* gnu/packages/spice.scm (virt-viewer): Update to 6.0.
---
 gnu/packages/spice.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/spice.scm b/gnu/packages/spice.scm
index 521be54c49..38d4a3a6bd 100644
--- a/gnu/packages/spice.scm
+++ b/gnu/packages/spice.scm
@@ -302,7 +302,7 @@ resolution scaling on graphical console window resize.")
 (define-public virt-viewer
   (package
     (name "virt-viewer")
-    (version "5.0")
+    (version "6.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -310,7 +310,7 @@ resolution scaling on graphical console window resize.")
                 "virt-viewer-" version ".tar.gz"))
               (sha256
                (base32
-                "0blbp1wkw8ahss9va0bmcz2yx18j0mvm6fzrzhh2ly3sja5ysb8b"))))
+                "1chqrf658niivzfh85cbwkbv9vyg8sv1mv3i31vawkfsfdvvsdwh"))))
     (build-system gnu-build-system)
     (inputs
       `(("gtk+" ,gtk+)

From a5b56a5346ce14c2d5f02ef3e1b4964d8dd4f8d5 Mon Sep 17 00:00:00 2001
From: Roel Janssen <roel@gnu.org>
Date: Tue, 24 Apr 2018 13:33:56 +0200
Subject: [PATCH 091/275] gnu: Add r-diffbind.

* gnu/packages/bioconductor.scm (r-diffbind): New variable.
---
 gnu/packages/bioconductor.scm | 44 +++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm
index 09581d9fde..e43b3ff928 100644
--- a/gnu/packages/bioconductor.scm
+++ b/gnu/packages/bioconductor.scm
@@ -23,6 +23,8 @@
   #:use-module (guix download)
   #:use-module (guix build-system r)
   #:use-module (gnu packages)
+  #:use-module (gnu packages cran)
+  #:use-module (gnu packages compression)
   #:use-module (gnu packages statistics)
   #:use-module (gnu packages bioinformatics))
 
@@ -70,3 +72,45 @@ the Human Protein Atlas project.")
 customizable permutation tests to assess the association between genomic
 region sets and other genomic features.")
     (license license:artistic2.0)))
+
+(define-public r-diffbind
+  (package
+    (name "r-diffbind")
+    (version "2.6.6")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (bioconductor-uri "DiffBind" version))
+       (sha256
+        (base32
+         "1sm5h6nq77hjfis6kr1nqyizcxgfz87dgpqc4fxlfqkmsd9n3vkp"))))
+    (properties `((upstream-name . "DiffBind")))
+    (build-system r-build-system)
+    (inputs
+     `(("zlib" ,zlib)))
+    (propagated-inputs
+     `(("r-amap" ,r-amap)
+       ("r-biocparallel" ,r-biocparallel)
+       ("r-deseq2" ,r-deseq2)
+       ("r-dplyr" ,r-dplyr)
+       ("r-edger" ,r-edger)
+       ("r-genomicalignments" ,r-genomicalignments)
+       ("r-ggrepel" ,r-ggrepel)
+       ("r-gplots" ,r-gplots)
+       ("r-iranges" ,r-iranges)
+       ("r-lattice" ,r-lattice)
+       ("r-limma" ,r-limma)
+       ("r-locfit" ,r-locfit)
+       ("r-rcolorbrewer" , r-rcolorbrewer)
+       ("r-rcpp" ,r-rcpp)
+       ("r-rsamtools" ,r-rsamtools)
+       ("r-s4vectors" ,r-s4vectors)
+       ("r-systempiper" ,r-systempiper)
+       ("r-zlibbioc" ,r-zlibbioc)))
+    (home-page "http://bioconductor.org/packages/DiffBind")
+    (synopsis "Differential binding analysis of ChIP-Seq peak data")
+    (description
+     "This package computes differentially bound sites from multiple
+ChIP-seq experiments using affinity (quantitative) data.  Also enables
+occupancy (overlap) analysis and plotting functions.")
+    (license license:artistic2.0)))

From 6d94bf6baa221bde0e6906df49b79fa289d33e19 Mon Sep 17 00:00:00 2001
From: Roel Janssen <roel@gnu.org>
Date: Tue, 24 Apr 2018 13:34:29 +0200
Subject: [PATCH 092/275] gnu: Add r-ripseeker.

* gnu/packages/bioconductor.scm (r-ripseeker): New variable.
---
 gnu/packages/bioconductor.scm | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm
index e43b3ff928..4c212ecf02 100644
--- a/gnu/packages/bioconductor.scm
+++ b/gnu/packages/bioconductor.scm
@@ -114,3 +114,36 @@ region sets and other genomic features.")
 ChIP-seq experiments using affinity (quantitative) data.  Also enables
 occupancy (overlap) analysis and plotting functions.")
     (license license:artistic2.0)))
+
+(define-public r-ripseeker
+  (package
+    (name "r-ripseeker")
+    (version "1.18.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (bioconductor-uri "RIPSeeker" version))
+       (sha256
+        (base32
+         "0bqkzwrncww7il36273chkd3gfxmii7p566ycki9qij419pwr35y"))))
+    (properties `((upstream-name . "RIPSeeker")))
+    (build-system r-build-system)
+    (propagated-inputs
+     `(("r-s4vectors" ,r-s4vectors)
+       ("r-iranges" ,r-iranges)
+       ("r-genomicranges" ,r-genomicranges)
+       ("r-summarizedexperiment" ,r-summarizedexperiment)
+       ("r-rsamtools" ,r-rsamtools)
+       ("r-genomicalignments" ,r-genomicalignments)
+       ("r-rtracklayer" ,r-rtracklayer)))
+    (home-page "http://bioconductor.org/packages/RIPSeeker")
+    (synopsis
+     "Identifying protein-associated transcripts from RIP-seq experiments")
+    (description
+     "This package infers and discriminates RIP peaks from RIP-seq alignments
+using two-state HMM with negative binomial emission probability.  While
+RIPSeeker is specifically tailored for RIP-seq data analysis, it also provides
+a suite of bioinformatics tools integrated within this self-contained software
+package comprehensively addressing issues ranging from post-alignments
+processing to visualization and annotation.")
+    (license license:gpl2)))

From acc6e6955f5d481cf984cafb0459d3489feda99e Mon Sep 17 00:00:00 2001
From: Jelle Licht <jlicht@fsfe.org>
Date: Tue, 17 Apr 2018 21:29:41 +0200
Subject: [PATCH 093/275] gnu: Add python2-pynacl.

* gnu/packages/python-crypto.scm (python2-pynacl): New variable.
---
 gnu/packages/python-crypto.scm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm
index d82cfeb422..dda1024b39 100644
--- a/gnu/packages/python-crypto.scm
+++ b/gnu/packages/python-crypto.scm
@@ -619,6 +619,9 @@ Networking and Cryptography library.  These libraries have a stated goal
 of improving usability, security and speed.")
     (license license:asl2.0)))
 
+(define-public python2-pynacl
+  (package-with-python2 python-pynacl))
+
 (define-public python2-pgpdump
   (package
     (name "python2-pgpdump")

From 09e3cf583437ce421215dd28d2b94f574458b311 Mon Sep 17 00:00:00 2001
From: Jelle Licht <jlicht@fsfe.org>
Date: Tue, 17 Apr 2018 21:31:05 +0200
Subject: [PATCH 094/275] gnu: ansible: Add missing inputs

* gnu/packages/admin.scm (ansible)[native-inputs]: Add python2-bcrypt and
  python2-pynacl.
---
 gnu/packages/admin.scm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 1dc5d2b241..5e2cf2d7ad 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -1574,7 +1574,9 @@ of supported upstream metrics systems simultaneously.")
        (patches (search-patches "ansible-wrap-program-hack.patch"))))
     (build-system python-build-system)
     (native-inputs
-     `(("python2-pycrypto" ,python2-pycrypto)
+     `(("python2-bcrypt" ,python2-bcrypt)
+       ("python2-pycrypto" ,python2-pycrypto)
+       ("python2-pynacl" ,python2-pynacl)
        ("python2-httplib2" ,python2-httplib2)
        ("python2-passlib" ,python2-passlib)
        ("python2-nose" ,python2-nose)

From a6ae9ffd6a133828644099453731eac155d6d367 Mon Sep 17 00:00:00 2001
From: Roel Janssen <roel@gnu.org>
Date: Tue, 24 Apr 2018 13:55:35 +0200
Subject: [PATCH 095/275] gnu: Add r-multtest.

* gnu/packages/bioconductor.scm (r-multtest): New variable.
---
 gnu/packages/bioconductor.scm | 38 +++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm
index 4c212ecf02..7cf6811d52 100644
--- a/gnu/packages/bioconductor.scm
+++ b/gnu/packages/bioconductor.scm
@@ -147,3 +147,41 @@ a suite of bioinformatics tools integrated within this self-contained software
 package comprehensively addressing issues ranging from post-alignments
 processing to visualization and annotation.")
     (license license:gpl2)))
+
+(define-public r-multtest
+  (package
+    (name "r-multtest")
+    (version "2.34.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (bioconductor-uri "multtest" version))
+       (sha256
+        (base32
+         "0n11rd49xl2vn3ldmfips7d3yb70l8npjcqsxyswr9ypjhgzkv9j"))))
+    (build-system r-build-system)
+    (propagated-inputs
+     `(("r-survival" ,r-survival)
+       ("r-biocgenerics" ,r-biocgenerics)
+       ("r-biobase" ,r-biobase)
+       ("r-mass" ,r-mass)))
+    (home-page "http://bioconductor.org/packages/multtest")
+    (synopsis "Resampling-based multiple hypothesis testing")
+    (description
+     "This package can do non-parametric bootstrap and permutation
+resampling-based multiple testing procedures (including empirical Bayes
+methods) for controlling the family-wise error rate (FWER), generalized
+family-wise error rate (gFWER), tail probability of the proportion of
+false positives (TPPFP), and false discovery rate (FDR).  Several choices
+of bootstrap-based null distribution are implemented (centered, centered
+and scaled, quantile-transformed).  Single-step and step-wise methods are
+available.  Tests based on a variety of T- and F-statistics (including
+T-statistics based on regression parameters from linear and survival models
+as well as those based on correlation parameters) are included.  When probing
+hypotheses with T-statistics, users may also select a potentially faster null
+distribution which is multivariate normal with mean zero and variance
+covariance matrix derived from the vector influence function.  Results are
+reported in terms of adjusted P-values, confidence regions and test statistic
+cutoffs.  The procedures are directly applicable to identifying differentially
+expressed genes in DNA microarray experiments.")
+    (license license:lgpl3)))

From 793f83efe1a13671c4e72dbe095a9984b13e69b3 Mon Sep 17 00:00:00 2001
From: Roel Janssen <roel@gnu.org>
Date: Tue, 24 Apr 2018 13:58:01 +0200
Subject: [PATCH 096/275] gnu: Add r-chippeakanno.

* gnu/packages/bioconductor.scm (r-chippeakanno): New variable.
---
 gnu/packages/bioconductor.scm | 50 +++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm
index 7cf6811d52..9a00baa89b 100644
--- a/gnu/packages/bioconductor.scm
+++ b/gnu/packages/bioconductor.scm
@@ -185,3 +185,53 @@ reported in terms of adjusted P-values, confidence regions and test statistic
 cutoffs.  The procedures are directly applicable to identifying differentially
 expressed genes in DNA microarray experiments.")
     (license license:lgpl3)))
+
+(define-public r-chippeakanno
+  (package
+    (name "r-chippeakanno")
+    (version "3.12.7")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (bioconductor-uri "ChIPpeakAnno" version))
+       (sha256
+        (base32
+         "1zab489d7a6bh6ylc68x6yn47gdkmr7p3677grx9l2qafrryjr04"))))
+    (properties `((upstream-name . "ChIPpeakAnno")))
+    (build-system r-build-system)
+    (propagated-inputs
+     `(("r-biocgenerics" ,r-biocgenerics)
+       ("r-go-db" ,r-go-db)
+       ("r-biomart" ,r-biomart)
+       ("r-bsgenome" ,r-bsgenome)
+       ("r-genomicfeatures" ,r-genomicfeatures)
+       ("r-genomeinfodb" ,r-genomeinfodb)
+       ("r-matrixstats" ,r-matrixstats)
+       ("r-annotationdbi" ,r-annotationdbi)
+       ("r-limma" ,r-limma)
+       ("r-multtest" ,r-multtest)
+       ("r-rbgl" ,r-rbgl)
+       ("r-graph" ,r-graph)
+       ("r-biocinstaller" ,r-biocinstaller)
+       ("r-regioner" ,r-regioner)
+       ("r-dbi" ,r-dbi)
+       ("r-ensembldb" ,r-ensembldb)
+       ("r-biobase" ,r-biobase)
+       ("r-seqinr" ,r-seqinr)
+       ("r-idr" ,r-idr)
+       ("r-genomicalignments" ,r-genomicalignments)
+       ("r-summarizedexperiment" ,r-summarizedexperiment)
+       ("r-rsamtools" ,r-rsamtools)
+       ("r-venndiagram" ,r-venndiagram)))
+    (home-page "http://bioconductor.org/packages/ChIPpeakAnno")
+    (synopsis "Peaks annotation from ChIP-seq and ChIP-chip experiments")
+    (description
+     "The package includes functions to retrieve the sequences around the peak,
+obtain enriched Gene Ontology (GO) terms, find the nearest gene, exon, miRNA or
+custom features such as most conserved elements and other transcription factor
+binding sites supplied by users.  Starting 2.0.5, new functions have been added
+for finding the peaks with bi-directional promoters with summary statistics
+(peaksNearBDP), for summarizing the occurrence of motifs in peaks
+(summarizePatternInPeaks) and for adding other IDs to annotated peaks or
+enrichedGO (addGeneIDs).")
+    (license license:gpl2+)))

From fdc3a05d1bcef69223ce8f776c16dd5a51f6baa0 Mon Sep 17 00:00:00 2001
From: Roel Janssen <roel@gnu.org>
Date: Tue, 24 Apr 2018 14:03:42 +0200
Subject: [PATCH 097/275] gnu: Add r-snowfall.

* gnu/packages/cran.scm (r-snowfall): New variable.
---
 gnu/packages/cran.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 9dc075ffb8..77e5054314 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -3924,3 +3924,25 @@ promises, but with a syntax that is idiomatic R.")
      "This package provides a parallel backend for the @code{%dopar%} function
 using the @code{snow} package.")
     (license license:gpl2)))
+
+(define-public r-snowfall
+  (package
+   (name "r-snowfall")
+   (version "1.84-6.1")
+   (source (origin
+            (method url-fetch)
+            (uri (cran-uri "snowfall" version))
+            (sha256
+             (base32 "13941rlw1jsdjsndp1plzj1cq5aqravizkrqn6l25r9im7rnsi2w"))))
+   (build-system r-build-system)
+   (propagated-inputs
+    `(("r-snow" ,r-snow)))
+   (home-page "http://cran.r-project.org/web/packages/snowfall/")
+   (synopsis "Easier cluster computing")
+   (description "This package is a usability wrapper around snow for easier
+development of parallel R programs.  This package offers e.g. extended error
+checks, and additional functions.  All functions work in sequential mode, too,
+if no cluster is present or wished.  The package is also designed as connector
+to the cluster management tool @code{sfCluster}, but can also used without
+it.")
+   (license license:gpl2+)))

From 164502d819c610553823fa63567e55b3a323721f Mon Sep 17 00:00:00 2001
From: Roel Janssen <roel@gnu.org>
Date: Tue, 24 Apr 2018 14:11:19 +0200
Subject: [PATCH 098/275] gnu: Add r-marray.

* gnu/packages/bioconductor.scm (r-marray): New variable.
---
 gnu/packages/bioconductor.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm
index 9a00baa89b..b8498b74d7 100644
--- a/gnu/packages/bioconductor.scm
+++ b/gnu/packages/bioconductor.scm
@@ -235,3 +235,23 @@ for finding the peaks with bi-directional promoters with summary statistics
 (summarizePatternInPeaks) and for adding other IDs to annotated peaks or
 enrichedGO (addGeneIDs).")
     (license license:gpl2+)))
+
+(define-public r-marray
+  (package
+    (name "r-marray")
+    (version "1.56.0")
+    (source (origin
+              (method url-fetch)
+              (uri (bioconductor-uri "marray" version))
+              (sha256
+               (base32 "14c93i86yc7jn4ax8p4l0z6v9xisw1bv7gzb4a0gbxhxn7mddaic"))))
+    (build-system r-build-system)
+    (propagated-inputs
+     `(("r-biobase" ,r-biobase)
+       ("r-limma" ,r-limma)))
+    (home-page "http://bioconductor.org/packages/marray")
+    (synopsis "Exploratory analysis for two-color spotted microarray data")
+    (description "This package contains class definitions for two-color spotted
+microarray data.  It also includes fuctions for data input, diagnostic plots,
+normalization and quality checking.")
+    (license license:lgpl2.0+)))

From 0416a0d4d5c38a9352d965b71d1eb9d966ed7db9 Mon Sep 17 00:00:00 2001
From: Roel Janssen <roel@gnu.org>
Date: Tue, 24 Apr 2018 14:11:51 +0200
Subject: [PATCH 099/275] gnu: Add r-cghbase.

* gnu/packages/bioconductor.scm (r-cghbase): New variable.
---
 gnu/packages/bioconductor.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm
index b8498b74d7..87c0c68f33 100644
--- a/gnu/packages/bioconductor.scm
+++ b/gnu/packages/bioconductor.scm
@@ -255,3 +255,23 @@ enrichedGO (addGeneIDs).")
 microarray data.  It also includes fuctions for data input, diagnostic plots,
 normalization and quality checking.")
     (license license:lgpl2.0+)))
+
+(define-public r-cghbase
+  (package
+   (name "r-cghbase")
+   (version "1.38.0")
+   (source (origin
+            (method url-fetch)
+            (uri (bioconductor-uri "CGHbase" version))
+            (sha256
+             (base32 "0fynvcsjdbgp69i0nxrc8ni58rhb1kx9k5r3nb91n9i8s43gjqlm"))))
+   (properties `((upstream-name . "CGHbase")))
+   (build-system r-build-system)
+   (propagated-inputs
+    `(("r-biobase" ,r-biobase)
+      ("r-marray" ,r-marray)))
+   (home-page "http://bioconductor.org/packages/CGHbase")
+   (synopsis "Base functions and classes for arrayCGH data analysis")
+   (description "This package contains functions and classes that are needed by
+the @code{arrayCGH} packages.")
+   (license license:gpl2+)))

From 67ee83d6c30b7b73facf1f9a7c981d05399ff190 Mon Sep 17 00:00:00 2001
From: Roel Janssen <roel@gnu.org>
Date: Tue, 24 Apr 2018 14:12:15 +0200
Subject: [PATCH 100/275] gnu: Add r-cghcall.

* gnu/packages/bioconductor.scm (r-cghcall): New variable.
---
 gnu/packages/bioconductor.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm
index 87c0c68f33..9b1d8667a6 100644
--- a/gnu/packages/bioconductor.scm
+++ b/gnu/packages/bioconductor.scm
@@ -275,3 +275,26 @@ normalization and quality checking.")
    (description "This package contains functions and classes that are needed by
 the @code{arrayCGH} packages.")
    (license license:gpl2+)))
+
+(define-public r-cghcall
+  (package
+   (name "r-cghcall")
+   (version "2.40.0")
+   (source (origin
+            (method url-fetch)
+            (uri (bioconductor-uri "CGHcall" version))
+            (sha256
+             (base32 "11pi6awz3858yb4s0z3qf3kcmsdgp6d4aj41g4lfix1sv5amllch"))))
+   (properties `((upstream-name . "CGHcall")))
+   (build-system r-build-system)
+   (propagated-inputs
+    `(("r-biobase" ,r-biobase)
+      ("r-cghbase" ,r-cghbase)
+      ("r-impute" ,r-impute)
+      ("r-dnacopy" ,r-dnacopy)
+      ("r-snowfall" ,r-snowfall)))
+   (home-page "http://bioconductor.org/packages/CGHcall")
+   (synopsis "Base functions and classes for arrayCGH data analysis")
+   (description "This package contains functions and classes that are needed by
+@code{arrayCGH} packages.")
+   (license license:gpl2+)))

From 0ef8cc9c1c568c03c368bcaee5c3e846b8bcc9d2 Mon Sep 17 00:00:00 2001
From: Roel Janssen <roel@gnu.org>
Date: Tue, 24 Apr 2018 14:12:32 +0200
Subject: [PATCH 101/275] gnu: Add r-qdnaseq.

* gnu/packages/bioconductor.scm (r-qdnaseq): New variable.
---
 gnu/packages/bioconductor.scm | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm
index 9b1d8667a6..76ff773ef1 100644
--- a/gnu/packages/bioconductor.scm
+++ b/gnu/packages/bioconductor.scm
@@ -298,3 +298,34 @@ the @code{arrayCGH} packages.")
    (description "This package contains functions and classes that are needed by
 @code{arrayCGH} packages.")
    (license license:gpl2+)))
+
+(define-public r-qdnaseq
+  (package
+    (name "r-qdnaseq")
+    (version "1.14.0")
+    (source (origin
+              (method url-fetch)
+              (uri (bioconductor-uri "QDNAseq" version))
+              (sha256
+               (base32 "0lgbv4s0xqgrs7q6ynb3c273sf7pyrp51jnc8ravq1z5g0a2zshy"))))
+    (properties `((upstream-name . "QDNAseq")))
+    (build-system r-build-system)
+    (propagated-inputs
+     `(("r-biobase" ,r-biobase)
+       ("r-cghbase" ,r-cghbase)
+       ("r-cghcall" ,r-cghcall)
+       ("r-dnacopy" ,r-dnacopy)
+       ("r-genomicranges" ,r-genomicranges)
+       ("r-iranges" ,r-iranges)
+       ("r-matrixstats" ,r-matrixstats)
+       ("r-r-utils" ,r-r-utils)
+       ("r-rsamtools" ,r-rsamtools)))
+    (home-page "http://bioconductor.org/packages/QDNAseq")
+    (synopsis "Quantitative DNA sequencing for chromosomal aberrations")
+    (description "The genome is divided into non-overlapping fixed-sized bins,
+number of sequence reads in each counted, adjusted with a simultaneous
+two-dimensional loess correction for sequence mappability and GC content, and
+filtered to remove spurious regions in the genome.  Downstream steps of
+segmentation and calling are also implemented via packages DNAcopy and CGHcall,
+respectively.")
+    (license license:gpl2+)))

From a65d88f2a50e7d4aa72a28706389934e4c48afe1 Mon Sep 17 00:00:00 2001
From: Jelle Licht <jlicht@fsfe.org>
Date: Tue, 24 Apr 2018 16:27:33 +0200
Subject: [PATCH 102/275] gnu: node: Update to 9.11.1.

* gnu/packages/node.scm (node): Update to 9.11.1.
---
 gnu/packages/node.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm
index 618dcaa92c..6a3a510ff2 100644
--- a/gnu/packages/node.scm
+++ b/gnu/packages/node.scm
@@ -43,14 +43,14 @@
 (define-public node
   (package
     (name "node")
-    (version "9.10.0")
+    (version "9.11.1")
     (source (origin
               (method url-fetch)
               (uri (string-append "http://nodejs.org/dist/v" version
                                   "/node-v" version ".tar.gz"))
               (sha256
                (base32
-                "0xld7jh3fx85az7s5zbbsbccnfjwp99xxfn5w0gh2zfc5dalwrg5"))
+                "1vjh9zvw7wkdz6b0l99ya7mqjk0l8lbg9isr1q8rxwp400dhkk32"))
               (modules '((guix build utils)))
               (snippet
                `(begin

From 3f0ec617f59bd340d2930ff210e4c3d370c7223e Mon Sep 17 00:00:00 2001
From: Leo Famulari <leo@famulari.name>
Date: Mon, 23 Apr 2018 13:58:38 -0400
Subject: [PATCH 103/275] gnu: go@1.4: Use the "real" pkg-config.

* gnu/packages/golang.scm (go-1.4)[native-inputs]: Use pkg-config instead of
%pkg-config.
---
 gnu/packages/golang.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 485aa02c46..42d8b3f3f0 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -195,7 +195,7 @@
        ;; https://github.com/golang/go/issues/24046
        ("gcc:lib" ,gcc-6 "lib")))
     (native-inputs
-     `(("pkg-config" ,%pkg-config)
+     `(("pkg-config" ,pkg-config)
        ("which" ,which)
        ("net-base" ,net-base)
        ("perl" ,perl)))

From 3f1574434965e1b8bd519380121325a8f5e47216 Mon Sep 17 00:00:00 2001
From: Leo Famulari <leo@famulari.name>
Date: Mon, 9 Apr 2018 17:05:41 -0400
Subject: [PATCH 104/275] gnu: go@1.9: Update to 1.9.5 [fixes CVE-2018-7187].

* gnu/packages/golang.scm (go-1.9): Update to 1.9.5.
[arguments]: Disable the 'TestTwoPkgConfigs' test.
---
 gnu/packages/golang.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 42d8b3f3f0..d25d2fd465 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -214,7 +214,7 @@ in the style of communicating sequential processes (@dfn{CSP}).")
   (package
     (inherit go-1.4)
     (name "go")
-    (version "1.9.4")
+    (version "1.9.5")
     (source
      (origin
        (method url-fetch)
@@ -222,7 +222,7 @@ in the style of communicating sequential processes (@dfn{CSP}).")
                            name version ".src.tar.gz"))
        (sha256
         (base32
-         "01nw8rfvf10naja0wq0kabsm012sbqq76hd4b8c7g28n6ggshwq5"))))
+         "1g4zqhbh1yw3gnb400szzwrdz0k5s3h0h5nc35xgmn5v69zvphpi"))))
     (arguments
      (substitute-keyword-arguments (package-arguments go-1.4)
        ((#:phases phases)
@@ -292,6 +292,7 @@ in the style of communicating sequential processes (@dfn{CSP}).")
                     ("syscall/syscall_unix_test.go" "(.+)(TestPassFD\\(.+)")
                     ("os/exec/exec_test.go" "(.+)(TestExtraFiles/areturn.+)")
                     ("cmd/go/go_test.go" "(.+)(TestCoverageWithCgo.+)")
+                    ("cmd/go/go_test.go" "(.+)(TestTwoPkgConfigs.+)")
                     ("os/exec/exec_test.go" "(.+)(TestOutputStderrCapture.+)")
                     ("os/exec/exec_test.go" "(.+)(TestExtraFiles.+)")
                     ("os/exec/exec_test.go" "(.+)(TestExtraFilesRace.+)")

From f0b85055c73629afc962b86bd13c195abca3dbb0 Mon Sep 17 00:00:00 2001
From: Leo Famulari <leo@famulari.name>
Date: Mon, 9 Apr 2018 17:07:13 -0400
Subject: [PATCH 105/275] gnu: go@1.10: Update to 1.10.1 [fixes CVE-2018-7187].

* gnu/packages/golang.scm (go-1.10): Update to 1.10.1.
[arguments]: Disable the 'TestTwoPkgConfigs' test.
---
 gnu/packages/golang.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index d25d2fd465..c6fc68468f 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -383,7 +383,7 @@ in the style of communicating sequential processes (@dfn{CSP}).")
   (package
     (inherit go-1.9)
     (name "go")
-    (version "1.10")
+    (version "1.10.1")
     (source
      (origin
        (method url-fetch)
@@ -391,7 +391,7 @@ in the style of communicating sequential processes (@dfn{CSP}).")
                            name version ".src.tar.gz"))
        (sha256
         (base32
-         "093z1h0gmi458kv7smpx0ph6jm7ss9mzxa432kysbz85jhl4kppk"))))
+         "1p1xyyxicp752n9wj10sljjl6mjxpfsplkhx74fzzjrwdkzlk52q"))))
     (arguments
      (substitute-keyword-arguments (package-arguments go-1.9)
        ((#:phases phases)
@@ -461,6 +461,7 @@ in the style of communicating sequential processes (@dfn{CSP}).")
                     ("syscall/syscall_unix_test.go" "(.+)(TestPassFD\\(.+)")
                     ("os/exec/exec_test.go" "(.+)(TestExtraFiles/areturn.+)")
                     ("cmd/go/go_test.go" "(.+)(TestCoverageWithCgo.+)")
+                    ("cmd/go/go_test.go" "(.+)(TestTwoPkgConfigs.+)")
                     ("os/exec/exec_test.go" "(.+)(TestOutputStderrCapture.+)")
                     ("os/exec/exec_test.go" "(.+)(TestExtraFiles.+)")
                     ("os/exec/exec_test.go" "(.+)(TestExtraFilesRace.+)")

From a0a553dcf12b3d6ad99237b75c3907bcb6ccaeeb Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Tue, 24 Apr 2018 20:12:07 +0200
Subject: [PATCH 106/275] gnu: libraw: Update to 0.18.9.

* gnu/packages/photo.scm (libraw): Update to 0.18.9.
---
 gnu/packages/photo.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm
index 437acd305d..d56cd6ecce 100644
--- a/gnu/packages/photo.scm
+++ b/gnu/packages/photo.scm
@@ -69,14 +69,14 @@
 (define-public libraw
   (package
     (name "libraw")
-    (version "0.18.8")
+    (version "0.18.9")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://www.libraw.org/data/LibRaw-"
                                   version ".tar.gz"))
               (sha256
                (base32
-                "1qi0fkw2zmd0yplrf79z7lgpz0hxl45dj5rdgpaj7283jzys9b2n"))))
+                "0kmjfdr409k9q9n17k9ywims5z4kqc16s81ba7y09n7669q1gvyj"))))
     (build-system gnu-build-system)
     (home-page "https://www.libraw.org")
     (synopsis "Raw image decoder")

From 460292af30f08567833926f0ee8b49287ba9c9bc Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Tue, 24 Apr 2018 20:19:38 +0200
Subject: [PATCH 107/275] gnu: qemu: Update to 2.12.0.

* gnu/packages/patches/qemu-CVE-2018-7550.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove it.
* gnu/packages/virtualization.scm (qemu): Update to 2.12.0.
[source](patches): Remove.
---
 gnu/local.mk                                  |  1 -
 gnu/packages/patches/qemu-CVE-2018-7550.patch | 66 -------------------
 gnu/packages/virtualization.scm               |  5 +-
 3 files changed, 2 insertions(+), 70 deletions(-)
 delete mode 100644 gnu/packages/patches/qemu-CVE-2018-7550.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 056a46cb79..639dd943d6 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1061,7 +1061,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/python-unittest2-python3-compat.patch	\
   %D%/packages/patches/python-unittest2-remove-argparse.patch	\
   %D%/packages/patches/python-waitress-fix-tests.patch		\
-  %D%/packages/patches/qemu-CVE-2018-7550.patch			\
   %D%/packages/patches/qt4-ldflags.patch			\
   %D%/packages/patches/qtbase-use-TZDIR.patch			\
   %D%/packages/patches/qtscript-disable-tests.patch		\
diff --git a/gnu/packages/patches/qemu-CVE-2018-7550.patch b/gnu/packages/patches/qemu-CVE-2018-7550.patch
deleted file mode 100644
index 43f111e206..0000000000
--- a/gnu/packages/patches/qemu-CVE-2018-7550.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-Fix CVE-2018-7550:
-
-https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-7550
-
-Patch copied from upstream source repository:
-
-https://git.qemu.org/?p=qemu.git;a=patch;h=2a8fcd119eb7c6bb3837fc3669eb1b2dfb31daf8
-
-From 2a8fcd119eb7c6bb3837fc3669eb1b2dfb31daf8 Mon Sep 17 00:00:00 2001
-From: Jack Schwartz <jack.schwartz@oracle.com>
-Date: Thu, 21 Dec 2017 09:25:15 -0800
-Subject: [PATCH] multiboot: bss_end_addr can be zero
-
-The multiboot spec (https://www.gnu.org/software/grub/manual/multiboot/),
-section 3.1.3, allows for bss_end_addr to be zero.
-
-A zero bss_end_addr signifies there is no .bss section.
-
-Suggested-by: Daniel Kiper <daniel.kiper@oracle.com>
-Signed-off-by: Jack Schwartz <jack.schwartz@oracle.com>
-Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
-Reviewed-by: Prasad J Pandit <pjp@fedoraproject.org>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
----
- hw/i386/multiboot.c | 18 ++++++++++--------
- 1 file changed, 10 insertions(+), 8 deletions(-)
-
-diff --git a/hw/i386/multiboot.c b/hw/i386/multiboot.c
-index 46d9c68bf5..bb8d8e4629 100644
---- a/hw/i386/multiboot.c
-+++ b/hw/i386/multiboot.c
-@@ -233,12 +233,6 @@ int load_multiboot(FWCfgState *fw_cfg,
-         mh_entry_addr = ldl_p(header+i+28);
- 
-         if (mh_load_end_addr) {
--            if (mh_bss_end_addr < mh_load_addr) {
--                fprintf(stderr, "invalid mh_bss_end_addr address\n");
--                exit(1);
--            }
--            mb_kernel_size = mh_bss_end_addr - mh_load_addr;
--
-             if (mh_load_end_addr < mh_load_addr) {
-                 fprintf(stderr, "invalid mh_load_end_addr address\n");
-                 exit(1);
-@@ -249,8 +243,16 @@ int load_multiboot(FWCfgState *fw_cfg,
-                 fprintf(stderr, "invalid kernel_file_size\n");
-                 exit(1);
-             }
--            mb_kernel_size = kernel_file_size - mb_kernel_text_offset;
--            mb_load_size = mb_kernel_size;
-+            mb_load_size = kernel_file_size - mb_kernel_text_offset;
-+        }
-+        if (mh_bss_end_addr) {
-+            if (mh_bss_end_addr < (mh_load_addr + mb_load_size)) {
-+                fprintf(stderr, "invalid mh_bss_end_addr address\n");
-+                exit(1);
-+            }
-+            mb_kernel_size = mh_bss_end_addr - mh_load_addr;
-+        } else {
-+            mb_kernel_size = mb_load_size;
-         }
- 
-         /* Valid if mh_flags sets MULTIBOOT_HEADER_HAS_VBE.
--- 
-2.17.0
-
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index 59b4c63293..86f4d71364 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -87,15 +87,14 @@
 (define-public qemu
   (package
     (name "qemu")
-    (version "2.11.1")
+    (version "2.12.0")
     (source (origin
              (method url-fetch)
              (uri (string-append "https://download.qemu.org/qemu-"
                                  version ".tar.xz"))
-             (patches (search-patches "qemu-CVE-2018-7550.patch"))
              (sha256
               (base32
-               "11l6cs6mib16rgdrnqrhkqs033fjik316gkgfz3asbmxz38lalca"))))
+               "1z66spkm1prvhbq7h5mfnp0i6mmamsb938fqmdfvyrgzc7rh34z6"))))
     (build-system gnu-build-system)
     (arguments
      '(;; Running tests in parallel can occasionally lead to failures, like:

From 005ccea624da372ee81584573b10cc2ebd73d287 Mon Sep 17 00:00:00 2001
From: Mark H Weaver <mhw@netris.org>
Date: Tue, 24 Apr 2018 16:49:35 -0400
Subject: [PATCH 108/275] gnu: linux-libre@4.4: Update to 4.4.129.

* gnu/packages/linux.scm (linux-libre-4.4): Update to 4.4.129.
---
 gnu/packages/linux.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 1d9585e7f1..4982c68121 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -416,8 +416,8 @@ It has been modified to remove all non-free binary blobs.")
                     #:configuration-file kernel-config))
 
 (define-public linux-libre-4.4
-  (make-linux-libre "4.4.128"
-                    "1aqz5skyz534bcpnn6w9madg6kadgyjjypah9dhmqf841rygb6rk"
+  (make-linux-libre "4.4.129"
+                    "1m4434iabnpn77521lm59wzjprq5brx8vr1952jd5a4gqwilmnnb"
                     %intel-compatible-systems
                     #:configuration-file kernel-config))
 

From 22789d97b01914ba0fe4861a8cd133573b58fe43 Mon Sep 17 00:00:00 2001
From: Mark H Weaver <mhw@netris.org>
Date: Tue, 24 Apr 2018 16:50:11 -0400
Subject: [PATCH 109/275] gnu: linux-libre@4.9: Update to 4.9.96.

* gnu/packages/linux.scm (linux-libre-4.9): Update to 4.9.96.
---
 gnu/packages/linux.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 4982c68121..5bdde86bc3 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -410,8 +410,8 @@ It has been modified to remove all non-free binary blobs.")
                     #:configuration-file kernel-config))
 
 (define-public linux-libre-4.9
-  (make-linux-libre "4.9.95"
-                    "06i756gbglxa2m4lib4p0fff5m2fm4s6f9aqc58i8lihnjqpkldk"
+  (make-linux-libre "4.9.96"
+                    "0w4j8pfpa1qfyv1ipqvdalfydsw2d1ygqd4aj9ls7f16rxq3clw0"
                     %intel-compatible-systems
                     #:configuration-file kernel-config))
 

From feb477869e365b9d80df00b4c1c170a417d07a3f Mon Sep 17 00:00:00 2001
From: Mark H Weaver <mhw@netris.org>
Date: Tue, 24 Apr 2018 16:50:54 -0400
Subject: [PATCH 110/275] gnu: linux-libre@4.14: Update to 4.14.36.

* gnu/packages/linux.scm (%linux-libre-4.14-version): Update to 4.14.36.
(%linux-libre-4.14-hash): Update hash.
---
 gnu/packages/linux.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 5bdde86bc3..06ba61a096 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -400,8 +400,8 @@ It has been modified to remove all non-free binary blobs.")
                     %linux-compatible-systems
                     #:configuration-file kernel-config))
 
-(define %linux-libre-4.14-version "4.14.35")
-(define %linux-libre-4.14-hash "0dfzc2290zks1a63zld8ac0xarc8gxwwh4wsr71y8mas7gfmyqzj")
+(define %linux-libre-4.14-version "4.14.36")
+(define %linux-libre-4.14-hash "03iwsaa5bb43v2yq81n0i9ysj63fik0nnhlrvwq8zsk8ni9sl6yb")
 
 (define-public linux-libre-4.14
   (make-linux-libre %linux-libre-4.14-version

From ba39d3280759fb20a4ff0092a5afac721a5fa769 Mon Sep 17 00:00:00 2001
From: Mark H Weaver <mhw@netris.org>
Date: Tue, 24 Apr 2018 16:51:45 -0400
Subject: [PATCH 111/275] gnu: linux-libre: Update to 4.16.4.

* gnu/packages/linux.scm (%linux-libre-version): Update to 4.16.4.
(%linux-libre-hash): Update hash.
---
 gnu/packages/linux.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 06ba61a096..e6a1dae0c4 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -391,8 +391,8 @@ It has been modified to remove all non-free binary blobs.")
 ;; supports qemu "virt" machine and possibly a large number of ARM boards.
 ;; See : https://wiki.debian.org/DebianKernel/ARMMP.
 
-(define %linux-libre-version "4.16.3")
-(define %linux-libre-hash "1wmx0ph8nbwidlx1dh8bi4p97b84nif9ymv00mafnn6iykdfdin0")
+(define %linux-libre-version "4.16.4")
+(define %linux-libre-hash "0lq3yv88yd9zcz52bl4hfllb41vy1i826gcim6qjjc88assqib9i")
 
 (define-public linux-libre
   (make-linux-libre %linux-libre-version

From b24b19e3ffb01ae0663e96dbafc01759646c142f Mon Sep 17 00:00:00 2001
From: Rutger Helling <rhelling@mykolab.com>
Date: Tue, 24 Apr 2018 23:31:54 +0200
Subject: [PATCH 112/275] gnu: retroarch: Update to 1.7.2.

* gnu/packages/emulators.scm (retroarch): Update to 1.7.2.
---
 gnu/packages/emulators.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm
index 75b191c067..9bf78ce05f 100644
--- a/gnu/packages/emulators.scm
+++ b/gnu/packages/emulators.scm
@@ -1043,7 +1043,7 @@ emulation community.  It provides highly accurate emulation.")
 (define-public retroarch
   (package
     (name "retroarch")
-    (version "1.7.1")
+    (version "1.7.2")
     (source
      (origin
        (method url-fetch)
@@ -1051,7 +1051,7 @@ emulation community.  It provides highly accurate emulation.")
                            version ".tar.gz"))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1wykv0w0kdlh7lh0k1ig0lpk5vh4c7r19jlfa9103jmjlryrq679"))))
+        (base32 "1sk3cp8y4rdiyhk2rgk1asdla5mpmybr778v0zqb5m4iyhrd1m2y"))))
     (build-system gnu-build-system)
     (arguments
      '(#:tests? #f                      ; no tests

From 1a04c893fa1fdf2309462f023e884d9c6cac07e5 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Wed, 25 Apr 2018 09:57:11 +0200
Subject: [PATCH 113/275] gnu: emacs-org, emacs-org-contrib: Update packages.

* gnu/packages/emacs.scm (emacs-org): Update to 9.1.11.
(emacs-org-contrib): Update to 20180423.
---
 gnu/packages/emacs.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 3ddca5be4a..802f289c6d 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -4618,14 +4618,14 @@ passive voice.")
     (name "emacs-org")
     ;; emacs-org-contrib inherits from this package.  Please update its sha256
     ;; checksum as well.
-    (version "9.1.10")
+    (version "9.1.11")
     (source (origin
               (method url-fetch)
               (uri (string-append "http://elpa.gnu.org/packages/org-"
                                   version ".tar"))
               (sha256
                (base32
-                "01vvq6m7r2ifyflvq5ga241qvl4j62smz0zr6jljk56b6nqi20lm"))))
+                "0i27g5qbkfqbxhgiz917pjwkxg3rwid99d0ickwx43bzq0zi7c1m"))))
     (build-system emacs-build-system)
     (home-page "https://orgmode.org/")
     (synopsis "Outline-based notes management and organizer")
@@ -4639,14 +4639,14 @@ reproducible research.")
   (package
     (inherit emacs-org)
     (name "emacs-org-contrib")
-    (version "20180416")
+    (version "20180423")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://orgmode.org/elpa/org-plus-contrib-"
                                   version ".tar"))
               (sha256
                (base32
-                "1f5zdfsa1fcf66hk3w57wh5385069yg0b86h57jgkcbmxkcmj6ij"))))
+                "1aggvdy74q8p79xyc19zring5gjvlzp6lbsq8ar319zkmcjrapqd"))))
     (arguments
      `(#:modules ((guix build emacs-build-system)
                   (guix build utils)

From 076fcab12064e3071de6104ea18a0bd3be87ea94 Mon Sep 17 00:00:00 2001
From: Rutger Helling <rhelling@mykolab.com>
Date: Wed, 25 Apr 2018 11:15:56 +0200
Subject: [PATCH 114/275] gnu: vulkan-icd-loader: Update to 1.1.73.0.

* gnu/packages/vulkan.scm (vulkan-icd-loader): Update to 1.1.73.0.
---
 gnu/packages/vulkan.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm
index 12b1f93015..ac9f6f2f25 100644
--- a/gnu/packages/vulkan.scm
+++ b/gnu/packages/vulkan.scm
@@ -160,7 +160,7 @@ interpretation of the specifications for these languages.")
 (define-public vulkan-icd-loader
   (package
     (name "vulkan-icd-loader")
-    (version "1.1.70.0")
+    (version "1.1.73.0")
     (source
      (origin
        (method url-fetch)
@@ -169,7 +169,7 @@ interpretation of the specifications for these languages.")
              "archive/sdk-" version ".tar.gz"))
        (sha256
         (base32
-         "15qkh77596v3xivnbb3l0q9zbmmsdglnaza2m1g7f8q7bbigyc5x"))))
+         "1qb34j2zrc04fgs96m3k76vi4nx3sygbdcyg7pbwasr45cbdhsxb"))))
     (build-system cmake-build-system)
     (arguments
      `(#:tests? #f ;FIXME: 23/39 tests fail.  Try "tests/run_all_tests.sh".
@@ -182,6 +182,7 @@ interpretation of the specifications for these languages.")
              #t)))
        #:configure-flags (list
                           "-DBUILD_LAYERS=OFF" ; FIXME: Fails to build.
+                          "-DBUILD_TESTS=OFF" ; FIXME: Needs 'googletest' submodule.
                           (string-append "-DCMAKE_INSTALL_LIBDIR="
                                               (assoc-ref %outputs "out") "/lib"))))
     (inputs `(("glslang" ,glslang)

From 035ee04b8978b8b58ad538aeea9aeb87f802203f Mon Sep 17 00:00:00 2001
From: Rutger Helling <rhelling@mykolab.com>
Date: Wed, 25 Apr 2018 11:25:35 +0200
Subject: [PATCH 115/275] gnu: parallel: Update to 20180422.

* gnu/packages/parallel.scm (parallel): Update to 20180422.
---
 gnu/packages/parallel.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm
index 66d9e933e7..1dfafac4e7 100644
--- a/gnu/packages/parallel.scm
+++ b/gnu/packages/parallel.scm
@@ -6,7 +6,7 @@
 ;;; Copyright © 2016 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2016 Ben Woodcroft <donttrustben@gmail.com>
-;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com>
+;;; Copyright © 2017, 2018 Rutger Helling <rhelling@mykolab.com>
 ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -47,7 +47,7 @@
 (define-public parallel
   (package
     (name "parallel")
-    (version "20180322")
+    (version "20180422")
     (source
      (origin
       (method url-fetch)
@@ -55,7 +55,7 @@
                           version ".tar.bz2"))
       (sha256
        (base32
-        "15v46pv4z98xm3fkwy7335faw4r7pilrxp4xis5a4zi4319sv2b3"))))
+        "0xsfpbxwgd4197gra981iv0nmjfk58c0d88dxx6dh6yrqz523klx"))))
     (build-system gnu-build-system)
     (arguments
      `(#:phases

From 113e9bc5a46707bdff4521655720c9694f587016 Mon Sep 17 00:00:00 2001
From: Rutger Helling <rhelling@mykolab.com>
Date: Wed, 25 Apr 2018 11:30:21 +0200
Subject: [PATCH 116/275] gnu: diffoscope: Update to 93.

* gnu/packages/package-management.scm (diffoscope): Update to 93.
---
 gnu/packages/package-management.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index a08bfaf5b7..c4107f79e2 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -6,6 +6,7 @@
 ;;; Copyright © 2017 Roel Janssen <roel@gnu.org>
 ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2018 Julien Lepiller <julien@lepiller.eu>
+;;; Copyright © 2018 Rutger Helling <rhelling@mykolab.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -534,13 +535,13 @@ transactions from C or Python.")
 (define-public diffoscope
   (package
     (name "diffoscope")
-    (version "90")
+    (version "93")
     (source (origin
               (method url-fetch)
               (uri (pypi-uri name version))
               (sha256
                (base32
-                "0hhg26vi0z2q4gwklwq4k16hibc4kq16jvyzp6zhr4kspi07wl6i"))))
+                "0g90nf7817jk03hzk36l3hymky4xqs50iynfld3r0in7hffly5nj"))))
     (build-system python-build-system)
     (arguments
      `(#:phases (modify-phases %standard-phases

From fe355a1f8df476eabbc7718d8b420e3e524a099a Mon Sep 17 00:00:00 2001
From: Rutger Helling <rhelling@mykolab.com>
Date: Wed, 25 Apr 2018 11:41:17 +0200
Subject: [PATCH 117/275] gnu: youtube-dl: Update to 2018.04.25.

* gnu/packages/video.scm (youtube-dl): Update to 2018.04.25.
---
 gnu/packages/video.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index dc5a375664..7c2e20527f 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -1153,7 +1153,7 @@ access to mpv's powerful playback capabilities.")
 (define-public youtube-dl
   (package
     (name "youtube-dl")
-    (version "2018.04.16")
+    (version "2018.04.25")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://yt-dl.org/downloads/"
@@ -1161,7 +1161,7 @@ access to mpv's powerful playback capabilities.")
                                   version ".tar.gz"))
               (sha256
                (base32
-                "046zg8pww2xg1yibh7c1a8jcg8f1znr4hsz1l1da03djcp6na99d"))))
+                "17zxgwfcy7c6gdyxdgh02f5zi52gvmy0zpccfj6zjkhw5iqj1vbw"))))
     (build-system python-build-system)
     (arguments
      ;; The problem here is that the directory for the man page and completion

From 5854082a7ad2aa5e7907d3fcde88a867bb0402ed Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Wed, 18 Apr 2018 06:30:43 +0200
Subject: [PATCH 118/275] gnu: ruby-ascii85: Update to 1.0.3.

* gnu/packages/ruby.scm (ruby-ascii85): Update to 1.0.3.
---
 gnu/packages/ruby.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index 98bb5bd110..fc63709894 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -4585,14 +4585,14 @@ files and use the data therein.")
 (define-public ruby-ascii85
   (package
     (name "ruby-ascii85")
-    (version "1.0.2")
+    (version "1.0.3")
     (source
      (origin
        (method url-fetch)
        (uri (rubygems-uri "Ascii85" version))
        (sha256
         (base32
-         "0j95sbxd18kc8rhcnvl1w37kflqpax1r12h1x47gh4xxn3mz4m7q"))))
+         "0658m37jjjn6drzqg1gk4p6c205mgp7g1jh2d00n4ngghgmz5qvs"))))
     (build-system ruby-build-system)
     (native-inputs
      `(("bundler" ,bundler)))

From 21acf56184870eee13bb550b18487e42d1b6ba8c Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Wed, 18 Apr 2018 20:53:50 +0200
Subject: [PATCH 119/275] gnu: perl-type-tiny: Update to 1.002002.

* gnu/packages/perl.scm (perl-type-tiny): Update to 1.002002.
---
 gnu/packages/perl.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm
index 9de8c3fdf7..1975ae15ab 100644
--- a/gnu/packages/perl.scm
+++ b/gnu/packages/perl.scm
@@ -8789,7 +8789,7 @@ variable conform.")
 (define-public perl-type-tiny
   (package
     (name "perl-type-tiny")
-    (version "1.002001")
+    (version "1.002002")
     (source
      (origin
        (method url-fetch)
@@ -8797,7 +8797,7 @@ variable conform.")
                            "Type-Tiny-" version ".tar.gz"))
        (sha256
         (base32
-         "1p8krim8kvw123nady96fagi8sk2pj1z8jkr4r8n45ihyamfxjck"))))
+         "0b48v28rvl20969gyr62yg6gr6a2nj9qik0bixavbjdmk67hqnx8"))))
     (build-system perl-build-system)
     (native-inputs
      `(("perl-test-warnings" ,perl-test-warnings)))

From 222999c989f76fb734ac83d6b397e9281c81123f Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Wed, 18 Apr 2018 20:54:23 +0200
Subject: [PATCH 120/275] gnu: ruby-domain-name: Update to 0.5.20180417.

* gnu/packages/ruby.scm (ruby-domain-name): Update to 0.5.20180417.
---
 gnu/packages/ruby.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index fc63709894..c15e677438 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -4079,14 +4079,14 @@ support to both Ruby and JRuby.  It uses @code{unf_ext} on CRuby and
 (define-public ruby-domain-name
   (package
     (name "ruby-domain-name")
-    (version "0.5.20170404")
+    (version "0.5.20180417")
     (source
      (origin
        (method url-fetch)
        (uri (rubygems-uri "domain_name" version))
        (sha256
         (base32
-         "12hs8yijhak7p2hf1xkh98g0mnp5phq3mrrhywzaxpwz1gw5r3kf"))))
+         "0abdlwb64ns7ssmiqhdwgl27ly40x2l27l8hs8hn0z4kb3zd2x3v"))))
     (build-system ruby-build-system)
     (arguments
      `(#:phases

From ab85cf7185da366da56314c53d8e43276e1cccc4 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Wed, 18 Apr 2018 21:27:31 +0200
Subject: [PATCH 121/275] gnu: perl-business-isbn: Update to 3.004.

* gnu/packages/perl.scm (perl-business-isbn): Update to 3.004.
---
 gnu/packages/perl.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm
index 1975ae15ab..3edb2b6168 100644
--- a/gnu/packages/perl.scm
+++ b/gnu/packages/perl.scm
@@ -610,7 +610,7 @@ Agency.")
 (define-public perl-business-isbn
   (package
     (name "perl-business-isbn")
-    (version "3.003")
+    (version "3.004")
     (source
      (origin
        (method url-fetch)
@@ -618,7 +618,7 @@ Agency.")
                            "Business-ISBN-" version ".tar.gz"))
        (sha256
         (base32
-         "1i2bxzqkki257rqbswa4ryj1grmwa5s47wrxln2ff5mha1ry31gm"))))
+         "07l3zfv8hagv37i3clvj5a1zc2jarr5phg80c93ks35zaz6llx9i"))))
     (build-system perl-build-system)
     (propagated-inputs
      `(("perl-business-isbn-data" ,perl-business-isbn-data)

From 5b862761f2a60af79b4c16851454a5e792ef4f56 Mon Sep 17 00:00:00 2001
From: Roel Janssen <roel@gnu.org>
Date: Wed, 25 Apr 2018 14:28:28 +0200
Subject: [PATCH 122/275] gnu: guix: Update to ab85cf7.

* gnu/packages/package-management.scm (guix): Update to ab85cf7.
---
 gnu/packages/package-management.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index c4107f79e2..e834f643c4 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -94,8 +94,8 @@
   ;; Note: the 'update-guix-package.scm' script expects this definition to
   ;; start precisely like this.
   (let ((version "0.14.0")
-        (commit "486de7377f25438b0f44fd93f97e9ef822d558b8")
-        (revision 10))
+        (commit "ab85cf7185da366da56314c53d8e43276e1cccc4")
+        (revision 11))
     (package
       (name "guix")
 
@@ -111,7 +111,7 @@
                       (commit commit)))
                 (sha256
                  (base32
-                  "12ghbby83w335g7vbg7h52hjaal5l6mc6qmldlx8029340br8h1w"))
+                  "1c00yr2vgsdl3kmlbjppyws47ssahamdx88y0wg26x73px71rd19"))
                 (file-name (string-append "guix-" version "-checkout"))))
       (build-system gnu-build-system)
       (arguments

From d000264299864480aa8b80357a3c6ae5ff2a5e74 Mon Sep 17 00:00:00 2001
From: Roel Janssen <roel@gnu.org>
Date: Wed, 25 Apr 2018 14:55:26 +0200
Subject: [PATCH 123/275] gnu: guile-ssh: Move files from bin to examples
 directory.

* gnu/packages/ssh.scm (guile-ssh): Move files from bin to the examples
  directory.
---
 gnu/packages/ssh.scm | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm
index afd41cd8e7..e4a277c5e6 100644
--- a/gnu/packages/ssh.scm
+++ b/gnu/packages/ssh.scm
@@ -259,8 +259,20 @@ Additionally, various channel-specific options can be negotiated.")
                              (substitute* (find-files "." "\\.scm$")
                                (("\"libguile-ssh\"")
                                 (string-append "\"" libdir "/libguile-ssh\"")))
-                             #t)))))
-
+                             #t))))
+                  (add-after 'install 'remove-bin-directory
+                    (lambda* (#:key outputs #:allow-other-keys)
+                      (let* ((out (assoc-ref outputs "out"))
+                             (bin (string-append out "/bin"))
+                             (examples (string-append
+                                        out "/share/guile-ssh/examples")))
+                        (mkdir-p examples)
+                        (rename-file (string-append bin "/ssshd.scm")
+                                     (string-append examples "/ssshd.scm"))
+                        (rename-file (string-append bin "/sssh.scm")
+                                     (string-append examples "/sssh.scm"))
+                        (delete-file-recursively bin)
+                        #t))))
        ;; Tests are not parallel-safe.
        #:parallel-tests? #f))
     (native-inputs `(("autoconf" ,autoconf)

From 8bf8dedc9a3009ec00f4d2a785d85474b07c3f05 Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Wed, 25 Apr 2018 12:14:13 +0200
Subject: [PATCH 124/275] gnu: rocksdb: Update to 5.12.4.

* gnu/packages/databases.scm (rocksdb): Update to 5.12.4.
---
 gnu/packages/databases.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index ecbb815246..f54fec6420 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -845,7 +845,7 @@ types are supported, as is encryption.")
 (define-public rocksdb
   (package
     (name "rocksdb")
-    (version "5.10.4")
+    (version "5.12.4")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://github.com/facebook/rocksdb"
@@ -853,7 +853,7 @@ types are supported, as is encryption.")
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "0hp7jxr99vyc57n708hiqk4lks9a9zmjgfjc21mx6v1rmabj2944"))
+                "1jcwgsjhk4hdfr2wf549blkgb89vwcdb5i2ahhqs6zf3mm20i3bf"))
               (modules '((guix build utils)))
               (snippet
                '(begin

From 3743e1320eb6ff6da8265d6576d4a6969ec5514e Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Wed, 25 Apr 2018 12:26:25 +0200
Subject: [PATCH 125/275] gnu: ceph: Update to 12.2.5.

* gnu/packages/patches/ceph-skip-collect-sys-info-test.patch: Adjust.
* gnu/packages/storage.scm (ceph): Update to 12.2.5.
---
 .../patches/ceph-skip-collect-sys-info-test.patch     | 11 +++--------
 gnu/packages/storage.scm                              |  4 ++--
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/patches/ceph-skip-collect-sys-info-test.patch b/gnu/packages/patches/ceph-skip-collect-sys-info-test.patch
index f210799254..429087c661 100644
--- a/gnu/packages/patches/ceph-skip-collect-sys-info-test.patch
+++ b/gnu/packages/patches/ceph-skip-collect-sys-info-test.patch
@@ -1,14 +1,13 @@
 This test fails because /etc/os-release is not available.
 
 diff --git a/src/test/common/test_util.cc b/src/test/common/test_util.cc
-index 288dd37db1..95b6cd4b30 100644
+index 64eace923c..6daf4aa514 100644
 --- a/src/test/common/test_util.cc
 +++ b/src/test/common/test_util.cc
-@@ -31,19 +31,3 @@ TEST(util, unit_to_bytesize)
- 
+@@ -32,17 +32,3 @@ TEST(util, unit_to_bytesize)
    ASSERT_EQ(65536ll, unit_to_bytesize(" 64K", &cerr));
  }
--
+ 
 -#if defined(__linux__)
 -TEST(util, collect_sys_info)
 -{
@@ -18,12 +17,8 @@ index 288dd37db1..95b6cd4b30 100644
 -  collect_sys_info(&sys_info, cct);
 -
 -  ASSERT_TRUE(sys_info.find("distro") != sys_info.end());
--  ASSERT_TRUE(sys_info.find("distro_version") != sys_info.end());
 -  ASSERT_TRUE(sys_info.find("distro_description") != sys_info.end());
 -
 -  cct->put();
 -}
 -#endif
--- 
-2.11.1
-
diff --git a/gnu/packages/storage.scm b/gnu/packages/storage.scm
index 54d91c1f3c..2ba6b856fb 100644
--- a/gnu/packages/storage.scm
+++ b/gnu/packages/storage.scm
@@ -52,14 +52,14 @@
 (define-public ceph
   (package
     (name "ceph")
-    (version "12.2.4")
+    (version "12.2.5")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://download.ceph.com/tarballs/ceph-"
                                   version ".tar.gz"))
               (sha256
                (base32
-                "13hv8scaxc1gdvrhzbfnsk4yy3pla6n1i4j4j4zf7schmbf0j8mp"))
+                "1ydc3mfvc0vpnpfnfmissvsrsj4jyxgzc2pcl1a4vdr3bwkcglp3"))
               (patches
                (search-patches "ceph-skip-unittest_blockdev.patch"
                                "ceph-skip-collect-sys-info-test.patch"

From 5843dab8fbb8f4583e37c16a9295b7b7917eebd8 Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Wed, 25 Apr 2018 12:29:02 +0200
Subject: [PATCH 126/275] gnu: fio: Update to 3.6.

* gnu/packages/benchmark.scm (fio): Update to 3.6.
---
 gnu/packages/benchmark.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/benchmark.scm b/gnu/packages/benchmark.scm
index 77dcd78331..bf88bd4919 100644
--- a/gnu/packages/benchmark.scm
+++ b/gnu/packages/benchmark.scm
@@ -34,7 +34,7 @@
 (define-public fio
   (package
     (name "fio")
-    (version "3.5")
+    (version "3.6")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -42,7 +42,7 @@
                        "fio-" version ".tar.bz2"))
               (sha256
                (base32
-                "1rrzcrn07db4pffvi2q0d0k884bwcapx6r1rfv4yx9066snvx240"))))
+                "1d2jibp1b2dq97f22wj6pcjl7gbd2kmhfggj2c7q3j8v9axjqsh2"))))
     (build-system gnu-build-system)
     (arguments
      '(#:test-target "test"

From 0afeda65218ed0c82ab18762111c52a9fedd2582 Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Wed, 25 Apr 2018 12:45:39 +0200
Subject: [PATCH 127/275] gnu: multipath-tools: Update to 0.7.6.

* gnu/packages/linux.scm (multipath-tools): Update to 0.7.6.
---
 gnu/packages/linux.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index e6a1dae0c4..c7c057b349 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -2898,7 +2898,7 @@ arrays when needed.")
 (define-public multipath-tools
   (package
     (name "multipath-tools")
-    (version "0.7.4")
+    (version "0.7.6")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://git.opensvc.com/?p=multipath-tools/"
@@ -2906,7 +2906,7 @@ arrays when needed.")
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "02lk453wa2gfxkl8zmdws15nkcibln2yw76zm779pkngkhggl6w8"))
+                "0zkcayi3mmp43ji2zid1gprgsvqhjjapsw7jjd60sf75prf50h2r"))
               (modules '((guix build utils)))
               (snippet
                '(begin

From 06c4778ae290c9f8de5f8ef1683cec14de8f2ebc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Tue, 24 Apr 2018 16:55:25 +0200
Subject: [PATCH 128/275] build: Add silent rules for Texinfo xref translation.

* Makefile.am (AM_V_POXREF, AM_V_POXREF_, AM_V_POXREF_0): New
variables.
* doc/local.mk ($(srcdir)/%D%/guix.%.texi)
($(srcdir)/%D%/contributing.%.texi): Use $(AM_V_POXREF).
---
 Makefile.am  | 4 ++++
 doc/local.mk | 6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 86528e8fdd..9f134c9708 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -800,3 +800,7 @@ AM_V_HELP2MAN_0 = @echo "  HELP2MAN" $@;
 AM_V_PO4A = $(AM_V_PO4A_$(V))
 AM_V_PO4A_ = $(AM_V_PO4A_$(AM_DEFAULT_VERBOSITY))
 AM_V_PO4A_0 = @echo "  PO4A" $@;
+
+AM_V_POXREF = $(AM_V_POXREF_$(V))
+AM_V_POXREF_ = $(AM_V_POXREF_$(AM_DEFAULT_VERBOSITY))
+AM_V_POXREF_0 = @echo "  POXREF" $@;
diff --git a/doc/local.mk b/doc/local.mk
index 64d18e121a..1bfc03aba8 100644
--- a/doc/local.mk
+++ b/doc/local.mk
@@ -1,6 +1,6 @@
 # GNU Guix --- Functional package management for GNU
 # Copyright © 2016 Eric Bavier <bavier@member.fsf.org>
-# Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org>
+# Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
 # Copyright © 2013 Andreas Enge <andreas@enge.fr>
 # Copyright © 2016 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
 # Copyright © 2016, 2018 Mathieu Lirzin <mthl@gnu.org>
@@ -93,12 +93,12 @@ endef
 $(srcdir)/%D%/guix.%.texi: po/doc/guix.%.po $(srcdir)/%D%/contributing.%.texi
 	-$(AM_V_PO4A)$(PO4A_TRANSLATE) $(PO4A_PARAMS) -m "%D%/guix.texi" -p "$<" -l "$@.tmp"
 	-sed -i "s|guix\.info|$$(basename "$@" | sed 's|texi$$|info|')|" "$@.tmp"
-	-$(xref_command)
+	-$(AM_V_POXREF)$(xref_command)
 	-mv "$@.tmp" "$@"
 
 $(srcdir)/%D%/contributing.%.texi: po/doc/guix.%.po po/doc/contributing.%.po
 	-$(AM_V_PO4A)$(PO4A_TRANSLATE) $(PO4A_PARAMS) -m "%D%/contributing.texi" -p "$(word 2,$^)" -l "$@.tmp"
-	-$(xref_command)
+	-$(AM_V_POXREF)$(xref_command)
 	-mv "$@.tmp" "$@"
 
 %D%/os-config-%.texi: gnu/system/examples/%.tmpl

From 0eb3b8c0b626d55c1575e3106d83448a8516a806 Mon Sep 17 00:00:00 2001
From: Pierre Neidhardt <ambrevar@gmail.com>
Date: Wed, 25 Apr 2018 15:36:00 +0530
Subject: [PATCH 129/275] gnu: guile-sly: Update home-page.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/guile.scm (guile-sly): Update home-page.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
 gnu/packages/guile.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index b954988712..2af6f875e9 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -1481,7 +1481,7 @@ users and in some situations.")
     (description "Sly is a 2D/3D game engine written in Guile Scheme.  Sly
 features a functional reactive programming interface and live coding
 capabilities.")
-    (home-page "http://dthompson.us/pages/software/sly.html")
+    (home-page "https://dthompson.us/projects/sly.html")
     (license license:gpl3+)))
 
 (define-public g-wrap

From b889df2722c30d74402f0d14037888834702aa0c Mon Sep 17 00:00:00 2001
From: Pierre Neidhardt <ambrevar@gmail.com>
Date: Wed, 25 Apr 2018 14:39:48 +0530
Subject: [PATCH 130/275] gnu: Add emacs-helm-system-packages
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/emacs.scm (emacs-helm-system-packages): New variable.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
 gnu/packages/emacs.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 802f289c6d..4f36d73277 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -5190,6 +5190,34 @@ To make YASnippet aware of these snippets, add the above directory to
 Yasnippet.")
       (license license:gpl2+))))
 
+(define-public emacs-helm-system-packages
+  (let ((commit "986b7bd360a705053500c4ce2c9bea03dd7b24a6")
+        (revision "1"))
+    (package
+      (name "emacs-helm-system-packages")
+      (version (git-version "1.9.0" revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://github.com/emacs-helm/helm-system-packages")
+                      (commit commit)))
+                (file-name (string-append name "-" version "-checkout"))
+                (sha256
+                 (base32
+                  "19iklhpxgh5xx6h4dysf58nd46lmyb46xj601lf7kbwl6yq0y61f"))))
+      (build-system emacs-build-system)
+      (propagated-inputs
+       `(("emacs-helm" ,emacs-helm)))
+      (home-page "https://github.com/emacs-helm/helm-system-packages")
+      (synopsis "Helm System Packages is an interface to your package manager")
+      (description "List all available packages in Helm (with installed
+packages displayed in their own respective face).  Fuzzy-search, mark and
+execute the desired action over any selections of packages: Install,
+uninstall, display packages details (in Org Mode) or insert details at point,
+find files owned by packages...  And much more, including performing all the
+above over the network.")
+      (license license:gpl3+))))
+
 (define-public emacs-memoize
   (package
     (name "emacs-memoize")

From a0bee5e769191705f930e07d4ed0f19273e3dec7 Mon Sep 17 00:00:00 2001
From: Pierre Neidhardt <ambrevar@gmail.com>
Date: Wed, 25 Apr 2018 14:40:21 +0530
Subject: [PATCH 131/275] gnu: Add emacs-evil-collection
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/emacs.scm (emacs-evil-collection): New variable.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
 gnu/packages/emacs.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 4f36d73277..2c9bd68b23 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -4527,6 +4527,31 @@ main features of Vim, and provides facilities for writing custom
 extensions.")
     (license license:gpl3+)))
 
+(define-public emacs-evil-collection
+  (let ((commit "f40704a57fd33b4bfad64147a2b771fc8961fdfc")
+        (revision "1"))
+    (package
+      (name "emacs-evil-collection")
+      (version (git-version "20180425" revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://github.com/emacs-evil/evil-collection")
+                      (commit commit)))
+                (file-name (string-append name "-" version "-checkout"))
+                (sha256
+                 (base32
+                  "0qn19k0f3isnbi1hkmcf3qjxbyvp23m5ak5ny7623qgwb2nwz1l5"))))
+      (build-system emacs-build-system)
+      (propagated-inputs
+       `(("emacs-evil" ,emacs-evil)))
+      (home-page "https://github.com/emacs-evil/evil-collection")
+      (synopsis "Collection of Evil bindings for many major and minor modes")
+      (description "This is a collection of Evil bindings for the parts of
+Emacs that Evil does not cover properly by default, such as @code{help-mode},
+@code{M-x calendar}, Eshell and more.")
+      (license license:gpl3+))))
+
 (define-public emacs-goto-chg
   (package
     (name "emacs-goto-chg")

From 37b9be5878d1694967a41d313de97f7a957df120 Mon Sep 17 00:00:00 2001
From: Pierre Neidhardt <ambrevar@gmail.com>
Date: Wed, 25 Apr 2018 15:35:39 +0530
Subject: [PATCH 132/275] gnu: guile-sdl2: Require guile 2.2.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/sdl.scm (guile-sdl2)[inputs]: Replace GUILE-2.0 with
GUILE-2.2.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
 gnu/packages/sdl.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm
index 30d18aa1c3..7ed4e5ca6e 100644
--- a/gnu/packages/sdl.scm
+++ b/gnu/packages/sdl.scm
@@ -502,7 +502,7 @@ sound and device input (keyboards, joysticks, mice, etc.).")
              (string-append "--with-libsdl2-mixer-prefix="
                             (assoc-ref %build-inputs "sdl2-mixer")))))
     (native-inputs
-     `(("guile" ,guile-2.0)
+     `(("guile" ,guile-2.2)
        ("pkg-config" ,pkg-config)))
     (inputs
      `(("sdl2" ,sdl2)

From eb88e2c11ccf47fb8b2c0b68425c3fc9ba4a116a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Lassieur?= <clement@lassieur.org>
Date: Wed, 25 Apr 2018 13:12:24 +0200
Subject: [PATCH 133/275] gnu: Add l-smash.

* gnu/packages/video.scm (l-smash): New variable.
---
 gnu/packages/video.scm | 40 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 39 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 7c2e20527f..ef64335294 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -19,7 +19,7 @@
 ;;; Copyright © 2017 Chris Marusich <cmmarusich@gmail.com>
 ;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
 ;;; Copyright © 2017 Ethan R. Jones <doubleplusgood23@gmail.com>
-;;; Copyright © 2017 Clément Lassieur <clement@lassieur.org>
+;;; Copyright © 2017, 2018 Clément Lassieur <clement@lassieur.org>
 ;;; Copyright © 2017 Gregor Giesen <giesen@zaehlwerk.net>
 ;;; Copyright © 2017, 2018 Rutger Helling <rhelling@mykolab.com>
 ;;; Copyright © 2018 Roel Janssen <roel@gnu.org>
@@ -2852,3 +2852,41 @@ the results, download the highest-rated result in the requested language and
 save it to the appropriate filename.")
       (license license:gpl3+)
       (home-page "https://github.com/alexanderwink/subdl"))))
+
+(define-public l-smash
+  (package
+    (name "l-smash")
+    (version "2.14.5")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "https://github.com/" name "/" name "/archive/v"
+                    version ".tar.gz"))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0dary0h65kq6sv93iabv25djlvzr5ckdcp3ywagbix44wqfw7xz6"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:tests? #f                      ;no tests
+       #:make-flags
+       (list (string-append "LDFLAGS=-Wl,-L.,-rpath="
+                            (assoc-ref %outputs "out") "/lib"))
+       #:phases
+       (modify-phases %standard-phases
+         ;; configure fails if it is followed by CONFIG_SHELL
+         (replace 'configure
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let ((out (assoc-ref outputs "out")))
+               (invoke "./configure" (string-append "--prefix=" out)
+                       "--disable-static")))))))
+    (native-inputs
+     `(("which" ,which)))
+    (home-page "https://l-smash.github.io/l-smash/")
+    (synopsis "MP4 multiplexer and demultiplexer library")
+    (description
+     "L-SMASH is a cross-platform library that handles the ISO base media file
+format and some of its derived file formats, including MP4.  It operates as a
+multiplexer and demultiplexer, and can mux video and audio in several formats
+using standalone executable files.")
+    (license license:isc)))

From 03e45891245a1951c347001d3c11883f2d86d709 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= <iyzsong@member.fsf.org>
Date: Thu, 26 Apr 2018 09:37:00 +0800
Subject: [PATCH 134/275] gnu: runc: Update comment about status of tests.

* gnu/packages/virtualization.scm (runc)[arguments]: Update comment.
---
 gnu/packages/virtualization.scm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index 86f4d71364..5e39fb9b9a 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -792,7 +792,9 @@ monitor/GPU.")
     (arguments
      '(#:import-path "github.com/opencontainers/runc"
        #:install-source? #f
-       #:tests? #f                      ; FIXME: 20/139 tests fail.
+       ;; XXX: 20/139 tests fail due to missing /var, cgroups and apparmor in
+       ;; the build environment.
+       #:tests? #f
        #:phases
        (modify-phases %standard-phases
          (replace 'unpack

From dce50fbc91b89b142b82088465a58f26657df74e Mon Sep 17 00:00:00 2001
From: Rutger Helling <rhelling@mykolab.com>
Date: Thu, 26 Apr 2018 08:53:01 +0200
Subject: [PATCH 135/275] gnu: retroarch: Fix hash.

* gnu/packages/emulators.scm (retroarch): Fix incorrect hash.
---
 gnu/packages/emulators.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm
index 9bf78ce05f..82283e1bcf 100644
--- a/gnu/packages/emulators.scm
+++ b/gnu/packages/emulators.scm
@@ -1051,7 +1051,7 @@ emulation community.  It provides highly accurate emulation.")
                            version ".tar.gz"))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1sk3cp8y4rdiyhk2rgk1asdla5mpmybr778v0zqb5m4iyhrd1m2y"))))
+        (base32 "1y9fakr41h6xpddpkj12mcw1kgldvy76nzvxm5jk5v7iyiks4c6k"))))
     (build-system gnu-build-system)
     (arguments
      '(#:tests? #f                      ; no tests

From 5e94ce97948c556630bf95ec7de039b67cec8141 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Thu, 26 Apr 2018 09:18:22 +0300
Subject: [PATCH 136/275] gnu: terminology: Update to 1.2.0.

* gnu/packages/enlightenment.scm (terminology): Update to 1.2.0.
[source]: Update source snippet.
[build-system]: Switch to meson-build-system.
[native-inputs]: Add perl.
---
 gnu/packages/enlightenment.scm | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm
index 0138b7287f..c9a58222e6 100644
--- a/gnu/packages/enlightenment.scm
+++ b/gnu/packages/enlightenment.scm
@@ -49,6 +49,7 @@
   #:use-module (gnu packages llvm)
   #:use-module (gnu packages lua)
   #:use-module (gnu packages pdf)
+  #:use-module (gnu packages perl)
   #:use-module (gnu packages photo)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages pulseaudio)
@@ -179,7 +180,7 @@ removable devices or support for multimedia.")
 (define-public terminology
   (package
     (name "terminology")
-    (version "1.1.1")
+    (version "1.2.0")
     (source (origin
               (method url-fetch)
               (uri
@@ -187,24 +188,17 @@ removable devices or support for multimedia.")
                               "terminology/terminology-" version ".tar.xz"))
               (sha256
                (base32
-                "05ncxvzb9rzkyjvd95hzn8lswqdwr8cix6rd54nqn9559jibh4ns"))
+                "0kw34l5lahn1qaks3ah6x8k41d6hfywpqfak2p7qq1z87zj506mx"))
               (modules '((guix build utils)))
               ;; Remove the bundled fonts.
               ;; TODO: Remove bundled lz4.
               (snippet
                '(begin
                   (delete-file-recursively "data/fonts")
-                  (substitute* '("data/Makefile.in" "data/Makefile.am")
-                    (("fonts") ""))
-                  (substitute* "configure"
-                    (("data/fonts/Makefile") "")
-                    (("\\\"data/fonts/Makefile") "# \"data/fonts/Makefile"))
-                  (substitute* '("data/themes/Makefile.in"
-                                 "data/themes/Makefile.am"
-                                 "data/themes/nyanology/Makefile.in"
-                                 "data/themes/nyanology/Makefile.am")
-                    (("-fd \\$\\(top_srcdir\\)/data/fonts") ""))))))
-    (build-system gnu-build-system)
+                  (substitute* "data/meson.build"
+                    (("subdir\\('fonts'\\)") ""))
+                  #t))))
+    (build-system meson-build-system)
     (arguments
      '(#:phases
        (modify-phases %standard-phases
@@ -213,6 +207,7 @@ removable devices or support for multimedia.")
            (lambda _ (setenv "HOME" "/tmp") #t)))))
     (native-inputs
      `(("gettext" ,gettext-minimal)
+       ("perl" ,perl)
        ("pkg-config" ,pkg-config)))
     (inputs
      `(("efl" ,efl)))

From dcf3ab6ab301822ce06eb3ff0eee3b65a3a84335 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Thu, 26 Apr 2018 10:20:15 +0300
Subject: [PATCH 137/275] gnu: enlightenment: Update to 0.22.3.

* gnu/packages/enlightenment.scm (enlightenment): Update to 0.22.3.
---
 gnu/packages/enlightenment.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm
index c9a58222e6..d5e97523dc 100644
--- a/gnu/packages/enlightenment.scm
+++ b/gnu/packages/enlightenment.scm
@@ -254,7 +254,7 @@ Libraries with some extra bells and whistles.")
 (define-public enlightenment
   (package
     (name "enlightenment")
-    (version "0.22.2")
+    (version "0.22.3")
     (source (origin
               (method url-fetch)
               (uri
@@ -262,7 +262,7 @@ Libraries with some extra bells and whistles.")
                               name "/" name "-" version ".tar.xz"))
               (sha256
                (base32
-                "0b33w75s4w7xmz9cv8dyp8vy2gcffnrvjys20fhcpw26abw1wn2d"))))
+                "16zydv7z94aw3rywmb9gr8ya85k7b75h22wng95lfx1x0y1yb0ad"))))
     (build-system gnu-build-system)
     (arguments
      `(#:configure-flags '("--enable-mount-eeze")

From c7fc414e1ee3f5a0fe83b765a56195cef0ac550c Mon Sep 17 00:00:00 2001
From: Rutger Helling <rhelling@mykolab.com>
Date: Thu, 26 Apr 2018 09:46:37 +0200
Subject: [PATCH 138/275] gnu: gnome-tweak-tool: Update to 3.26.4.

* gnu/packages/gnome.scm (gnome-tweak-tool): Update to 3.26.4.
[arguments]: Replace 'configure, 'build, 'check and 'install phases with Meson
build phases.
[native-inputs]: Add "gtk+:bin", "meson" and "ninja".
[inputs]: Add "nautilus." Replace "python@2" with "python" and
"python2-pygobject" with "python-pygobject".
---
 gnu/packages/gnome.scm | 32 +++++++++++++++++++++++---------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index aac1f08978..0311621cc0 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -6294,7 +6294,7 @@ existing databases over the internet.")
 (define-public gnome-tweak-tool
   (package
     (name "gnome-tweak-tool")
-    (version "3.24.1")
+    (version "3.26.4")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/gnome-tweak-tool/"
@@ -6304,7 +6304,7 @@ existing databases over the internet.")
                         (search-patch "gnome-tweak-tool-search-paths.patch")))
               (sha256
                (base32
-                "0rgmm7n6jwc5hz64sprm4jxnky62hw839a7r18rn1mj884vnn8hr"))))
+                "1pq5a0kzh1sz7s7ax5c7p6212k9d51nk5bfvjfyqn99cs928187x"))))
     (build-system glib-or-gtk-build-system)
     (arguments
      `(#:configure-flags '("--localstatedir=/tmp"
@@ -6312,6 +6312,16 @@ existing databases over the internet.")
        #:imported-modules ((guix build python-build-system)
                            ,@%glib-or-gtk-build-system-modules)
        #:phases (modify-phases %standard-phases
+                  (delete 'configure)
+                  (replace 'build
+                    (lambda* (#:key outputs #:allow-other-keys)
+                      (invoke "meson" "build"
+                                      "--prefix" (assoc-ref outputs "out"))))
+                  (replace 'check
+                    (lambda _ (invoke "ninja" "-C" "build" "test")))
+                  (replace 'install
+                    (lambda* (#:key outputs #:allow-other-keys)
+                      (invoke "ninja" "-C" "build" "install")))
                   (add-after 'install 'wrap-program
                     (lambda* (#:key outputs #:allow-other-keys)
                       (let ((out               (assoc-ref outputs "out"))
@@ -6322,17 +6332,21 @@ existing databases over the internet.")
                   (add-after 'install 'wrap
                     (@@ (guix build python-build-system) wrap)))))
     (native-inputs
-     `(("intltool" ,intltool)
+     `(("gtk+:bin" ,gtk+ "bin")         ; For gtk-update-icon-cache
+       ("intltool" ,intltool)
+       ("meson" ,meson-for-build)
+       ("ninja" ,ninja)
        ("pkg-config" ,pkg-config)))
     (inputs
-     `(("python" ,python-2)
-       ("python2-pygobject" ,python2-pygobject)
-       ("gnome-desktop" ,gnome-desktop)
-       ("libsoup" ,libsoup)
-       ("libnotify" ,libnotify)
+     `(("gnome-desktop" ,gnome-desktop)
+       ("gtk+" ,gtk+)
        ("gobject-introspection" ,gobject-introspection)
        ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
-       ("gtk+" ,gtk+)))
+       ("libnotify" ,libnotify)
+       ("libsoup" ,libsoup)
+       ("nautilus" ,nautilus)
+       ("python" ,python)
+       ("python-pygobject" ,python-pygobject)))
     (synopsis "Customize advanced GNOME 3 options")
     (home-page "https://wiki.gnome.org/action/show/Apps/GnomeTweakTool")
     (description

From 5fa88cc4663bab79d7209125cea412f851fdd6dc Mon Sep 17 00:00:00 2001
From: Rutger Helling <rhelling@mykolab.com>
Date: Thu, 26 Apr 2018 09:57:34 +0200
Subject: [PATCH 139/275] gnu: gnome-disk-utility: Update to 3.28.1.

* gnu/packages/gnome.scm (gnome-disk-utility): Update to 3.28.1.
---
 gnu/packages/gnome.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 0311621cc0..41b77df141 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -533,7 +533,7 @@ and keep up to date translations of documentation.")
 (define-public gnome-disk-utility
   (package
     (name "gnome-disk-utility")
-    (version "3.26.2")
+    (version "3.28.1")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/" name "/"
@@ -541,7 +541,7 @@ and keep up to date translations of documentation.")
                                   name "-" version ".tar.xz"))
               (sha256
                (base32
-                "1wjnw9hpjqyhrr116491rfzd0837g6jqvzq2z1ndx2sdqv19caxa"))))
+                "09dmknfas8iifv6k5jb4a9ag57s8awrn0f26fd1qlg0mbfjlnfd6"))))
     (build-system meson-build-system)
     (native-inputs
      `(("glib:bin" ,glib "bin")

From 87bcd9bf655035bda31b2921a88ed14d9b6fa2e8 Mon Sep 17 00:00:00 2001
From: Rutger Helling <rhelling@mykolab.com>
Date: Thu, 26 Apr 2018 11:02:32 +0200
Subject: [PATCH 140/275] gnu: evince: Update to 3.28.2.

* gnu/packages/gnome.scm (evince): Update to 3.28.2.
---
 gnu/packages/gnome.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 41b77df141..f0f19a8f7c 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -725,7 +725,7 @@ forgotten when the session ends.")
 (define-public evince
   (package
     (name "evince")
-    (version "3.28.0")
+    (version "3.28.2")
     (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/" name "/"
@@ -733,7 +733,7 @@ forgotten when the session ends.")
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
-               "1a3kcls18dcz1lj8hrx8skcli9xxfyi71c17xjwayh71cm5jc8zs"))))
+               "1qbk1x2c7iacmmfwjzh136v2sdacrkqn9d6bnqid7xn9hlnx4m89"))))
     (build-system glib-or-gtk-build-system)
     (arguments
      `(#:configure-flags '("--disable-nautilus")

From 27b52c1f6aa036ec99691a5c76ecf697e09cd62f Mon Sep 17 00:00:00 2001
From: Rutger Helling <rhelling@mykolab.com>
Date: Thu, 26 Apr 2018 08:14:50 +0200
Subject: [PATCH 141/275] gnu: qemu: Build with Python 3 and SDL2 support.

* gnu/packages/bootloaders.scm (qemu-minimal-2.10): Remove variable.
* gnu/packages/virtualization.scm (qemu)[inputs]: Use sdl2 instead of sdl.
[native-inputs]: Use python-wrapper instead of python@2.
* gnu/packages/virtualization.scm (qemu-minimal)[inputs]: Remove sdl2 instead of
sdl from inherited packages.
* gnu/packages/virtualization.scm (qemu-minimal-2.10): Add variable.
[native-inputs]: Remove python-wrapper from inherited packages and use python@2
instead.
* gnu/packages/debug.scm (american-fuzzy-lop): Inherit from moved hidden-package
qemu-minimal-2.10.
---
 gnu/packages/bootloaders.scm    | 16 ----------------
 gnu/packages/debug.scm          |  3 ++-
 gnu/packages/virtualization.scm | 29 +++++++++++++++++++++++++----
 3 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
index 281bb98fa9..4350ff3a50 100644
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@ -72,22 +72,6 @@
      (base32
       "0p2vhnc18cnbmb39vq4m7hzv4mhnm2l0a2s7gx3ar277fwng3hys"))))
 
-;; The GRUB test suite fails with later versions of Qemu, so we
-;; keep it at 2.10 for now.  See
-;; <https://lists.gnu.org/archive/html/bug-grub/2018-02/msg00004.html>.
-;; TODO: When grub no longer needs this version, move to gnu/packages/debug.scm.
-(define qemu-minimal-2.10
-  (package
-    (inherit qemu-minimal)
-    (version "2.10.2")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://download.qemu.org/qemu-"
-                                  version ".tar.xz"))
-              (sha256
-               (base32
-                "17w21spvaxaidi2am5lpsln8yjpyp2zi3s3gc6nsxj5arlgamzgw"))))))
-
 (define-public grub
   (package
     (name "grub")
diff --git a/gnu/packages/debug.scm b/gnu/packages/debug.scm
index 112c656ff8..c12baf4e2b 100644
--- a/gnu/packages/debug.scm
+++ b/gnu/packages/debug.scm
@@ -2,6 +2,7 @@
 ;;; Copyright © 2014, 2015, 2016, 2017 Eric Bavier <bavier@member.fsf.org>
 ;;; Copyright © 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2018 Rutger Helling <rhelling@mykolab.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -169,7 +170,7 @@ tools that process C/C++ code.")
       (inputs
        `(("custom-qemu"
           ;; The afl-qemu tool builds qemu 2.10.0 with a few patches applied.
-          ,(package (inherit (@@ (gnu packages bootloaders) qemu-minimal-2.10))
+          ,(package (inherit qemu-minimal-2.10)
              (name "afl-qemu")
              (inputs
               `(("afl-src" ,source)
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index 5e39fb9b9a..079b55da57 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -5,7 +5,7 @@
 ;;; Copyright © 2016, 2017 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2017 Alex Vong <alexvong1995@gmail.com>
 ;;; Copyright © 2017 Andy Patterson <ajpatter@uwaterloo.ca>
-;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com>
+;;; Copyright © 2017, 2018 Rutger Helling <rhelling@mykolab.com>
 ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2018 Danny Milosavljevic <dannym@scratchpost.org>
 ;;; Copyright © 2018 Sou Bunnbu <iyzsong@member.fsf.org>
@@ -187,7 +187,7 @@ exec smbd $@")))
        ;; ("pciutils" ,pciutils)
        ("pixman" ,pixman)
        ("pulseaudio" ,pulseaudio)
-       ("sdl" ,sdl)
+       ("sdl2" ,sdl2)
        ("spice" ,spice)
        ("usbredir" ,usbredir)
        ("util-linux" ,util-linux)
@@ -197,7 +197,7 @@ exec smbd $@")))
     (native-inputs `(("glib:bin" ,glib "bin") ; gtester, etc.
                      ("perl" ,perl)
                      ("pkg-config" ,pkg-config)
-                     ("python" ,python-2) ; incompatible with Python 3 according to error message
+                     ("python-wrapper" ,python-wrapper)
                      ("texinfo" ,texinfo)))
     (home-page "https://www.qemu.org")
     (synopsis "Machine emulator and virtualizer")
@@ -233,9 +233,30 @@ server and embedded PowerPC, and S390 guests.")
 
     ;; Remove dependencies on optional libraries, notably GUI libraries.
     (inputs (fold alist-delete (package-inputs qemu)
-                  '("libusb" "mesa" "sdl" "spice" "virglrenderer"
+                  '("libusb" "mesa" "sdl2" "spice" "virglrenderer"
                     "usbredir" "libdrm" "libepoxy" "pulseaudio")))))
 
+;; The GRUB test suite fails with later versions of Qemu, so we
+;; keep it at 2.10 for now.  See
+;; <https://lists.gnu.org/archive/html/bug-grub/2018-02/msg00004.html>.
+;; This package is hidden since we do not backport updates to it.
+(define-public qemu-minimal-2.10
+  (hidden-package
+   (package
+    (inherit qemu-minimal)
+    (version "2.10.2")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append "https://download.qemu.org/qemu-"
+                                 version ".tar.xz"))
+             (sha256
+              (base32
+               "17w21spvaxaidi2am5lpsln8yjpyp2zi3s3gc6nsxj5arlgamzgw"))))
+    ;; qemu-minimal-2.10 needs Python 2. Remove below once no longer necessary.
+    (native-inputs `(("python-2" ,python-2)
+                     ,@(fold alist-delete (package-native-inputs qemu)
+                             '("python-wrapper")))))))
+
 (define-public libosinfo
   (package
     (name "libosinfo")

From 90a8ef8c4325f97da39d5326b1cd110b3f3984bf Mon Sep 17 00:00:00 2001
From: Rutger Helling <rhelling@mykolab.com>
Date: Thu, 26 Apr 2018 08:17:05 +0200
Subject: [PATCH 142/275] gnu: qemu: Enable GTK3 frontend.

* gnu/packages/virtualization.scm (qemu)[native-inputs]: Add "gettext" to native-inputs.
[inputs]: Add "gtk+" to inputs.
* gnu/packages/virtualization.scm (qemu-minimal)[native-inputs]: Remove "gettext"
from inherited inputs.
[inputs]: Remove "gtk+" from inherited inputs.
---
 gnu/packages/virtualization.scm | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index 079b55da57..46f78b8b1e 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -39,6 +39,7 @@
   #:use-module (gnu packages docbook)
   #:use-module (gnu packages documentation)
   #:use-module (gnu packages fontutils)
+  #:use-module (gnu packages gettext)
   #:use-module (gnu packages gl)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gnome)
@@ -173,6 +174,7 @@ exec smbd $@")))
      `(("alsa-lib" ,alsa-lib)
        ("attr" ,attr)
        ("glib" ,glib)
+       ("gtk+" ,gtk+)
        ("libaio" ,libaio)
        ("libattr" ,attr)
        ("libcap" ,libcap)           ; virtfs support requires libcap & libattr
@@ -194,7 +196,8 @@ exec smbd $@")))
        ;; ("vde2" ,vde2)
        ("virglrenderer" ,virglrenderer)
        ("zlib" ,zlib)))
-    (native-inputs `(("glib:bin" ,glib "bin") ; gtester, etc.
+    (native-inputs `(("gettext" ,gettext-minimal)
+                     ("glib:bin" ,glib "bin") ; gtester, etc.
                      ("perl" ,perl)
                      ("pkg-config" ,pkg-config)
                      ("python-wrapper" ,python-wrapper)
@@ -232,8 +235,10 @@ server and embedded PowerPC, and S390 guests.")
         ''("--target-list=i386-softmmu,x86_64-softmmu,mips64el-softmmu,arm-softmmu,aarch64-softmmu"))))
 
     ;; Remove dependencies on optional libraries, notably GUI libraries.
+    (native-inputs (fold alist-delete (package-native-inputs qemu)
+                  '("gettext")))
     (inputs (fold alist-delete (package-inputs qemu)
-                  '("libusb" "mesa" "sdl2" "spice" "virglrenderer"
+                  '("libusb" "mesa" "sdl2" "spice" "virglrenderer" "gtk+"
                     "usbredir" "libdrm" "libepoxy" "pulseaudio")))))
 
 ;; The GRUB test suite fails with later versions of Qemu, so we

From 28cae3389146ee575e29c6dfd77987883503568e Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Thu, 26 Apr 2018 12:50:09 +0200
Subject: [PATCH 143/275] gnu: perl@5.26.2: Don't export variable.

This prevents it from ending up in user profiles, which would fail due to
wrong search paths as reported in <https://bugs.gnu.org/31216#43>.

* gnu/packages/perl.scm (perl-5.26.2): Use DEFINE instead of DEFINE-PUBLIC.
---
 gnu/packages/perl.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm
index 3edb2b6168..4375c4df2b 100644
--- a/gnu/packages/perl.scm
+++ b/gnu/packages/perl.scm
@@ -161,7 +161,7 @@
 
 ;; Fixes CVE-2018-6797, CVE-2018-6798, and CVE-2018-6913.
 ;; See <https://metacpan.org/changes/release/SHAY/perl-5.26.2>.
-(define-public perl-5.26.2
+(define perl-5.26.2
   (package
     (inherit perl)
     (version "5.26.2")

From 25637b770ed154303f540655421b00c283358f11 Mon Sep 17 00:00:00 2001
From: Rouby Pierre-Antoine <pierre-antoine.rouby@inria.fr>
Date: Wed, 25 Apr 2018 13:48:50 +0200
Subject: [PATCH 144/275] gnu: Add psm2.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/linux.scm (psm2): New variable.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
 gnu/packages/linux.scm | 49 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index c7c057b349..8fc9c56d69 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -27,6 +27,7 @@
 ;;; Copyright © 2017, 2018 Rutger Helling <rhelling@mykolab.com>
 ;;; Copyright © 2017 nee <nee-git@hidamari.blue>
 ;;; Copyright © 2017 Dave Love <fx@gnu.org>
+;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -4631,3 +4632,51 @@ the @code{coretemp} module and sets the fan speed using the @code{applesmc}
 module.  It can be executed as a daemon or in the foreground with root
 privileges.")
     (license license:gpl3+)))
+
+(define-public psm2
+  (package
+    (name "psm2")
+    (version "10.3-46")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/intel/opa-psm2.git")
+                    (commit (string-append "PSM2_" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "0wadphv4rl5p38x6a3dgpbijlzqdvcn02cfafnp72nh9faz0zvlx"))))
+    (build-system gnu-build-system)
+    (arguments
+     '(#:make-flags
+       `(,(string-append "LDFLAGS=-Wl,-rpath=" %output "/lib"))
+       #:tests? #f
+       #:phases (modify-phases %standard-phases
+                  (delete 'configure)
+                  (add-after 'unpack 'patch-Makefiles
+                    (lambda _
+                      (substitute* "Makefile"
+                        (("/lib64") "/lib")
+                        (("/usr") ""))
+                      (substitute* "compat/Makefile"
+                        (("/lib64") "/lib")
+                        (("/usr") ""))
+                      #t))
+                  (replace 'install
+                    (lambda _
+                      (setenv "DESTDIR" %output)
+                      (invoke "make" "install")
+                      #t)))))
+    (inputs
+     `(("rdma-core" ,rdma-core)
+       ("numactl" ,numactl)))
+    (synopsis "Intel Performance Scaled Messaging 2 (PSM2) library")
+    (description
+     "This package is low-level user-level Intel's communications interface.
+The PSM2 API is a high-performance vendor-specific protocol that provides a
+low-level communications interface for the Intel Omni-Path family of
+high-speed networking devices.")
+    (home-page "https://github.com/intel/opa-psm2")
+    ;; Only the x86_64 architecure is supported.
+    (supported-systems '("x86_64-linux"))
+    (license (list license:bsd-3 license:gpl2)))) ; dual

From 2690b6ce7da78eda4d936e3344fc6684a176ac81 Mon Sep 17 00:00:00 2001
From: Rouby Pierre-Antoine <pierre-antoine.rouby@inria.fr>
Date: Fri, 20 Apr 2018 17:30:57 +0200
Subject: [PATCH 145/275] gnu: Add libpfm4.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/linux.scm (libpfm4): New variable.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
 gnu/packages/linux.scm | 47 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 8fc9c56d69..4d24463173 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -4680,3 +4680,50 @@ high-speed networking devices.")
     ;; Only the x86_64 architecure is supported.
     (supported-systems '("x86_64-linux"))
     (license (list license:bsd-3 license:gpl2)))) ; dual
+
+(define-public libpfm4
+  (package
+    (name "libpfm4")
+    (version "4.9.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://sourceforge/perfmon2/"
+                                  name "/libpfm-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1qp4g4n6dw42p2w5rkwzdb7ynk8h7g5vg01ybpmvxncgwa7bw3yv"))))
+    (build-system gnu-build-system)
+    (arguments
+     '(#:modules ((guix build utils)
+                  (guix build gnu-build-system))
+       #:phases (modify-phases %standard-phases
+                  (delete 'configure)
+                  (delete 'check)
+                  (replace 'build
+                    (lambda* (#:key inputs outputs #:allow-other-keys)
+                      (let* ((out (assoc-ref outputs "out")))
+                        (setenv "CC" "gcc")
+                        (invoke "make")
+                        #t)))
+                  (replace 'install
+                    (lambda* (#:key outputs #:allow-other-keys)
+                      (let* ((out (assoc-ref outputs "out")))
+                        (invoke "make"
+                                (string-append "PREFIX=" out)
+                                "install")
+                        #t))))))
+    (synopsis "Performance event monitoring library")
+    (description
+     "This package provides a library called libpfm4, which is used to develop
+monitoring tools exploiting the performance monitoring events such as those
+provided by the Performance Monitoring Unit (PMU) of modern processors.
+
+Libpfm4 helps convert from an event name, expressed as a string, to the event
+encoding that is either the raw event as documented by the hardware vendor or
+the OS-specific encoding.  In the latter case, the library is able to prepare
+the OS-specific data structures needed by the kernel to setup the event.
+
+libpfm4 provides support for the @code{perf_events} interface, which was
+introduced in Linux 2.6.31.")
+    (home-page "http://perfmon2.sourceforge.net/")
+    (license license:expat)))

From 379848ed31d995ed7ce38dd89bce7ea8679c13e7 Mon Sep 17 00:00:00 2001
From: Leo Famulari <leo@famulari.name>
Date: Thu, 26 Apr 2018 15:05:19 -0400
Subject: [PATCH 146/275] gnu: zsh: Update to 5.5.1.

* gnu/packages/shells.scm (zsh): Update to 5.5.1.
[source]: Remove obsolete patches.
* gnu/packages/patches/zsh-CVE-2018-7548.patch,
gnu/packages/patches/zsh-CVE-2018-7549.patch: Delete files.
* gnu/local.mk (dist_patch_DATA): Remove them.
---
 gnu/local.mk                                 |  4 +-
 gnu/packages/patches/zsh-CVE-2018-7548.patch | 48 -----------------
 gnu/packages/patches/zsh-CVE-2018-7549.patch | 56 --------------------
 gnu/packages/shells.scm                      | 10 ++--
 4 files changed, 5 insertions(+), 113 deletions(-)
 delete mode 100644 gnu/packages/patches/zsh-CVE-2018-7548.patch
 delete mode 100644 gnu/packages/patches/zsh-CVE-2018-7549.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 639dd943d6..6065d4c96b 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1196,9 +1196,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/xinetd-CVE-2013-4342.patch		\
   %D%/packages/patches/xmodmap-asprintf.patch 			\
   %D%/packages/patches/libyaml-CVE-2014-9130.patch 		\
-  %D%/packages/patches/zathura-plugindir-environment-variable.patch	\
-  %D%/packages/patches/zsh-CVE-2018-7548.patch			\
-  %D%/packages/patches/zsh-CVE-2018-7549.patch
+  %D%/packages/patches/zathura-plugindir-environment-variable.patch
 
 MISC_DISTRO_FILES =				\
   %D%/packages/ld-wrapper.in
diff --git a/gnu/packages/patches/zsh-CVE-2018-7548.patch b/gnu/packages/patches/zsh-CVE-2018-7548.patch
deleted file mode 100644
index 1ee15fad73..0000000000
--- a/gnu/packages/patches/zsh-CVE-2018-7548.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Fix CVE-2018-7548:
-
-https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-7548
-
-Patch copied from upstream source repository:
-
-https://sourceforge.net/p/zsh/code/ci/110b13e1090bc31ac1352b28adc2d02b6d25a102
-
-From 110b13e1090bc31ac1352b28adc2d02b6d25a102 Mon Sep 17 00:00:00 2001
-From: Joey Pabalinas <joeypabalinas@gmail.com>
-Date: Tue, 23 Jan 2018 22:28:08 -0800
-Subject: [PATCH] 42313: avoid null-pointer deref when using ${(PA)...} on an
- empty array result
-
----
- ChangeLog   | 5 +++++
- Src/subst.c | 2 +-
- 2 files changed, 6 insertions(+), 1 deletion(-)
-
-#diff --git a/ChangeLog b/ChangeLog
-#index d2ba94afc..3037edda4 100644
-#--- a/ChangeLog
-#+++ b/ChangeLog
-#@@ -1,3 +1,8 @@
-#+2018-01-23  Barton E. Schaefer  <schaefer@zsh.org>
-#+
-#+       * Joey Pabalinas: 42313: Src/subst.c: avoid null-pointer deref
-#+       when using ${(PA)...} on an empty array result
-#+
-# 2018-01-23  Oliver Kiddle  <okiddle@yahoo.co.uk>
-# 
-#        * 42317: Completion/Linux/Command/_cryptsetup,
-diff --git a/Src/subst.c b/Src/subst.c
-index d027e3d83..a265a187e 100644
---- a/Src/subst.c
-+++ b/Src/subst.c
-@@ -2430,7 +2430,7 @@ paramsubst(LinkList l, LinkNode n, char **str, int qt, int pf_flags,
- 		val = aval[0];
- 		isarr = 0;
- 	    }
--	    s = dyncat(val, s);
-+	    s = val ? dyncat(val, s) : dupstring(s);
- 	    /* Now behave po-faced as if it was always like that... */
- 	    subexp = 0;
- 	    /*
--- 
-2.16.2
-
diff --git a/gnu/packages/patches/zsh-CVE-2018-7549.patch b/gnu/packages/patches/zsh-CVE-2018-7549.patch
deleted file mode 100644
index abefcdf2f9..0000000000
--- a/gnu/packages/patches/zsh-CVE-2018-7549.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-Fix CVE-2018-7549:
-
-https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-7549
-
-Patch copied from upstream source repository:
-
-https://sourceforge.net/p/zsh/code/ci/c2cc8b0fbefc9868fa83537f5b6d90fc1ec438dd
-
-From c2cc8b0fbefc9868fa83537f5b6d90fc1ec438dd Mon Sep 17 00:00:00 2001
-From: Stephane Chazelas <stephane.chazelas@gmail.com>
-Date: Fri, 22 Dec 2017 22:17:09 +0000
-Subject: [PATCH] Avoid crash copying empty hash table.
-
-Visible with typeset -p.
----
- ChangeLog    |  2 ++
- Src/params.c | 11 +++++++----
- 2 files changed, 9 insertions(+), 4 deletions(-)
-
-#diff --git a/ChangeLog b/ChangeLog
-#index f74c26b88..e3628cfa7 100644
-#--- a/ChangeLog
-#+++ b/ChangeLog
-#@@ -1,5 +1,7 @@
-# 2018-01-04  Peter Stephenson  <p.stephenson@samsung.com>
-# 
-#+       * Stephane: 42159: Src/params.c: avoid crash copying empty hash table.
-#+
-#        * Sebastian: 42188: Src/Modules/system.c: It is necessary to
-#        close the lock descriptor in some failure cases.
-#
-diff --git a/Src/params.c b/Src/params.c
-index 31ff0445b..de7730ae7 100644
---- a/Src/params.c
-+++ b/Src/params.c
-@@ -549,10 +549,13 @@ scancopyparams(HashNode hn, UNUSED(int flags))
- HashTable
- copyparamtable(HashTable ht, char *name)
- {
--    HashTable nht = newparamtable(ht->hsize, name);
--    outtable = nht;
--    scanhashtable(ht, 0, 0, 0, scancopyparams, 0);
--    outtable = NULL;
-+    HashTable nht = 0;
-+    if (ht) {
-+	nht = newparamtable(ht->hsize, name);
-+	outtable = nht;
-+	scanhashtable(ht, 0, 0, 0, scancopyparams, 0);
-+	outtable = NULL;
-+    }
-     return nht;
- }
- 
--- 
-2.16.2
-
diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm
index 8f3aa9b5f1..f0f25a0120 100644
--- a/gnu/packages/shells.scm
+++ b/gnu/packages/shells.scm
@@ -291,20 +291,18 @@ history mechanism, job control and a C-like syntax.")
 (define-public zsh
   (package
     (name "zsh")
-    (version "5.4.2")
+    (version "5.5.1")
     (source (origin
               (method url-fetch)
               (uri (list (string-append
                            "http://www.zsh.org/pub/zsh-" version
-                           ".tar.gz")
+                           ".tar.xz")
                          (string-append
                            "http://www.zsh.org/pub/old/zsh-" version
-                           ".tar.gz")))
-              (patches (search-patches "zsh-CVE-2018-7548.patch"
-                                       "zsh-CVE-2018-7549.patch"))
+                           ".tar.xz")))
               (sha256
                (base32
-                "1jdcfinzmki2w963msvsanv29vqqfmdfm4rncwpw0r3zqnrcsywm"))))
+                "105aqkdfsdxc4531anrj2zis2ywz6icagjam9lsc235yzh48ihz1"))))
     (build-system gnu-build-system)
     (arguments `(#:configure-flags '("--with-tcsetpgrp" "--enable-pcre")
                  #:phases

From 79a9dee62dbb1667f9c9b3b1e75d0e1e356c8f20 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sat, 21 Apr 2018 14:35:56 +0200
Subject: [PATCH 147/275] gnu: perl-test-base: Update to 0.89.

* gnu/packages/perl-check.scm (perl-test-base): Update to 0.89.
---
 gnu/packages/perl-check.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/perl-check.scm b/gnu/packages/perl-check.scm
index 832efc2b78..4291c90e48 100644
--- a/gnu/packages/perl-check.scm
+++ b/gnu/packages/perl-check.scm
@@ -96,7 +96,7 @@ warning content is outputted via diag.")
 (define-public perl-test-base
   (package
     (name "perl-test-base")
-    (version "0.88")
+    (version "0.89")
     (source
      (origin
        (method url-fetch)
@@ -104,7 +104,7 @@ warning content is outputted via diag.")
                            "Test-Base-" version ".tar.gz"))
        (sha256
         (base32
-         "0fch1cvivnszbnwhpfmwv1rin04j5xkj1n1ylfmlxg6bm72qqdjj"))))
+         "056hibgg3i2b89mwr76vyxi6ayb3hqjqcwicvn3s5lximsma3517"))))
     (build-system perl-build-system)
     (native-inputs
      `(("perl-algorithm-diff" ,perl-algorithm-diff)

From cb6fb537dd5dacea0a3b7ca2be6b24b14a62c646 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sat, 21 Apr 2018 16:13:55 +0200
Subject: [PATCH 148/275] gnu: perl-test-pod: Update to 1.52.

* gnu/packages/perl-check.scm (perl-test-pod): Update to 1.52.
---
 gnu/packages/perl-check.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/perl-check.scm b/gnu/packages/perl-check.scm
index 4291c90e48..efbe6923f7 100644
--- a/gnu/packages/perl-check.scm
+++ b/gnu/packages/perl-check.scm
@@ -894,7 +894,7 @@ as flexible as possible to the tester.")
 (define-public perl-test-pod
   (package
     (name "perl-test-pod")
-    (version "1.51")
+    (version "1.52")
     (source
      (origin
        (method url-fetch)
@@ -902,7 +902,7 @@ as flexible as possible to the tester.")
                            "Test-Pod-" version ".tar.gz"))
        (sha256
         (base32
-         "1yvy5mc4j3s2h4aizryvark2nm58g2c6zhw9mlx9wmsavz7d78f1"))))
+         "1z75x1pxwp8ajwq9iazlg2c3wd7rdlim08yclpdg32qnc36dpa30"))))
     (build-system perl-build-system)
     (native-inputs `(("perl-module-build" ,perl-module-build)))
     (home-page "http://search.cpan.org/dist/Test-Pod/")

From 23da2107f93d4172a902483c7780373e205c151a Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sat, 21 Apr 2018 21:12:33 +0200
Subject: [PATCH 149/275] gnu: perl-test-differences: Update to 0.64.

* gnu/packages/perl-check.scm (perl-test-differences): Update to 0.64.
---
 gnu/packages/perl-check.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/perl-check.scm b/gnu/packages/perl-check.scm
index efbe6923f7..3670c263f6 100644
--- a/gnu/packages/perl-check.scm
+++ b/gnu/packages/perl-check.scm
@@ -317,7 +317,7 @@ structures without getting caught in an infinite loop.")
 (define-public perl-test-differences
   (package
     (name "perl-test-differences")
-    (version "0.63")
+    (version "0.64")
     (source
      (origin
        (method url-fetch)
@@ -325,7 +325,7 @@ structures without getting caught in an infinite loop.")
                            "Test-Differences-" version ".tar.gz"))
        (sha256
         (base32
-         "0rhs4q6qn64ji06ns7lwl6iiiw3mggvd9xk9nkiqvx1jihbplrbw"))))
+         "0xmj5vgklq4yqvi7l63ky1k6g7fhww68llpmw9rhlaihqbcrsicz"))))
     (build-system perl-build-system)
     (native-inputs
      `(("perl-module-build" ,perl-module-build)))

From 8cb722028c9a96a3ff388a16dd00c7ecd4bff73d Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sat, 21 Apr 2018 22:51:17 +0200
Subject: [PATCH 150/275] gnu: perl-test-output: Update to 1.031.

* gnu/packages/perl-check.scm (perl-test-output): Update to 1.031.
---
 gnu/packages/perl-check.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/perl-check.scm b/gnu/packages/perl-check.scm
index 3670c263f6..7e5588bd6c 100644
--- a/gnu/packages/perl-check.scm
+++ b/gnu/packages/perl-check.scm
@@ -869,14 +869,14 @@ usually called epsilon.  This module provides such a function for use with
 (define-public perl-test-output
   (package
     (name "perl-test-output")
-    (version "1.03")
+    (version "1.031")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://cpan/authors/id/B/BD/BDFOY/"
                                   "Test-Output-" version ".tar.gz"))
               (sha256
                (base32
-                "12991jnzj4cbw9whhprmqvnzd1ayii84g2mh8vxbjngwqrjsy41i"))))
+                "193y1xjvgc1p9pdgdwps2127knvpz9wc1xh6gmr74y3ihmqz7f7q"))))
     (build-system perl-build-system)
     (propagated-inputs
      `(("perl-capture-tiny" ,perl-capture-tiny)

From 41b937cd5f4f64ec130b875c1e59f4a51831ecdc Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sat, 21 Apr 2018 23:02:11 +0200
Subject: [PATCH 151/275] gnu: perl-test-simple: Update to 1.302136.

* gnu/packages/perl-check.scm (perl-test-simple): Update to 1.302136.
---
 gnu/packages/perl-check.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/perl-check.scm b/gnu/packages/perl-check.scm
index 7e5588bd6c..f8be207f1b 100644
--- a/gnu/packages/perl-check.scm
+++ b/gnu/packages/perl-check.scm
@@ -1077,14 +1077,14 @@ makes fork(2) safe to use in test cases.")
 (define-public perl-test-simple
   (package
     (name "perl-test-simple")
-    (version "1.302122")
+    (version "1.302136")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://cpan/authors/id/E/EX/EXODIST/"
                                   "Test-Simple-" version ".tar.gz"))
               (sha256
                (base32
-                "117m707cbvrh01s3w6g371i9xvpnklifiqpcmky4f49jgck8izgm"))))
+                "0inlv8f4rbhsw6qnqhf1w6ay153xbw27fldmb2pmg4ihn19mr6ld"))))
     (build-system perl-build-system)
     (synopsis "Basic utilities for writing tests")
     (description

From 8c8771c375edad0e08dcf43e1e23c54803cb24f8 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sat, 21 Apr 2018 23:03:28 +0200
Subject: [PATCH 152/275] gnu: perl-error: Update to 0.17025.

* gnu/packages/perl-.scm (perl-error): Update to 0.17025.
---
 gnu/packages/perl.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm
index 4375c4df2b..73d7331e16 100644
--- a/gnu/packages/perl.scm
+++ b/gnu/packages/perl.scm
@@ -3025,14 +3025,14 @@ separator.")
 (define-public perl-error
   (package
     (name "perl-error")
-    (version "0.17023")
+    (version "0.17025")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://cpan/authors/id/S/SH/SHLOMIF/"
                                   "Error-" version ".tar.gz"))
               (sha256
                (base32
-                "0dsxic78mxy30qvbbdzfyp501hbkwhnbmafqfxipr0yqfy8f2j5g"))))
+                "1bzgzmf1v4md02vadm46b4j4ilqxrcrfasvbzymhrznlsd54g7vc"))))
     (build-system perl-build-system)
     (native-inputs `(("perl-module-build" ,perl-module-build)))
     (home-page "http://search.cpan.org/dist/Error/")

From ea1db49a8936d84677c3f83f46fb2f525044a0e8 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sat, 21 Apr 2018 23:04:45 +0200
Subject: [PATCH 153/275] gnu: perl-file-find-rule: Update to 0.34.

* gnu/packages/perl.scm (perl-file-find-rule): Update to 0.34.
---
 gnu/packages/perl.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm
index 73d7331e16..2a091d8200 100644
--- a/gnu/packages/perl.scm
+++ b/gnu/packages/perl.scm
@@ -3370,7 +3370,7 @@ type.")
 (define-public perl-file-find-rule
   (package
     (name "perl-file-find-rule")
-    (version "0.33")
+    (version "0.34")
     (source
      (origin
        (method url-fetch)
@@ -3378,7 +3378,7 @@ type.")
                            "File-Find-Rule-" version ".tar.gz"))
        (sha256
         (base32
-         "0w73b4jr2fcrd74a1w3b2jryq3mqzc8z5mk7ia9p85xn3qmpa5r4"))))
+         "1znachnhmi1w5pdqx8dzgfa892jb7x8ivrdy4pzjj7zb6g61cvvy"))))
     (build-system perl-build-system)
     (propagated-inputs
      `(("perl-text-glob" ,perl-text-glob)

From ff8b52bad9078a58fd4ad4a6f3a794814f49cebe Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Tue, 24 Apr 2018 11:30:10 +0200
Subject: [PATCH 154/275] gnu: perl-class-inspector: Update to 1.32.

* gnu/packages/perl.scm (perl-class-inspector): Update to 1.32.
---
 gnu/packages/perl.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm
index 2a091d8200..9cc83ed71b 100644
--- a/gnu/packages/perl.scm
+++ b/gnu/packages/perl.scm
@@ -1120,7 +1120,7 @@ to the calling program.")
 (define-public perl-class-inspector
   (package
     (name "perl-class-inspector")
-    (version "1.31")
+    (version "1.32")
     (source
      (origin
        (method url-fetch)
@@ -1128,7 +1128,7 @@ to the calling program.")
                            "Class-Inspector-" version ".tar.gz"))
        (sha256
         (base32
-         "1sqfjgzxx1f951fykc6vgfvys4j8rxaw2zf3jq26yrvs3ygn8pq6"))))
+         "0d85rihxahdvhj8cysqrgg0kbmcqghz5hgy41dbkxr1qaf5xrynf"))))
     (build-system perl-build-system)
     (home-page "http://search.cpan.org/dist/Class-Inspector/")
     (synopsis "Get information about a class and its structure")

From 39a915c2bf4f7dc23107ad094730784886326b67 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Tue, 24 Apr 2018 11:30:43 +0200
Subject: [PATCH 155/275] gnu: perl-devel-overloadinfo: Update to 0.005.

* gnu/packages/perl.scm (perl-devel-overloadinfo): Update to 0.005.
---
 gnu/packages/perl.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm
index 9cc83ed71b..7a21cfacd9 100644
--- a/gnu/packages/perl.scm
+++ b/gnu/packages/perl.scm
@@ -2712,7 +2712,7 @@ variable in a subroutines scope to one of your choosing.")
 (define-public perl-devel-overloadinfo
   (package
     (name "perl-devel-overloadinfo")
-    (version "0.004")
+    (version "0.005")
     (source
      (origin
        (method url-fetch)
@@ -2720,7 +2720,7 @@ variable in a subroutines scope to one of your choosing.")
                            "Devel-OverloadInfo-" version ".tar.gz"))
        (sha256
         (base32
-         "0zckjhzdqa6smpp98y15mqafsyzwjxwrvk10snzhn2sb0r889s43"))))
+         "1rx6g8pyhi7lx6z130b7vlf8syzrq92w9ky8mpw4d6bwlkzy5zcb"))))
     (build-system perl-build-system)
     (native-inputs
      `(("perl-test-fatal" ,perl-test-fatal)))

From 4844ccb2fecb222fdfbe3818a1c9b8f78a11e793 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Tue, 24 Apr 2018 11:31:09 +0200
Subject: [PATCH 156/275] gnu: perl-file-sharedir-install: Update to 0.12.

* gnu/packages/perl.scm (perl-file-sharedir-install): Update to 0.12.
---
 gnu/packages/perl.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm
index 7a21cfacd9..23a5802388 100644
--- a/gnu/packages/perl.scm
+++ b/gnu/packages/perl.scm
@@ -3635,7 +3635,7 @@ distributions.  It is a companion module to File::ShareDir.")
 (define-public perl-file-sharedir-install
   (package
     (name "perl-file-sharedir-install")
-    (version "0.11")
+    (version "0.12")
     (source
      (origin
        (method url-fetch)
@@ -3643,7 +3643,7 @@ distributions.  It is a companion module to File::ShareDir.")
                            "File-ShareDir-Install-" version ".tar.gz"))
        (sha256
         (base32
-         "1j0cw1aq9fdv9kl1a6fnfa4zihsvmcqzy9sb0xk0i9pyx5r8ggrj"))))
+         "13g8d69c2lq3mrc0i4fr705h99gxyzw1srww4m7wdhzfmbsdqxli"))))
     (build-system perl-build-system)
     (native-inputs
      `(("perl-module-build" ,perl-module-build)))

From dbfbe2b0c869bd6687812d6ba2338879fa5068a1 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Tue, 24 Apr 2018 11:31:40 +0200
Subject: [PATCH 157/275] gnu: perl-mime-types: Update to 2.17.

* gnu/packages/perl.scm (perl-mime-types): Update to 2.17.
---
 gnu/packages/perl.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm
index 23a5802388..0500d960a3 100644
--- a/gnu/packages/perl.scm
+++ b/gnu/packages/perl.scm
@@ -4980,7 +4980,7 @@ messages.")
 (define-public perl-mime-types
   (package
     (name "perl-mime-types")
-    (version "2.16")
+    (version "2.17")
     (source
      (origin
        (method url-fetch)
@@ -4988,7 +4988,7 @@ messages.")
                            "MIME-Types-" version ".tar.gz"))
        (sha256
         (base32
-         "0nkv99yd8bxa6h8c52nd07142f0mdzjnhcdw66s3wljmzsi9z8hk"))))
+         "1xlg7q6h8zyb8534sy0iqn90py18kilg419q6051bwqz5zadfkp0"))))
     (build-system perl-build-system)
     (home-page "http://search.cpan.org/dist/MIME-Types/")
     (synopsis "Definition of MIME types")

From 4f1f1592a694f3beffa1714b1d0a5501331093ec Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Tue, 24 Apr 2018 11:32:02 +0200
Subject: [PATCH 158/275] gnu: perl-module-find: Update to 0.13.

* gnu/packages/perl.scm (perl-module-find): Update to 0.13.
---
 gnu/packages/perl.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm
index 0500d960a3..2a2deaf9fa 100644
--- a/gnu/packages/perl.scm
+++ b/gnu/packages/perl.scm
@@ -5126,7 +5126,7 @@ debug options.
 (define-public perl-module-find
   (package
     (name "perl-module-find")
-    (version "0.12")
+    (version "0.13")
     (source
      (origin
        (method url-fetch)
@@ -5134,7 +5134,7 @@ debug options.
                            "Module-Find-" version ".tar.gz"))
        (sha256
         (base32
-         "1lc33jdv4pgmm7nkr9bff0lhwjhhw91kaf6iiy2n7i7mw8dfv47l"))))
+         "0s45y5lvd9k89g7lds83c0bn1p29c13hfsbrd7x64jfaf8h8cisa"))))
     (build-system perl-build-system)
     (home-page "http://search.cpan.org/dist/Module-Find/")
     (synopsis "Find and use installed modules in a (sub)category")

From 4e7ec8c06eec3087e16e7c710809e23e1bb76a42 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Tue, 24 Apr 2018 11:32:24 +0200
Subject: [PATCH 159/275] gnu: perl-task-weaken: Update to 1.06.

* gnu/packages/perl.scm (perl-task-weaken): Update to 1.06.
---
 gnu/packages/perl.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm
index 2a2deaf9fa..3380ff64a6 100644
--- a/gnu/packages/perl.scm
+++ b/gnu/packages/perl.scm
@@ -7871,7 +7871,7 @@ of a system.")
 (define-public perl-task-weaken
   (package
     (name "perl-task-weaken")
-    (version "1.05")
+    (version "1.06")
     (source
      (origin
        (method url-fetch)
@@ -7879,7 +7879,7 @@ of a system.")
                            "Task-Weaken-" version ".tar.gz"))
        (sha256
         (base32
-         "0p5ryr3421p5rqj6dk5dcvxsml5gl9skbn7gv4szk50fimrvzww5"))))
+         "1gk6rmnp4x50lzr0vfng41khf0f8yzxlm0pad1j69vxskpdzx0r3"))))
     (build-system perl-build-system)
     (arguments
      '(#:phases (modify-phases %standard-phases

From b6617a1ed86e8239325111b650b7468f0cc374dc Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Tue, 24 Apr 2018 11:32:47 +0200
Subject: [PATCH 160/275] gnu: perl-text-glob: Update to 0.11.

* gnu/packages/perl.scm (perl-text-glob): Update to 0.11.
---
 gnu/packages/perl.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm
index 3380ff64a6..2397b273c3 100644
--- a/gnu/packages/perl.scm
+++ b/gnu/packages/perl.scm
@@ -8259,7 +8259,7 @@ to tabs.")
 (define-public perl-text-glob
   (package
     (name "perl-text-glob")
-    (version "0.09")
+    (version "0.11")
     (source
      (origin
        (method url-fetch)
@@ -8267,7 +8267,7 @@ to tabs.")
                            "Text-Glob-" version ".tar.gz"))
        (sha256
         (base32
-         "0lr76wrsj8wcxrq4wi8z1640w4dmdbkznp06q744rg3g0bd238d5"))))
+         "11sj62fynfgwrlgkv5a051cq6yn0pagxqjsz27dxx8phsd4wv706"))))
     (build-system perl-build-system)
     (native-inputs `(("perl-module-build" ,perl-module-build)))
     (home-page "http://search.cpan.org/dist/Text-Glob/")

From a3cbd75bb3bde551cf138659b51d9cd725b74588 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Thu, 26 Apr 2018 16:11:45 +0200
Subject: [PATCH 161/275] gnu: openvpn: Update to 2.4.6.

* gnu/packages/vpn.scm (openvpn): Update to 2.4.6.
---
 gnu/packages/vpn.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm
index 6ba3677a90..c93960bc05 100644
--- a/gnu/packages/vpn.scm
+++ b/gnu/packages/vpn.scm
@@ -278,7 +278,7 @@ and probably others.")
 (define-public openvpn
   (package
     (name "openvpn")
-    (version "2.4.5")
+    (version "2.4.6")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -286,7 +286,7 @@ and probably others.")
                     version ".tar.xz"))
               (sha256
                (base32
-                "17njq59hsraqyxrbhkrxr7dvx0p066s3pn8w1mi0yd9jldis7h23"))))
+                "09lck4wmkas3iyrzaspin9gn3wiclqb1m9sf8diy7j8wakx38r2g"))))
     (build-system gnu-build-system)
     (arguments
      '(#:configure-flags '("--enable-iproute2=yes")))

From 3b8064734eafb725ed04d3e77ff3f01502e631bb Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Thu, 26 Apr 2018 16:16:49 +0200
Subject: [PATCH 162/275] gnu: youtube-viewer: Update to 3.3.4.

* gnu/packages/video.scm (youtube-viewer): Update to 3.3.4.
---
 gnu/packages/video.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index ef64335294..58fd35558c 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -1310,7 +1310,7 @@ audio, images) from the Web.  It can use either mpv or vlc for playback.")
 (define-public youtube-viewer
   (package
     (name "youtube-viewer")
-    (version "3.3.3")
+    (version "3.3.4")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -1319,7 +1319,7 @@ audio, images) from the Web.  It can use either mpv or vlc for playback.")
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "1j572his6qmazlmyrbnfq62s9bqml875ay7wy26byy9hfc7m0vgk"))))
+                "1dqaxkz5svv0lmxds6lppcpzhkq6gar2raw9gx6imrd7yz02fpgn"))))
     (build-system perl-build-system)
     (native-inputs
      `(("perl-module-build" ,perl-module-build)))

From d2caedf08d24d6780beede84c0a58f851ee5816c Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Thu, 26 Apr 2018 18:28:19 +0200
Subject: [PATCH 163/275] gnu: ghostwriter: Update to 1.6.2.

* gnu/packages/text-editors.scm (ghostwriter): Update to 1.6.2.
---
 gnu/packages/text-editors.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm
index 6d8d800fd4..1382e32c1d 100644
--- a/gnu/packages/text-editors.scm
+++ b/gnu/packages/text-editors.scm
@@ -292,7 +292,7 @@ team.")
 (define-public ghostwriter
   (package
     (name "ghostwriter")
-    (version "1.6.1")
+    (version "1.6.2")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -301,7 +301,7 @@ team.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1ihdr4xk0j83q83xknbikxb7yf9qhlkgvc89w33lhj090cv376gd"))))
+                "0251563zy0q69fzfacvalpx43y15cshb0bhshyd4w37061gh1c12"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("pkg-config" ,pkg-config)

From 1cc3e26b6aeb4acd406b7f57a436bf4c4b35aa93 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Thu, 19 Apr 2018 23:11:49 +0200
Subject: [PATCH 164/275] gnu: fio: Use INVOKE.

* gnu/packages/benchmark.scm (fio)[arguments]: Substitute INVOKE for
SYSTEM* and end phase with explicit #t.
---
 gnu/packages/benchmark.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/benchmark.scm b/gnu/packages/benchmark.scm
index bf88bd4919..ebc8bdb5f2 100644
--- a/gnu/packages/benchmark.scm
+++ b/gnu/packages/benchmark.scm
@@ -67,8 +67,9 @@
              ;; The configure script doesn't understand some of the
              ;; GNU options, so we can't use #:configure-flags.
              (let ((out (assoc-ref outputs "out")))
-               (zero? (system* "./configure"
-                               (string-append "--prefix=" out))))))
+               (invoke "./configure"
+                       (string-append "--prefix=" out))
+               #t)))
          ;; The main `fio` executable is fairly small and self contained.
          ;; Moving the auxiliary python and gnuplot scripts to a separate
          ;; output saves almost 400 MiB on the closure.

From 11edb2474c96ceaf3286e9e7cac2aeaf27b5d729 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Thu, 26 Apr 2018 18:59:02 +0200
Subject: [PATCH 165/275] gnu: mg: Find ncurses through pkg-config.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/text-editors.scm (mg)[arguments]: Remove explicit
‘CURSES_LIBS=-lncurses’ setting from #:make-flags.
---
 gnu/packages/text-editors.scm | 1 -
 1 file changed, 1 deletion(-)

diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm
index 1382e32c1d..0e6539436d 100644
--- a/gnu/packages/text-editors.scm
+++ b/gnu/packages/text-editors.scm
@@ -260,7 +260,6 @@ Wordstar-, EMACS-, Pico, Nedit or vi-like key bindings.  e3 can be used on
      ;; No test suite available.
      '(#:tests? #f
        #:make-flags (list (string-append "prefix=" %output)
-                          "CURSES_LIBS=-lncurses"
                           "CC=gcc")
        #:phases (modify-phases %standard-phases
                   (delete 'configure)

From a4d8b386ac9b44ac08bdedf4dcb4b7becef4df53 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Thu, 26 Apr 2018 19:25:50 +0200
Subject: [PATCH 166/275] gnu: mg: Update to 20180408.

* gnu/packages/text-editors.scm (mg): Update to 20180408.
[source]: Switch from discontinued proper releases to a git tag.
---
 gnu/packages/text-editors.scm | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm
index 0e6539436d..d12e3d706f 100644
--- a/gnu/packages/text-editors.scm
+++ b/gnu/packages/text-editors.scm
@@ -237,14 +237,16 @@ Wordstar-, EMACS-, Pico, Nedit or vi-like key bindings.  e3 can be used on
 (define-public mg
   (package
     (name "mg")
-    (version "20171014")
+    (version "20180408")
     (source (origin
-              (method url-fetch)
-              (uri (string-append "https://homepage.boetes.org/software/mg/mg-"
-                                  version ".tar.gz"))
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/hboetes/mg")
+                    (commit version)))
+              (file-name (git-file-name name version))
               (sha256
                (base32
-                "0hakfikzsml7z0hja8m8mcahrmfy2piy81bq9nccsjplyfc9clai"))
+                "06w86xk7sjl2x2h3z6msn8kpmwj05qdimcym77wzhz5s94dzh1bl"))
               (modules '((guix build utils)))
               (snippet
                '(begin
@@ -262,7 +264,7 @@ Wordstar-, EMACS-, Pico, Nedit or vi-like key bindings.  e3 can be used on
        #:make-flags (list (string-append "prefix=" %output)
                           "CC=gcc")
        #:phases (modify-phases %standard-phases
-                  (delete 'configure)
+                  (delete 'configure)   ; no configure script
                   (add-before 'build 'correct-location-of-difftool
                     (lambda _
                       (substitute* "buffer.c"

From 5e517e9b982b76ee7708def964db25eec19553ee Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Thu, 26 Apr 2018 20:08:13 +0200
Subject: [PATCH 167/275] gnu: python-html5-parser: Update to 0.4.5.

* gnu/packages/python-web.scm (python-html5-parser): Update to 0.4.5.
---
 gnu/packages/python-web.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index d15ad92a56..e85303bb66 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -214,13 +214,13 @@ and written in Python.")
 (define-public python-html5-parser
   (package
     (name "python-html5-parser")
-    (version "0.4.4")
+    (version "0.4.5")
     (source (origin
               (method url-fetch)
               (uri (pypi-uri "html5-parser" version))
               (sha256
                (base32
-                "1d8sxhl41ffh7qlk7wlsy17xw6slzx5v1yna9s72wx5qrpaa3wxr"))))
+                "01mx33sx4dhl4kj6wc48nj6jz7ry60rkhjv0s6k8h5xmjf5yy0x9"))))
     (build-system python-build-system)
     (native-inputs
      `(("pkg-config" ,pkg-config)))

From 442ce03acc9dd3a7e3d7934d8d8af779b1c5a012 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Thu, 26 Apr 2018 20:09:31 +0200
Subject: [PATCH 168/275] gnu: r-sourcetools: Update to 0.1.7.

* gnu/packages/statistics.scm (r-sourcetools): Update to 0.1.7.
---
 gnu/packages/statistics.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index f3fa7271a7..4f35308f4e 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -4270,14 +4270,14 @@ closely-packed, non-overlapping points.")
 (define-public r-sourcetools
   (package
     (name "r-sourcetools")
-    (version "0.1.6")
+    (version "0.1.7")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "sourcetools" version))
        (sha256
         (base32
-         "0l8c6fql82cb246qh7hfgxb4s35qn0qfgy6dzvkx0zkz1cpqvx69"))))
+         "1jnjir0q2dj724f1mjm6p5h77yzyx6xcqy9r2g7gmcxkxw349627"))))
     (build-system r-build-system)
     (home-page "https://cran.r-project.org/web/packages/sourcetools")
     (synopsis "Tools for reading, tokenizing and parsing R code")

From 9b4d3c1d02e1252bedf96e0172c394af1b966fb4 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Thu, 26 Apr 2018 20:11:15 +0200
Subject: [PATCH 169/275] gnu: r-sn: Update to 1.5-2.

* gnu/packages/statistics.scm (r-sn): Update to 1.5-2.
---
 gnu/packages/statistics.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index 4f35308f4e..2c003d3e6b 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -5262,14 +5262,14 @@ first and second order derivatives.")
 (define-public r-sn
   (package
     (name "r-sn")
-    (version "1.5-1")
+    (version "1.5-2")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "sn" version))
        (sha256
         (base32
-         "0l7qlah6dwkp8jswnr2mn3phlm15naba5zkmv0g5pcqy5ix0gz7w"))))
+         "16gwr68zzj5v83bqfmzxnzwig3dnjrkxdhs6clri1caqkvrq6aig"))))
     (build-system r-build-system)
     (propagated-inputs
      `(("r-mnormt" ,r-mnormt)

From 9616e86aa08a974e7fe24073ad4ba59f4c46e190 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Thu, 26 Apr 2018 20:14:09 +0200
Subject: [PATCH 170/275] gnu: r-ztable: Update to 0.1.8.

* gnu/packages/statistics.scm (r-ztable): Update to 0.1.8.
---
 gnu/packages/statistics.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index 2c003d3e6b..7f2e571253 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -4211,13 +4211,13 @@ series of numeric vectors/matrices and factors.")
 (define-public r-ztable
   (package
     (name "r-ztable")
-    (version "0.1.5")
+    (version "0.1.8")
     (source (origin
               (method url-fetch)
               (uri (cran-uri "ztable" version))
               (sha256
                (base32
-                "1jfqnqy9544gfvz3bsb48v4177nwp4b4n9l2743asq8sbq305b5r"))))
+                "1hk5k9614n52dpfrhdws06w4gvwhnz8q47x4cwxx88qmrzm8z2m3"))))
     (build-system r-build-system)
     (home-page "https://cran.r-project.org/web/packages/ztable")
     (synopsis "Zebra-striped tables in LaTeX and HTML formats for R")

From ebf09e77dc582294b040deb6369cb720dce6e7c9 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Thu, 26 Apr 2018 20:49:54 +0200
Subject: [PATCH 171/275] gnu: python-ndg-httpsclient: Update to 0.5.0.

* gnu/packages/python-web.scm (python-ndg-httpsclient): Update to 0.5.0.
---
 gnu/packages/python-web.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index e85303bb66..53a9d3c2f3 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -998,13 +998,13 @@ facilities for defining, registering and looking up components.")
 (define-public python-ndg-httpsclient
   (package
     (name "python-ndg-httpsclient")
-    (version "0.4.4")
+    (version "0.5.0")
     (source (origin
               (method url-fetch)
               (uri (pypi-uri "ndg_httpsclient" version))
               (sha256
                 (base32
-                  "0sl5ak1r1xil9ms0a9fh9fm6ncml65kgnjpjfic9dhnaimwx997v"))))
+                  "12q8rjvsvjphj6lvvcka2izdjr36a5lgkygajwx6p4wh0x1za2f0"))))
     (build-system python-build-system)
     (arguments
      '(;; The tests appear to require networking.

From 9052324d720bb5860e09ec2d79a177f77dc1babb Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Thu, 26 Apr 2018 20:50:35 +0200
Subject: [PATCH 172/275] gnu: python-sphinx@1.6: Update to 1.6.4.

* gnu/packages/python.scm (python-sphinx-1.6): Update to 1.6.4.
---
 gnu/packages/python.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index f36e4c770d..a9e72f28a8 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -2438,13 +2438,13 @@ sources.")
 (define-public python-sphinx-1.6
   (package (inherit python-sphinx)
     (name "python-sphinx")
-    (version "1.6.3")
+    (version "1.6.4")
     (source (origin
               (method url-fetch)
               (uri (pypi-uri "Sphinx" version))
               (sha256
                (base32
-                "1rj6f3i8hmrx2qlkshi5kp5xcy98dlynwlyl05yvflj5f66dp2xg"))))
+                "0gjakw9fv5pwqb5yyclxycs36sapxizk1vx6mkcdizmzgzcfy0gi"))))
     (arguments
      `(#:phases
        (modify-phases %standard-phases

From 5cf24cde18c44669931309e2e406ef076f28defe Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Thu, 26 Apr 2018 20:51:00 +0200
Subject: [PATCH 173/275] gnu: python-rst.linker: Update to 1.9.

* gnu/packages/python.scm (python-rst.linker): Update to 1.9.
---
 gnu/packages/python.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index a9e72f28a8..796b41840e 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -2551,14 +2551,14 @@ and several other projects.")
 (define-public python-rst.linker
   (package
     (name "python-rst.linker")
-    (version "1.7")
+    (version "1.9")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "rst.linker" version))
        (sha256
         (base32
-         "0bh4lnj2p1nh0wf5pgxgfbrp27xhb1rinahkb5j7s3qprq6qn0sr"))))
+         "16crgnai6020vdmnpwdimw1vm3jb74ysfyb3kmcidb0lgma5xq2d"))))
     (build-system python-build-system)
     (propagated-inputs
      `(("python-dateutil" ,python-dateutil)

From c10176649f694e6c5a6cfad6c496abd572d0421b Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Thu, 26 Apr 2018 20:51:28 +0200
Subject: [PATCH 174/275] gnu: python2-pathlib2: Update to 2.3.2.

* gnu/packages/python.scm (python2-pathlib2): Update to 2.3.2.
---
 gnu/packages/python.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 796b41840e..f6378acc79 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -8175,13 +8175,13 @@ anymore.")
 (define-public python2-pathlib2
   (package
     (name "python2-pathlib2")
-    (version "2.3.0")
+    (version "2.3.2")
     (source (origin
               (method url-fetch)
               (uri (pypi-uri "pathlib2" version))
               (sha256
                (base32
-                "1cx5gs2v9j2vnzmcrbq5l8fq2mwrr1h6pyf1sjdji2w1bavm09fk"))))
+                "10yb0iv5x2hs631rcppkhbddx799d3h8pcwmkbh2a66ns3w71ccf"))))
     (build-system python-build-system)
     ;; We only need the the Python 2 variant, since for Python 3 our minimum
     ;; version is 3.4 which already includes this package as part of the

From d1f1a7a0b15bddb05ac4b0e817e9ad855982df11 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Thu, 26 Apr 2018 20:51:53 +0200
Subject: [PATCH 175/275] gnu: python-qrcode: Update to 6.0.

* gnu/packages/python.scm (python-qrcode): Update to 6.0.
---
 gnu/packages/python.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index f6378acc79..46bfdaed20 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -10393,14 +10393,14 @@ a file-like object from which an arbitrarly-sized key can be read.")
 (define-public python-qrcode
   (package
     (name "python-qrcode")
-    (version "5.3")
+    (version "6.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "qrcode" version))
        (sha256
         (base32
-         "0kljfrfq0c2rmxf8am57333ia41kd0snbm2rnqbdy816hgpcq5a1"))))
+         "1gz1g2n9kqwqkak78aavr354z1v3yyiksk7q6xp5hi1zr6s0syq3"))))
     (build-system python-build-system)
     (arguments
      ;; FIXME: Tests require packaging 'pymaging'.

From 205044b9c181ce6a51010d95c0ccb70c38e489f2 Mon Sep 17 00:00:00 2001
From: Leo Famulari <leo@famulari.name>
Date: Thu, 26 Apr 2018 15:20:21 -0400
Subject: [PATCH 176/275] gnu: python-josepy: Update to 1.1.0.

* gnu/packages/python-crypto.scm (python-josepy, python2-josepy): Update
to 1.1.0.
---
 gnu/packages/python-crypto.scm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm
index dda1024b39..cdd74d3053 100644
--- a/gnu/packages/python-crypto.scm
+++ b/gnu/packages/python-crypto.scm
@@ -717,28 +717,28 @@ Python.")
 (define-public python-josepy
   (package
     (name "python-josepy")
-    (version "1.0.1")
+    (version "1.1.0")
     (source (origin
               (method url-fetch)
               (uri (pypi-uri "josepy" version))
               (sha256
                (base32
-                "1k0ahzzaq2rrjiifwbhbp7vm8z4zk0ipgiqwicil80kzlf6bhj4z"))))
+                "11khz8malzrv375b27jjkv66z6z6khdx1v5mkkr4vq16gp3n4p7v"))))
     (build-system python-build-system)
     (arguments
-     ;; The tests require pytest >= 3.2, which is not yet packaged.
+     ;; The tests require flake8 >= 3.5, which is not yet packaged.
      '(#:tests? #f))
     (propagated-inputs
      `(("python-cryptography" ,python-cryptography)
        ("python-pyopenssl" ,python-pyopenssl)
        ("python-six" ,python-six)))
-;; TODO Enable when we have pytest >= 3.2.
+;; TODO Enable when we have flake8 >= 3.5.
 ;    (native-inputs
 ;     `(("python-coverage" ,python-coverage)
 ;       ("python-flake8" ,python-flake8)
 ;       ("python-isort" ,python-isort)
 ;       ("python-mock" ,python-mock)
-;       ("python-pytest" ,python-pytest-3.0)
+;       ("python-pytest" ,python-pytest)
 ;       ("python-pytest-cov" ,python-pytest-cov)
 ;       ("python-pytest-cache" ,python-pytest-cache)
 ;       ("python-pytest-flake8" ,python-pytest-flake8)))

From e9c3a780d17b581a866845bedf546fed1e8475c1 Mon Sep 17 00:00:00 2001
From: Alex Kost <alezost@gmail.com>
Date: Wed, 25 Apr 2018 19:17:22 +0300
Subject: [PATCH 177/275] gnu: geiser: Update to 0.10.

* gnu/packages/emacs.scm (geiser): Update to 0.10.
---
 gnu/packages/emacs.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 2c9bd68b23..15e432da84 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -2,7 +2,7 @@
 ;;; Copyright © 2014 Taylan Ulrich Bayirli/Kammer <taylanbayirli@gmail.com>
 ;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2014, 2015, 2016, 2017, 2018 Mark H Weaver <mhw@netris.org>
-;;; Copyright © 2014, 2015, 2016, 2017 Alex Kost <alezost@gmail.com>
+;;; Copyright © 2014, 2015, 2016, 2017, 2018 Alex Kost <alezost@gmail.com>
 ;;; Copyright © 2015 Federico Beffa <beffa@fbengineering.ch>
 ;;; Copyright © 2015, 2016, 2017, 2018 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2016, 2017 Chris Marusich <cmmarusich@gmail.com>
@@ -319,14 +319,14 @@ editor (without an X toolkit)" )
 (define-public geiser
   (package
     (name "geiser")
-    (version "0.9")
+    (version "0.10")
     (source (origin
              (method url-fetch)
              (uri (string-append "mirror://savannah/geiser/" version
                                  "/geiser-" version ".tar.gz"))
              (sha256
               (base32
-               "0phz9d8wjk4p13vqannv0003fwh8qqrp0gfzcs2hgq1mrmv1srss"))))
+               "0pj3l7p8d60c9b4vfprnv6g5l61d74pls4b5dvd84cn4ky9mzwjv"))))
     (build-system gnu-build-system)
     (arguments
      '(#:phases

From cec021d16a38672875ae5622f3e921efc5aac447 Mon Sep 17 00:00:00 2001
From: Alex Kost <alezost@gmail.com>
Date: Wed, 25 Apr 2018 19:18:18 +0300
Subject: [PATCH 178/275] gnu: emacs-with-editor: Update to 2.7.2.

* gnu/packages/emacs.scm (emacs-with-editor): Update to 2.7.2.
---
 gnu/packages/emacs.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 15e432da84..19dc6084c8 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -410,7 +410,7 @@ configuration files, such as .gitattributes, .gitignore, and .git/config.")
 (define-public emacs-with-editor
   (package
     (name "emacs-with-editor")
-    (version "2.7.0")
+    (version "2.7.2")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -419,7 +419,7 @@ configuration files, such as .gitattributes, .gitignore, and .git/config.")
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "0kah7pv211zx9fsb5g4hd51bqcq2bxd1chdykd488ihvfz1l5y14"))))
+                "1jqi3axcs0cb1pcv1jxxc2a09v6psrm33wwl6hmyshzl8kbxs2mv"))))
     (build-system emacs-build-system)
     (propagated-inputs
      `(("emacs-dash" ,emacs-dash)))

From 1f22a544c221356b3f3f00c1212df83bf9c63a13 Mon Sep 17 00:00:00 2001
From: Alex Kost <alezost@gmail.com>
Date: Wed, 25 Apr 2018 19:18:53 +0300
Subject: [PATCH 179/275] gnu: emacs-magit-popup: Update to 2.12.3.

* gnu/packages/emacs.scm (emacs-magit-popup): Update to 2.12.3.
---
 gnu/packages/emacs.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 19dc6084c8..4227f4e829 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -558,7 +558,7 @@ support for Git-SVN.")
 (define-public emacs-magit-popup
   (package
     (name "emacs-magit-popup")
-    (version "2.12.0")
+    (version "2.12.3")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -567,7 +567,7 @@ support for Git-SVN.")
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "1dnk611f7lww6rb03hk8ijg2jwxx9f26pjfff4bwjmnjz7hnd6vz"))))
+                "1kz6vj67awkwf9y2wj6m3l2him3znm08z6bkdvnmfr6rwd96dr39"))))
     (build-system emacs-build-system)
     (arguments
      `(#:phases

From 16ef3368da6f74dfc228a0bae60bfd53a95ce282 Mon Sep 17 00:00:00 2001
From: Leo Famulari <leo@famulari.name>
Date: Thu, 26 Apr 2018 16:10:19 -0400
Subject: [PATCH 180/275] gnu: PackageKit: Update to 1.1.10 [fixes
 CVE-2018-1106].

* gnu/packages/freedesktop.scm (packagekit): Update to 1.1.10.
---
 gnu/packages/freedesktop.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index daa5a3e0b1..7d94053ed3 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -343,7 +343,7 @@ of a the system to know what users are logged in, and where.")
 (define-public packagekit
   (package
     (name "packagekit")
-    (version "1.1.5")
+    (version "1.1.10")
     (source (origin
              (method url-fetch)
              (uri (string-append
@@ -352,7 +352,7 @@ of a the system to know what users are logged in, and where.")
                    "PackageKit-" version ".tar.xz"))
              (sha256
               (base32
-               "035pqxgkyki813hyw2frrbpfllq113zfk5qcp9wvsq5lsp74ix2h"))))
+               "1msfmb22cm4s3l6vsbr86b8s0v897sy6gcga3qg87z7640a0di2b"))))
     (build-system gnu-build-system)
     (arguments
      `(#:tests? #f

From 8df0267ad4cef8e86ac34a8e3b95cd1ef6177efb Mon Sep 17 00:00:00 2001
From: Roel Janssen <roel@gnu.org>
Date: Fri, 27 Apr 2018 01:09:56 +0200
Subject: [PATCH 181/275] gnu: htslib: Update to 1.8.

* gnu/packages/bioinformatics.scm (htslib): Update to 1.8.
---
 gnu/packages/bioinformatics.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 3e93d94651..fc5fe41115 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -3453,7 +3453,7 @@ The main functions of FastQC are:
 (define-public htslib
   (package
     (name "htslib")
-    (version "1.7")
+    (version "1.8")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -3461,7 +3461,7 @@ The main functions of FastQC are:
                     version "/htslib-" version ".tar.bz2"))
               (sha256
                (base32
-                "1il6i2p84b0y9c93dhvzzki1ifw9bvapm2mvpr0xvb2nq8jlwgdy"))))
+                "18bw0mn9pj5wgarnlaxmf1bb8pdqgl1zd6czirqcr62ajpn1xvy0"))))
     (build-system gnu-build-system)
     (inputs
      `(("openssl" ,openssl)

From cbd9f91c326f5f57fb9dd4374069b215e2e7a5f6 Mon Sep 17 00:00:00 2001
From: Roel Janssen <roel@gnu.org>
Date: Fri, 27 Apr 2018 01:05:18 +0200
Subject: [PATCH 182/275] gnu: bcftools: Update to 1.8.

* gnu/packages/bioinformatics.scm (bcftools): Update to 1.8.
* gnu/local.mk: Remove patch.
* gnu/packages/patches/bcftools-regidx-unsigned-char.patch: Remove file.
---
 gnu/local.mk                                     |  1 -
 gnu/packages/bioinformatics.scm                  |  7 +++----
 .../patches/bcftools-regidx-unsigned-char.patch  | 16 ----------------
 3 files changed, 3 insertions(+), 21 deletions(-)
 delete mode 100644 gnu/packages/patches/bcftools-regidx-unsigned-char.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 6065d4c96b..3e093b791b 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -575,7 +575,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/azr3.patch				\
   %D%/packages/patches/bash-completion-directories.patch	\
   %D%/packages/patches/bazaar-CVE-2017-14176.patch		\
-  %D%/packages/patches/bcftools-regidx-unsigned-char.patch	\
   %D%/packages/patches/binutils-ld-new-dtags.patch		\
   %D%/packages/patches/binutils-loongson-workaround.patch	\
   %D%/packages/patches/blast+-fix-makefile.patch		\
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index fc5fe41115..d8b17f51e4 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -285,7 +285,7 @@ BAM files.")
 (define-public bcftools
   (package
     (name "bcftools")
-    (version "1.5")
+    (version "1.8")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -293,12 +293,11 @@ BAM files.")
                     version "/bcftools-" version ".tar.bz2"))
               (sha256
                (base32
-                "0093hkkvxmbwfaa7905s6185jymynvg42kq6sxv7fili11l5mxwz"))
-              (patches (search-patches "bcftools-regidx-unsigned-char.patch"))
+                "1vgw2mwngq20c530zim52zvgmw1lci8rzl33pvh44xqk3xlzvjsa"))
               (modules '((guix build utils)))
               (snippet
                ;; Delete bundled htslib.
-               '(delete-file-recursively "htslib-1.5"))))
+               '(delete-file-recursively "htslib-1.8"))))
     (build-system gnu-build-system)
     (arguments
      `(#:test-target "test"
diff --git a/gnu/packages/patches/bcftools-regidx-unsigned-char.patch b/gnu/packages/patches/bcftools-regidx-unsigned-char.patch
deleted file mode 100644
index af5bc160f5..0000000000
--- a/gnu/packages/patches/bcftools-regidx-unsigned-char.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Fix test-regidx argument parsing on archs with unsigned char
- On architectures where char is unsigned "c >= 0" was always true.
-Author: Adrian Bunk <bunk@debian.org>
-Bug-Debian: https://bugs.debian.org/865060
-
---- a/test/test-regidx.c
-+++ b/test/test-regidx.c
-@@ -336,7 +336,7 @@
-         {"seed",1,0,'s'},
-         {0,0,0,0}
-     };
--    char c;
-+    int c;
-     int seed = (int)time(NULL);
-     while ((c = getopt_long(argc, argv, "hvs:",loptions,NULL)) >= 0) 
-     {

From c829c5ea85a9953663b3b26f304d91babf21fbc9 Mon Sep 17 00:00:00 2001
From: Roel Janssen <roel@gnu.org>
Date: Fri, 27 Apr 2018 01:08:58 +0200
Subject: [PATCH 183/275] gnu: samtools: Update to 1.8.

* gnu/packages/bioinformatics.scm (samtools): Update to 1.8.
---
 gnu/packages/bioinformatics.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index d8b17f51e4..95a5bc8d5a 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -4920,7 +4920,7 @@ to the user's query of interest.")
 (define-public samtools
   (package
     (name "samtools")
-    (version "1.7")
+    (version "1.8")
     (source
      (origin
        (method url-fetch)
@@ -4929,7 +4929,7 @@ to the user's query of interest.")
                        version "/samtools-" version ".tar.bz2"))
        (sha256
         (base32
-         "18acyqysbxpydlc44lqv2hpp57l06bs9a3yqmcvjk8va2xrrdc77"))))
+         "05myg7bs90i68qbqab9cdg9rqj2xh39azibrx82ipzc5kcfvqhn9"))))
     (build-system gnu-build-system)
     (arguments
      `(#:modules ((ice-9 ftw)

From b43a9eb361590ebaf59d48374fe7faa24d2f882b Mon Sep 17 00:00:00 2001
From: Roel Janssen <roel@gnu.org>
Date: Fri, 27 Apr 2018 01:06:56 +0200
Subject: [PATCH 184/275] gnu: bedops: Update to 2.4.33.

* gnu/packages/bioinformatics.scm (bedops): Update to 2.4.33.
---
 gnu/packages/bioinformatics.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 95a5bc8d5a..828b41a8db 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -337,7 +337,7 @@ transparently with both VCFs and BCFs, both uncompressed and BGZF-compressed.")
 (define-public bedops
   (package
     (name "bedops")
-    (version "2.4.14")
+    (version "2.4.33")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://github.com/bedops/bedops/archive/v"
@@ -345,7 +345,7 @@ transparently with both VCFs and BCFs, both uncompressed and BGZF-compressed.")
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "1kqbac547wyqma81cyky9n7mkgikjpsfd3nnmcm6hpqwanqgh10v"))))
+                "0kx4awrwby8f33wqyx8w7ms7v25xhf0d421csgf96a3hfzn2mb0m"))))
     (build-system gnu-build-system)
     (arguments
      '(#:tests? #f

From ae9877fed35a3add9ce38eab524daca597c00b52 Mon Sep 17 00:00:00 2001
From: Christopher Lemmer Webber <cwebber@dustycloud.org>
Date: Thu, 26 Apr 2018 19:10:36 -0500
Subject: [PATCH 185/275] gnu: paperkey: Update to 1.5.

* gnu/packages/gnupg.scm (paperkey): Update to 1.5.
---
 gnu/packages/gnupg.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
index 29421446ed..f397482ab0 100644
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@ -795,7 +795,7 @@ passphrase when @code{gpg} is run and needs it.")))
 (define-public paperkey
   (package
     (name "paperkey")
-    (version "1.3")
+    (version "1.5")
     (source (origin
               (method url-fetch)
               (uri (string-append "http://www.jabberwocky.com/"
@@ -803,7 +803,7 @@ passphrase when @code{gpg} is run and needs it.")))
                                   version ".tar.gz"))
               (sha256
                (base32
-                "1yybj8bj68v4lxwpn596b6ismh2fyixw5vlqqg26byrn4d9dfmsv"))))
+                "1prd2jaf4zjad3xhv160hmi5n408ssljfg7iz90jxs9w111pjwy4"))))
     (build-system gnu-build-system)
     (arguments
      `(#:phases

From e3e74e40227bdf3e47077a5d32665f3e44bfa186 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Thu, 26 Apr 2018 22:00:15 +0200
Subject: [PATCH 186/275] gnu: python2-ndg-httpsclient: Fix build.

This might be a follow-up to a39cc016329f1f490ac7629fa81c9b686e7b0f4e
from 2016, which would be neat.

* gnu/packages/python-web.scm (python2-ndg-httpsclient)[arguments]: Use
SUBSTITUTE-KEYWORD-ARGUMENTS to still skip tests.
---
 gnu/packages/python-web.scm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 53a9d3c2f3..6e8d9ab954 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -44,6 +44,7 @@
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system python)
+  #:use-module (guix utils)
   #:use-module (gnu packages)
   #:use-module (gnu packages check)
   #:use-module (gnu packages compression)
@@ -1024,7 +1025,9 @@ of the SSL peer.")
 (define-public python2-ndg-httpsclient
   (package (inherit python-ndg-httpsclient)
     (name "python2-ndg-httpsclient")
-    (arguments `(#:python ,python-2))
+    (arguments
+     (substitute-keyword-arguments (package-arguments python-ndg-httpsclient)
+       ((#:python _) python-2)))
     (propagated-inputs
      `(("python2-pyopenssl" ,python2-pyopenssl)))))
 

From 93a554a0d985f99c00ba1423efba6f091ce6d48b Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Thu, 26 Apr 2018 21:26:55 +0200
Subject: [PATCH 187/275] gnu: python-simplejson: Update to 3.14.0.

* gnu/packages/python.scm (python-simplejson): Update to 3.14.0.
---
 gnu/packages/python.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 46bfdaed20..a5d533b1c1 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -1212,14 +1212,14 @@ after Andy Lester’s Perl module WWW::Mechanize.")
 (define-public python-simplejson
   (package
     (name "python-simplejson")
-    (version "3.13.2")
+    (version "3.14.0")
     (source
      (origin
       (method url-fetch)
       (uri (pypi-uri "simplejson" version))
       (sha256
        (base32
-        "02jg5nixffqyicfqdl4dil82fh1z9p2as758wp0nqwalw0hcykjc"))))
+        "1lkv3xlf7ryzi69zqfdbkvpxdfy1rg1rq2yzcnxgf4km5m6difqy"))))
     (build-system python-build-system)
     (home-page "http://simplejson.readthedocs.org/en/latest/")
     (synopsis

From a7999e2d63c83598d1fc019416ee96025d17ef4c Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Thu, 26 Apr 2018 21:42:29 +0200
Subject: [PATCH 188/275] gnu: perl-test-notabs: Update to 2.02.

* gnu/packages/perl-check.scm (perl-test-notabs): Update to 2.02.
---
 gnu/packages/perl-check.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/perl-check.scm b/gnu/packages/perl-check.scm
index f8be207f1b..9c17733d4c 100644
--- a/gnu/packages/perl-check.scm
+++ b/gnu/packages/perl-check.scm
@@ -798,7 +798,7 @@ If used in a subtest, the remainder of the subtest will be skipped.")
 (define-public perl-test-notabs
   (package
     (name "perl-test-notabs")
-    (version "2.00")
+    (version "2.02")
     (source
      (origin
        (method url-fetch)
@@ -808,7 +808,7 @@ If used in a subtest, the remainder of the subtest will be skipped.")
              ".tar.gz"))
        (sha256
         (base32
-         "127kpl1va267qar2ia4c22xb96jby2jqnda3sj5pjgmxg8si26cg"))))
+         "0c306p9qdpa2ycii3c50hml23mwy6bjxpry126g1dw11hyiwcxgv"))))
     (build-system perl-build-system)
     (home-page
      "http://search.cpan.org/dist/Test-NoTabs/")

From 9960ed6291480e0ab6f85fca00290c0ff38cbffe Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Thu, 26 Apr 2018 22:44:44 +0200
Subject: [PATCH 189/275] gnu: perl-file-sharedir-install: Update to 0.13.

* gnu/packages/perl.scm (perl-file-sharedir-install): Update to 0.13.
---
 gnu/packages/perl.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm
index 2397b273c3..c3b3eedc87 100644
--- a/gnu/packages/perl.scm
+++ b/gnu/packages/perl.scm
@@ -3635,7 +3635,7 @@ distributions.  It is a companion module to File::ShareDir.")
 (define-public perl-file-sharedir-install
   (package
     (name "perl-file-sharedir-install")
-    (version "0.12")
+    (version "0.13")
     (source
      (origin
        (method url-fetch)
@@ -3643,7 +3643,7 @@ distributions.  It is a companion module to File::ShareDir.")
                            "File-ShareDir-Install-" version ".tar.gz"))
        (sha256
         (base32
-         "13g8d69c2lq3mrc0i4fr705h99gxyzw1srww4m7wdhzfmbsdqxli"))))
+         "1yc0wlkav2l2wr36a53n4mnhsy2zv29z5nm14mygxgjwv7qgvgj5"))))
     (build-system perl-build-system)
     (native-inputs
      `(("perl-module-build" ,perl-module-build)))

From 085a95a71cbfabd25410757c1409a46438cd62c7 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Thu, 26 Apr 2018 23:16:52 +0200
Subject: [PATCH 190/275] gnu: perl-b-hooks-endofscope: Update to 0.24.

* gnu/packages/perl.scm (perl-b-hooks-endofscope): Update to 0.24.
---
 gnu/packages/perl.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm
index c3b3eedc87..13f0e778f8 100644
--- a/gnu/packages/perl.scm
+++ b/gnu/packages/perl.scm
@@ -452,7 +452,7 @@ all known commands are checked.")
 (define-public perl-b-hooks-endofscope
   (package
     (name "perl-b-hooks-endofscope")
-    (version "0.21")
+    (version "0.24")
     (source
      (origin
        (method url-fetch)
@@ -460,7 +460,7 @@ all known commands are checked.")
                            "B-Hooks-EndOfScope-" version ".tar.gz"))
        (sha256
         (base32
-         "0b70vbpabsy9ia366k330cz1zbdyb1pwhb0l7j28pmpih045iwwh"))))
+         "1imcqxp23yc80a7p0h56sja9glbrh4qyhgzljqd4g9habpz3vah3"))))
     (build-system perl-build-system)
     (propagated-inputs
      `(("perl-module-runtime" ,perl-module-runtime)

From 9b8e38ae3d93672623b0f48015d96251f2613aee Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Thu, 26 Apr 2018 23:17:14 +0200
Subject: [PATCH 191/275] gnu: perl-capture-tiny: Update to 0.48.

* gnu/packages/perl.scm (perl-capture-tiny): Update to 0.48.
---
 gnu/packages/perl.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm
index 13f0e778f8..7a743cfd0d 100644
--- a/gnu/packages/perl.scm
+++ b/gnu/packages/perl.scm
@@ -720,7 +720,7 @@ algorithm to keep the most used entries in the cache.")
 (define-public perl-capture-tiny
   (package
     (name "perl-capture-tiny")
-    (version "0.46")
+    (version "0.48")
     (source
      (origin
        (method url-fetch)
@@ -729,7 +729,7 @@ algorithm to keep the most used entries in the cache.")
              version ".tar.gz"))
        (sha256
         (base32
-         "05bhlx6d4nzamhkkh0pkckg7wlvaq6mazf7q1fbb5wpp1j1nlyjx"))))
+         "069yrikrrb4vqzc3hrkkfj96apsh7q0hg8lhihq97lxshwz128vc"))))
     (build-system perl-build-system)
     (home-page "http://search.cpan.org/dist/Capture-Tiny/")
     (synopsis "Capture STDOUT and STDERR from Perl, XS or external programs")

From c3a17ab7af23be5230b81c9a848501e74348f1d0 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Thu, 26 Apr 2018 23:31:19 +0200
Subject: [PATCH 192/275] gnu: perl-sub-quote: Update to 2.005001.

* gnu/packages/perl.scm (perl-sub-quote): Update to 2.005001.
---
 gnu/packages/perl.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm
index 7a743cfd0d..7bb0eaa8ab 100644
--- a/gnu/packages/perl.scm
+++ b/gnu/packages/perl.scm
@@ -7690,7 +7690,7 @@ return value is the sub.")
 (define-public perl-sub-quote
   (package
     (name "perl-sub-quote")
-    (version "2.005000")
+    (version "2.005001")
     (source
      (origin
        (method url-fetch)
@@ -7699,7 +7699,7 @@ return value is the sub.")
              version ".tar.gz"))
        (sha256
         (base32
-         "1zv45cvj4ifkbr61ydcpphnj6lvib37gfxwfh40h0yzf3c8lbca4"))))
+         "01xsvfdpxzimsbrp9mqipsr93y83nhj21q05g8v1bw6yfl3lzayn"))))
     (build-system perl-build-system)
     (native-inputs
      `(("perl-test-fatal" ,perl-test-fatal)))

From e1612fb59c41f0ba1c29c16d5a817fb2153ffb61 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Thu, 26 Apr 2018 23:52:03 +0200
Subject: [PATCH 193/275] gnu: perl-safe-isa: Update to 1.000010.

* gnu/packages/perl.scm (perl-safe-isa): Update to 1.000010.
---
 gnu/packages/perl.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm
index 7bb0eaa8ab..e72063d9fb 100644
--- a/gnu/packages/perl.scm
+++ b/gnu/packages/perl.scm
@@ -7171,7 +7171,7 @@ and @code{deserialize_regexp}.")
 (define-public perl-safe-isa
   (package
     (name "perl-safe-isa")
-    (version "1.000008")
+    (version "1.000010")
     (source
      (origin
        (method url-fetch)
@@ -7179,7 +7179,7 @@ and @code{deserialize_regexp}.")
                            "Safe-Isa-" version ".tar.gz"))
        (sha256
         (base32
-         "08r74hwxq5b3bibnbwjr9anybg15l3zqdgcirpw1xm2qpvcxgdkx"))))
+         "0sm6p1kw98s7j6n92vvxjqf818xggnmjwci34xjmw7gzl2519x47"))))
     (build-system perl-build-system)
     (home-page "http://search.cpan.org/dist/Safe-Isa/")
     (synopsis "Call isa, can, does, and DOES safely")

From 6a4c7d311a6f6c4ab1f69506ddf15c78fc72f6a1 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Thu, 26 Apr 2018 23:52:42 +0200
Subject: [PATCH 194/275] gnu: perl-log-any-adapter-log4perl: Update to 0.09.

* gnu/packages/perl.scm (perl-log-any-adapter-log4perl): Update to 0.09.
[source]: Update maintainer URI.
---
 gnu/packages/perl.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm
index e72063d9fb..8703ef5cbc 100644
--- a/gnu/packages/perl.scm
+++ b/gnu/packages/perl.scm
@@ -4521,17 +4521,17 @@ logging mechanism.")
 (define-public perl-log-any-adapter-log4perl
   (package
     (name "perl-log-any-adapter-log4perl")
-    (version "0.08")
+    (version "0.09")
     (source
      (origin
        (method url-fetch)
        (uri (string-append
-             "mirror://cpan/authors/id/D/DA/DAGOLDEN/Log-Any-Adapter-Log4perl-"
+             "mirror://cpan/authors/id/P/PR/PREACTION/Log-Any-Adapter-Log4perl-"
              version
              ".tar.gz"))
        (sha256
         (base32
-         "0xf4fnrsznvg0hf36q481124ja1hp3lybki1xjgnk82z9990jmxn"))))
+         "19f1drqnzr6g4xwjm6jk4iaa3zmiax8bzxqch04f4jr12bjd75qi"))))
     (build-system perl-build-system)
     (propagated-inputs
      `(("perl-log-any" ,perl-log-any)

From d5db813b382e941710771ab937bba45d62527691 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Fri, 27 Apr 2018 00:32:05 +0200
Subject: [PATCH 195/275] gnu: libfm: Update to 1.3.0.

* gnu/packages/lxde.scm (libfm): Update to 1.3.0.
---
 gnu/packages/lxde.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/lxde.scm b/gnu/packages/lxde.scm
index 58961d2452..97ab8720d6 100644
--- a/gnu/packages/lxde.scm
+++ b/gnu/packages/lxde.scm
@@ -48,7 +48,7 @@
 (define-public libfm
   (package
     (name "libfm")
-    (version "1.2.5")
+    (version "1.3.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://sourceforge/pcmanfm/"
@@ -56,7 +56,7 @@
                                   "%29/LibFM/" name "-" version ".tar.xz"))
               (sha256
                (base32
-                "0nlvfwh09gbq8bkbvwnw6iqr918rrs9gc9ljb9pjspyg408bn1n7"))))
+                "151jyy8ipmp2h829gd9s4s429qafv1zxl7j6zaj1k1gzm9s5rmnb"))))
     (build-system gnu-build-system)
     (inputs `(("glib" ,glib)
               ("gtk+" ,gtk+-2)))

From ca2158bb3a0f5de3108a4f81e6733a5309e9af1d Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Fri, 27 Apr 2018 00:34:46 +0200
Subject: [PATCH 196/275] gnu: pcmanfm: Update to 1.3.0.

* gnu/packages/lxde.scm (pcmanfm): Update to 1.3.0.
[source]: Remove patch.
* gnu/packages/patches/pcmanfm-CVE-2017-8934.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove it.
---
 gnu/local.mk                                  |  1 -
 gnu/packages/lxde.scm                         |  9 ++-
 .../patches/pcmanfm-CVE-2017-8934.patch       | 56 -------------------
 3 files changed, 4 insertions(+), 62 deletions(-)
 delete mode 100644 gnu/packages/patches/pcmanfm-CVE-2017-8934.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 3e093b791b..db1c260da6 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -977,7 +977,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/patchelf-rework-for-arm.patch		\
   %D%/packages/patches/patchutils-xfail-gendiff-tests.patch	\
   %D%/packages/patches/patch-hurd-path-max.patch		\
-  %D%/packages/patches/pcmanfm-CVE-2017-8934.patch		\
   %D%/packages/patches/pcre2-CVE-2017-7186.patch		\
   %D%/packages/patches/pcre2-CVE-2017-8786.patch		\
   %D%/packages/patches/perl-file-path-CVE-2017-6512.patch	\
diff --git a/gnu/packages/lxde.scm b/gnu/packages/lxde.scm
index 97ab8720d6..67e66f8f6b 100644
--- a/gnu/packages/lxde.scm
+++ b/gnu/packages/lxde.scm
@@ -205,26 +205,25 @@ speed up the access to freedesktop.org defined application menus.")
 (define-public pcmanfm
   (package
     (name "pcmanfm")
-    (version "1.2.5")
+    (version "1.3.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://sourceforge/" name "/"
                                   "PCManFM%20%2B%20Libfm%20%28tarball%20release"
                                   "%29/PCManFM/" name "-" version ".tar.xz"))
-              (patches (search-patches "pcmanfm-CVE-2017-8934.patch"))
               (sha256
                (base32
-                "0rxdh0dfzc84l85c54blq42gczygq8adhr3l9hqzy1dp530cm1hc"))))
+                "1ywgfyklms5hqkapsbjps4kyx20ac0d1qk16ww74yagkyfdkwsas"))))
     (build-system gnu-build-system)
     (inputs `(("gtk+"   ,gtk+-2)
-              ("gvfs"   ,gvfs)                    ;for trash and mount support
+              ("gvfs"   ,gvfs)          ; for trash and mount support
               ("libfm"  ,libfm)
               ("libx11" ,libx11)))
     (native-inputs `(("intltool"   ,intltool)
                      ("libtool"    ,libtool)
                      ("pkg-config" ,pkg-config)))
     (propagated-inputs
-     `(("lxmenu-data" ,lxmenu-data)))     ;for "Open With..." application list
+     `(("lxmenu-data" ,lxmenu-data)))   ; for "Open With..." application list
     (synopsis "LXDE file manager")
     (description "PCMan is a lightweight GTK+ based file manager, compliant
 with freedesktop.org standard.")
diff --git a/gnu/packages/patches/pcmanfm-CVE-2017-8934.patch b/gnu/packages/patches/pcmanfm-CVE-2017-8934.patch
deleted file mode 100644
index 489d22c83b..0000000000
--- a/gnu/packages/patches/pcmanfm-CVE-2017-8934.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From bc8c3d871e9ecc67c47ff002b68cf049793faf08 Mon Sep 17 00:00:00 2001
-From: Andriy Grytsenko <andrej@rep.kiev.ua>
-Date: Sun, 14 May 2017 21:35:40 +0300
-Subject: [PATCH] Fix potential access violation, use runtime user dir instead
- of tmp dir.
-
----
- NEWS              | 4 ++++
- src/single-inst.c | 7 ++++++-
- 2 files changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/NEWS b/NEWS
-index 8c2049a..876f7f3 100644
---- a/NEWS
-+++ b/NEWS
-@@ -1,3 +1,7 @@
-+* Fixed potential access violation, use runtime user dir instead of tmp dir
-+    for single instance socket.
-+
-+
- Changes on 1.2.5 since 1.2.4:
- 
- * Removed options to Cut, Remove and Rename from context menu on mounted
-diff --git a/src/single-inst.c b/src/single-inst.c
-index 62c37b3..aaf84ab 100644
---- a/src/single-inst.c
-+++ b/src/single-inst.c
-@@ -2,7 +2,7 @@
-  *      single-inst.c: simple IPC mechanism for single instance app
-  *
-  *      Copyright 2010 Hong Jen Yee (PCMan) <pcman.tw@gmail.com>
-- *      Copyright 2012 Andriy Grytsenko (LStranger) <andrej@rep.kiev.ua>
-+ *      Copyright 2012-2017 Andriy Grytsenko (LStranger) <andrej@rep.kiev.ua>
-  *
-  *      This program is free software; you can redistribute it and/or modify
-  *      it under the terms of the GNU General Public License as published by
-@@ -404,11 +404,16 @@ static void get_socket_name(SingleInstData* data, char* buf, int len)
-     }
-     else
-         dpynum = 0;
-+#if GLIB_CHECK_VERSION(2, 28, 0)
-+    g_snprintf(buf, len, "%s/%s-socket-%s-%d", g_get_user_runtime_dir(),
-+               data->prog_name, host ? host : "", dpynum);
-+#else
-     g_snprintf(buf, len, "%s/.%s-socket-%s-%d-%s",
-                 g_get_tmp_dir(),
-                 data->prog_name,
-                 host ? host : "",
-                 dpynum,
-                 g_get_user_name());
-+#endif
- }
- 
--- 
-2.1.4
-

From fb9232d717c4c7350059adfa5ff8bfe2d673c5a2 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Fri, 27 Apr 2018 00:51:02 +0200
Subject: [PATCH 197/275] gnu: cpuid: Update to 20180419.

* gnu/packages/linux.scm (cpuid): Update to 20180419.
---
 gnu/packages/linux.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 4d24463173..bcbfc5dabd 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -4305,20 +4305,20 @@ available in the kernel Linux.")
 (define-public cpuid
   (package
     (name "cpuid")
-    (version "20170122")
+    (version "20180419")
     (source (origin
               (method url-fetch)
               (uri (string-append "http://www.etallen.com/cpuid/cpuid-"
                                   version ".src.tar.gz"))
               (sha256
                (base32
-                "0ra8ph9m1dckqaikfnbsh408fp2w9k49fkl423fl2hvhwsm14xk6"))))
+                "0cnxj72pjalsszhn862r6shw64zbrkw0k3mm36fn93bivswjnj12"))))
     (build-system gnu-build-system)
     (arguments
      '(#:make-flags '("CC=gcc")
-       #:tests? #f ; no tests
+       #:tests? #f                      ; no tests
        #:phases (modify-phases %standard-phases
-                  (delete 'configure)
+                  (delete 'configure)   ; no configure script
                   (add-before 'install 'fix-makefile
                     (lambda* (#:key outputs #:allow-other-keys)
                       (substitute* "Makefile"

From 1c51b7b4bc1f5c71b5cbe4ea94f4ea1f96bd9478 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Fri, 27 Apr 2018 01:09:51 +0200
Subject: [PATCH 198/275] gnu: libetonyek: Update to 0.1.8.

gnu/packages/libreoffice.scm (libetonyek): Update to 0.1.8.
---
 gnu/packages/libreoffice.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm
index ef40e018b1..211454f174 100644
--- a/gnu/packages/libreoffice.scm
+++ b/gnu/packages/libreoffice.scm
@@ -359,14 +359,14 @@ CorelDRAW documents of all versions.")
 (define-public libetonyek
   (package
     (name "libetonyek")
-    (version "0.1.7")
+    (version "0.1.8")
     (source
      (origin
       (method url-fetch)
       (uri (string-append "http://dev-www.libreoffice.org/src/" name "/"
                           name "-" version ".tar.xz"))
       (sha256 (base32
-               "1b1lqy6g7flximlv0bp8jbsivyhdp679yj0d0q4jzm968h6y3nv9"))))
+               "0bfq9rwm040xhh7b3v0gsdavwvnrz4hkwnhpggarxk70mr3j7jcx"))))
     (build-system gnu-build-system)
     (arguments
      `(#:configure-flags '("--with-mdds=1.2")))

From 72dae07296fd6e3db6a77f48a014a80520d6e6d1 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Fri, 27 Apr 2018 01:14:48 +0200
Subject: [PATCH 199/275] gnu: quassel: Update to 0.12.5.

* gnu/packages/irc.scm (quassel): Update to 0.12.5.
[source]: Remove patch.
* gnu/packages/patches/quassel-fix-tls-check.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove it.
---
 gnu/local.mk                                  |  1 -
 gnu/packages/irc.scm                          |  7 +++---
 .../patches/quassel-fix-tls-check.patch       | 25 -------------------
 3 files changed, 3 insertions(+), 30 deletions(-)
 delete mode 100644 gnu/packages/patches/quassel-fix-tls-check.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index db1c260da6..3ce87ee444 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1063,7 +1063,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/qtbase-use-TZDIR.patch			\
   %D%/packages/patches/qtscript-disable-tests.patch		\
   %D%/packages/patches/quagga-reproducible-build.patch          \
-  %D%/packages/patches/quassel-fix-tls-check.patch              \
   %D%/packages/patches/quickswitch-fix-dmenu-check.patch	\
   %D%/packages/patches/rapicorn-isnan.patch			\
   %D%/packages/patches/raptor2-heap-overflow.patch		\
diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm
index 38a1fb3a2d..c376805f46 100644
--- a/gnu/packages/irc.scm
+++ b/gnu/packages/irc.scm
@@ -65,18 +65,17 @@
 (define-public quassel
   (package
     (name "quassel")
-    (version "0.12.4")
+    (version "0.12.5")
     (source
       (origin
         (method url-fetch)
         (uri (string-append "http://quassel-irc.org/pub/quassel-"
                             version ".tar.bz2"))
-        (patches (search-patches "quassel-fix-tls-check.patch"))
         (sha256
          (base32
-          "0ka456fb8ha3w7g74xlzfg6w4azxjjxgrhl4aqpbwg3lnd6fbr4k"))
+          "1qkl3sb4ijx4k17m0c42j2p5bc4jymypwhmplm942rbrzm6mg50q"))
         (modules '((guix build utils)))
-        ;; We don't want to install the bundles scripts
+        ;; We don't want to install the bundled scripts.
         (snippet
          '(begin
             (delete-file-recursively "data/scripts")
diff --git a/gnu/packages/patches/quassel-fix-tls-check.patch b/gnu/packages/patches/quassel-fix-tls-check.patch
deleted file mode 100644
index 057bc02a14..0000000000
--- a/gnu/packages/patches/quassel-fix-tls-check.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-This allows quasselclient to connect to SSL-enabled quasselcore instances.
-
-The check in qglobal.h requires -fPIC (not -fPIE as it is now). When this check
-fails SSL / TLS is disabled.
-
-This patch comes from the upstream source repository [0] and can be
-removed when the next version is packaged.
-
-[0] https://github.com/quassel/quassel/commit/4768c9e99f99b581d4e32e797db91d0182391696
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -428,6 +428,11 @@ endif()
- cmake_push_check_state(RESET)
- set(CMAKE_REQUIRED_INCLUDES ${QT_INCLUDES} ${Qt5Core_INCLUDE_DIRS})
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Core_EXECUTABLE_COMPILE_FLAGS}")
-+
-+if (USE_QT5 AND Qt5_POSITION_INDEPENDENT_CODE)
-+    set(CMAKE_REQUIRED_FLAGS "-fPIC -DQT_NO_VERSION_TAGGING")
-+endif()
-+
- check_cxx_source_compiles("
-     #include \"qglobal.h\"
-     #if defined QT_NO_SSL
-

From 5b292eac73d6dbc88b79a5ba9e122fca0b8af345 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Fri, 27 Apr 2018 01:39:31 +0200
Subject: [PATCH 200/275] gnu: quassel: Use HTTPS home page.

* gnu/packages/irc.scm (quassel)[home-page]: Use HTTPS.
---
 gnu/packages/irc.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm
index c376805f46..219e803089 100644
--- a/gnu/packages/irc.scm
+++ b/gnu/packages/irc.scm
@@ -103,7 +103,7 @@
        ("qtscript" ,qtscript)
        ("snorenotify" ,snorenotify)
        ("zlib" ,zlib)))
-    (home-page "http://quassel-irc.org/")
+    (home-page "https://quassel-irc.org/")
     (synopsis "Distributed IRC client")
     (description "Quassel is a distributed IRC client, meaning that one or more
 clients can attach to and detach from the central core.  It resembles the

From c2e76b7082ee5af27765b0d3ac50810e076fe514 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Fri, 27 Apr 2018 03:11:50 +0200
Subject: [PATCH 201/275] gnu: darktable: Update to 2.4.3.

* gnu/packages/photo.scm (darktable): Update to 2.4.3.
---
 gnu/packages/photo.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm
index d56cd6ecce..2c0c2313f4 100644
--- a/gnu/packages/photo.scm
+++ b/gnu/packages/photo.scm
@@ -330,7 +330,7 @@ photographic equipment.")
 (define-public darktable
   (package
     (name "darktable")
-    (version "2.4.2")
+    (version "2.4.3")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -339,7 +339,7 @@ photographic equipment.")
                     version "/darktable-" version ".tar.xz"))
               (sha256
                (base32
-                "10asz918kv2248px3w9bn5k8cfrad5xrci58x9y61l0yf5hcpk0r"))))
+                "1lq3xp7hhfhfwqrz0f2mrp3xywnpvb0nlw6lbm5cgx22s5xzri8x"))))
     (build-system cmake-build-system)
     (arguments
      `(#:tests? #f ; There are no tests.

From d98e9009a934f7c12e2241b072ad469a009468de Mon Sep 17 00:00:00 2001
From: Eric Bavier <bavier@cray.com>
Date: Fri, 2 Mar 2018 14:05:34 -0600
Subject: [PATCH 202/275] gnu: scotch: Update to 6.0.5a.

* gnu/packages/patches/pt-scotch-build-parallelism.patch: Delete files.
* gnu/packages/patches/scotch-build-parallelism.patch,
gnu/packages/patches/scotch-graph-diam-64.patch,
gnu/packages/patches/scotch-graph-induce-type-64.patch: New files.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/maths.scm (scotch): Update to 6.0.5a.
[source](patches): Adjust accordingly.
---
 gnu/local.mk                                  |  4 +-
 gnu/packages/maths.scm                        |  8 ++--
 .../patches/pt-scotch-build-parallelism.patch | 13 -------
 .../patches/scotch-build-parallelism.patch    | 39 +++++++++++++++++++
 .../patches/scotch-graph-diam-64.patch        | 27 +++++++++++++
 .../patches/scotch-graph-induce-type-64.patch | 19 +++++++++
 6 files changed, 93 insertions(+), 17 deletions(-)
 delete mode 100644 gnu/packages/patches/pt-scotch-build-parallelism.patch
 create mode 100644 gnu/packages/patches/scotch-build-parallelism.patch
 create mode 100644 gnu/packages/patches/scotch-graph-diam-64.patch
 create mode 100644 gnu/packages/patches/scotch-graph-induce-type-64.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 3ce87ee444..cbf2c6f1b4 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1014,7 +1014,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/psm-arch.patch				\
   %D%/packages/patches/psm-ldflags.patch			\
   %D%/packages/patches/psm-repro.patch				\
-  %D%/packages/patches/pt-scotch-build-parallelism.patch	\
   %D%/packages/patches/pulseaudio-fix-mult-test.patch		\
   %D%/packages/patches/pulseaudio-longer-test-timeout.patch	\
   %D%/packages/patches/pycairo-wscript.patch			\
@@ -1086,6 +1085,9 @@ dist_patch_DATA =						\
   %D%/packages/patches/rxvt-unicode-escape-sequences.patch	\
   %D%/packages/patches/scheme48-tests.patch			\
   %D%/packages/patches/scotch-test-threading.patch		\
+  %D%/packages/patches/scotch-build-parallelism.patch		\
+  %D%/packages/patches/scotch-graph-diam-64.patch		\
+  %D%/packages/patches/scotch-graph-induce-type-64.patch	\
   %D%/packages/patches/sdl-libx11-1.6.patch			\
   %D%/packages/patches/seq24-rename-mutex.patch			\
   %D%/packages/patches/shadow-CVE-2018-7169.patch		\
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 353aa41167..aa382cda6b 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -2199,16 +2199,18 @@ implemented in ANSI C, and MPI for communications.")
 (define-public scotch
   (package
     (name "scotch")
-    (version "6.0.4")
+    (version "6.0.5a")
     (source
      (origin
       (method url-fetch)
       (uri (string-append "https://gforge.inria.fr/frs/download.php/"
                           "latestfile/298/scotch_" version ".tar.gz"))
       (sha256
-       (base32 "1ir088mvrqggyqdkx9qfynmiaffqbyih5qfl5mga2nrlm1qlsgzm"))
+       (base32 "0vsmgjz8qv80di3ljmc7hbdsizxxxwy2b9rgd2fl1mdc6dgbj8av"))
       (patches (search-patches "scotch-test-threading.patch"
-                               "pt-scotch-build-parallelism.patch"))))
+                               "scotch-build-parallelism.patch"
+                               "scotch-graph-induce-type-64.patch"
+                               "scotch-graph-diam-64.patch"))))
     (build-system gnu-build-system)
     (inputs
      `(("zlib" ,zlib)
diff --git a/gnu/packages/patches/pt-scotch-build-parallelism.patch b/gnu/packages/patches/pt-scotch-build-parallelism.patch
deleted file mode 100644
index 2ac5f27f52..0000000000
--- a/gnu/packages/patches/pt-scotch-build-parallelism.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Building with -j may cause the esmumps_main target to fail with a "no rule for
-dependency libptesmumps.a" error.  Fix the dependency name.
-
---- scotch_6.0.4/src/esmumps/Makefile	2012-12-01 08:29:29.000000000 -0600
-+++ scotch_6.0.4/src/esmumps/Makefile	2015-06-15 17:29:23.279605734 -0500
-@@ -160,6 +160,6 @@
- 					order.h					\
- 					symbol.h				\
- 					esmumps.h				\
--					lib$(ESMUMPSLIB)$(LIB)			\
-+					libesmumps$(LIB)			\
- 					$(libdir)/lib$(SCOTCHLIB)$(LIB)		\
- 					$(libdir)/lib$(SCOTCHLIB)errexit$(LIB)
diff --git a/gnu/packages/patches/scotch-build-parallelism.patch b/gnu/packages/patches/scotch-build-parallelism.patch
new file mode 100644
index 0000000000..a669f1dbeb
--- /dev/null
+++ b/gnu/packages/patches/scotch-build-parallelism.patch
@@ -0,0 +1,39 @@
+Fixes make with -j, otherwise scotch.h may not be generated by the time make
+tries to compile library_graph_diam.o et al.
+
+Reported upstream at
+https://gforge.inria.fr/tracker/index.php?func=detail&aid=21651&group_id=248&atid=1081
+
+diff --git a/src/libscotch/Makefile b/src/libscotch/Makefile
+index 9898894..b0ee14c 100644
+--- a/src/libscotch/Makefile
++++ b/src/libscotch/Makefile
+@@ -2229,6 +2229,28 @@ library_graph_color_f$(OBJ)	:	library_graph_color_f.c			\
+ 					common.h				\
+ 					scotch.h
+ 
++library_graph_diam$(OBJ)	:	library_graph_diam.c			\
++					module.h				\
++					common.h				\
++					graph.h					\
++					scotch.h
++
++library_graph_diam_f$(OBJ)	:	library_graph_diam.c			\
++					module.h				\
++					common.h				\
++					scotch.h
++
++library_graph_induce$(OBJ)	:	library_graph_diam.c			\
++					module.h				\
++					common.h				\
++					graph.h					\
++					scotch.h
++
++library_graph_induce_f$(OBJ)	:	library_graph_diam.c			\
++					module.h				\
++					common.h				\
++					scotch.h
++
+ library_graph_io_chac$(OBJ)	:	library_graph_io_chac.c			\
+ 					module.h				\
+ 					common.h				\
diff --git a/gnu/packages/patches/scotch-graph-diam-64.patch b/gnu/packages/patches/scotch-graph-diam-64.patch
new file mode 100644
index 0000000000..2ae31e3c3b
--- /dev/null
+++ b/gnu/packages/patches/scotch-graph-diam-64.patch
@@ -0,0 +1,27 @@
+Fixes test_scotch_graph_diam test with -DINTSIZE64.
+
+Reported upstream at
+https://gforge.inria.fr/tracker/index.php?func=detail&aid=21650&group_id=248&atid=1081
+
+--- scotch-6.0.5a/src/libscotch/library.h
++++ scotch-6.0.5a/src/libscotch/library.h
+@@ -187,6 +187,7 @@ SCOTCH_Num                  SCOTCH_graphBase    (SCOTCH_Graph * const, const SCO
+ int                         SCOTCH_graphCheck   (const SCOTCH_Graph * const);
+ void                        SCOTCH_graphSize    (const SCOTCH_Graph * const, SCOTCH_Num * const, SCOTCH_Num * const);
+ void                        SCOTCH_graphData    (const SCOTCH_Graph * const, SCOTCH_Num * const, SCOTCH_Num * const, SCOTCH_Num ** const, SCOTCH_Num ** const, SCOTCH_Num ** const, SCOTCH_Num ** const, SCOTCH_Num * const, SCOTCH_Num ** const, SCOTCH_Num ** const);
++SCOTCH_Num                  SCOTCH_graphDiamPV  (SCOTCH_Graph * const);
+ void                        SCOTCH_graphStat    (const SCOTCH_Graph * const, SCOTCH_Num * const, SCOTCH_Num * const, SCOTCH_Num * const, double * const, double * const, SCOTCH_Num * const, SCOTCH_Num * const, double * const, double * const, SCOTCH_Num * const, SCOTCH_Num * const, SCOTCH_Num * const, double * const, double * const);
+ int                         SCOTCH_graphCoarsen (const SCOTCH_Graph * const, const SCOTCH_Num, const double, const SCOTCH_Num, SCOTCH_Graph * const, SCOTCH_Num * const);
+ int                         SCOTCH_graphCoarsenMatch (const SCOTCH_Graph * const, SCOTCH_Num * const, const double, const SCOTCH_Num, SCOTCH_Num * const);
+--- scotch-6.0.5a/src/libscotch/library_graph_diam.c
++++ scotch-6.0.5a/src/libscotch/library_graph_diam.c
+@@ -72,8 +72,7 @@
+ 
+ SCOTCH_Num
+ SCOTCH_graphDiamPV (
+-SCOTCH_Graph * const        grafptr,
+-const SCOTCH_Num            baseval)
++SCOTCH_Graph * const        grafptr)
+ {
+   return ((SCOTCH_Num) graphDiamPV ((Graph * const) grafptr));
+ }
diff --git a/gnu/packages/patches/scotch-graph-induce-type-64.patch b/gnu/packages/patches/scotch-graph-induce-type-64.patch
new file mode 100644
index 0000000000..d2eee52a7b
--- /dev/null
+++ b/gnu/packages/patches/scotch-graph-induce-type-64.patch
@@ -0,0 +1,19 @@
+Fixes return type of SCOTCH_graphInduceList and SCOTCH_graphInducePart
+so that the definition matches with -DINTSIZE64.
+
+Reported upstream at
+https://gforge.inria.fr/tracker/index.php?func=detail&aid=21608&group_id=248&atid=1081
+
+--- scotch_6.0.5a/src/libscotch/library.h.orig	2018-02-11 10:52:38.000000000 -0600
++++ scotch_6.0.5a/src/libscotch/library.h	2018-02-23 16:56:41.000000000 -0600
+@@ -199,8 +199,8 @@
+ int                         SCOTCH_graphGeomSaveChac (const SCOTCH_Graph * const, const SCOTCH_Geom * const, FILE * const, FILE * const, const char * const);
+ int                         SCOTCH_graphGeomSaveMmkt (const SCOTCH_Graph * const, const SCOTCH_Geom * const, FILE * const, FILE * const, const char * const);
+ int                         SCOTCH_graphGeomSaveScot (const SCOTCH_Graph * const, const SCOTCH_Geom * const, FILE * const, FILE * const, const char * const);
+-int                         SCOTCH_graphInduceList (const SCOTCH_Graph * const, const SCOTCH_Num, const SCOTCH_Num * const, SCOTCH_Graph * const);
+-int                         SCOTCH_graphInducePart (const SCOTCH_Graph * const, const SCOTCH_Num, const SCOTCH_GraphPart2 * const, const SCOTCH_GraphPart2, SCOTCH_Graph * const);
++SCOTCH_Num                  SCOTCH_graphInduceList (const SCOTCH_Graph * const, const SCOTCH_Num, const SCOTCH_Num * const, SCOTCH_Graph * const);
++SCOTCH_Num                  SCOTCH_graphInducePart (const SCOTCH_Graph * const, const SCOTCH_Num, const SCOTCH_GraphPart2 * const, const SCOTCH_GraphPart2, SCOTCH_Graph * const);
+ 
+ int                         SCOTCH_graphMapInit (const SCOTCH_Graph * const, SCOTCH_Mapping * const, const SCOTCH_Arch * const, SCOTCH_Num * const);
+ void                        SCOTCH_graphMapExit (const SCOTCH_Graph * const, SCOTCH_Mapping * const);

From e7323f4c0873b0b8cb1699d73c24e0e2a17b76f9 Mon Sep 17 00:00:00 2001
From: Eric Bavier <bavier@cray.com>
Date: Mon, 26 Feb 2018 11:29:38 -0600
Subject: [PATCH 203/275] gnu: mumps: Update to 5.1.2.

* gnu/packages/maths.scm (mumps): Update to 5.1.2.
---
 gnu/packages/maths.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index aa382cda6b..00f35659eb 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -1772,7 +1772,7 @@ arising after the discretization of partial differential equations.")
 (define-public mumps
   (package
     (name "mumps")
-    (version "5.0.2")
+    (version "5.1.2")
     (source
      (origin
        (method url-fetch)
@@ -1780,7 +1780,7 @@ arising after the discretization of partial differential equations.")
                            version ".tar.gz"))
        (sha256
         (base32
-         "0igyc1pfzxdhpbad3v3lb86ixkdbqa1a8gbs15b04r2294h2nabp"))
+         "1s9asin08zqzmh08257sdghhivvy9vjif7c53fhaxaax2kd5qd7b"))
        (patches (search-patches "mumps-build-parallelism.patch"))))
     (build-system gnu-build-system)
     (inputs

From 834b0b9a5ca7ebd2cd3c1b2fe8dcb99e5e2f0841 Mon Sep 17 00:00:00 2001
From: Eric Bavier <bavier@member.fsf.org>
Date: Tue, 24 Apr 2018 18:44:38 -0500
Subject: [PATCH 204/275] gnu: Add Ranger.

* gnu/packages/disk.scm (ranger): New variable.
---
 gnu/packages/disk.scm | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm
index 595000bf88..a36273a01f 100644
--- a/gnu/packages/disk.scm
+++ b/gnu/packages/disk.scm
@@ -10,6 +10,7 @@
 ;;; Copyright © 2017 Hartmut Goebel <h.goebel@crazy-compilers.com>
 ;;; Copyright © 2017 Stefan Reichör <stefan@xsteve.at>
 ;;; Copyright © 2018 Vasile Dumitrascu <va511e@yahoo.com>
+;;; Copyright © 2018 Eric Bavier <bavier@member.fsf.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -35,6 +36,7 @@
   #:use-module (guix build-system python)
   #:use-module (gnu packages)
   #:use-module (gnu packages base)
+  #:use-module (gnu packages check)
   #:use-module (gnu packages databases)
   #:use-module (gnu packages docbook)
   #:use-module (gnu packages gettext)
@@ -502,3 +504,32 @@ your data as it changes, without having to re-checksum unchanged data.
 
 Duperemove can also take input from the @command{fdupes} program.")
     (license license:gpl2)))
+
+(define-public ranger
+  (package
+    (name "ranger")
+    (version "1.9.1")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://ranger.github.io/"
+                                  "ranger-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1lnzkrxcnlwnyi3z0v8ybyp8d5rm26qm35rr68kbs2lbs06inha0"))))
+    (build-system python-build-system)
+    (native-inputs                      ;for tests
+     `(("python-pytest" ,python-pytest)
+       ("python-pylint" ,python-pylint)
+       ("python-flake8" ,python-flake8)
+       ("which" ,which)))
+    (arguments
+     '(#:phases (modify-phases %standard-phases
+                  (replace 'check
+                    (lambda _ (invoke "make" "test"))))))
+    (home-page "https://ranger.github.io/")
+    (synopsis "Console file manager")
+    (description "@code{ranger} is a console file manager with VI key
+bindings.  It provides a minimalistic and nice curses interface with a view on
+the directory hierarchy.  It ships with @code{rifle}, a file launcher that is
+good at automatically finding out which program to use for what file type.")
+    (license license:gpl3)))

From adfc742c420f34ecf925ea00d49204f9863bce33 Mon Sep 17 00:00:00 2001
From: Eric Bavier <bavier@member.fsf.org>
Date: Thu, 26 Apr 2018 21:08:23 -0500
Subject: [PATCH 205/275] gnu: ranger: Fix description and tests.

* gnu/packages/disk.scm (ranger)[arguments]: Replace '#:phases' with
'#:test-target'.
[description]: Remove texinfo markup.  'VI' -> 'Vi'.
---
 gnu/packages/disk.scm | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm
index a36273a01f..d7bf726830 100644
--- a/gnu/packages/disk.scm
+++ b/gnu/packages/disk.scm
@@ -522,14 +522,11 @@ Duperemove can also take input from the @command{fdupes} program.")
        ("python-pylint" ,python-pylint)
        ("python-flake8" ,python-flake8)
        ("which" ,which)))
-    (arguments
-     '(#:phases (modify-phases %standard-phases
-                  (replace 'check
-                    (lambda _ (invoke "make" "test"))))))
+    (arguments '(#:test-target "test"))
     (home-page "https://ranger.github.io/")
     (synopsis "Console file manager")
-    (description "@code{ranger} is a console file manager with VI key
-bindings.  It provides a minimalistic and nice curses interface with a view on
-the directory hierarchy.  It ships with @code{rifle}, a file launcher that is
-good at automatically finding out which program to use for what file type.")
+    (description "ranger is a console file manager with Vi key bindings.  It
+provides a minimalistic and nice curses interface with a view on the directory
+hierarchy.  It ships with @code{rifle}, a file launcher that is good at
+automatically finding out which program to use for what file type.")
     (license license:gpl3)))

From 54c3b7bf66fbcb15830ca960bc1cc813fa216901 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Fri, 27 Apr 2018 03:34:27 +0200
Subject: [PATCH 206/275] gnu: perl-strictures@2: Update to 2.000004.

* gnu/packages/perl.scm (perl-strictures-2): Update to 2.000004.
---
 gnu/packages/perl.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm
index 8703ef5cbc..1c93c470f9 100644
--- a/gnu/packages/perl.scm
+++ b/gnu/packages/perl.scm
@@ -7451,7 +7451,7 @@ run from within a source-controlled directory.")
 (define-public perl-strictures-2
   (package
     (inherit perl-strictures)
-    (version "2.000003")
+    (version "2.000004")
     (source
      (origin
        (method url-fetch)
@@ -7459,7 +7459,7 @@ run from within a source-controlled directory.")
                            "strictures-" version ".tar.gz"))
        (sha256
         (base32
-         "08mgvf1d2651gsg3jgjfs13878ndqa4ji8vfsda9f7jjd84ymy17"))))))
+         "0lzp0q6kwk6vgf7zdlvy9zz28fj6n1b776irm556c7gylcq29113"))))))
 
 (define-public perl-string-camelcase
   (package

From 15fc96e07366fe7540144767996e1f4f85e09776 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Fri, 27 Apr 2018 03:41:30 +0200
Subject: [PATCH 207/275] gnu: perl-clone: Update to 0.39.

* gnu/packages/perl.scm (perl-clone): Update to 0.39.
---
 gnu/packages/perl.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm
index 1c93c470f9..2e3f92f4e2 100644
--- a/gnu/packages/perl.scm
+++ b/gnu/packages/perl.scm
@@ -1320,14 +1320,14 @@ arrays for their internal representation.")
 (define-public perl-clone
   (package
     (name "perl-clone")
-    (version "0.38")
+    (version "0.39")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://cpan/authors/id/G/GA/GARU/"
                                   "Clone-" version ".tar.gz"))
               (sha256
                (base32
-                "1s5xrv9zlckqqzyhxi0l9lwj9m6na2bz5hqxrkva2v7gnx5m7c4z"))))
+                "0bgsidb96gxzf3zhy6v1ksj1c200vxbwykk32fqm1mj97rl4dc5c"))))
     (build-system perl-build-system)
     (synopsis "Recursively copy Perl datatypes")
     (description

From d4eae3f7d2b8b19044ac2b34db23ea0e24602578 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Fri, 27 Apr 2018 04:13:19 +0200
Subject: [PATCH 208/275] gnu: tuxguitar: Update home page.

The tuxguitar.pw domain is infested with squatters.

* gnu/packages/music.scm (tuxguitar)[home-page]: Update.
---
 gnu/packages/music.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 4a7a3157dd..f62099921c 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -1689,7 +1689,7 @@ is subjective.")
                #t))))))
     (inputs
      `(("java-swt" ,java-swt)))
-    (home-page "http://tuxguitar.pw")
+    (home-page "http://tuxguitar.com.ar/")
     (synopsis "Multitrack tablature editor and player")
     (description
      "TuxGuitar is a guitar tablature editor with player support through midi.

From 53c475d104fbb793d84773fbca44953c452cf18f Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Fri, 27 Apr 2018 04:13:42 +0200
Subject: [PATCH 209/275] gnu: tuxguitar: Update to 1.5.

* gnu/packages/music.scm (tuxguitar): Update to 1.5.
---
 gnu/packages/music.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index f62099921c..b4c59ed16d 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -1599,7 +1599,7 @@ is subjective.")
 (define-public tuxguitar
   (package
     (name "tuxguitar")
-    (version "1.4")
+    (version "1.5")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -1607,7 +1607,7 @@ is subjective.")
                     version "/tuxguitar-" version "-src.tar.gz"))
               (sha256
                (base32
-                "041275vwfr82kass7wiq9g2y82w9qrbzfinzcvfij2f2q45njwmc"))
+                "1yd5wv17sh6i8pkndxayfd6r2k1ccgnc4w3nda3lpniv8cpjzz3k"))
               (modules '((guix build utils)))
               (snippet
                '(begin

From 5346d91523f748dffe2c2389a9d8b03ad95a68c7 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Fri, 27 Apr 2018 05:05:25 +0200
Subject: [PATCH 210/275] gnu: mpd: Update to 0.20.19.

* gnu/packages/mpd.scm (mpd): Update to 0.20.19.
---
 gnu/packages/mpd.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm
index 0e2acedf7f..a9d317eb7b 100644
--- a/gnu/packages/mpd.scm
+++ b/gnu/packages/mpd.scm
@@ -88,7 +88,7 @@ interfacing MPD in the C, C++ & Objective C languages.")
 (define-public mpd
   (package
     (name "mpd")
-    (version "0.20.18")
+    (version "0.20.19")
     (source (origin
               (method url-fetch)
               (uri
@@ -97,7 +97,7 @@ interfacing MPD in the C, C++ & Objective C languages.")
                               "/mpd-" version ".tar.xz"))
               (sha256
                (base32
-                "0d6lz8ykyvxkl0fwnd9c5vzbbhmjh1yzv7rzhprlzfchmv12sn3a"))))
+                "1hsng4mnaz1jr2s3fy3q78vf2f6102lwphjdls7qln0pj8dyzk81"))))
     (build-system gnu-build-system)
     (arguments
      `(#:phases

From 7adaf5b5ad880f14a590faec23fba434cf970d77 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Fri, 27 Apr 2018 05:06:00 +0200
Subject: [PATCH 211/275] gnu: drumstick: Update to 1.1.1.

* gnu/packages/music.scm (drumstick): Update to 1.1.1.
[inputs]: Remove fluidsynth.
---
 gnu/packages/music.scm | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index b4c59ed16d..6419ad4ca1 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -1881,17 +1881,17 @@ browser.")
 (define-public drumstick
   (package
     (name "drumstick")
-    (version "1.1.0")
+    (version "1.1.1")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://sourceforge/drumstick/"
                                   version "/drumstick-" version ".tar.bz2"))
               (sha256
                (base32
-                "13pkfqrav30bbcddgf1imd7jk6lpqbxkz1qv31718pdl446jq7df"))))
+                "0avwxr6n9ra7narxc5lmkhdqi8ix10gmif8rpd06wp4g9iv46xrn"))))
     (build-system cmake-build-system)
     (arguments
-     `(#:tests? #f  ; no test target
+     `(#:tests? #f                      ; no test target
        #:configure-flags '("-DLIB_SUFFIX=")
        #:phases
        (modify-phases %standard-phases
@@ -1907,11 +1907,10 @@ browser.")
     (inputs
      `(("qtbase" ,qtbase)
        ("qtsvg" ,qtsvg)
-       ("alsa-lib" ,alsa-lib)
-       ("fluidsynth" ,fluidsynth)))
+       ("alsa-lib" ,alsa-lib)))
     (native-inputs
      `(("pkg-config" ,pkg-config)
-       ("libxslt" ,libxslt) ;for xsltproc
+       ("libxslt" ,libxslt)             ; for xsltproc
        ("docbook-xsl" ,docbook-xsl)
        ("doxygen" ,doxygen)))
     (home-page "http://drumstick.sourceforge.net/")

From a9071e5c5109210bff637e3ba7e0325167b89728 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Fri, 27 Apr 2018 05:08:41 +0200
Subject: [PATCH 212/275] gnu: infamous-plugins: Use HTTPS home page.

* gnu/packages/audio.scm (infamous-plugins)[home-page]: Use HTTPS.
---
 gnu/packages/audio.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index d468899065..e16578d95c 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -589,7 +589,7 @@ based on human speech recordings.")
        ("zita-resampler" ,zita-resampler)))
     (native-inputs
      `(("pkg-config" ,pkg-config)))
-    (home-page "http://ssj71.github.io/infamousPlugins")
+    (home-page "https://ssj71.github.io/infamousPlugins")
     (synopsis "LV2 plugins for live use")
     (description
      "The infamous plugins are a collection of LV2 audio plugins for live

From d11edbdf7dc7b6c2405c3ee4469f57f8b1d3d5e3 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Fri, 27 Apr 2018 05:10:27 +0200
Subject: [PATCH 213/275] gnu: infamous-plugins: Update to 0.2.04.

* gnu/packages/audio.scm (infamous-plugins): Update to 0.2.04.
---
 gnu/packages/audio.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index e16578d95c..61e8fa3392 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -553,7 +553,7 @@ based on human speech recordings.")
 (define-public infamous-plugins
   (package
     (name "infamous-plugins")
-    (version "0.2.02")
+    (version "0.2.04")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://github.com/ssj71/infamousPlugins/"
@@ -561,10 +561,10 @@ based on human speech recordings.")
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "0qm3ak07vc1l3f5c3c2lq9gkfknlxwn8ks03cysw1pk8hj7dwnv6"))))
+                "1n6rhqsmvad7692w2h01niw5gqg5yk7a09wxl5ivs77zyp93vf7z"))))
     (build-system cmake-build-system)
     (arguments
-     `(#:tests? #f ; There are no tests
+     `(#:tests? #f                      ; there are no tests
        #:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'remove-compiler-flags
@@ -579,7 +579,7 @@ based on human speech recordings.")
                             "src/powercut/CMakeLists.txt"
                             "src/powerup/CMakeLists.txt"
                             "src/stuck/CMakeLists.txt")
-                          (("-msse2 -mfpmath=sse") ""))
+               (("-msse2 -mfpmath=sse") ""))
              #t)))))
     (inputs
      `(("cairo" ,cairo)

From 3290f10773ed6573a158623d29c61712a86d9cbb Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Fri, 27 Apr 2018 05:13:11 +0200
Subject: [PATCH 214/275] gnu: thefuck: Update to 3.26.

* gnu/packages/admin.scm (thefuck): Update to 3.26.
---
 gnu/packages/admin.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 5e2cf2d7ad..ce4dca67fa 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -1941,7 +1941,7 @@ throughput (in the same interval).")
 (define-public thefuck
   (package
     (name "thefuck")
-    (version "3.25")
+    (version "3.26")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://github.com/nvbn/thefuck/archive/"
@@ -1949,7 +1949,7 @@ throughput (in the same interval).")
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "088bn2l1376qlndbpnjya4q1x3913nj3yj3wc7s2w3bz66d23skk"))
+                "0ddlf25ik97z34bcpc52xyfhlfm6a3hdi43l6cz4ggwcawdwvn1p"))
               (patches (search-patches "thefuck-test-environ.patch"))))
     (build-system python-build-system)
     (arguments

From 2216b6f4108abfb2f75db7667beaa46ee7d630e8 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Fri, 27 Apr 2018 05:13:48 +0200
Subject: [PATCH 215/275] gnu: thefuck: Use INVOKE.

* gnu/packages/admin.scm (thefuck)[arguments]: Substitute INVOKE for
SYSTEM* and end phase with explicit #t.
---
 gnu/packages/admin.scm | 3 ++-
 gnu/packages/music.scm | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index ce4dca67fa..1d9fa7c673 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -1962,7 +1962,8 @@ throughput (in the same interval).")
              (add-installed-pythonpath inputs outputs)
              ;; Some tests need write access to $HOME.
              (setenv "HOME" "/tmp")
-             (zero? (system* "py.test" "-v")))))))
+             (invoke "py.test" "-v")
+             #t)))))
     (propagated-inputs
      `(("python-colorama" ,python-colorama)
        ("python-decorator" ,python-decorator)
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 6419ad4ca1..7e98fa74cf 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -2147,14 +2147,14 @@ computer's keyboard.")
 (define-public aj-snapshot
   (package
     (name "aj-snapshot")
-    (version "0.9.7")
+    (version "0.9.8")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://sourceforge/aj-snapshot/"
                                   "aj-snapshot-" version ".tar.bz2"))
               (sha256
                (base32
-                "0yxccgp9qw2cyqv719wlbq8wfsr5ga8czvwa7bmb8dh5s11n3rn8"))))
+                "0wilky1g2mb88v2z0520s7sw1dsn10iwanc8id5p6z1xsnhg7b6p"))))
     (build-system gnu-build-system)
     (inputs
      `(("minixml" ,minixml)

From a654d3debd4a3f73ca191c459f8af8618fd1da58 Mon Sep 17 00:00:00 2001
From: Chris Marusich <cmmarusich@gmail.com>
Date: Fri, 27 Apr 2018 01:34:38 -0700
Subject: [PATCH 216/275] services: Set default <dhcpd-configuration> version
 to "4".

* gnu/services/networking.scm (<dhcpd-configuration>) <version>: Set the
default to "4" instead of "6"; both our manual and upstream says the default
should be "4".
---
 gnu/services/networking.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm
index be34f32395..df67bd69c7 100644
--- a/gnu/services/networking.scm
+++ b/gnu/services/networking.scm
@@ -361,7 +361,7 @@ Protocol (DHCP) client, on all the non-loopback network interfaces."
   (config-file   dhcpd-configuration-config-file ;file-like
                  (default #f))
   (version dhcpd-configuration-version ;"4", "6", or "4o6"
-              (default "6"))
+              (default "4"))
   (run-directory dhcpd-configuration-run-directory
                  (default "/run/dhcpd"))
   (lease-file dhcpd-configuration-lease-file

From deb4894405e74fd06446e4e04b554dc55b44a398 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Fri, 27 Apr 2018 09:27:03 +0200
Subject: [PATCH 217/275] gnu: emacs-slack: Update to 0-4.d903954.

* gnu/packages/emacs.scm (emacs-slack): Update to 0-4.d903954.
---
 gnu/packages/emacs.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 4227f4e829..1775c62457 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -6948,8 +6948,8 @@ want to use it.")
     (license license:gpl3+)))
 
 (define-public emacs-slack
-  (let ((commit "92724604879149cf331fa8778d089813a9d4ce1a")
-        (revision "3"))
+  (let ((commit "d90395482d26175ce38fd935e978c428be8af9a0")
+        (revision "4"))
     (package
       (name "emacs-slack")
       (version (string-append "0-" revision "." (string-take commit 7)))
@@ -6961,7 +6961,7 @@ want to use it.")
                 (file-name (string-append name "-" version "-checkout"))
                 (sha256
                  (base32
-                  "1fdf8s3ca356k7m7f5kqzfamfl2nrqjj2pynjv3kkrr0ad15nxmw"))))
+                  "14f6wjcbl09cfd3yngr6m1k1d4nr764im666mbnqbk9nmqf50nib"))))
       (build-system emacs-build-system)
       (propagated-inputs
        `(("emacs-alert" ,emacs-alert)

From d4dee0804ad8e886764be0805b1b908a4696301e Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Fri, 27 Apr 2018 13:25:31 +0200
Subject: [PATCH 218/275] gnu: r-pillar: Update to 1.2.2.

* gnu/packages/cran.scm (r-pillar): Update to 1.2.2.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 77e5054314..fd9fee537e 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -2571,14 +2571,14 @@ display.")
 (define-public r-pillar
   (package
     (name "r-pillar")
-    (version "1.2.1")
+    (version "1.2.2")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "pillar" version))
        (sha256
         (base32
-         "1ryd7m570y6q3w71wd5dz042b3d0dv24g2rbkw1kdx0n6jj9gsbd"))))
+         "1kmqvny3rw4p5kgxz6mhqfpp7j3nnpp22dfai4kjrr2cfmj6wvb7"))))
     (build-system r-build-system)
     (propagated-inputs
      `(("r-cli" ,r-cli)

From 7f77e5d5fa0c4669efa1012fc526868229821912 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Fri, 27 Apr 2018 13:25:45 +0200
Subject: [PATCH 219/275] gnu: r-metap: Update to 0.9.

* gnu/packages/cran.scm (r-metap): Update to 0.9.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index fd9fee537e..caa204e60a 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -2637,14 +2637,14 @@ automatically.")
 (define-public r-metap
   (package
     (name "r-metap")
-    (version "0.8")
+    (version "0.9")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "metap" version))
        (sha256
         (base32
-         "06ny9zkilawdy0s8yiwhnygs3yppw89bbyf76zgdavykbzscz5lh"))))
+         "03vg0mb6q7j2z0pkxykbak0hcp6dcak7zxs1lw9hswz9kqrq5jhz"))))
     (build-system r-build-system)
     (propagated-inputs
      `(("r-lattice" ,r-lattice)))

From 97dbc684c8c4f784af895869fde8c366c30ad2df Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Fri, 27 Apr 2018 13:25:53 +0200
Subject: [PATCH 220/275] gnu: r-foreign: Update to 0.8-70.

* gnu/packages/statistics.scm (r-foreign): Update to 0.8-70.
---
 gnu/packages/statistics.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index 7f2e571253..ce8617f1b5 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -402,14 +402,14 @@ code for possible problems.")
 (define-public r-foreign
   (package
     (name "r-foreign")
-    (version "0.8-69")
+    (version "0.8-70")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "foreign" version))
        (sha256
         (base32
-         "0s1lxmd85dd0kxx8hwk02w9l7pmpk4bpy7787fbyh2dbq5g9ys0k"))))
+         "11mql8q3i1q593dvd351fhvkvfab25li80d1ahl4xjjzy52qdkc6"))))
     (build-system r-build-system)
     (home-page "https://cran.r-project.org/web/packages/foreign")
     (synopsis "Read data stored by other statistics software")

From 5ce901d59a1fef58f401e4d377ca21cb7a326e17 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Fri, 27 Apr 2018 13:26:06 +0200
Subject: [PATCH 221/275] gnu: r-r-oo: Update to 1.22.0.

* gnu/packages/statistics.scm (r-r-oo): Update to 1.22.0.
---
 gnu/packages/statistics.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index ce8617f1b5..874d9fa646 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -3399,13 +3399,13 @@ want to migrate to S4.")
 (define-public r-r-oo
   (package
     (name "r-r-oo")
-    (version "1.21.0")
+    (version "1.22.0")
     (source (origin
               (method url-fetch)
               (uri (cran-uri "R.oo" version))
               (sha256
                (base32
-                "0723gxjazgqq7v3lwnl7axw3brzcnizvhbd71ijkkv8mz31fwp34"))))
+                "0k6xwy93fpb2p7bs76lzk52br9rv5xnd9524xj8qyazv1132x1n0"))))
     (properties `((upstream-name . "R.oo")))
     (build-system r-build-system)
     (propagated-inputs

From 8e71673d2fc84357c6b9d75b5df809432c31d499 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Fri, 27 Apr 2018 13:26:14 +0200
Subject: [PATCH 222/275] gnu: r-robustbase: Update to 0.93-0.

* gnu/packages/statistics.scm (r-robustbase): Update to 0.93-0.
---
 gnu/packages/statistics.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index 874d9fa646..11c7daca0b 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -4686,14 +4686,14 @@ can be efficiently implemented directly in the R language.")
 (define-public r-robustbase
   (package
     (name "r-robustbase")
-    (version "0.92-8")
+    (version "0.93-0")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "robustbase" version))
        (sha256
         (base32
-         "080ynchq8pvhnmbivj4fp74n0x9lyr9923sg0s9gq5irgm68kgxw"))))
+         "130pzibn5cb8mycv8byc6npzcpddghz8m7jqwk15qmx4g3cj8zgy"))))
     (build-system r-build-system)
     (inputs
      `(("gfortran" ,gfortran)))

From a6334e6e8dc55ba49d0c151fc4b893e59bbdbe56 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Fri, 27 Apr 2018 13:32:40 +0200
Subject: [PATCH 223/275] gnu: emacs-websocket: Update to 1.10.

* gnu/packages/emacs.scm (emacs-websocket): Update to 1.10.
[source]: Fetch from git.
---
 gnu/packages/emacs.scm | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 1775c62457..8112ec9715 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -6876,15 +6876,17 @@ well as Github-style emojis like @code{:smile:}.  It provides a minor mode
 (define-public emacs-websocket
   (package
     (name "emacs-websocket")
-    (version "1.8")
+    (version "1.10")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "https://elpa.gnu.org/packages/websocket-"
-                           version ".tar"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/ahyatt/emacs-websocket.git")
+             (commit version)))
+       (file-name (string-append name "-" version "-checkout"))
        (sha256
         (base32
-         "0dcxmnnm8z7cvsc7nkb822a1g6w03klp7cijjnfq0pz84p3w9cd9"))))
+         "1dgrf7na6r6mmkknphzshlbd5fnzisg0qn0j7vfpa38wgsymaq52"))))
     (build-system emacs-build-system)
     (home-page "http://elpa.gnu.org/packages/websocket.html")
     (synopsis "Emacs WebSocket client and server")

From 171cf56c2f404cf35b9848c57c7c5c2fea32c2b0 Mon Sep 17 00:00:00 2001
From: Ben Woodcroft <donttrustben@gmail.com>
Date: Fri, 27 Apr 2018 19:04:49 +1000
Subject: [PATCH 224/275] gnu: diamond: Update to 0.9.21.

* gnu/packages/bioinformatics.scm (diamond): Update to 0.9.21.
---
 gnu/packages/bioinformatics.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 828b41a8db..f71b602e0a 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -2079,7 +2079,7 @@ accurately delineate genomic rearrangements throughout the genome.")
 (define-public diamond
   (package
     (name "diamond")
-    (version "0.9.19")
+    (version "0.9.21")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -2088,7 +2088,7 @@ accurately delineate genomic rearrangements throughout the genome.")
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "0c4y8l90vdxmglb0w37y0413v11qzcwg8sdmy9k0c0gr3bsq7dzs"))))
+                "1cf98vcsiwcv3c4apg50w1240v1mpw0zln1sdw3g692dqa4y041z"))))
     (build-system cmake-build-system)
     (arguments
      '(#:tests? #f ; no "check" target

From 53ec1b7e8b649e78165dc9c6ea894cd70d20a33c Mon Sep 17 00:00:00 2001
From: Ben Woodcroft <donttrustben@gmail.com>
Date: Fri, 27 Apr 2018 19:06:02 +1000
Subject: [PATCH 225/275] gnu: vsearch: Update to 2.8.0.

* gnu/packages/bioinformatics.scm (vsearch): Update to 2.8.0.
---
 gnu/packages/bioinformatics.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index f71b602e0a..da1cf4a218 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -6604,7 +6604,7 @@ SELECT or UPDATE queries to an end-point.")
 (define-public vsearch
   (package
     (name "vsearch")
-    (version "2.7.1")
+    (version "2.8.0")
     (source
      (origin
        (method url-fetch)
@@ -6614,7 +6614,7 @@ SELECT or UPDATE queries to an end-point.")
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "0jlzfgh79fzmb4g7sngzdjjsjyc37icvs1k7vmc2ksxglj6x5i7f"))
+         "15pbirgzhvflj4pi5n82vybbzjy9mlb0lv5l3qhrmdkfzpbyahw3"))
        (patches (search-patches "vsearch-unbundle-cityhash.patch"))
        (snippet
         '(begin

From 6e668353937a05779919b06cc7fc94f1eccb5033 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Fri, 27 Apr 2018 15:17:24 +0200
Subject: [PATCH 226/275] gnu: perl-bareword-filehandles: Update to 0.006.

* gnu/packages/perl.scm (perl-bareword-filehandles): Update to 0.006.
---
 gnu/packages/perl.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm
index 2e3f92f4e2..480a9b4533 100644
--- a/gnu/packages/perl.scm
+++ b/gnu/packages/perl.scm
@@ -385,7 +385,7 @@ error when it would have happened.")
 (define-public perl-bareword-filehandles
   (package
     (name "perl-bareword-filehandles")
-    (version "0.005")
+    (version "0.006")
     (source
      (origin
        (method url-fetch)
@@ -394,7 +394,7 @@ error when it would have happened.")
              version ".tar.gz"))
        (sha256
         (base32
-         "0fdirls2pg7d6ymvlzzz59q3dy6hgh08k0qpr2mw51w127s8rav6"))))
+         "1yxz6likpfshpyfrgwyi7dw6ig1wjhh0vnvbcs6ypr62pv00fv5d"))))
     (build-system perl-build-system)
     (native-inputs
      `(("perl-b-hooks-op-check" ,perl-b-hooks-op-check)

From 8b1e89a4ad508a109d49f2413f72110b3d0deca6 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Fri, 27 Apr 2018 15:17:51 +0200
Subject: [PATCH 227/275] gnu: perl-multidimensional: Update to 0.014.

* gnu/packages/perl.scm (perl-multidimensional): Update to 0.014.
---
 gnu/packages/perl.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm
index 480a9b4533..225065fd3b 100644
--- a/gnu/packages/perl.scm
+++ b/gnu/packages/perl.scm
@@ -6257,7 +6257,7 @@ and libraries based on OpenSSL.")
 (define-public perl-multidimensional
   (package
     (name "perl-multidimensional")
-    (version "0.013")
+    (version "0.014")
     (source
      (origin
        (method url-fetch)
@@ -6266,7 +6266,7 @@ and libraries based on OpenSSL.")
              version ".tar.gz"))
        (sha256
         (base32
-         "02p5zv68i39hnkmzzxsk1fi7xy56pfcsslrd7yqwzhq74czcw81x"))))
+         "0prchsg547ziysjl8ghiid6ph3m2xnwpsrwrjymibga7fhqi9sqj"))))
     (build-system perl-build-system)
     (native-inputs
      `(("perl-b-hooks-op-check" ,perl-b-hooks-op-check)

From c441959819d0f59a10e6a8ece3eacacd0c410118 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Fri, 27 Apr 2018 15:18:43 +0200
Subject: [PATCH 228/275] gnu: libstaroffice: Update to 0.0.6.

* gnu/packages/libreoffice.scm (libstaroffice): Update to 0.0.6.
---
 gnu/packages/libreoffice.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm
index 211454f174..adcdff1ca1 100644
--- a/gnu/packages/libreoffice.scm
+++ b/gnu/packages/libreoffice.scm
@@ -611,14 +611,14 @@ spreadsheet documents.")
 (define-public libstaroffice
   (package
     (name "libstaroffice")
-    (version "0.0.5")
+    (version "0.0.6")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "https://github.com/fosnola/libstaroffice/releases/download/"
                            version "/libstaroffice-" version ".tar.xz"))
        (sha256 (base32
-                "10m9imcgqf7kdhn1a5ara62fdayidwm7qzj3binsls40snnhfm9i"))))
+                "1i0ykl0c94lc1qzb5mbyf9jr7qw8p38ja424whmhgrllh7ny203b"))))
     (build-system gnu-build-system)
     (inputs
      `(("librevenge" ,librevenge)

From 60912a888d4c238850da38efe2cbf39a29dbf877 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Fri, 27 Apr 2018 15:12:26 +0200
Subject: [PATCH 229/275] doc: Add tips for Vim users.

* doc/contributing.texi (Formatting Code): Add a paragraph about Vim.
---
 doc/contributing.texi | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/doc/contributing.texi b/doc/contributing.texi
index d8929fa2e4..2792fe2b29 100644
--- a/doc/contributing.texi
+++ b/doc/contributing.texi
@@ -308,6 +308,13 @@ indent a whole file, omit the second argument:
 ./etc/indent-code.el gnu/services/@var{file}.scm
 @end example
 
+@cindex Vim, Scheme code editing
+If you are editing code with Vim, we recommend that you run @code{:set
+autoindent} so that your code is automatically indented as you type.
+Additionally,
+@uref{https://www.vim.org/scripts/script.php?script_id=3998,
+@code{paredit.vim}} may help you deal with all these parentheses.
+
 We require all top-level procedures to carry a docstring.  This
 requirement can be relaxed for simple private procedures in the
 @code{(guix build @dots{})} name space, though.

From 6ddb59607be810caa1aa40b402b38564d8d9a6bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Fri, 27 Apr 2018 15:31:37 +0200
Subject: [PATCH 230/275] guix system: Report wrong file system 'device'
 fields.

Previously, if you wrote (device "my-label") without (title 'label),
you'd get:

  guix system: error: stat: No such file or directory: "my-label"

Now you get a proper error and a hint.

Reported by Pierre-Antoine Rouby.

* guix/scripts/system.scm (check-file-system-availability)[literal]: New
variable.  Loop over LITERAL.
* gnu/system/file-systems.scm (%pseudo-file-system-types): New variable.
* guix/ui.scm (display-hint): Make public.
---
 gnu/system/file-systems.scm |  9 ++++++++-
 guix/scripts/system.scm     | 24 +++++++++++++++++++++++-
 guix/ui.scm                 |  1 +
 3 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/gnu/system/file-systems.scm b/gnu/system/file-systems.scm
index 7f5afb00fe..c0c635508c 100644
--- a/gnu/system/file-systems.scm
+++ b/gnu/system/file-systems.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -47,6 +47,7 @@
             spec->file-system
             specification->file-system-mapping
 
+            %pseudo-file-system-types
             %fuse-control-file-system
             %binary-format-file-system
             %shared-memory-file-system
@@ -203,6 +204,12 @@ TARGET in the other system."
 ;;; Common file systems.
 ;;;
 
+(define %pseudo-file-system-types
+  ;; List of know pseudo file system types.  This is used when validating file
+  ;; system definitions.
+  '("binfmt_misc" "cgroup" "devpts" "devtmpfs" "fusectl"
+    "proc" "sysfs" "tmpfs"))
+
 (define %fuse-control-file-system
   ;; Control file system for Linux' file systems in user-space (FUSE).
   (file-system
diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm
index b50cabcd1a..af501eb8f7 100644
--- a/guix/scripts/system.scm
+++ b/guix/scripts/system.scm
@@ -583,7 +583,8 @@ any, are available.  Raise an error if they're not."
   (define relevant
     (filter (lambda (fs)
               (and (file-system-mount? fs)
-                   (not (string=? "tmpfs" (file-system-type fs)))
+                   (not (member (file-system-type fs)
+                                %pseudo-file-system-types))
                    (not (memq 'bind-mount (file-system-flags fs)))))
             file-systems))
 
@@ -592,6 +593,11 @@ any, are available.  Raise an error if they're not."
               (eq? (file-system-title fs) 'label))
             relevant))
 
+  (define literal
+    (filter (lambda (fs)
+              (eq? (file-system-title fs) 'device))
+            relevant))
+
   (define uuid
     (filter (lambda (fs)
               (eq? (file-system-title fs) 'uuid))
@@ -610,6 +616,22 @@ any, are available.  Raise an error if they're not."
                            (set! fail? #t)
                            (format (current-error-port)
                                    args ...))))))
+    (for-each (lambda (fs)
+                (catch 'system-error
+                  (lambda ()
+                    (stat (file-system-device fs)))
+                  (lambda args
+                    (let ((errno  (system-error-errno args))
+                          (device (file-system-device fs)))
+                      (error (G_ "~a: error: device '~a' not found: ~a~%")
+                             (file-system-location* fs) device
+                             (strerror errno))
+                      (unless (string-prefix? "/" device)
+                        (display-hint (format #f (G_ "If '~a' is a file system
+label, you need to add @code{(title 'label)} to your @code{file-system}
+definition.")
+                                              device)))))))
+              literal)
     (for-each (lambda (fs)
                 (unless (find-partition-by-label (file-system-device fs))
                   (error (G_ "~a: error: file system with label '~a' not found~%")
diff --git a/guix/ui.scm b/guix/ui.scm
index cb49a15c4d..536c36e3fe 100644
--- a/guix/ui.scm
+++ b/guix/ui.scm
@@ -60,6 +60,7 @@
   #:use-module (texinfo string-utils)
   #:re-export (G_ N_ P_)                          ;backward compatibility
   #:export (report-error
+            display-hint
             leave
             make-user-module
             load*

From 5e3175f743b079eac55b3e33c512538acb2d658d Mon Sep 17 00:00:00 2001
From: Roel Janssen <roel@gnu.org>
Date: Sat, 28 Apr 2018 00:38:31 +0200
Subject: [PATCH 231/275] gnu: nnn: Update to 1.7.

* gnu/packages/admin.scm (nnn): Update to 1.7.
---
 gnu/packages/admin.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 1d9fa7c673..0f9966f6c9 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -2416,7 +2416,7 @@ you are running, what theme or icon set you are using, etc.")
 (define-public nnn
   (package
     (name "nnn")
-    (version "1.5")
+    (version "1.7")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://github.com/jarun/nnn/"
@@ -2424,7 +2424,7 @@ you are running, what theme or icon set you are using, etc.")
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "0zswf8lb29zr1z642i1d0zi1y2mxal8qjqdrpdiqjh197jamj3zm"))))
+                "0z3lqbfx3y1caxvn7yq90b7whwyq2y32zf8kyd976ilbxpxnxqpv"))))
     (build-system gnu-build-system)
     (inputs `(("ncurses" ,ncurses)
               ("readline" ,readline)))

From d0c75e73d41f308bc6f851aa7b9539f3ae71aa15 Mon Sep 17 00:00:00 2001
From: Roel Janssen <roel@gnu.org>
Date: Sat, 28 Apr 2018 00:43:16 +0200
Subject: [PATCH 232/275] gnu: taxtastic: Update to 0.8.5.

* gnu/packages/bioinformatics.scm (taxtastic): Update to 0.8.5.
---
 gnu/packages/bioinformatics.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index da1cf4a218..9239f08ce6 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -5963,13 +5963,13 @@ Cuffdiff or Ballgown programs.")
 (define-public taxtastic
   (package
     (name "taxtastic")
-    (version "0.6.4")
+    (version "0.8.5")
     (source (origin
               (method url-fetch)
               (uri (pypi-uri "taxtastic" version))
               (sha256
                (base32
-                "0s79z8kfl853x7l4h8ms05k31q87aw62nrchlk20w9n227j35929"))))
+                "03pysw79lsrvz4lwzis88j15067ffqbi4cid5pqhrlxmd6bh8rrk"))))
     (build-system python-build-system)
     (arguments
      `(#:python ,python-2

From 4ffa0858755bc045d91863a785926c09678988eb Mon Sep 17 00:00:00 2001
From: Roel Janssen <roel@gnu.org>
Date: Sat, 28 Apr 2018 00:56:59 +0200
Subject: [PATCH 233/275] gnu: bamtools: Update to 2.5.1.

* gnu/packages/bioinformatics.scm (bamtools): Update to 2.5.1.
---
 gnu/packages/bioinformatics.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 9239f08ce6..5d83d2af8a 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -252,7 +252,7 @@ instance, it implements several methods to assess contig-wise read coverage.")
 (define-public bamtools
   (package
     (name "bamtools")
-    (version "2.4.1")
+    (version "2.5.1")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -261,7 +261,7 @@ instance, it implements several methods to assess contig-wise read coverage.")
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "0jr024kcrhjb82cm69i7p5fcg5375zlc1h3qh2n1v368hcd0qflk"))))
+                "1z3kg24qrwq13a88n9d86izngrar4fll7gr6phddb2faw75pdgaa"))))
     (build-system cmake-build-system)
     (arguments
      `(#:tests? #f ;no "check" target

From e09d74ecd2727660d77680755a01d27ffb594a2d Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Fri, 27 Apr 2018 18:40:50 +0200
Subject: [PATCH 234/275] gnu: Add r-codedepends.

* gnu/packages/cran.scm (r-codedepends): New variable.
---
 gnu/packages/cran.scm | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index caa204e60a..bc95fd2aa4 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -3946,3 +3946,30 @@ if no cluster is present or wished.  The package is also designed as connector
 to the cluster management tool @code{sfCluster}, but can also used without
 it.")
    (license license:gpl2+)))
+
+(define-public r-codedepends
+  (package
+    (name "r-codedepends")
+    (version "0.5-3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (cran-uri "CodeDepends" version))
+       (sha256
+        (base32
+         "03p82s0abca2jimzqvxdzykfzca7c7fhm5xsjxybcksr4gggr5sc"))))
+    (properties `((upstream-name . "CodeDepends")))
+    (build-system r-build-system)
+    (propagated-inputs
+     `(("r-codetools" ,r-codetools)
+       ("r-xml" ,r-xml)))
+    (home-page "http://cran.r-project.org/web/packages/CodeDepends")
+    (synopsis "Analysis of R code for reproducible research and code comprehension")
+    (description
+     "This package provides tools for analyzing R expressions or blocks of
+code and determining the dependencies between them.  It focuses on R scripts,
+but can be used on the bodies of functions.  There are many facilities
+including the ability to summarize or get a high-level view of code,
+determining dependencies between variables, code improvement suggestions.")
+    ;; Any version of the GPL
+    (license (list license:gpl2+ license:gpl3+))))

From 4b93efec289719008a1f187ffc089585eaa93b04 Mon Sep 17 00:00:00 2001
From: Roel Janssen <roel@gnu.org>
Date: Sat, 28 Apr 2018 01:05:58 +0200
Subject: [PATCH 235/275] gnu: express: Link with shared protobuf library.

* gnu/packages/bioinformatics.scm (express): Link with shared protobuf
  library.
---
 gnu/packages/bioinformatics.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 5d83d2af8a..a7aa4362a8 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -2339,7 +2339,8 @@ dynamic programming or a variety of heuristics.")
                 (string-append (assoc-ref inputs "bamtools") "/include/bamtools")))
              (substitute* "src/CMakeLists.txt"
                (("\\$\\{CMAKE_CURRENT_SOURCE_DIR\\}/\\.\\./bamtools/lib")
-                (string-append (assoc-ref inputs "bamtools") "/lib/bamtools")))
+                (string-append (assoc-ref inputs "bamtools") "/lib"))
+               (("libprotobuf.a") "libprotobuf.so"))
              #t)))))
     (inputs
      `(("boost" ,boost)

From 457fd268ffdf2adc8c0d68eda7e87a15547267c1 Mon Sep 17 00:00:00 2001
From: Roel Janssen <roel@gnu.org>
Date: Sat, 28 Apr 2018 01:10:24 +0200
Subject: [PATCH 236/275] gnu: multiqc: Update to 1.5.

* gnu/packages/bioinformatics.scm (multiqc): Update to 1.5.
---
 gnu/packages/bioinformatics.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index a7aa4362a8..bb09abd00c 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -9063,14 +9063,14 @@ replacement for strverscmp.")
 (define-public multiqc
   (package
     (name "multiqc")
-    (version "1.4")
+    (version "1.5")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "multiqc" version))
        (sha256
         (base32
-         "0ihx4rzmsfphv4byn05qv6f1y95g2dxs6viwziipl4wjk96acgm8"))))
+         "02iihfl0w0hpnr4pa0sbd1y9qxrg3ycyhjp5lidkcrqh1lmzs3zy"))))
     (build-system python-build-system)
     (propagated-inputs
      `(("python-jinja2" ,python-jinja2)

From d36d5229ed331c347bc107d8568e9ebabc04b7d1 Mon Sep 17 00:00:00 2001
From: Roel Janssen <roel@gnu.org>
Date: Sat, 28 Apr 2018 01:24:10 +0200
Subject: [PATCH 237/275] gnu: star: Update to 2.6.0a.

* gnu/packages/bioinformatics.scm (star): Update to 2.6.0a.
---
 gnu/packages/bioinformatics.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index bb09abd00c..895faee57a 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -5769,7 +5769,7 @@ application of SortMeRNA is filtering rRNA from metatranscriptomic data.")
 (define-public star
   (package
     (name "star")
-    (version "2.5.3a")
+    (version "2.6.0a")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://github.com/alexdobin/STAR/archive/"
@@ -5777,7 +5777,7 @@ application of SortMeRNA is filtering rRNA from metatranscriptomic data.")
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "013wirlz8lllgjyagl48l75n1isxyabqb3sj7qlsl0x1rmvqw99a"))
+                "0yci4ymy4407kjh0lqp021nzccp6r31wgrkixkmix5p130cxvc56"))
               (modules '((guix build utils)))
               (snippet
                '(begin

From 6a71d454de3d75b5abc74d09c38ff6ba9b2f0f9a Mon Sep 17 00:00:00 2001
From: Roel Janssen <roel@gnu.org>
Date: Sat, 28 Apr 2018 01:44:29 +0200
Subject: [PATCH 238/275] gnu: vte: Update to 0.52.1.

* gnu/packages/gnome.scm (vte): Update to 0.52.1.
---
 gnu/packages/gnome.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index f0f19a8f7c..8ae487b3f1 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -2062,7 +2062,7 @@ libraries written in C.")
 (define-public vte
   (package
     (name "vte")
-    (version "0.50.2")
+    (version "0.52.1")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/" name "/"
@@ -2070,7 +2070,7 @@ libraries written in C.")
                                   name "-" version ".tar.xz"))
               (sha256
                (base32
-                "1kq9bxf7waap190zx5k78d21y3l31npblrnhfkxz4j7zz9mk3pbr"))))
+                "1lva70inb5y8p42rg95fb88z2ybwcz0lybla3ixbgp2sj0s4rzdh"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("pkg-config" ,pkg-config)

From 169fa0d813f5c79bc2c0d986d298bcc2eff3106a Mon Sep 17 00:00:00 2001
From: Roel Janssen <roel@gnu.org>
Date: Sat, 28 Apr 2018 01:45:32 +0200
Subject: [PATCH 239/275] gnu: gnome-terminal: Update to 3.28.1.

* gnu/packages/gnome.scm (gnome-terminal): Update to 3.28.1.
---
 gnu/packages/gnome.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 8ae487b3f1..0147b20c09 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -2731,7 +2731,7 @@ more fun.")
 (define-public gnome-terminal
   (package
     (name "gnome-terminal")
-    (version "3.26.2")
+    (version "3.28.1")
     (source
      (origin
        (method url-fetch)
@@ -2740,7 +2740,7 @@ more fun.")
                            name "-" version ".tar.xz"))
        (sha256
         (base32
-         "1c05f2lrlm8jfx2394k6nabg4ml07lqasxaja5v98mhlm0aa96rs"))))
+         "1hqwh12hiy73mazqgvyrq8jk4c669x2fb4nh8mwby3qbk8ca19pp"))))
     (build-system glib-or-gtk-build-system)
     (arguments
      '(#:configure-flags

From dad9556c5d01a21cff768bdf8473628f362d4ebf Mon Sep 17 00:00:00 2001
From: Roel Janssen <roel@gnu.org>
Date: Sat, 28 Apr 2018 01:52:52 +0200
Subject: [PATCH 240/275] gnu: roary: Update to 3.12.0.

* gnu/packages/bioinformatics.scm (roary): Update to 3.12.0.
---
 gnu/packages/bioinformatics.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 895faee57a..019c46adbd 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -4575,7 +4575,7 @@ partial genes, and identifies translation initiation sites.")
 (define-public roary
   (package
     (name "roary")
-    (version "3.11.0")
+    (version "3.12.0")
     (source
      (origin
        (method url-fetch)
@@ -4584,7 +4584,7 @@ partial genes, and identifies translation initiation sites.")
              version ".tar.gz"))
        (sha256
         (base32
-         "10lw78x1xzvn7xzvnmh4bm3cak3ah5cssapl0yidvhaj1f44h29i"))))
+         "0qxrds9wx7cfhlkihrp6697kx0flhhxymap9fwan0b3rbdhcnmff"))))
     (build-system perl-build-system)
     (arguments
      `(#:phases

From a62d455d1d16344ffae2dc1525497711e1328800 Mon Sep 17 00:00:00 2001
From: Roel Janssen <roel@gnu.org>
Date: Sat, 28 Apr 2018 02:14:35 +0200
Subject: [PATCH 241/275] gnu: fabric: Update to 1.14.0.

* gnu/packages/admin.scm (fabric): Update to 1.14.0;
[native-inputs]: Add python2-pynacl and python2-bcrypt.
---
 gnu/packages/admin.scm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 0f9966f6c9..3d92eb1471 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -2335,21 +2335,23 @@ Intel DRM Driver.")
 (define-public fabric
   (package
     (name "fabric")
-    (version "1.13.2")
+    (version "1.14.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "Fabric" version))
        (sha256
         (base32
-         "0k944dxr41whw7ib6380q9x15wyskx7fqni656icdn8rzshn9bwq"))))
+         "13r0b0hllgf8j9rh6x1knmbgvingbdmx046aazv6vck2ll120mw1"))))
     (build-system python-build-system)
     (arguments
      `(#:python ,python-2))             ; Python 2 only
     (native-inputs
      `(("python2-fudge" ,python2-fudge)
        ("python2-jinja2" ,python2-jinja2)
-       ("python2-nose" ,python2-nose)))
+       ("python2-nose" ,python2-nose)
+       ("python2-pynacl" ,python2-pynacl)
+       ("python2-bcrypt" ,python2-bcrypt)))
     (propagated-inputs
      `(("python2-paramiko" ,python2-paramiko)))
     (home-page "http://fabfile.org")

From 21c566a3aa80ccf44c451141beb0557581d85ba4 Mon Sep 17 00:00:00 2001
From: Roel Janssen <roel@gnu.org>
Date: Sat, 28 Apr 2018 10:14:47 +0200
Subject: [PATCH 242/275] gnu: virt-manager: Update to 1.5.1.

* gnu/packages/virtualization.scm (virt-manager): Update to 1.5.1.
---
 gnu/packages/virtualization.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index 46f78b8b1e..b73287c826 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -548,7 +548,7 @@ virtualization library.")
 (define-public virt-manager
   (package
     (name "virt-manager")
-    (version "1.4.3")
+    (version "1.5.1")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://virt-manager.org/download/sources"
@@ -556,7 +556,7 @@ virtualization library.")
                                   version ".tar.gz"))
               (sha256
                (base32
-                "093azs8p4p7y4nf5j25xpsvdxww7gky1g0hs8mkcvmpxl2wjd0jj"))))
+                "1ardmd4sxdmd57y7qpka44gf09c1yq2g0xs074d3k1h925crv27f"))))
     (build-system python-build-system)
     (arguments
      `(#:python ,python-2

From 5559e01fe04dc463ef7cc705a9cc3f6cd3ab3ae6 Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Sat, 28 Apr 2018 15:30:49 +0200
Subject: [PATCH 243/275] gnu: mes: Update to 0.13.

* gnu/packages/mes.scm (mes): Update to 0.13.  Use new gitlab url scheme.
---
 gnu/packages/mes.scm | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index 5c832f9d13..d2ce394a03 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -60,16 +60,15 @@ extensive examples, including parsers for the Javascript and C99 languages.")
   (let ((triplet "i686-unknown-linux-gnu"))
     (package
       (name "mes")
-      (version "0.12")
+      (version "0.13")
       (source (origin
                 (method url-fetch)
                 (uri (string-append "https://gitlab.com/janneke/mes"
-                                    "/repository/archive.tar.gz?ref=v"
-                                    version))
-                (file-name (string-append name "-" version ".tar.gz"))
+                                    "/-/archive/v" version
+                                    "/mes-" version ".tar.gz"))
                 (sha256
                  (base32
-                  "0lbwmyl5262z28kpac6kmxxx8aglzy8n6bsicp5lyzkmzkzvjnh2"))))
+                  "0db4f32rak839ff3n7ywkkng9672457pd2pvvgvcsyndqmmdsqw0"))))
       (build-system gnu-build-system)
       (supported-systems '("i686-linux" "x86_64-linux"))
       (propagated-inputs

From 7fb1530f2f552c8a70aba2ef1b410c749937e7e8 Mon Sep 17 00:00:00 2001
From: Fis Trivial <ybbs.daans@hotmail.com>
Date: Sat, 28 Apr 2018 07:42:32 +0000
Subject: [PATCH 244/275] gnu: python-yapf: Update to 0.21.0.

* gnu/packages/python.scm (python-yapf): Update to 0.21.0.

Signed-off-by: Oleg Pykhalov <go.wigust@gmail.com>
---
 gnu/packages/python.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index a5d533b1c1..9b673192e9 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -12689,14 +12689,14 @@ and works only with Python 2 and NumPy < 1.9.")
 (define-public python-yapf
   (package
     (name "python-yapf")
-    (version "0.20.1")
+    (version "0.21.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "yapf" version))
        (sha256
         (base32
-         "0s7l6afzxvpx39kzd0lwshlaxw8m4fwh4iy0rlmav4vipr3g46dx"))))
+         "144gc7d6b1415vh02409rnb8qd5kxi6mxlr7y64d5cizgxbf72kx"))))
     (build-system python-build-system)
     (home-page "https://github.com/google/yapf")
     (synopsis "Formatter for Python code")

From 8311a844164c1637c731f33bca9331a90d79678d Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Thu, 15 Mar 2018 11:22:03 +0100
Subject: [PATCH 245/275] gnu: godot: Add a file extension to source file name.

* gnu/packages/game-development.scm (godot)[source](file-name): Append ".tar.gz".
---
 gnu/packages/game-development.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
index 0039a738cc..edbc9c0ca5 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -1070,7 +1070,7 @@ games.")
               (uri
                (string-append "https://github.com/godotengine/godot/archive/"
                               version "-stable.tar.gz"))
-              (file-name (string-append name "-" version))
+              (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
                 "0k8c12nzhl98i9il9s3awbwdamkrwxk0s47jr7n8a3z93rpszd2p"))))

From 5b8d2ace9377b5bbfa1095545b1e9fba1a2d16ac Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Thu, 15 Mar 2018 11:38:48 +0100
Subject: [PATCH 246/275] gnu: godot: Remove unused bundled libraries from the
 source.

While at it, also use system libvpx.

* gnu/packages/game-development.scm (godot)[source](snippet): New field.
[arguments]: Add "builtin_libvpx=no" to #:scons-flags.
[inputs]: Add LIBVPX.
---
 gnu/packages/game-development.scm | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
index edbc9c0ca5..f6c9eba8c2 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -13,6 +13,7 @@
 ;;; Copyright © 2017 Peter Mikkelsen <petermikkelsen10@gmail.com>
 ;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net>
 ;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com>
+;;; Copyright © 2018 Marius Bakke <mbakke@fastmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1073,7 +1074,25 @@ games.")
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "0k8c12nzhl98i9il9s3awbwdamkrwxk0s47jr7n8a3z93rpszd2p"))))
+                "0k8c12nzhl98i9il9s3awbwdamkrwxk0s47jr7n8a3z93rpszd2p"))
+              (modules '((guix build utils)))
+              (snippet
+               '(begin
+                  ;; Drop libraries that we take from Guix.  Note that some
+                  ;; of these may be modified; see "thirdparty/README.md".
+                  (with-directory-excursion "thirdparty"
+                    (for-each delete-file-recursively
+                              '("freetype"
+                                "libogg"
+                                "libpng"
+                                "libtheora"
+                                "libvorbis"
+                                "libvpx"
+                                "libwebp"
+                                "openssl"
+                                "opus"
+                                "zlib"))
+                    #t)))))
     (build-system scons-build-system)
     (arguments
      `(#:scons ,scons-python2
@@ -1091,6 +1110,7 @@ games.")
                            "builtin_libpng=no"
                            "builtin_libtheora=no"
                            "builtin_libvorbis=no"
+                           "builtin_libvpx=no"
                            "builtin_libwebp=no"
                            "builtin_openssl=no"
                            "builtin_opus=no"
@@ -1146,6 +1166,7 @@ games.")
               ("glu" ,glu)
               ("libtheora" ,libtheora)
               ("libvorbis" ,libvorbis)
+              ("libvpx" ,libvpx)
               ("libwebp" ,libwebp)
               ("libx11" ,libx11)
               ("libxcursor" ,libxcursor)

From af574d824a18f89a0f00acd99fc37dff131d827c Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Thu, 26 Apr 2018 15:25:00 +0200
Subject: [PATCH 247/275] gnu: godot: Update to 3.0.2.

* gnu/packages/game-development.scm (godot): Update to 3.0.2.
---
 gnu/packages/game-development.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
index f6c9eba8c2..86abf9f37c 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -1065,7 +1065,7 @@ games.")
 (define-public godot
   (package
     (name "godot")
-    (version "3.0.1")
+    (version "3.0.2")
     (source (origin
               (method url-fetch)
               (uri
@@ -1074,7 +1074,7 @@ games.")
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "0k8c12nzhl98i9il9s3awbwdamkrwxk0s47jr7n8a3z93rpszd2p"))
+                "0ldnk3j4w2kh454mzclmq8nk7zqrn758yrqq85i4kzljpkf93g0m"))
               (modules '((guix build utils)))
               (snippet
                '(begin

From 720d9df90867d3521eacc7dc867959f5a487434b Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Sat, 28 Apr 2018 13:38:01 +0200
Subject: [PATCH 248/275] gnu: notmuch: Update to 0.26.2.

* gnu/packages/mail.scm (notmuch): Update to 0.26.2.
---
 gnu/packages/mail.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 77e4a1d800..c492f3163d 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -744,14 +744,14 @@ invoking @command{notifymuch} from the post-new hook.")
 (define-public notmuch
   (package
     (name "notmuch")
-    (version "0.26.1")
+    (version "0.26.2")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://notmuchmail.org/releases/notmuch-"
                                   version ".tar.gz"))
               (sha256
                (base32
-                "0dx8nhdmkaqabxcgxfa757m99fi395y76h9ynx8539yh9m7y9xyk"))))
+                "0fqf6wwvqlccq9qdnd0mky7fx0kbkczd28blf045s0vsvdjii70h"))))
     (build-system gnu-build-system)
     (arguments
      `(#:modules ((guix build gnu-build-system)

From 48167ccd7534126c74d85aedced29331ee2f1880 Mon Sep 17 00:00:00 2001
From: Kei Kebreau <kkebreau@posteo.net>
Date: Sat, 28 Apr 2018 14:39:44 -0400
Subject: [PATCH 249/275] gnu: dfc: Update to 3.1.1.

* gnu/packages/admin.scm (dfc): Update to 3.1.1.
---
 gnu/packages/admin.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 3d92eb1471..2b9b43bc50 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -245,16 +245,16 @@ services.")
 (define-public dfc
   (package
    (name "dfc")
-   (version "3.0.4")
+   (version "3.1.1")
    (source
     (origin
      (method url-fetch)
       (uri (string-append
-            "http://projects.gw-computing.net/attachments/download/79/dfc-"
+            "http://projects.gw-computing.net/attachments/download/615/dfc-"
             version ".tar.gz"))
       (sha256
        (base32
-        "0zk1ppx93ijimf4sbgqilxxikpsa2gmpbynknyh41xy7jbdjxp0b"))))
+        "0m1fd7l85ckb7bq4c5c3g257bkjglm8gq7x42pkmpp87fkknc94n"))))
    (build-system cmake-build-system)
    (arguments '(#:tests? #f)) ; There are no tests.
    (native-inputs `(("gettext" ,gettext-minimal)))

From 5a48a066ab40435b050c5601038343ca2ccb834a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sat, 28 Apr 2018 22:27:49 +0200
Subject: [PATCH 250/275] gnu: gcc-toolchain: Add "static" output.

This allows the use of 'gcc-toolchain' to create statically-linked
executables (requires libc.a.)

* gnu/packages/commencement.scm (make-gcc-toolchain): Add "static"
output.  Add "libc-static" to 'inputs'.  Add call to 'union-build' for
the "static" output.
---
 gnu/packages/commencement.scm | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index fe9fbebcc2..1026ee8929 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -1026,7 +1026,10 @@ COREUTILS-FINAL vs. COREUTILS, etc."
 
                      (union-build (assoc-ref %outputs "debug")
                                   (list (assoc-ref %build-inputs
-                                                   "libc-debug")))))))
+                                                   "libc-debug")))
+                     (union-build (assoc-ref %outputs "static")
+                                  (list (assoc-ref %build-inputs
+                                                   "libc-static")))))))
 
     (native-search-paths (package-native-search-paths gcc))
     (search-paths (package-search-paths gcc))
@@ -1038,7 +1041,7 @@ COREUTILS-FINAL vs. COREUTILS, etc."
 be installed in user profiles.  This includes GCC, as well as libc (headers
 and binaries, plus debugging symbols in the 'debug' output), and Binutils.")
     (home-page "https://gcc.gnu.org/")
-    (outputs '("out" "debug"))
+    (outputs '("out" "debug" "static"))
 
     ;; The main raison d'être of this "meta-package" is (1) to conveniently
     ;; install everything that we need, and (2) to make sure ld-wrapper comes
@@ -1047,7 +1050,8 @@ and binaries, plus debugging symbols in the 'debug' output), and Binutils.")
               ("ld-wrapper" ,(car (assoc-ref %final-inputs "ld-wrapper")))
               ("binutils" ,binutils-final)
               ("libc" ,glibc-final)
-              ("libc-debug" ,glibc-final "debug")))))
+              ("libc-debug" ,glibc-final "debug")
+              ("libc-static" ,glibc-final "static")))))
 
 (define-public gcc-toolchain-4.8
   (make-gcc-toolchain gcc-4.8))

From 3c2d267f4b0c47893c65d6fa14e4c52b6cda7d61 Mon Sep 17 00:00:00 2001
From: Diego Nicola Barbato <dnbarbato@posteo.de>
Date: Fri, 27 Apr 2018 23:52:13 +0200
Subject: [PATCH 251/275] gnu: escpr: Update to 1.6.20.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/cups.scm (escpr): Update to 1.6.20.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
 gnu/packages/cups.scm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm
index 62e308a07e..d6722702d8 100644
--- a/gnu/packages/cups.scm
+++ b/gnu/packages/cups.scm
@@ -605,7 +605,7 @@ HP@tie{}LaserJet, and possibly other printers.  See @file{README} for details.")
 (define-public escpr
   (package
     (name "escpr")
-    (version "1.6.18")
+    (version "1.6.20")
     ;; XXX: This currently works.  But it will break as soon as a newer
     ;; version is available since the URLs for older versions are not
     ;; preserved.  An alternative source will be added as soon as
@@ -613,12 +613,12 @@ HP@tie{}LaserJet, and possibly other printers.  See @file{README} for details.")
     (source (origin
               (method url-fetch)
               ;; The uri has to be chopped up in order to satisfy guix lint.
-              (uri (string-append "https://download3.ebz.epson.net/dsc/f/03/00/06/86/80/"
-                                  "9955e43f3aead20366851d24cea65de779cf5aa7/"
-                                  "epson-inkjet-printer-escpr-1.6.18-1lsb3.2.tar.gz"))
+              (uri (string-append "https://download3.ebz.epson.net/dsc/f/03/00/07/16/23/"
+                                  "804253d188a31ae6a0f2722648248ef952afedfb/"
+                                  "epson-inkjet-printer-escpr-1.6.20-1lsb3.2.tar.gz"))
               (sha256
                (base32
-                "137jf52dhi5v2rkmlw4b73f7r7f98m61dpgsb7yvqs2f0yhsjsb3"))))
+                "19800pl7kbbgdzbsy9ijmd7dm3ly4kr2h1dxypqpd075g6n0i770"))))
     (build-system gnu-build-system)
     (arguments
      `(#:configure-flags

From 2dab4188ec69be8cb41594516cc8a484b984bdc9 Mon Sep 17 00:00:00 2001
From: Fis Trivial <ybbs.daans@hotmail.com>
Date: Sat, 28 Apr 2018 03:47:03 +0000
Subject: [PATCH 252/275] gnu: Add python-autograd
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/machine-learning.scm (python-autograd, python2-autograd): New
variables.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
 gnu/packages/machine-learning.scm | 44 +++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm
index 12384a1031..f0d35484ea 100644
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@ -6,6 +6,7 @@
 ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2018 Mark Meyer <mark@ofosos.org>
 ;;; Copyright © 2018 Ben Woodcroft <donttrustben@gmail.com>
+;;; Copyright © 2018 Fis Trivial <ybbs.daans@hotmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -688,3 +689,46 @@ mining and data analysis.")
 
 (define-public python2-scikit-learn
   (package-with-python2 python-scikit-learn))
+
+(define-public python-autograd
+  (let* ((commit "442205dfefe407beffb33550846434baa90c4de7")
+         (revision "0")
+         (version (git-version "0.0.0" revision commit)))
+    (package
+      (name "python-autograd")
+      (home-page "https://github.com/HIPS/autograd")
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url home-page)
+                      (commit commit)))
+                (sha256
+                 (base32
+                  "189sv2xb0mwnjawa9z7mrgdglc1miaq93pnck26r28fi1jdwg0z4"))
+                (file-name (git-file-name name version))))
+      (version version)
+      (build-system python-build-system)
+      (native-inputs
+       `(("python-nose" ,python-nose)
+         ("python-pytest" ,python-pytest)))
+      (propagated-inputs
+       `(("python-future" ,python-future)
+         ("python-numpy" ,python-numpy)))
+      (arguments
+       `(#:phases (modify-phases %standard-phases
+                    (replace 'check
+                      (lambda _
+                        (invoke "py.test" "-v"))))))
+      (synopsis "Efficiently computes derivatives of NumPy code")
+      (description "Autograd can automatically differentiate native Python and
+NumPy code.  It can handle a large subset of Python's features, including loops,
+ifs, recursion and closures, and it can even take derivatives of derivatives
+of derivatives.  It supports reverse-mode differentiation
+(a.k.a. backpropagation), which means it can efficiently take gradients of
+scalar-valued functions with respect to array-valued arguments, as well as
+forward-mode differentiation, and the two can be composed arbitrarily.  The
+main intended application of Autograd is gradient-based optimization.")
+      (license license:expat))))
+
+(define-public python2-autograd
+  (package-with-python2 python-autograd))

From a34bc5c913c64475a4f2fe66db77b30021a18beb Mon Sep 17 00:00:00 2001
From: Fis Trivial <ybbs.daans@hotmail.com>
Date: Sat, 28 Apr 2018 04:25:30 +0000
Subject: [PATCH 253/275] gnu: python-autopep8: Update to 1.3.5
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/python.scm (python-autopep8): Update to 1.3.5

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
 gnu/packages/python.scm | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 9b673192e9..04ab52eb9f 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -3788,28 +3788,28 @@ multivalue dictionary that retains the order of insertions and deletions.")
 
 (define-public python-autopep8
   (package
-  (name "python-autopep8")
-  (version "1.3.2")
-  (source
-   (origin
-     (method url-fetch)
-     (uri (pypi-uri "autopep8" version))
-     (sha256
-      (base32
-       "1p9pa1ffg4iy96l918808jggg9a69iaka5awmj8xid36yc5mk0ky"))))
-  (build-system python-build-system)
-  (propagated-inputs
-    `(("python-pycodestyle" ,python-pycodestyle)))
-  (home-page "https://github.com/hhatto/autopep8")
-  (synopsis "Format Python code according to the PEP 8 style guide")
-  (description
-    "@code{autopep8} automatically formats Python code to conform to
+    (name "python-autopep8")
+    (version "1.3.5")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "autopep8" version))
+       (sha256
+        (base32
+         "192bvhzi4d0claqxgzymvv7k3qnj627742bc8sgxpzjj42pd9112"))))
+    (build-system python-build-system)
+    (propagated-inputs
+     `(("python-pycodestyle" ,python-pycodestyle)))
+    (home-page "https://github.com/hhatto/autopep8")
+    (synopsis "Format Python code according to the PEP 8 style guide")
+    (description
+     "@code{autopep8} automatically formats Python code to conform to
 the PEP 8 style guide.  It uses the pycodestyle utility to determine
 what parts of the code needs to be formatted.  @code{autopep8} is
 capable of fixing most of the formatting issues that can be reported
 by pycodestyle.")
-  (license (license:non-copyleft
-            "https://github.com/hhatto/autopep8/blob/master/LICENSE"))))
+    (license (license:non-copyleft
+              "https://github.com/hhatto/autopep8/blob/master/LICENSE"))))
 
 (define-public python2-autopep8
   (package-with-python2 python-autopep8))

From 4f447d2f98e173374ec597fdc38198666e089ef8 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sat, 28 Apr 2018 19:55:01 +0200
Subject: [PATCH 254/275] gnu: Use HTTPS for julialang.org home pages.

* gnu/packages/textutils.scm (utf8proc)[home-page]: Use HTTPS.
* gnu/packages/julia.scm (julia)[home-page]: Likewise
---
 gnu/packages/julia.scm     | 2 +-
 gnu/packages/textutils.scm | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/julia.scm b/gnu/packages/julia.scm
index 7a44abdec2..6fb1eee6cc 100644
--- a/gnu/packages/julia.scm
+++ b/gnu/packages/julia.scm
@@ -384,7 +384,7 @@
     ;; Julia is not officially released for ARM and MIPS.
     ;; See https://github.com/JuliaLang/julia/issues/10639
     (supported-systems '("i686-linux" "x86_64-linux" "aarch64-linux"))
-    (home-page "http://julialang.org/")
+    (home-page "https://julialang.org/")
     (synopsis "High-performance dynamic language for technical computing")
     (description
      "Julia is a high-level, high-performance dynamic programming language for
diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm
index 2108a0a6d1..4aa3e9c2a0 100644
--- a/gnu/packages/textutils.scm
+++ b/gnu/packages/textutils.scm
@@ -177,7 +177,7 @@ libenca and several charset conversion libraries and tools.")
              (substitute* "data/GraphemeBreakTest.txt"
                (("÷") "/")
                (("×") "+")))))))
-    (home-page "http://julialang.org/utf8proc/")
+    (home-page "https://julialang.org/utf8proc/")
     (synopsis "C library for processing UTF-8 Unicode data")
     (description "utf8proc is a small C library that provides Unicode
 normalization, case-folding, and other operations for data in the UTF-8

From 8bcda205f587547cfc6aabba8cbf08251cc44e74 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sat, 28 Apr 2018 23:02:12 +0200
Subject: [PATCH 255/275] gnu: utf8proc: Update to 2.1.1.

* gnu/packages/textutils.scm (utf8proc): Update to 2.1.1.
---
 gnu/packages/textutils.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm
index 4aa3e9c2a0..a06bf31176 100644
--- a/gnu/packages/textutils.scm
+++ b/gnu/packages/textutils.scm
@@ -136,7 +136,7 @@ libenca and several charset conversion libraries and tools.")
 (define-public utf8proc
   (package
     (name "utf8proc")
-    (version "2.1.0")
+    (version "2.1.1")
     (source
      (origin
        (method url-fetch)
@@ -145,9 +145,9 @@ libenca and several charset conversion libraries and tools.")
              version ".tar.gz"))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0q1jhdkk4f9b0zb8s2ql3sba3br5nvjsmbsaybmgj064k9hwbk15"))))
+        (base32 "1cnpigrazhslw65s4j1a56j7p6d7d61wsxxjf1218i9mkwv2yw17"))))
     (build-system gnu-build-system)
-    (inputs                  ;test data that is otherwise downloaded with curl
+    (inputs                 ; test data that is otherwise downloaded with curl
      `(("NormalizationTest.txt"
         ,(origin
            (method url-fetch)

From df1eaffc36c77d0bb3c55c68fa3c5d4c5d9b221f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sun, 29 Apr 2018 17:40:03 +0200
Subject: [PATCH 256/275] file-systems: Expound '%pseudo-file-system-types'.

Reported by Tobias Geerinckx-Rice <me@tobias.gr>.

* gnu/system/file-systems.scm (%pseudo-file-system-types): Add
"debugfs", "efivarfs", "hugetlbfs", "overlay", and "securityfs".
---
 gnu/system/file-systems.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/system/file-systems.scm b/gnu/system/file-systems.scm
index c0c635508c..d2acd705de 100644
--- a/gnu/system/file-systems.scm
+++ b/gnu/system/file-systems.scm
@@ -207,8 +207,8 @@ TARGET in the other system."
 (define %pseudo-file-system-types
   ;; List of know pseudo file system types.  This is used when validating file
   ;; system definitions.
-  '("binfmt_misc" "cgroup" "devpts" "devtmpfs" "fusectl"
-    "proc" "sysfs" "tmpfs"))
+  '("binfmt_misc" "cgroup" "debugfs" "devpts" "devtmpfs" "efivarfs" "fusectl"
+    "hugetlbfs" "overlay" "proc" "securityfs" "sysfs" "tmpfs"))
 
 (define %fuse-control-file-system
   ;; Control file system for Linux' file systems in user-space (FUSE).

From fd0b21d5f636c227b83a1fe722b12120dbc0750e Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagrant@debian.org>
Date: Sun, 29 Apr 2018 04:33:00 +0000
Subject: [PATCH 257/275] gnu: make-u-boot-package: Install 'SPL' files also.

* gnu/packages/bootloaders.scm (make-u-boot-package)[arguments]: Add 'SPL'
files to the files installed during custom 'install phase.
---
 gnu/packages/bootloaders.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
index 4350ff3a50..fc4570c2e5 100644
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@ -408,7 +408,7 @@ also initializes the boards (RAM etc).")
                       (libexec (string-append out "/libexec"))
                       (uboot-files (append
                                     (find-files "." ".*\\.(bin|efi|img|spl|itb|dtb)$")
-                                    (find-files "." "^MLO$"))))
+                                    (find-files "." "^(MLO|SPL)$"))))
                  (mkdir-p libexec)
                  (install-file ".config" libexec)
                  (for-each

From 95a3422ef1da7be528d1ae4204ec1b63effde5b6 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagrant@debian.org>
Date: Sun, 29 Apr 2018 04:38:05 +0000
Subject: [PATCH 258/275] gnu: Add u-boot-wandboard.

* gnu/packages/bootloaders.scm (u-boot-wandboard): New variable.
---
 gnu/packages/bootloaders.scm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
index fc4570c2e5..6a9fa36f24 100644
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@ -463,6 +463,9 @@ also initializes the boards (RAM etc).")
 (define-public u-boot-nintendo-nes-classic-edition
   (make-u-boot-package "Nintendo_NES_Classic_Edition" "arm-linux-gnueabihf"))
 
+(define-public u-boot-wandboard
+  (make-u-boot-package "wandboard" "arm-linux-gnueabihf"))
+
 (define-public vboot-utils
   (package
     (name "vboot-utils")

From adc61d72448de550614b71f120dc5b3a340f6dc0 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagrant@debian.org>
Date: Sun, 29 Apr 2018 06:39:10 +0000
Subject: [PATCH 259/275] gnu: Add u-boot-mx6cuboxi.

* gnu/packages/bootloaders.scm (u-boot-mx6cuboxi): New variable.
---
 gnu/packages/bootloaders.scm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
index 6a9fa36f24..0db6ad3f6a 100644
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@ -466,6 +466,9 @@ also initializes the boards (RAM etc).")
 (define-public u-boot-wandboard
   (make-u-boot-package "wandboard" "arm-linux-gnueabihf"))
 
+(define-public u-boot-mx6cuboxi
+  (make-u-boot-package "mx6cuboxi" "arm-linux-gnueabihf"))
+
 (define-public vboot-utils
   (package
     (name "vboot-utils")

From 39764ef893b7b65a8ce55e13746fed8fd0bad6e0 Mon Sep 17 00:00:00 2001
From: Julien Lepiller <julien@lepiller.eu>
Date: Sun, 29 Apr 2018 21:38:17 +0200
Subject: [PATCH 260/275] build: Use only one domain for guix-manual.

* Makefile.am (assert-no-store-file-names): Exclude guix-manual.
* po/doc/guix.pot po/doc/contributing.pot: Merge into...
* po/doc/guix-manual.pot: ...this.
* po/doc/guix.fr.po po/doc/contributing.fr.po: Merge into...
* po/doc/guix-manual.fr.po: ...this.
* doc/local.mk: Replace old file names.
* po/doc/local.mk: Replace old file names.
---
 Makefile.am                              |     1 +
 doc/local.mk                             |     6 +-
 po/doc/contributing.fr.po                |  1220 -
 po/doc/contributing.pot                  |   962 -
 po/doc/{guix.fr.po => guix-manual.fr.po} | 34249 ++++++++++++---------
 po/doc/{guix.pot => guix-manual.pot}     | 12471 ++++----
 po/doc/local.mk                          |    42 +-
 7 files changed, 26493 insertions(+), 22458 deletions(-)
 delete mode 100644 po/doc/contributing.fr.po
 delete mode 100644 po/doc/contributing.pot
 rename po/doc/{guix.fr.po => guix-manual.fr.po} (55%)
 rename po/doc/{guix.pot => guix-manual.pot} (84%)

diff --git a/Makefile.am b/Makefile.am
index 9f134c9708..7ea9228881 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -740,6 +740,7 @@ assert-no-store-file-names: $(distdir)/ChangeLog
 	$(AM_V_at)if grep -r --exclude=*.texi --exclude=*.info			\
 	     --exclude=*.info-[0-9] --exclude=*.dot				\
 	     --exclude=*.eps --exclude-dir=bootstrap				\
+		 --exclude=guix-manual.pot --exclude=guix-manual.*.po		\
 	     --exclude=guix-prettify.el						\
 	     --exclude=ChangeLog						\
 	     -E "$(storedir)/[a-z0-9]{32}-" $(distdir) ;			\
diff --git a/doc/local.mk b/doc/local.mk
index 1bfc03aba8..0b7904329a 100644
--- a/doc/local.mk
+++ b/doc/local.mk
@@ -90,14 +90,14 @@ cat "$@.tmp" | egrep '@p?x?ref' -A1 | sed 'N;s|--\n||g;P;D' | sed 's|^| |g' | \
 done
 endef
 
-$(srcdir)/%D%/guix.%.texi: po/doc/guix.%.po $(srcdir)/%D%/contributing.%.texi
+$(srcdir)/%D%/guix.%.texi: po/doc/guix-manual.%.po $(srcdir)/%D%/contributing.%.texi
 	-$(AM_V_PO4A)$(PO4A_TRANSLATE) $(PO4A_PARAMS) -m "%D%/guix.texi" -p "$<" -l "$@.tmp"
 	-sed -i "s|guix\.info|$$(basename "$@" | sed 's|texi$$|info|')|" "$@.tmp"
 	-$(AM_V_POXREF)$(xref_command)
 	-mv "$@.tmp" "$@"
 
-$(srcdir)/%D%/contributing.%.texi: po/doc/guix.%.po po/doc/contributing.%.po
-	-$(AM_V_PO4A)$(PO4A_TRANSLATE) $(PO4A_PARAMS) -m "%D%/contributing.texi" -p "$(word 2,$^)" -l "$@.tmp"
+$(srcdir)/%D%/contributing.%.texi: po/doc/guix-manual.%.po
+	-$(AM_V_PO4A)$(PO4A_TRANSLATE) $(PO4A_PARAMS) -m "%D%/contributing.texi" -p "$<" -l "$@.tmp"
 	-$(AM_V_POXREF)$(xref_command)
 	-mv "$@.tmp" "$@"
 
diff --git a/po/doc/contributing.fr.po b/po/doc/contributing.fr.po
deleted file mode 100644
index 610013ed5c..0000000000
--- a/po/doc/contributing.fr.po
+++ /dev/null
@@ -1,1220 +0,0 @@
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"POT-Creation-Date: 2018-04-10 21:34+0200\n"
-"PO-Revision-Date: 2018-04-19 18:50+0200\n"
-"Last-Translator: Julien Lepiller <julien@lepiller.eu>\n"
-"Language-Team: \n"
-"Language: fr\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.0.6\n"
-
-#. type: chapter
-#: doc/contributing.texi:1 doc/contributing.texi:2
-#, no-wrap
-msgid "Contributing"
-msgstr "Contribuer"
-
-#. type: Plain text
-#: doc/contributing.texi:9
-msgid ""
-"This project is a cooperative effort, and we need your help to make it grow! "
-"Please get in touch with us on @email{guix-devel@@gnu.org} and @code{#guix} on "
-"the Freenode IRC network.  We welcome ideas, bug reports, patches, and "
-"anything that may be helpful to the project.  We particularly welcome help on "
-"packaging (@pxref{Packaging Guidelines})."
-msgstr ""
-"Ce projet est un effort coopératif et nous avons besoin de votre aide pour le "
-"faire grandir ! Contactez-nous sur @email{guix-devel@@gnu.org} et @code{#guix} "
-"sur le réseau IRC Freenode. Nous accueillons les idées, les rapports de "
-"bogues, les correctifs et tout ce qui pourrait aider le projet. Nous "
-"apprécions particulièrement toute aide sur la création de paquets "
-"(@pxref{Consignes d'empaquetage})."
-
-#. type: cindex
-#: doc/contributing.texi:10
-#, no-wrap
-msgid "code of conduct, of contributors"
-msgstr "code de conduite, des contributeurs"
-
-#. type: cindex
-#: doc/contributing.texi:11
-#, no-wrap
-msgid "contributor covenant"
-msgstr "convention de contribution"
-
-#. type: Plain text
-#: doc/contributing.texi:17
-msgid ""
-"We want to provide a warm, friendly, and harassment-free environment, so that "
-"anyone can contribute to the best of their abilities.  To this end our project "
-"uses a ``Contributor Covenant'', which was adapted from @url{http://"
-"contributor-covenant.org/}.  You can find a local version in the @file{CODE-OF-"
-"CONDUCT} file in the source tree."
-msgstr ""
-"Nous souhaitons fournir un environnement chaleureux, amical et sans "
-"harcèlement pour que tout le monde puisse contribuer au mieux de ses "
-"capacités. Pour cela notre projet a une « Convention de contribution » adaptée "
-"de @url{http://contributor-covenant.org/}. Vous pouvez trouver une version "
-"locale dans le fichier @file{CODE-OF-CONDUCT} dans l'arborescence des sources."
-
-#. type: Plain text
-#: doc/contributing.texi:21
-msgid ""
-"Contributors are not required to use their legal name in patches and on-line "
-"communication; they can use any name or pseudonym of their choice."
-msgstr ""
-"Les contributeurs n'ont pas besoin d'utiliser leur nom légal dans leurs "
-"correctifs et leurs communications en ligne ; ils peuvent utiliser n'importe "
-"quel nom ou pseudonyme de leur choix."
-
-#. type: section
-#: doc/contributing.texi:28 doc/contributing.texi:30 doc/contributing.texi:31
-#, no-wrap
-msgid "Building from Git"
-msgstr "Construire depuis Git"
-
-#. type: menuentry
-#: doc/contributing.texi:28
-msgid "The latest and greatest."
-msgstr ""
-
-#. type: section
-#: doc/contributing.texi:28 doc/contributing.texi:102 doc/contributing.texi:103
-#, no-wrap
-msgid "Running Guix Before It Is Installed"
-msgstr "Lancer Guix avant qu'il ne soit installé"
-
-#. type: menuentry
-#: doc/contributing.texi:28
-msgid "Hacker tricks."
-msgstr "Astuces pour les hackers."
-
-#. type: section
-#: doc/contributing.texi:28 doc/contributing.texi:169 doc/contributing.texi:170
-#, no-wrap
-msgid "The Perfect Setup"
-msgstr "La configuration parfaite"
-
-#. type: menuentry
-#: doc/contributing.texi:28
-msgid "The right tools."
-msgstr "Les bons outils."
-
-#. type: section
-#: doc/contributing.texi:28 doc/contributing.texi:228 doc/contributing.texi:229
-#, no-wrap
-msgid "Coding Style"
-msgstr "Style de code"
-
-#. type: menuentry
-#: doc/contributing.texi:28
-msgid "Hygiene of the contributor."
-msgstr "Hygiène du contributeur."
-
-#. type: section
-#: doc/contributing.texi:28 doc/contributing.texi:319 doc/contributing.texi:320
-#, no-wrap
-msgid "Submitting Patches"
-msgstr "Envoyer des correctifs"
-
-#. type: menuentry
-#: doc/contributing.texi:28
-msgid "Share your work."
-msgstr "Partager votre travail."
-
-#. type: Plain text
-#: doc/contributing.texi:35
-msgid ""
-"If you want to hack Guix itself, it is recommended to use the latest version "
-"from the Git repository:"
-msgstr ""
-"Si vous souhaitez travailler sur Guix lui-même, il est recommandé d'utiliser "
-"la dernière version du dépôt Git :"
-
-#. type: example
-#: doc/contributing.texi:38
-#, no-wrap
-msgid "git clone https://git.savannah.gnu.org/git/guix.git\n"
-msgstr "git clone https://git.savannah.gnu.org/git/guix.git\n"
-
-#. type: Plain text
-#: doc/contributing.texi:43
-msgid ""
-"When building Guix from a checkout, the following packages are required in "
-"addition to those mentioned in the installation instructions "
-"(@pxref{Requirements})."
-msgstr ""
-"Lors de la construction de Guix depuis un extrait, les paquets suivants sont "
-"requis en plus de ceux mentionnés dans les instructions d'installation "
-"(@pxref{Prérequis})."
-
-#. type: item
-#: doc/contributing.texi:45
-#, no-wrap
-msgid "@url{http://gnu.org/software/autoconf/, GNU Autoconf};"
-msgstr "@url{http://gnu.org/software/autoconf/, GNU Autoconf};"
-
-#. type: item
-#: doc/contributing.texi:46
-#, no-wrap
-msgid "@url{http://gnu.org/software/automake/, GNU Automake};"
-msgstr "@url{http://gnu.org/software/automake/, GNU Automake};"
-
-#. type: item
-#: doc/contributing.texi:47
-#, no-wrap
-msgid "@url{http://gnu.org/software/gettext/, GNU Gettext};"
-msgstr "@url{http://gnu.org/software/gettext/, GNU Gettext};"
-
-#. type: item
-#: doc/contributing.texi:48
-#, no-wrap
-msgid "@url{http://gnu.org/software/texinfo/, GNU Texinfo};"
-msgstr "@url{http://gnu.org/software/texinfo/, GNU Texinfo};"
-
-#. type: item
-#: doc/contributing.texi:49
-#, no-wrap
-msgid "@url{http://www.graphviz.org/, Graphviz};"
-msgstr "@url{http://www.graphviz.org/, Graphviz};"
-
-#. type: item
-#: doc/contributing.texi:50
-#, no-wrap
-msgid "@url{http://www.gnu.org/software/help2man/, GNU Help2man (optional)}."
-msgstr "@url{http://www.gnu.org/software/help2man/, GNU Help2man (facultatif)}."
-
-#. type: Plain text
-#: doc/contributing.texi:57
-msgid ""
-"The easiest way to set up a development environment for Guix is, of course, by "
-"using Guix! The following command starts a new shell where all the "
-"dependencies and appropriate environment variables are set up to hack on Guix:"
-msgstr ""
-"La manière la plus simple de configurer un environnement de développement pour "
-"Guix est, bien sûr, d'utiliser Guix ! La commande suivante démarre un nouveau "
-"shell où toutes les dépendances et les variables d'environnements appropriées "
-"sont configurés pour travailler sur Guix :"
-
-#. type: example
-#: doc/contributing.texi:60
-#, no-wrap
-msgid "guix environment guix\n"
-msgstr "guix environment guix\n"
-
-#. type: Plain text
-#: doc/contributing.texi:64
-msgid ""
-"@xref{Invoking guix environment}, for more information on that command.  Extra "
-"dependencies can be added with @option{--ad-hoc}:"
-msgstr ""
-"@xref{Invoquer guix environment}, pour plus d'information sur cette commande. "
-"On peut ajouter des dépendances supplémentaires avec @option{--ad-hoc} :"
-
-#. type: example
-#: doc/contributing.texi:67
-#, no-wrap
-msgid "guix environment guix --ad-hoc help2man git strace\n"
-msgstr "guix environment guix --ad-hoc help2man git strace\n"
-
-#. type: Plain text
-#: doc/contributing.texi:71
-msgid ""
-"Run @command{./bootstrap} to generate the build system infrastructure using "
-"Autoconf and Automake.  If you get an error like this one:"
-msgstr ""
-"Lancez @command{./bootstrap} pour générer l'infrastructure du système de "
-"construction avec Autoconf et Automake. Si vous avez une erreur comme :"
-
-#. type: example
-#: doc/contributing.texi:74
-#, no-wrap
-msgid "configure.ac:46: error: possibly undefined macro: PKG_CHECK_MODULES\n"
-msgstr "configure.ac:46: error: possibly undefined macro: PKG_CHECK_MODULES\n"
-
-#. type: Plain text
-#: doc/contributing.texi:83
-msgid ""
-"it probably means that Autoconf couldn’t find @file{pkg.m4}, which is provided "
-"by pkg-config.  Make sure that @file{pkg.m4} is available.  The same holds for "
-"the @file{guile.m4} set of macros provided by Guile.  For instance, if you "
-"installed Automake in @file{/usr/local}, it wouldn’t look for @file{.m4} files "
-"in @file{/usr/share}.  In that case, you have to invoke the following command:"
-msgstr ""
-"cela signifie probablement qu'Autoconf n'a pas pu trouver @file{pkg.m4} qui "
-"est fournit par pkg-config. Assurez-vous que @file{pkg.m4} est disponible. "
-"C'est aussi vrai pour l'ensemble de macros de @file{guile.m4} fournies par "
-"Guile. Par exemple, si vous avez installé Automake dans @file{/usr/local}, il "
-"ne cherchera pas les fichiers @file{.m4} dans @file{/usr/share}. Dans ce case "
-"vous devez invoquer la commande suivante :"
-
-#. type: example
-#: doc/contributing.texi:86
-#, no-wrap
-msgid "export ACLOCAL_PATH=/usr/share/aclocal\n"
-msgstr "export ACLOCAL_PATH=/usr/share/aclocal\n"
-
-#. type: Plain text
-#: doc/contributing.texi:90
-msgid ""
-"@xref{Macro Search Path,,, automake, The GNU Automake Manual}, for more "
-"information."
-msgstr ""
-"@xref{Macro Search Path,,, automake, The GNU Automake Manual}, pour plus "
-"d'information."
-
-#. type: Plain text
-#: doc/contributing.texi:95
-msgid ""
-"Then, run @command{./configure} as usual.  Make sure to pass @code{--"
-"localstatedir=@var{directory}} where @var{directory} is the "
-"@code{localstatedir} value used by your current installation (@pxref{The "
-"Store}, for information about this)."
-msgstr ""
-"Ensuite, lancez @command{./configure} comme d'habitude. Assurez-vous de passer "
-"@code{--localstatedir=@var{directory}} où @var{directory} est la valeur "
-"@code{localstatedir} utilisée par votre installation actuelle (@pxref{Le "
-"dépôt} pour plus d'informations à ce propos)."
-
-#. type: Plain text
-#: doc/contributing.texi:100
-msgid ""
-"Finally, you have to invoke @code{make check} to run tests (@pxref{Running the "
-"Test Suite}).  If anything fails, take a look at installation instructions "
-"(@pxref{Installation})  or send a message to the @email{guix-devel@@gnu.org, "
-"mailing list}."
-msgstr ""
-"Finalement, vous devez invoquer @code{make check} pour lancer les tests "
-"(@pxref{Lancer la suite de tests}). Si quelque chose échoue, jetez un œil aux "
-"instructions d'installation (@pxref{Installation}) ou envoyez un message à la "
-"list @email{guix-devel@@gnu.org}."
-
-#. type: Plain text
-#: doc/contributing.texi:109
-msgid ""
-"In order to keep a sane working environment, you will find it useful to test "
-"the changes made in your local source tree checkout without actually "
-"installing them.  So that you can distinguish between your ``end-user'' hat "
-"and your ``motley'' costume."
-msgstr ""
-"Pour garder un environnement de travail sain, il est utile de tester les "
-"changement localement sans les installer pour de vrai. Pour pouvoir distinguer "
-"votre rôle « d'utilisateur final » de celui parfois haut en couleur de « "
-"développeur »."
-
-#. type: Plain text
-#: doc/contributing.texi:117
-msgid ""
-"To that end, all the command-line tools can be used even if you have not run "
-"@code{make install}.  To do that, prefix each command with @command{./pre-inst-"
-"env} (the @file{pre-inst-env} script lives in the top build tree of Guix), as "
-"in@footnote{The @option{-E} flag to @command{sudo} guarantees that "
-"@code{GUILE_LOAD_PATH} is correctly set such that @command{guix-daemon} and "
-"the tools it uses can find the Guile modules they need.}:"
-msgstr ""
-"Pour cela, tous les outils en ligne de commande sont utilisables même sans "
-"avoir lancé @code{make install}. Vous devez pour cela préfixer chaque commande "
-"par @command{./pre-inst-env} (le script @file{pre-inst-env} se trouve dans le "
-"répertoire de plus haut niveau de l'arborescence des sources de Guix) comme "
-"cela@footnote{L'option @option{-E} de @command{sudo} garantie que "
-"@code{GUILE_LOAD_PATH} est bien paramétré pour @command{guix-daemon} et les "
-"outils qu'il utilise puissent trouver les modules Guile dont ils ont besoin.} :"
-
-#. type: example
-#: doc/contributing.texi:121
-#, no-wrap
-msgid ""
-"$ sudo -E ./pre-inst-env guix-daemon --build-users-group=guixbuild\n"
-"$ ./pre-inst-env guix build hello\n"
-msgstr ""
-"$ sudo -E ./pre-inst-env guix-daemon --build-users-group=guixbuild\n"
-"$ ./pre-inst-env guix build hello\n"
-
-#. type: Plain text
-#: doc/contributing.texi:125
-msgid "Similarly, for a Guile session using the Guix modules:"
-msgstr "De même, pour une session Guile qui utilise les modules Guix :"
-
-#. type: example
-#: doc/contributing.texi:128
-#, no-wrap
-msgid ""
-"$ ./pre-inst-env guile -c '(use-modules (guix utils)) (pk (%current-system))'\n"
-"\n"
-msgstr ""
-"$ ./pre-inst-env guile -c '(use-modules (guix utils)) (pk (%current-system))'\n"
-"\n"
-
-#. type: example
-#: doc/contributing.texi:130
-#, no-wrap
-msgid ";;; (\"x86_64-linux\")\n"
-msgstr ";;; (\"x86_64-linux\")\n"
-
-#. type: cindex
-#: doc/contributing.texi:133
-#, no-wrap
-msgid "REPL"
-msgstr "REPL"
-
-#. type: cindex
-#: doc/contributing.texi:134
-#, no-wrap
-msgid "read-eval-print loop"
-msgstr "read-eval-print loop"
-
-#. type: Plain text
-#: doc/contributing.texi:137
-msgid ""
-"@dots{} and for a REPL (@pxref{Using Guile Interactively,,, guile, Guile "
-"Reference Manual}):"
-msgstr ""
-"@dots{} et pour un REPL (@pxref{Using Guile Interactively,,, guile, Guile "
-"Reference Manual})"
-
-#. type: example
-#: doc/contributing.texi:152
-#, no-wrap
-msgid ""
-"$ ./pre-inst-env guile\n"
-"scheme@@(guile-user)> ,use(guix)\n"
-"scheme@@(guile-user)> ,use(gnu)\n"
-"scheme@@(guile-user)> (define snakes\n"
-"                       (fold-packages\n"
-"                         (lambda (package lst)\n"
-"                           (if (string-prefix? \"python\"\n"
-"                                               (package-name package))\n"
-"                               (cons package lst)\n"
-"                               lst))\n"
-"                         '()))\n"
-"scheme@@(guile-user)> (length snakes)\n"
-"$1 = 361\n"
-msgstr ""
-"$ ./pre-inst-env guile\n"
-"scheme@@(guile-user)> ,use(guix)\n"
-"scheme@@(guile-user)> ,use(gnu)\n"
-"scheme@@(guile-user)> (define snakes\n"
-"                       (fold-packages\n"
-"                         (lambda (package lst)\n"
-"                           (if (string-prefix? \"python\"\n"
-"                                               (package-name package))\n"
-"                               (cons package lst)\n"
-"                               lst))\n"
-"                         '()))\n"
-"scheme@@(guile-user)> (length snakes)\n"
-"$1 = 361\n"
-
-#. type: Plain text
-#: doc/contributing.texi:156
-msgid ""
-"The @command{pre-inst-env} script sets up all the environment variables "
-"necessary to support this, including @env{PATH} and @env{GUILE_LOAD_PATH}."
-msgstr ""
-"Le script @command{pre-inst-env} paramètre toutes les variables "
-"d'environnement nécessaires, dont @env{PATH} et @env{GUILE_LOAD_PATH}."
-
-#. type: Plain text
-#: doc/contributing.texi:167
-msgid ""
-"Note that @command{./pre-inst-env guix pull} does @emph{not} upgrade the local "
-"source tree; it simply updates the @file{~/.config/guix/latest} symlink "
-"(@pxref{Invoking guix pull}).  Run @command{git pull} instead if you want to "
-"upgrade your local source tree.@footnote{If you would like to set up "
-"@command{guix} to use your Git checkout, you can point the @file{~/.config/"
-"guix/latest} symlink to your Git checkout directory.  If you are the sole user "
-"of your system, you may also consider pointing the @file{/root/.config/guix/"
-"latest} symlink to point to @file{~/.config/guix/latest}; this way it will "
-"always use the same @command{guix} as your user does.}"
-msgstr ""
-"Remarquez que @command{./pre-inst-env guix pull} ne met @emph{pas} à jour "
-"l'arborescence des sources locale ; il met seulement à jour le lien symbolique "
-"@file{~/.config/guix/latest} (@pxref{Invoquer guix pull}). Lancez @command{git "
-"pull} à la place si vous voulez mettre à jour votre arborescence des sources "
-"locale@footnote{Si vous voulez paramétrer @command{guix} pour qu'il utilise "
-"votre dépôt Git, vous pouvez faire pointer le lien symbolique @file{~/.config/"
-"guix/latest} vers le répertoire contenant ce dépôt. Si vous le seul "
-"utilisateur du système, vous pouvez aussi considérer faire pointer le lien "
-"symbolique @file{/root/.config/guix/latest} vers @file{~/.config/guix/"
-"latest} ; comme ça root aura toujours la même commande @command{guix} que "
-"votre utilisateur}."
-
-#. type: Plain text
-#: doc/contributing.texi:177
-msgid ""
-"The Perfect Setup to hack on Guix is basically the perfect setup used for "
-"Guile hacking (@pxref{Using Guile in Emacs,,, guile, Guile Reference "
-"Manual}).  First, you need more than an editor, you need @url{http://www.gnu."
-"org/software/emacs, Emacs}, empowered by the wonderful @url{http://nongnu.org/"
-"geiser/, Geiser}."
-msgstr ""
-"La configuration parfaite pour travailler sur Guix est simplement la "
-"configuration parfaite pour travailler en Guile (@pxref{Using Guile in "
-"Emacs,,, guile, Guile Reference Manual}). Tout d'abord, vous avez besoin de "
-"mieux qu'un éditeur de texte, vous avez besoin de @url{http://www.gnu.org/"
-"software/emacs, Emacs}, amélioré par le superbe @url{http://nongnu.org/"
-"geiser/, Geiser}."
-
-#. type: Plain text
-#: doc/contributing.texi:185
-msgid ""
-"Geiser allows for interactive and incremental development from within Emacs: "
-"code compilation and evaluation from within buffers, access to on-line "
-"documentation (docstrings), context-sensitive completion, @kbd{M-.} to jump to "
-"an object definition, a REPL to try out your code, and more "
-"(@pxref{Introduction,,, geiser, Geiser User Manual}).  For convenient Guix "
-"development, make sure to augment Guile’s load path so that it finds source "
-"files from your checkout:"
-msgstr ""
-"Geiser permet le développement interactif et incrémental depuis Emacs : la "
-"compilation du code et son évaluation depuis les buffers, l'accès à la "
-"documentation en ligne (docstrings), la complétion sensible au contexte, "
-"@kbd{M-.} pour sauter à la définition d'un objet, un REPL pour tester votre "
-"code, et bien plus (@pxref{Introduction,,, geiser, Geiser User Manual}). Pour "
-"travailler confortablement sur Guix, assurez-vous de modifier le chemin de "
-"chargement de Guile pour qu'il trouve les fichiers source de votre dépôt :"
-
-#. type: lisp
-#: doc/contributing.texi:190
-#, no-wrap
-msgid ""
-";; @r{Assuming the Guix checkout is in ~/src/guix.}\n"
-"(with-eval-after-load 'geiser-guile\n"
-"  (add-to-list 'geiser-guile-load-path \"~/src/guix\"))\n"
-msgstr ""
-";; @r{Si l'extrait est dans ~/src/guix.}\n"
-"(with-eval-after-load 'geiser-guile\n"
-"  (add-to-list 'geiser-guile-load-path \"~/src/guix\"))\n"
-
-#. type: Plain text
-#: doc/contributing.texi:198
-msgid ""
-"To actually edit the code, Emacs already has a neat Scheme mode.  But in "
-"addition to that, you must not miss @url{http://www.emacswiki.org/emacs/"
-"ParEdit, Paredit}.  It provides facilities to directly operate on the syntax "
-"tree, such as raising an s-expression or wrapping it, swallowing or rejecting "
-"the following s-expression, etc."
-msgstr ""
-
-#. type: cindex
-#: doc/contributing.texi:199
-#, no-wrap
-msgid "code snippets"
-msgstr "extraits de code"
-
-#. type: cindex
-#: doc/contributing.texi:200
-#, no-wrap
-msgid "templates"
-msgstr "modèles"
-
-#. type: cindex
-#: doc/contributing.texi:201
-#, no-wrap
-msgid "reducing boilerplate"
-msgstr "réduire la quantité de code commun"
-
-#. type: Plain text
-#: doc/contributing.texi:208
-msgid ""
-"We also provide templates for common git commit messages and package "
-"definitions in the @file{etc/snippets} directory.  These templates can be used "
-"with @url{http://joaotavora.github.io/yasnippet/, YASnippet} to expand short "
-"trigger strings to interactive text snippets.  You may want to add the "
-"snippets directory to the @var{yas-snippet-dirs} variable in Emacs."
-msgstr ""
-"Nous fournissons aussi des modèles pour les messages de commit git communs et "
-"les définitions de paquets dans le répertoire @file{etc/snippets}. Ces modèles "
-"s'utilisent avec @url{http://joaotavora.github.io/yasnippet/, YASnippet} pour "
-"développer des chaînes courtes de déclenchement en extraits de texte "
-"interactifs. Vous pouvez ajouter le répertoire des modèles dans la variables "
-"@var{yas-snippet-dirs} d'Emacs."
-
-#. type: lisp
-#: doc/contributing.texi:213
-#, no-wrap
-msgid ""
-";; @r{Assuming the Guix checkout is in ~/src/guix.}\n"
-"(with-eval-after-load 'yasnippet\n"
-"  (add-to-list 'yas-snippet-dirs \"~/src/guix/etc/snippets\"))\n"
-msgstr ""
-";; @r{Si l'extrait est dans ~/src/guix.}\n"
-"(with-eval-after-load 'yasnippet\n"
-"  (add-to-list 'yas-snippet-dirs \"~/src/guix/etc/snippets\"))\n"
-
-#. type: Plain text
-#: doc/contributing.texi:220
-msgid ""
-"The commit message snippets depend on @url{https://magit.vc/, Magit} to "
-"display staged files.  When editing a commit message type @code{add} followed "
-"by @kbd{TAB} to insert a commit message template for adding a package; type "
-"@code{update} followed by @kbd{TAB} to insert a template for updating a "
-"package."
-msgstr ""
-"Les extraits de messages de commit dépendent de @url{https://magit.vc/, Magit} "
-"pour afficher les fichiers sélectionnés. Lors de la modification d'un message "
-"de commit, tapez @code{add} suivi de @kbd{TAB} pour insérer un modèle de "
-"message de commit pour ajouter un paquet ; tapez @code{update} suivi de "
-"@kbd{TAB} pour insérer un modèle pour la mise à jour d'un paquet."
-
-#. type: Plain text
-#: doc/contributing.texi:226
-msgid ""
-"The main snippet for @code{scheme-mode} is triggered by typing "
-"@code{package...} followed by @kbd{TAB}.  This snippet also inserts the "
-"trigger string @code{origin...}, which can be expanded further.  The "
-"@code{origin} snippet in turn may insert other trigger strings ending on "
-"@code{...}, which also can be expanded further."
-msgstr ""
-"L'extrait principal pour @code{scheme-mode} est lancé en tapant "
-"@code{package…} suivi par @kbd{TAB}. Cet extrait insère aussi la chaîne de "
-"déclenchement @code{origin…}, qui peut aussi être étendue. L'extrait "
-"@code{origin} lui-même peut aussi insérer des chaînes de déclenchement qui "
-"finissent sur @code{…}, qui peuvent aussi être étendues."
-
-#. type: Plain text
-#: doc/contributing.texi:234
-msgid ""
-"In general our code follows the GNU Coding Standards (@pxref{Top,,, standards, "
-"GNU Coding Standards}).  However, they do not say much about Scheme, so here "
-"are some additional rules."
-msgstr ""
-"En général notre code suit le Standard de Code GNU (@pxref{Top,,, standards, "
-"GNU Coding Standards}). Cependant, il ne parle pas beaucoup de Scheme, donc "
-"voici quelques règles supplémentaires."
-
-#. type: subsection
-#: doc/contributing.texi:240 doc/contributing.texi:242 doc/contributing.texi:243
-#, no-wrap
-msgid "Programming Paradigm"
-msgstr "Paradigme de programmation"
-
-#. type: menuentry
-#: doc/contributing.texi:240
-msgid "How to compose your elements."
-msgstr "Comment composer vos éléments."
-
-#. type: subsection
-#: doc/contributing.texi:240 doc/contributing.texi:249 doc/contributing.texi:250
-#, no-wrap
-msgid "Modules"
-msgstr "Modules"
-
-#. type: menuentry
-#: doc/contributing.texi:240
-msgid "Where to store your code?"
-msgstr "Où stocker votre code ?"
-
-#. type: subsection
-#: doc/contributing.texi:240 doc/contributing.texi:260 doc/contributing.texi:261
-#, no-wrap
-msgid "Data Types and Pattern Matching"
-msgstr "Types de données et reconnaissance de motif"
-
-#. type: menuentry
-#: doc/contributing.texi:240
-msgid "Implementing data structures."
-msgstr "Implémenter des structures de données."
-
-#. type: subsection
-#: doc/contributing.texi:240 doc/contributing.texi:274 doc/contributing.texi:275
-#, no-wrap
-msgid "Formatting Code"
-msgstr "Formatage du code"
-
-#. type: menuentry
-#: doc/contributing.texi:240
-msgid "Writing conventions."
-msgstr "Conventions d'écriture."
-
-#. type: Plain text
-#: doc/contributing.texi:248
-msgid ""
-"Scheme code in Guix is written in a purely functional style.  One exception is "
-"code that involves input/output, and procedures that implement low-level "
-"concepts, such as the @code{memoize} procedure."
-msgstr ""
-"Le code Scheme dans Guix est écrit dans un style purement fonctionnel. Le code "
-"qui s'occupe des entrées-sorties est une exception ainsi que les procédures "
-"qui implémentent des concepts bas-niveau comme la procédure @code{memoize}."
-
-#. type: Plain text
-#: doc/contributing.texi:256
-msgid ""
-"Guile modules that are meant to be used on the builder side must live in the "
-"@code{(guix build @dots{})} name space.  They must not refer to other Guix or "
-"GNU modules.  However, it is OK for a ``host-side'' module to use a build-side "
-"module."
-msgstr ""
-"Les modules Guile qui sont sensés être utilisés du côté de la construction "
-"doivent se trouver dans l'espace de nom @code{(guix build @dots{})}. Ils ne "
-"doivent pas se référer à d'autres modules Guix ou GNU. Cependant il est "
-"correct pour un module « côté hôte » de dépendre d'un module coté construction."
-
-#. type: Plain text
-#: doc/contributing.texi:259
-msgid ""
-"Modules that deal with the broader GNU system should be in the @code{(gnu "
-"@dots{})} name space rather than @code{(guix @dots{})}."
-msgstr ""
-"Les modules qui s'occupent du système GNU général devraient se trouver dans "
-"l'espace de nom @code{(gnu @dots{})} plutôt que @code{(guix @dots{})}."
-
-#. type: Plain text
-#: doc/contributing.texi:268
-msgid ""
-"The tendency in classical Lisp is to use lists to represent everything, and "
-"then to browse them ``by hand'' using @code{car}, @code{cdr}, @code{cadr}, and "
-"co.  There are several problems with that style, notably the fact that it is "
-"hard to read, error-prone, and a hindrance to proper type error reports."
-msgstr ""
-"La tendance en Lisp classique est d'utiliser des listes pour tout représenter "
-"et de naviguer dedans « à la main ( avec @code{car}, @code{cdr}, @code{cadr} "
-"et compagnie. Il y a plusieurs problèmes avec ce style, notamment le fait "
-"qu'il soit dur à lire, source d'erreur et un obstacle aux rapports d'erreur "
-"bien typés."
-
-#. type: Plain text
-#: doc/contributing.texi:273
-msgid ""
-"Guix code should define appropriate data types (for instance, using "
-"@code{define-record-type*}) rather than abuse lists.  In addition, it should "
-"use pattern matching, via Guile’s @code{(ice-9 match)} module, especially when "
-"matching lists."
-msgstr ""
-"Le code de Guix devrait définir des types de données appropriées (par exemple, "
-"avec @code{define-record-type*}) plutôt que d'abuser des listes. En plus, il "
-"devrait utiliser la recherche de motifs, via le module Guile @code{(ice-9 "
-"match)}, surtout pour rechercher dans des listes."
-
-#. type: cindex
-#: doc/contributing.texi:277
-#, no-wrap
-msgid "formatting code"
-msgstr "formater le code"
-
-#. type: cindex
-#: doc/contributing.texi:278
-#, no-wrap
-msgid "coding style"
-msgstr "style de code"
-
-#. type: Plain text
-#: doc/contributing.texi:285
-msgid ""
-"When writing Scheme code, we follow common wisdom among Scheme programmers.  "
-"In general, we follow the @url{http://mumble.net/~campbell/scheme/style.txt, "
-"Riastradh's Lisp Style Rules}.  This document happens to describe the "
-"conventions mostly used in Guile’s code too.  It is very thoughtful and well "
-"written, so please do read it."
-msgstr ""
-"Lorsque nous écrivons du code Scheme, nous suivons la sagesse commune aux "
-"programmeurs Scheme. En général, nous suivons les @url{http://mumble.net/"
-"~campbell/scheme/style.txt, règles de style de Riastradh}. Ce document décrit "
-"aussi les conventions utilisées dans le code de Guile. Il est bien pensé et "
-"bien écrit, alors n'hésitez pas à le lire."
-
-#. type: Plain text
-#: doc/contributing.texi:292
-msgid ""
-"Some special forms introduced in Guix, such as the @code{substitute*} macro, "
-"have special indentation rules.  These are defined in the @file{.dir-locals."
-"el} file, which Emacs automatically uses.  Also note that Emacs-Guix provides "
-"@code{guix-devel-mode} mode that indents and highlights Guix code properly "
-"(@pxref{Development,,, emacs-guix, The Emacs-Guix Reference Manual})."
-msgstr ""
-"Certaines formes spéciales introduites dans Guix comme la macro "
-"@code{substitute*} ont des règles d'indentation spécifiques. Elles sont "
-"définies dans le fichier @file{.dir-locals.el} qu'Emacs utilise "
-"automatiquement. Remarquez aussi qu'Emacs-Guix fournit le mode @code{guix-"
-"devel-mode} qui indente et colore le code Guix correctement "
-"(@pxref{Development,,, emacs-guix, The Emacs-Guix Reference Manual})."
-
-#. type: cindex
-#: doc/contributing.texi:293
-#, no-wrap
-msgid "indentation, of code"
-msgstr "indentation, du code"
-
-#. type: cindex
-#: doc/contributing.texi:294
-#, no-wrap
-msgid "formatting, of code"
-msgstr "formatage, du code"
-
-#. type: Plain text
-#: doc/contributing.texi:297
-msgid ""
-"If you do not use Emacs, please make sure to let your editor knows these "
-"rules.  To automatically indent a package definition, you can also run:"
-msgstr ""
-"Si vous n'utilisez pas Emacs, assurez-vous que votre éditeur connaisse ces "
-"règles. Pour indenter automatiquement une définition de paquet, vous pouvez "
-"aussi lancer :"
-
-#. type: example
-#: doc/contributing.texi:300
-#, no-wrap
-msgid "./etc/indent-code.el gnu/packages/@var{file}.scm @var{package}\n"
-msgstr "./etc/indent-code.el gnu/packages/@var{file}.scm @var{package}\n"
-
-#. type: Plain text
-#: doc/contributing.texi:306
-msgid ""
-"This automatically indents the definition of @var{package} in @file{gnu/"
-"packages/@var{file}.scm} by running Emacs in batch mode.  To indent a whole "
-"file, omit the second argument:"
-msgstr ""
-"Cela indente automatiquement la définition de @var{package} dans @file{gnu/"
-"packages/@var{file}.scm} en lançant Emacs en mode commande. Pour indenter un "
-"fichier complet, n'indiquez pas de second argument :"
-
-#. type: example
-#: doc/contributing.texi:309
-#, no-wrap
-msgid "./etc/indent-code.el gnu/services/@var{file}.scm\n"
-msgstr "./etc/indent-code.el gnu/services/@var{file}.scm\n"
-
-#. type: Plain text
-#: doc/contributing.texi:314
-msgid ""
-"We require all top-level procedures to carry a docstring.  This requirement "
-"can be relaxed for simple private procedures in the @code{(guix build "
-"@dots{})} name space, though."
-msgstr ""
-"Nous demandons que toutes les procédure de premier niveau contiennent une "
-"chaîne de documentation. Ce pré-requis peut être relâché pour les procédures "
-"privées simples dans l'espace de nom @code{(guix build @dots{})} cependant."
-
-#. type: Plain text
-#: doc/contributing.texi:317
-msgid ""
-"Procedures should not have more than four positional parameters.  Use keyword "
-"parameters for procedures that take more than four parameters."
-msgstr ""
-"Les procédures ne devraient pas avoir plus de quatre paramètres positionnés. "
-"Utilisez des paramètres par mot-clefs pour les procédures qui prennent plus de "
-"quatre paramètres."
-
-#. type: Plain text
-#: doc/contributing.texi:326
-msgid ""
-"Development is done using the Git distributed version control system.  Thus, "
-"access to the repository is not strictly necessary.  We welcome contributions "
-"in the form of patches as produced by @code{git format-patch} sent to the "
-"@email{guix-patches@@gnu.org} mailing list."
-msgstr ""
-"Le développement se fait avec le système de contrôle de version Git. Ainsi, "
-"l'accès au dépôt n'est pas strictement nécessaire. Nous accueillons les "
-"contributions sous forme de correctifs produits par @code{git format-patch} "
-"envoyés sur la liste de diffusion @email{guix-patches@@gnu.org}."
-
-#. type: Plain text
-#: doc/contributing.texi:333
-msgid ""
-"This mailing list is backed by a Debbugs instance accessible at @uref{https://"
-"bugs.gnu.org/guix-patches}, which allows us to keep track of submissions.  "
-"Each message sent to that mailing list gets a new tracking number assigned; "
-"people can then follow up on the submission by sending email to @code{@var{NNN}"
-"@@debbugs.gnu.org}, where @var{NNN} is the tracking number (@pxref{Sending a "
-"Patch Series})."
-msgstr ""
-"Cette liste de diffusion est gérée par une instance Debbugs accessible à "
-"l'adresse @uref{https://bugs.gnu.org/guix-patches}, qui nous permet de suivre "
-"les soumissions. Chaque message envoyé à cette liste se voit attribuer un "
-"numéro de suivi ; les gens peuvent ensuite répondre à cette soumission en "
-"envoyant un courriel à @code{@var{NNN}@@debbugs.gnu.org}, où @var{NNN} est le "
-"numéro de suivi (@pxref{Envoyer une série de correctifs})."
-
-#. type: Plain text
-#: doc/contributing.texi:337
-msgid ""
-"Please write commit logs in the ChangeLog format (@pxref{Change Logs,,, "
-"standards, GNU Coding Standards}); you can check the commit history for "
-"examples."
-msgstr ""
-"Veuillez écrire les messages de commit dans le format ChangeLog (@pxref{Change "
-"Logs,,, standards, GNU Coding Standards}) ; vous pouvez regarder l'historique "
-"des commits pour trouver des exemples."
-
-#. type: Plain text
-#: doc/contributing.texi:340
-msgid ""
-"Before submitting a patch that adds or modifies a package definition, please "
-"run through this check list:"
-msgstr ""
-"Avant de soumettre un correctif qui ajoute ou modifie la définition d'un "
-"paquet, veuillez vérifier cette check-list :"
-
-#. type: enumerate
-#: doc/contributing.texi:347
-msgid ""
-"If the authors of the packaged software provide a cryptographic signature for "
-"the release tarball, make an effort to verify the authenticity of the "
-"archive.  For a detached GPG signature file this would be done with the "
-"@code{gpg --verify} command."
-msgstr ""
-"Si les auteurs du paquet logiciel fournissent une signature cryptographique "
-"pour l'archive, faîtes un effort pour vérifier l'authenticité de l'archive. "
-"Pour un fichier de signature GPG détaché, cela se fait avec la commande "
-"@code{gpg --verify}."
-
-#. type: enumerate
-#: doc/contributing.texi:351
-msgid ""
-"Take some time to provide an adequate synopsis and description for the "
-"package.  @xref{Synopses and Descriptions}, for some guidelines."
-msgstr ""
-"Prenez un peu de temps pour fournir un synopsis et une description adéquats "
-"pour le paquet. Voir @xref{Synopsis et descriptions} pour quelques lignes "
-"directrices."
-
-#. type: enumerate
-#: doc/contributing.texi:356
-msgid ""
-"Run @code{guix lint @var{package}}, where @var{package} is the name of the new "
-"or modified package, and fix any errors it reports (@pxref{Invoking guix "
-"lint})."
-msgstr ""
-"Lancez @code{guix lint @var{paquet}}, où @var{paquet} est le nom du nouveau "
-"paquet ou du paquet modifié, et corrigez les erreurs qu'il rapporte "
-"(@pxref{Invoquer guix lint})."
-
-#. type: enumerate
-#: doc/contributing.texi:360
-msgid ""
-"Make sure the package builds on your platform, using @code{guix build "
-"@var{package}}."
-msgstr ""
-"Assurez-vous que le paquet se construise sur votre plate-forme avec @code{guix "
-"build @var{paquet}}."
-
-#. type: cindex
-#: doc/contributing.texi:362
-#, no-wrap
-msgid "bundling"
-msgstr "construction groupée"
-
-#. type: enumerate
-#: doc/contributing.texi:365
-msgid ""
-"Make sure the package does not use bundled copies of software already "
-"available as separate packages."
-msgstr ""
-"Assurez-vous que le paquet n'utilise pas de copie groupée d'un logiciel déjà "
-"disponible dans un paquet séparé."
-
-#. type: enumerate
-#: doc/contributing.texi:374
-msgid ""
-"Sometimes, packages include copies of the source code of their dependencies as "
-"a convenience for users.  However, as a distribution, we want to make sure "
-"that such packages end up using the copy we already have in the distribution, "
-"if there is one.  This improves resource usage (the dependency is built and "
-"stored only once), and allows the distribution to make transverse changes such "
-"as applying security updates for a given software package in a single place "
-"and have them affect the whole system---something that bundled copies prevent."
-msgstr ""
-"Parfois, les paquets incluent des copie du code source de leurs dépendances "
-"pour le confort de leurs utilisateurs. Cependant, en tant que distribution, "
-"nous voulons nous assurer que ces paquets utilisent bien les copient que nous "
-"avons déjà dans la distribution si elles existent. Cela améliore l'utilisation "
-"des ressources (la dépendance n'est construite et stockée qu'une seule fois) "
-"et permet à la distribution de faire des changements transversaux comme "
-"appliquer des correctifs de sécurité pour un paquet donné depuis un unique "
-"emplacement et qu'ils affectent tout le système, ce qu'empêchent les copies "
-"groupées."
-
-#. type: enumerate
-#: doc/contributing.texi:381
-msgid ""
-"Take a look at the profile reported by @command{guix size} (@pxref{Invoking "
-"guix size}).  This will allow you to notice references to other packages "
-"unwillingly retained.  It may also help determine whether to split the package "
-"(@pxref{Packages with Multiple Outputs}), and which optional dependencies "
-"should be used."
-msgstr ""
-"Regardez le profile rapporté par @command{guix size} (@pxref{Invoking guix "
-"size}). Cela vous permettra de remarquer des références à d'autres paquets qui "
-"ont été retenus. Il peut aussi aider à déterminer s'il faut découper le paquet "
-"(@pxref{Des paquets avec plusieurs résultats}) et quelle dépendance facultative "
-"utiliser."
-
-#. type: enumerate
-#: doc/contributing.texi:386
-msgid ""
-"For important changes, check that dependent package (if applicable) are not "
-"affected by the change; @code{guix refresh --list-dependent @var{package}} "
-"will help you do that (@pxref{Invoking guix refresh})."
-msgstr ""
-"Pour les changements important, vérifiez que les paquets qui en dépendent "
-"(s'ils existent) ne sont pas affectés par le changement ; @code{guix refresh --"
-"list-dependant @var{paquet}} vous aidera (@pxref{Invoquer guix refresh})."
-
-#. type: cindex
-#: doc/contributing.texi:388
-#, no-wrap
-msgid "branching strategy"
-msgstr "stratégie de branche"
-
-#. type: cindex
-#: doc/contributing.texi:389
-#, no-wrap
-msgid "rebuild scheduling strategy"
-msgstr "stratégie de planification des reconstructions"
-
-#. type: enumerate
-#: doc/contributing.texi:392
-msgid ""
-"Depending on the number of dependent packages and thus the amount of "
-"rebuilding induced, commits go to different branches, along these lines:"
-msgstr ""
-"Suivant le nombre de paquets dépendants et donc le nombre de reconstruction "
-"induites, les commits vont vers des branches différentes, suivant ces "
-"principes :"
-
-#. type: item
-#: doc/contributing.texi:394
-#, no-wrap
-msgid "300 dependent packages or less"
-msgstr "300 paquets dépendants ou moins"
-
-#. type: table
-#: doc/contributing.texi:396
-msgid "@code{master} branch (non-disruptive changes)."
-msgstr "branche @code{master} (changements non-disruptifs)."
-
-#. type: item
-#: doc/contributing.texi:397
-#, no-wrap
-msgid "between 300 and 1,200 dependent packages"
-msgstr "entre 300 et 1 200 paquets dépendants"
-
-#. type: table
-#: doc/contributing.texi:402
-msgid ""
-"@code{staging} branch (non-disruptive changes).  This branch is intended to be "
-"merged in @code{master} every 3 weeks or so.  Topical changes (e.g., an update "
-"of the GNOME stack) can instead go to a specific branch (say, @code{gnome-"
-"updates})."
-msgstr ""
-"branche @code{staging} (changemets non-disruptifs). Cette branche devrait être "
-"fusionnées dans @code{master} tous les 3 semaines. Les changements par thèmes "
-"(par exemple une mise à jour de la pile GNOME) peuvent aller dans une branche "
-"spécifique (disons, @code{gnome-updates})."
-
-#. type: item
-#: doc/contributing.texi:403
-#, no-wrap
-msgid "more than 1,200 dependent packages"
-msgstr "plus de 1 200 paquets dépendants"
-
-#. type: table
-#: doc/contributing.texi:407
-msgid ""
-"@code{core-updates} branch (may include major and potentially disruptive "
-"changes).  This branch is intended to be merged in @code{master} every 2.5 "
-"months or so."
-msgstr ""
-"branche @code{core-updates} (peut inclure des changements majeurs et "
-"potentiellement disruptifs). Cette branche devrait être fusionnée dans "
-"@code{master} tous les 2,5 mois environ."
-
-#. type: enumerate
-#: doc/contributing.texi:414
-msgid ""
-"All these branches are tracked by our build farm and merged into @code{master} "
-"once everything has been successfully built.  This allows us to fix issues "
-"before they hit users, and to reduce the window during which pre-built "
-"binaries are not available."
-msgstr ""
-"Toutes ces branches sont gérées par notre ferme de construction et fusionnées "
-"dans @code{master} une fois que tout a été construit correctement. Cela nous "
-"permet de corriger des problèmes avant qu'ils n'atteignent les utilisateurs et "
-"réduit la fenêtre pendant laquelle les binaires pré-construits ne sont pas "
-"disponibles."
-
-#. type: cindex
-#: doc/contributing.texi:416
-#, no-wrap
-msgid "determinism, of build processes"
-msgstr "déterminisme, du processus de construction"
-
-#. type: cindex
-#: doc/contributing.texi:417
-#, no-wrap
-msgid "reproducible builds, checking"
-msgstr "construction reproductibles, vérification"
-
-#. type: enumerate
-#: doc/contributing.texi:421
-msgid ""
-"Check whether the package's build process is deterministic.  This typically "
-"means checking whether an independent build of the package yields the exact "
-"same result that you obtained, bit for bit."
-msgstr ""
-"Vérifiez si le processus de construction du paquet est déterministe. Cela "
-"signifie typiquement vérifier qu'une construction indépendante du paquet "
-"renvoie exactement le même résultat que vous avez obtenu, bit à bit."
-
-#. type: enumerate
-#: doc/contributing.texi:424
-msgid ""
-"A simple way to do that is by building the same package several times in a row "
-"on your machine (@pxref{Invoking guix build}):"
-msgstr ""
-"Une manière simple de le faire est de reconstruire le paquet plusieurs fois à "
-"la suite sur votre machine (@pxref{Invoquer guix build}) :"
-
-#. type: example
-#: doc/contributing.texi:427
-#, no-wrap
-msgid "guix build --rounds=2 my-package\n"
-msgstr "guix build --rounds=2 mon-paquet\n"
-
-#. type: enumerate
-#: doc/contributing.texi:431
-msgid ""
-"This is enough to catch a class of common non-determinism issues, such as "
-"timestamps or randomly-generated output in the build result."
-msgstr ""
-"Cela est suffisant pour trouver une classe de non-déterminisme commune, comme "
-"l'horodatage ou des sorties générées aléatoirement dans le résultat de la "
-"construction."
-
-#. type: enumerate
-#: doc/contributing.texi:441
-msgid ""
-"Another option is to use @command{guix challenge} (@pxref{Invoking guix "
-"challenge}).  You may run it once the package has been committed and built by "
-"@code{hydra.gnu.org} to check whether it obtains the same result as you did.  "
-"Better yet: Find another machine that can build it and run @command{guix "
-"publish}.  Since the remote build machine is likely different from yours, this "
-"can catch non-determinism issues related to the hardware---e.g., use of "
-"different instruction set extensions---or to the operating system kernel---e."
-"g., reliance on @code{uname} or @file{/proc} files."
-msgstr ""
-"Une autre option consiste à utiliser @command{guix challenge} (@pxref{Invoquer "
-"guix challenge}). Vous pouvez lancer la commande une fois que les paquets ont "
-"été commités et construits par @code{hydra.gnu.org} pour vérifier s'il obtient "
-"le même résultat que vous. Mieux encore : trouvez une autre machine qui peut "
-"le construire et lancez @command{guix publish}. Puis la machine distante est "
-"sûrement différente de la vôtre, cela peut trouver des problèmes de non-"
-"déterminisme liés au matériel — par exemple utiliser une extension du jeu "
-"d'instruction — ou du noyau du système d'exploitation — par exemple se reposer "
-"sur @code{uname} ou les fichiers de @file{/proc}."
-
-#. type: enumerate
-#: doc/contributing.texi:447
-msgid ""
-"When writing documentation, please use gender-neutral wording when referring "
-"to people, such as @uref{https://en.wikipedia.org/wiki/Singular_they, singular "
-"``they''@comma{} ``their''@comma{} ``them''}, and so forth."
-msgstr ""
-"Lorsque vous écrivez de la documentation, utilisez une formulation au genre "
-"neutre lorsque vous vous référez à des personnes, comme le @uref{https://fr."
-"wikipedia.org/wiki/They_singulier, ``they''@comma{} ``their''@comma{} ``them'' "
-"singulier} (en anglais)."
-
-#. type: enumerate
-#: doc/contributing.texi:451
-msgid ""
-"Verify that your patch contains only one set of related changes.  Bundling "
-"unrelated changes together makes reviewing harder and slower."
-msgstr ""
-"Vérifiez que votre correctif contienne seulement un ensemble de changements "
-"liés. Grouper des changements non liés ensemble rend la revue plus difficile "
-"et plus lente."
-
-#. type: enumerate
-#: doc/contributing.texi:454
-msgid ""
-"Examples of unrelated changes include the addition of several packages, or a "
-"package update along with fixes to that package."
-msgstr ""
-"Ajouter plusieurs paquet ou une mise à jour d'un paquet avec des corrections "
-"dans ce paquet sont des exemples de changements sans rapport."
-
-#. type: enumerate
-#: doc/contributing.texi:459
-msgid ""
-"Please follow our code formatting rules, possibly running the @command{etc/"
-"indent-code.el} script to do that automatically for you (@pxref{Formatting "
-"Code})."
-msgstr ""
-"Suivez nos règles de formatage de code, éventuellement en lançant le script "
-"@command{et/indent-code.el} pour le faire automatiquement (@pxref{Formatage du "
-"code})."
-
-#. type: Plain text
-#: doc/contributing.texi:469
-msgid ""
-"When posting a patch to the mailing list, use @samp{[PATCH] @dots{}} as a "
-"subject.  You may use your email client or the @command{git send-email} "
-"command (@pxref{Sending a Patch Series}).  We prefer to get patches in plain "
-"text messages, either inline or as MIME attachments.  You are advised to pay "
-"attention if your email client changes anything like line breaks or "
-"indentation which could potentially break the patches."
-msgstr ""
-"Lorsque vous envoyez un correctif à la liste de diffusion, utilisez "
-"@samp{[PATCH] @dots{}} comme sujet. Vous pouvez utiliser votre client de "
-"courriel ou la commande @command{git send-email} (@pxref{Envoyer une série de "
-"correctifs}). Nous préférons recevoir des correctifs en texte brut, soit en "
-"ligne, soit en pièce-jointe MIME. Nous vous conseillons de faire attention si "
-"votre client de courriel change par exemple les retours à la ligne ou "
-"l'indentation, ce qui peut casser les correctifs."
-
-#. type: Plain text
-#: doc/contributing.texi:472
-msgid ""
-"When a bug is resolved, please close the thread by sending an email to "
-"@email{@var{NNN}-done@@debbugs.gnu.org}."
-msgstr ""
-"Lorsqu'un bogue est résolu, veuillez fermer le fil en envoyant un courriel à "
-"@email{@var{NNN}-done@@debbugs.gnu.org}."
-
-#. type: anchor{#1}
-#: doc/contributing.texi:473 doc/contributing.texi:475
-#, no-wrap
-msgid "Sending a Patch Series"
-msgstr "Envoyer une série de correctifs"
-
-#. type: cindex
-#: doc/contributing.texi:475
-#, no-wrap
-msgid "patch series"
-msgstr "série de correctifs"
-
-#. type: code{#1}
-#: doc/contributing.texi:476
-#, no-wrap
-msgid "git send-email"
-msgstr "git send-email"
-
-#. type: code{#1}
-#: doc/contributing.texi:477
-#, no-wrap
-msgid "git-send-email"
-msgstr "git-send-email"
-
-#. type: Plain text
-#: doc/contributing.texi:485
-msgid ""
-"When sending a patch series (e.g., using @code{git send-email}), please first "
-"send one message to @email{guix-patches@@gnu.org}, and then send subsequent "
-"patches to @email{@var{NNN}@@debbugs.gnu.org} to make sure they are kept "
-"together.  See @uref{https://debbugs.gnu.org/Advanced.html, the Debbugs "
-"documentation} for more information."
-msgstr ""
-"Lorsque vous envoyez une série de correctifs (p.e. avec @code{git send-"
-"email}), envoyez d'abord une premier message à @email{guix-patches@@gnu.org} "
-"puis envoyez le reste des correctifs à @email{@var{NNN}@@debbugs.gnu.org} pour "
-"vous assurer qu'ils seront groupés ensemble. Voyez @uref{https://debbugs.gnu."
-"org/Advanced.html, la documentation de Debbugs} pour plus d'informations."
diff --git a/po/doc/contributing.pot b/po/doc/contributing.pot
deleted file mode 100644
index 856adf42d4..0000000000
--- a/po/doc/contributing.pot
+++ /dev/null
@@ -1,962 +0,0 @@
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) YEAR Ludovic Courtès
-# This file is distributed under the same license as the guix package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: guix 0.14.0.4279-63c2a\n"
-"Report-Msgid-Bugs-To: ludo@gnu.org\n"
-"POT-Creation-Date: 2018-04-19 21:17+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. type: chapter
-#: doc/contributing.texi:1 doc/contributing.texi:2
-#, no-wrap
-msgid "Contributing"
-msgstr ""
-
-#. type: Plain text
-#: doc/contributing.texi:9
-msgid ""
-"This project is a cooperative effort, and we need your help to make it grow! "
-"Please get in touch with us on @email{guix-devel@@gnu.org} and @code{#guix} "
-"on the Freenode IRC network.  We welcome ideas, bug reports, patches, and "
-"anything that may be helpful to the project.  We particularly welcome help "
-"on packaging (@pxref{Packaging Guidelines})."
-msgstr ""
-
-#. type: cindex
-#: doc/contributing.texi:10
-#, no-wrap
-msgid "code of conduct, of contributors"
-msgstr ""
-
-#. type: cindex
-#: doc/contributing.texi:11
-#, no-wrap
-msgid "contributor covenant"
-msgstr ""
-
-#. type: Plain text
-#: doc/contributing.texi:17
-msgid ""
-"We want to provide a warm, friendly, and harassment-free environment, so "
-"that anyone can contribute to the best of their abilities.  To this end our "
-"project uses a ``Contributor Covenant'', which was adapted from "
-"@url{http://contributor-covenant.org/}.  You can find a local version in the "
-"@file{CODE-OF-CONDUCT} file in the source tree."
-msgstr ""
-
-#. type: Plain text
-#: doc/contributing.texi:21
-msgid ""
-"Contributors are not required to use their legal name in patches and on-line "
-"communication; they can use any name or pseudonym of their choice."
-msgstr ""
-
-#. type: section
-#: doc/contributing.texi:28 doc/contributing.texi:30 doc/contributing.texi:31
-#, no-wrap
-msgid "Building from Git"
-msgstr ""
-
-#. type: menuentry
-#: doc/contributing.texi:28
-msgid "The latest and greatest."
-msgstr ""
-
-#. type: section
-#: doc/contributing.texi:28 doc/contributing.texi:102 doc/contributing.texi:103
-#, no-wrap
-msgid "Running Guix Before It Is Installed"
-msgstr ""
-
-#. type: menuentry
-#: doc/contributing.texi:28
-msgid "Hacker tricks."
-msgstr ""
-
-#. type: section
-#: doc/contributing.texi:28 doc/contributing.texi:169 doc/contributing.texi:170
-#, no-wrap
-msgid "The Perfect Setup"
-msgstr ""
-
-#. type: menuentry
-#: doc/contributing.texi:28
-msgid "The right tools."
-msgstr ""
-
-#. type: section
-#: doc/contributing.texi:28 doc/contributing.texi:228 doc/contributing.texi:229
-#, no-wrap
-msgid "Coding Style"
-msgstr ""
-
-#. type: menuentry
-#: doc/contributing.texi:28
-msgid "Hygiene of the contributor."
-msgstr ""
-
-#. type: section
-#: doc/contributing.texi:28 doc/contributing.texi:319 doc/contributing.texi:320
-#, no-wrap
-msgid "Submitting Patches"
-msgstr ""
-
-#. type: menuentry
-#: doc/contributing.texi:28
-msgid "Share your work."
-msgstr ""
-
-#. type: Plain text
-#: doc/contributing.texi:35
-msgid ""
-"If you want to hack Guix itself, it is recommended to use the latest version "
-"from the Git repository:"
-msgstr ""
-
-#. type: example
-#: doc/contributing.texi:38
-#, no-wrap
-msgid "git clone https://git.savannah.gnu.org/git/guix.git\n"
-msgstr ""
-
-#. type: Plain text
-#: doc/contributing.texi:43
-msgid ""
-"When building Guix from a checkout, the following packages are required in "
-"addition to those mentioned in the installation instructions "
-"(@pxref{Requirements})."
-msgstr ""
-
-#. type: item
-#: doc/contributing.texi:45
-#, no-wrap
-msgid "@url{http://gnu.org/software/autoconf/, GNU Autoconf};"
-msgstr ""
-
-#. type: item
-#: doc/contributing.texi:46
-#, no-wrap
-msgid "@url{http://gnu.org/software/automake/, GNU Automake};"
-msgstr ""
-
-#. type: item
-#: doc/contributing.texi:47
-#, no-wrap
-msgid "@url{http://gnu.org/software/gettext/, GNU Gettext};"
-msgstr ""
-
-#. type: item
-#: doc/contributing.texi:48
-#, no-wrap
-msgid "@url{http://gnu.org/software/texinfo/, GNU Texinfo};"
-msgstr ""
-
-#. type: item
-#: doc/contributing.texi:49
-#, no-wrap
-msgid "@url{http://www.graphviz.org/, Graphviz};"
-msgstr ""
-
-#. type: item
-#: doc/contributing.texi:50
-#, no-wrap
-msgid "@url{http://www.gnu.org/software/help2man/, GNU Help2man (optional)}."
-msgstr ""
-
-#. type: Plain text
-#: doc/contributing.texi:57
-msgid ""
-"The easiest way to set up a development environment for Guix is, of course, "
-"by using Guix! The following command starts a new shell where all the "
-"dependencies and appropriate environment variables are set up to hack on "
-"Guix:"
-msgstr ""
-
-#. type: example
-#: doc/contributing.texi:60
-#, no-wrap
-msgid "guix environment guix\n"
-msgstr ""
-
-#. type: Plain text
-#: doc/contributing.texi:64
-msgid ""
-"@xref{Invoking guix environment}, for more information on that command.  "
-"Extra dependencies can be added with @option{--ad-hoc}:"
-msgstr ""
-
-#. type: example
-#: doc/contributing.texi:67
-#, no-wrap
-msgid "guix environment guix --ad-hoc help2man git strace\n"
-msgstr ""
-
-#. type: Plain text
-#: doc/contributing.texi:71
-msgid ""
-"Run @command{./bootstrap} to generate the build system infrastructure using "
-"Autoconf and Automake.  If you get an error like this one:"
-msgstr ""
-
-#. type: example
-#: doc/contributing.texi:74
-#, no-wrap
-msgid "configure.ac:46: error: possibly undefined macro: PKG_CHECK_MODULES\n"
-msgstr ""
-
-#. type: Plain text
-#: doc/contributing.texi:83
-msgid ""
-"it probably means that Autoconf couldn’t find @file{pkg.m4}, which is "
-"provided by pkg-config.  Make sure that @file{pkg.m4} is available.  The "
-"same holds for the @file{guile.m4} set of macros provided by Guile.  For "
-"instance, if you installed Automake in @file{/usr/local}, it wouldn’t look "
-"for @file{.m4} files in @file{/usr/share}.  In that case, you have to invoke "
-"the following command:"
-msgstr ""
-
-#. type: example
-#: doc/contributing.texi:86
-#, no-wrap
-msgid "export ACLOCAL_PATH=/usr/share/aclocal\n"
-msgstr ""
-
-#. type: Plain text
-#: doc/contributing.texi:90
-msgid ""
-"@xref{Macro Search Path,,, automake, The GNU Automake Manual}, for more "
-"information."
-msgstr ""
-
-#. type: Plain text
-#: doc/contributing.texi:95
-msgid ""
-"Then, run @command{./configure} as usual.  Make sure to pass "
-"@code{--localstatedir=@var{directory}} where @var{directory} is the "
-"@code{localstatedir} value used by your current installation (@pxref{The "
-"Store}, for information about this)."
-msgstr ""
-
-#. type: Plain text
-#: doc/contributing.texi:100
-msgid ""
-"Finally, you have to invoke @code{make check} to run tests (@pxref{Running "
-"the Test Suite}).  If anything fails, take a look at installation "
-"instructions (@pxref{Installation})  or send a message to the "
-"@email{guix-devel@@gnu.org, mailing list}."
-msgstr ""
-
-#. type: Plain text
-#: doc/contributing.texi:109
-msgid ""
-"In order to keep a sane working environment, you will find it useful to test "
-"the changes made in your local source tree checkout without actually "
-"installing them.  So that you can distinguish between your ``end-user'' hat "
-"and your ``motley'' costume."
-msgstr ""
-
-#. type: Plain text
-#: doc/contributing.texi:117
-msgid ""
-"To that end, all the command-line tools can be used even if you have not run "
-"@code{make install}.  To do that, prefix each command with "
-"@command{./pre-inst-env} (the @file{pre-inst-env} script lives in the top "
-"build tree of Guix), as in@footnote{The @option{-E} flag to @command{sudo} "
-"guarantees that @code{GUILE_LOAD_PATH} is correctly set such that "
-"@command{guix-daemon} and the tools it uses can find the Guile modules they "
-"need.}:"
-msgstr ""
-
-#. type: example
-#: doc/contributing.texi:121
-#, no-wrap
-msgid ""
-"$ sudo -E ./pre-inst-env guix-daemon --build-users-group=guixbuild\n"
-"$ ./pre-inst-env guix build hello\n"
-msgstr ""
-
-#. type: Plain text
-#: doc/contributing.texi:125
-msgid "Similarly, for a Guile session using the Guix modules:"
-msgstr ""
-
-#. type: example
-#: doc/contributing.texi:128
-#, no-wrap
-msgid ""
-"$ ./pre-inst-env guile -c '(use-modules (guix utils)) (pk "
-"(%current-system))'\n"
-"\n"
-msgstr ""
-
-#. type: example
-#: doc/contributing.texi:130
-#, no-wrap
-msgid ";;; (\"x86_64-linux\")\n"
-msgstr ""
-
-#. type: cindex
-#: doc/contributing.texi:133
-#, no-wrap
-msgid "REPL"
-msgstr ""
-
-#. type: cindex
-#: doc/contributing.texi:134
-#, no-wrap
-msgid "read-eval-print loop"
-msgstr ""
-
-#. type: Plain text
-#: doc/contributing.texi:137
-msgid ""
-"@dots{} and for a REPL (@pxref{Using Guile Interactively,,, guile, Guile "
-"Reference Manual}):"
-msgstr ""
-
-#. type: example
-#: doc/contributing.texi:152
-#, no-wrap
-msgid ""
-"$ ./pre-inst-env guile\n"
-"scheme@@(guile-user)> ,use(guix)\n"
-"scheme@@(guile-user)> ,use(gnu)\n"
-"scheme@@(guile-user)> (define snakes\n"
-"                       (fold-packages\n"
-"                         (lambda (package lst)\n"
-"                           (if (string-prefix? \"python\"\n"
-"                                               (package-name package))\n"
-"                               (cons package lst)\n"
-"                               lst))\n"
-"                         '()))\n"
-"scheme@@(guile-user)> (length snakes)\n"
-"$1 = 361\n"
-msgstr ""
-
-#. type: Plain text
-#: doc/contributing.texi:156
-msgid ""
-"The @command{pre-inst-env} script sets up all the environment variables "
-"necessary to support this, including @env{PATH} and @env{GUILE_LOAD_PATH}."
-msgstr ""
-
-#. type: Plain text
-#: doc/contributing.texi:167
-msgid ""
-"Note that @command{./pre-inst-env guix pull} does @emph{not} upgrade the "
-"local source tree; it simply updates the @file{~/.config/guix/latest} "
-"symlink (@pxref{Invoking guix pull}).  Run @command{git pull} instead if you "
-"want to upgrade your local source tree.@footnote{If you would like to set up "
-"@command{guix} to use your Git checkout, you can point the "
-"@file{~/.config/guix/latest} symlink to your Git checkout directory.  If you "
-"are the sole user of your system, you may also consider pointing the "
-"@file{/root/.config/guix/latest} symlink to point to "
-"@file{~/.config/guix/latest}; this way it will always use the same "
-"@command{guix} as your user does.}"
-msgstr ""
-
-#. type: Plain text
-#: doc/contributing.texi:177
-msgid ""
-"The Perfect Setup to hack on Guix is basically the perfect setup used for "
-"Guile hacking (@pxref{Using Guile in Emacs,,, guile, Guile Reference "
-"Manual}).  First, you need more than an editor, you need "
-"@url{http://www.gnu.org/software/emacs, Emacs}, empowered by the wonderful "
-"@url{http://nongnu.org/geiser/, Geiser}."
-msgstr ""
-
-#. type: Plain text
-#: doc/contributing.texi:185
-msgid ""
-"Geiser allows for interactive and incremental development from within Emacs: "
-"code compilation and evaluation from within buffers, access to on-line "
-"documentation (docstrings), context-sensitive completion, @kbd{M-.} to jump "
-"to an object definition, a REPL to try out your code, and more "
-"(@pxref{Introduction,,, geiser, Geiser User Manual}).  For convenient Guix "
-"development, make sure to augment Guile’s load path so that it finds source "
-"files from your checkout:"
-msgstr ""
-
-#. type: lisp
-#: doc/contributing.texi:190
-#, no-wrap
-msgid ""
-";; @r{Assuming the Guix checkout is in ~/src/guix.}\n"
-"(with-eval-after-load 'geiser-guile\n"
-"  (add-to-list 'geiser-guile-load-path \"~/src/guix\"))\n"
-msgstr ""
-
-#. type: Plain text
-#: doc/contributing.texi:198
-msgid ""
-"To actually edit the code, Emacs already has a neat Scheme mode.  But in "
-"addition to that, you must not miss "
-"@url{http://www.emacswiki.org/emacs/ParEdit, Paredit}.  It provides "
-"facilities to directly operate on the syntax tree, such as raising an "
-"s-expression or wrapping it, swallowing or rejecting the following "
-"s-expression, etc."
-msgstr ""
-
-#. type: cindex
-#: doc/contributing.texi:199
-#, no-wrap
-msgid "code snippets"
-msgstr ""
-
-#. type: cindex
-#: doc/contributing.texi:200
-#, no-wrap
-msgid "templates"
-msgstr ""
-
-#. type: cindex
-#: doc/contributing.texi:201
-#, no-wrap
-msgid "reducing boilerplate"
-msgstr ""
-
-#. type: Plain text
-#: doc/contributing.texi:208
-msgid ""
-"We also provide templates for common git commit messages and package "
-"definitions in the @file{etc/snippets} directory.  These templates can be "
-"used with @url{http://joaotavora.github.io/yasnippet/, YASnippet} to expand "
-"short trigger strings to interactive text snippets.  You may want to add the "
-"snippets directory to the @var{yas-snippet-dirs} variable in Emacs."
-msgstr ""
-
-#. type: lisp
-#: doc/contributing.texi:213
-#, no-wrap
-msgid ""
-";; @r{Assuming the Guix checkout is in ~/src/guix.}\n"
-"(with-eval-after-load 'yasnippet\n"
-"  (add-to-list 'yas-snippet-dirs \"~/src/guix/etc/snippets\"))\n"
-msgstr ""
-
-#. type: Plain text
-#: doc/contributing.texi:220
-msgid ""
-"The commit message snippets depend on @url{https://magit.vc/, Magit} to "
-"display staged files.  When editing a commit message type @code{add} "
-"followed by @kbd{TAB} to insert a commit message template for adding a "
-"package; type @code{update} followed by @kbd{TAB} to insert a template for "
-"updating a package."
-msgstr ""
-
-#. type: Plain text
-#: doc/contributing.texi:226
-msgid ""
-"The main snippet for @code{scheme-mode} is triggered by typing "
-"@code{package...} followed by @kbd{TAB}.  This snippet also inserts the "
-"trigger string @code{origin...}, which can be expanded further.  The "
-"@code{origin} snippet in turn may insert other trigger strings ending on "
-"@code{...}, which also can be expanded further."
-msgstr ""
-
-#. type: Plain text
-#: doc/contributing.texi:234
-msgid ""
-"In general our code follows the GNU Coding Standards (@pxref{Top,,, "
-"standards, GNU Coding Standards}).  However, they do not say much about "
-"Scheme, so here are some additional rules."
-msgstr ""
-
-#. type: subsection
-#: doc/contributing.texi:240 doc/contributing.texi:242 doc/contributing.texi:243
-#, no-wrap
-msgid "Programming Paradigm"
-msgstr ""
-
-#. type: menuentry
-#: doc/contributing.texi:240
-msgid "How to compose your elements."
-msgstr ""
-
-#. type: subsection
-#: doc/contributing.texi:240 doc/contributing.texi:249 doc/contributing.texi:250
-#, no-wrap
-msgid "Modules"
-msgstr ""
-
-#. type: menuentry
-#: doc/contributing.texi:240
-msgid "Where to store your code?"
-msgstr ""
-
-#. type: subsection
-#: doc/contributing.texi:240 doc/contributing.texi:260 doc/contributing.texi:261
-#, no-wrap
-msgid "Data Types and Pattern Matching"
-msgstr ""
-
-#. type: menuentry
-#: doc/contributing.texi:240
-msgid "Implementing data structures."
-msgstr ""
-
-#. type: subsection
-#: doc/contributing.texi:240 doc/contributing.texi:274 doc/contributing.texi:275
-#, no-wrap
-msgid "Formatting Code"
-msgstr ""
-
-#. type: menuentry
-#: doc/contributing.texi:240
-msgid "Writing conventions."
-msgstr ""
-
-#. type: Plain text
-#: doc/contributing.texi:248
-msgid ""
-"Scheme code in Guix is written in a purely functional style.  One exception "
-"is code that involves input/output, and procedures that implement low-level "
-"concepts, such as the @code{memoize} procedure."
-msgstr ""
-
-#. type: Plain text
-#: doc/contributing.texi:256
-msgid ""
-"Guile modules that are meant to be used on the builder side must live in the "
-"@code{(guix build @dots{})} name space.  They must not refer to other Guix "
-"or GNU modules.  However, it is OK for a ``host-side'' module to use a "
-"build-side module."
-msgstr ""
-
-#. type: Plain text
-#: doc/contributing.texi:259
-msgid ""
-"Modules that deal with the broader GNU system should be in the @code{(gnu "
-"@dots{})} name space rather than @code{(guix @dots{})}."
-msgstr ""
-
-#. type: Plain text
-#: doc/contributing.texi:268
-msgid ""
-"The tendency in classical Lisp is to use lists to represent everything, and "
-"then to browse them ``by hand'' using @code{car}, @code{cdr}, @code{cadr}, "
-"and co.  There are several problems with that style, notably the fact that "
-"it is hard to read, error-prone, and a hindrance to proper type error "
-"reports."
-msgstr ""
-
-#. type: Plain text
-#: doc/contributing.texi:273
-msgid ""
-"Guix code should define appropriate data types (for instance, using "
-"@code{define-record-type*}) rather than abuse lists.  In addition, it should "
-"use pattern matching, via Guile’s @code{(ice-9 match)} module, especially "
-"when matching lists."
-msgstr ""
-
-#. type: cindex
-#: doc/contributing.texi:277
-#, no-wrap
-msgid "formatting code"
-msgstr ""
-
-#. type: cindex
-#: doc/contributing.texi:278
-#, no-wrap
-msgid "coding style"
-msgstr ""
-
-#. type: Plain text
-#: doc/contributing.texi:285
-msgid ""
-"When writing Scheme code, we follow common wisdom among Scheme programmers.  "
-"In general, we follow the @url{http://mumble.net/~campbell/scheme/style.txt, "
-"Riastradh's Lisp Style Rules}.  This document happens to describe the "
-"conventions mostly used in Guile’s code too.  It is very thoughtful and well "
-"written, so please do read it."
-msgstr ""
-
-#. type: Plain text
-#: doc/contributing.texi:292
-msgid ""
-"Some special forms introduced in Guix, such as the @code{substitute*} macro, "
-"have special indentation rules.  These are defined in the "
-"@file{.dir-locals.el} file, which Emacs automatically uses.  Also note that "
-"Emacs-Guix provides @code{guix-devel-mode} mode that indents and highlights "
-"Guix code properly (@pxref{Development,,, emacs-guix, The Emacs-Guix "
-"Reference Manual})."
-msgstr ""
-
-#. type: cindex
-#: doc/contributing.texi:293
-#, no-wrap
-msgid "indentation, of code"
-msgstr ""
-
-#. type: cindex
-#: doc/contributing.texi:294
-#, no-wrap
-msgid "formatting, of code"
-msgstr ""
-
-#. type: Plain text
-#: doc/contributing.texi:297
-msgid ""
-"If you do not use Emacs, please make sure to let your editor knows these "
-"rules.  To automatically indent a package definition, you can also run:"
-msgstr ""
-
-#. type: example
-#: doc/contributing.texi:300
-#, no-wrap
-msgid "./etc/indent-code.el gnu/packages/@var{file}.scm @var{package}\n"
-msgstr ""
-
-#. type: Plain text
-#: doc/contributing.texi:306
-msgid ""
-"This automatically indents the definition of @var{package} in "
-"@file{gnu/packages/@var{file}.scm} by running Emacs in batch mode.  To "
-"indent a whole file, omit the second argument:"
-msgstr ""
-
-#. type: example
-#: doc/contributing.texi:309
-#, no-wrap
-msgid "./etc/indent-code.el gnu/services/@var{file}.scm\n"
-msgstr ""
-
-#. type: Plain text
-#: doc/contributing.texi:314
-msgid ""
-"We require all top-level procedures to carry a docstring.  This requirement "
-"can be relaxed for simple private procedures in the @code{(guix build "
-"@dots{})} name space, though."
-msgstr ""
-
-#. type: Plain text
-#: doc/contributing.texi:317
-msgid ""
-"Procedures should not have more than four positional parameters.  Use "
-"keyword parameters for procedures that take more than four parameters."
-msgstr ""
-
-#. type: Plain text
-#: doc/contributing.texi:326
-msgid ""
-"Development is done using the Git distributed version control system.  Thus, "
-"access to the repository is not strictly necessary.  We welcome "
-"contributions in the form of patches as produced by @code{git format-patch} "
-"sent to the @email{guix-patches@@gnu.org} mailing list."
-msgstr ""
-
-#. type: Plain text
-#: doc/contributing.texi:333
-msgid ""
-"This mailing list is backed by a Debbugs instance accessible at "
-"@uref{https://bugs.gnu.org/guix-patches}, which allows us to keep track of "
-"submissions.  Each message sent to that mailing list gets a new tracking "
-"number assigned; people can then follow up on the submission by sending "
-"email to @code{@var{NNN}@@debbugs.gnu.org}, where @var{NNN} is the tracking "
-"number (@pxref{Sending a Patch Series})."
-msgstr ""
-
-#. type: Plain text
-#: doc/contributing.texi:337
-msgid ""
-"Please write commit logs in the ChangeLog format (@pxref{Change Logs,,, "
-"standards, GNU Coding Standards}); you can check the commit history for "
-"examples."
-msgstr ""
-
-#. type: Plain text
-#: doc/contributing.texi:340
-msgid ""
-"Before submitting a patch that adds or modifies a package definition, please "
-"run through this check list:"
-msgstr ""
-
-#. type: enumerate
-#: doc/contributing.texi:347
-msgid ""
-"If the authors of the packaged software provide a cryptographic signature "
-"for the release tarball, make an effort to verify the authenticity of the "
-"archive.  For a detached GPG signature file this would be done with the "
-"@code{gpg --verify} command."
-msgstr ""
-
-#. type: enumerate
-#: doc/contributing.texi:351
-msgid ""
-"Take some time to provide an adequate synopsis and description for the "
-"package.  @xref{Synopses and Descriptions}, for some guidelines."
-msgstr ""
-
-#. type: enumerate
-#: doc/contributing.texi:356
-msgid ""
-"Run @code{guix lint @var{package}}, where @var{package} is the name of the "
-"new or modified package, and fix any errors it reports (@pxref{Invoking guix "
-"lint})."
-msgstr ""
-
-#. type: enumerate
-#: doc/contributing.texi:360
-msgid ""
-"Make sure the package builds on your platform, using @code{guix build "
-"@var{package}}."
-msgstr ""
-
-#. type: cindex
-#: doc/contributing.texi:362
-#, no-wrap
-msgid "bundling"
-msgstr ""
-
-#. type: enumerate
-#: doc/contributing.texi:365
-msgid ""
-"Make sure the package does not use bundled copies of software already "
-"available as separate packages."
-msgstr ""
-
-#. type: enumerate
-#: doc/contributing.texi:374
-msgid ""
-"Sometimes, packages include copies of the source code of their dependencies "
-"as a convenience for users.  However, as a distribution, we want to make "
-"sure that such packages end up using the copy we already have in the "
-"distribution, if there is one.  This improves resource usage (the dependency "
-"is built and stored only once), and allows the distribution to make "
-"transverse changes such as applying security updates for a given software "
-"package in a single place and have them affect the whole system---something "
-"that bundled copies prevent."
-msgstr ""
-
-#. type: enumerate
-#: doc/contributing.texi:381
-msgid ""
-"Take a look at the profile reported by @command{guix size} (@pxref{Invoking "
-"guix size}).  This will allow you to notice references to other packages "
-"unwillingly retained.  It may also help determine whether to split the "
-"package (@pxref{Packages with Multiple Outputs}), and which optional "
-"dependencies should be used."
-msgstr ""
-
-#. type: enumerate
-#: doc/contributing.texi:386
-msgid ""
-"For important changes, check that dependent package (if applicable) are not "
-"affected by the change; @code{guix refresh --list-dependent @var{package}} "
-"will help you do that (@pxref{Invoking guix refresh})."
-msgstr ""
-
-#. type: cindex
-#: doc/contributing.texi:388
-#, no-wrap
-msgid "branching strategy"
-msgstr ""
-
-#. type: cindex
-#: doc/contributing.texi:389
-#, no-wrap
-msgid "rebuild scheduling strategy"
-msgstr ""
-
-#. type: enumerate
-#: doc/contributing.texi:392
-msgid ""
-"Depending on the number of dependent packages and thus the amount of "
-"rebuilding induced, commits go to different branches, along these lines:"
-msgstr ""
-
-#. type: item
-#: doc/contributing.texi:394
-#, no-wrap
-msgid "300 dependent packages or less"
-msgstr ""
-
-#. type: table
-#: doc/contributing.texi:396
-msgid "@code{master} branch (non-disruptive changes)."
-msgstr ""
-
-#. type: item
-#: doc/contributing.texi:397
-#, no-wrap
-msgid "between 300 and 1,200 dependent packages"
-msgstr ""
-
-#. type: table
-#: doc/contributing.texi:402
-msgid ""
-"@code{staging} branch (non-disruptive changes).  This branch is intended to "
-"be merged in @code{master} every 3 weeks or so.  Topical changes (e.g., an "
-"update of the GNOME stack) can instead go to a specific branch (say, "
-"@code{gnome-updates})."
-msgstr ""
-
-#. type: item
-#: doc/contributing.texi:403
-#, no-wrap
-msgid "more than 1,200 dependent packages"
-msgstr ""
-
-#. type: table
-#: doc/contributing.texi:407
-msgid ""
-"@code{core-updates} branch (may include major and potentially disruptive "
-"changes).  This branch is intended to be merged in @code{master} every 2.5 "
-"months or so."
-msgstr ""
-
-#. type: enumerate
-#: doc/contributing.texi:414
-msgid ""
-"All these branches are tracked by our build farm and merged into "
-"@code{master} once everything has been successfully built.  This allows us "
-"to fix issues before they hit users, and to reduce the window during which "
-"pre-built binaries are not available."
-msgstr ""
-
-#. type: cindex
-#: doc/contributing.texi:416
-#, no-wrap
-msgid "determinism, of build processes"
-msgstr ""
-
-#. type: cindex
-#: doc/contributing.texi:417
-#, no-wrap
-msgid "reproducible builds, checking"
-msgstr ""
-
-#. type: enumerate
-#: doc/contributing.texi:421
-msgid ""
-"Check whether the package's build process is deterministic.  This typically "
-"means checking whether an independent build of the package yields the exact "
-"same result that you obtained, bit for bit."
-msgstr ""
-
-#. type: enumerate
-#: doc/contributing.texi:424
-msgid ""
-"A simple way to do that is by building the same package several times in a "
-"row on your machine (@pxref{Invoking guix build}):"
-msgstr ""
-
-#. type: example
-#: doc/contributing.texi:427
-#, no-wrap
-msgid "guix build --rounds=2 my-package\n"
-msgstr ""
-
-#. type: enumerate
-#: doc/contributing.texi:431
-msgid ""
-"This is enough to catch a class of common non-determinism issues, such as "
-"timestamps or randomly-generated output in the build result."
-msgstr ""
-
-#. type: enumerate
-#: doc/contributing.texi:441
-msgid ""
-"Another option is to use @command{guix challenge} (@pxref{Invoking guix "
-"challenge}).  You may run it once the package has been committed and built "
-"by @code{hydra.gnu.org} to check whether it obtains the same result as you "
-"did.  Better yet: Find another machine that can build it and run "
-"@command{guix publish}.  Since the remote build machine is likely different "
-"from yours, this can catch non-determinism issues related to the "
-"hardware---e.g., use of different instruction set extensions---or to the "
-"operating system kernel---e.g., reliance on @code{uname} or @file{/proc} "
-"files."
-msgstr ""
-
-#. type: enumerate
-#: doc/contributing.texi:447
-msgid ""
-"When writing documentation, please use gender-neutral wording when referring "
-"to people, such as @uref{https://en.wikipedia.org/wiki/Singular_they, "
-"singular ``they''@comma{} ``their''@comma{} ``them''}, and so forth."
-msgstr ""
-
-#. type: enumerate
-#: doc/contributing.texi:451
-msgid ""
-"Verify that your patch contains only one set of related changes.  Bundling "
-"unrelated changes together makes reviewing harder and slower."
-msgstr ""
-
-#. type: enumerate
-#: doc/contributing.texi:454
-msgid ""
-"Examples of unrelated changes include the addition of several packages, or a "
-"package update along with fixes to that package."
-msgstr ""
-
-#. type: enumerate
-#: doc/contributing.texi:459
-msgid ""
-"Please follow our code formatting rules, possibly running the "
-"@command{etc/indent-code.el} script to do that automatically for you "
-"(@pxref{Formatting Code})."
-msgstr ""
-
-#. type: Plain text
-#: doc/contributing.texi:469
-msgid ""
-"When posting a patch to the mailing list, use @samp{[PATCH] @dots{}} as a "
-"subject.  You may use your email client or the @command{git send-email} "
-"command (@pxref{Sending a Patch Series}).  We prefer to get patches in plain "
-"text messages, either inline or as MIME attachments.  You are advised to pay "
-"attention if your email client changes anything like line breaks or "
-"indentation which could potentially break the patches."
-msgstr ""
-
-#. type: Plain text
-#: doc/contributing.texi:472
-msgid ""
-"When a bug is resolved, please close the thread by sending an email to "
-"@email{@var{NNN}-done@@debbugs.gnu.org}."
-msgstr ""
-
-#. type: anchor{#1}
-#: doc/contributing.texi:473 doc/contributing.texi:475
-#, no-wrap
-msgid "Sending a Patch Series"
-msgstr ""
-
-#. type: cindex
-#: doc/contributing.texi:475
-#, no-wrap
-msgid "patch series"
-msgstr ""
-
-#. type: code{#1}
-#: doc/contributing.texi:476
-#, no-wrap
-msgid "git send-email"
-msgstr ""
-
-#. type: code{#1}
-#: doc/contributing.texi:477
-#, no-wrap
-msgid "git-send-email"
-msgstr ""
-
-#. type: Plain text
-#: doc/contributing.texi:485
-msgid ""
-"When sending a patch series (e.g., using @code{git send-email}), please "
-"first send one message to @email{guix-patches@@gnu.org}, and then send "
-"subsequent patches to @email{@var{NNN}@@debbugs.gnu.org} to make sure they "
-"are kept together.  See @uref{https://debbugs.gnu.org/Advanced.html, the "
-"Debbugs documentation} for more information."
-msgstr ""
diff --git a/po/doc/guix.fr.po b/po/doc/guix-manual.fr.po
similarity index 55%
rename from po/doc/guix.fr.po
rename to po/doc/guix-manual.fr.po
index c6795833c2..409bb66809 100644
--- a/po/doc/guix.fr.po
+++ b/po/doc/guix-manual.fr.po
@@ -3,10 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
+#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2018-04-10 21:34+0200\n"
+"Report-Msgid-Bugs-To: ludo@gnu.org\n"
+"POT-Creation-Date: 2018-04-29 20:48+0200\n"
 "PO-Revision-Date: 2018-04-13 22:46+0200\n"
 "Last-Translator: Julien Lepiller <julien@lepiller.eu>\n"
 "Language-Team: \n"
@@ -14,7 +16,1279 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"#-#-#-#-#  contributing.fr.po  #-#-#-#-#\n"
 "X-Generator: Poedit 2.0.6\n"
+"#-#-#-#-#  guix.fr.po  #-#-#-#-#\n"
+"X-Generator: Poedit 2.0.6\n"
+
+#. #-#-#-#-#  contributing.pot (guix 0.14.0.4289-6527)  #-#-#-#-#
+#. type: chapter
+#. #-#-#-#-#  guix.pot (guix 0.14.0.4289-6527)  #-#-#-#-#
+#. type: menuentry
+#: doc/contributing.texi:1 doc/contributing.texi:2 doc/guix.texi:106
+#: doc/guix.texi:276
+#, no-wrap
+msgid "Contributing"
+msgstr "Contribuer"
+
+#. type: Plain text
+#: doc/contributing.texi:9
+msgid ""
+"This project is a cooperative effort, and we need your help to make it grow! "
+"Please get in touch with us on @email{guix-devel@@gnu.org} and @code{#guix} "
+"on the Freenode IRC network.  We welcome ideas, bug reports, patches, and "
+"anything that may be helpful to the project.  We particularly welcome help "
+"on packaging (@pxref{Packaging Guidelines})."
+msgstr ""
+"Ce projet est un effort coopératif et nous avons besoin de votre aide pour "
+"le faire grandir ! Contactez-nous sur @email{guix-devel@@gnu.org} et "
+"@code{#guix} sur le réseau IRC Freenode. Nous accueillons les idées, les "
+"rapports de bogues, les correctifs et tout ce qui pourrait aider le projet. "
+"Nous apprécions particulièrement toute aide sur la création de paquets "
+"(@pxref{Consignes d'empaquetage})."
+
+#. type: cindex
+#: doc/contributing.texi:10
+#, no-wrap
+msgid "code of conduct, of contributors"
+msgstr "code de conduite, des contributeurs"
+
+#. type: cindex
+#: doc/contributing.texi:11
+#, no-wrap
+msgid "contributor covenant"
+msgstr "convention de contribution"
+
+#. type: Plain text
+#: doc/contributing.texi:17
+msgid ""
+"We want to provide a warm, friendly, and harassment-free environment, so "
+"that anyone can contribute to the best of their abilities.  To this end our "
+"project uses a ``Contributor Covenant'', which was adapted from @url{http://"
+"contributor-covenant.org/}.  You can find a local version in the @file{CODE-"
+"OF-CONDUCT} file in the source tree."
+msgstr ""
+"Nous souhaitons fournir un environnement chaleureux, amical et sans "
+"harcèlement pour que tout le monde puisse contribuer au mieux de ses "
+"capacités. Pour cela notre projet a une « Convention de contribution » "
+"adaptée de @url{http://contributor-covenant.org/}. Vous pouvez trouver une "
+"version locale dans le fichier @file{CODE-OF-CONDUCT} dans l'arborescence "
+"des sources."
+
+#. type: Plain text
+#: doc/contributing.texi:21
+msgid ""
+"Contributors are not required to use their legal name in patches and on-line "
+"communication; they can use any name or pseudonym of their choice."
+msgstr ""
+"Les contributeurs n'ont pas besoin d'utiliser leur nom légal dans leurs "
+"correctifs et leurs communications en ligne ; ils peuvent utiliser n'importe "
+"quel nom ou pseudonyme de leur choix."
+
+#. #-#-#-#-#  contributing.pot (guix 0.14.0.4289-6527)  #-#-#-#-#
+#. type: section
+#. #-#-#-#-#  guix.pot (guix 0.14.0.4289-6527)  #-#-#-#-#
+#. type: menuentry
+#: doc/contributing.texi:28 doc/contributing.texi:30 doc/contributing.texi:31
+#: doc/guix.texi:282
+#, no-wrap
+msgid "Building from Git"
+msgstr "Construire depuis Git"
+
+#. type: menuentry
+#: doc/contributing.texi:28 doc/guix.texi:282
+msgid "The latest and greatest."
+msgstr ""
+
+#. #-#-#-#-#  contributing.pot (guix 0.14.0.4289-6527)  #-#-#-#-#
+#. type: section
+#. #-#-#-#-#  guix.pot (guix 0.14.0.4289-6527)  #-#-#-#-#
+#. type: menuentry
+#: doc/contributing.texi:28 doc/contributing.texi:102 doc/contributing.texi:103
+#: doc/guix.texi:282
+#, no-wrap
+msgid "Running Guix Before It Is Installed"
+msgstr "Lancer Guix avant qu'il ne soit installé"
+
+#. type: menuentry
+#: doc/contributing.texi:28 doc/guix.texi:282
+msgid "Hacker tricks."
+msgstr "Astuces pour les hackers."
+
+#. #-#-#-#-#  contributing.pot (guix 0.14.0.4289-6527)  #-#-#-#-#
+#. type: section
+#. #-#-#-#-#  guix.pot (guix 0.14.0.4289-6527)  #-#-#-#-#
+#. type: menuentry
+#: doc/contributing.texi:28 doc/contributing.texi:169 doc/contributing.texi:170
+#: doc/guix.texi:282
+#, no-wrap
+msgid "The Perfect Setup"
+msgstr "La configuration parfaite"
+
+#. type: menuentry
+#: doc/contributing.texi:28 doc/guix.texi:282
+msgid "The right tools."
+msgstr "Les bons outils."
+
+#. #-#-#-#-#  contributing.pot (guix 0.14.0.4289-6527)  #-#-#-#-#
+#. type: section
+#. #-#-#-#-#  guix.pot (guix 0.14.0.4289-6527)  #-#-#-#-#
+#. type: menuentry
+#: doc/contributing.texi:28 doc/contributing.texi:228 doc/contributing.texi:229
+#: doc/guix.texi:282 doc/guix.texi:284
+#, no-wrap
+msgid "Coding Style"
+msgstr "Style de code"
+
+#. type: menuentry
+#: doc/contributing.texi:28 doc/guix.texi:282
+msgid "Hygiene of the contributor."
+msgstr "Hygiène du contributeur."
+
+#. #-#-#-#-#  contributing.pot (guix 0.14.0.4289-6527)  #-#-#-#-#
+#. type: section
+#. #-#-#-#-#  guix.pot (guix 0.14.0.4289-6527)  #-#-#-#-#
+#. type: menuentry
+#: doc/contributing.texi:28 doc/contributing.texi:326 doc/contributing.texi:327
+#: doc/guix.texi:282
+#, no-wrap
+msgid "Submitting Patches"
+msgstr "Envoyer des correctifs"
+
+#. type: menuentry
+#: doc/contributing.texi:28 doc/guix.texi:282
+msgid "Share your work."
+msgstr "Partager votre travail."
+
+#. type: Plain text
+#: doc/contributing.texi:35
+msgid ""
+"If you want to hack Guix itself, it is recommended to use the latest version "
+"from the Git repository:"
+msgstr ""
+"Si vous souhaitez travailler sur Guix lui-même, il est recommandé d'utiliser "
+"la dernière version du dépôt Git :"
+
+#. type: example
+#: doc/contributing.texi:38
+#, no-wrap
+msgid "git clone https://git.savannah.gnu.org/git/guix.git\n"
+msgstr "git clone https://git.savannah.gnu.org/git/guix.git\n"
+
+#. type: Plain text
+#: doc/contributing.texi:43
+msgid ""
+"When building Guix from a checkout, the following packages are required in "
+"addition to those mentioned in the installation instructions "
+"(@pxref{Requirements})."
+msgstr ""
+"Lors de la construction de Guix depuis un extrait, les paquets suivants sont "
+"requis en plus de ceux mentionnés dans les instructions d'installation "
+"(@pxref{Prérequis})."
+
+#. type: item
+#: doc/contributing.texi:45
+#, no-wrap
+msgid "@url{http://gnu.org/software/autoconf/, GNU Autoconf};"
+msgstr "@url{http://gnu.org/software/autoconf/, GNU Autoconf};"
+
+#. type: item
+#: doc/contributing.texi:46
+#, no-wrap
+msgid "@url{http://gnu.org/software/automake/, GNU Automake};"
+msgstr "@url{http://gnu.org/software/automake/, GNU Automake};"
+
+#. type: item
+#: doc/contributing.texi:47
+#, no-wrap
+msgid "@url{http://gnu.org/software/gettext/, GNU Gettext};"
+msgstr "@url{http://gnu.org/software/gettext/, GNU Gettext};"
+
+#. type: item
+#: doc/contributing.texi:48
+#, no-wrap
+msgid "@url{http://gnu.org/software/texinfo/, GNU Texinfo};"
+msgstr "@url{http://gnu.org/software/texinfo/, GNU Texinfo};"
+
+#. type: item
+#: doc/contributing.texi:49
+#, no-wrap
+msgid "@url{http://www.graphviz.org/, Graphviz};"
+msgstr "@url{http://www.graphviz.org/, Graphviz};"
+
+#. type: item
+#: doc/contributing.texi:50
+#, no-wrap
+msgid "@url{http://www.gnu.org/software/help2man/, GNU Help2man (optional)}."
+msgstr "@url{http://www.gnu.org/software/help2man/, GNU Help2man (facultatif)}."
+
+#. type: Plain text
+#: doc/contributing.texi:57
+msgid ""
+"The easiest way to set up a development environment for Guix is, of course, "
+"by using Guix! The following command starts a new shell where all the "
+"dependencies and appropriate environment variables are set up to hack on "
+"Guix:"
+msgstr ""
+"La manière la plus simple de configurer un environnement de développement "
+"pour Guix est, bien sûr, d'utiliser Guix ! La commande suivante démarre un "
+"nouveau shell où toutes les dépendances et les variables d'environnements "
+"appropriées sont configurés pour travailler sur Guix :"
+
+#. type: example
+#: doc/contributing.texi:60
+#, no-wrap
+msgid "guix environment guix\n"
+msgstr "guix environment guix\n"
+
+#. type: Plain text
+#: doc/contributing.texi:64
+msgid ""
+"@xref{Invoking guix environment}, for more information on that command.  "
+"Extra dependencies can be added with @option{--ad-hoc}:"
+msgstr ""
+"@xref{Invoquer guix environment}, pour plus d'information sur cette "
+"commande. On peut ajouter des dépendances supplémentaires avec @option{--ad-"
+"hoc} :"
+
+#. type: example
+#: doc/contributing.texi:67
+#, no-wrap
+msgid "guix environment guix --ad-hoc help2man git strace\n"
+msgstr "guix environment guix --ad-hoc help2man git strace\n"
+
+#. type: Plain text
+#: doc/contributing.texi:71
+msgid ""
+"Run @command{./bootstrap} to generate the build system infrastructure using "
+"Autoconf and Automake.  If you get an error like this one:"
+msgstr ""
+"Lancez @command{./bootstrap} pour générer l'infrastructure du système de "
+"construction avec Autoconf et Automake. Si vous avez une erreur comme :"
+
+#. type: example
+#: doc/contributing.texi:74
+#, no-wrap
+msgid "configure.ac:46: error: possibly undefined macro: PKG_CHECK_MODULES\n"
+msgstr "configure.ac:46: error: possibly undefined macro: PKG_CHECK_MODULES\n"
+
+#. type: Plain text
+#: doc/contributing.texi:83
+msgid ""
+"it probably means that Autoconf couldn’t find @file{pkg.m4}, which is "
+"provided by pkg-config.  Make sure that @file{pkg.m4} is available.  The "
+"same holds for the @file{guile.m4} set of macros provided by Guile.  For "
+"instance, if you installed Automake in @file{/usr/local}, it wouldn’t look "
+"for @file{.m4} files in @file{/usr/share}.  In that case, you have to invoke "
+"the following command:"
+msgstr ""
+"cela signifie probablement qu'Autoconf n'a pas pu trouver @file{pkg.m4} qui "
+"est fournit par pkg-config. Assurez-vous que @file{pkg.m4} est disponible. "
+"C'est aussi vrai pour l'ensemble de macros de @file{guile.m4} fournies par "
+"Guile. Par exemple, si vous avez installé Automake dans @file{/usr/local}, "
+"il ne cherchera pas les fichiers @file{.m4} dans @file{/usr/share}. Dans ce "
+"case vous devez invoquer la commande suivante :"
+
+#. type: example
+#: doc/contributing.texi:86
+#, no-wrap
+msgid "export ACLOCAL_PATH=/usr/share/aclocal\n"
+msgstr "export ACLOCAL_PATH=/usr/share/aclocal\n"
+
+#. type: Plain text
+#: doc/contributing.texi:90
+msgid ""
+"@xref{Macro Search Path,,, automake, The GNU Automake Manual}, for more "
+"information."
+msgstr ""
+"@xref{Macro Search Path,,, automake, The GNU Automake Manual}, pour plus "
+"d'information."
+
+#. type: Plain text
+#: doc/contributing.texi:95
+msgid ""
+"Then, run @command{./configure} as usual.  Make sure to pass @code{--"
+"localstatedir=@var{directory}} where @var{directory} is the "
+"@code{localstatedir} value used by your current installation (@pxref{The "
+"Store}, for information about this)."
+msgstr ""
+"Ensuite, lancez @command{./configure} comme d'habitude. Assurez-vous de "
+"passer @code{--localstatedir=@var{directory}} où @var{directory} est la "
+"valeur @code{localstatedir} utilisée par votre installation actuelle "
+"(@pxref{Le dépôt} pour plus d'informations à ce propos)."
+
+#. type: Plain text
+#: doc/contributing.texi:100
+msgid ""
+"Finally, you have to invoke @code{make check} to run tests (@pxref{Running "
+"the Test Suite}).  If anything fails, take a look at installation "
+"instructions (@pxref{Installation})  or send a message to the @email{guix-"
+"devel@@gnu.org, mailing list}."
+msgstr ""
+"Finalement, vous devez invoquer @code{make check} pour lancer les tests "
+"(@pxref{Lancer la suite de tests}). Si quelque chose échoue, jetez un œil "
+"aux instructions d'installation (@pxref{Installation}) ou envoyez un message "
+"à la list @email{guix-devel@@gnu.org}."
+
+#. type: Plain text
+#: doc/contributing.texi:109
+msgid ""
+"In order to keep a sane working environment, you will find it useful to test "
+"the changes made in your local source tree checkout without actually "
+"installing them.  So that you can distinguish between your ``end-user'' hat "
+"and your ``motley'' costume."
+msgstr ""
+"Pour garder un environnement de travail sain, il est utile de tester les "
+"changement localement sans les installer pour de vrai. Pour pouvoir "
+"distinguer votre rôle « d'utilisateur final » de celui parfois haut en "
+"couleur de « développeur »."
+
+#. type: Plain text
+#: doc/contributing.texi:117
+msgid ""
+"To that end, all the command-line tools can be used even if you have not run "
+"@code{make install}.  To do that, prefix each command with @command{./pre-"
+"inst-env} (the @file{pre-inst-env} script lives in the top build tree of "
+"Guix), as in@footnote{The @option{-E} flag to @command{sudo} guarantees that "
+"@code{GUILE_LOAD_PATH} is correctly set such that @command{guix-daemon} and "
+"the tools it uses can find the Guile modules they need.}:"
+msgstr ""
+"Pour cela, tous les outils en ligne de commande sont utilisables même sans "
+"avoir lancé @code{make install}. Vous devez pour cela préfixer chaque "
+"commande par @command{./pre-inst-env} (le script @file{pre-inst-env} se "
+"trouve dans le répertoire de plus haut niveau de l'arborescence des sources "
+"de Guix) comme cela@footnote{L'option @option{-E} de @command{sudo} garantie "
+"que @code{GUILE_LOAD_PATH} est bien paramétré pour @command{guix-daemon} et "
+"les outils qu'il utilise puissent trouver les modules Guile dont ils ont "
+"besoin.} :"
+
+#. type: example
+#: doc/contributing.texi:121
+#, no-wrap
+msgid ""
+"$ sudo -E ./pre-inst-env guix-daemon --build-users-group=guixbuild\n"
+"$ ./pre-inst-env guix build hello\n"
+msgstr ""
+"$ sudo -E ./pre-inst-env guix-daemon --build-users-group=guixbuild\n"
+"$ ./pre-inst-env guix build hello\n"
+
+#. type: Plain text
+#: doc/contributing.texi:125
+msgid "Similarly, for a Guile session using the Guix modules:"
+msgstr "De même, pour une session Guile qui utilise les modules Guix :"
+
+#. type: example
+#: doc/contributing.texi:128
+#, no-wrap
+msgid ""
+"$ ./pre-inst-env guile -c '(use-modules (guix utils)) (pk (%current-system))'\n"
+"\n"
+msgstr ""
+"$ ./pre-inst-env guile -c '(use-modules (guix utils)) (pk (%current-system))'\n"
+"\n"
+
+#. type: example
+#: doc/contributing.texi:130
+#, no-wrap
+msgid ";;; (\"x86_64-linux\")\n"
+msgstr ";;; (\"x86_64-linux\")\n"
+
+#. type: cindex
+#: doc/contributing.texi:133
+#, no-wrap
+msgid "REPL"
+msgstr "REPL"
+
+#. type: cindex
+#: doc/contributing.texi:134
+#, no-wrap
+msgid "read-eval-print loop"
+msgstr "read-eval-print loop"
+
+#. type: Plain text
+#: doc/contributing.texi:137
+msgid ""
+"@dots{} and for a REPL (@pxref{Using Guile Interactively,,, guile, Guile "
+"Reference Manual}):"
+msgstr ""
+"@dots{} et pour un REPL (@pxref{Using Guile Interactively,,, guile, Guile "
+"Reference Manual})"
+
+#. type: example
+#: doc/contributing.texi:152
+#, no-wrap
+msgid ""
+"$ ./pre-inst-env guile\n"
+"scheme@@(guile-user)> ,use(guix)\n"
+"scheme@@(guile-user)> ,use(gnu)\n"
+"scheme@@(guile-user)> (define snakes\n"
+"                       (fold-packages\n"
+"                         (lambda (package lst)\n"
+"                           (if (string-prefix? \"python\"\n"
+"                                               (package-name package))\n"
+"                               (cons package lst)\n"
+"                               lst))\n"
+"                         '()))\n"
+"scheme@@(guile-user)> (length snakes)\n"
+"$1 = 361\n"
+msgstr ""
+"$ ./pre-inst-env guile\n"
+"scheme@@(guile-user)> ,use(guix)\n"
+"scheme@@(guile-user)> ,use(gnu)\n"
+"scheme@@(guile-user)> (define snakes\n"
+"                       (fold-packages\n"
+"                         (lambda (package lst)\n"
+"                           (if (string-prefix? \"python\"\n"
+"                                               (package-name package))\n"
+"                               (cons package lst)\n"
+"                               lst))\n"
+"                         '()))\n"
+"scheme@@(guile-user)> (length snakes)\n"
+"$1 = 361\n"
+
+#. type: Plain text
+#: doc/contributing.texi:156
+msgid ""
+"The @command{pre-inst-env} script sets up all the environment variables "
+"necessary to support this, including @env{PATH} and @env{GUILE_LOAD_PATH}."
+msgstr ""
+"Le script @command{pre-inst-env} paramètre toutes les variables "
+"d'environnement nécessaires, dont @env{PATH} et @env{GUILE_LOAD_PATH}."
+
+#. type: Plain text
+#: doc/contributing.texi:167
+msgid ""
+"Note that @command{./pre-inst-env guix pull} does @emph{not} upgrade the "
+"local source tree; it simply updates the @file{~/.config/guix/latest} "
+"symlink (@pxref{Invoking guix pull}).  Run @command{git pull} instead if you "
+"want to upgrade your local source tree.@footnote{If you would like to set up "
+"@command{guix} to use your Git checkout, you can point the @file{~/.config/"
+"guix/latest} symlink to your Git checkout directory.  If you are the sole "
+"user of your system, you may also consider pointing the @file{/root/.config/"
+"guix/latest} symlink to point to @file{~/.config/guix/latest}; this way it "
+"will always use the same @command{guix} as your user does.}"
+msgstr ""
+"Remarquez que @command{./pre-inst-env guix pull} ne met @emph{pas} à jour "
+"l'arborescence des sources locale ; il met seulement à jour le lien "
+"symbolique @file{~/.config/guix/latest} (@pxref{Invoquer guix pull}). Lancez "
+"@command{git pull} à la place si vous voulez mettre à jour votre "
+"arborescence des sources locale@footnote{Si vous voulez paramétrer "
+"@command{guix} pour qu'il utilise votre dépôt Git, vous pouvez faire pointer "
+"le lien symbolique @file{~/.config/guix/latest} vers le répertoire contenant "
+"ce dépôt. Si vous le seul utilisateur du système, vous pouvez aussi "
+"considérer faire pointer le lien symbolique @file{/root/.config/guix/latest} "
+"vers @file{~/.config/guix/latest} ; comme ça root aura toujours la même "
+"commande @command{guix} que votre utilisateur}."
+
+#. type: Plain text
+#: doc/contributing.texi:177
+msgid ""
+"The Perfect Setup to hack on Guix is basically the perfect setup used for "
+"Guile hacking (@pxref{Using Guile in Emacs,,, guile, Guile Reference "
+"Manual}).  First, you need more than an editor, you need @url{http://www.gnu."
+"org/software/emacs, Emacs}, empowered by the wonderful @url{http://nongnu."
+"org/geiser/, Geiser}."
+msgstr ""
+"La configuration parfaite pour travailler sur Guix est simplement la "
+"configuration parfaite pour travailler en Guile (@pxref{Using Guile in "
+"Emacs,,, guile, Guile Reference Manual}). Tout d'abord, vous avez besoin de "
+"mieux qu'un éditeur de texte, vous avez besoin de @url{http://www.gnu.org/"
+"software/emacs, Emacs}, amélioré par le superbe @url{http://nongnu.org/"
+"geiser/, Geiser}."
+
+#. type: Plain text
+#: doc/contributing.texi:185
+msgid ""
+"Geiser allows for interactive and incremental development from within Emacs: "
+"code compilation and evaluation from within buffers, access to on-line "
+"documentation (docstrings), context-sensitive completion, @kbd{M-.} to jump "
+"to an object definition, a REPL to try out your code, and more "
+"(@pxref{Introduction,,, geiser, Geiser User Manual}).  For convenient Guix "
+"development, make sure to augment Guile’s load path so that it finds source "
+"files from your checkout:"
+msgstr ""
+"Geiser permet le développement interactif et incrémental depuis Emacs : la "
+"compilation du code et son évaluation depuis les buffers, l'accès à la "
+"documentation en ligne (docstrings), la complétion sensible au contexte, "
+"@kbd{M-.} pour sauter à la définition d'un objet, un REPL pour tester votre "
+"code, et bien plus (@pxref{Introduction,,, geiser, Geiser User Manual}). "
+"Pour travailler confortablement sur Guix, assurez-vous de modifier le chemin "
+"de chargement de Guile pour qu'il trouve les fichiers source de votre dépôt :"
+
+#. type: lisp
+#: doc/contributing.texi:190
+#, no-wrap
+msgid ""
+";; @r{Assuming the Guix checkout is in ~/src/guix.}\n"
+"(with-eval-after-load 'geiser-guile\n"
+"  (add-to-list 'geiser-guile-load-path \"~/src/guix\"))\n"
+msgstr ""
+";; @r{Si l'extrait est dans ~/src/guix.}\n"
+"(with-eval-after-load 'geiser-guile\n"
+"  (add-to-list 'geiser-guile-load-path \"~/src/guix\"))\n"
+
+#. type: Plain text
+#: doc/contributing.texi:198
+msgid ""
+"To actually edit the code, Emacs already has a neat Scheme mode.  But in "
+"addition to that, you must not miss @url{http://www.emacswiki.org/emacs/"
+"ParEdit, Paredit}.  It provides facilities to directly operate on the syntax "
+"tree, such as raising an s-expression or wrapping it, swallowing or "
+"rejecting the following s-expression, etc."
+msgstr ""
+
+#. type: cindex
+#: doc/contributing.texi:199
+#, no-wrap
+msgid "code snippets"
+msgstr "extraits de code"
+
+#. type: cindex
+#: doc/contributing.texi:200
+#, no-wrap
+msgid "templates"
+msgstr "modèles"
+
+#. type: cindex
+#: doc/contributing.texi:201
+#, no-wrap
+msgid "reducing boilerplate"
+msgstr "réduire la quantité de code commun"
+
+#. type: Plain text
+#: doc/contributing.texi:208
+msgid ""
+"We also provide templates for common git commit messages and package "
+"definitions in the @file{etc/snippets} directory.  These templates can be "
+"used with @url{http://joaotavora.github.io/yasnippet/, YASnippet} to expand "
+"short trigger strings to interactive text snippets.  You may want to add the "
+"snippets directory to the @var{yas-snippet-dirs} variable in Emacs."
+msgstr ""
+"Nous fournissons aussi des modèles pour les messages de commit git communs "
+"et les définitions de paquets dans le répertoire @file{etc/snippets}. Ces "
+"modèles s'utilisent avec @url{http://joaotavora.github.io/yasnippet/, "
+"YASnippet} pour développer des chaînes courtes de déclenchement en extraits "
+"de texte interactifs. Vous pouvez ajouter le répertoire des modèles dans la "
+"variables @var{yas-snippet-dirs} d'Emacs."
+
+#. type: lisp
+#: doc/contributing.texi:213
+#, no-wrap
+msgid ""
+";; @r{Assuming the Guix checkout is in ~/src/guix.}\n"
+"(with-eval-after-load 'yasnippet\n"
+"  (add-to-list 'yas-snippet-dirs \"~/src/guix/etc/snippets\"))\n"
+msgstr ""
+";; @r{Si l'extrait est dans ~/src/guix.}\n"
+"(with-eval-after-load 'yasnippet\n"
+"  (add-to-list 'yas-snippet-dirs \"~/src/guix/etc/snippets\"))\n"
+
+#. type: Plain text
+#: doc/contributing.texi:220
+msgid ""
+"The commit message snippets depend on @url{https://magit.vc/, Magit} to "
+"display staged files.  When editing a commit message type @code{add} "
+"followed by @kbd{TAB} to insert a commit message template for adding a "
+"package; type @code{update} followed by @kbd{TAB} to insert a template for "
+"updating a package."
+msgstr ""
+"Les extraits de messages de commit dépendent de @url{https://magit.vc/, "
+"Magit} pour afficher les fichiers sélectionnés. Lors de la modification d'un "
+"message de commit, tapez @code{add} suivi de @kbd{TAB} pour insérer un "
+"modèle de message de commit pour ajouter un paquet ; tapez @code{update} "
+"suivi de @kbd{TAB} pour insérer un modèle pour la mise à jour d'un paquet."
+
+#. type: Plain text
+#: doc/contributing.texi:226
+msgid ""
+"The main snippet for @code{scheme-mode} is triggered by typing "
+"@code{package...} followed by @kbd{TAB}.  This snippet also inserts the "
+"trigger string @code{origin...}, which can be expanded further.  The "
+"@code{origin} snippet in turn may insert other trigger strings ending on "
+"@code{...}, which also can be expanded further."
+msgstr ""
+"L'extrait principal pour @code{scheme-mode} est lancé en tapant "
+"@code{package…} suivi par @kbd{TAB}. Cet extrait insère aussi la chaîne de "
+"déclenchement @code{origin…}, qui peut aussi être étendue. L'extrait "
+"@code{origin} lui-même peut aussi insérer des chaînes de déclenchement qui "
+"finissent sur @code{…}, qui peuvent aussi être étendues."
+
+#. type: Plain text
+#: doc/contributing.texi:234
+msgid ""
+"In general our code follows the GNU Coding Standards (@pxref{Top,,, "
+"standards, GNU Coding Standards}).  However, they do not say much about "
+"Scheme, so here are some additional rules."
+msgstr ""
+"En général notre code suit le Standard de Code GNU (@pxref{Top,,, standards, "
+"GNU Coding Standards}). Cependant, il ne parle pas beaucoup de Scheme, donc "
+"voici quelques règles supplémentaires."
+
+#. #-#-#-#-#  contributing.pot (guix 0.14.0.4289-6527)  #-#-#-#-#
+#. type: subsection
+#. #-#-#-#-#  guix.pot (guix 0.14.0.4289-6527)  #-#-#-#-#
+#. type: menuentry
+#: doc/contributing.texi:240 doc/contributing.texi:242
+#: doc/contributing.texi:243 doc/guix.texi:289
+#, no-wrap
+msgid "Programming Paradigm"
+msgstr "Paradigme de programmation"
+
+#. type: menuentry
+#: doc/contributing.texi:240 doc/guix.texi:289
+msgid "How to compose your elements."
+msgstr "Comment composer vos éléments."
+
+#. #-#-#-#-#  contributing.pot (guix 0.14.0.4289-6527)  #-#-#-#-#
+#. type: subsection
+#. #-#-#-#-#  guix.pot (guix 0.14.0.4289-6527)  #-#-#-#-#
+#. type: menuentry
+#: doc/contributing.texi:240 doc/contributing.texi:249
+#: doc/contributing.texi:250 doc/guix.texi:289
+#, no-wrap
+msgid "Modules"
+msgstr "Modules"
+
+#. type: menuentry
+#: doc/contributing.texi:240 doc/guix.texi:289
+msgid "Where to store your code?"
+msgstr "Où stocker votre code ?"
+
+#. #-#-#-#-#  contributing.pot (guix 0.14.0.4289-6527)  #-#-#-#-#
+#. type: subsection
+#. #-#-#-#-#  guix.pot (guix 0.14.0.4289-6527)  #-#-#-#-#
+#. type: menuentry
+#: doc/contributing.texi:240 doc/contributing.texi:260
+#: doc/contributing.texi:261 doc/guix.texi:289
+#, no-wrap
+msgid "Data Types and Pattern Matching"
+msgstr "Types de données et reconnaissance de motif"
+
+#. type: menuentry
+#: doc/contributing.texi:240 doc/guix.texi:289
+msgid "Implementing data structures."
+msgstr "Implémenter des structures de données."
+
+#. #-#-#-#-#  contributing.pot (guix 0.14.0.4289-6527)  #-#-#-#-#
+#. type: subsection
+#. #-#-#-#-#  guix.pot (guix 0.14.0.4289-6527)  #-#-#-#-#
+#. type: menuentry
+#: doc/contributing.texi:240 doc/contributing.texi:274
+#: doc/contributing.texi:275 doc/guix.texi:289
+#, no-wrap
+msgid "Formatting Code"
+msgstr "Formatage du code"
+
+#. type: menuentry
+#: doc/contributing.texi:240 doc/guix.texi:289
+msgid "Writing conventions."
+msgstr "Conventions d'écriture."
+
+#. type: Plain text
+#: doc/contributing.texi:248
+msgid ""
+"Scheme code in Guix is written in a purely functional style.  One exception "
+"is code that involves input/output, and procedures that implement low-level "
+"concepts, such as the @code{memoize} procedure."
+msgstr ""
+"Le code Scheme dans Guix est écrit dans un style purement fonctionnel. Le "
+"code qui s'occupe des entrées-sorties est une exception ainsi que les "
+"procédures qui implémentent des concepts bas-niveau comme la procédure "
+"@code{memoize}."
+
+#. type: Plain text
+#: doc/contributing.texi:256
+msgid ""
+"Guile modules that are meant to be used on the builder side must live in the "
+"@code{(guix build @dots{})} name space.  They must not refer to other Guix "
+"or GNU modules.  However, it is OK for a ``host-side'' module to use a build-"
+"side module."
+msgstr ""
+"Les modules Guile qui sont sensés être utilisés du côté de la construction "
+"doivent se trouver dans l'espace de nom @code{(guix build @dots{})}. Ils ne "
+"doivent pas se référer à d'autres modules Guix ou GNU. Cependant il est "
+"correct pour un module « côté hôte » de dépendre d'un module coté "
+"construction."
+
+#. type: Plain text
+#: doc/contributing.texi:259
+msgid ""
+"Modules that deal with the broader GNU system should be in the @code{(gnu "
+"@dots{})} name space rather than @code{(guix @dots{})}."
+msgstr ""
+"Les modules qui s'occupent du système GNU général devraient se trouver dans "
+"l'espace de nom @code{(gnu @dots{})} plutôt que @code{(guix @dots{})}."
+
+#. type: Plain text
+#: doc/contributing.texi:268
+msgid ""
+"The tendency in classical Lisp is to use lists to represent everything, and "
+"then to browse them ``by hand'' using @code{car}, @code{cdr}, @code{cadr}, "
+"and co.  There are several problems with that style, notably the fact that "
+"it is hard to read, error-prone, and a hindrance to proper type error "
+"reports."
+msgstr ""
+"La tendance en Lisp classique est d'utiliser des listes pour tout "
+"représenter et de naviguer dedans « à la main ( avec @code{car}, @code{cdr}, "
+"@code{cadr} et compagnie. Il y a plusieurs problèmes avec ce style, "
+"notamment le fait qu'il soit dur à lire, source d'erreur et un obstacle aux "
+"rapports d'erreur bien typés."
+
+#. type: Plain text
+#: doc/contributing.texi:273
+msgid ""
+"Guix code should define appropriate data types (for instance, using "
+"@code{define-record-type*}) rather than abuse lists.  In addition, it should "
+"use pattern matching, via Guile’s @code{(ice-9 match)} module, especially "
+"when matching lists."
+msgstr ""
+"Le code de Guix devrait définir des types de données appropriées (par "
+"exemple, avec @code{define-record-type*}) plutôt que d'abuser des listes. En "
+"plus, il devrait utiliser la recherche de motifs, via le module Guile "
+"@code{(ice-9 match)}, surtout pour rechercher dans des listes."
+
+#. type: cindex
+#: doc/contributing.texi:277
+#, no-wrap
+msgid "formatting code"
+msgstr "formater le code"
+
+#. type: cindex
+#: doc/contributing.texi:278
+#, no-wrap
+msgid "coding style"
+msgstr "style de code"
+
+#. type: Plain text
+#: doc/contributing.texi:285
+msgid ""
+"When writing Scheme code, we follow common wisdom among Scheme programmers.  "
+"In general, we follow the @url{http://mumble.net/~campbell/scheme/style.txt, "
+"Riastradh's Lisp Style Rules}.  This document happens to describe the "
+"conventions mostly used in Guile’s code too.  It is very thoughtful and well "
+"written, so please do read it."
+msgstr ""
+"Lorsque nous écrivons du code Scheme, nous suivons la sagesse commune aux "
+"programmeurs Scheme. En général, nous suivons les @url{http://mumble.net/"
+"~campbell/scheme/style.txt, règles de style de Riastradh}. Ce document "
+"décrit aussi les conventions utilisées dans le code de Guile. Il est bien "
+"pensé et bien écrit, alors n'hésitez pas à le lire."
+
+#. type: Plain text
+#: doc/contributing.texi:292
+msgid ""
+"Some special forms introduced in Guix, such as the @code{substitute*} macro, "
+"have special indentation rules.  These are defined in the @file{.dir-locals."
+"el} file, which Emacs automatically uses.  Also note that Emacs-Guix "
+"provides @code{guix-devel-mode} mode that indents and highlights Guix code "
+"properly (@pxref{Development,,, emacs-guix, The Emacs-Guix Reference "
+"Manual})."
+msgstr ""
+"Certaines formes spéciales introduites dans Guix comme la macro "
+"@code{substitute*} ont des règles d'indentation spécifiques. Elles sont "
+"définies dans le fichier @file{.dir-locals.el} qu'Emacs utilise "
+"automatiquement. Remarquez aussi qu'Emacs-Guix fournit le mode @code{guix-"
+"devel-mode} qui indente et colore le code Guix correctement "
+"(@pxref{Development,,, emacs-guix, The Emacs-Guix Reference Manual})."
+
+#. type: cindex
+#: doc/contributing.texi:293
+#, no-wrap
+msgid "indentation, of code"
+msgstr "indentation, du code"
+
+#. type: cindex
+#: doc/contributing.texi:294
+#, no-wrap
+msgid "formatting, of code"
+msgstr "formatage, du code"
+
+#. type: Plain text
+#: doc/contributing.texi:297
+msgid ""
+"If you do not use Emacs, please make sure to let your editor knows these "
+"rules.  To automatically indent a package definition, you can also run:"
+msgstr ""
+"Si vous n'utilisez pas Emacs, assurez-vous que votre éditeur connaisse ces "
+"règles. Pour indenter automatiquement une définition de paquet, vous pouvez "
+"aussi lancer :"
+
+#. type: example
+#: doc/contributing.texi:300
+#, no-wrap
+msgid "./etc/indent-code.el gnu/packages/@var{file}.scm @var{package}\n"
+msgstr "./etc/indent-code.el gnu/packages/@var{file}.scm @var{package}\n"
+
+#. type: Plain text
+#: doc/contributing.texi:306
+msgid ""
+"This automatically indents the definition of @var{package} in @file{gnu/"
+"packages/@var{file}.scm} by running Emacs in batch mode.  To indent a whole "
+"file, omit the second argument:"
+msgstr ""
+"Cela indente automatiquement la définition de @var{package} dans @file{gnu/"
+"packages/@var{file}.scm} en lançant Emacs en mode commande. Pour indenter un "
+"fichier complet, n'indiquez pas de second argument :"
+
+#. type: example
+#: doc/contributing.texi:309
+#, no-wrap
+msgid "./etc/indent-code.el gnu/services/@var{file}.scm\n"
+msgstr "./etc/indent-code.el gnu/services/@var{file}.scm\n"
+
+#. type: cindex
+#: doc/contributing.texi:311
+#, no-wrap
+msgid "Vim, Scheme code editing"
+msgstr ""
+
+#. type: Plain text
+#: doc/contributing.texi:317
+msgid ""
+"If you are editing code with Vim, we recommend that you run @code{:set "
+"autoindent} so that your code is automatically indented as you type.  "
+"Additionally, @uref{https://www.vim.org/scripts/script.php?script_id=3998, "
+"@code{paredit.vim}} may help you deal with all these parentheses."
+msgstr ""
+
+#. type: Plain text
+#: doc/contributing.texi:321
+msgid ""
+"We require all top-level procedures to carry a docstring.  This requirement "
+"can be relaxed for simple private procedures in the @code{(guix build "
+"@dots{})} name space, though."
+msgstr ""
+"Nous demandons que toutes les procédure de premier niveau contiennent une "
+"chaîne de documentation. Ce pré-requis peut être relâché pour les procédures "
+"privées simples dans l'espace de nom @code{(guix build @dots{})} cependant."
+
+#. type: Plain text
+#: doc/contributing.texi:324
+msgid ""
+"Procedures should not have more than four positional parameters.  Use "
+"keyword parameters for procedures that take more than four parameters."
+msgstr ""
+"Les procédures ne devraient pas avoir plus de quatre paramètres positionnés. "
+"Utilisez des paramètres par mot-clefs pour les procédures qui prennent plus "
+"de quatre paramètres."
+
+#. type: Plain text
+#: doc/contributing.texi:333
+msgid ""
+"Development is done using the Git distributed version control system.  Thus, "
+"access to the repository is not strictly necessary.  We welcome "
+"contributions in the form of patches as produced by @code{git format-patch} "
+"sent to the @email{guix-patches@@gnu.org} mailing list."
+msgstr ""
+"Le développement se fait avec le système de contrôle de version Git. Ainsi, "
+"l'accès au dépôt n'est pas strictement nécessaire. Nous accueillons les "
+"contributions sous forme de correctifs produits par @code{git format-patch} "
+"envoyés sur la liste de diffusion @email{guix-patches@@gnu.org}."
+
+#. type: Plain text
+#: doc/contributing.texi:340
+msgid ""
+"This mailing list is backed by a Debbugs instance accessible at "
+"@uref{https://bugs.gnu.org/guix-patches}, which allows us to keep track of "
+"submissions.  Each message sent to that mailing list gets a new tracking "
+"number assigned; people can then follow up on the submission by sending "
+"email to @code{@var{NNN}@@debbugs.gnu.org}, where @var{NNN} is the tracking "
+"number (@pxref{Sending a Patch Series})."
+msgstr ""
+"Cette liste de diffusion est gérée par une instance Debbugs accessible à "
+"l'adresse @uref{https://bugs.gnu.org/guix-patches}, qui nous permet de "
+"suivre les soumissions. Chaque message envoyé à cette liste se voit "
+"attribuer un numéro de suivi ; les gens peuvent ensuite répondre à cette "
+"soumission en envoyant un courriel à @code{@var{NNN}@@debbugs.gnu.org}, où "
+"@var{NNN} est le numéro de suivi (@pxref{Envoyer une série de correctifs})."
+
+#. type: Plain text
+#: doc/contributing.texi:344
+msgid ""
+"Please write commit logs in the ChangeLog format (@pxref{Change Logs,,, "
+"standards, GNU Coding Standards}); you can check the commit history for "
+"examples."
+msgstr ""
+"Veuillez écrire les messages de commit dans le format ChangeLog "
+"(@pxref{Change Logs,,, standards, GNU Coding Standards}) ; vous pouvez "
+"regarder l'historique des commits pour trouver des exemples."
+
+#. type: Plain text
+#: doc/contributing.texi:347
+msgid ""
+"Before submitting a patch that adds or modifies a package definition, please "
+"run through this check list:"
+msgstr ""
+"Avant de soumettre un correctif qui ajoute ou modifie la définition d'un "
+"paquet, veuillez vérifier cette check-list :"
+
+#. type: enumerate
+#: doc/contributing.texi:354
+msgid ""
+"If the authors of the packaged software provide a cryptographic signature "
+"for the release tarball, make an effort to verify the authenticity of the "
+"archive.  For a detached GPG signature file this would be done with the "
+"@code{gpg --verify} command."
+msgstr ""
+"Si les auteurs du paquet logiciel fournissent une signature cryptographique "
+"pour l'archive, faîtes un effort pour vérifier l'authenticité de l'archive. "
+"Pour un fichier de signature GPG détaché, cela se fait avec la commande "
+"@code{gpg --verify}."
+
+#. type: enumerate
+#: doc/contributing.texi:358
+msgid ""
+"Take some time to provide an adequate synopsis and description for the "
+"package.  @xref{Synopses and Descriptions}, for some guidelines."
+msgstr ""
+"Prenez un peu de temps pour fournir un synopsis et une description adéquats "
+"pour le paquet. Voir @xref{Synopsis et descriptions} pour quelques lignes "
+"directrices."
+
+#. type: enumerate
+#: doc/contributing.texi:363
+msgid ""
+"Run @code{guix lint @var{package}}, where @var{package} is the name of the "
+"new or modified package, and fix any errors it reports (@pxref{Invoking guix "
+"lint})."
+msgstr ""
+"Lancez @code{guix lint @var{paquet}}, où @var{paquet} est le nom du nouveau "
+"paquet ou du paquet modifié, et corrigez les erreurs qu'il rapporte "
+"(@pxref{Invoquer guix lint})."
+
+#. type: enumerate
+#: doc/contributing.texi:367
+msgid ""
+"Make sure the package builds on your platform, using @code{guix build "
+"@var{package}}."
+msgstr ""
+"Assurez-vous que le paquet se construise sur votre plate-forme avec "
+"@code{guix build @var{paquet}}."
+
+#. type: cindex
+#: doc/contributing.texi:369
+#, no-wrap
+msgid "bundling"
+msgstr "construction groupée"
+
+#. type: enumerate
+#: doc/contributing.texi:372
+msgid ""
+"Make sure the package does not use bundled copies of software already "
+"available as separate packages."
+msgstr ""
+"Assurez-vous que le paquet n'utilise pas de copie groupée d'un logiciel déjà "
+"disponible dans un paquet séparé."
+
+#. type: enumerate
+#: doc/contributing.texi:381
+msgid ""
+"Sometimes, packages include copies of the source code of their dependencies "
+"as a convenience for users.  However, as a distribution, we want to make "
+"sure that such packages end up using the copy we already have in the "
+"distribution, if there is one.  This improves resource usage (the dependency "
+"is built and stored only once), and allows the distribution to make "
+"transverse changes such as applying security updates for a given software "
+"package in a single place and have them affect the whole system---something "
+"that bundled copies prevent."
+msgstr ""
+"Parfois, les paquets incluent des copie du code source de leurs dépendances "
+"pour le confort de leurs utilisateurs. Cependant, en tant que distribution, "
+"nous voulons nous assurer que ces paquets utilisent bien les copient que "
+"nous avons déjà dans la distribution si elles existent. Cela améliore "
+"l'utilisation des ressources (la dépendance n'est construite et stockée "
+"qu'une seule fois) et permet à la distribution de faire des changements "
+"transversaux comme appliquer des correctifs de sécurité pour un paquet donné "
+"depuis un unique emplacement et qu'ils affectent tout le système, ce "
+"qu'empêchent les copies groupées."
+
+#. type: enumerate
+#: doc/contributing.texi:388
+msgid ""
+"Take a look at the profile reported by @command{guix size} (@pxref{Invoking "
+"guix size}).  This will allow you to notice references to other packages "
+"unwillingly retained.  It may also help determine whether to split the "
+"package (@pxref{Packages with Multiple Outputs}), and which optional "
+"dependencies should be used."
+msgstr ""
+"Regardez le profile rapporté par @command{guix size} (@pxref{Invoking guix "
+"size}). Cela vous permettra de remarquer des références à d'autres paquets "
+"qui ont été retenus. Il peut aussi aider à déterminer s'il faut découper le "
+"paquet (@pxref{Des paquets avec plusieurs résultats}) et quelle dépendance "
+"facultative utiliser."
+
+#. type: enumerate
+#: doc/contributing.texi:393
+msgid ""
+"For important changes, check that dependent package (if applicable) are not "
+"affected by the change; @code{guix refresh --list-dependent @var{package}} "
+"will help you do that (@pxref{Invoking guix refresh})."
+msgstr ""
+"Pour les changements important, vérifiez que les paquets qui en dépendent "
+"(s'ils existent) ne sont pas affectés par le changement ; @code{guix refresh "
+"--list-dependant @var{paquet}} vous aidera (@pxref{Invoquer guix refresh})."
+
+#. type: cindex
+#: doc/contributing.texi:395
+#, no-wrap
+msgid "branching strategy"
+msgstr "stratégie de branche"
+
+#. type: cindex
+#: doc/contributing.texi:396
+#, no-wrap
+msgid "rebuild scheduling strategy"
+msgstr "stratégie de planification des reconstructions"
+
+#. type: enumerate
+#: doc/contributing.texi:399
+msgid ""
+"Depending on the number of dependent packages and thus the amount of "
+"rebuilding induced, commits go to different branches, along these lines:"
+msgstr ""
+"Suivant le nombre de paquets dépendants et donc le nombre de reconstruction "
+"induites, les commits vont vers des branches différentes, suivant ces "
+"principes :"
+
+#. type: item
+#: doc/contributing.texi:401
+#, no-wrap
+msgid "300 dependent packages or less"
+msgstr "300 paquets dépendants ou moins"
+
+#. type: table
+#: doc/contributing.texi:403
+msgid "@code{master} branch (non-disruptive changes)."
+msgstr "branche @code{master} (changements non-disruptifs)."
+
+#. type: item
+#: doc/contributing.texi:404
+#, no-wrap
+msgid "between 300 and 1,200 dependent packages"
+msgstr "entre 300 et 1 200 paquets dépendants"
+
+#. type: table
+#: doc/contributing.texi:409
+msgid ""
+"@code{staging} branch (non-disruptive changes).  This branch is intended to "
+"be merged in @code{master} every 3 weeks or so.  Topical changes (e.g., an "
+"update of the GNOME stack) can instead go to a specific branch (say, "
+"@code{gnome-updates})."
+msgstr ""
+"branche @code{staging} (changemets non-disruptifs). Cette branche devrait "
+"être fusionnées dans @code{master} tous les 3 semaines. Les changements par "
+"thèmes (par exemple une mise à jour de la pile GNOME) peuvent aller dans une "
+"branche spécifique (disons, @code{gnome-updates})."
+
+#. type: item
+#: doc/contributing.texi:410
+#, no-wrap
+msgid "more than 1,200 dependent packages"
+msgstr "plus de 1 200 paquets dépendants"
+
+#. type: table
+#: doc/contributing.texi:414
+msgid ""
+"@code{core-updates} branch (may include major and potentially disruptive "
+"changes).  This branch is intended to be merged in @code{master} every 2.5 "
+"months or so."
+msgstr ""
+"branche @code{core-updates} (peut inclure des changements majeurs et "
+"potentiellement disruptifs). Cette branche devrait être fusionnée dans "
+"@code{master} tous les 2,5 mois environ."
+
+#. type: enumerate
+#: doc/contributing.texi:421
+msgid ""
+"All these branches are tracked by our build farm and merged into "
+"@code{master} once everything has been successfully built.  This allows us "
+"to fix issues before they hit users, and to reduce the window during which "
+"pre-built binaries are not available."
+msgstr ""
+"Toutes ces branches sont gérées par notre ferme de construction et "
+"fusionnées dans @code{master} une fois que tout a été construit "
+"correctement. Cela nous permet de corriger des problèmes avant qu'ils "
+"n'atteignent les utilisateurs et réduit la fenêtre pendant laquelle les "
+"binaires pré-construits ne sont pas disponibles."
+
+#. type: cindex
+#: doc/contributing.texi:423
+#, no-wrap
+msgid "determinism, of build processes"
+msgstr "déterminisme, du processus de construction"
+
+#. type: cindex
+#: doc/contributing.texi:424
+#, no-wrap
+msgid "reproducible builds, checking"
+msgstr "construction reproductibles, vérification"
+
+#. type: enumerate
+#: doc/contributing.texi:428
+msgid ""
+"Check whether the package's build process is deterministic.  This typically "
+"means checking whether an independent build of the package yields the exact "
+"same result that you obtained, bit for bit."
+msgstr ""
+"Vérifiez si le processus de construction du paquet est déterministe. Cela "
+"signifie typiquement vérifier qu'une construction indépendante du paquet "
+"renvoie exactement le même résultat que vous avez obtenu, bit à bit."
+
+#. type: enumerate
+#: doc/contributing.texi:431
+msgid ""
+"A simple way to do that is by building the same package several times in a "
+"row on your machine (@pxref{Invoking guix build}):"
+msgstr ""
+"Une manière simple de le faire est de reconstruire le paquet plusieurs fois "
+"à la suite sur votre machine (@pxref{Invoquer guix build}) :"
+
+#. type: example
+#: doc/contributing.texi:434
+#, no-wrap
+msgid "guix build --rounds=2 my-package\n"
+msgstr "guix build --rounds=2 mon-paquet\n"
+
+#. type: enumerate
+#: doc/contributing.texi:438
+msgid ""
+"This is enough to catch a class of common non-determinism issues, such as "
+"timestamps or randomly-generated output in the build result."
+msgstr ""
+"Cela est suffisant pour trouver une classe de non-déterminisme commune, "
+"comme l'horodatage ou des sorties générées aléatoirement dans le résultat de "
+"la construction."
+
+#. type: enumerate
+#: doc/contributing.texi:448
+msgid ""
+"Another option is to use @command{guix challenge} (@pxref{Invoking guix "
+"challenge}).  You may run it once the package has been committed and built "
+"by @code{hydra.gnu.org} to check whether it obtains the same result as you "
+"did.  Better yet: Find another machine that can build it and run "
+"@command{guix publish}.  Since the remote build machine is likely different "
+"from yours, this can catch non-determinism issues related to the hardware---"
+"e.g., use of different instruction set extensions---or to the operating "
+"system kernel---e.g., reliance on @code{uname} or @file{/proc} files."
+msgstr ""
+"Une autre option consiste à utiliser @command{guix challenge} "
+"(@pxref{Invoquer guix challenge}). Vous pouvez lancer la commande une fois "
+"que les paquets ont été commités et construits par @code{hydra.gnu.org} pour "
+"vérifier s'il obtient le même résultat que vous. Mieux encore : trouvez une "
+"autre machine qui peut le construire et lancez @command{guix publish}. Puis "
+"la machine distante est sûrement différente de la vôtre, cela peut trouver "
+"des problèmes de non-déterminisme liés au matériel — par exemple utiliser "
+"une extension du jeu d'instruction — ou du noyau du système d'exploitation — "
+"par exemple se reposer sur @code{uname} ou les fichiers de @file{/proc}."
+
+#. type: enumerate
+#: doc/contributing.texi:454
+msgid ""
+"When writing documentation, please use gender-neutral wording when referring "
+"to people, such as @uref{https://en.wikipedia.org/wiki/Singular_they, "
+"singular ``they''@comma{} ``their''@comma{} ``them''}, and so forth."
+msgstr ""
+"Lorsque vous écrivez de la documentation, utilisez une formulation au genre "
+"neutre lorsque vous vous référez à des personnes, comme le @uref{https://fr."
+"wikipedia.org/wiki/They_singulier, ``they''@comma{} ``their''@comma{} "
+"``them'' singulier} (en anglais)."
+
+#. type: enumerate
+#: doc/contributing.texi:458
+msgid ""
+"Verify that your patch contains only one set of related changes.  Bundling "
+"unrelated changes together makes reviewing harder and slower."
+msgstr ""
+"Vérifiez que votre correctif contienne seulement un ensemble de changements "
+"liés. Grouper des changements non liés ensemble rend la revue plus difficile "
+"et plus lente."
+
+#. type: enumerate
+#: doc/contributing.texi:461
+msgid ""
+"Examples of unrelated changes include the addition of several packages, or a "
+"package update along with fixes to that package."
+msgstr ""
+"Ajouter plusieurs paquet ou une mise à jour d'un paquet avec des corrections "
+"dans ce paquet sont des exemples de changements sans rapport."
+
+#. type: enumerate
+#: doc/contributing.texi:466
+msgid ""
+"Please follow our code formatting rules, possibly running the @command{etc/"
+"indent-code.el} script to do that automatically for you (@pxref{Formatting "
+"Code})."
+msgstr ""
+"Suivez nos règles de formatage de code, éventuellement en lançant le script "
+"@command{et/indent-code.el} pour le faire automatiquement (@pxref{Formatage "
+"du code})."
+
+#. type: Plain text
+#: doc/contributing.texi:476
+msgid ""
+"When posting a patch to the mailing list, use @samp{[PATCH] @dots{}} as a "
+"subject.  You may use your email client or the @command{git send-email} "
+"command (@pxref{Sending a Patch Series}).  We prefer to get patches in plain "
+"text messages, either inline or as MIME attachments.  You are advised to pay "
+"attention if your email client changes anything like line breaks or "
+"indentation which could potentially break the patches."
+msgstr ""
+"Lorsque vous envoyez un correctif à la liste de diffusion, utilisez "
+"@samp{[PATCH] @dots{}} comme sujet. Vous pouvez utiliser votre client de "
+"courriel ou la commande @command{git send-email} (@pxref{Envoyer une série "
+"de correctifs}). Nous préférons recevoir des correctifs en texte brut, soit "
+"en ligne, soit en pièce-jointe MIME. Nous vous conseillons de faire "
+"attention si votre client de courriel change par exemple les retours à la "
+"ligne ou l'indentation, ce qui peut casser les correctifs."
+
+#. type: Plain text
+#: doc/contributing.texi:479
+msgid ""
+"When a bug is resolved, please close the thread by sending an email to "
+"@email{@var{NNN}-done@@debbugs.gnu.org}."
+msgstr ""
+"Lorsqu'un bogue est résolu, veuillez fermer le fil en envoyant un courriel à "
+"@email{@var{NNN}-done@@debbugs.gnu.org}."
+
+#. type: anchor{#1}
+#: doc/contributing.texi:480 doc/contributing.texi:482
+#, no-wrap
+msgid "Sending a Patch Series"
+msgstr "Envoyer une série de correctifs"
+
+#. type: cindex
+#: doc/contributing.texi:482
+#, no-wrap
+msgid "patch series"
+msgstr "série de correctifs"
+
+#. type: code{#1}
+#: doc/contributing.texi:483
+#, no-wrap
+msgid "git send-email"
+msgstr "git send-email"
+
+#. type: code{#1}
+#: doc/contributing.texi:484
+#, no-wrap
+msgid "git-send-email"
+msgstr "git-send-email"
+
+#. type: Plain text
+#: doc/contributing.texi:492
+msgid ""
+"When sending a patch series (e.g., using @code{git send-email}), please "
+"first send one message to @email{guix-patches@@gnu.org}, and then send "
+"subsequent patches to @email{@var{NNN}@@debbugs.gnu.org} to make sure they "
+"are kept together.  See @uref{https://debbugs.gnu.org/Advanced.html, the "
+"Debbugs documentation} for more information."
+msgstr ""
+"Lorsque vous envoyez une série de correctifs (p.e. avec @code{git send-"
+"email}), envoyez d'abord une premier message à @email{guix-patches@@gnu.org} "
+"puis envoyez le reste des correctifs à @email{@var{NNN}@@debbugs.gnu.org} "
+"pour vous assurer qu'ils seront groupés ensemble. Voyez @uref{https://"
+"debbugs.gnu.org/Advanced.html, la documentation de Debbugs} pour plus "
+"d'informations."
 
 #. type: Plain text
 #: doc/guix.texi:7
@@ -38,46 +1312,74 @@ msgstr "version-fr.texi"
 #. type: copying
 #: doc/guix.texi:51
 msgid ""
-"Copyright @copyright{} 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès@* Copyright @copyright{} 2013, 2014, 2016 Andreas "
-"Enge@* Copyright @copyright{} 2013 Nikita Karetnikov@* Copyright @copyright{} 2014, 2015, 2016 Alex Kost@* Copyright @copyright{} "
-"2015, 2016 Mathieu Lirzin@* Copyright @copyright{} 2014 Pierre-Antoine Rault@* Copyright @copyright{} 2015 Taylan Ulrich Bayırlı/"
-"Kammer@* Copyright @copyright{} 2015, 2016, 2017 Leo Famulari@* Copyright @copyright{} 2015, 2016, 2017, 2018 Ricardo Wurmus@* "
-"Copyright @copyright{} 2016 Ben Woodcroft@* Copyright @copyright{} 2016, 2017, 2018 Chris Marusich@* Copyright @copyright{} 2016, "
-"2017, 2018 Efraim Flashner@* Copyright @copyright{} 2016 John Darrington@* Copyright @copyright{} 2016, 2017 Nils Gillmann@* "
-"Copyright @copyright{} 2016, 2017 Jan Nieuwenhuizen@* Copyright @copyright{} 2016 Julien Lepiller@* Copyright @copyright{} 2016 Alex "
-"ter Weele@* Copyright @copyright{} 2017, 2018 Clément Lassieur@* Copyright @copyright{} 2017 Mathieu Othacehe@* Copyright "
-"@copyright{} 2017 Federico Beffa@* Copyright @copyright{} 2017 Carlo Zancanaro@* Copyright @copyright{} 2017 Thomas Danckaert@* "
-"Copyright @copyright{} 2017 humanitiesNerd@* Copyright @copyright{} 2017 Christopher Allan Webber@* Copyright @copyright{} 2017 "
-"Marius Bakke@* Copyright @copyright{} 2017 Hartmut Goebel@* Copyright @copyright{} 2017 Maxim Cournoyer@* Copyright @copyright{} "
-"2017, 2018 Tobias Geerinckx-Rice@* Copyright @copyright{} 2017 George Clemmer@* Copyright @copyright{} 2017 Andy Wingo@* Copyright "
-"@copyright{} 2017, 2018 Arun Isaac@* Copyright @copyright{} 2017 nee@* Copyright @copyright{} 2018 Rutger Helling@* Copyright "
-"@copyright{} 2018 Oleg Pykhalov@* Copyright @copyright{} 2018 Mike Gerwitz"
+"Copyright @copyright{} 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic "
+"Courtès@* Copyright @copyright{} 2013, 2014, 2016 Andreas Enge@* Copyright "
+"@copyright{} 2013 Nikita Karetnikov@* Copyright @copyright{} 2014, 2015, "
+"2016 Alex Kost@* Copyright @copyright{} 2015, 2016 Mathieu Lirzin@* "
+"Copyright @copyright{} 2014 Pierre-Antoine Rault@* Copyright @copyright{} "
+"2015 Taylan Ulrich Bayırlı/Kammer@* Copyright @copyright{} 2015, 2016, 2017 "
+"Leo Famulari@* Copyright @copyright{} 2015, 2016, 2017, 2018 Ricardo "
+"Wurmus@* Copyright @copyright{} 2016 Ben Woodcroft@* Copyright @copyright{} "
+"2016, 2017, 2018 Chris Marusich@* Copyright @copyright{} 2016, 2017, 2018 "
+"Efraim Flashner@* Copyright @copyright{} 2016 John Darrington@* Copyright "
+"@copyright{} 2016, 2017 Nils Gillmann@* Copyright @copyright{} 2016, 2017 "
+"Jan Nieuwenhuizen@* Copyright @copyright{} 2016 Julien Lepiller@* Copyright "
+"@copyright{} 2016 Alex ter Weele@* Copyright @copyright{} 2017, 2018 Clément "
+"Lassieur@* Copyright @copyright{} 2017 Mathieu Othacehe@* Copyright "
+"@copyright{} 2017 Federico Beffa@* Copyright @copyright{} 2017 Carlo "
+"Zancanaro@* Copyright @copyright{} 2017 Thomas Danckaert@* Copyright "
+"@copyright{} 2017 humanitiesNerd@* Copyright @copyright{} 2017 Christopher "
+"Allan Webber@* Copyright @copyright{} 2017 Marius Bakke@* Copyright "
+"@copyright{} 2017 Hartmut Goebel@* Copyright @copyright{} 2017 Maxim "
+"Cournoyer@* Copyright @copyright{} 2017, 2018 Tobias Geerinckx-Rice@* "
+"Copyright @copyright{} 2017 George Clemmer@* Copyright @copyright{} 2017 "
+"Andy Wingo@* Copyright @copyright{} 2017, 2018 Arun Isaac@* Copyright "
+"@copyright{} 2017 nee@* Copyright @copyright{} 2018 Rutger Helling@* "
+"Copyright @copyright{} 2018 Oleg Pykhalov@* Copyright @copyright{} 2018 Mike "
+"Gerwitz"
 msgstr ""
-"Copyright @copyright{} 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès@* Copyright @copyright{} 2013, 2014, 2016 Andreas "
-"Enge@* Copyright @copyright{} 2013 Nikita Karetnikov@* Copyright @copyright{} 2014, 2015, 2016 Alex Kost@* Copyright @copyright{} "
-"2015, 2016 Mathieu Lirzin@* Copyright @copyright{} 2014 Pierre-Antoine Rault@* Copyright @copyright{} 2015 Taylan Ulrich Bayırlı/"
-"Kammer@* Copyright @copyright{} 2015, 2016, 2017 Leo Famulari@* Copyright @copyright{} 2015, 2016, 2017, 2018 Ricardo Wurmus@* "
-"Copyright @copyright{} 2016 Ben Woodcroft@* Copyright @copyright{} 2016, 2017, 2018 Chris Marusich@* Copyright @copyright{} 2016, "
-"2017, 2018 Efraim Flashner@* Copyright @copyright{} 2016 John Darrington@* Copyright @copyright{} 2016, 2017 Nils Gillmann@* "
-"Copyright @copyright{} 2016, 2017 Jan Nieuwenhuizen@* Copyright @copyright{} 2016 Julien Lepiller@* Copyright @copyright{} 2016 Alex "
-"ter Weele@* Copyright @copyright{} 2017, 2018 Clément Lassieur@* Copyright @copyright{} 2017 Mathieu Othacehe@* Copyright "
-"@copyright{} 2017 Federico Beffa@* Copyright @copyright{} 2017 Carlo Zancanaro@* Copyright @copyright{} 2017 Thomas Danckaert@* "
-"Copyright @copyright{} 2017 humanitiesNerd@* Copyright @copyright{} 2017 Christopher Allan Webber@* Copyright @copyright{} 2017 "
-"Marius Bakke@* Copyright @copyright{} 2017 Hartmut Goebel@* Copyright @copyright{} 2017 Maxim Cournoyer@* Copyright @copyright{} "
-"2017, 2018 Tobias Geerinckx-Rice@* Copyright @copyright{} 2017 George Clemmer@* Copyright @copyright{} 2017 Andy Wingo@* Copyright "
-"@copyright{} 2017, 2018 Arun Isaac@* Copyright @copyright{} 2017 nee@* Copyright @copyright{} 2018 Rutger Helling@* Copyright "
-"@copyright{} 2018 Oleg Pykhalov@* Copyright @copyright{} 2018 Mike Gerwitz"
+"Copyright @copyright{} 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic "
+"Courtès@* Copyright @copyright{} 2013, 2014, 2016 Andreas Enge@* Copyright "
+"@copyright{} 2013 Nikita Karetnikov@* Copyright @copyright{} 2014, 2015, "
+"2016 Alex Kost@* Copyright @copyright{} 2015, 2016 Mathieu Lirzin@* "
+"Copyright @copyright{} 2014 Pierre-Antoine Rault@* Copyright @copyright{} "
+"2015 Taylan Ulrich Bayırlı/Kammer@* Copyright @copyright{} 2015, 2016, 2017 "
+"Leo Famulari@* Copyright @copyright{} 2015, 2016, 2017, 2018 Ricardo "
+"Wurmus@* Copyright @copyright{} 2016 Ben Woodcroft@* Copyright @copyright{} "
+"2016, 2017, 2018 Chris Marusich@* Copyright @copyright{} 2016, 2017, 2018 "
+"Efraim Flashner@* Copyright @copyright{} 2016 John Darrington@* Copyright "
+"@copyright{} 2016, 2017 Nils Gillmann@* Copyright @copyright{} 2016, 2017 "
+"Jan Nieuwenhuizen@* Copyright @copyright{} 2016 Julien Lepiller@* Copyright "
+"@copyright{} 2016 Alex ter Weele@* Copyright @copyright{} 2017, 2018 Clément "
+"Lassieur@* Copyright @copyright{} 2017 Mathieu Othacehe@* Copyright "
+"@copyright{} 2017 Federico Beffa@* Copyright @copyright{} 2017 Carlo "
+"Zancanaro@* Copyright @copyright{} 2017 Thomas Danckaert@* Copyright "
+"@copyright{} 2017 humanitiesNerd@* Copyright @copyright{} 2017 Christopher "
+"Allan Webber@* Copyright @copyright{} 2017 Marius Bakke@* Copyright "
+"@copyright{} 2017 Hartmut Goebel@* Copyright @copyright{} 2017 Maxim "
+"Cournoyer@* Copyright @copyright{} 2017, 2018 Tobias Geerinckx-Rice@* "
+"Copyright @copyright{} 2017 George Clemmer@* Copyright @copyright{} 2017 "
+"Andy Wingo@* Copyright @copyright{} 2017, 2018 Arun Isaac@* Copyright "
+"@copyright{} 2017 nee@* Copyright @copyright{} 2018 Rutger Helling@* "
+"Copyright @copyright{} 2018 Oleg Pykhalov@* Copyright @copyright{} 2018 Mike "
+"Gerwitz"
 
 #. type: copying
 #: doc/guix.texi:58
 msgid ""
-"Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version "
-"1.3 or any later version published by the Free Software Foundation; with no Invariant Sections, no Front-Cover Texts, and no Back-"
-"Cover Texts.  A copy of the license is included in the section entitled ``GNU Free Documentation License''."
+"Permission is granted to copy, distribute and/or modify this document under "
+"the terms of the GNU Free Documentation License, Version 1.3 or any later "
+"version published by the Free Software Foundation; with no Invariant "
+"Sections, no Front-Cover Texts, and no Back-Cover Texts.  A copy of the "
+"license is included in the section entitled ``GNU Free Documentation "
+"License''."
 msgstr ""
-"Vous avez la permission de copier, distribuer ou modifier ce document sous les termes de la Licence GNU Free Documentation, version "
-"1.3 ou toute version ultérieure publiée par la Free Software Foundation ; sans section invariante, texte de couverture et sans texte "
-"de quatrième de couverture. Une copie de la licence est incluse dans la section intitulée « GNU Free Documentation License »."
+"Vous avez la permission de copier, distribuer ou modifier ce document sous "
+"les termes de la Licence GNU Free Documentation, version 1.3 ou toute "
+"version ultérieure publiée par la Free Software Foundation ; sans section "
+"invariante, texte de couverture et sans texte de quatrième de couverture. "
+"Une copie de la licence est incluse dans la section intitulée « GNU Free "
+"Documentation License »."
 
 #. type: dircategory
 #: doc/guix.texi:60
@@ -202,9 +1504,12 @@ msgstr "GNU Guix"
 
 #. type: Plain text
 #: doc/guix.texi:97
-msgid "This document describes GNU Guix version @value{VERSION}, a functional package management tool written for the GNU system."
+msgid ""
+"This document describes GNU Guix version @value{VERSION}, a functional "
+"package management tool written for the GNU system."
 msgstr ""
-"Cette documentation décrit GNU Guix version @value{VERSION}, un outils de gestion de paquets fonctionnel écrit pour le système GNU."
+"Cette documentation décrit GNU Guix version @value{VERSION}, un outils de "
+"gestion de paquets fonctionnel écrit pour le système GNU."
 
 #. type: chapter
 #: doc/guix.texi:106 doc/guix.texi:294 doc/guix.texi:295
@@ -251,7 +1556,7 @@ msgid "Using Guix in Scheme."
 msgstr "Utiliser Guix en Scheme."
 
 #. type: chapter
-#: doc/guix.texi:106 doc/guix.texi:165 doc/guix.texi:5358 doc/guix.texi:5359
+#: doc/guix.texi:106 doc/guix.texi:165 doc/guix.texi:5362 doc/guix.texi:5363
 #, no-wrap
 msgid "Utilities"
 msgstr "Utilitaires"
@@ -262,7 +1567,7 @@ msgid "Package management commands."
 msgstr "Commandes de gestion de paquets."
 
 #. type: chapter
-#: doc/guix.texi:106 doc/guix.texi:190 doc/guix.texi:7977 doc/guix.texi:7978
+#: doc/guix.texi:106 doc/guix.texi:190 doc/guix.texi:7981 doc/guix.texi:7982
 #, no-wrap
 msgid "GNU Distribution"
 msgstr "Distribution GNU"
@@ -272,18 +1577,13 @@ msgstr "Distribution GNU"
 msgid "Software for your friendly GNU system."
 msgstr "Des logiciels pour un système GNU convivial."
 
-#. type: menuentry
-#: doc/guix.texi:106 doc/guix.texi:276
-msgid "Contributing"
-msgstr "Contribuer"
-
 #. type: menuentry
 #: doc/guix.texi:106
 msgid "Your help needed!"
 msgstr "Nous avons besoin de votre aide !"
 
 #. type: chapter
-#: doc/guix.texi:111 doc/guix.texi:22276 doc/guix.texi:22277
+#: doc/guix.texi:111 doc/guix.texi:22338 doc/guix.texi:22339
 #, no-wrap
 msgid "Acknowledgments"
 msgstr "Remerciements"
@@ -294,7 +1594,7 @@ msgid "Thanks!"
 msgstr "Merci !"
 
 #. type: appendix
-#: doc/guix.texi:111 doc/guix.texi:22298 doc/guix.texi:22299
+#: doc/guix.texi:111 doc/guix.texi:22360 doc/guix.texi:22361
 #, no-wrap
 msgid "GNU Free Documentation License"
 msgstr "La licence GNU Free Documentation"
@@ -305,7 +1605,7 @@ msgid "The license of this manual."
 msgstr "La licence de ce manuel."
 
 #. type: unnumbered
-#: doc/guix.texi:111 doc/guix.texi:22304 doc/guix.texi:22305
+#: doc/guix.texi:111 doc/guix.texi:22366 doc/guix.texi:22367
 #, no-wrap
 msgid "Concept Index"
 msgstr "Index des concepts"
@@ -316,7 +1616,7 @@ msgid "Concepts."
 msgstr "Les concepts."
 
 #. type: unnumbered
-#: doc/guix.texi:111 doc/guix.texi:22308 doc/guix.texi:22309
+#: doc/guix.texi:111 doc/guix.texi:22370 doc/guix.texi:22371
 #, no-wrap
 msgid "Programming Index"
 msgstr "Index de programmation"
@@ -365,7 +1665,8 @@ msgid "Testing Guix."
 msgstr "Tester Guix."
 
 #. type: section
-#: doc/guix.texi:123 doc/guix.texi:125 doc/guix.texi:398 doc/guix.texi:743 doc/guix.texi:744
+#: doc/guix.texi:123 doc/guix.texi:125 doc/guix.texi:398 doc/guix.texi:743
+#: doc/guix.texi:744
 #, no-wrap
 msgid "Setting Up the Daemon"
 msgstr "Paramétrer le démon"
@@ -453,7 +1754,8 @@ msgid "Package installation, removal, etc."
 msgstr "Installation, suppression, etc. de paquets."
 
 #. type: section
-#: doc/guix.texi:140 doc/guix.texi:142 doc/guix.texi:1682 doc/guix.texi:2245 doc/guix.texi:2246
+#: doc/guix.texi:140 doc/guix.texi:142 doc/guix.texi:1682 doc/guix.texi:2245
+#: doc/guix.texi:2246
 #, no-wrap
 msgid "Substitutes"
 msgstr "Substituts"
@@ -585,7 +1887,8 @@ msgid "How can you trust that binary blob?"
 msgstr "Comment pouvez-vous avoir confiance en un paquet binaire ?"
 
 #. type: section
-#: doc/guix.texi:158 doc/guix.texi:160 doc/guix.texi:3141 doc/guix.texi:3143 doc/guix.texi:3144
+#: doc/guix.texi:158 doc/guix.texi:160 doc/guix.texi:3141 doc/guix.texi:3143
+#: doc/guix.texi:3144
 #, no-wrap
 msgid "Defining Packages"
 msgstr "Définition des paquets"
@@ -673,1058 +1976,989 @@ msgid "The origin data type."
 msgstr "Le type de données d'origine."
 
 #. type: node
-#: doc/guix.texi:181 doc/guix.texi:5382 doc/guix.texi:5384
+#: doc/guix.texi:181 doc/guix.texi:5386 doc/guix.texi:5388
 #, no-wrap
 msgid "Invoking guix build"
 msgstr "Invoquer guix build"
 
 #. type: menuentry
-#: doc/guix.texi:181 doc/guix.texi:5382
+#: doc/guix.texi:181 doc/guix.texi:5386
 msgid "Building packages from the command line."
 msgstr "Construire des paquets depuis la ligne de commande."
 
 #. type: node
-#: doc/guix.texi:181 doc/guix.texi:5382 doc/guix.texi:5964
+#: doc/guix.texi:181 doc/guix.texi:5386 doc/guix.texi:5968
 #, no-wrap
 msgid "Invoking guix edit"
 msgstr "Invoquer guix edit"
 
 #. type: menuentry
-#: doc/guix.texi:181 doc/guix.texi:5382
+#: doc/guix.texi:181 doc/guix.texi:5386
 msgid "Editing package definitions."
 msgstr "Modifier les définitions de paquets."
 
 #. type: node
-#: doc/guix.texi:181 doc/guix.texi:5382 doc/guix.texi:5990
+#: doc/guix.texi:181 doc/guix.texi:5386 doc/guix.texi:5994
 #, no-wrap
 msgid "Invoking guix download"
 msgstr "Invoquer guix download"
 
 #. type: menuentry
-#: doc/guix.texi:181 doc/guix.texi:5382
+#: doc/guix.texi:181 doc/guix.texi:5386
 msgid "Downloading a file and printing its hash."
 msgstr "Télécharger un fichier et afficher son hash."
 
 #. type: node
-#: doc/guix.texi:181 doc/guix.texi:5382 doc/guix.texi:6043
+#: doc/guix.texi:181 doc/guix.texi:5386 doc/guix.texi:6047
 #, no-wrap
 msgid "Invoking guix hash"
 msgstr "Invoquer guix hash"
 
 #. type: menuentry
-#: doc/guix.texi:181 doc/guix.texi:5382
+#: doc/guix.texi:181 doc/guix.texi:5386
 msgid "Computing the cryptographic hash of a file."
 msgstr "Calculer le hash cryptographique d'un fichier."
 
 #. type: node
-#: doc/guix.texi:181 doc/guix.texi:5382 doc/guix.texi:6105
+#: doc/guix.texi:181 doc/guix.texi:5386 doc/guix.texi:6109
 #, no-wrap
 msgid "Invoking guix import"
 msgstr "Invoquer guix import"
 
 #. type: menuentry
-#: doc/guix.texi:181 doc/guix.texi:5382
+#: doc/guix.texi:181 doc/guix.texi:5386
 msgid "Importing package definitions."
 msgstr "Importer des définitions de paquets."
 
 #. type: node
-#: doc/guix.texi:181 doc/guix.texi:5382 doc/guix.texi:6472
+#: doc/guix.texi:181 doc/guix.texi:5386 doc/guix.texi:6476
 #, no-wrap
 msgid "Invoking guix refresh"
 msgstr "Invoquer guix refresh"
 
 #. type: menuentry
-#: doc/guix.texi:181 doc/guix.texi:5382
+#: doc/guix.texi:181 doc/guix.texi:5386
 msgid "Updating package definitions."
 msgstr "Mettre à jour les définitions de paquets."
 
 #. type: node
-#: doc/guix.texi:181 doc/guix.texi:5382 doc/guix.texi:6719
+#: doc/guix.texi:181 doc/guix.texi:5386 doc/guix.texi:6723
 #, no-wrap
 msgid "Invoking guix lint"
 msgstr "Invoquer guix lint"
 
 #. type: menuentry
-#: doc/guix.texi:181 doc/guix.texi:5382
+#: doc/guix.texi:181 doc/guix.texi:5386
 msgid "Finding errors in package definitions."
 msgstr "Trouver des erreurs dans les définitions de paquets."
 
 #. type: node
-#: doc/guix.texi:181 doc/guix.texi:5382 doc/guix.texi:6810
+#: doc/guix.texi:181 doc/guix.texi:5386 doc/guix.texi:6814
 #, no-wrap
 msgid "Invoking guix size"
 msgstr "Invoquer guix size"
 
 #. type: menuentry
-#: doc/guix.texi:181 doc/guix.texi:5382
+#: doc/guix.texi:181 doc/guix.texi:5386
 msgid "Profiling disk usage."
 msgstr "Profiler l'utilisation du disque."
 
 #. type: node
-#: doc/guix.texi:181 doc/guix.texi:5382 doc/guix.texi:6926
+#: doc/guix.texi:181 doc/guix.texi:5386 doc/guix.texi:6930
 #, no-wrap
 msgid "Invoking guix graph"
 msgstr "Invoquer guix graph"
 
 #. type: menuentry
-#: doc/guix.texi:181 doc/guix.texi:5382
+#: doc/guix.texi:181 doc/guix.texi:5386
 msgid "Visualizing the graph of packages."
 msgstr "Visualiser le graphe des paquets."
 
 #. type: node
-#: doc/guix.texi:181 doc/guix.texi:5382 doc/guix.texi:7105
+#: doc/guix.texi:181 doc/guix.texi:5386 doc/guix.texi:7109
 #, no-wrap
 msgid "Invoking guix environment"
 msgstr "Invoquer guix environment"
 
 #. type: menuentry
-#: doc/guix.texi:181 doc/guix.texi:5382
+#: doc/guix.texi:181 doc/guix.texi:5386
 msgid "Setting up development environments."
 msgstr "Mettre en place des environnements de développement."
 
 #. type: node
-#: doc/guix.texi:181 doc/guix.texi:5382 doc/guix.texi:7424
+#: doc/guix.texi:181 doc/guix.texi:5386 doc/guix.texi:7428
 #, no-wrap
 msgid "Invoking guix publish"
 msgstr "Invoquer guix publish"
 
 #. type: menuentry
-#: doc/guix.texi:181 doc/guix.texi:5382
+#: doc/guix.texi:181 doc/guix.texi:5386
 msgid "Sharing substitutes."
 msgstr "Partager des substituts."
 
 #. type: node
-#: doc/guix.texi:181 doc/guix.texi:5382 doc/guix.texi:7641
+#: doc/guix.texi:181 doc/guix.texi:5386 doc/guix.texi:7645
 #, no-wrap
 msgid "Invoking guix challenge"
 msgstr "Invoquer guix challenge"
 
 #. type: menuentry
-#: doc/guix.texi:181 doc/guix.texi:5382
+#: doc/guix.texi:181 doc/guix.texi:5386
 msgid "Challenging substitute servers."
 msgstr "Défier les serveurs de substituts."
 
 #. type: node
-#: doc/guix.texi:181 doc/guix.texi:5382 doc/guix.texi:7780
+#: doc/guix.texi:181 doc/guix.texi:5386 doc/guix.texi:7784
 #, no-wrap
 msgid "Invoking guix copy"
 msgstr "Invoquer guix copy"
 
 #. type: menuentry
-#: doc/guix.texi:181 doc/guix.texi:5382
+#: doc/guix.texi:181 doc/guix.texi:5386
 msgid "Copying to and from a remote store."
 msgstr "Copier vers et depuis un dépôt distant."
 
 #. type: node
-#: doc/guix.texi:181 doc/guix.texi:5382 doc/guix.texi:7843
+#: doc/guix.texi:181 doc/guix.texi:5386 doc/guix.texi:7847
 #, no-wrap
 msgid "Invoking guix container"
 msgstr "Invoquer guix container"
 
 #. type: menuentry
-#: doc/guix.texi:181 doc/guix.texi:5382
+#: doc/guix.texi:181 doc/guix.texi:5386
 msgid "Process isolation."
 msgstr "Isolation de processus."
 
 #. type: node
-#: doc/guix.texi:181 doc/guix.texi:5382 doc/guix.texi:7897
+#: doc/guix.texi:181 doc/guix.texi:5386 doc/guix.texi:7901
 #, no-wrap
 msgid "Invoking guix weather"
 msgstr "Invoquer guix weather"
 
 #. type: menuentry
-#: doc/guix.texi:181 doc/guix.texi:5382
+#: doc/guix.texi:181 doc/guix.texi:5386
 msgid "Assessing substitute availability."
 msgstr "Mesurer la disponibilité des substituts."
 
 #. type: section
-#: doc/guix.texi:183 doc/guix.texi:5385
+#: doc/guix.texi:183 doc/guix.texi:5389
 #, no-wrap
 msgid "Invoking @command{guix build}"
 msgstr "Invoquer @command{guix build}"
 
 #. type: subsection
-#: doc/guix.texi:188 doc/guix.texi:5436 doc/guix.texi:5438 doc/guix.texi:5439
+#: doc/guix.texi:188 doc/guix.texi:5440 doc/guix.texi:5442 doc/guix.texi:5443
 #, no-wrap
 msgid "Common Build Options"
 msgstr "Options de construction communes"
 
 #. type: menuentry
-#: doc/guix.texi:188 doc/guix.texi:5436
+#: doc/guix.texi:188 doc/guix.texi:5440
 msgid "Build options for most commands."
 msgstr "Options de construction pour la plupart des commandes."
 
 #. type: subsection
-#: doc/guix.texi:188 doc/guix.texi:5436 doc/guix.texi:5580 doc/guix.texi:5581
+#: doc/guix.texi:188 doc/guix.texi:5440 doc/guix.texi:5584 doc/guix.texi:5585
 #, no-wrap
 msgid "Package Transformation Options"
 msgstr "Options de transformation de paquets"
 
 #. type: menuentry
-#: doc/guix.texi:188 doc/guix.texi:5436
+#: doc/guix.texi:188 doc/guix.texi:5440
 msgid "Creating variants of packages."
 msgstr "Créer des variantes de paquets."
 
 #. type: subsection
-#: doc/guix.texi:188 doc/guix.texi:5436 doc/guix.texi:5680 doc/guix.texi:5681
+#: doc/guix.texi:188 doc/guix.texi:5440 doc/guix.texi:5684 doc/guix.texi:5685
 #, no-wrap
 msgid "Additional Build Options"
 msgstr "Options de construction supplémentaires"
 
 #. type: menuentry
-#: doc/guix.texi:188 doc/guix.texi:5436
+#: doc/guix.texi:188 doc/guix.texi:5440
 msgid "Options specific to 'guix build'."
 msgstr "Options spécifiques à « guix build »."
 
 #. type: subsection
-#: doc/guix.texi:188 doc/guix.texi:5436 doc/guix.texi:5884 doc/guix.texi:5885
+#: doc/guix.texi:188 doc/guix.texi:5440 doc/guix.texi:5888 doc/guix.texi:5889
 #, no-wrap
 msgid "Debugging Build Failures"
 msgstr "Débogage des échecs de construction"
 
 #. type: menuentry
-#: doc/guix.texi:188 doc/guix.texi:5436
+#: doc/guix.texi:188 doc/guix.texi:5440
 msgid "Real life packaging experience."
 msgstr "La vie d'un empaqueteur."
 
 #. type: section
-#: doc/guix.texi:200 doc/guix.texi:202 doc/guix.texi:8049 doc/guix.texi:8054 doc/guix.texi:8055
+#: doc/guix.texi:200 doc/guix.texi:202 doc/guix.texi:8053 doc/guix.texi:8058
+#: doc/guix.texi:8059
 #, no-wrap
 msgid "System Installation"
 msgstr "Installation du système"
 
 #. type: menuentry
-#: doc/guix.texi:200 doc/guix.texi:8049
+#: doc/guix.texi:200 doc/guix.texi:8053
 msgid "Installing the whole operating system."
 msgstr "Installer le système d'exploitation complet."
 
 #. type: section
-#: doc/guix.texi:200 doc/guix.texi:212 doc/guix.texi:8049 doc/guix.texi:8670 doc/guix.texi:8671
+#: doc/guix.texi:200 doc/guix.texi:212 doc/guix.texi:8053 doc/guix.texi:8674
+#: doc/guix.texi:8675
 #, no-wrap
 msgid "System Configuration"
 msgstr "Configuration système"
 
 #. type: menuentry
-#: doc/guix.texi:200 doc/guix.texi:8049
+#: doc/guix.texi:200 doc/guix.texi:8053
 msgid "Configuring the operating system."
 msgstr "Configurer le système d'exploitation."
 
 #. type: section
-#: doc/guix.texi:200 doc/guix.texi:8049 doc/guix.texi:21289 doc/guix.texi:21290
+#: doc/guix.texi:200 doc/guix.texi:8053 doc/guix.texi:21351 doc/guix.texi:21352
 #, no-wrap
 msgid "Documentation"
 msgstr "Documentation"
 
 #. type: menuentry
-#: doc/guix.texi:200 doc/guix.texi:8049
+#: doc/guix.texi:200 doc/guix.texi:8053
 msgid "Browsing software user manuals."
 msgstr "Visualiser les manuels d'utilisateur des logiciels."
 
 #. type: section
-#: doc/guix.texi:200 doc/guix.texi:8049 doc/guix.texi:21353 doc/guix.texi:21354
+#: doc/guix.texi:200 doc/guix.texi:8053 doc/guix.texi:21415 doc/guix.texi:21416
 #, no-wrap
 msgid "Installing Debugging Files"
 msgstr "Installer les fichiers de débogage"
 
 #. type: menuentry
-#: doc/guix.texi:200 doc/guix.texi:8049
+#: doc/guix.texi:200 doc/guix.texi:8053
 msgid "Feeding the debugger."
 msgstr "Nourrir le débogueur."
 
 #. type: section
-#: doc/guix.texi:200 doc/guix.texi:8049 doc/guix.texi:21419 doc/guix.texi:21420
+#: doc/guix.texi:200 doc/guix.texi:8053 doc/guix.texi:21481 doc/guix.texi:21482
 #, no-wrap
 msgid "Security Updates"
 msgstr "Mises à jour de sécurité"
 
 #. type: menuentry
-#: doc/guix.texi:200 doc/guix.texi:8049
+#: doc/guix.texi:200 doc/guix.texi:8053
 msgid "Deploying security fixes quickly."
 msgstr "Déployer des correctifs de sécurité rapidement."
 
 #. type: section
-#: doc/guix.texi:200 doc/guix.texi:8049 doc/guix.texi:21539 doc/guix.texi:21540
+#: doc/guix.texi:200 doc/guix.texi:8053 doc/guix.texi:21601 doc/guix.texi:21602
 #, no-wrap
 msgid "Package Modules"
 msgstr "Modules de paquets"
 
 #. type: menuentry
-#: doc/guix.texi:200 doc/guix.texi:8049
+#: doc/guix.texi:200 doc/guix.texi:8053
 msgid "Packages from the programmer's viewpoint."
 msgstr "Les paquets du point de vu du programmeur."
 
 #. type: section
-#: doc/guix.texi:200 doc/guix.texi:265 doc/guix.texi:8049 doc/guix.texi:21593 doc/guix.texi:21594
+#: doc/guix.texi:200 doc/guix.texi:265 doc/guix.texi:8053 doc/guix.texi:21655
+#: doc/guix.texi:21656
 #, no-wrap
 msgid "Packaging Guidelines"
 msgstr "Consignes d'empaquetage"
 
 #. type: menuentry
-#: doc/guix.texi:200 doc/guix.texi:8049
+#: doc/guix.texi:200 doc/guix.texi:8053
 msgid "Growing the distribution."
 msgstr "Faire grandir la distribution."
 
 #. type: section
-#: doc/guix.texi:200 doc/guix.texi:8049 doc/guix.texi:22044 doc/guix.texi:22045
+#: doc/guix.texi:200 doc/guix.texi:8053 doc/guix.texi:22106 doc/guix.texi:22107
 #, no-wrap
 msgid "Bootstrapping"
 msgstr "Bootstrapping"
 
 #. type: menuentry
-#: doc/guix.texi:200 doc/guix.texi:8049
+#: doc/guix.texi:200 doc/guix.texi:8053
 msgid "GNU/Linux built from scratch."
 msgstr "GNU/Linux depuis zéro."
 
 #. type: node
-#: doc/guix.texi:200 doc/guix.texi:8049 doc/guix.texi:22228
+#: doc/guix.texi:200 doc/guix.texi:8053 doc/guix.texi:22290
 #, no-wrap
 msgid "Porting"
 msgstr "Porter"
 
 #. type: menuentry
-#: doc/guix.texi:200 doc/guix.texi:8049
+#: doc/guix.texi:200 doc/guix.texi:8053
 msgid "Targeting another platform or kernel."
 msgstr "Cibler une autre plateforme ou un autre noyau."
 
 #. type: subsection
-#: doc/guix.texi:210 doc/guix.texi:1126 doc/guix.texi:8086 doc/guix.texi:8088 doc/guix.texi:8089
+#: doc/guix.texi:210 doc/guix.texi:1126 doc/guix.texi:8090 doc/guix.texi:8092
+#: doc/guix.texi:8093
 #, no-wrap
 msgid "Limitations"
 msgstr "Limitations"
 
 #. type: menuentry
-#: doc/guix.texi:210 doc/guix.texi:8086
+#: doc/guix.texi:210 doc/guix.texi:8090
 msgid "What you can expect."
 msgstr "Ce à quoi vous attendre."
 
 #. type: subsection
-#: doc/guix.texi:210 doc/guix.texi:8086 doc/guix.texi:8132 doc/guix.texi:8133
+#: doc/guix.texi:210 doc/guix.texi:8090 doc/guix.texi:8136 doc/guix.texi:8137
 #, no-wrap
 msgid "Hardware Considerations"
 msgstr "Considérations matérielles"
 
 #. type: menuentry
-#: doc/guix.texi:210 doc/guix.texi:8086
+#: doc/guix.texi:210 doc/guix.texi:8090
 msgid "Supported hardware."
 msgstr "Matériel supporté."
 
 #. type: subsection
-#: doc/guix.texi:210 doc/guix.texi:8086 doc/guix.texi:8167 doc/guix.texi:8168
+#: doc/guix.texi:210 doc/guix.texi:8090 doc/guix.texi:8171 doc/guix.texi:8172
 #, no-wrap
 msgid "USB Stick and DVD Installation"
 msgstr "Installation depuis une clef USB ou un DVD"
 
 #. type: menuentry
-#: doc/guix.texi:210 doc/guix.texi:8086
+#: doc/guix.texi:210 doc/guix.texi:8090
 msgid "Preparing the installation medium."
 msgstr "Préparer le média d'installation."
 
 #. type: subsection
-#: doc/guix.texi:210 doc/guix.texi:8086 doc/guix.texi:8265 doc/guix.texi:8266
+#: doc/guix.texi:210 doc/guix.texi:8090 doc/guix.texi:8269 doc/guix.texi:8270
 #, no-wrap
 msgid "Preparing for Installation"
 msgstr "Préparer l'installation"
 
 #. type: menuentry
-#: doc/guix.texi:210 doc/guix.texi:8086
+#: doc/guix.texi:210 doc/guix.texi:8090
 msgid "Networking, partitioning, etc."
 msgstr "Réseau, partitionnement, etc."
 
 #. type: subsection
-#: doc/guix.texi:210 doc/guix.texi:8086 doc/guix.texi:8504 doc/guix.texi:8505
+#: doc/guix.texi:210 doc/guix.texi:8090 doc/guix.texi:8508 doc/guix.texi:8509
 #, no-wrap
 msgid "Proceeding with the Installation"
 msgstr "Effectuer l'installation"
 
 #. type: menuentry
-#: doc/guix.texi:210 doc/guix.texi:8086
+#: doc/guix.texi:210 doc/guix.texi:8090
 msgid "The real thing."
 msgstr "Pour de vrai."
 
 #. type: node
-#: doc/guix.texi:210 doc/guix.texi:8086 doc/guix.texi:8601
+#: doc/guix.texi:210 doc/guix.texi:8090 doc/guix.texi:8605
 #, no-wrap
 msgid "Installing GuixSD in a VM"
 msgstr "Installer GuixSD dans une VM"
 
 #. type: menuentry
-#: doc/guix.texi:210 doc/guix.texi:8086
+#: doc/guix.texi:210 doc/guix.texi:8090
 msgid "GuixSD playground."
 msgstr "Jouer avec GuixSD."
 
 #. type: subsection
-#: doc/guix.texi:210 doc/guix.texi:8086 doc/guix.texi:8655 doc/guix.texi:8656
+#: doc/guix.texi:210 doc/guix.texi:8090 doc/guix.texi:8659 doc/guix.texi:8660
 #, no-wrap
 msgid "Building the Installation Image"
 msgstr "Construire l'image d'installation"
 
 #. type: menuentry
-#: doc/guix.texi:210 doc/guix.texi:8086
+#: doc/guix.texi:210 doc/guix.texi:8090
 msgid "How this comes to be."
 msgstr "D'où vient tout cela."
 
 #. type: subsection
-#: doc/guix.texi:228 doc/guix.texi:8711 doc/guix.texi:8713 doc/guix.texi:8714
+#: doc/guix.texi:228 doc/guix.texi:8715 doc/guix.texi:8717 doc/guix.texi:8718
 #, no-wrap
 msgid "Using the Configuration System"
 msgstr "Utiliser le système de configuration"
 
 #. type: menuentry
-#: doc/guix.texi:228 doc/guix.texi:8711
+#: doc/guix.texi:228 doc/guix.texi:8715
 msgid "Customizing your GNU system."
 msgstr "Personnaliser votre système GNU."
 
 #. type: node
-#: doc/guix.texi:228 doc/guix.texi:8711 doc/guix.texi:8929
+#: doc/guix.texi:228 doc/guix.texi:8715 doc/guix.texi:8933
 #, no-wrap
 msgid "operating-system Reference"
 msgstr "Référence de système d'exploitation"
 
 #. type: menuentry
-#: doc/guix.texi:228 doc/guix.texi:8711
+#: doc/guix.texi:228 doc/guix.texi:8715
 msgid "Detail of operating-system declarations."
 msgstr "Détail sur la déclaration de système d'exploitation."
 
 #. type: subsection
-#: doc/guix.texi:228 doc/guix.texi:8711 doc/guix.texi:9083 doc/guix.texi:9084
+#: doc/guix.texi:228 doc/guix.texi:8715 doc/guix.texi:9087 doc/guix.texi:9088
 #, no-wrap
 msgid "File Systems"
 msgstr "Systèmes de fichiers"
 
 #. type: menuentry
-#: doc/guix.texi:228 doc/guix.texi:8711
+#: doc/guix.texi:228 doc/guix.texi:8715
 msgid "Configuring file system mounts."
 msgstr "Configurer les montages de systèmes de fichiers."
 
 #. type: subsection
-#: doc/guix.texi:228 doc/guix.texi:8711 doc/guix.texi:9246 doc/guix.texi:9247
+#: doc/guix.texi:228 doc/guix.texi:8715 doc/guix.texi:9250 doc/guix.texi:9251
 #, no-wrap
 msgid "Mapped Devices"
 msgstr "Périphériques mappés"
 
 #. type: menuentry
-#: doc/guix.texi:228 doc/guix.texi:8711
+#: doc/guix.texi:228 doc/guix.texi:8715
 msgid "Block device extra processing."
 msgstr "Gestion des périphériques de bloc."
 
 #. type: subsection
-#: doc/guix.texi:228 doc/guix.texi:8711 doc/guix.texi:9367 doc/guix.texi:9368
+#: doc/guix.texi:228 doc/guix.texi:8715 doc/guix.texi:9371 doc/guix.texi:9372
 #, no-wrap
 msgid "User Accounts"
 msgstr "Comptes utilisateurs"
 
 #. type: menuentry
-#: doc/guix.texi:228 doc/guix.texi:8711
+#: doc/guix.texi:228 doc/guix.texi:8715
 msgid "Specifying user accounts."
 msgstr "Spécifier des comptes utilisateurs."
 
 #. type: subsection
-#: doc/guix.texi:228 doc/guix.texi:1449 doc/guix.texi:8711 doc/guix.texi:9502 doc/guix.texi:9503
+#: doc/guix.texi:228 doc/guix.texi:1449 doc/guix.texi:8715 doc/guix.texi:9506
+#: doc/guix.texi:9507
 #, no-wrap
 msgid "Locales"
 msgstr "Régionalisation"
 
 #. type: menuentry
-#: doc/guix.texi:228 doc/guix.texi:8711
+#: doc/guix.texi:228 doc/guix.texi:8715
 msgid "Language and cultural convention settings."
 msgstr "Paramétrer la langue et les conventions culturelles."
 
 #. type: subsection
-#: doc/guix.texi:228 doc/guix.texi:230 doc/guix.texi:8711 doc/guix.texi:9642 doc/guix.texi:9643
+#: doc/guix.texi:228 doc/guix.texi:230 doc/guix.texi:8715 doc/guix.texi:9646
+#: doc/guix.texi:9647
 #, no-wrap
 msgid "Services"
 msgstr "Services"
 
 #. type: menuentry
-#: doc/guix.texi:228 doc/guix.texi:8711
+#: doc/guix.texi:228 doc/guix.texi:8715
 msgid "Specifying system services."
 msgstr "Spécifier les services du système."
 
 #. type: subsection
-#: doc/guix.texi:228 doc/guix.texi:8711 doc/guix.texi:19658 doc/guix.texi:19659
+#: doc/guix.texi:228 doc/guix.texi:8715 doc/guix.texi:19720 doc/guix.texi:19721
 #, no-wrap
 msgid "Setuid Programs"
 msgstr "Programmes setuid"
 
 #. type: menuentry
-#: doc/guix.texi:228 doc/guix.texi:8711
+#: doc/guix.texi:228 doc/guix.texi:8715
 msgid "Programs running with root privileges."
 msgstr "Programmes tournant avec les privilèges root."
 
 #. type: subsection
-#: doc/guix.texi:228 doc/guix.texi:1594 doc/guix.texi:8711 doc/guix.texi:19704 doc/guix.texi:19705
+#: doc/guix.texi:228 doc/guix.texi:1594 doc/guix.texi:8715 doc/guix.texi:19766
+#: doc/guix.texi:19767
 #, no-wrap
 msgid "X.509 Certificates"
 msgstr "Certificats X.509"
 
 #. type: menuentry
-#: doc/guix.texi:228 doc/guix.texi:8711
+#: doc/guix.texi:228 doc/guix.texi:8715
 msgid "Authenticating HTTPS servers."
 msgstr "Authentifier les serveurs HTTPS."
 
 #. type: subsection
-#: doc/guix.texi:228 doc/guix.texi:1492 doc/guix.texi:8711 doc/guix.texi:19767 doc/guix.texi:19768
+#: doc/guix.texi:228 doc/guix.texi:1492 doc/guix.texi:8715 doc/guix.texi:19829
+#: doc/guix.texi:19830
 #, no-wrap
 msgid "Name Service Switch"
 msgstr "Name Service Switch"
 
 #. type: menuentry
-#: doc/guix.texi:228 doc/guix.texi:8711
+#: doc/guix.texi:228 doc/guix.texi:8715
 msgid "Configuring libc's name service switch."
 msgstr "Configurer le « name service switch » de la libc."
 
 #. type: subsection
-#: doc/guix.texi:228 doc/guix.texi:8711 doc/guix.texi:19905 doc/guix.texi:19906
+#: doc/guix.texi:228 doc/guix.texi:8715 doc/guix.texi:19967 doc/guix.texi:19968
 #, no-wrap
 msgid "Initial RAM Disk"
 msgstr "Disque de RAM initial"
 
 #. type: menuentry
-#: doc/guix.texi:228 doc/guix.texi:8711
+#: doc/guix.texi:228 doc/guix.texi:8715
 msgid "Linux-Libre bootstrapping."
 msgstr "Démarrage de Linux-Libre."
 
 #. type: subsection
-#: doc/guix.texi:228 doc/guix.texi:8711 doc/guix.texi:20065 doc/guix.texi:20066
+#: doc/guix.texi:228 doc/guix.texi:8715 doc/guix.texi:20127 doc/guix.texi:20128
 #, no-wrap
 msgid "Bootloader Configuration"
 msgstr "Configuration du chargeur d'amorçage"
 
 #. type: menuentry
-#: doc/guix.texi:228 doc/guix.texi:8711
+#: doc/guix.texi:228 doc/guix.texi:8715
 msgid "Configuring the boot loader."
 msgstr "Configurer le chargeur d'amorçage."
 
 #. type: node
-#: doc/guix.texi:228 doc/guix.texi:8711 doc/guix.texi:20236
+#: doc/guix.texi:228 doc/guix.texi:8715 doc/guix.texi:20298
 #, no-wrap
 msgid "Invoking guix system"
 msgstr "Invoquer guix system"
 
 #. type: menuentry
-#: doc/guix.texi:228 doc/guix.texi:8711
+#: doc/guix.texi:228 doc/guix.texi:8715
 msgid "Instantiating a system configuration."
 msgstr "Instantier une configuration du système."
 
 #. type: node
-#: doc/guix.texi:228 doc/guix.texi:8711 doc/guix.texi:20661
+#: doc/guix.texi:228 doc/guix.texi:8715 doc/guix.texi:20723
 #, no-wrap
 msgid "Running GuixSD in a VM"
 msgstr "Lancer GuixSD dans une VM"
 
 #. type: menuentry
-#: doc/guix.texi:228 doc/guix.texi:8711
+#: doc/guix.texi:228 doc/guix.texi:8715
 msgid "How to run GuixSD in a virtual machine."
 msgstr "Comment lancer GuixSD dans une machine virtuelle."
 
 #. type: subsection
-#: doc/guix.texi:228 doc/guix.texi:258 doc/guix.texi:8711 doc/guix.texi:20772 doc/guix.texi:20773
+#: doc/guix.texi:228 doc/guix.texi:258 doc/guix.texi:8715 doc/guix.texi:20834
+#: doc/guix.texi:20835
 #, no-wrap
 msgid "Defining Services"
 msgstr "Définir des services"
 
 #. type: menuentry
-#: doc/guix.texi:228 doc/guix.texi:8711
+#: doc/guix.texi:228 doc/guix.texi:8715
 msgid "Adding new service definitions."
 msgstr "Ajouter de nouvelles définitions de services."
 
 #. type: subsubsection
-#: doc/guix.texi:256 doc/guix.texi:9714 doc/guix.texi:9716 doc/guix.texi:9717
+#: doc/guix.texi:256 doc/guix.texi:9718 doc/guix.texi:9720 doc/guix.texi:9721
 #, no-wrap
 msgid "Base Services"
 msgstr "Services de base"
 
 #. type: menuentry
-#: doc/guix.texi:256 doc/guix.texi:9714
+#: doc/guix.texi:256 doc/guix.texi:9718
 msgid "Essential system services."
 msgstr "Services systèmes essentiels."
 
 #. type: subsubsection
-#: doc/guix.texi:256 doc/guix.texi:9714 doc/guix.texi:10484 doc/guix.texi:10485
+#: doc/guix.texi:256 doc/guix.texi:9718 doc/guix.texi:10488 doc/guix.texi:10489
 #, no-wrap
 msgid "Scheduled Job Execution"
 msgstr ""
 
 #. type: menuentry
-#: doc/guix.texi:256 doc/guix.texi:9714
+#: doc/guix.texi:256 doc/guix.texi:9718
 msgid "The mcron service."
 msgstr ""
 
 #. type: subsubsection
-#: doc/guix.texi:256 doc/guix.texi:9714 doc/guix.texi:10579 doc/guix.texi:10580
+#: doc/guix.texi:256 doc/guix.texi:9718 doc/guix.texi:10583 doc/guix.texi:10584
 #, no-wrap
 msgid "Log Rotation"
 msgstr ""
 
 #. type: menuentry
-#: doc/guix.texi:256 doc/guix.texi:9714
+#: doc/guix.texi:256 doc/guix.texi:9718
 msgid "The rottlog service."
 msgstr ""
 
 #. type: subsubsection
-#: doc/guix.texi:256 doc/guix.texi:9714 doc/guix.texi:10681 doc/guix.texi:10682
+#: doc/guix.texi:256 doc/guix.texi:9718 doc/guix.texi:10685 doc/guix.texi:10686
 #, no-wrap
 msgid "Networking Services"
 msgstr ""
 
 #. type: menuentry
-#: doc/guix.texi:256 doc/guix.texi:9714
+#: doc/guix.texi:256 doc/guix.texi:9718
 msgid "Network setup, SSH daemon, etc."
 msgstr ""
 
 #. type: subsubsection
-#: doc/guix.texi:256 doc/guix.texi:9714 doc/guix.texi:11382 doc/guix.texi:11383
+#: doc/guix.texi:256 doc/guix.texi:9718 doc/guix.texi:11431 doc/guix.texi:11432
 #, no-wrap
 msgid "X Window"
 msgstr ""
 
 #. type: menuentry
-#: doc/guix.texi:256 doc/guix.texi:9714
+#: doc/guix.texi:256 doc/guix.texi:9718
 msgid "Graphical display."
 msgstr ""
 
 #. type: subsubsection
-#: doc/guix.texi:256 doc/guix.texi:9714 doc/guix.texi:11628 doc/guix.texi:11629
+#: doc/guix.texi:256 doc/guix.texi:9718 doc/guix.texi:11677 doc/guix.texi:11678
 #, no-wrap
 msgid "Printing Services"
 msgstr ""
 
 #. type: menuentry
-#: doc/guix.texi:256 doc/guix.texi:9714
+#: doc/guix.texi:256 doc/guix.texi:9718
 msgid "Local and remote printer support."
 msgstr ""
 
 #. type: subsubsection
-#: doc/guix.texi:256 doc/guix.texi:9714 doc/guix.texi:12465 doc/guix.texi:12466
+#: doc/guix.texi:256 doc/guix.texi:9718 doc/guix.texi:12514 doc/guix.texi:12515
 #, no-wrap
 msgid "Desktop Services"
 msgstr ""
 
 #. type: menuentry
-#: doc/guix.texi:256 doc/guix.texi:9714
+#: doc/guix.texi:256 doc/guix.texi:9718
 msgid "D-Bus and desktop services."
 msgstr ""
 
 #. type: subsubsection
-#: doc/guix.texi:256 doc/guix.texi:9714 doc/guix.texi:12758 doc/guix.texi:12759
+#: doc/guix.texi:256 doc/guix.texi:9718 doc/guix.texi:12807 doc/guix.texi:12808
 #, no-wrap
 msgid "Database Services"
 msgstr ""
 
 #. type: menuentry
-#: doc/guix.texi:256 doc/guix.texi:9714
+#: doc/guix.texi:256 doc/guix.texi:9718
 msgid "SQL databases, key-value stores, etc."
 msgstr ""
 
 #. type: subsubsection
-#: doc/guix.texi:256 doc/guix.texi:9714 doc/guix.texi:12882 doc/guix.texi:12883
+#: doc/guix.texi:256 doc/guix.texi:9718 doc/guix.texi:12931 doc/guix.texi:12932
 #, no-wrap
 msgid "Mail Services"
 msgstr ""
 
 #. type: menuentry
-#: doc/guix.texi:256 doc/guix.texi:9714
+#: doc/guix.texi:256 doc/guix.texi:9718
 msgid "IMAP, POP3, SMTP, and all that."
 msgstr ""
 
 #. type: subsubsection
-#: doc/guix.texi:256 doc/guix.texi:9714 doc/guix.texi:14334 doc/guix.texi:14335
+#: doc/guix.texi:256 doc/guix.texi:9718 doc/guix.texi:14383 doc/guix.texi:14384
 #, no-wrap
 msgid "Messaging Services"
 msgstr ""
 
 #. type: menuentry
-#: doc/guix.texi:256 doc/guix.texi:9714
+#: doc/guix.texi:256 doc/guix.texi:9718
 msgid "Messaging services."
 msgstr ""
 
 #. type: subsubsection
-#: doc/guix.texi:256 doc/guix.texi:9714 doc/guix.texi:14802 doc/guix.texi:14803
+#: doc/guix.texi:256 doc/guix.texi:9718 doc/guix.texi:14851 doc/guix.texi:14852
 #, no-wrap
 msgid "Telephony Services"
 msgstr ""
 
 #. type: menuentry
-#: doc/guix.texi:256 doc/guix.texi:9714
+#: doc/guix.texi:256 doc/guix.texi:9718
 msgid "Telephony services."
 msgstr ""
 
 #. type: subsubsection
-#: doc/guix.texi:256 doc/guix.texi:9714 doc/guix.texi:15007 doc/guix.texi:15008
+#: doc/guix.texi:256 doc/guix.texi:9718 doc/guix.texi:15056 doc/guix.texi:15057
 #, no-wrap
 msgid "Monitoring Services"
 msgstr ""
 
 #. type: menuentry
-#: doc/guix.texi:256 doc/guix.texi:9714
+#: doc/guix.texi:256 doc/guix.texi:9718
 msgid "Monitoring services."
 msgstr ""
 
 #. type: subsubsection
-#: doc/guix.texi:256 doc/guix.texi:9714 doc/guix.texi:15160 doc/guix.texi:15161
+#: doc/guix.texi:256 doc/guix.texi:9718 doc/guix.texi:15209 doc/guix.texi:15210
 #, no-wrap
 msgid "Kerberos Services"
 msgstr ""
 
 #. type: menuentry
-#: doc/guix.texi:256 doc/guix.texi:9714
+#: doc/guix.texi:256 doc/guix.texi:9718
 msgid "Kerberos services."
 msgstr ""
 
 #. type: subsubsection
-#: doc/guix.texi:256 doc/guix.texi:9714 doc/guix.texi:15286 doc/guix.texi:15287
+#: doc/guix.texi:256 doc/guix.texi:9718 doc/guix.texi:15335 doc/guix.texi:15336
 #, no-wrap
 msgid "Web Services"
 msgstr ""
 
 #. type: menuentry
-#: doc/guix.texi:256 doc/guix.texi:9714
+#: doc/guix.texi:256 doc/guix.texi:9718
 msgid "Web servers."
 msgstr ""
 
 #. type: subsubsection
-#: doc/guix.texi:256 doc/guix.texi:9714 doc/guix.texi:15895 doc/guix.texi:15896
+#: doc/guix.texi:256 doc/guix.texi:9718 doc/guix.texi:15944 doc/guix.texi:15945
 #, no-wrap
 msgid "Certificate Services"
 msgstr ""
 
 #. type: menuentry
-#: doc/guix.texi:256 doc/guix.texi:9714
+#: doc/guix.texi:256 doc/guix.texi:9718
 msgid "TLS certificates via Let's Encrypt."
 msgstr ""
 
 #. type: subsubsection
-#: doc/guix.texi:256 doc/guix.texi:9714 doc/guix.texi:16041 doc/guix.texi:16042
+#: doc/guix.texi:256 doc/guix.texi:9718 doc/guix.texi:16090 doc/guix.texi:16091
 #, no-wrap
 msgid "DNS Services"
 msgstr ""
 
 #. type: menuentry
-#: doc/guix.texi:256 doc/guix.texi:9714
+#: doc/guix.texi:256 doc/guix.texi:9718
 msgid "DNS daemons."
 msgstr ""
 
 #. type: subsubsection
-#: doc/guix.texi:256 doc/guix.texi:9714 doc/guix.texi:16445 doc/guix.texi:16446
+#: doc/guix.texi:256 doc/guix.texi:9718 doc/guix.texi:16494 doc/guix.texi:16495
 #, no-wrap
 msgid "VPN Services"
 msgstr ""
 
 #. type: menuentry
-#: doc/guix.texi:256 doc/guix.texi:9714
+#: doc/guix.texi:256 doc/guix.texi:9718
 msgid "VPN daemons."
 msgstr ""
 
 #. type: subsubsection
-#: doc/guix.texi:256 doc/guix.texi:9714 doc/guix.texi:16803 doc/guix.texi:16804
+#: doc/guix.texi:256 doc/guix.texi:9718 doc/guix.texi:16852 doc/guix.texi:16853
 #, no-wrap
 msgid "Network File System"
 msgstr ""
 
 #. type: menuentry
-#: doc/guix.texi:256 doc/guix.texi:9714
+#: doc/guix.texi:256 doc/guix.texi:9718
 msgid "NFS related services."
 msgstr ""
 
 #. type: subsubsection
-#: doc/guix.texi:256 doc/guix.texi:9714 doc/guix.texi:16918 doc/guix.texi:16919
+#: doc/guix.texi:256 doc/guix.texi:9718 doc/guix.texi:16967 doc/guix.texi:16968
 #, no-wrap
 msgid "Continuous Integration"
 msgstr ""
 
 #. type: menuentry
-#: doc/guix.texi:256 doc/guix.texi:9714
+#: doc/guix.texi:256 doc/guix.texi:9718
 msgid "The Cuirass service."
 msgstr ""
 
 #. type: subsubsection
-#: doc/guix.texi:256 doc/guix.texi:9714 doc/guix.texi:17014 doc/guix.texi:17015
+#: doc/guix.texi:256 doc/guix.texi:9718 doc/guix.texi:17063 doc/guix.texi:17064
 #, no-wrap
 msgid "Power management Services"
 msgstr ""
 
 #. type: menuentry
-#: doc/guix.texi:256 doc/guix.texi:9714
+#: doc/guix.texi:256 doc/guix.texi:9718
 msgid "The TLP tool."
 msgstr ""
 
 #. type: subsubsection
-#: doc/guix.texi:256 doc/guix.texi:9714 doc/guix.texi:17542 doc/guix.texi:17543
+#: doc/guix.texi:256 doc/guix.texi:9718 doc/guix.texi:17591 doc/guix.texi:17592
 #, no-wrap
 msgid "Audio Services"
 msgstr ""
 
 #. type: menuentry
-#: doc/guix.texi:256 doc/guix.texi:9714
+#: doc/guix.texi:256 doc/guix.texi:9718
 msgid "The MPD."
 msgstr ""
 
 #. type: node
-#: doc/guix.texi:256 doc/guix.texi:9714 doc/guix.texi:17592
+#: doc/guix.texi:256 doc/guix.texi:9718 doc/guix.texi:17641
 #, no-wrap
 msgid "Virtualization Services"
 msgstr ""
 
 #. type: menuentry
-#: doc/guix.texi:256 doc/guix.texi:9714
+#: doc/guix.texi:256 doc/guix.texi:9718
 msgid "Virtualization services."
 msgstr ""
 
 #. type: subsubsection
-#: doc/guix.texi:256 doc/guix.texi:9714 doc/guix.texi:18385 doc/guix.texi:18386
+#: doc/guix.texi:256 doc/guix.texi:9718 doc/guix.texi:18434 doc/guix.texi:18435
 #, no-wrap
 msgid "Version Control Services"
 msgstr ""
 
 #. type: menuentry
-#: doc/guix.texi:256 doc/guix.texi:9714
+#: doc/guix.texi:256 doc/guix.texi:9718
 msgid "Providing remote access to Git repositories."
 msgstr ""
 
 #. type: subsubsection
-#: doc/guix.texi:256 doc/guix.texi:9714 doc/guix.texi:19466 doc/guix.texi:19467
+#: doc/guix.texi:256 doc/guix.texi:9718 doc/guix.texi:19528 doc/guix.texi:19529
 #, no-wrap
 msgid "Game Services"
 msgstr ""
 
 #. type: menuentry
-#: doc/guix.texi:256 doc/guix.texi:9714
+#: doc/guix.texi:256 doc/guix.texi:9718
 msgid "Game servers."
 msgstr ""
 
 #. type: subsubsection
-#: doc/guix.texi:256 doc/guix.texi:9714 doc/guix.texi:19497 doc/guix.texi:19498
+#: doc/guix.texi:256 doc/guix.texi:9718 doc/guix.texi:19559 doc/guix.texi:19560
 #, no-wrap
 msgid "Miscellaneous Services"
 msgstr ""
 
 #. type: menuentry
-#: doc/guix.texi:256 doc/guix.texi:9714
+#: doc/guix.texi:256 doc/guix.texi:9718
 msgid "Other services."
 msgstr ""
 
 #. type: subsubsection
-#: doc/guix.texi:263 doc/guix.texi:20784 doc/guix.texi:20786 doc/guix.texi:20787
+#: doc/guix.texi:263 doc/guix.texi:20846 doc/guix.texi:20848
+#: doc/guix.texi:20849
 #, no-wrap
 msgid "Service Composition"
 msgstr "Composition de services"
 
 #. type: menuentry
-#: doc/guix.texi:263 doc/guix.texi:20784
+#: doc/guix.texi:263 doc/guix.texi:20846
 msgid "The model for composing services."
 msgstr "Le modèle de composition des services."
 
 #. type: subsubsection
-#: doc/guix.texi:263 doc/guix.texi:20784 doc/guix.texi:20842 doc/guix.texi:20843
+#: doc/guix.texi:263 doc/guix.texi:20846 doc/guix.texi:20904
+#: doc/guix.texi:20905
 #, no-wrap
 msgid "Service Types and Services"
 msgstr "Types service et services"
 
 #. type: menuentry
-#: doc/guix.texi:263 doc/guix.texi:20784
+#: doc/guix.texi:263 doc/guix.texi:20846
 msgid "Types and services."
 msgstr "Types et services."
 
 #. type: subsubsection
-#: doc/guix.texi:263 doc/guix.texi:20784 doc/guix.texi:20979 doc/guix.texi:20980
+#: doc/guix.texi:263 doc/guix.texi:20846 doc/guix.texi:21041
+#: doc/guix.texi:21042
 #, no-wrap
 msgid "Service Reference"
 msgstr "Référence de service"
 
 #. type: menuentry
-#: doc/guix.texi:263 doc/guix.texi:20784
+#: doc/guix.texi:263 doc/guix.texi:20846
 msgid "API reference."
 msgstr "Référence de l'API."
 
 #. type: subsubsection
-#: doc/guix.texi:263 doc/guix.texi:20784 doc/guix.texi:21204 doc/guix.texi:21205
+#: doc/guix.texi:263 doc/guix.texi:20846 doc/guix.texi:21266
+#: doc/guix.texi:21267
 #, no-wrap
 msgid "Shepherd Services"
 msgstr "Services Shepherd"
 
 #. type: menuentry
-#: doc/guix.texi:263 doc/guix.texi:20784
+#: doc/guix.texi:263 doc/guix.texi:20846
 msgid "A particular type of service."
 msgstr "Un type de service particulier."
 
 #. type: subsection
-#: doc/guix.texi:274 doc/guix.texi:21668 doc/guix.texi:21670 doc/guix.texi:21671
+#: doc/guix.texi:274 doc/guix.texi:21730 doc/guix.texi:21732
+#: doc/guix.texi:21733
 #, no-wrap
 msgid "Software Freedom"
 msgstr "Liberté logiciel"
 
 #. type: menuentry
-#: doc/guix.texi:274 doc/guix.texi:21668
+#: doc/guix.texi:274 doc/guix.texi:21730
 msgid "What may go into the distribution."
 msgstr "Ce que la distribution peut contenir."
 
 #. type: subsection
-#: doc/guix.texi:274 doc/guix.texi:21668 doc/guix.texi:21698 doc/guix.texi:21699
+#: doc/guix.texi:274 doc/guix.texi:21730 doc/guix.texi:21760
+#: doc/guix.texi:21761
 #, no-wrap
 msgid "Package Naming"
 msgstr "Conventions de nommage"
 
 #. type: menuentry
-#: doc/guix.texi:274 doc/guix.texi:21668
+#: doc/guix.texi:274 doc/guix.texi:21730
 msgid "What's in a name?"
 msgstr "Qu'est-ce qu'un bon nom ?"
 
 #. type: subsection
-#: doc/guix.texi:274 doc/guix.texi:21668 doc/guix.texi:21723 doc/guix.texi:21724
+#: doc/guix.texi:274 doc/guix.texi:21730 doc/guix.texi:21785
+#: doc/guix.texi:21786
 #, no-wrap
 msgid "Version Numbers"
 msgstr "Numéros de version"
 
 #. type: menuentry
-#: doc/guix.texi:274 doc/guix.texi:21668
+#: doc/guix.texi:274 doc/guix.texi:21730
 msgid "When the name is not enough."
 msgstr "Lorsque le nom n'est pas suffisant."
 
 #. type: subsection
-#: doc/guix.texi:274 doc/guix.texi:21668 doc/guix.texi:21814 doc/guix.texi:21815
+#: doc/guix.texi:274 doc/guix.texi:21730 doc/guix.texi:21876
+#: doc/guix.texi:21877
 #, no-wrap
 msgid "Synopses and Descriptions"
 msgstr "Synopsis et descriptions"
 
 #. type: menuentry
-#: doc/guix.texi:274 doc/guix.texi:21668
+#: doc/guix.texi:274 doc/guix.texi:21730
 msgid "Helping users find the right package."
 msgstr "Aider les utilisateurs à trouver le bon paquet."
 
 #. type: subsection
-#: doc/guix.texi:274 doc/guix.texi:21668 doc/guix.texi:21894 doc/guix.texi:21895
+#: doc/guix.texi:274 doc/guix.texi:21730 doc/guix.texi:21956
+#: doc/guix.texi:21957
 #, no-wrap
 msgid "Python Modules"
 msgstr "Modules python"
 
 #. type: menuentry
-#: doc/guix.texi:274 doc/guix.texi:21668
+#: doc/guix.texi:274 doc/guix.texi:21730
 msgid "A touch of British comedy."
 msgstr "Un peu de comédie anglaise."
 
 #. type: subsection
-#: doc/guix.texi:274 doc/guix.texi:21668 doc/guix.texi:21969 doc/guix.texi:21970
+#: doc/guix.texi:274 doc/guix.texi:21730 doc/guix.texi:22031
+#: doc/guix.texi:22032
 #, no-wrap
 msgid "Perl Modules"
 msgstr "Modules perl"
 
 #. type: menuentry
-#: doc/guix.texi:274 doc/guix.texi:21668
+#: doc/guix.texi:274 doc/guix.texi:21730
 msgid "Little pearls."
 msgstr "Petites perles."
 
 #. type: subsection
-#: doc/guix.texi:274 doc/guix.texi:21668 doc/guix.texi:21985 doc/guix.texi:21986
+#: doc/guix.texi:274 doc/guix.texi:21730 doc/guix.texi:22047
+#: doc/guix.texi:22048
 #, no-wrap
 msgid "Java Packages"
 msgstr "Paquets java"
 
 #. type: menuentry
-#: doc/guix.texi:274 doc/guix.texi:21668
+#: doc/guix.texi:274 doc/guix.texi:21730
 msgid "Coffee break."
 msgstr "Pause café."
 
 #. type: subsection
-#: doc/guix.texi:274 doc/guix.texi:21668 doc/guix.texi:22005 doc/guix.texi:22006
+#: doc/guix.texi:274 doc/guix.texi:21730 doc/guix.texi:22067
+#: doc/guix.texi:22068
 #, no-wrap
 msgid "Fonts"
 msgstr "Polices de caractères"
 
 #. type: menuentry
-#: doc/guix.texi:274 doc/guix.texi:21668
+#: doc/guix.texi:274 doc/guix.texi:21730
 msgid "Fond of fonts."
 msgstr ""
 
-#. type: menuentry
-#: doc/guix.texi:282
-msgid "Building from Git"
-msgstr "Construire depuis Git"
-
-#. type: menuentry
-#: doc/guix.texi:282
-msgid "The latest and greatest."
-msgstr ""
-
-#. type: menuentry
-#: doc/guix.texi:282
-msgid "Running Guix Before It Is Installed"
-msgstr "Lancer Guix avant qu'il ne soit installé"
-
-#. type: menuentry
-#: doc/guix.texi:282
-msgid "Hacker tricks."
-msgstr "Astuces pour les hackers."
-
-#. type: menuentry
-#: doc/guix.texi:282
-msgid "The Perfect Setup"
-msgstr "La configuration parfaite"
-
-#. type: menuentry
-#: doc/guix.texi:282
-msgid "The right tools."
-msgstr "Les bons outils."
-
-#. type: menuentry
-#: doc/guix.texi:282 doc/guix.texi:284
-msgid "Coding Style"
-msgstr "Style de code"
-
-#. type: menuentry
-#: doc/guix.texi:282
-msgid "Hygiene of the contributor."
-msgstr "Hygiène du contributeur."
-
-#. type: menuentry
-#: doc/guix.texi:282
-msgid "Submitting Patches"
-msgstr "Envoyer des correctifs"
-
-#. type: menuentry
-#: doc/guix.texi:282
-msgid "Share your work."
-msgstr "Partager votre travail."
-
-#. type: menuentry
-#: doc/guix.texi:289
-msgid "Programming Paradigm"
-msgstr "Paradigme de programmation"
-
-#. type: menuentry
-#: doc/guix.texi:289
-msgid "How to compose your elements."
-msgstr "Comment composer vos éléments."
-
-#. type: menuentry
-#: doc/guix.texi:289
-msgid "Modules"
-msgstr "Modules"
-
-#. type: menuentry
-#: doc/guix.texi:289
-msgid "Where to store your code?"
-msgstr "Où stocker votre code ?"
-
-#. type: menuentry
-#: doc/guix.texi:289
-msgid "Data Types and Pattern Matching"
-msgstr "Types de données et reconnaissance de motif"
-
-#. type: menuentry
-#: doc/guix.texi:289
-msgid "Implementing data structures."
-msgstr "Implémenter des structures de données."
-
-#. type: menuentry
-#: doc/guix.texi:289
-msgid "Formatting Code"
-msgstr "Formatage du code"
-
-#. type: menuentry
-#: doc/guix.texi:289
-msgid "Writing conventions."
-msgstr "Conventions d'écriture."
-
 #. type: cindex
 #: doc/guix.texi:297
 #, no-wrap
@@ -1734,15 +2968,20 @@ msgstr "but"
 #. type: Plain text
 #: doc/guix.texi:304
 msgid ""
-"GNU Guix@footnote{``Guix'' is pronounced like ``geeks'', or ``ɡiːks'' using the international phonetic alphabet (IPA).} is a package "
-"management tool for the GNU system.  Guix makes it easy for unprivileged users to install, upgrade, or remove packages, to roll back "
-"to a previous package set, to build packages from source, and generally assists with the creation and maintenance of software "
-"environments."
+"GNU Guix@footnote{``Guix'' is pronounced like ``geeks'', or ``ɡiːks'' using "
+"the international phonetic alphabet (IPA).} is a package management tool for "
+"the GNU system.  Guix makes it easy for unprivileged users to install, "
+"upgrade, or remove packages, to roll back to a previous package set, to "
+"build packages from source, and generally assists with the creation and "
+"maintenance of software environments."
 msgstr ""
-"GNU Guix@footnote{« Guix » se prononce comme « geeks » (en prononçant le « s »), ou « ɡiːks » dans l'alphabet phonétique "
-"international (API).} est un outil de gestion de paquets pour le système GNU. Guix facilite pour les utilisateurs non privilégiés "
-"l'installation, la mise à jour et la suppression de paquets, la restauration à un ensemble de paquets précédent, la construction de "
-"paquets depuis les sources et plus généralement aide à la création et à la maintenance d'environnements logiciels."
+"GNU Guix@footnote{« Guix » se prononce comme « geeks » (en prononçant le "
+"« s »), ou « ɡiːks » dans l'alphabet phonétique international (API).} est un "
+"outil de gestion de paquets pour le système GNU. Guix facilite pour les "
+"utilisateurs non privilégiés l'installation, la mise à jour et la "
+"suppression de paquets, la restauration à un ensemble de paquets précédent, "
+"la construction de paquets depuis les sources et plus généralement aide à la "
+"création et à la maintenance d'environnements logiciels."
 
 #. type: cindex
 #: doc/guix.texi:305
@@ -1753,12 +2992,14 @@ msgstr "interfaces utilisateurs"
 #. type: Plain text
 #: doc/guix.texi:310
 msgid ""
-"Guix provides a command-line package management interface (@pxref{Invoking guix package}), a set of command-line utilities "
-"(@pxref{Utilities}), as well as Scheme programming interfaces (@pxref{Programming Interface})."
+"Guix provides a command-line package management interface (@pxref{Invoking "
+"guix package}), a set of command-line utilities (@pxref{Utilities}), as well "
+"as Scheme programming interfaces (@pxref{Programming Interface})."
 msgstr ""
-"Guix fournit une interface de gestion des paquets par la ligne de commande (@pxref{Invoquer guix package}), un ensemble "
-"d'utilitaires en ligne de commande (@pxref{Utilitaires}) ainsi que des interfaces de programmation Scheme (@pxref{Interface de "
-"programmation})."
+"Guix fournit une interface de gestion des paquets par la ligne de commande "
+"(@pxref{Invoquer guix package}), un ensemble d'utilitaires en ligne de "
+"commande (@pxref{Utilitaires}) ainsi que des interfaces de programmation "
+"Scheme (@pxref{Interface de programmation})."
 
 #. type: cindex
 #: doc/guix.texi:310
@@ -1769,11 +3010,14 @@ msgstr "démon de construction"
 #. type: Plain text
 #: doc/guix.texi:314
 msgid ""
-"Its @dfn{build daemon} is responsible for building packages on behalf of users (@pxref{Setting Up the Daemon}) and for downloading "
-"pre-built binaries from authorized sources (@pxref{Substitutes})."
+"Its @dfn{build daemon} is responsible for building packages on behalf of "
+"users (@pxref{Setting Up the Daemon}) and for downloading pre-built binaries "
+"from authorized sources (@pxref{Substitutes})."
 msgstr ""
-"Son @dfn{démon de construction} est responsable de la construction des paquets pour les utilisateurs (@pxref{Paramétrer le démon}) "
-"et du téléchargement des binaires pré-construits depuis les sources autorisées (@pxref{Substituts})."
+"Son @dfn{démon de construction} est responsable de la construction des "
+"paquets pour les utilisateurs (@pxref{Paramétrer le démon}) et du "
+"téléchargement des binaires pré-construits depuis les sources autorisées "
+"(@pxref{Substituts})."
 
 #. type: cindex
 #: doc/guix.texi:315
@@ -1782,7 +3026,7 @@ msgid "extensibility of the distribution"
 msgstr "extensibilité de la distribution"
 
 #. type: cindex
-#: doc/guix.texi:316 doc/guix.texi:21561
+#: doc/guix.texi:316 doc/guix.texi:21623
 #, no-wrap
 msgid "customization, of packages"
 msgstr "personnalisation, des paquets"
@@ -1790,26 +3034,33 @@ msgstr "personnalisation, des paquets"
 #. type: Plain text
 #: doc/guix.texi:325
 msgid ""
-"Guix includes package definitions for many GNU and non-GNU packages, all of which @uref{https://www.gnu.org/philosophy/free-sw.html, "
-"respect the user's computing freedom}.  It is @emph{extensible}: users can write their own package definitions (@pxref{Defining "
-"Packages}) and make them available as independent package modules (@pxref{Package Modules}).  It is also @emph{customizable}: users "
-"can @emph{derive} specialized package definitions from existing ones, including from the command line (@pxref{Package Transformation "
-"Options})."
+"Guix includes package definitions for many GNU and non-GNU packages, all of "
+"which @uref{https://www.gnu.org/philosophy/free-sw.html, respect the user's "
+"computing freedom}.  It is @emph{extensible}: users can write their own "
+"package definitions (@pxref{Defining Packages}) and make them available as "
+"independent package modules (@pxref{Package Modules}).  It is also "
+"@emph{customizable}: users can @emph{derive} specialized package definitions "
+"from existing ones, including from the command line (@pxref{Package "
+"Transformation Options})."
 msgstr ""
-"Guix contient de nombreuses définitions de paquet GNU et non-GNU qui respectent tous les @uref{https://www.gnu.org/philosophy/free-"
-"sw.fr.html, libertés de l'utilisateur}. Il est @emph{extensible} : les utilisateurs peuvent écrire leurs propres définitions de "
-"paquets (@pxref{Defining Packages}) et les rendre disponibles dans des modules de paquets indépendants (@pxref{Package Modules}). Il "
-"est aussi @emph{personnalisable} : les utilisateurs peuvent @emph{dériver} des définitions de paquets spécialisées à partir de "
-"définitions existantes, même depuis la ligne de commande (@pxref{Package Transformation Options})."
+"Guix contient de nombreuses définitions de paquet GNU et non-GNU qui "
+"respectent tous les @uref{https://www.gnu.org/philosophy/free-sw.fr.html, "
+"libertés de l'utilisateur}. Il est @emph{extensible} : les utilisateurs "
+"peuvent écrire leurs propres définitions de paquets (@pxref{Defining "
+"Packages}) et les rendre disponibles dans des modules de paquets "
+"indépendants (@pxref{Package Modules}). Il est aussi "
+"@emph{personnalisable} : les utilisateurs peuvent @emph{dériver} des "
+"définitions de paquets spécialisées à partir de définitions existantes, même "
+"depuis la ligne de commande (@pxref{Package Transformation Options})."
 
 #. type: cindex
-#: doc/guix.texi:326 doc/guix.texi:7980 doc/guix.texi:8058
+#: doc/guix.texi:326 doc/guix.texi:7984 doc/guix.texi:8062
 #, no-wrap
 msgid "Guix System Distribution"
 msgstr "Distribution Système Guix"
 
 #. type: cindex
-#: doc/guix.texi:327 doc/guix.texi:7981
+#: doc/guix.texi:327 doc/guix.texi:7985
 #, no-wrap
 msgid "GuixSD"
 msgstr "GuixSD"
@@ -1817,15 +3068,22 @@ msgstr "GuixSD"
 #. type: Plain text
 #: doc/guix.texi:336
 msgid ""
-"You can install GNU@tie{}Guix on top of an existing GNU/Linux system where it complements the available tools without interference "
-"(@pxref{Installation}), or you can use it as part of the standalone @dfn{Guix System Distribution} or GuixSD (@pxref{GNU "
-"Distribution}).  With GNU@tie{}GuixSD, you @emph{declare} all aspects of the operating system configuration and Guix takes care of "
-"instantiating the configuration in a transactional, reproducible, and stateless fashion (@pxref{System Configuration})."
+"You can install GNU@tie{}Guix on top of an existing GNU/Linux system where "
+"it complements the available tools without interference "
+"(@pxref{Installation}), or you can use it as part of the standalone "
+"@dfn{Guix System Distribution} or GuixSD (@pxref{GNU Distribution}).  With "
+"GNU@tie{}GuixSD, you @emph{declare} all aspects of the operating system "
+"configuration and Guix takes care of instantiating the configuration in a "
+"transactional, reproducible, and stateless fashion (@pxref{System "
+"Configuration})."
 msgstr ""
-"Vous pouvez installer GNU@tie{}Guix sur un système GNU/Linux existant pour compléter les outils disponibles sans interférence "
-"(@pxref{Installation}) ou vous pouvez l'utiliser à travers la @dfn{Distribution Système Guix} ou GuixSD (@pxref{Distribution GNU}) "
-"distincte. Avec GNU@tie{}GuixSD, vous @emph{déclarez} tous les aspects de la configuration du système d'exploitation et Guix "
-"s'occupe de créer la configuration d'une manière transactionnelle, reproductible et sans état (@pxref{Configuration système})."
+"Vous pouvez installer GNU@tie{}Guix sur un système GNU/Linux existant pour "
+"compléter les outils disponibles sans interférence (@pxref{Installation}) ou "
+"vous pouvez l'utiliser à travers la @dfn{Distribution Système Guix} ou "
+"GuixSD (@pxref{Distribution GNU}) distincte. Avec GNU@tie{}GuixSD, vous "
+"@emph{déclarez} tous les aspects de la configuration du système "
+"d'exploitation et Guix s'occupe de créer la configuration d'une manière "
+"transactionnelle, reproductible et sans état (@pxref{Configuration système})."
 
 #. type: cindex
 #: doc/guix.texi:337
@@ -1836,23 +3094,36 @@ msgstr "gestion de paquet fonctionnelle"
 #. type: Plain text
 #: doc/guix.texi:352
 msgid ""
-"Under the hood, Guix implements the @dfn{functional package management} discipline pioneered by Nix (@pxref{Acknowledgments}).  In "
-"Guix, the package build and installation process is seen as a @emph{function}, in the mathematical sense.  That function takes "
-"inputs, such as build scripts, a compiler, and libraries, and returns an installed package.  As a pure function, its result depends "
-"solely on its inputs---for instance, it cannot refer to software or scripts that were not explicitly passed as inputs.  A build "
-"function always produces the same result when passed a given set of inputs.  It cannot alter the environment of the running system "
-"in any way; for instance, it cannot create, modify, or delete files outside of its build and installation directories.  This is "
-"achieved by running build processes in isolated environments (or @dfn{containers}), where only their explicit inputs are visible."
+"Under the hood, Guix implements the @dfn{functional package management} "
+"discipline pioneered by Nix (@pxref{Acknowledgments}).  In Guix, the package "
+"build and installation process is seen as a @emph{function}, in the "
+"mathematical sense.  That function takes inputs, such as build scripts, a "
+"compiler, and libraries, and returns an installed package.  As a pure "
+"function, its result depends solely on its inputs---for instance, it cannot "
+"refer to software or scripts that were not explicitly passed as inputs.  A "
+"build function always produces the same result when passed a given set of "
+"inputs.  It cannot alter the environment of the running system in any way; "
+"for instance, it cannot create, modify, or delete files outside of its build "
+"and installation directories.  This is achieved by running build processes "
+"in isolated environments (or @dfn{containers}), where only their explicit "
+"inputs are visible."
 msgstr ""
-"Sous le capot, Guix implémente la discipline de @dfn{gestion de paquet fonctionnel} inventé par Nix (@pxref{Remerciements}). Dans "
-"Guix le processus de construction et d'installation des paquets est vu comme une @emph{fonction} dans le sens mathématique du terme. "
-"Cette fonction a des entrées (comme des scripts de construction, un compilateur et des bibliothèques) et renvoie un paquet installé. "
-"En tant que fonction pure, son résultat ne dépend que de ses entrées. Par exemple, il ne peut pas faire référence à des logiciels ou "
-"des scripts qui n'ont pas été explicitement passés en entrée. Une fonction de construction produit toujours le même résultat quand "
-"on lui donne le même ensemble d'entrée. Elle ne peut pas modifier l'environnement du système en cours d'exécution d'aucune manière ; "
-"par exemple elle ne peut pas créer, modifier ou supprimer des fichiers en dehors de ses répertoires de construction et "
-"d'installation. Ce résultat s'obtient en lançant les processus de construction dans des environnements isolés (ou des "
-"@dfn{conteneurs}) où seules les entrées explicites sont visibles."
+"Sous le capot, Guix implémente la discipline de @dfn{gestion de paquet "
+"fonctionnel} inventé par Nix (@pxref{Remerciements}). Dans Guix le processus "
+"de construction et d'installation des paquets est vu comme une "
+"@emph{fonction} dans le sens mathématique du terme. Cette fonction a des "
+"entrées (comme des scripts de construction, un compilateur et des "
+"bibliothèques) et renvoie un paquet installé. En tant que fonction pure, son "
+"résultat ne dépend que de ses entrées. Par exemple, il ne peut pas faire "
+"référence à des logiciels ou des scripts qui n'ont pas été explicitement "
+"passés en entrée. Une fonction de construction produit toujours le même "
+"résultat quand on lui donne le même ensemble d'entrée. Elle ne peut pas "
+"modifier l'environnement du système en cours d'exécution d'aucune manière ; "
+"par exemple elle ne peut pas créer, modifier ou supprimer des fichiers en "
+"dehors de ses répertoires de construction et d'installation. Ce résultat "
+"s'obtient en lançant les processus de construction dans des environnements "
+"isolés (ou des @dfn{conteneurs}) où seules les entrées explicites sont "
+"visibles."
 
 #. type: cindex
 #: doc/guix.texi:353 doc/guix.texi:4186
@@ -1863,24 +3134,31 @@ msgstr "dépôt"
 #. type: Plain text
 #: doc/guix.texi:360
 msgid ""
-"The result of package build functions is @dfn{cached} in the file system, in a special directory called @dfn{the store} (@pxref{The "
-"Store}).  Each package is installed in a directory of its own in the store---by default under @file{/gnu/store}.  The directory name "
-"contains a hash of all the inputs used to build that package; thus, changing an input yields a different directory name."
+"The result of package build functions is @dfn{cached} in the file system, in "
+"a special directory called @dfn{the store} (@pxref{The Store}).  Each "
+"package is installed in a directory of its own in the store---by default "
+"under @file{/gnu/store}.  The directory name contains a hash of all the "
+"inputs used to build that package; thus, changing an input yields a "
+"different directory name."
 msgstr ""
-"Le résultat des fonctions de construction de paquets est mis en @dfn{cache} dans le système de fichier, dans répertoire spécial "
-"appelé le @dfn{dépôt} (@pxref{The Store}). Chaque paquet est installé dans son répertoire propre dans le dépôt — par défaut dans "
-"@file{/gnu/store}. Le nom du répertoire contient un hash de toutes les entrées utilisées pour construire le paquet ; ainsi, changer "
-"une entrée donnera un nom de répertoire différent."
+"Le résultat des fonctions de construction de paquets est mis en @dfn{cache} "
+"dans le système de fichier, dans répertoire spécial appelé le @dfn{dépôt} "
+"(@pxref{The Store}). Chaque paquet est installé dans son répertoire propre "
+"dans le dépôt — par défaut dans @file{/gnu/store}. Le nom du répertoire "
+"contient un hash de toutes les entrées utilisées pour construire le paquet ; "
+"ainsi, changer une entrée donnera un nom de répertoire différent."
 
 #. type: Plain text
 #: doc/guix.texi:364
 msgid ""
-"This approach is the foundation for the salient features of Guix: support for transactional package upgrade and rollback, per-user "
-"installation, and garbage collection of packages (@pxref{Features})."
+"This approach is the foundation for the salient features of Guix: support "
+"for transactional package upgrade and rollback, per-user installation, and "
+"garbage collection of packages (@pxref{Features})."
 msgstr ""
-"Cette approche est le fondement des fonctionnalités les plus importante de Guix : le support des mises à jour des paquets et des "
-"retours en arrière transactionnels, l'installation différenciée par utilisateur et le ramassage de miettes pour les paquets "
-"(@pxref{Fonctionnalités})."
+"Cette approche est le fondement des fonctionnalités les plus importante de "
+"Guix : le support des mises à jour des paquets et des retours en arrière "
+"transactionnels, l'installation différenciée par utilisateur et le ramassage "
+"de miettes pour les paquets (@pxref{Fonctionnalités})."
 
 #. type: cindex
 #: doc/guix.texi:370
@@ -1891,20 +3169,27 @@ msgstr "installer Guix"
 #. type: Plain text
 #: doc/guix.texi:375
 msgid ""
-"GNU Guix is available for download from its website at @url{http://www.gnu.org/software/guix/}.  This section describes the software "
-"requirements of Guix, as well as how to install it and get ready to use it."
+"GNU Guix is available for download from its website at @url{http://www.gnu."
+"org/software/guix/}.  This section describes the software requirements of "
+"Guix, as well as how to install it and get ready to use it."
 msgstr ""
-"GNU Guix est disponible au téléchargement depuis son site web sur @url{http://www.gnu.org/software/guix/}. Cette section décrit les "
-"pré-requis logiciels de Guix ainsi que la manière de l'installer et de se préparer à l'utiliser."
+"GNU Guix est disponible au téléchargement depuis son site web sur "
+"@url{http://www.gnu.org/software/guix/}. Cette section décrit les pré-requis "
+"logiciels de Guix ainsi que la manière de l'installer et de se préparer à "
+"l'utiliser."
 
 #. type: Plain text
 #: doc/guix.texi:380
 msgid ""
-"Note that this section is concerned with the installation of the package manager, which can be done on top of a running GNU/Linux "
-"system.  If, instead, you want to install the complete GNU operating system, @pxref{System Installation}."
+"Note that this section is concerned with the installation of the package "
+"manager, which can be done on top of a running GNU/Linux system.  If, "
+"instead, you want to install the complete GNU operating system, "
+"@pxref{System Installation}."
 msgstr ""
-"Remarquez que cette section concerne l'installation du gestionnaire de paquet, ce qui se fait sur un système GNU/Linux en cours "
-"d'exécution. Si vous souhaitez plutôt installer le système d'exploitation GNU complet, @pxref{System Installation}."
+"Remarquez que cette section concerne l'installation du gestionnaire de "
+"paquet, ce qui se fait sur un système GNU/Linux en cours d'exécution. Si "
+"vous souhaitez plutôt installer le système d'exploitation GNU complet, "
+"@pxref{System Installation}."
 
 #. type: cindex
 #: doc/guix.texi:381 doc/guix.texi:1444
@@ -1915,18 +3200,26 @@ msgstr "distro extérieure"
 #. type: Plain text
 #: doc/guix.texi:387
 msgid ""
-"When installed on a running GNU/Linux system---thereafter called a @dfn{foreign distro}---GNU@tie{}Guix complements the available "
-"tools without interference.  Its data lives exclusively in two directories, usually @file{/gnu/store} and @file{/var/guix}; other "
-"files on your system, such as @file{/etc}, are left untouched."
+"When installed on a running GNU/Linux system---thereafter called a "
+"@dfn{foreign distro}---GNU@tie{}Guix complements the available tools without "
+"interference.  Its data lives exclusively in two directories, usually @file{/"
+"gnu/store} and @file{/var/guix}; other files on your system, such as @file{/"
+"etc}, are left untouched."
 msgstr ""
-"Lorsqu'il est installé sur an système GNU/Linux existant — ci-après nommé @dfn{distro extérieure} — GNU@tie{}Guix complète les "
-"outils disponibles sans interférence. Ses données se trouvent exclusivement dans deux répertoires, typiquement @file{/gnu/store} et "
-"@file{/var/guix} ; les autres fichiers de votre système comme @file{/etc} sont laissés intacts."
+"Lorsqu'il est installé sur an système GNU/Linux existant — ci-après nommé "
+"@dfn{distro extérieure} — GNU@tie{}Guix complète les outils disponibles sans "
+"interférence. Ses données se trouvent exclusivement dans deux répertoires, "
+"typiquement @file{/gnu/store} et @file{/var/guix} ; les autres fichiers de "
+"votre système comme @file{/etc} sont laissés intacts."
 
 #. type: Plain text
 #: doc/guix.texi:390
-msgid "Once installed, Guix can be updated by running @command{guix pull} (@pxref{Invoking guix pull})."
-msgstr "Une fois installé, Guix peut être mis à jour en lançant @command{guix pull} (@pxref{Invoking guix pull})."
+msgid ""
+"Once installed, Guix can be updated by running @command{guix pull} "
+"(@pxref{Invoking guix pull})."
+msgstr ""
+"Une fois installé, Guix peut être mis à jour en lançant @command{guix pull} "
+"(@pxref{Invoking guix pull})."
 
 #. type: cindex
 #: doc/guix.texi:403
@@ -1937,16 +3230,20 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:409
 msgid ""
-"This section describes how to install Guix on an arbitrary system from a self-contained tarball providing binaries for Guix and for "
-"all its dependencies.  This is often quicker than installing from source, which is described in the next sections.  The only "
-"requirement is to have GNU@tie{}tar and Xz."
+"This section describes how to install Guix on an arbitrary system from a "
+"self-contained tarball providing binaries for Guix and for all its "
+"dependencies.  This is often quicker than installing from source, which is "
+"described in the next sections.  The only requirement is to have GNU@tie{}"
+"tar and Xz."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:414
 msgid ""
-"We provide a @uref{https://git.savannah.gnu.org/cgit/guix.git/plain/etc/guix-install.sh, shell installer script}, which automates "
-"the download, installation, and initial configuration of Guix.  It should be run as the root user."
+"We provide a @uref{https://git.savannah.gnu.org/cgit/guix.git/plain/etc/guix-"
+"install.sh, shell installer script}, which automates the download, "
+"installation, and initial configuration of Guix.  It should be run as the "
+"root user."
 msgstr ""
 
 #. type: Plain text
@@ -1963,14 +3260,17 @@ msgstr ""
 #. type: enumerate
 #: doc/guix.texi:424
 msgid ""
-"Download the binary tarball from @indicateurl{ftp://alpha.gnu.org/gnu/guix/guix-binary-@value{VERSION}.@var{system}.tar.xz}, where "
-"@var{system} is @code{x86_64-linux} for an @code{x86_64} machine already running the kernel Linux, and so on."
+"Download the binary tarball from @indicateurl{ftp://alpha.gnu.org/gnu/guix/"
+"guix-binary-@value{VERSION}.@var{system}.tar.xz}, where @var{system} is "
+"@code{x86_64-linux} for an @code{x86_64} machine already running the kernel "
+"Linux, and so on."
 msgstr ""
 
 #. type: enumerate
 #: doc/guix.texi:428
 msgid ""
-"Make sure to download the associated @file{.sig} file and to verify the authenticity of the tarball against it, along these lines:"
+"Make sure to download the associated @file{.sig} file and to verify the "
+"authenticity of the tarball against it, along these lines:"
 msgstr ""
 
 #. type: example
@@ -1982,26 +3282,29 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:436 doc/guix.texi:8194
-msgid "If that command fails because you do not have the required public key, then run this command to import it:"
+#: doc/guix.texi:436 doc/guix.texi:8198
+msgid ""
+"If that command fails because you do not have the required public key, then "
+"run this command to import it:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:439 doc/guix.texi:8197
+#: doc/guix.texi:439 doc/guix.texi:8201
 #, no-wrap
 msgid "$ gpg --keyserver pgp.mit.edu --recv-keys @value{OPENPGP-SIGNING-KEY-ID}\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:444 doc/guix.texi:8202
+#: doc/guix.texi:444 doc/guix.texi:8206
 msgid "and rerun the @code{gpg --verify} command."
 msgstr ""
 
 #. type: enumerate
 #: doc/guix.texi:448
 msgid ""
-"Now, you need to become the @code{root} user.  Depending on your distribution, you may have to run @code{su -} or @code{sudo -i}.  "
-"As @code{root}, run:"
+"Now, you need to become the @code{root} user.  Depending on your "
+"distribution, you may have to run @code{su -} or @code{sudo -i}.  As "
+"@code{root}, run:"
 msgstr ""
 
 #. type: example
@@ -2017,22 +3320,27 @@ msgstr ""
 #. type: enumerate
 #: doc/guix.texi:459
 msgid ""
-"This creates @file{/gnu/store} (@pxref{The Store}) and @file{/var/guix}.  The latter contains a ready-to-use profile for @code{root} "
-"(see next step.)"
+"This creates @file{/gnu/store} (@pxref{The Store}) and @file{/var/guix}.  "
+"The latter contains a ready-to-use profile for @code{root} (see next step.)"
 msgstr ""
 
 #. type: enumerate
 #: doc/guix.texi:462
-msgid "Do @emph{not} unpack the tarball on a working Guix system since that would overwrite its own essential files."
+msgid ""
+"Do @emph{not} unpack the tarball on a working Guix system since that would "
+"overwrite its own essential files."
 msgstr ""
 
 #. type: enumerate
 #: doc/guix.texi:472
 msgid ""
-"The @code{--warning=no-timestamp} option makes sure GNU@tie{}tar does not emit warnings about ``implausibly old time stamps'' (such "
-"warnings were triggered by GNU@tie{}tar 1.26 and older; recent versions are fine.)  They stem from the fact that all the files in "
-"the archive have their modification time set to zero (which means January 1st, 1970.)  This is done on purpose to make sure the "
-"archive content is independent of its creation time, thus making it reproducible."
+"The @code{--warning=no-timestamp} option makes sure GNU@tie{}tar does not "
+"emit warnings about ``implausibly old time stamps'' (such warnings were "
+"triggered by GNU@tie{}tar 1.26 and older; recent versions are fine.)  They "
+"stem from the fact that all the files in the archive have their modification "
+"time set to zero (which means January 1st, 1970.)  This is done on purpose "
+"to make sure the archive content is independent of its creation time, thus "
+"making it reproducible."
 msgstr ""
 
 #. type: enumerate
@@ -2050,7 +3358,9 @@ msgstr ""
 
 #. type: enumerate
 #: doc/guix.texi:483
-msgid "Source @file{etc/profile} to augment @code{PATH} and other relevant environment variables:"
+msgid ""
+"Source @file{etc/profile} to augment @code{PATH} and other relevant "
+"environment variables:"
 msgstr ""
 
 #. type: example
@@ -2063,7 +3373,9 @@ msgstr ""
 
 #. type: enumerate
 #: doc/guix.texi:492
-msgid "Create the group and user accounts for build users as explained below (@pxref{Build Environment Setup})."
+msgid ""
+"Create the group and user accounts for build users as explained below "
+"(@pxref{Build Environment Setup})."
 msgstr ""
 
 #. type: enumerate
@@ -2073,7 +3385,9 @@ msgstr ""
 
 #. type: enumerate
 #: doc/guix.texi:498
-msgid "If your host distro uses the systemd init system, this can be achieved with these commands:"
+msgid ""
+"If your host distro uses the systemd init system, this can be achieved with "
+"these commands:"
 msgstr ""
 
 #. type: example
@@ -2086,7 +3400,7 @@ msgid ""
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:513 doc/guix.texi:7631
+#: doc/guix.texi:513 doc/guix.texi:7635
 msgid "If your host distro uses the Upstart init system:"
 msgstr ""
 
@@ -2112,7 +3426,9 @@ msgstr ""
 
 #. type: enumerate
 #: doc/guix.texi:529
-msgid "Make the @command{guix} command available to other users on the machine, for instance with:"
+msgid ""
+"Make the @command{guix} command available to other users on the machine, for "
+"instance with:"
 msgstr ""
 
 #. type: example
@@ -2126,7 +3442,9 @@ msgstr ""
 
 #. type: enumerate
 #: doc/guix.texi:538
-msgid "It is also a good idea to make the Info version of this manual available there:"
+msgid ""
+"It is also a good idea to make the Info version of this manual available "
+"there:"
 msgstr ""
 
 #. type: example
@@ -2142,20 +3460,26 @@ msgstr ""
 #. type: enumerate
 #: doc/guix.texi:550
 msgid ""
-"That way, assuming @file{/usr/local/share/info} is in the search path, running @command{info guix} will open this manual "
-"(@pxref{Other Info Directories,,, texinfo, GNU Texinfo}, for more details on changing the Info search path.)"
+"That way, assuming @file{/usr/local/share/info} is in the search path, "
+"running @command{info guix} will open this manual (@pxref{Other Info "
+"Directories,,, texinfo, GNU Texinfo}, for more details on changing the Info "
+"search path.)"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:552 doc/guix.texi:2304 doc/guix.texi:10190
+#: doc/guix.texi:552 doc/guix.texi:2304 doc/guix.texi:10194
 #, no-wrap
 msgid "substitutes, authorization thereof"
 msgstr ""
 
 #. type: enumerate
 #: doc/guix.texi:555
-msgid "To use substitutes from @code{hydra.gnu.org} or one of its mirrors (@pxref{Substitutes}), authorize them:"
-msgstr "Pour utiliser les substituts de @code{hydra.gnu.org} ou l'un de ses mirroirs (@pxref{Substituts}), autorisez-les :"
+msgid ""
+"To use substitutes from @code{hydra.gnu.org} or one of its mirrors "
+"(@pxref{Substitutes}), authorize them:"
+msgstr ""
+"Pour utiliser les substituts de @code{hydra.gnu.org} ou l'un de ses mirroirs "
+"(@pxref{Substituts}), autorisez-les :"
 
 #. type: example
 #: doc/guix.texi:558
@@ -2165,7 +3489,9 @@ msgstr ""
 
 #. type: enumerate
 #: doc/guix.texi:563
-msgid "Each user may need to perform a few additional steps to make their Guix environment ready for use, @pxref{Application Setup}."
+msgid ""
+"Each user may need to perform a few additional steps to make their Guix "
+"environment ready for use, @pxref{Application Setup}."
 msgstr ""
 
 #. type: Plain text
@@ -2175,7 +3501,9 @@ msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:569
-msgid "You can confirm that Guix is working by installing a sample package into the root profile:"
+msgid ""
+"You can confirm that Guix is working by installing a sample package into the "
+"root profile:"
 msgstr ""
 
 #. type: example
@@ -2187,15 +3515,18 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:579
 msgid ""
-"The @code{guix} package must remain available in @code{root}'s profile, or it would become subject to garbage collection---in which "
-"case you would find yourself badly handicapped by the lack of the @command{guix} command.  In other words, do not remove @code{guix} "
-"by running @code{guix package -r guix}."
+"The @code{guix} package must remain available in @code{root}'s profile, or "
+"it would become subject to garbage collection---in which case you would find "
+"yourself badly handicapped by the lack of the @command{guix} command.  In "
+"other words, do not remove @code{guix} by running @code{guix package -r "
+"guix}."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:582
 msgid ""
-"The binary installation tarball can be (re)produced and verified simply by running the following command in the Guix source tree:"
+"The binary installation tarball can be (re)produced and verified simply by "
+"running the following command in the Guix source tree:"
 msgstr ""
 
 #. type: example
@@ -2223,8 +3554,10 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:603
 msgid ""
-"This section lists requirements when building Guix from source.  The build procedure for Guix is the same as for other GNU software, "
-"and is not covered here.  Please see the files @file{README} and @file{INSTALL} in the Guix source tree for additional details."
+"This section lists requirements when building Guix from source.  The build "
+"procedure for Guix is the same as for other GNU software, and is not covered "
+"here.  Please see the files @file{README} and @file{INSTALL} in the Guix "
+"source tree for additional details."
 msgstr ""
 
 #. type: Plain text
@@ -2252,13 +3585,16 @@ msgstr ""
 #. type: itemize
 #: doc/guix.texi:614
 msgid ""
-"@uref{http://gnutls.org/, GnuTLS}, specifically its Guile bindings (@pxref{Guile Preparations, how to install the GnuTLS bindings "
-"for Guile,, gnutls-guile, GnuTLS-Guile});"
+"@uref{http://gnutls.org/, GnuTLS}, specifically its Guile bindings "
+"(@pxref{Guile Preparations, how to install the GnuTLS bindings for Guile,, "
+"gnutls-guile, GnuTLS-Guile});"
 msgstr ""
 
 #. type: itemize
 #: doc/guix.texi:618
-msgid "@uref{https://gitlab.com/guile-git/guile-git, Guile-Git}, from August 2017 or later;"
+msgid ""
+"@uref{https://gitlab.com/guile-git/guile-git, Guile-Git}, from August 2017 "
+"or later;"
 msgstr ""
 
 #. type: item
@@ -2281,25 +3617,32 @@ msgstr ""
 #. type: itemize
 #: doc/guix.texi:631
 msgid ""
-"Installing @url{http://savannah.nongnu.org/projects/guile-json/, Guile-JSON} will allow you to use the @command{guix import pypi} "
-"command (@pxref{Invoking guix import}).  It is of interest primarily for developers and not for casual users."
+"Installing @url{http://savannah.nongnu.org/projects/guile-json/, Guile-JSON} "
+"will allow you to use the @command{guix import pypi} command "
+"(@pxref{Invoking guix import}).  It is of interest primarily for developers "
+"and not for casual users."
 msgstr ""
 
 #. type: itemize
 #: doc/guix.texi:638
 msgid ""
-"Support for build offloading (@pxref{Daemon Offload Setup}) and @command{guix copy} (@pxref{Invoking guix copy}) depends on "
-"@uref{https://github.com/artyom-poptsov/guile-ssh, Guile-SSH}, version 0.10.2 or later."
+"Support for build offloading (@pxref{Daemon Offload Setup}) and "
+"@command{guix copy} (@pxref{Invoking guix copy}) depends on @uref{https://"
+"github.com/artyom-poptsov/guile-ssh, Guile-SSH}, version 0.10.2 or later."
 msgstr ""
 
 #. type: itemize
 #: doc/guix.texi:642
-msgid "When @url{http://www.bzip.org, libbz2} is available, @command{guix-daemon} can use it to compress build logs."
+msgid ""
+"When @url{http://www.bzip.org, libbz2} is available, @command{guix-daemon} "
+"can use it to compress build logs."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:646
-msgid "Unless @code{--disable-daemon} was passed to @command{configure}, the following packages are also needed:"
+msgid ""
+"Unless @code{--disable-daemon} was passed to @command{configure}, the "
+"following packages are also needed:"
 msgstr ""
 
 #. type: item
@@ -2328,10 +3671,13 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:661
 msgid ""
-"When configuring Guix on a system that already has a Guix installation, be sure to specify the same state directory as the existing "
-"installation using the @code{--localstatedir} option of the @command{configure} script (@pxref{Directory Variables, "
-"@code{localstatedir},, standards, GNU Coding Standards}).  The @command{configure} script protects against unintended "
-"misconfiguration of @var{localstatedir} so you do not inadvertently corrupt your store (@pxref{The Store})."
+"When configuring Guix on a system that already has a Guix installation, be "
+"sure to specify the same state directory as the existing installation using "
+"the @code{--localstatedir} option of the @command{configure} script "
+"(@pxref{Directory Variables, @code{localstatedir},, standards, GNU Coding "
+"Standards}).  The @command{configure} script protects against unintended "
+"misconfiguration of @var{localstatedir} so you do not inadvertently corrupt "
+"your store (@pxref{The Store})."
 msgstr ""
 
 #. type: cindex
@@ -2343,18 +3689,22 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:667
 msgid ""
-"When a working installation of @url{http://nixos.org/nix/, the Nix package manager} is available, you can instead configure Guix "
-"with @code{--disable-daemon}.  In that case, Nix replaces the three dependencies above."
+"When a working installation of @url{http://nixos.org/nix/, the Nix package "
+"manager} is available, you can instead configure Guix with @code{--disable-"
+"daemon}.  In that case, Nix replaces the three dependencies above."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:677
 msgid ""
-"Guix is compatible with Nix, so it is possible to share the same store between both.  To do so, you must pass @command{configure} "
-"not only the same @code{--with-store-dir} value, but also the same @code{--localstatedir} value.  The latter is essential because it "
-"specifies where the database that stores metadata about the store is located, among other things.  The default values for Nix are "
-"@code{--with-store-dir=/nix/store} and @code{--localstatedir=/nix/var}.  Note that @code{--disable-daemon} is not required if your "
-"goal is to share the store with Nix."
+"Guix is compatible with Nix, so it is possible to share the same store "
+"between both.  To do so, you must pass @command{configure} not only the same "
+"@code{--with-store-dir} value, but also the same @code{--localstatedir} "
+"value.  The latter is essential because it specifies where the database that "
+"stores metadata about the store is located, among other things.  The default "
+"values for Nix are @code{--with-store-dir=/nix/store} and @code{--"
+"localstatedir=/nix/var}.  Note that @code{--disable-daemon} is not required "
+"if your goal is to share the store with Nix."
 msgstr ""
 
 #. type: cindex
@@ -2366,9 +3716,10 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:687
 msgid ""
-"After a successful @command{configure} and @code{make} run, it is a good idea to run the test suite.  It can help catch issues with "
-"the setup or environment, or bugs in Guix itself---and really, reporting test failures is a good way to help improve the software.  "
-"To run the test suite, type:"
+"After a successful @command{configure} and @code{make} run, it is a good "
+"idea to run the test suite.  It can help catch issues with the setup or "
+"environment, or bugs in Guix itself---and really, reporting test failures is "
+"a good way to help improve the software.  To run the test suite, type:"
 msgstr ""
 
 #. type: example
@@ -2380,14 +3731,17 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:697
 msgid ""
-"Test cases can run in parallel: you can use the @code{-j} option of GNU@tie{}make to speed things up.  The first run may take a few "
-"minutes on a recent machine; subsequent runs will be faster because the store that is created for test purposes will already have "
-"various things in cache."
+"Test cases can run in parallel: you can use the @code{-j} option of GNU@tie{}"
+"make to speed things up.  The first run may take a few minutes on a recent "
+"machine; subsequent runs will be faster because the store that is created "
+"for test purposes will already have various things in cache."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:700
-msgid "It is also possible to run a subset of the tests by defining the @code{TESTS} makefile variable as in this example:"
+msgid ""
+"It is also possible to run a subset of the tests by defining the "
+"@code{TESTS} makefile variable as in this example:"
 msgstr ""
 
 #. type: example
@@ -2399,8 +3753,9 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:708
 msgid ""
-"By default, tests results are displayed at a file level.  In order to see the details of every individual test cases, it is possible "
-"to define the @code{SCM_LOG_DRIVER_FLAGS} makefile variable as in this example:"
+"By default, tests results are displayed at a file level.  In order to see "
+"the details of every individual test cases, it is possible to define the "
+"@code{SCM_LOG_DRIVER_FLAGS} makefile variable as in this example:"
 msgstr ""
 
 #. type: example
@@ -2412,15 +3767,18 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:717
 msgid ""
-"Upon failure, please email @email{bug-guix@@gnu.org} and attach the @file{test-suite.log} file.  Please specify the Guix version "
-"being used as well as version numbers of the dependencies (@pxref{Requirements}) in your message."
+"Upon failure, please email @email{bug-guix@@gnu.org} and attach the "
+"@file{test-suite.log} file.  Please specify the Guix version being used as "
+"well as version numbers of the dependencies (@pxref{Requirements}) in your "
+"message."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:721
 msgid ""
-"Guix also comes with a whole-system test suite that tests complete GuixSD operating system instances.  It can only run on systems "
-"where Guix is already installed, using:"
+"Guix also comes with a whole-system test suite that tests complete GuixSD "
+"operating system instances.  It can only run on systems where Guix is "
+"already installed, using:"
 msgstr ""
 
 #. type: example
@@ -2443,19 +3801,25 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:739
 msgid ""
-"These system tests are defined in the @code{(gnu tests @dots{})} modules.  They work by running the operating systems under test "
-"with lightweight instrumentation in a virtual machine (VM).  They can be computationally intensive or rather cheap, depending on "
-"whether substitutes are available for their dependencies (@pxref{Substitutes}).  Some of them require a lot of storage space to hold "
-"VM images."
+"These system tests are defined in the @code{(gnu tests @dots{})} modules.  "
+"They work by running the operating systems under test with lightweight "
+"instrumentation in a virtual machine (VM).  They can be computationally "
+"intensive or rather cheap, depending on whether substitutes are available "
+"for their dependencies (@pxref{Substitutes}).  Some of them require a lot of "
+"storage space to hold VM images."
 msgstr ""
-"Ces tests systèmes sont définis dans les modules @code{(gnu tests @dots{})}. Ils fonctionnent en lançant les systèmes d'exploitation "
-"sous test avec une instrumentation légère dans une machine virtuelle (VM). Ils peuvent être intenses en terme de calculs ou plutôt "
-"rapides en fonction de la disponibilité des substituts de leurs dépendances (@pxref{Substituts}). Certains requièrent beaucoup "
-"d'espace disque pour contenir les images des VM."
+"Ces tests systèmes sont définis dans les modules @code{(gnu tests @dots{})}. "
+"Ils fonctionnent en lançant les systèmes d'exploitation sous test avec une "
+"instrumentation légère dans une machine virtuelle (VM). Ils peuvent être "
+"intenses en terme de calculs ou plutôt rapides en fonction de la "
+"disponibilité des substituts de leurs dépendances (@pxref{Substituts}). "
+"Certains requièrent beaucoup d'espace disque pour contenir les images des VM."
 
 #. type: Plain text
 #: doc/guix.texi:742
-msgid "Again in case of test failures, please send @email{bug-guix@@gnu.org} all the details."
+msgid ""
+"Again in case of test failures, please send @email{bug-guix@@gnu.org} all "
+"the details."
 msgstr ""
 
 #. type: cindex
@@ -2467,20 +3831,25 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:754
 msgid ""
-"Operations such as building a package or running the garbage collector are all performed by a specialized process, the @dfn{build "
-"daemon}, on behalf of clients.  Only the daemon may access the store and its associated database.  Thus, any operation that "
-"manipulates the store goes through the daemon.  For instance, command-line tools such as @command{guix package} and @command{guix "
-"build} communicate with the daemon (@i{via} remote procedure calls) to instruct it what to do."
+"Operations such as building a package or running the garbage collector are "
+"all performed by a specialized process, the @dfn{build daemon}, on behalf of "
+"clients.  Only the daemon may access the store and its associated database.  "
+"Thus, any operation that manipulates the store goes through the daemon.  For "
+"instance, command-line tools such as @command{guix package} and "
+"@command{guix build} communicate with the daemon (@i{via} remote procedure "
+"calls) to instruct it what to do."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:758
 msgid ""
-"The following sections explain how to prepare the build daemon's environment.  See also @ref{Substitutes}, for information on how to "
-"allow the daemon to download pre-built binaries."
+"The following sections explain how to prepare the build daemon's "
+"environment.  See also @ref{Substitutes}, for information on how to allow "
+"the daemon to download pre-built binaries."
 msgstr ""
-"Les sections suivantes expliquent comment préparer l'environnement du démon de construction. Voir aussi @ref{Substituts} pour "
-"apprendre comment permettre le téléchargement de binaires pré-construits."
+"Les sections suivantes expliquent comment préparer l'environnement du démon "
+"de construction. Voir aussi @ref{Substituts} pour apprendre comment "
+"permettre le téléchargement de binaires pré-construits."
 
 #. type: cindex
 #: doc/guix.texi:768 doc/guix.texi:1193
@@ -2491,10 +3860,13 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:776
 msgid ""
-"In a standard multi-user setup, Guix and its daemon---the @command{guix-daemon} program---are installed by the system administrator; "
-"@file{/gnu/store} is owned by @code{root} and @command{guix-daemon} runs as @code{root}.  Unprivileged users may use Guix tools to "
-"build packages or otherwise access the store, and the daemon will do it on their behalf, ensuring that the store is kept in a "
-"consistent state, and allowing built packages to be shared among users."
+"In a standard multi-user setup, Guix and its daemon---the @command{guix-"
+"daemon} program---are installed by the system administrator; @file{/gnu/"
+"store} is owned by @code{root} and @command{guix-daemon} runs as "
+"@code{root}.  Unprivileged users may use Guix tools to build packages or "
+"otherwise access the store, and the daemon will do it on their behalf, "
+"ensuring that the store is kept in a consistent state, and allowing built "
+"packages to be shared among users."
 msgstr ""
 
 #. type: cindex
@@ -2506,17 +3878,23 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:788
 msgid ""
-"When @command{guix-daemon} runs as @code{root}, you may not want package build processes themselves to run as @code{root} too, for "
-"obvious security reasons.  To avoid that, a special pool of @dfn{build users} should be created for use by build processes started "
-"by the daemon.  These build users need not have a shell and a home directory: they will just be used when the daemon drops "
-"@code{root} privileges in build processes.  Having several such users allows the daemon to launch distinct build processes under "
-"separate UIDs, which guarantees that they do not interfere with each other---an essential feature since builds are regarded as pure "
-"functions (@pxref{Introduction})."
+"When @command{guix-daemon} runs as @code{root}, you may not want package "
+"build processes themselves to run as @code{root} too, for obvious security "
+"reasons.  To avoid that, a special pool of @dfn{build users} should be "
+"created for use by build processes started by the daemon.  These build users "
+"need not have a shell and a home directory: they will just be used when the "
+"daemon drops @code{root} privileges in build processes.  Having several such "
+"users allows the daemon to launch distinct build processes under separate "
+"UIDs, which guarantees that they do not interfere with each other---an "
+"essential feature since builds are regarded as pure functions "
+"(@pxref{Introduction})."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:791
-msgid "On a GNU/Linux system, a build user pool may be created like this (using Bash syntax and the @code{shadow} commands):"
+msgid ""
+"On a GNU/Linux system, a build user pool may be created like this (using "
+"Bash syntax and the @code{shadow} commands):"
 msgstr ""
 
 #. type: example
@@ -2536,19 +3914,24 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:813
 msgid ""
-"The number of build users determines how many build jobs may run in parallel, as specified by the @option{--max-jobs} option "
-"(@pxref{Invoking guix-daemon, @option{--max-jobs}}).  To use @command{guix system vm} and related commands, you may need to add the "
-"build users to the @code{kvm} group so they can access @file{/dev/kvm}, using @code{-G guixbuild,kvm} instead of @code{-G guixbuild} "
-"(@pxref{Invoking guix system})."
+"The number of build users determines how many build jobs may run in "
+"parallel, as specified by the @option{--max-jobs} option (@pxref{Invoking "
+"guix-daemon, @option{--max-jobs}}).  To use @command{guix system vm} and "
+"related commands, you may need to add the build users to the @code{kvm} "
+"group so they can access @file{/dev/kvm}, using @code{-G guixbuild,kvm} "
+"instead of @code{-G guixbuild} (@pxref{Invoking guix system})."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:822
 msgid ""
-"The @code{guix-daemon} program may then be run as @code{root} with the following command@footnote{If your machine uses the systemd "
-"init system, dropping the @file{@var{prefix}/lib/systemd/system/guix-daemon.service} file in @file{/etc/systemd/system} will ensure "
-"that @command{guix-daemon} is automatically started.  Similarly, if your machine uses the Upstart init system, drop the "
-"@file{@var{prefix}/lib/upstart/system/guix-daemon.conf} file in @file{/etc/init}.}:"
+"The @code{guix-daemon} program may then be run as @code{root} with the "
+"following command@footnote{If your machine uses the systemd init system, "
+"dropping the @file{@var{prefix}/lib/systemd/system/guix-daemon.service} file "
+"in @file{/etc/systemd/system} will ensure that @command{guix-daemon} is "
+"automatically started.  Similarly, if your machine uses the Upstart init "
+"system, drop the @file{@var{prefix}/lib/upstart/system/guix-daemon.conf} "
+"file in @file{/etc/init}.}:"
 msgstr ""
 
 #. type: example
@@ -2566,25 +3949,32 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:832
 msgid ""
-"This way, the daemon starts build processes in a chroot, under one of the @code{guixbuilder} users.  On GNU/Linux, by default, the "
-"chroot environment contains nothing but:"
+"This way, the daemon starts build processes in a chroot, under one of the "
+"@code{guixbuilder} users.  On GNU/Linux, by default, the chroot environment "
+"contains nothing but:"
 msgstr ""
 
 #. type: itemize
 #: doc/guix.texi:840
 msgid ""
-"a minimal @code{/dev} directory, created mostly independently from the host @code{/dev}@footnote{``Mostly'', because while the set "
-"of files that appear in the chroot's @code{/dev} is fixed, most of these files can only be created if the host has them.};"
+"a minimal @code{/dev} directory, created mostly independently from the host "
+"@code{/dev}@footnote{``Mostly'', because while the set of files that appear "
+"in the chroot's @code{/dev} is fixed, most of these files can only be "
+"created if the host has them.};"
 msgstr ""
 
 #. type: itemize
 #: doc/guix.texi:844
-msgid "the @code{/proc} directory; it only shows the processes of the container since a separate PID name space is used;"
+msgid ""
+"the @code{/proc} directory; it only shows the processes of the container "
+"since a separate PID name space is used;"
 msgstr ""
 
 #. type: itemize
 #: doc/guix.texi:848
-msgid "@file{/etc/passwd} with an entry for the current user and an entry for user @file{nobody};"
+msgid ""
+"@file{/etc/passwd} with an entry for the current user and an entry for user "
+"@file{nobody};"
 msgstr ""
 
 #. type: itemize
@@ -2594,7 +3984,9 @@ msgstr ""
 
 #. type: itemize
 #: doc/guix.texi:855
-msgid "@file{/etc/hosts} with an entry that maps @code{localhost} to @code{127.0.0.1};"
+msgid ""
+"@file{/etc/hosts} with an entry that maps @code{localhost} to "
+"@code{127.0.0.1};"
 msgstr ""
 
 #. type: itemize
@@ -2605,10 +3997,13 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:867
 msgid ""
-"You can influence the directory where the daemon stores build trees @i{via} the @code{TMPDIR} environment variable.  However, the "
-"build tree within the chroot is always called @file{/tmp/guix-build-@var{name}.drv-0}, where @var{name} is the derivation name---e."
-"g., @code{coreutils-8.24}.  This way, the value of @code{TMPDIR} does not leak inside build environments, which avoids discrepancies "
-"in cases where build processes capture the name of their build tree."
+"You can influence the directory where the daemon stores build trees @i{via} "
+"the @code{TMPDIR} environment variable.  However, the build tree within the "
+"chroot is always called @file{/tmp/guix-build-@var{name}.drv-0}, where "
+"@var{name} is the derivation name---e.g., @code{coreutils-8.24}.  This way, "
+"the value of @code{TMPDIR} does not leak inside build environments, which "
+"avoids discrepancies in cases where build processes capture the name of "
+"their build tree."
 msgstr ""
 
 #. type: vindex
@@ -2620,19 +4015,23 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:872
 msgid ""
-"The daemon also honors the @code{http_proxy} environment variable for HTTP downloads it performs, be it for fixed-output derivations "
+"The daemon also honors the @code{http_proxy} environment variable for HTTP "
+"downloads it performs, be it for fixed-output derivations "
 "(@pxref{Derivations}) or for substitutes (@pxref{Substitutes})."
 msgstr ""
-"Le démon tient aussi compte de la variable d'environnement @code{http_proxy} pour ses téléchargements HTTP, que ce soit pour les "
-"dérivations à sortie fixes (@pxref{Derivations}) ou pour les substituts (@pxref{Substituts})."
+"Le démon tient aussi compte de la variable d'environnement @code{http_proxy} "
+"pour ses téléchargements HTTP, que ce soit pour les dérivations à sortie "
+"fixes (@pxref{Derivations}) ou pour les substituts (@pxref{Substituts})."
 
 #. type: Plain text
 #: doc/guix.texi:880
 msgid ""
-"If you are installing Guix as an unprivileged user, it is still possible to run @command{guix-daemon} provided you pass @code{--"
-"disable-chroot}.  However, build processes will not be isolated from one another, and not from the rest of the system.  Thus, build "
-"processes may interfere with each other, and may access programs, libraries, and other files available on the system---making it "
-"much harder to view them as @emph{pure} functions."
+"If you are installing Guix as an unprivileged user, it is still possible to "
+"run @command{guix-daemon} provided you pass @code{--disable-chroot}.  "
+"However, build processes will not be isolated from one another, and not from "
+"the rest of the system.  Thus, build processes may interfere with each "
+"other, and may access programs, libraries, and other files available on the "
+"system---making it much harder to view them as @emph{pure} functions."
 msgstr ""
 
 #. type: subsection
@@ -2656,13 +4055,18 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:900
 msgid ""
-"When desired, the build daemon can @dfn{offload} derivation builds to other machines running Guix, using the @code{offload} "
-"@dfn{build hook}@footnote{This feature is available only when @uref{https://github.com/artyom-poptsov/guile-ssh, Guile-SSH} is "
-"present.}.  When that feature is enabled, a list of user-specified build machines is read from @file{/etc/guix/machines.scm}; every "
-"time a build is requested, for instance via @code{guix build}, the daemon attempts to offload it to one of the machines that satisfy "
-"the constraints of the derivation, in particular its system type---e.g., @file{x86_64-linux}.  Missing prerequisites for the build "
-"are copied over SSH to the target machine, which then proceeds with the build; upon success the output(s) of the build are copied "
-"back to the initial machine."
+"When desired, the build daemon can @dfn{offload} derivation builds to other "
+"machines running Guix, using the @code{offload} @dfn{build hook}"
+"@footnote{This feature is available only when @uref{https://github.com/"
+"artyom-poptsov/guile-ssh, Guile-SSH} is present.}.  When that feature is "
+"enabled, a list of user-specified build machines is read from @file{/etc/"
+"guix/machines.scm}; every time a build is requested, for instance via "
+"@code{guix build}, the daemon attempts to offload it to one of the machines "
+"that satisfy the constraints of the derivation, in particular its system "
+"type---e.g., @file{x86_64-linux}.  Missing prerequisites for the build are "
+"copied over SSH to the target machine, which then proceeds with the build; "
+"upon success the output(s) of the build are copied back to the initial "
+"machine."
 msgstr ""
 
 #. type: Plain text
@@ -2700,17 +4104,20 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:925
 msgid ""
-"In the example above we specify a list of two build machines, one for the @code{x86_64} architecture and one for the @code{mips64el} "
-"architecture."
+"In the example above we specify a list of two build machines, one for the "
+"@code{x86_64} architecture and one for the @code{mips64el} architecture."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:934
 msgid ""
-"In fact, this file is---not surprisingly!---a Scheme file that is evaluated when the @code{offload} hook is started.  Its return "
-"value must be a list of @code{build-machine} objects.  While this example shows a fixed list of build machines, one could imagine, "
-"say, using DNS-SD to return a list of potential build machines discovered in the local network (@pxref{Introduction, Guile-Avahi,, "
-"guile-avahi, Using Avahi in Guile Scheme Programs}).  The @code{build-machine} data type is detailed below."
+"In fact, this file is---not surprisingly!---a Scheme file that is evaluated "
+"when the @code{offload} hook is started.  Its return value must be a list of "
+"@code{build-machine} objects.  While this example shows a fixed list of "
+"build machines, one could imagine, say, using DNS-SD to return a list of "
+"potential build machines discovered in the local network "
+"(@pxref{Introduction, Guile-Avahi,, guile-avahi, Using Avahi in Guile Scheme "
+"Programs}).  The @code{build-machine} data type is detailed below."
 msgstr ""
 
 #. type: deftp
@@ -2721,13 +4128,17 @@ msgstr ""
 
 #. type: deftp
 #: doc/guix.texi:938
-msgid "This data type represents build machines to which the daemon may offload builds.  The important fields are:"
+msgid ""
+"This data type represents build machines to which the daemon may offload "
+"builds.  The important fields are:"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:941 doc/guix.texi:3402 doc/guix.texi:9402 doc/guix.texi:9466 doc/guix.texi:9561 doc/guix.texi:10951
-#: doc/guix.texi:14988 doc/guix.texi:15221 doc/guix.texi:15354 doc/guix.texi:15628 doc/guix.texi:15669 doc/guix.texi:19601
-#: doc/guix.texi:19618 doc/guix.texi:19884 doc/guix.texi:21092
+#: doc/guix.texi:941 doc/guix.texi:3402 doc/guix.texi:9406 doc/guix.texi:9470
+#: doc/guix.texi:9565 doc/guix.texi:11000 doc/guix.texi:15037
+#: doc/guix.texi:15270 doc/guix.texi:15403 doc/guix.texi:15677
+#: doc/guix.texi:15718 doc/guix.texi:19663 doc/guix.texi:19680
+#: doc/guix.texi:19946 doc/guix.texi:21154
 #, no-wrap
 msgid "name"
 msgstr ""
@@ -2749,7 +4160,7 @@ msgid "The system type of the remote machine---e.g., @code{\"x86_64-linux\"}."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:947 doc/guix.texi:10961
+#: doc/guix.texi:947 doc/guix.texi:11010
 #, no-wrap
 msgid "user"
 msgstr ""
@@ -2757,8 +4168,9 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:951
 msgid ""
-"The user account to use when connecting to the remote machine over SSH.  Note that the SSH key pair must @emph{not} be passphrase-"
-"protected, to allow non-interactive logins."
+"The user account to use when connecting to the remote machine over SSH.  "
+"Note that the SSH key pair must @emph{not} be passphrase-protected, to allow "
+"non-interactive logins."
 msgstr ""
 
 #. type: item
@@ -2770,8 +4182,9 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:956
 msgid ""
-"This must be the machine's SSH @dfn{public host key} in OpenSSH format.  This is used to authenticate the machine when we connect to "
-"it.  It is a long string that looks like this:"
+"This must be the machine's SSH @dfn{public host key} in OpenSSH format.  "
+"This is used to authenticate the machine when we connect to it.  It is a "
+"long string that looks like this:"
 msgstr ""
 
 #. type: example
@@ -2783,15 +4196,17 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:964
 msgid ""
-"If the machine is running the OpenSSH daemon, @command{sshd}, the host key can be found in a file such as @file{/etc/ssh/"
-"ssh_host_ed25519_key.pub}."
+"If the machine is running the OpenSSH daemon, @command{sshd}, the host key "
+"can be found in a file such as @file{/etc/ssh/ssh_host_ed25519_key.pub}."
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:969
 msgid ""
-"If the machine is running the SSH daemon of GNU@tie{}lsh, @command{lshd}, the host key is in @file{/etc/lsh/host-key.pub} or a "
-"similar file.  It can be converted to the OpenSSH format using @command{lsh-export-key} (@pxref{Converting keys,,, lsh, LSH Manual}):"
+"If the machine is running the SSH daemon of GNU@tie{}lsh, @command{lshd}, "
+"the host key is in @file{/etc/lsh/host-key.pub} or a similar file.  It can "
+"be converted to the OpenSSH format using @command{lsh-export-key} "
+"(@pxref{Converting keys,,, lsh, LSH Manual}):"
 msgstr ""
 
 #. type: example
@@ -2826,12 +4241,16 @@ msgstr ""
 
 #. type: table
 #: doc/guix.texi:987
-msgid "The SSH private key file to use when connecting to the machine, in OpenSSH format."
+msgid ""
+"The SSH private key file to use when connecting to the machine, in OpenSSH "
+"format."
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:990
-msgid "Note that the default value is the private key @emph{of the root account}.  Make sure it exists if you use the default."
+msgid ""
+"Note that the default value is the private key @emph{of the root account}.  "
+"Make sure it exists if you use the default."
 msgstr ""
 
 #. type: item
@@ -2841,7 +4260,7 @@ msgid "@code{compression} (default: @code{\"zlib@@openssh.com,zlib\"})"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:992 doc/guix.texi:10418
+#: doc/guix.texi:992 doc/guix.texi:10422
 #, no-wrap
 msgid "@code{compression-level} (default: @code{3})"
 msgstr ""
@@ -2853,7 +4272,9 @@ msgstr ""
 
 #. type: table
 #: doc/guix.texi:997
-msgid "Note that offloading relies on SSH compression to reduce bandwidth usage when transferring files to and from build machines."
+msgid ""
+"Note that offloading relies on SSH compression to reduce bandwidth usage "
+"when transferring files to and from build machines."
 msgstr ""
 
 #. type: item
@@ -2864,7 +4285,9 @@ msgstr ""
 
 #. type: table
 #: doc/guix.texi:1001
-msgid "File name of the Unix-domain socket @command{guix-daemon} is listening to on that machine."
+msgid ""
+"File name of the Unix-domain socket @command{guix-daemon} is listening to on "
+"that machine."
 msgstr ""
 
 #. type: item
@@ -2886,7 +4309,9 @@ msgstr ""
 
 #. type: table
 #: doc/guix.texi:1008
-msgid "A ``relative speed factor''.  The offload scheduler will tend to prefer machines with a higher speed factor."
+msgid ""
+"A ``relative speed factor''.  The offload scheduler will tend to prefer "
+"machines with a higher speed factor."
 msgstr ""
 
 #. type: item
@@ -2898,16 +4323,18 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:1014
 msgid ""
-"A list of strings denoting specific features supported by the machine.  An example is @code{\"kvm\"} for machines that have the KVM "
-"Linux modules and corresponding hardware support.  Derivations can request features by name, and they will be scheduled on matching "
-"build machines."
+"A list of strings denoting specific features supported by the machine.  An "
+"example is @code{\"kvm\"} for machines that have the KVM Linux modules and "
+"corresponding hardware support.  Derivations can request features by name, "
+"and they will be scheduled on matching build machines."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:1022
 msgid ""
-"The @code{guile} command must be in the search path on the build machines.  In addition, the Guix modules must be in "
-"@code{$GUILE_LOAD_PATH} on the build machine---you can check whether this is the case by running:"
+"The @code{guile} command must be in the search path on the build machines.  "
+"In addition, the Guix modules must be in @code{$GUILE_LOAD_PATH} on the "
+"build machine---you can check whether this is the case by running:"
 msgstr ""
 
 #. type: example
@@ -2919,9 +4346,11 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:1032
 msgid ""
-"There is one last thing to do once @file{machines.scm} is in place.  As explained above, when offloading, files are transferred back "
-"and forth between the machine stores.  For this to work, you first need to generate a key pair on each machine to allow the daemon "
-"to export signed archives of files from the store (@pxref{Invoking guix archive}):"
+"There is one last thing to do once @file{machines.scm} is in place.  As "
+"explained above, when offloading, files are transferred back and forth "
+"between the machine stores.  For this to work, you first need to generate a "
+"key pair on each machine to allow the daemon to export signed archives of "
+"files from the store (@pxref{Invoking guix archive}):"
 msgstr ""
 
 #. type: example
@@ -2932,7 +4361,9 @@ msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:1040
-msgid "Each build machine must authorize the key of the master machine so that it accepts store items it receives from the master:"
+msgid ""
+"Each build machine must authorize the key of the master machine so that it "
+"accepts store items it receives from the master:"
 msgstr ""
 
 #. type: example
@@ -2943,15 +4374,18 @@ msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:1047
-msgid "Likewise, the master machine must authorize the key of each build machine."
+msgid ""
+"Likewise, the master machine must authorize the key of each build machine."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:1053
 msgid ""
-"All the fuss with keys is here to express pairwise mutual trust relations between the master and the build machines.  Concretely, "
-"when the master receives files from a build machine (and @i{vice versa}), its build daemon can make sure they are genuine, have not "
-"been tampered with, and that they are signed by an authorized key."
+"All the fuss with keys is here to express pairwise mutual trust relations "
+"between the master and the build machines.  Concretely, when the master "
+"receives files from a build machine (and @i{vice versa}), its build daemon "
+"can make sure they are genuine, have not been tampered with, and that they "
+"are signed by an authorized key."
 msgstr ""
 
 #. type: cindex
@@ -2962,7 +4396,9 @@ msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:1057
-msgid "To test whether your setup is operational, run this command on the master node:"
+msgid ""
+"To test whether your setup is operational, run this command on the master "
+"node:"
 msgstr ""
 
 #. type: example
@@ -2974,13 +4410,17 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:1066
 msgid ""
-"This will attempt to connect to each of the build machines specified in @file{/etc/guix/machines.scm}, make sure Guile and the Guix "
-"modules are available on each machine, attempt to export to the machine and import from it, and report any error in the process."
+"This will attempt to connect to each of the build machines specified in "
+"@file{/etc/guix/machines.scm}, make sure Guile and the Guix modules are "
+"available on each machine, attempt to export to the machine and import from "
+"it, and report any error in the process."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:1069
-msgid "If you want to test a different machine file, just specify it on the command line:"
+msgid ""
+"If you want to test a different machine file, just specify it on the command "
+"line:"
 msgstr ""
 
 #. type: example
@@ -2991,7 +4431,9 @@ msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:1076
-msgid "Last, you can test the subset of the machines whose name matches a regular expression like this:"
+msgid ""
+"Last, you can test the subset of the machines whose name matches a regular "
+"expression like this:"
 msgstr ""
 
 #. type: example
@@ -3008,7 +4450,9 @@ msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:1084
-msgid "To display the current load of all build hosts, run this command on the main node:"
+msgid ""
+"To display the current load of all build hosts, run this command on the main "
+"node:"
 msgstr ""
 
 #. type: example
@@ -3038,9 +4482,11 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:1101
 msgid ""
-"Guix includes an SELinux policy file at @file{etc/guix-daemon.cil} that can be installed on a system where SELinux is enabled, in "
-"order to label Guix files and to specify the expected behavior of the daemon.  Since GuixSD does not provide an SELinux base policy, "
-"the daemon policy cannot be used on GuixSD."
+"Guix includes an SELinux policy file at @file{etc/guix-daemon.cil} that can "
+"be installed on a system where SELinux is enabled, in order to label Guix "
+"files and to specify the expected behavior of the daemon.  Since GuixSD does "
+"not provide an SELinux base policy, the daemon policy cannot be used on "
+"GuixSD."
 msgstr ""
 
 #. type: subsubsection
@@ -3068,14 +4514,17 @@ msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:1112
-msgid "Then relabel the file system with @code{restorecon} or by a different mechanism provided by your system."
+msgid ""
+"Then relabel the file system with @code{restorecon} or by a different "
+"mechanism provided by your system."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:1117
 msgid ""
-"Once the policy is installed, the file system has been relabeled, and the daemon has been restarted, it should be running in the "
-"@code{guix_daemon_t} context.  You can confirm this with the following command:"
+"Once the policy is installed, the file system has been relabeled, and the "
+"daemon has been restarted, it should be running in the @code{guix_daemon_t} "
+"context.  You can confirm this with the following command:"
 msgstr ""
 
 #. type: example
@@ -3087,8 +4536,8 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:1125
 msgid ""
-"Monitor the SELinux log files as you run a command like @code{guix build hello} to convince yourself that SELinux permits all "
-"necessary operations."
+"Monitor the SELinux log files as you run a command like @code{guix build "
+"hello} to convince yourself that SELinux permits all necessary operations."
 msgstr ""
 
 #. type: cindex
@@ -3100,52 +4549,64 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:1132
 msgid ""
-"This policy is not perfect.  Here is a list of limitations or quirks that should be considered when deploying the provided SELinux "
-"policy for the Guix daemon."
+"This policy is not perfect.  Here is a list of limitations or quirks that "
+"should be considered when deploying the provided SELinux policy for the Guix "
+"daemon."
 msgstr ""
 
 #. type: enumerate
 #: doc/guix.texi:1139
 msgid ""
-"@code{guix_daemon_socket_t} isn’t actually used.  None of the socket operations involve contexts that have anything to do with "
-"@code{guix_daemon_socket_t}.  It doesn’t hurt to have this unused label, but it would be preferrable to define socket rules for only "
-"this label."
+"@code{guix_daemon_socket_t} isn’t actually used.  None of the socket "
+"operations involve contexts that have anything to do with "
+"@code{guix_daemon_socket_t}.  It doesn’t hurt to have this unused label, but "
+"it would be preferrable to define socket rules for only this label."
 msgstr ""
 
 #. type: enumerate
 #: doc/guix.texi:1150
 msgid ""
-"@code{guix gc} cannot access arbitrary links to profiles.  By design, the file label of the destination of a symlink is independent "
-"of the file label of the link itself.  Although all profiles under $localstatedir are labelled, the links to these profiles inherit "
-"the label of the directory they are in.  For links in the user’s home directory this will be @code{user_home_t}.  But for links from "
-"the root user’s home directory, or @file{/tmp}, or the HTTP server’s working directory, etc, this won’t work.  @code{guix gc} would "
-"be prevented from reading and following these links."
+"@code{guix gc} cannot access arbitrary links to profiles.  By design, the "
+"file label of the destination of a symlink is independent of the file label "
+"of the link itself.  Although all profiles under $localstatedir are "
+"labelled, the links to these profiles inherit the label of the directory "
+"they are in.  For links in the user’s home directory this will be "
+"@code{user_home_t}.  But for links from the root user’s home directory, or "
+"@file{/tmp}, or the HTTP server’s working directory, etc, this won’t work.  "
+"@code{guix gc} would be prevented from reading and following these links."
 msgstr ""
 
 #. type: enumerate
 #: doc/guix.texi:1155
 msgid ""
-"The daemon’s feature to listen for TCP connections might no longer work.  This might require extra rules, because SELinux treats "
-"network sockets differently from files."
+"The daemon’s feature to listen for TCP connections might no longer work.  "
+"This might require extra rules, because SELinux treats network sockets "
+"differently from files."
 msgstr ""
 
 #. type: enumerate
 #: doc/guix.texi:1166
 msgid ""
-"Currently all files with a name matching the regular expression @code{/gnu/store/.+-(guix-.+|profile)/bin/guix-daemon} are assigned "
-"the label @code{guix_daemon_exec_t}; this means that @emph{any} file with that name in any profile would be permitted to run in the "
-"@code{guix_daemon_t} domain.  This is not ideal.  An attacker could build a package that provides this executable and convince a "
-"user to install and run it, which lifts it into the @code{guix_daemon_t} domain.  At that point SELinux could not prevent it from "
-"accessing files that are allowed for processes in that domain."
+"Currently all files with a name matching the regular expression @code{/gnu/"
+"store/.+-(guix-.+|profile)/bin/guix-daemon} are assigned the label "
+"@code{guix_daemon_exec_t}; this means that @emph{any} file with that name in "
+"any profile would be permitted to run in the @code{guix_daemon_t} domain.  "
+"This is not ideal.  An attacker could build a package that provides this "
+"executable and convince a user to install and run it, which lifts it into "
+"the @code{guix_daemon_t} domain.  At that point SELinux could not prevent it "
+"from accessing files that are allowed for processes in that domain."
 msgstr ""
 
 #. type: enumerate
 #: doc/guix.texi:1174
 msgid ""
-"We could generate a much more restrictive policy at installation time, so that only the @emph{exact} file name of the currently "
-"installed @code{guix-daemon} executable would be labelled with @code{guix_daemon_exec_t}, instead of using a broad regular "
-"expression.  The downside is that root would have to install or upgrade the policy at installation time whenever the Guix package "
-"that provides the effectively running @code{guix-daemon} executable is upgraded."
+"We could generate a much more restrictive policy at installation time, so "
+"that only the @emph{exact} file name of the currently installed @code{guix-"
+"daemon} executable would be labelled with @code{guix_daemon_exec_t}, instead "
+"of using a broad regular expression.  The downside is that root would have "
+"to install or upgrade the policy at installation time whenever the Guix "
+"package that provides the effectively running @code{guix-daemon} executable "
+"is upgraded."
 msgstr ""
 
 #. type: section
@@ -3157,8 +4618,10 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:1183
 msgid ""
-"The @command{guix-daemon} program implements all the functionality to access the store.  This includes launching build processes, "
-"running the garbage collector, querying the availability of a build result, etc.  It is normally run as @code{root} like this:"
+"The @command{guix-daemon} program implements all the functionality to access "
+"the store.  This includes launching build processes, running the garbage "
+"collector, querying the availability of a build result, etc.  It is normally "
+"run as @code{root} like this:"
 msgstr ""
 
 #. type: Plain text
@@ -3173,7 +4636,7 @@ msgid "container, build environment"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:1194 doc/guix.texi:1732 doc/guix.texi:2392 doc/guix.texi:7644
+#: doc/guix.texi:1194 doc/guix.texi:1732 doc/guix.texi:2392 doc/guix.texi:7648
 #, no-wrap
 msgid "reproducible builds"
 msgstr ""
@@ -3181,35 +4644,48 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:1206
 msgid ""
-"By default, @command{guix-daemon} launches build processes under different UIDs, taken from the build group specified with @code{--"
-"build-users-group}.  In addition, each build process is run in a chroot environment that only contains the subset of the store that "
-"the build process depends on, as specified by its derivation (@pxref{Programming Interface, derivation}), plus a set of specific "
-"system directories.  By default, the latter contains @file{/dev} and @file{/dev/pts}.  Furthermore, on GNU/Linux, the build "
-"environment is a @dfn{container}: in addition to having its own file system tree, it has a separate mount name space, its own PID "
-"name space, network name space, etc.  This helps achieve reproducible builds (@pxref{Features})."
+"By default, @command{guix-daemon} launches build processes under different "
+"UIDs, taken from the build group specified with @code{--build-users-group}.  "
+"In addition, each build process is run in a chroot environment that only "
+"contains the subset of the store that the build process depends on, as "
+"specified by its derivation (@pxref{Programming Interface, derivation}), "
+"plus a set of specific system directories.  By default, the latter contains "
+"@file{/dev} and @file{/dev/pts}.  Furthermore, on GNU/Linux, the build "
+"environment is a @dfn{container}: in addition to having its own file system "
+"tree, it has a separate mount name space, its own PID name space, network "
+"name space, etc.  This helps achieve reproducible builds (@pxref{Features})."
 msgstr ""
-"Par défaut, @command{guix-daemon} lance les processus de construction sous différents UID récupérés depuis le groupe de construction "
-"spécifié avec @code{--build-users-group}. En plus, chaque processus de construction est lancé dans un environnement chroot qui ne "
-"contient que le sous-ensemble du dépôt dont le processus de construction dépend, tel que spécifié par sa dérivation "
-"(@pxref{Interface de programmation, dérivation}), plus un ensemble de répertoires systèmes spécifiques. Par défaut ce dernier "
-"contient @file{/dev} et @file{/dev/pts}. De plus, sous GNU/Linux, l'environnement de construction est un @dfn{conteneur} : en plus "
-"d'avoir sa propre arborescence du système de fichier, elle a un espace de montage séparé, son propre espace de PID, son espace de "
-"réseau, etc. Cela aide à obtenir des constructions reproductibles (@pxref{Fonctionnalités})."
+"Par défaut, @command{guix-daemon} lance les processus de construction sous "
+"différents UID récupérés depuis le groupe de construction spécifié avec "
+"@code{--build-users-group}. En plus, chaque processus de construction est "
+"lancé dans un environnement chroot qui ne contient que le sous-ensemble du "
+"dépôt dont le processus de construction dépend, tel que spécifié par sa "
+"dérivation (@pxref{Interface de programmation, dérivation}), plus un "
+"ensemble de répertoires systèmes spécifiques. Par défaut ce dernier contient "
+"@file{/dev} et @file{/dev/pts}. De plus, sous GNU/Linux, l'environnement de "
+"construction est un @dfn{conteneur} : en plus d'avoir sa propre arborescence "
+"du système de fichier, elle a un espace de montage séparé, son propre espace "
+"de PID, son espace de réseau, etc. Cela aide à obtenir des constructions "
+"reproductibles (@pxref{Fonctionnalités})."
 
 #. type: Plain text
 #: doc/guix.texi:1215
 msgid ""
-"When the daemon performs a build on behalf of the user, it creates a build directory under @file{/tmp} or under the directory "
-"specified by its @code{TMPDIR} environment variable; this directory is shared with the container for the duration of the build.  Be "
-"aware that using a directory other than @file{/tmp} can affect build results---for example, with a longer directory name, a build "
-"process that uses Unix-domain sockets might hit the name length limitation for @code{sun_path}, which it would otherwise not hit."
+"When the daemon performs a build on behalf of the user, it creates a build "
+"directory under @file{/tmp} or under the directory specified by its "
+"@code{TMPDIR} environment variable; this directory is shared with the "
+"container for the duration of the build.  Be aware that using a directory "
+"other than @file{/tmp} can affect build results---for example, with a longer "
+"directory name, a build process that uses Unix-domain sockets might hit the "
+"name length limitation for @code{sun_path}, which it would otherwise not hit."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:1219
 msgid ""
-"The build directory is automatically deleted upon completion, unless the build failed and the client specified @option{--keep-"
-"failed} (@pxref{Invoking guix build, @option{--keep-failed}})."
+"The build directory is automatically deleted upon completion, unless the "
+"build failed and the client specified @option{--keep-failed} "
+"(@pxref{Invoking guix build, @option{--keep-failed}})."
 msgstr ""
 
 #. type: Plain text
@@ -3225,13 +4701,15 @@ msgstr ""
 
 #. type: table
 #: doc/guix.texi:1226
-msgid "Take users from @var{group} to run build processes (@pxref{Setting Up the Daemon, build users})."
+msgid ""
+"Take users from @var{group} to run build processes (@pxref{Setting Up the "
+"Daemon, build users})."
 msgstr ""
-"Prend les utilisateurs de @var{group} pour lancer les processus de construction (@pxref{Paramétrer le démon, utilisateurs de "
-"construction})."
+"Prend les utilisateurs de @var{group} pour lancer les processus de "
+"construction (@pxref{Paramétrer le démon, utilisateurs de construction})."
 
 #. type: item
-#: doc/guix.texi:1227 doc/guix.texi:5494
+#: doc/guix.texi:1227 doc/guix.texi:5498
 #, no-wrap
 msgid "--no-substitutes"
 msgstr ""
@@ -3243,23 +4721,27 @@ msgid "substitutes"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:1232 doc/guix.texi:5498
+#: doc/guix.texi:1232 doc/guix.texi:5502
 msgid ""
-"Do not use substitutes for build products.  That is, always build things locally instead of allowing downloads of pre-built binaries "
+"Do not use substitutes for build products.  That is, always build things "
+"locally instead of allowing downloads of pre-built binaries "
 "(@pxref{Substitutes})."
 msgstr ""
-"Ne pas utiliser de substitut pour les résultats de la construction. C'est-à-dire, toujours construire localement plutôt que de "
-"permettre le téléchargement de binaires pré-construits (@pxref{Substituts})."
+"Ne pas utiliser de substitut pour les résultats de la construction. C'est-à-"
+"dire, toujours construire localement plutôt que de permettre le "
+"téléchargement de binaires pré-construits (@pxref{Substituts})."
 
 #. type: table
 #: doc/guix.texi:1236
 msgid ""
-"When the daemon runs with @code{--no-substitutes}, clients can still explicitly enable substitution @i{via} the @code{set-build-"
-"options} remote procedure call (@pxref{The Store})."
+"When the daemon runs with @code{--no-substitutes}, clients can still "
+"explicitly enable substitution @i{via} the @code{set-build-options} remote "
+"procedure call (@pxref{The Store})."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:1237 doc/guix.texi:5481 doc/guix.texi:6893 doc/guix.texi:7769 doc/guix.texi:7957
+#: doc/guix.texi:1237 doc/guix.texi:5485 doc/guix.texi:6897 doc/guix.texi:7773
+#: doc/guix.texi:7961
 #, no-wrap
 msgid "--substitute-urls=@var{urls}"
 msgstr ""
@@ -3272,22 +4754,23 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:1243
 msgid ""
-"Consider @var{urls} the default whitespace-separated list of substitute source URLs.  When this option is omitted, "
-"@indicateurl{https://mirror.hydra.gnu.org https://hydra.gnu.org} is used (@code{mirror.hydra.gnu.org} is a mirror of @code{hydra.gnu."
-"org})."
+"Consider @var{urls} the default whitespace-separated list of substitute "
+"source URLs.  When this option is omitted, @indicateurl{https://mirror.hydra."
+"gnu.org https://hydra.gnu.org} is used (@code{mirror.hydra.gnu.org} is a "
+"mirror of @code{hydra.gnu.org})."
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:1246
 msgid ""
-"This means that substitutes may be downloaded from @var{urls}, as long as they are signed by a trusted signature "
-"(@pxref{Substitutes})."
+"This means that substitutes may be downloaded from @var{urls}, as long as "
+"they are signed by a trusted signature (@pxref{Substitutes})."
 msgstr ""
-"Cela signifie que les substituts sont téléchargés depuis les @var{urls}, tant qu'ils sont signés par une signature de confiance "
-"(@pxref{Substituts})."
+"Cela signifie que les substituts sont téléchargés depuis les @var{urls}, "
+"tant qu'ils sont signés par une signature de confiance (@pxref{Substituts})."
 
 #. type: item
-#: doc/guix.texi:1248 doc/guix.texi:5519
+#: doc/guix.texi:1248 doc/guix.texi:5523
 #, no-wrap
 msgid "--no-build-hook"
 msgstr ""
@@ -3300,8 +4783,9 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:1254
 msgid ""
-"The build hook is a helper program that the daemon can start and to which it submits build requests.  This mechanism is used to "
-"offload builds to other machines (@pxref{Daemon Offload Setup})."
+"The build hook is a helper program that the daemon can start and to which it "
+"submits build requests.  This mechanism is used to offload builds to other "
+"machines (@pxref{Daemon Offload Setup})."
 msgstr ""
 
 #. type: item
@@ -3318,49 +4802,55 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:1262
 msgid ""
-"When this option is used, @command{guix gc --list-failures} can be used to query the set of store items marked as failed; "
-"@command{guix gc --clear-failures} removes store items from the set of cached failures.  @xref{Invoking guix gc}."
+"When this option is used, @command{guix gc --list-failures} can be used to "
+"query the set of store items marked as failed; @command{guix gc --clear-"
+"failures} removes store items from the set of cached failures.  "
+"@xref{Invoking guix gc}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:1263 doc/guix.texi:5543
+#: doc/guix.texi:1263 doc/guix.texi:5547
 #, no-wrap
 msgid "--cores=@var{n}"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:1264 doc/guix.texi:5544
+#: doc/guix.texi:1264 doc/guix.texi:5548
 #, no-wrap
 msgid "-c @var{n}"
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:1267
-msgid "Use @var{n} CPU cores to build each derivation; @code{0} means as many as available."
+msgid ""
+"Use @var{n} CPU cores to build each derivation; @code{0} means as many as "
+"available."
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:1271
 msgid ""
-"The default value is @code{0}, but it may be overridden by clients, such as the @code{--cores} option of @command{guix build} "
-"(@pxref{Invoking guix build})."
+"The default value is @code{0}, but it may be overridden by clients, such as "
+"the @code{--cores} option of @command{guix build} (@pxref{Invoking guix "
+"build})."
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:1275
 msgid ""
-"The effect is to define the @code{NIX_BUILD_CORES} environment variable in the build process, which can then use it to exploit "
-"internal parallelism---for instance, by running @code{make -j$NIX_BUILD_CORES}."
+"The effect is to define the @code{NIX_BUILD_CORES} environment variable in "
+"the build process, which can then use it to exploit internal parallelism---"
+"for instance, by running @code{make -j$NIX_BUILD_CORES}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:1276 doc/guix.texi:5548
+#: doc/guix.texi:1276 doc/guix.texi:5552
 #, no-wrap
 msgid "--max-jobs=@var{n}"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:1277 doc/guix.texi:5549
+#: doc/guix.texi:1277 doc/guix.texi:5553
 #, no-wrap
 msgid "-M @var{n}"
 msgstr ""
@@ -3368,19 +4858,23 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:1282
 msgid ""
-"Allow at most @var{n} build jobs in parallel.  The default value is @code{1}.  Setting it to @code{0} means that no builds will be "
-"performed locally; instead, the daemon will offload builds (@pxref{Daemon Offload Setup}), or simply fail."
+"Allow at most @var{n} build jobs in parallel.  The default value is "
+"@code{1}.  Setting it to @code{0} means that no builds will be performed "
+"locally; instead, the daemon will offload builds (@pxref{Daemon Offload "
+"Setup}), or simply fail."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:1283 doc/guix.texi:5524
+#: doc/guix.texi:1283 doc/guix.texi:5528
 #, no-wrap
 msgid "--max-silent-time=@var{seconds}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:1286 doc/guix.texi:5527
-msgid "When the build or substitution process remains silent for more than @var{seconds}, terminate it and report a build failure."
+#: doc/guix.texi:1286 doc/guix.texi:5531
+msgid ""
+"When the build or substitution process remains silent for more than "
+"@var{seconds}, terminate it and report a build failure."
 msgstr ""
 
 #. type: table
@@ -3390,23 +4884,29 @@ msgstr ""
 
 #. type: table
 #: doc/guix.texi:1291
-msgid "The value specified here can be overridden by clients (@pxref{Common Build Options, @code{--max-silent-time}})."
+msgid ""
+"The value specified here can be overridden by clients (@pxref{Common Build "
+"Options, @code{--max-silent-time}})."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:1292 doc/guix.texi:5531
+#: doc/guix.texi:1292 doc/guix.texi:5535
 #, no-wrap
 msgid "--timeout=@var{seconds}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:1295 doc/guix.texi:5534
-msgid "Likewise, when the build or substitution process lasts for more than @var{seconds}, terminate it and report a build failure."
+#: doc/guix.texi:1295 doc/guix.texi:5538
+msgid ""
+"Likewise, when the build or substitution process lasts for more than "
+"@var{seconds}, terminate it and report a build failure."
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:1300
-msgid "The value specified here can be overridden by clients (@pxref{Common Build Options, @code{--timeout}})."
+msgid ""
+"The value specified here can be overridden by clients (@pxref{Common Build "
+"Options, @code{--timeout}})."
 msgstr ""
 
 #. type: item
@@ -3418,15 +4918,18 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:1306
 msgid ""
-"Build each derivation @var{n} times in a row, and raise an error if consecutive build results are not bit-for-bit identical.  Note "
-"that this setting can be overridden by clients such as @command{guix build} (@pxref{Invoking guix build})."
+"Build each derivation @var{n} times in a row, and raise an error if "
+"consecutive build results are not bit-for-bit identical.  Note that this "
+"setting can be overridden by clients such as @command{guix build} "
+"(@pxref{Invoking guix build})."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:1310 doc/guix.texi:5826
+#: doc/guix.texi:1310 doc/guix.texi:5830
 msgid ""
-"When used in conjunction with @option{--keep-failed}, the differing output is kept in the store, under @file{/gnu/store/@dots{}-"
-"check}.  This makes it easy to look for differences between the two results."
+"When used in conjunction with @option{--keep-failed}, the differing output "
+"is kept in the store, under @file{/gnu/store/@dots{}-check}.  This makes it "
+"easy to look for differences between the two results."
 msgstr ""
 
 #. type: item
@@ -3443,8 +4946,9 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:1317
 msgid ""
-"This is useful to debug daemon start-up issues, but then it may be overridden by clients, for example the @code{--verbosity} option "
-"of @command{guix build} (@pxref{Invoking guix build})."
+"This is useful to debug daemon start-up issues, but then it may be "
+"overridden by clients, for example the @code{--verbosity} option of "
+"@command{guix build} (@pxref{Invoking guix build})."
 msgstr ""
 
 #. type: item
@@ -3461,9 +4965,10 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:1326
 msgid ""
-"Doing this may change the result of build processes---for instance if they use optional dependencies found in @var{dir} when it is "
-"available, and not otherwise.  For that reason, it is not recommended to do so.  Instead, make sure that each derivation declares "
-"all the inputs that it needs."
+"Doing this may change the result of build processes---for instance if they "
+"use optional dependencies found in @var{dir} when it is available, and not "
+"otherwise.  For that reason, it is not recommended to do so.  Instead, make "
+"sure that each derivation declares all the inputs that it needs."
 msgstr ""
 
 #. type: item
@@ -3480,8 +4985,10 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:1334
 msgid ""
-"Using this option is not recommended since, again, it would allow build processes to gain access to undeclared dependencies.  It is "
-"necessary, though, when @command{guix-daemon} is running under an unprivileged user account."
+"Using this option is not recommended since, again, it would allow build "
+"processes to gain access to undeclared dependencies.  It is necessary, "
+"though, when @command{guix-daemon} is running under an unprivileged user "
+"account."
 msgstr ""
 
 #. type: item
@@ -3492,14 +4999,17 @@ msgstr ""
 
 #. type: table
 #: doc/guix.texi:1338
-msgid "Compress build logs according to @var{type}, one of @code{gzip}, @code{bzip2}, or @code{none}."
+msgid ""
+"Compress build logs according to @var{type}, one of @code{gzip}, "
+"@code{bzip2}, or @code{none}."
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:1342
 msgid ""
-"Unless @code{--lose-logs} is used, all the build logs are kept in the @var{localstatedir}.  To save space, the daemon automatically "
-"compresses them with bzip2 by default."
+"Unless @code{--lose-logs} is used, all the build logs are kept in the "
+"@var{localstatedir}.  To save space, the daemon automatically compresses "
+"them with bzip2 by default."
 msgstr ""
 
 #. type: item
@@ -3522,9 +5032,12 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:1353
 msgid ""
-"By default, files added to the store are automatically ``deduplicated'': if a newly added file is identical to another one found in "
-"the store, the daemon makes the new file a hard link to the other file.  This can noticeably reduce disk usage, at the expense of "
-"slightly increased input/output load at the end of a build process.  This option disables this optimization."
+"By default, files added to the store are automatically ``deduplicated'': if "
+"a newly added file is identical to another one found in the store, the "
+"daemon makes the new file a hard link to the other file.  This can "
+"noticeably reduce disk usage, at the expense of slightly increased input/"
+"output load at the end of a build process.  This option disables this "
+"optimization."
 msgstr ""
 
 #. type: item
@@ -3535,7 +5048,9 @@ msgstr ""
 
 #. type: table
 #: doc/guix.texi:1357
-msgid "Tell whether the garbage collector (GC) must keep outputs of live derivations."
+msgid ""
+"Tell whether the garbage collector (GC) must keep outputs of live "
+"derivations."
 msgstr ""
 
 #. type: cindex
@@ -3553,9 +5068,10 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:1364
 msgid ""
-"When set to ``yes'', the GC will keep the outputs of any live derivation available in the store---the @code{.drv} files.  The "
-"default is ``no'', meaning that derivation outputs are kept only if they are GC roots.  @xref{Invoking guix gc}, for more on GC "
-"roots."
+"When set to ``yes'', the GC will keep the outputs of any live derivation "
+"available in the store---the @code{.drv} files.  The default is ``no'', "
+"meaning that derivation outputs are kept only if they are GC roots.  "
+"@xref{Invoking guix gc}, for more on GC roots."
 msgstr ""
 
 #. type: item
@@ -3566,23 +5082,28 @@ msgstr ""
 
 #. type: table
 #: doc/guix.texi:1368
-msgid "Tell whether the garbage collector (GC) must keep derivations corresponding to live outputs."
+msgid ""
+"Tell whether the garbage collector (GC) must keep derivations corresponding "
+"to live outputs."
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:1373
 msgid ""
-"When set to ``yes'', as is the case by default, the GC keeps derivations---i.e., @code{.drv} files---as long as at least one of "
-"their outputs is live.  This allows users to keep track of the origins of items in their store.  Setting it to ``no'' saves a bit of "
-"disk space."
+"When set to ``yes'', as is the case by default, the GC keeps derivations---i."
+"e., @code{.drv} files---as long as at least one of their outputs is live.  "
+"This allows users to keep track of the origins of items in their store.  "
+"Setting it to ``no'' saves a bit of disk space."
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:1380
 msgid ""
-"Note that when both @code{--gc-keep-derivations} and @code{--gc-keep-outputs} are used, the effect is to keep all the build "
-"prerequisites (the sources, compiler, libraries, and other build-time tools) of live objects in the store, regardless of whether "
-"these prerequisites are live.  This is convenient for developers since it saves rebuilds or downloads."
+"Note that when both @code{--gc-keep-derivations} and @code{--gc-keep-"
+"outputs} are used, the effect is to keep all the build prerequisites (the "
+"sources, compiler, libraries, and other build-time tools) of live objects in "
+"the store, regardless of whether these prerequisites are live.  This is "
+"convenient for developers since it saves rebuilds or downloads."
 msgstr ""
 
 #. type: item
@@ -3594,13 +5115,15 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:1384
 msgid ""
-"On Linux-based systems, impersonate Linux 2.6.  This means that the kernel's @code{uname} system call will report 2.6 as the release "
-"number."
+"On Linux-based systems, impersonate Linux 2.6.  This means that the kernel's "
+"@code{uname} system call will report 2.6 as the release number."
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:1387
-msgid "This might be helpful to build programs that (usually wrongfully) depend on the kernel version number."
+msgid ""
+"This might be helpful to build programs that (usually wrongfully) depend on "
+"the kernel version number."
 msgstr ""
 
 #. type: item
@@ -3611,12 +5134,15 @@ msgstr ""
 
 #. type: table
 #: doc/guix.texi:1391
-msgid "Do not keep build logs.  By default they are kept under @code{@var{localstatedir}/guix/log}."
+msgid ""
+"Do not keep build logs.  By default they are kept under "
+"@code{@var{localstatedir}/guix/log}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:1392 doc/guix.texi:2890 doc/guix.texi:5779 doc/guix.texi:6920 doc/guix.texi:7328 doc/guix.texi:7962
-#: doc/guix.texi:19986 doc/guix.texi:20530
+#: doc/guix.texi:1392 doc/guix.texi:2890 doc/guix.texi:5783 doc/guix.texi:6924
+#: doc/guix.texi:7332 doc/guix.texi:7966 doc/guix.texi:20048
+#: doc/guix.texi:20592
 #, no-wrap
 msgid "--system=@var{system}"
 msgstr ""
@@ -3624,8 +5150,9 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:1396
 msgid ""
-"Assume @var{system} as the current system type.  By default it is the architecture/kernel pair found at configure time, such as "
-"@code{x86_64-linux}."
+"Assume @var{system} as the current system type.  By default it is the "
+"architecture/kernel pair found at configure time, such as @code{x86_64-"
+"linux}."
 msgstr ""
 
 #. type: item
@@ -3637,9 +5164,10 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:1402
 msgid ""
-"Listen for connections on @var{endpoint}.  @var{endpoint} is interpreted as the file name of a Unix-domain socket if it starts with "
-"@code{/} (slash sign).  Otherwise, @var{endpoint} is interpreted as a host name or host name and port to listen to.  Here are a few "
-"examples:"
+"Listen for connections on @var{endpoint}.  @var{endpoint} is interpreted as "
+"the file name of a Unix-domain socket if it starts with @code{/} (slash "
+"sign).  Otherwise, @var{endpoint} is interpreted as a host name or host name "
+"and port to listen to.  Here are a few examples:"
 msgstr ""
 
 #. type: item
@@ -3650,7 +5178,9 @@ msgstr ""
 
 #. type: table
 #: doc/guix.texi:1407
-msgid "Listen for connections on the @file{/gnu/var/daemon} Unix-domain socket, creating it if needed."
+msgid ""
+"Listen for connections on the @file{/gnu/var/daemon} Unix-domain socket, "
+"creating it if needed."
 msgstr ""
 
 #. type: item
@@ -3685,7 +5215,9 @@ msgstr ""
 
 #. type: table
 #: doc/guix.texi:1415
-msgid "Listen for TCP connections on the network interface corresponding to @code{localhost}, on port 44146."
+msgid ""
+"Listen for TCP connections on the network interface corresponding to "
+"@code{localhost}, on port 44146."
 msgstr ""
 
 #. type: item
@@ -3696,21 +5228,27 @@ msgstr ""
 
 #. type: table
 #: doc/guix.texi:1419
-msgid "Listen for TCP connections on the network interface corresponding to @code{128.0.0.42}, on port 1234."
+msgid ""
+"Listen for TCP connections on the network interface corresponding to "
+"@code{128.0.0.42}, on port 1234."
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:1426
 msgid ""
-"This option can be repeated multiple times, in which case @command{guix-daemon} accepts connections on all the specified endpoints.  "
-"Users can tell client commands what endpoint to connect to by setting the @code{GUIX_DAEMON_SOCKET} environment variable (@pxref{The "
-"Store, @code{GUIX_DAEMON_SOCKET}})."
+"This option can be repeated multiple times, in which case @command{guix-"
+"daemon} accepts connections on all the specified endpoints.  Users can tell "
+"client commands what endpoint to connect to by setting the "
+"@code{GUIX_DAEMON_SOCKET} environment variable (@pxref{The Store, "
+"@code{GUIX_DAEMON_SOCKET}})."
 msgstr ""
 
 #. type: quotation
-#: doc/guix.texi:1427 doc/guix.texi:2325 doc/guix.texi:2789 doc/guix.texi:2952 doc/guix.texi:4205 doc/guix.texi:4273 doc/guix.texi:5784
-#: doc/guix.texi:7220 doc/guix.texi:7847 doc/guix.texi:8065 doc/guix.texi:8276 doc/guix.texi:11442 doc/guix.texi:20313
-#: doc/guix.texi:20511 doc/guix.texi:20598 doc/guix.texi:21442
+#: doc/guix.texi:1427 doc/guix.texi:2325 doc/guix.texi:2789 doc/guix.texi:2952
+#: doc/guix.texi:4205 doc/guix.texi:4273 doc/guix.texi:5788 doc/guix.texi:7224
+#: doc/guix.texi:7851 doc/guix.texi:8069 doc/guix.texi:8280 doc/guix.texi:11491
+#: doc/guix.texi:20375 doc/guix.texi:20573 doc/guix.texi:20660
+#: doc/guix.texi:21504
 #, no-wrap
 msgid "Note"
 msgstr ""
@@ -3718,23 +5256,27 @@ msgstr ""
 #. type: quotation
 #: doc/guix.texi:1433
 msgid ""
-"The daemon protocol is @emph{unauthenticated and unencrypted}.  Using @code{--listen=@var{host}} is suitable on local networks, such "
-"as clusters, where only trusted nodes may connect to the build daemon.  In other cases where remote access to the daemon is needed, "
-"we recommend using Unix-domain sockets along with SSH."
+"The daemon protocol is @emph{unauthenticated and unencrypted}.  Using "
+"@code{--listen=@var{host}} is suitable on local networks, such as clusters, "
+"where only trusted nodes may connect to the build daemon.  In other cases "
+"where remote access to the daemon is needed, we recommend using Unix-domain "
+"sockets along with SSH."
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:1438
 msgid ""
-"When @code{--listen} is omitted, @command{guix-daemon} listens for connections on the Unix-domain socket located at "
-"@file{@var{localstatedir}/guix/daemon-socket/socket}."
+"When @code{--listen} is omitted, @command{guix-daemon} listens for "
+"connections on the Unix-domain socket located at @file{@var{localstatedir}/"
+"guix/daemon-socket/socket}."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:1448
 msgid ""
-"When using Guix on top of GNU/Linux distribution other than GuixSD---a so-called @dfn{foreign distro}---a few additional steps are "
-"needed to get everything in place.  Here are some of them."
+"When using Guix on top of GNU/Linux distribution other than GuixSD---a so-"
+"called @dfn{foreign distro}---a few additional steps are needed to get "
+"everything in place.  Here are some of them."
 msgstr ""
 
 #. type: anchor{#1}
@@ -3749,7 +5291,7 @@ msgid "locales, when not on GuixSD"
 msgstr ""
 
 #. type: vindex
-#: doc/guix.texi:1453 doc/guix.texi:9545
+#: doc/guix.texi:1453 doc/guix.texi:9549
 #, no-wrap
 msgid "LOCPATH"
 msgstr ""
@@ -3763,8 +5305,10 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:1459
 msgid ""
-"Packages installed @i{via} Guix will not use the locale data of the host system.  Instead, you must first install one of the locale "
-"packages available with Guix and then define the @code{GUIX_LOCPATH} environment variable:"
+"Packages installed @i{via} Guix will not use the locale data of the host "
+"system.  Instead, you must first install one of the locale packages "
+"available with Guix and then define the @code{GUIX_LOCPATH} environment "
+"variable:"
 msgstr ""
 
 #. type: example
@@ -3778,35 +5322,44 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:1469
 msgid ""
-"Note that the @code{glibc-locales} package contains data for all the locales supported by the GNU@tie{}libc and weighs in at around "
-"110@tie{}MiB.  Alternatively, the @code{glibc-utf8-locales} is smaller but limited to a few UTF-8 locales."
+"Note that the @code{glibc-locales} package contains data for all the locales "
+"supported by the GNU@tie{}libc and weighs in at around 110@tie{}MiB.  "
+"Alternatively, the @code{glibc-utf8-locales} is smaller but limited to a few "
+"UTF-8 locales."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:1473
 msgid ""
-"The @code{GUIX_LOCPATH} variable plays a role similar to @code{LOCPATH} (@pxref{Locale Names, @code{LOCPATH},, libc, The GNU C "
-"Library Reference Manual}).  There are two important differences though:"
+"The @code{GUIX_LOCPATH} variable plays a role similar to @code{LOCPATH} "
+"(@pxref{Locale Names, @code{LOCPATH},, libc, The GNU C Library Reference "
+"Manual}).  There are two important differences though:"
 msgstr ""
 
 #. type: enumerate
 #: doc/guix.texi:1480
 msgid ""
-"@code{GUIX_LOCPATH} is honored only by the libc in Guix, and not by the libc provided by foreign distros.  Thus, using "
-"@code{GUIX_LOCPATH} allows you to make sure the programs of the foreign distro will not end up loading incompatible locale data."
+"@code{GUIX_LOCPATH} is honored only by the libc in Guix, and not by the libc "
+"provided by foreign distros.  Thus, using @code{GUIX_LOCPATH} allows you to "
+"make sure the programs of the foreign distro will not end up loading "
+"incompatible locale data."
 msgstr ""
 
 #. type: enumerate
 #: doc/guix.texi:1487
 msgid ""
-"libc suffixes each entry of @code{GUIX_LOCPATH} with @code{/X.Y}, where @code{X.Y} is the libc version---e.g., @code{2.22}.  This "
-"means that, should your Guix profile contain a mixture of programs linked against different libc version, each libc version will "
-"only try to load locale data in the right format."
+"libc suffixes each entry of @code{GUIX_LOCPATH} with @code{/X.Y}, where "
+"@code{X.Y} is the libc version---e.g., @code{2.22}.  This means that, should "
+"your Guix profile contain a mixture of programs linked against different "
+"libc version, each libc version will only try to load locale data in the "
+"right format."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:1491
-msgid "This is important because the locale data format used by different libc versions may be incompatible."
+msgid ""
+"This is important because the locale data format used by different libc "
+"versions may be incompatible."
 msgstr ""
 
 #. type: cindex
@@ -3836,9 +5389,12 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:1504
 msgid ""
-"When using Guix on a foreign distro, we @emph{strongly recommend} that the system run the GNU C library's @dfn{name service cache "
-"daemon}, @command{nscd}, which should be listening on the @file{/var/run/nscd/socket} socket.  Failing to do that, applications "
-"installed with Guix may fail to look up host names or user accounts, or may even crash.  The next paragraphs explain why."
+"When using Guix on a foreign distro, we @emph{strongly recommend} that the "
+"system run the GNU C library's @dfn{name service cache daemon}, "
+"@command{nscd}, which should be listening on the @file{/var/run/nscd/socket} "
+"socket.  Failing to do that, applications installed with Guix may fail to "
+"look up host names or user accounts, or may even crash.  The next paragraphs "
+"explain why."
 msgstr ""
 
 #. type: file{#1}
@@ -3850,8 +5406,10 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:1510
 msgid ""
-"The GNU C library implements a @dfn{name service switch} (NSS), which is an extensible mechanism for ``name lookups'' in general: "
-"host name resolution, user accounts, and more (@pxref{Name Service Switch,,, libc, The GNU C Library Reference Manual})."
+"The GNU C library implements a @dfn{name service switch} (NSS), which is an "
+"extensible mechanism for ``name lookups'' in general: host name resolution, "
+"user accounts, and more (@pxref{Name Service Switch,,, libc, The GNU C "
+"Library Reference Manual})."
 msgstr ""
 
 #. type: cindex
@@ -3869,35 +5427,44 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:1521
 msgid ""
-"Being extensible, the NSS supports @dfn{plugins}, which provide new name lookup implementations: for example, the @code{nss-mdns} "
-"plugin allow resolution of @code{.local} host names, the @code{nis} plugin allows user account lookup using the Network information "
-"service (NIS), and so on.  These extra ``lookup services'' are configured system-wide in @file{/etc/nsswitch.conf}, and all the "
-"programs running on the system honor those settings (@pxref{NSS Configuration File,,, libc, The GNU C Reference Manual})."
+"Being extensible, the NSS supports @dfn{plugins}, which provide new name "
+"lookup implementations: for example, the @code{nss-mdns} plugin allow "
+"resolution of @code{.local} host names, the @code{nis} plugin allows user "
+"account lookup using the Network information service (NIS), and so on.  "
+"These extra ``lookup services'' are configured system-wide in @file{/etc/"
+"nsswitch.conf}, and all the programs running on the system honor those "
+"settings (@pxref{NSS Configuration File,,, libc, The GNU C Reference "
+"Manual})."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:1531
 msgid ""
-"When they perform a name lookup---for instance by calling the @code{getaddrinfo} function in C---applications first try to connect "
-"to the nscd; on success, nscd performs name lookups on their behalf.  If the nscd is not running, then they perform the name lookup "
-"by themselves, by loading the name lookup services into their own address space and running it.  These name lookup services---the "
-"@file{libnss_*.so} files---are @code{dlopen}'d, but they may come from the host system's C library, rather than from the C library "
-"the application is linked against (the C library coming from Guix)."
+"When they perform a name lookup---for instance by calling the "
+"@code{getaddrinfo} function in C---applications first try to connect to the "
+"nscd; on success, nscd performs name lookups on their behalf.  If the nscd "
+"is not running, then they perform the name lookup by themselves, by loading "
+"the name lookup services into their own address space and running it.  These "
+"name lookup services---the @file{libnss_*.so} files---are @code{dlopen}'d, "
+"but they may come from the host system's C library, rather than from the C "
+"library the application is linked against (the C library coming from Guix)."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:1536
 msgid ""
-"And this is where the problem is: if your application is linked against Guix's C library (say, glibc 2.24) and tries to load NSS "
-"plugins from another C library (say, @code{libnss_mdns.so} for glibc 2.22), it will likely crash or have its name lookups fail "
-"unexpectedly."
+"And this is where the problem is: if your application is linked against "
+"Guix's C library (say, glibc 2.24) and tries to load NSS plugins from "
+"another C library (say, @code{libnss_mdns.so} for glibc 2.22), it will "
+"likely crash or have its name lookups fail unexpectedly."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:1541
 msgid ""
-"Running @command{nscd} on the system, among other advantages, eliminates this binary incompatibility problem because those "
-"@code{libnss_*.so} files are loaded in the @command{nscd} process, not in applications themselves."
+"Running @command{nscd} on the system, among other advantages, eliminates "
+"this binary incompatibility problem because those @code{libnss_*.so} files "
+"are loaded in the @command{nscd} process, not in applications themselves."
 msgstr ""
 
 #. type: subsection
@@ -3907,7 +5474,7 @@ msgid "X11 Fonts"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:1544 doc/guix.texi:22008
+#: doc/guix.texi:1544 doc/guix.texi:22070
 #, no-wrap
 msgid "fonts"
 msgstr ""
@@ -3915,18 +5482,22 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:1552
 msgid ""
-"The majority of graphical applications use Fontconfig to locate and load fonts and perform X11-client-side rendering.  The "
-"@code{fontconfig} package in Guix looks for fonts in @file{$HOME/.guix-profile} by default.  Thus, to allow graphical applications "
-"installed with Guix to display fonts, you have to install fonts with Guix as well.  Essential font packages include @code{gs-fonts}, "
-"@code{font-dejavu}, and @code{font-gnu-freefont-ttf}."
+"The majority of graphical applications use Fontconfig to locate and load "
+"fonts and perform X11-client-side rendering.  The @code{fontconfig} package "
+"in Guix looks for fonts in @file{$HOME/.guix-profile} by default.  Thus, to "
+"allow graphical applications installed with Guix to display fonts, you have "
+"to install fonts with Guix as well.  Essential font packages include "
+"@code{gs-fonts}, @code{font-dejavu}, and @code{font-gnu-freefont-ttf}."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:1559
 msgid ""
-"To display text written in Chinese languages, Japanese, or Korean in graphical applications, consider installing @code{font-adobe-"
-"source-han-sans} or @code{font-wqy-zenhei}.  The former has multiple outputs, one per language family (@pxref{Packages with Multiple "
-"Outputs}).  For instance, the following command installs fonts for Chinese languages:"
+"To display text written in Chinese languages, Japanese, or Korean in "
+"graphical applications, consider installing @code{font-adobe-source-han-"
+"sans} or @code{font-wqy-zenhei}.  The former has multiple outputs, one per "
+"language family (@pxref{Packages with Multiple Outputs}).  For instance, the "
+"following command installs fonts for Chinese languages:"
 msgstr ""
 
 #. type: example
@@ -3944,8 +5515,9 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:1568
 msgid ""
-"Older programs such as @command{xterm} do not use Fontconfig and instead rely on server-side font rendering.  Such programs require "
-"to specify a full name of a font using XLFD (X Logical Font Description), like this:"
+"Older programs such as @command{xterm} do not use Fontconfig and instead "
+"rely on server-side font rendering.  Such programs require to specify a full "
+"name of a font using XLFD (X Logical Font Description), like this:"
 msgstr ""
 
 #. type: example
@@ -3957,8 +5529,8 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:1575
 msgid ""
-"To be able to use such full names for the TrueType fonts installed in your Guix profile, you need to extend the font path of the X "
-"server:"
+"To be able to use such full names for the TrueType fonts installed in your "
+"Guix profile, you need to extend the font path of the X server:"
 msgstr ""
 
 #. type: example
@@ -3975,7 +5547,9 @@ msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:1585
-msgid "After that, you can run @code{xlsfonts} (from @code{xlsfonts} package)  to make sure your TrueType fonts are listed there."
+msgid ""
+"After that, you can run @code{xlsfonts} (from @code{xlsfonts} package)  to "
+"make sure your TrueType fonts are listed there."
 msgstr ""
 
 #. type: code{#1}
@@ -3993,27 +5567,32 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:1593
 msgid ""
-"After installing fonts you may have to refresh the font cache to use them in applications.  The same applies when applications "
-"installed via Guix do not seem to find fonts.  To force rebuilding of the font cache run @code{fc-cache -f}.  The @code{fc-cache} "
-"command is provided by the @code{fontconfig} package."
+"After installing fonts you may have to refresh the font cache to use them in "
+"applications.  The same applies when applications installed via Guix do not "
+"seem to find fonts.  To force rebuilding of the font cache run @code{fc-"
+"cache -f}.  The @code{fc-cache} command is provided by the @code{fontconfig} "
+"package."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:1596 doc/guix.texi:19725
+#: doc/guix.texi:1596 doc/guix.texi:19787
 #, no-wrap
 msgid "nss-certs"
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:1599
-msgid "The @code{nss-certs} package provides X.509 certificates, which allow programs to authenticate Web servers accessed over HTTPS."
+msgid ""
+"The @code{nss-certs} package provides X.509 certificates, which allow "
+"programs to authenticate Web servers accessed over HTTPS."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:1604
 msgid ""
-"When using Guix on a foreign distro, you can install this package and define the relevant environment variables so that packages "
-"know where to look for certificates.  @xref{X.509 Certificates}, for detailed information."
+"When using Guix on a foreign distro, you can install this package and define "
+"the relevant environment variables so that packages know where to look for "
+"certificates.  @xref{X.509 Certificates}, for detailed information."
 msgstr ""
 
 #. type: subsection
@@ -4031,19 +5610,25 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:1618
 msgid ""
-"When you install Emacs packages with Guix, the elisp files may be placed either in @file{$HOME/.guix-profile/share/emacs/site-lisp/} "
-"or in sub-directories of @file{$HOME/.guix-profile/share/emacs/site-lisp/guix.d/}.  The latter directory exists because potentially "
-"there may exist thousands of Emacs packages and storing all their files in a single directory may not be reliable (because of name "
-"conflicts).  So we think using a separate directory for each package is a good idea.  It is very similar to how the Emacs package "
-"system organizes the file structure (@pxref{Package Files,,, emacs, The GNU Emacs Manual})."
+"When you install Emacs packages with Guix, the elisp files may be placed "
+"either in @file{$HOME/.guix-profile/share/emacs/site-lisp/} or in sub-"
+"directories of @file{$HOME/.guix-profile/share/emacs/site-lisp/guix.d/}.  "
+"The latter directory exists because potentially there may exist thousands of "
+"Emacs packages and storing all their files in a single directory may not be "
+"reliable (because of name conflicts).  So we think using a separate "
+"directory for each package is a good idea.  It is very similar to how the "
+"Emacs package system organizes the file structure (@pxref{Package Files,,, "
+"emacs, The GNU Emacs Manual})."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:1624
 msgid ""
-"By default, Emacs (installed with Guix) ``knows'' where these packages are placed, so you do not need to perform any configuration.  "
-"If, for some reason, you want to avoid auto-loading Emacs packages installed with Guix, you can do so by running Emacs with @code{--"
-"no-site-file} option (@pxref{Init File,,, emacs, The GNU Emacs Manual})."
+"By default, Emacs (installed with Guix) ``knows'' where these packages are "
+"placed, so you do not need to perform any configuration.  If, for some "
+"reason, you want to avoid auto-loading Emacs packages installed with Guix, "
+"you can do so by running Emacs with @code{--no-site-file} option "
+"(@pxref{Init File,,, emacs, The GNU Emacs Manual})."
 msgstr ""
 
 #. type: subsection
@@ -4067,10 +5652,12 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:1637
 msgid ""
-"Guix offers individual compiler packages such as @code{gcc} but if you are in need of a complete toolchain for compiling and linking "
-"source code what you really want is the @code{gcc-toolchain} package.  This package provides a complete GCC toolchain for C/C++ "
-"development, including GCC itself, the GNU C Library (headers and binaries, plus debugging symbols in the @code{debug} output), "
-"Binutils, and a linker wrapper."
+"Guix offers individual compiler packages such as @code{gcc} but if you are "
+"in need of a complete toolchain for compiling and linking source code what "
+"you really want is the @code{gcc-toolchain} package.  This package provides "
+"a complete GCC toolchain for C/C++ development, including GCC itself, the "
+"GNU C Library (headers and binaries, plus debugging symbols in the "
+"@code{debug} output), Binutils, and a linker wrapper."
 msgstr ""
 
 #. type: cindex
@@ -4082,10 +5669,14 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:1648
 msgid ""
-"The wrapper's purpose is to inspect the @code{-L} and @code{-l} switches passed to the linker, add corresponding @code{-rpath} "
-"arguments, and invoke the actual linker with this new set of arguments.  By default, the linker wrapper refuses to link to libraries "
-"outside the store to ensure ``purity''.  This can be annoying when using the toolchain to link with local libraries.  To allow "
-"references to libraries outside the store you need to define the environment variable @code{GUIX_LD_WRAPPER_ALLOW_IMPURITIES}."
+"The wrapper's purpose is to inspect the @code{-L} and @code{-l} switches "
+"passed to the linker, add corresponding @code{-rpath} arguments, and invoke "
+"the actual linker with this new set of arguments.  By default, the linker "
+"wrapper refuses to link to libraries outside the store to ensure "
+"``purity''.  This can be annoying when using the toolchain to link with "
+"local libraries.  To allow references to libraries outside the store you "
+"need to define the environment variable "
+"@code{GUIX_LD_WRAPPER_ALLOW_IMPURITIES}."
 msgstr ""
 
 #. type: cindex
@@ -4097,22 +5688,29 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:1660
 msgid ""
-"The purpose of GNU Guix is to allow users to easily install, upgrade, and remove software packages, without having to know about "
-"their build procedures or dependencies.  Guix also goes beyond this obvious set of features."
+"The purpose of GNU Guix is to allow users to easily install, upgrade, and "
+"remove software packages, without having to know about their build "
+"procedures or dependencies.  Guix also goes beyond this obvious set of "
+"features."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:1668
 msgid ""
-"This chapter describes the main features of Guix, as well as the package management tools it provides.  Along with the command-line "
-"interface described below (@pxref{Invoking guix package, @code{guix package}}), you may also use the Emacs-Guix interface "
-"(@pxref{Top,,, emacs-guix, The Emacs-Guix Reference Manual}), after installing @code{emacs-guix} package (run @kbd{M-x guix-help} "
-"command to start with it):"
+"This chapter describes the main features of Guix, as well as the package "
+"management tools it provides.  Along with the command-line interface "
+"described below (@pxref{Invoking guix package, @code{guix package}}), you "
+"may also use the Emacs-Guix interface (@pxref{Top,,, emacs-guix, The Emacs-"
+"Guix Reference Manual}), after installing @code{emacs-guix} package (run "
+"@kbd{M-x guix-help} command to start with it):"
 msgstr ""
-"Ce chapitre décrit les principales fonctionnalités de Guix, ainsi que des outils de gestion des paquets qu'il fournit. En plus de "
-"l'interface en ligne de commande décrite en dessous de (@pxref{Invoquer guix package, @code{guix package}}), vous pouvez aussi "
-"utiliser l'interface Emacs-Guix (@pxref{Top,,, emacs-guix, Le manuel de référence de emacs-guix}), après avoir installé le paquet "
-"@code{emacs-guix} (lancez la commande @kbd{M-x guix-help} pour le démarrer) :"
+"Ce chapitre décrit les principales fonctionnalités de Guix, ainsi que des "
+"outils de gestion des paquets qu'il fournit. En plus de l'interface en ligne "
+"de commande décrite en dessous de (@pxref{Invoquer guix package, @code{guix "
+"package}}), vous pouvez aussi utiliser l'interface Emacs-Guix (@pxref{Top,,, "
+"emacs-guix, Le manuel de référence de emacs-guix}), après avoir installé le "
+"paquet @code{emacs-guix} (lancez la commande @kbd{M-x guix-help} pour le "
+"démarrer) :"
 
 #. type: example
 #: doc/guix.texi:1671
@@ -4123,31 +5721,37 @@ msgstr "guix package -i emacs-guix\n"
 #. type: Plain text
 #: doc/guix.texi:1690
 msgid ""
-"When using Guix, each package ends up in the @dfn{package store}, in its own directory---something that resembles @file{/gnu/store/"
-"xxx-package-1.2}, where @code{xxx} is a base32 string."
+"When using Guix, each package ends up in the @dfn{package store}, in its own "
+"directory---something that resembles @file{/gnu/store/xxx-package-1.2}, "
+"where @code{xxx} is a base32 string."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:1695
 msgid ""
-"Instead of referring to these directories, users have their own @dfn{profile}, which points to the packages that they actually want "
-"to use.  These profiles are stored within each user's home directory, at @code{$HOME/.guix-profile}."
+"Instead of referring to these directories, users have their own "
+"@dfn{profile}, which points to the packages that they actually want to use.  "
+"These profiles are stored within each user's home directory, at @code{$HOME/."
+"guix-profile}."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:1703
 msgid ""
-"For example, @code{alice} installs GCC 4.7.2.  As a result, @file{/home/alice/.guix-profile/bin/gcc} points to @file{/gnu/store/"
-"@dots{}-gcc-4.7.2/bin/gcc}.  Now, on the same machine, @code{bob} had already installed GCC 4.8.0.  The profile of @code{bob} simply "
-"continues to point to @file{/gnu/store/@dots{}-gcc-4.8.0/bin/gcc}---i.e., both versions of GCC coexist on the same system without "
-"any interference."
+"For example, @code{alice} installs GCC 4.7.2.  As a result, @file{/home/"
+"alice/.guix-profile/bin/gcc} points to @file{/gnu/store/@dots{}-gcc-4.7.2/"
+"bin/gcc}.  Now, on the same machine, @code{bob} had already installed GCC "
+"4.8.0.  The profile of @code{bob} simply continues to point to @file{/gnu/"
+"store/@dots{}-gcc-4.8.0/bin/gcc}---i.e., both versions of GCC coexist on the "
+"same system without any interference."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:1707
 msgid ""
-"The @command{guix package} command is the central tool to manage packages (@pxref{Invoking guix package}).  It operates on the per-"
-"user profiles, and can be used @emph{with normal user privileges}."
+"The @command{guix package} command is the central tool to manage packages "
+"(@pxref{Invoking guix package}).  It operates on the per-user profiles, and "
+"can be used @emph{with normal user privileges}."
 msgstr ""
 
 #. type: cindex
@@ -4159,27 +5763,33 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:1715
 msgid ""
-"The command provides the obvious install, remove, and upgrade operations.  Each invocation is actually a @emph{transaction}: either "
-"the specified operation succeeds, or nothing happens.  Thus, if the @command{guix package} process is terminated during the "
-"transaction, or if a power outage occurs during the transaction, then the user's profile remains in its previous state, and remains "
-"usable."
+"The command provides the obvious install, remove, and upgrade operations.  "
+"Each invocation is actually a @emph{transaction}: either the specified "
+"operation succeeds, or nothing happens.  Thus, if the @command{guix package} "
+"process is terminated during the transaction, or if a power outage occurs "
+"during the transaction, then the user's profile remains in its previous "
+"state, and remains usable."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:1723
 msgid ""
-"In addition, any package transaction may be @emph{rolled back}.  So, if, for example, an upgrade installs a new version of a package "
-"that turns out to have a serious bug, users may roll back to the previous instance of their profile, which was known to work well.  "
-"Similarly, the global system configuration on GuixSD is subject to transactional upgrades and roll-back (@pxref{Using the "
-"Configuration System})."
+"In addition, any package transaction may be @emph{rolled back}.  So, if, for "
+"example, an upgrade installs a new version of a package that turns out to "
+"have a serious bug, users may roll back to the previous instance of their "
+"profile, which was known to work well.  Similarly, the global system "
+"configuration on GuixSD is subject to transactional upgrades and roll-back "
+"(@pxref{Using the Configuration System})."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:1730
 msgid ""
-"All packages in the package store may be @emph{garbage-collected}.  Guix can determine which packages are still referenced by user "
-"profiles, and remove those that are provably no longer referenced (@pxref{Invoking guix gc}).  Users may also explicitly remove old "
-"generations of their profile so that the packages they refer to can be collected."
+"All packages in the package store may be @emph{garbage-collected}.  Guix can "
+"determine which packages are still referenced by user profiles, and remove "
+"those that are provably no longer referenced (@pxref{Invoking guix gc}).  "
+"Users may also explicitly remove old generations of their profile so that "
+"the packages they refer to can be collected."
 msgstr ""
 
 #. type: cindex
@@ -4191,36 +5801,48 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:1743
 msgid ""
-"Finally, Guix takes a @dfn{purely functional} approach to package management, as described in the introduction "
-"(@pxref{Introduction}).  Each @file{/gnu/store} package directory name contains a hash of all the inputs that were used to build "
-"that package---compiler, libraries, build scripts, etc.  This direct correspondence allows users to make sure a given package "
-"installation matches the current state of their distribution.  It also helps maximize @dfn{build reproducibility}: thanks to the "
-"isolated build environments that are used, a given build is likely to yield bit-identical files when performed on different machines "
-"(@pxref{Invoking guix-daemon, container})."
+"Finally, Guix takes a @dfn{purely functional} approach to package "
+"management, as described in the introduction (@pxref{Introduction}).  Each "
+"@file{/gnu/store} package directory name contains a hash of all the inputs "
+"that were used to build that package---compiler, libraries, build scripts, "
+"etc.  This direct correspondence allows users to make sure a given package "
+"installation matches the current state of their distribution.  It also helps "
+"maximize @dfn{build reproducibility}: thanks to the isolated build "
+"environments that are used, a given build is likely to yield bit-identical "
+"files when performed on different machines (@pxref{Invoking guix-daemon, "
+"container})."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:1754
 msgid ""
-"This foundation allows Guix to support @dfn{transparent binary/source deployment}.  When a pre-built binary for a @file{/gnu/store} "
-"item is available from an external source---a @dfn{substitute}, Guix just downloads it and unpacks it; otherwise, it builds the "
-"package from source, locally (@pxref{Substitutes}).  Because build results are usually bit-for-bit reproducible, users do not have "
-"to trust servers that provide substitutes: they can force a local build and @emph{challenge} providers (@pxref{Invoking guix "
-"challenge})."
+"This foundation allows Guix to support @dfn{transparent binary/source "
+"deployment}.  When a pre-built binary for a @file{/gnu/store} item is "
+"available from an external source---a @dfn{substitute}, Guix just downloads "
+"it and unpacks it; otherwise, it builds the package from source, locally "
+"(@pxref{Substitutes}).  Because build results are usually bit-for-bit "
+"reproducible, users do not have to trust servers that provide substitutes: "
+"they can force a local build and @emph{challenge} providers (@pxref{Invoking "
+"guix challenge})."
 msgstr ""
-"Ce fondement permet à Guix de supporter le @dfn{déploiement transparent de binaire ou source}. Lorsqu'une binaire pré-construit pour "
-"une entrée de @file{/gnu/store} est disponible depuis une source externe (un @dfn{substitut}), Guix le télécharge simplement et le "
-"décompresse ; sinon, il construit le paquet depuis les sources localement (@pxref{Substituts}). Comme les résultats des "
-"constructions sont généralement reproductibles au bit près, si vous n'avez pas besoin de faire confiance aux serveurs qui "
-"fournissent les substituts : vous pouvez forcer une construction locale et @emph{défier} les fournisseurs (@pxref{Invoking guix "
-"challenge})."
+"Ce fondement permet à Guix de supporter le @dfn{déploiement transparent de "
+"binaire ou source}. Lorsqu'une binaire pré-construit pour une entrée de "
+"@file{/gnu/store} est disponible depuis une source externe (un "
+"@dfn{substitut}), Guix le télécharge simplement et le décompresse ; sinon, "
+"il construit le paquet depuis les sources localement (@pxref{Substituts}). "
+"Comme les résultats des constructions sont généralement reproductibles au "
+"bit près, si vous n'avez pas besoin de faire confiance aux serveurs qui "
+"fournissent les substituts : vous pouvez forcer une construction locale et "
+"@emph{défier} les fournisseurs (@pxref{Invoking guix challenge})."
 
 #. type: Plain text
 #: doc/guix.texi:1760
 msgid ""
-"Control over the build environment is a feature that is also useful for developers.  The @command{guix environment} command allows "
-"developers of a package to quickly set up the right development environment for their package, without having to manually install "
-"the dependencies of the package into their profile (@pxref{Invoking guix environment})."
+"Control over the build environment is a feature that is also useful for "
+"developers.  The @command{guix environment} command allows developers of a "
+"package to quickly set up the right development environment for their "
+"package, without having to manually install the dependencies of the package "
+"into their profile (@pxref{Invoking guix environment})."
 msgstr ""
 
 #. type: section
@@ -4256,13 +5878,16 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:1773
 msgid ""
-"The @command{guix package} command is the tool that allows users to install, upgrade, and remove packages, as well as rolling back "
-"to previous configurations.  It operates only on the user's own profile, and works with normal user privileges (@pxref{Features}).  "
-"Its syntax is:"
+"The @command{guix package} command is the tool that allows users to install, "
+"upgrade, and remove packages, as well as rolling back to previous "
+"configurations.  It operates only on the user's own profile, and works with "
+"normal user privileges (@pxref{Features}).  Its syntax is:"
 msgstr ""
-"La commande @command{guix package} est l'outil qui permet d'installer, mettre à jour et supprimer les paquets ainsi que de revenir à "
-"une configuration précédente. Elle n'opère que dans le profil de l'utilisateur et fonctionne avec les privilèges utilisateurs "
-"normaux (@pxref{Fonctionnalités}). Sa syntaxe est :"
+"La commande @command{guix package} est l'outil qui permet d'installer, "
+"mettre à jour et supprimer les paquets ainsi que de revenir à une "
+"configuration précédente. Elle n'opère que dans le profil de l'utilisateur "
+"et fonctionne avec les privilèges utilisateurs normaux "
+"(@pxref{Fonctionnalités}). Sa syntaxe est :"
 
 #. type: example
 #: doc/guix.texi:1776
@@ -4273,13 +5898,17 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:1782
 msgid ""
-"Primarily, @var{options} specifies the operations to be performed during the transaction.  Upon completion, a new profile is "
-"created, but previous @dfn{generations} of the profile remain available, should the user want to roll back."
+"Primarily, @var{options} specifies the operations to be performed during the "
+"transaction.  Upon completion, a new profile is created, but previous "
+"@dfn{generations} of the profile remain available, should the user want to "
+"roll back."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:1785
-msgid "For example, to remove @code{lua} and install @code{guile} and @code{guile-cairo} in a single transaction:"
+msgid ""
+"For example, to remove @code{lua} and install @code{guile} and @code{guile-"
+"cairo} in a single transaction:"
 msgstr ""
 
 #. type: example
@@ -4291,8 +5920,10 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:1794
 msgid ""
-"@command{guix package} also supports a @dfn{declarative approach} whereby the user specifies the exact set of packages to be "
-"available and passes it @i{via} the @option{--manifest} option (@pxref{profile-manifest, @option{--manifest}})."
+"@command{guix package} also supports a @dfn{declarative approach} whereby "
+"the user specifies the exact set of packages to be available and passes it "
+"@i{via} the @option{--manifest} option (@pxref{profile-manifest, @option{--"
+"manifest}})."
 msgstr ""
 
 #. type: cindex
@@ -4304,9 +5935,11 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:1801
 msgid ""
-"For each user, a symlink to the user's default profile is automatically created in @file{$HOME/.guix-profile}.  This symlink always "
-"points to the current generation of the user's default profile.  Thus, users can add @file{$HOME/.guix-profile/bin} to their "
-"@code{PATH} environment variable, and so on."
+"For each user, a symlink to the user's default profile is automatically "
+"created in @file{$HOME/.guix-profile}.  This symlink always points to the "
+"current generation of the user's default profile.  Thus, users can add "
+"@file{$HOME/.guix-profile/bin} to their @code{PATH} environment variable, "
+"and so on."
 msgstr ""
 
 #. type: cindex
@@ -4318,9 +5951,10 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:1806
 msgid ""
-"If you are not using the Guix System Distribution, consider adding the following lines to your @file{~/.bash_profile} (@pxref{Bash "
-"Startup Files,,, bash, The GNU Bash Reference Manual}) so that newly-spawned shells get all the right environment variable "
-"definitions:"
+"If you are not using the Guix System Distribution, consider adding the "
+"following lines to your @file{~/.bash_profile} (@pxref{Bash Startup Files,,, "
+"bash, The GNU Bash Reference Manual}) so that newly-spawned shells get all "
+"the right environment variable definitions:"
 msgstr ""
 
 #. type: example
@@ -4334,11 +5968,14 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:1821
 msgid ""
-"In a multi-user setup, user profiles are stored in a place registered as a @dfn{garbage-collector root}, which @file{$HOME/.guix-"
-"profile} points to (@pxref{Invoking guix gc}).  That directory is normally @code{@var{localstatedir}/guix/profiles/per-user/"
-"@var{user}}, where @var{localstatedir} is the value passed to @code{configure} as @code{--localstatedir}, and @var{user} is the user "
-"name.  The @file{per-user} directory is created when @command{guix-daemon} is started, and the @var{user} sub-directory is created "
-"by @command{guix package}."
+"In a multi-user setup, user profiles are stored in a place registered as a "
+"@dfn{garbage-collector root}, which @file{$HOME/.guix-profile} points to "
+"(@pxref{Invoking guix gc}).  That directory is normally "
+"@code{@var{localstatedir}/guix/profiles/per-user/@var{user}}, where "
+"@var{localstatedir} is the value passed to @code{configure} as @code{--"
+"localstatedir}, and @var{user} is the user name.  The @file{per-user} "
+"directory is created when @command{guix-daemon} is started, and the "
+"@var{user} sub-directory is created by @command{guix package}."
 msgstr ""
 
 #. type: Plain text
@@ -4366,18 +6003,21 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:1834
 msgid ""
-"Each @var{package} may specify either a simple package name, such as @code{guile}, or a package name followed by an at-sign and "
-"version number, such as @code{guile@@1.8.8} or simply @code{guile@@1.8} (in the latter case, the newest version prefixed by "
-"@code{1.8} is selected.)"
+"Each @var{package} may specify either a simple package name, such as "
+"@code{guile}, or a package name followed by an at-sign and version number, "
+"such as @code{guile@@1.8.8} or simply @code{guile@@1.8} (in the latter case, "
+"the newest version prefixed by @code{1.8} is selected.)"
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:1842
 msgid ""
-"If no version number is specified, the newest available version will be selected.  In addition, @var{package} may contain a colon, "
-"followed by the name of one of the outputs of the package, as in @code{gcc:doc} or @code{binutils@@2.22:lib} (@pxref{Packages with "
-"Multiple Outputs}).  Packages with a corresponding name (and optionally version) are searched for among the GNU distribution modules "
-"(@pxref{Package Modules})."
+"If no version number is specified, the newest available version will be "
+"selected.  In addition, @var{package} may contain a colon, followed by the "
+"name of one of the outputs of the package, as in @code{gcc:doc} or "
+"@code{binutils@@2.22:lib} (@pxref{Packages with Multiple Outputs}).  "
+"Packages with a corresponding name (and optionally version) are searched for "
+"among the GNU distribution modules (@pxref{Package Modules})."
 msgstr ""
 
 #. type: cindex
@@ -4389,9 +6029,10 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:1849
 msgid ""
-"Sometimes packages have @dfn{propagated inputs}: these are dependencies that automatically get installed along with the required "
-"package (@pxref{package-propagated-inputs, @code{propagated-inputs} in @code{package} objects}, for information about propagated "
-"inputs in package definitions)."
+"Sometimes packages have @dfn{propagated inputs}: these are dependencies that "
+"automatically get installed along with the required package (@pxref{package-"
+"propagated-inputs, @code{propagated-inputs} in @code{package} objects}, for "
+"information about propagated inputs in package definitions)."
 msgstr ""
 
 #. type: anchor{#1}
@@ -4402,16 +6043,20 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:1856
 msgid ""
-"An example is the GNU MPC library: its C header files refer to those of the GNU MPFR library, which in turn refer to those of the "
-"GMP library.  Thus, when installing MPC, the MPFR and GMP libraries also get installed in the profile; removing MPC also removes "
-"MPFR and GMP---unless they had also been explicitly installed by the user."
+"An example is the GNU MPC library: its C header files refer to those of the "
+"GNU MPFR library, which in turn refer to those of the GMP library.  Thus, "
+"when installing MPC, the MPFR and GMP libraries also get installed in the "
+"profile; removing MPC also removes MPFR and GMP---unless they had also been "
+"explicitly installed by the user."
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:1861
 msgid ""
-"Besides, packages sometimes rely on the definition of environment variables for their search paths (see explanation of @code{--"
-"search-paths} below).  Any missing or possibly incorrect environment variable definitions are reported here."
+"Besides, packages sometimes rely on the definition of environment variables "
+"for their search paths (see explanation of @code{--search-paths} below).  "
+"Any missing or possibly incorrect environment variable definitions are "
+"reported here."
 msgstr ""
 
 #. type: item
@@ -4434,15 +6079,18 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:1870
 msgid ""
-"@var{exp} must be a Scheme expression that evaluates to a @code{<package>} object.  This option is notably useful to disambiguate "
-"between same-named variants of a package, with expressions such as @code{(@@ (gnu packages base) guile-final)}."
+"@var{exp} must be a Scheme expression that evaluates to a @code{<package>} "
+"object.  This option is notably useful to disambiguate between same-named "
+"variants of a package, with expressions such as @code{(@@ (gnu packages "
+"base) guile-final)}."
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:1874
 msgid ""
-"Note that this option installs the first output of the specified package, which may be insufficient when needing a specific output "
-"of a multiple-output package."
+"Note that this option installs the first output of the specified package, "
+"which may be insufficient when needing a specific output of a multiple-"
+"output package."
 msgstr ""
 
 #. type: item
@@ -4452,7 +6100,7 @@ msgid "--install-from-file=@var{file}"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:1876 doc/guix.texi:5695
+#: doc/guix.texi:1876 doc/guix.texi:5699
 #, no-wrap
 msgid "-f @var{file}"
 msgstr ""
@@ -4463,12 +6111,14 @@ msgid "Install the package that the code within @var{file} evaluates to."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:1881 doc/guix.texi:7279
-msgid "As an example, @var{file} might contain a definition like this (@pxref{Defining Packages}):"
+#: doc/guix.texi:1881 doc/guix.texi:7283
+msgid ""
+"As an example, @var{file} might contain a definition like this "
+"(@pxref{Defining Packages}):"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:1884 doc/guix.texi:5705
+#: doc/guix.texi:1884 doc/guix.texi:5709
 #, no-wrap
 msgid "@verbatiminclude package-hello.scm\n"
 msgstr ""
@@ -4476,8 +6126,10 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:1890
 msgid ""
-"Developers may find it useful to include such a @file{guix.scm} file in the root of their project source tree that can be used to "
-"test development snapshots and create reproducible development environments (@pxref{Invoking guix environment})."
+"Developers may find it useful to include such a @file{guix.scm} file in the "
+"root of their project source tree that can be used to test development "
+"snapshots and create reproducible development environments (@pxref{Invoking "
+"guix environment})."
 msgstr ""
 
 #. type: item
@@ -4500,8 +6152,9 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:1899
 msgid ""
-"As for @code{--install}, each @var{package} may specify a version number and/or output name in addition to the package name.  For "
-"instance, @code{-r glibc:debug} would remove the @code{debug} output of @code{glibc}."
+"As for @code{--install}, each @var{package} may specify a version number and/"
+"or output name in addition to the package name.  For instance, @code{-r "
+"glibc:debug} would remove the @code{debug} output of @code{glibc}."
 msgstr ""
 
 #. type: item
@@ -4525,15 +6178,17 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:1906
 msgid ""
-"Upgrade all the installed packages.  If one or more @var{regexp}s are specified, upgrade only installed packages whose name matches "
-"a @var{regexp}.  Also see the @code{--do-not-upgrade} option below."
+"Upgrade all the installed packages.  If one or more @var{regexp}s are "
+"specified, upgrade only installed packages whose name matches a "
+"@var{regexp}.  Also see the @code{--do-not-upgrade} option below."
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:1911
 msgid ""
-"Note that this upgrades package to the latest version of packages found in the distribution currently installed.  To update your "
-"distribution, you should regularly run @command{guix pull} (@pxref{Invoking guix pull})."
+"Note that this upgrades package to the latest version of packages found in "
+"the distribution currently installed.  To update your distribution, you "
+"should regularly run @command{guix pull} (@pxref{Invoking guix pull})."
 msgstr ""
 
 #. type: item
@@ -4545,8 +6200,10 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:1917
 msgid ""
-"When used together with the @code{--upgrade} option, do @emph{not} upgrade any packages whose name matches a @var{regexp}.  For "
-"example, to upgrade all packages in the current profile except those containing the substring ``emacs'':"
+"When used together with the @code{--upgrade} option, do @emph{not} upgrade "
+"any packages whose name matches a @var{regexp}.  For example, to upgrade all "
+"packages in the current profile except those containing the substring "
+"``emacs'':"
 msgstr ""
 
 #. type: example
@@ -4562,13 +6219,14 @@ msgid "profile-manifest"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:1922 doc/guix.texi:2877 doc/guix.texi:6573 doc/guix.texi:7284 doc/guix.texi:7968
+#: doc/guix.texi:1922 doc/guix.texi:2877 doc/guix.texi:6577 doc/guix.texi:7288
+#: doc/guix.texi:7972
 #, no-wrap
 msgid "--manifest=@var{file}"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:1923 doc/guix.texi:2878 doc/guix.texi:6574 doc/guix.texi:7285
+#: doc/guix.texi:1923 doc/guix.texi:2878 doc/guix.texi:6578 doc/guix.texi:7289
 #, no-wrap
 msgid "-m @var{file}"
 msgstr ""
@@ -4587,20 +6245,26 @@ msgstr ""
 
 #. type: table
 #: doc/guix.texi:1928
-msgid "Create a new generation of the profile from the manifest object returned by the Scheme code in @var{file}."
+msgid ""
+"Create a new generation of the profile from the manifest object returned by "
+"the Scheme code in @var{file}."
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:1934
 msgid ""
-"This allows you to @emph{declare} the profile's contents rather than constructing it through a sequence of @code{--install} and "
-"similar commands.  The advantage is that @var{file} can be put under version control, copied to different machines to reproduce the "
-"same profile, and so on."
+"This allows you to @emph{declare} the profile's contents rather than "
+"constructing it through a sequence of @code{--install} and similar "
+"commands.  The advantage is that @var{file} can be put under version "
+"control, copied to different machines to reproduce the same profile, and so "
+"on."
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:1938
-msgid "@var{file} must return a @dfn{manifest} object, which is roughly a list of packages:"
+msgid ""
+"@var{file} must return a @dfn{manifest} object, which is roughly a list of "
+"packages:"
 msgstr ""
 
 #. type: findex
@@ -4637,9 +6301,11 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:1957
 msgid ""
-"In this example we have to know which modules define the @code{emacs} and @code{guile-2.0} variables to provide the right @code{use-"
-"package-modules} line, which can be cumbersome.  We can instead provide regular package specifications and let @code{specifications-"
-">manifest} look up the corresponding package objects, like this:"
+"In this example we have to know which modules define the @code{emacs} and "
+"@code{guile-2.0} variables to provide the right @code{use-package-modules} "
+"line, which can be cumbersome.  We can instead provide regular package "
+"specifications and let @code{specifications->manifest} look up the "
+"corresponding package objects, like this:"
 msgstr ""
 
 #. type: example
@@ -4657,7 +6323,7 @@ msgid "--roll-back"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:1964 doc/guix.texi:20365
+#: doc/guix.texi:1964 doc/guix.texi:20427
 #, no-wrap
 msgid "rolling back"
 msgstr ""
@@ -4676,26 +6342,32 @@ msgstr ""
 
 #. type: table
 #: doc/guix.texi:1969
-msgid "Roll back to the previous @dfn{generation} of the profile---i.e., undo the last transaction."
+msgid ""
+"Roll back to the previous @dfn{generation} of the profile---i.e., undo the "
+"last transaction."
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:1972
-msgid "When combined with options such as @code{--install}, roll back occurs before any other actions."
+msgid ""
+"When combined with options such as @code{--install}, roll back occurs before "
+"any other actions."
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:1976
 msgid ""
-"When rolling back from the first generation that actually contains installed packages, the profile is made to point to the "
-"@dfn{zeroth generation}, which contains no files apart from its own metadata."
+"When rolling back from the first generation that actually contains installed "
+"packages, the profile is made to point to the @dfn{zeroth generation}, which "
+"contains no files apart from its own metadata."
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:1980
 msgid ""
-"After having rolled back, installing, removing, or upgrading packages overwrites previous future generations.  Thus, the history of "
-"the generations in a profile is always linear."
+"After having rolled back, installing, removing, or upgrading packages "
+"overwrites previous future generations.  Thus, the history of the "
+"generations in a profile is always linear."
 msgstr ""
 
 #. type: item
@@ -4711,7 +6383,7 @@ msgid "-S @var{pattern}"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:1983 doc/guix.texi:2181 doc/guix.texi:20323
+#: doc/guix.texi:1983 doc/guix.texi:2181 doc/guix.texi:20385
 #, no-wrap
 msgid "generations"
 msgstr ""
@@ -4724,16 +6396,19 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:1991
 msgid ""
-"@var{pattern} may be either a generation number or a number prefixed with ``+'' or ``-''.  The latter means: move forward/backward "
-"by a specified number of generations.  For example, if you want to return to the latest generation after @code{--roll-back}, use "
-"@code{--switch-generation=+1}."
+"@var{pattern} may be either a generation number or a number prefixed with ``"
+"+'' or ``-''.  The latter means: move forward/backward by a specified number "
+"of generations.  For example, if you want to return to the latest generation "
+"after @code{--roll-back}, use @code{--switch-generation=+1}."
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:1996
 msgid ""
-"The difference between @code{--roll-back} and @code{--switch-generation=-1} is that @code{--switch-generation} will not make a "
-"zeroth generation, so if a specified generation does not exist, the current generation will not be changed."
+"The difference between @code{--roll-back} and @code{--switch-generation=-1} "
+"is that @code{--switch-generation} will not make a zeroth generation, so if "
+"a specified generation does not exist, the current generation will not be "
+"changed."
 msgstr ""
 
 #. type: item
@@ -4745,22 +6420,27 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:2003
 msgid ""
-"Report environment variable definitions, in Bash syntax, that may be needed in order to use the set of installed packages.  These "
-"environment variables are used to specify @dfn{search paths} for files used by some of the installed packages."
+"Report environment variable definitions, in Bash syntax, that may be needed "
+"in order to use the set of installed packages.  These environment variables "
+"are used to specify @dfn{search paths} for files used by some of the "
+"installed packages."
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:2011
 msgid ""
-"For example, GCC needs the @code{CPATH} and @code{LIBRARY_PATH} environment variables to be defined so it can look for headers and "
-"libraries in the user's profile (@pxref{Environment Variables,,, gcc, Using the GNU Compiler Collection (GCC)}).  If GCC and, say, "
-"the C library are installed in the profile, then @code{--search-paths} will suggest setting these variables to @code{@var{profile}/"
-"include} and @code{@var{profile}/lib}, respectively."
+"For example, GCC needs the @code{CPATH} and @code{LIBRARY_PATH} environment "
+"variables to be defined so it can look for headers and libraries in the "
+"user's profile (@pxref{Environment Variables,,, gcc, Using the GNU Compiler "
+"Collection (GCC)}).  If GCC and, say, the C library are installed in the "
+"profile, then @code{--search-paths} will suggest setting these variables to "
+"@code{@var{profile}/include} and @code{@var{profile}/lib}, respectively."
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:2014
-msgid "The typical use case is to define these environment variables in the shell:"
+msgid ""
+"The typical use case is to define these environment variables in the shell:"
 msgstr ""
 
 #. type: example
@@ -4772,14 +6452,17 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:2023
 msgid ""
-"@var{kind} may be one of @code{exact}, @code{prefix}, or @code{suffix}, meaning that the returned environment variable definitions "
-"will either be exact settings, or prefixes or suffixes of the current value of these variables.  When omitted, @var{kind} defaults "
-"to @code{exact}."
+"@var{kind} may be one of @code{exact}, @code{prefix}, or @code{suffix}, "
+"meaning that the returned environment variable definitions will either be "
+"exact settings, or prefixes or suffixes of the current value of these "
+"variables.  When omitted, @var{kind} defaults to @code{exact}."
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:2026
-msgid "This option can also be used to compute the @emph{combined} search paths of several profiles.  Consider this example:"
+msgid ""
+"This option can also be used to compute the @emph{combined} search paths of "
+"several profiles.  Consider this example:"
 msgstr ""
 
 #. type: example
@@ -4794,8 +6477,9 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:2036
 msgid ""
-"The last command above reports about the @code{GUILE_LOAD_PATH} variable, even though, taken individually, neither @file{foo} nor "
-"@file{bar} would lead to that recommendation."
+"The last command above reports about the @code{GUILE_LOAD_PATH} variable, "
+"even though, taken individually, neither @file{foo} nor @file{bar} would "
+"lead to that recommendation."
 msgstr ""
 
 #. type: item
@@ -4847,19 +6531,22 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:2051
 msgid ""
-"By default, @command{guix package} reports as an error @dfn{collisions} in the profile.  Collisions happen when two or more "
-"different versions or variants of a given package end up in the profile."
+"By default, @command{guix package} reports as an error @dfn{collisions} in "
+"the profile.  Collisions happen when two or more different versions or "
+"variants of a given package end up in the profile."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:2052 doc/guix.texi:2754 doc/guix.texi:7773
+#: doc/guix.texi:2052 doc/guix.texi:2754 doc/guix.texi:7777
 #, no-wrap
 msgid "--verbose"
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:2055
-msgid "Produce verbose output.  In particular, emit the build log of the environment on the standard error port."
+msgid ""
+"Produce verbose output.  In particular, emit the build log of the "
+"environment on the standard error port."
 msgstr ""
 
 #. type: item
@@ -4870,14 +6557,17 @@ msgstr ""
 
 #. type: table
 #: doc/guix.texi:2059
-msgid "Use the bootstrap Guile to build the profile.  This option is only useful to distribution developers."
+msgid ""
+"Use the bootstrap Guile to build the profile.  This option is only useful to "
+"distribution developers."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:2065
 msgid ""
-"In addition to these actions, @command{guix package} supports the following options to query the current state of a profile, or the "
-"availability of packages:"
+"In addition to these actions, @command{guix package} supports the following "
+"options to query the current state of a profile, or the availability of "
+"packages:"
 msgstr ""
 
 #. type: item
@@ -4901,13 +6591,17 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:2075
 msgid ""
-"List the available packages whose name, synopsis, or description matches @var{regexp}, sorted by relevance.  Print all the metadata "
-"of matching packages in @code{recutils} format (@pxref{Top, GNU recutils databases,, recutils, GNU recutils manual})."
+"List the available packages whose name, synopsis, or description matches "
+"@var{regexp}, sorted by relevance.  Print all the metadata of matching "
+"packages in @code{recutils} format (@pxref{Top, GNU recutils databases,, "
+"recutils, GNU recutils manual})."
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:2078
-msgid "This allows specific fields to be extracted using the @command{recsel} command, for instance:"
+msgid ""
+"This allows specific fields to be extracted using the @command{recsel} "
+"command, for instance:"
 msgstr ""
 
 #. type: example
@@ -4942,7 +6636,9 @@ msgstr ""
 
 #. type: table
 #: doc/guix.texi:2096
-msgid "Similarly, to show the name of all the packages available under the terms of the GNU@tie{}LGPL version 3:"
+msgid ""
+"Similarly, to show the name of all the packages available under the terms of "
+"the GNU@tie{}LGPL version 3:"
 msgstr ""
 
 #. type: example
@@ -4965,8 +6661,8 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:2108
 msgid ""
-"It is also possible to refine search results using several @code{-s} flags.  For example, the following command returns a list of "
-"board games:"
+"It is also possible to refine search results using several @code{-s} flags.  "
+"For example, the following command returns a list of board games:"
 msgstr ""
 
 #. type: example
@@ -4981,15 +6677,17 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:2119
 msgid ""
-"If we were to omit @code{-s game}, we would also get software packages that deal with printed circuit boards; removing the angle "
-"brackets around @code{board} would further add packages that have to do with keyboards."
+"If we were to omit @code{-s game}, we would also get software packages that "
+"deal with printed circuit boards; removing the angle brackets around "
+"@code{board} would further add packages that have to do with keyboards."
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:2123
 msgid ""
-"And now for a more elaborate example.  The following command searches for cryptographic libraries, filters out Haskell, Perl, "
-"Python, and Ruby libraries, and prints the name and synopsis of the matching packages:"
+"And now for a more elaborate example.  The following command searches for "
+"cryptographic libraries, filters out Haskell, Perl, Python, and Ruby "
+"libraries, and prints the name and synopsis of the matching packages:"
 msgstr ""
 
 #. type: example
@@ -5003,8 +6701,8 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:2132
 msgid ""
-"@xref{Selection Expressions,,, recutils, GNU recutils manual}, for more information on @dfn{selection expressions} for @code{recsel -"
-"e}."
+"@xref{Selection Expressions,,, recutils, GNU recutils manual}, for more "
+"information on @dfn{selection expressions} for @code{recsel -e}."
 msgstr ""
 
 #. type: item
@@ -5016,8 +6714,9 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:2137
 msgid ""
-"Show details about @var{package}, taken from the list of available packages, in @code{recutils} format (@pxref{Top, GNU recutils "
-"databases,, recutils, GNU recutils manual})."
+"Show details about @var{package}, taken from the list of available packages, "
+"in @code{recutils} format (@pxref{Top, GNU recutils databases,, recutils, "
+"GNU recutils manual})."
 msgstr ""
 
 #. type: example
@@ -5040,7 +6739,9 @@ msgstr ""
 
 #. type: table
 #: doc/guix.texi:2149
-msgid "You may also specify the full name of a package to only get details about a specific version of it:"
+msgid ""
+"You may also specify the full name of a package to only get details about a "
+"specific version of it:"
 msgstr ""
 
 #. type: example
@@ -5067,16 +6768,18 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:2162
 msgid ""
-"List the currently installed packages in the specified profile, with the most recently installed packages shown last.  When "
-"@var{regexp} is specified, list only installed packages whose name matches @var{regexp}."
+"List the currently installed packages in the specified profile, with the "
+"most recently installed packages shown last.  When @var{regexp} is "
+"specified, list only installed packages whose name matches @var{regexp}."
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:2168
 msgid ""
-"For each installed package, print the following items, separated by tabs: the package name, its version string, the part of the "
-"package that is installed (for instance, @code{out} for the default output, @code{include} for its headers, etc.), and the path of "
-"this package in the store."
+"For each installed package, print the following items, separated by tabs: "
+"the package name, its version string, the part of the package that is "
+"installed (for instance, @code{out} for the default output, @code{include} "
+"for its headers, etc.), and the path of this package in the store."
 msgstr ""
 
 #. type: item
@@ -5094,17 +6797,20 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:2174
 msgid ""
-"List packages currently available in the distribution for this system (@pxref{GNU Distribution}).  When @var{regexp} is specified, "
-"list only installed packages whose name matches @var{regexp}."
+"List packages currently available in the distribution for this system "
+"(@pxref{GNU Distribution}).  When @var{regexp} is specified, list only "
+"installed packages whose name matches @var{regexp}."
 msgstr ""
-"Liste les paquets actuellement disponibles dans la distribution pour ce système (@pxref{Distribution GNU}). Lorsque @var{regexp} est "
-"spécifié, liste uniquement les paquets dont le nom correspond à @var{regexp}."
+"Liste les paquets actuellement disponibles dans la distribution pour ce "
+"système (@pxref{Distribution GNU}). Lorsque @var{regexp} est spécifié, liste "
+"uniquement les paquets dont le nom correspond à @var{regexp}."
 
 #. type: table
 #: doc/guix.texi:2178
 msgid ""
-"For each package, print the following items separated by tabs: its name, its version string, the parts of the package "
-"(@pxref{Packages with Multiple Outputs}), and the source location of its definition."
+"For each package, print the following items separated by tabs: its name, its "
+"version string, the parts of the package (@pxref{Packages with Multiple "
+"Outputs}), and the source location of its definition."
 msgstr ""
 
 #. type: item
@@ -5122,20 +6828,25 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:2186
 msgid ""
-"Return a list of generations along with their creation dates; for each generation, show the installed packages, with the most "
-"recently installed packages shown last.  Note that the zeroth generation is never shown."
+"Return a list of generations along with their creation dates; for each "
+"generation, show the installed packages, with the most recently installed "
+"packages shown last.  Note that the zeroth generation is never shown."
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:2191
 msgid ""
-"For each installed package, print the following items, separated by tabs: the name of a package, its version string, the part of the "
-"package that is installed (@pxref{Packages with Multiple Outputs}), and the location of this package in the store."
+"For each installed package, print the following items, separated by tabs: "
+"the name of a package, its version string, the part of the package that is "
+"installed (@pxref{Packages with Multiple Outputs}), and the location of this "
+"package in the store."
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:2194
-msgid "When @var{pattern} is used, the command returns only matching generations.  Valid patterns include:"
+msgid ""
+"When @var{pattern} is used, the command returns only matching generations.  "
+"Valid patterns include:"
 msgstr ""
 
 #. type: item
@@ -5146,14 +6857,16 @@ msgstr ""
 
 #. type: itemize
 #: doc/guix.texi:2199
-msgid "generation numbers.  For instance, @code{--list-generations=1} returns the first one."
+msgid ""
+"generation numbers.  For instance, @code{--list-generations=1} returns the "
+"first one."
 msgstr ""
 
 #. type: itemize
 #: doc/guix.texi:2202
 msgid ""
-"And @code{--list-generations=1,8,2} outputs three generations in the specified order.  Neither spaces nor trailing commas are "
-"allowed."
+"And @code{--list-generations=1,8,2} outputs three generations in the "
+"specified order.  Neither spaces nor trailing commas are allowed."
 msgstr ""
 
 #. type: item
@@ -5164,14 +6877,16 @@ msgstr ""
 
 #. type: itemize
 #: doc/guix.texi:2206
-msgid "specified generations and everything in between.  Note that the start of a range must be smaller than its end."
+msgid ""
+"specified generations and everything in between.  Note that the start of a "
+"range must be smaller than its end."
 msgstr ""
 
 #. type: itemize
 #: doc/guix.texi:2210
 msgid ""
-"It is also possible to omit the endpoint.  For example, @code{--list-generations=2..}, returns all generations starting from the "
-"second one."
+"It is also possible to omit the endpoint.  For example, @code{--list-"
+"generations=2..}, returns all generations starting from the second one."
 msgstr ""
 
 #. type: item
@@ -5183,8 +6898,9 @@ msgstr ""
 #. type: itemize
 #: doc/guix.texi:2215
 msgid ""
-"or months by passing an integer along with the first letter of the duration.  For example, @code{--list-generations=20d} lists "
-"generations that are up to 20 days old."
+"or months by passing an integer along with the first letter of the "
+"duration.  For example, @code{--list-generations=20d} lists generations that "
+"are up to 20 days old."
 msgstr ""
 
 #. type: item
@@ -5201,34 +6917,44 @@ msgstr ""
 
 #. type: table
 #: doc/guix.texi:2221
-msgid "When @var{pattern} is omitted, delete all generations except the current one."
+msgid ""
+"When @var{pattern} is omitted, delete all generations except the current one."
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:2227
 msgid ""
-"This command accepts the same patterns as @option{--list-generations}.  When @var{pattern} is specified, delete the matching "
-"generations.  When @var{pattern} specifies a duration, generations @emph{older} than the specified duration match.  For instance, "
-"@code{--delete-generations=1m} deletes generations that are more than one month old."
+"This command accepts the same patterns as @option{--list-generations}.  When "
+"@var{pattern} is specified, delete the matching generations.  When "
+"@var{pattern} specifies a duration, generations @emph{older} than the "
+"specified duration match.  For instance, @code{--delete-generations=1m} "
+"deletes generations that are more than one month old."
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:2230
-msgid "If the current generation matches, it is @emph{not} deleted.  Also, the zeroth generation is never deleted."
+msgid ""
+"If the current generation matches, it is @emph{not} deleted.  Also, the "
+"zeroth generation is never deleted."
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:2233
-msgid "Note that deleting generations prevents rolling back to them.  Consequently, this command must be used with care."
+msgid ""
+"Note that deleting generations prevents rolling back to them.  Consequently, "
+"this command must be used with care."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:2244
 msgid ""
-"Finally, since @command{guix package} may actually start build processes, it supports all the common build options (@pxref{Common "
-"Build Options}).  It also supports package transformation options, such as @option{--with-source} (@pxref{Package Transformation "
-"Options}).  However, note that package transformations are lost when upgrading; to preserve transformations across upgrades, you "
-"should define your own package variant in a Guile module and add it to @code{GUIX_PACKAGE_PATH} (@pxref{Defining Packages})."
+"Finally, since @command{guix package} may actually start build processes, it "
+"supports all the common build options (@pxref{Common Build Options}).  It "
+"also supports package transformation options, such as @option{--with-source} "
+"(@pxref{Package Transformation Options}).  However, note that package "
+"transformations are lost when upgrading; to preserve transformations across "
+"upgrades, you should define your own package variant in a Guile module and "
+"add it to @code{GUIX_PACKAGE_PATH} (@pxref{Defining Packages})."
 msgstr ""
 
 #. type: cindex
@@ -5240,16 +6966,20 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:2255
 msgid ""
-"Guix supports transparent source/binary deployment, which means that it can either build things locally, or download pre-built items "
-"from a server, or both.  We call these pre-built items @dfn{substitutes}---they are substitutes for local build results.  In many "
-"cases, downloading a substitute is much faster than building things locally."
+"Guix supports transparent source/binary deployment, which means that it can "
+"either build things locally, or download pre-built items from a server, or "
+"both.  We call these pre-built items @dfn{substitutes}---they are "
+"substitutes for local build results.  In many cases, downloading a "
+"substitute is much faster than building things locally."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:2260
 msgid ""
-"Substitutes can be anything resulting from a derivation build (@pxref{Derivations}).  Of course, in the common case, they are pre-"
-"built package binaries, but source tarballs, for instance, which also result from derivation builds, can be available as substitutes."
+"Substitutes can be anything resulting from a derivation build "
+"(@pxref{Derivations}).  Of course, in the common case, they are pre-built "
+"package binaries, but source tarballs, for instance, which also result from "
+"derivation builds, can be available as substitutes."
 msgstr ""
 
 #. type: cindex
@@ -5267,28 +6997,36 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:2284
 msgid ""
-"The @code{mirror.hydra.gnu.org} server is a front-end to an official build farm that builds packages from Guix continuously for some "
-"architectures, and makes them available as substitutes.  This is the default source of substitutes; it can be overridden by passing "
-"the @option{--substitute-urls} option either to @command{guix-daemon} (@pxref{daemon-substitute-urls,, @code{guix-daemon --"
-"substitute-urls}})  or to client tools such as @command{guix package} (@pxref{client-substitute-urls,, client @option{--substitute-"
-"urls} option})."
+"The @code{mirror.hydra.gnu.org} server is a front-end to an official build "
+"farm that builds packages from Guix continuously for some architectures, and "
+"makes them available as substitutes.  This is the default source of "
+"substitutes; it can be overridden by passing the @option{--substitute-urls} "
+"option either to @command{guix-daemon} (@pxref{daemon-substitute-urls,, "
+"@code{guix-daemon --substitute-urls}})  or to client tools such as "
+"@command{guix package} (@pxref{client-substitute-urls,, client @option{--"
+"substitute-urls} option})."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:2290
 msgid ""
-"Substitute URLs can be either HTTP or HTTPS.  HTTPS is recommended because communications are encrypted; conversely, using HTTP "
-"makes all communications visible to an eavesdropper, who could use the information gathered to determine, for instance, whether your "
-"system has unpatched security vulnerabilities."
+"Substitute URLs can be either HTTP or HTTPS.  HTTPS is recommended because "
+"communications are encrypted; conversely, using HTTP makes all "
+"communications visible to an eavesdropper, who could use the information "
+"gathered to determine, for instance, whether your system has unpatched "
+"security vulnerabilities."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:2299
 msgid ""
-"Substitutes from the official build farm are enabled by default when using the Guix System Distribution (@pxref{GNU Distribution}).  "
-"However, they are disabled by default when using Guix on a foreign distribution, unless you have explicitly enabled them via one of "
-"the recommended installation steps (@pxref{Installation}).  The following paragraphs describe how to enable or disable substitutes "
-"for the official build farm; the same procedure can also be used to enable substitutes for any other substitute server."
+"Substitutes from the official build farm are enabled by default when using "
+"the Guix System Distribution (@pxref{GNU Distribution}).  However, they are "
+"disabled by default when using Guix on a foreign distribution, unless you "
+"have explicitly enabled them via one of the recommended installation steps "
+"(@pxref{Installation}).  The following paragraphs describe how to enable or "
+"disable substitutes for the official build farm; the same procedure can also "
+"be used to enable substitutes for any other substitute server."
 msgstr ""
 
 #. type: cindex
@@ -5312,17 +7050,21 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:2313
 msgid ""
-"To allow Guix to download substitutes from @code{hydra.gnu.org} or a mirror thereof, you must add its public key to the access "
-"control list (ACL) of archive imports, using the @command{guix archive} command (@pxref{Invoking guix archive}).  Doing so implies "
-"that you trust @code{hydra.gnu.org} to not be compromised and to serve genuine substitutes."
+"To allow Guix to download substitutes from @code{hydra.gnu.org} or a mirror "
+"thereof, you must add its public key to the access control list (ACL) of "
+"archive imports, using the @command{guix archive} command (@pxref{Invoking "
+"guix archive}).  Doing so implies that you trust @code{hydra.gnu.org} to not "
+"be compromised and to serve genuine substitutes."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:2320
 msgid ""
-"The public key for @code{hydra.gnu.org} is installed along with Guix, in @code{@var{prefix}/share/guix/hydra.gnu.org.pub}, where "
-"@var{prefix} is the installation prefix of Guix.  If you installed Guix from source, make sure you checked the GPG signature of "
-"@file{guix-@value{VERSION}.tar.gz}, which contains this public key file.  Then, you can run something like this:"
+"The public key for @code{hydra.gnu.org} is installed along with Guix, in "
+"@code{@var{prefix}/share/guix/hydra.gnu.org.pub}, where @var{prefix} is the "
+"installation prefix of Guix.  If you installed Guix from source, make sure "
+"you checked the GPG signature of @file{guix-@value{VERSION}.tar.gz}, which "
+"contains this public key file.  Then, you can run something like this:"
 msgstr ""
 
 #. type: example
@@ -5334,20 +7076,25 @@ msgstr ""
 #. type: quotation
 #: doc/guix.texi:2329
 msgid ""
-"Similarly, the @file{berlin.guixsd.org.pub} file contains the public key for the project's new build farm, reachable at "
-"@indicateurl{https://berlin.guixsd.org}."
+"Similarly, the @file{berlin.guixsd.org.pub} file contains the public key for "
+"the project's new build farm, reachable at @indicateurl{https://berlin."
+"guixsd.org}."
 msgstr ""
 
 #. type: quotation
 #: doc/guix.texi:2334
 msgid ""
-"As of this writing @code{berlin.guixsd.org} is being upgraded so it can better scale up, but you might want to give it a try.  It is "
-"backed by 20 x86_64/i686 build nodes and may be able to provide substitutes more quickly than @code{mirror.hydra.gnu.org}."
+"As of this writing @code{berlin.guixsd.org} is being upgraded so it can "
+"better scale up, but you might want to give it a try.  It is backed by 20 "
+"x86_64/i686 build nodes and may be able to provide substitutes more quickly "
+"than @code{mirror.hydra.gnu.org}."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:2338
-msgid "Once this is in place, the output of a command like @code{guix build} should change from something like:"
+msgid ""
+"Once this is in place, the output of a command like @code{guix build} should "
+"change from something like:"
 msgstr ""
 
 #. type: example
@@ -5383,7 +7130,9 @@ msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:2365
-msgid "This indicates that substitutes from @code{hydra.gnu.org} are usable and will be downloaded, when possible, for future builds."
+msgid ""
+"This indicates that substitutes from @code{hydra.gnu.org} are usable and "
+"will be downloaded, when possible, for future builds."
 msgstr ""
 
 #. type: cindex
@@ -5395,9 +7144,11 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:2372
 msgid ""
-"The substitute mechanism can be disabled globally by running @code{guix-daemon} with @code{--no-substitutes} (@pxref{Invoking guix-"
-"daemon}).  It can also be disabled temporarily by passing the @code{--no-substitutes} option to @command{guix package}, "
-"@command{guix build}, and other command-line tools."
+"The substitute mechanism can be disabled globally by running @code{guix-"
+"daemon} with @code{--no-substitutes} (@pxref{Invoking guix-daemon}).  It can "
+"also be disabled temporarily by passing the @code{--no-substitutes} option "
+"to @command{guix package}, @command{guix build}, and other command-line "
+"tools."
 msgstr ""
 
 #. type: cindex
@@ -5409,16 +7160,19 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:2380
 msgid ""
-"Guix detects and raises an error when attempting to use a substitute that has been tampered with.  Likewise, it ignores substitutes "
-"that are not signed, or that are not signed by one of the keys listed in the ACL."
+"Guix detects and raises an error when attempting to use a substitute that "
+"has been tampered with.  Likewise, it ignores substitutes that are not "
+"signed, or that are not signed by one of the keys listed in the ACL."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:2386
 msgid ""
-"There is one exception though: if an unauthorized server provides substitutes that are @emph{bit-for-bit identical} to those "
-"provided by an authorized server, then the unauthorized server becomes eligible for downloads.  For example, assume we have chosen "
-"two substitute servers with this option:"
+"There is one exception though: if an unauthorized server provides "
+"substitutes that are @emph{bit-for-bit identical} to those provided by an "
+"authorized server, then the unauthorized server becomes eligible for "
+"downloads.  For example, assume we have chosen two substitute servers with "
+"this option:"
 msgstr ""
 
 #. type: example
@@ -5430,54 +7184,68 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:2400
 msgid ""
-"If the ACL contains only the key for @code{b.example.org}, and if @code{a.example.org} happens to serve the @emph{exact same} "
-"substitutes, then Guix will download substitutes from @code{a.example.org} because it comes first in the list and can be considered "
-"a mirror of @code{b.example.org}.  In practice, independent build machines usually produce the same binaries, thanks to bit-"
-"reproducible builds (see below)."
+"If the ACL contains only the key for @code{b.example.org}, and if @code{a."
+"example.org} happens to serve the @emph{exact same} substitutes, then Guix "
+"will download substitutes from @code{a.example.org} because it comes first "
+"in the list and can be considered a mirror of @code{b.example.org}.  In "
+"practice, independent build machines usually produce the same binaries, "
+"thanks to bit-reproducible builds (see below)."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:2407
 msgid ""
-"When using HTTPS, the server's X.509 certificate is @emph{not} validated (in other words, the server is not authenticated), contrary "
-"to what HTTPS clients such as Web browsers usually do.  This is because Guix authenticates substitute information itself, as "
-"explained above, which is what we care about (whereas X.509 certificates are about authenticating bindings between domain names and "
-"public keys.)"
+"When using HTTPS, the server's X.509 certificate is @emph{not} validated (in "
+"other words, the server is not authenticated), contrary to what HTTPS "
+"clients such as Web browsers usually do.  This is because Guix authenticates "
+"substitute information itself, as explained above, which is what we care "
+"about (whereas X.509 certificates are about authenticating bindings between "
+"domain names and public keys.)"
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:2419
 msgid ""
-"Substitutes are downloaded over HTTP or HTTPS.  The @code{http_proxy} environment variable can be set in the environment of "
-"@command{guix-daemon} and is honored for downloads of substitutes.  Note that the value of @code{http_proxy} in the environment "
-"where @command{guix build}, @command{guix package}, and other client commands are run has @emph{absolutely no effect}."
+"Substitutes are downloaded over HTTP or HTTPS.  The @code{http_proxy} "
+"environment variable can be set in the environment of @command{guix-daemon} "
+"and is honored for downloads of substitutes.  Note that the value of "
+"@code{http_proxy} in the environment where @command{guix build}, "
+"@command{guix package}, and other client commands are run has "
+"@emph{absolutely no effect}."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:2428
 msgid ""
-"Even when a substitute for a derivation is available, sometimes the substitution attempt will fail.  This can happen for a variety "
-"of reasons: the substitute server might be offline, the substitute may recently have been deleted, the connection might have been "
-"interrupted, etc."
+"Even when a substitute for a derivation is available, sometimes the "
+"substitution attempt will fail.  This can happen for a variety of reasons: "
+"the substitute server might be offline, the substitute may recently have "
+"been deleted, the connection might have been interrupted, etc."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:2442
 msgid ""
-"When substitutes are enabled and a substitute for a derivation is available, but the substitution attempt fails, Guix will attempt "
-"to build the derivation locally depending on whether or not @code{--fallback} was given (@pxref{fallback-option,, common build "
-"option @code{--fallback}}).  Specifically, if @code{--fallback} was omitted, then no local build will be performed, and the "
-"derivation is considered to have failed.  However, if @code{--fallback} was given, then Guix will attempt to build the derivation "
-"locally, and the success or failure of the derivation depends on the success or failure of the local build.  Note that when "
-"substitutes are disabled or no substitute is available for the derivation in question, a local build will @emph{always} be "
-"performed, regardless of whether or not @code{--fallback} was given."
+"When substitutes are enabled and a substitute for a derivation is available, "
+"but the substitution attempt fails, Guix will attempt to build the "
+"derivation locally depending on whether or not @code{--fallback} was given "
+"(@pxref{fallback-option,, common build option @code{--fallback}}).  "
+"Specifically, if @code{--fallback} was omitted, then no local build will be "
+"performed, and the derivation is considered to have failed.  However, if "
+"@code{--fallback} was given, then Guix will attempt to build the derivation "
+"locally, and the success or failure of the derivation depends on the success "
+"or failure of the local build.  Note that when substitutes are disabled or "
+"no substitute is available for the derivation in question, a local build "
+"will @emph{always} be performed, regardless of whether or not @code{--"
+"fallback} was given."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:2447
 msgid ""
-"To get an idea of how many substitutes are available right now, you can try running the @command{guix weather} command "
-"(@pxref{Invoking guix weather}).  This command provides statistics on the substitutes provided by a server."
+"To get an idea of how many substitutes are available right now, you can try "
+"running the @command{guix weather} command (@pxref{Invoking guix weather}).  "
+"This command provides statistics on the substitutes provided by a server."
 msgstr ""
 
 #. type: cindex
@@ -5489,29 +7257,38 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:2461
 msgid ""
-"Today, each individual's control over their own computing is at the mercy of institutions, corporations, and groups with enough "
-"power and determination to subvert the computing infrastructure and exploit its weaknesses.  While using @code{hydra.gnu.org} "
-"substitutes can be convenient, we encourage users to also build on their own, or even run their own build farm, such that "
-"@code{hydra.gnu.org} is less of an interesting target.  One way to help is by publishing the software you build using @command{guix "
-"publish} so that others have one more choice of server to download substitutes from (@pxref{Invoking guix publish})."
+"Today, each individual's control over their own computing is at the mercy of "
+"institutions, corporations, and groups with enough power and determination "
+"to subvert the computing infrastructure and exploit its weaknesses.  While "
+"using @code{hydra.gnu.org} substitutes can be convenient, we encourage users "
+"to also build on their own, or even run their own build farm, such that "
+"@code{hydra.gnu.org} is less of an interesting target.  One way to help is "
+"by publishing the software you build using @command{guix publish} so that "
+"others have one more choice of server to download substitutes from "
+"(@pxref{Invoking guix publish})."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:2473
 msgid ""
-"Guix has the foundations to maximize build reproducibility (@pxref{Features}).  In most cases, independent builds of a given package "
-"or derivation should yield bit-identical results.  Thus, through a diverse set of independent package builds, we can strengthen the "
-"integrity of our systems.  The @command{guix challenge} command aims to help users assess substitute servers, and to assist "
-"developers in finding out about non-deterministic package builds (@pxref{Invoking guix challenge}).  Similarly, the @option{--check} "
-"option of @command{guix build} allows users to check whether previously-installed substitutes are genuine by rebuilding them locally "
-"(@pxref{build-check, @command{guix build --check}})."
+"Guix has the foundations to maximize build reproducibility "
+"(@pxref{Features}).  In most cases, independent builds of a given package or "
+"derivation should yield bit-identical results.  Thus, through a diverse set "
+"of independent package builds, we can strengthen the integrity of our "
+"systems.  The @command{guix challenge} command aims to help users assess "
+"substitute servers, and to assist developers in finding out about non-"
+"deterministic package builds (@pxref{Invoking guix challenge}).  Similarly, "
+"the @option{--check} option of @command{guix build} allows users to check "
+"whether previously-installed substitutes are genuine by rebuilding them "
+"locally (@pxref{build-check, @command{guix build --check}})."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:2477
 msgid ""
-"In the future, we want Guix to have support to publish and retrieve binaries to/from other users, in a peer-to-peer fashion.  If you "
-"would like to discuss this project, join us on @email{guix-devel@@gnu.org}."
+"In the future, we want Guix to have support to publish and retrieve binaries "
+"to/from other users, in a peer-to-peer fashion.  If you would like to "
+"discuss this project, join us on @email{guix-devel@@gnu.org}."
 msgstr ""
 
 #. type: cindex
@@ -5535,19 +7312,25 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:2493
 msgid ""
-"Often, packages defined in Guix have a single @dfn{output}---i.e., the source package leads to exactly one directory in the store.  "
-"When running @command{guix package -i glibc}, one installs the default output of the GNU libc package; the default output is called "
-"@code{out}, but its name can be omitted as shown in this command.  In this particular case, the default output of @code{glibc} "
-"contains all the C header files, shared libraries, static libraries, Info documentation, and other supporting files."
+"Often, packages defined in Guix have a single @dfn{output}---i.e., the "
+"source package leads to exactly one directory in the store.  When running "
+"@command{guix package -i glibc}, one installs the default output of the GNU "
+"libc package; the default output is called @code{out}, but its name can be "
+"omitted as shown in this command.  In this particular case, the default "
+"output of @code{glibc} contains all the C header files, shared libraries, "
+"static libraries, Info documentation, and other supporting files."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:2501
 msgid ""
-"Sometimes it is more appropriate to separate the various types of files produced from a single source package into separate "
-"outputs.  For instance, the GLib C library (used by GTK+ and related packages)  installs more than 20 MiB of reference documentation "
-"as HTML pages.  To save space for users who do not need it, the documentation goes to a separate output, called @code{doc}.  To "
-"install the main GLib output, which contains everything but the documentation, one would run:"
+"Sometimes it is more appropriate to separate the various types of files "
+"produced from a single source package into separate outputs.  For instance, "
+"the GLib C library (used by GTK+ and related packages)  installs more than "
+"20 MiB of reference documentation as HTML pages.  To save space for users "
+"who do not need it, the documentation goes to a separate output, called "
+"@code{doc}.  To install the main GLib output, which contains everything but "
+"the documentation, one would run:"
 msgstr ""
 
 #. type: example
@@ -5557,7 +7340,7 @@ msgid "guix package -i glib\n"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:2506 doc/guix.texi:21259
+#: doc/guix.texi:2506 doc/guix.texi:21321
 #, no-wrap
 msgid "documentation"
 msgstr ""
@@ -5576,19 +7359,25 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:2522
 msgid ""
-"Some packages install programs with different ``dependency footprints''.  For instance, the WordNet package installs both command-"
-"line tools and graphical user interfaces (GUIs).  The former depend solely on the C library, whereas the latter depend on Tcl/Tk and "
-"the underlying X libraries.  In this case, we leave the command-line tools in the default output, whereas the GUIs are in a separate "
-"output.  This allows users who do not need the GUIs to save space.  The @command{guix size} command can help find out about such "
-"situations (@pxref{Invoking guix size}).  @command{guix graph} can also be helpful (@pxref{Invoking guix graph})."
+"Some packages install programs with different ``dependency footprints''.  "
+"For instance, the WordNet package installs both command-line tools and "
+"graphical user interfaces (GUIs).  The former depend solely on the C "
+"library, whereas the latter depend on Tcl/Tk and the underlying X "
+"libraries.  In this case, we leave the command-line tools in the default "
+"output, whereas the GUIs are in a separate output.  This allows users who do "
+"not need the GUIs to save space.  The @command{guix size} command can help "
+"find out about such situations (@pxref{Invoking guix size}).  @command{guix "
+"graph} can also be helpful (@pxref{Invoking guix graph})."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:2530
 msgid ""
-"There are several such multiple-output packages in the GNU distribution.  Other conventional output names include @code{lib} for "
-"libraries and possibly header files, @code{bin} for stand-alone programs, and @code{debug} for debugging information "
-"(@pxref{Installing Debugging Files}).  The outputs of a packages are listed in the third column of the output of @command{guix "
+"There are several such multiple-output packages in the GNU distribution.  "
+"Other conventional output names include @code{lib} for libraries and "
+"possibly header files, @code{bin} for stand-alone programs, and @code{debug} "
+"for debugging information (@pxref{Installing Debugging Files}).  The outputs "
+"of a packages are listed in the third column of the output of @command{guix "
 "package --list-available} (@pxref{Invoking guix package})."
 msgstr ""
 
@@ -5613,33 +7402,41 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:2542
 msgid ""
-"Packages that are installed, but not used, may be @dfn{garbage-collected}.  The @command{guix gc} command allows users to explicitly "
-"run the garbage collector to reclaim space from the @file{/gnu/store} directory.  It is the @emph{only} way to remove files from "
-"@file{/gnu/store}---removing files or directories manually may break it beyond repair!"
+"Packages that are installed, but not used, may be @dfn{garbage-collected}.  "
+"The @command{guix gc} command allows users to explicitly run the garbage "
+"collector to reclaim space from the @file{/gnu/store} directory.  It is the "
+"@emph{only} way to remove files from @file{/gnu/store}---removing files or "
+"directories manually may break it beyond repair!"
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:2553
 msgid ""
-"The garbage collector has a set of known @dfn{roots}: any file under @file{/gnu/store} reachable from a root is considered "
-"@dfn{live} and cannot be deleted; any other file is considered @dfn{dead} and may be deleted.  The set of garbage collector roots "
-"(``GC roots'' for short)  includes default user profiles; by default, the symlinks under @file{/var/guix/gcroots} represent these GC "
-"roots.  New GC roots can be added with @command{guix build --root}, for example (@pxref{Invoking guix build})."
+"The garbage collector has a set of known @dfn{roots}: any file under @file{/"
+"gnu/store} reachable from a root is considered @dfn{live} and cannot be "
+"deleted; any other file is considered @dfn{dead} and may be deleted.  The "
+"set of garbage collector roots (``GC roots'' for short)  includes default "
+"user profiles; by default, the symlinks under @file{/var/guix/gcroots} "
+"represent these GC roots.  New GC roots can be added with @command{guix "
+"build --root}, for example (@pxref{Invoking guix build})."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:2559
 msgid ""
-"Prior to running @code{guix gc --collect-garbage} to make space, it is often useful to remove old generations from user profiles; "
-"that way, old package builds referenced by those generations can be reclaimed.  This is achieved by running @code{guix package --"
-"delete-generations} (@pxref{Invoking guix package})."
+"Prior to running @code{guix gc --collect-garbage} to make space, it is often "
+"useful to remove old generations from user profiles; that way, old package "
+"builds referenced by those generations can be reclaimed.  This is achieved "
+"by running @code{guix package --delete-generations} (@pxref{Invoking guix "
+"package})."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:2563
 msgid ""
-"Our recommendation is to run a garbage collection periodically, or when you are short on disk space.  For instance, to guarantee "
-"that at least 5@tie{}GB are available on your disk, simply run:"
+"Our recommendation is to run a garbage collection periodically, or when you "
+"are short on disk space.  For instance, to guarantee that at least 5@tie{}GB "
+"are available on your disk, simply run:"
 msgstr ""
 
 #. type: example
@@ -5651,18 +7448,22 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:2575
 msgid ""
-"It is perfectly safe to run as a non-interactive periodic job (@pxref{Scheduled Job Execution}, for how to set up such a job on "
-"GuixSD).  Running @command{guix gc} with no arguments will collect as much garbage as it can, but that is often inconvenient: you "
-"may find yourself having to rebuild or re-download software that is ``dead'' from the GC viewpoint but that is necessary to build "
-"other pieces of software---e.g., the compiler tool chain."
+"It is perfectly safe to run as a non-interactive periodic job "
+"(@pxref{Scheduled Job Execution}, for how to set up such a job on GuixSD).  "
+"Running @command{guix gc} with no arguments will collect as much garbage as "
+"it can, but that is often inconvenient: you may find yourself having to "
+"rebuild or re-download software that is ``dead'' from the GC viewpoint but "
+"that is necessary to build other pieces of software---e.g., the compiler "
+"tool chain."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:2581
 msgid ""
-"The @command{guix gc} command has three modes of operation: it can be used to garbage-collect any dead files (the default), to "
-"delete specific files (the @code{--delete} option), to print garbage-collector information, or for more advanced queries.  The "
-"garbage collection options are as follows:"
+"The @command{guix gc} command has three modes of operation: it can be used "
+"to garbage-collect any dead files (the default), to delete specific files "
+"(the @code{--delete} option), to print garbage-collector information, or for "
+"more advanced queries.  The garbage collection options are as follows:"
 msgstr ""
 
 #. type: item
@@ -5680,16 +7481,17 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:2588
 msgid ""
-"Collect garbage---i.e., unreachable @file{/gnu/store} files and sub-directories.  This is the default operation when no option is "
-"specified."
+"Collect garbage---i.e., unreachable @file{/gnu/store} files and sub-"
+"directories.  This is the default operation when no option is specified."
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:2593
 msgid ""
-"When @var{min} is given, stop once @var{min} bytes have been collected.  @var{min} may be a number of bytes, or it may include a "
-"unit as a suffix, such as @code{MiB} for mebibytes and @code{GB} for gigabytes (@pxref{Block size, size specifications,, coreutils, "
-"GNU Coreutils})."
+"When @var{min} is given, stop once @var{min} bytes have been collected.  "
+"@var{min} may be a number of bytes, or it may include a unit as a suffix, "
+"such as @code{MiB} for mebibytes and @code{GB} for gigabytes (@pxref{Block "
+"size, size specifications,, coreutils, GNU Coreutils})."
 msgstr ""
 
 #. type: table
@@ -5712,13 +7514,16 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:2601
 msgid ""
-"Collect garbage until @var{free} space is available under @file{/gnu/store}, if possible; @var{free} denotes storage space, such as "
-"@code{500MiB}, as described above."
+"Collect garbage until @var{free} space is available under @file{/gnu/store}, "
+"if possible; @var{free} denotes storage space, such as @code{500MiB}, as "
+"described above."
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:2604
-msgid "When @var{free} or more is already available in @file{/gnu/store}, do nothing and exit immediately."
+msgid ""
+"When @var{free} or more is already available in @file{/gnu/store}, do "
+"nothing and exit immediately."
 msgstr ""
 
 #. type: item
@@ -5728,7 +7533,7 @@ msgid "--delete"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:2606 doc/guix.texi:5836 doc/guix.texi:20536
+#: doc/guix.texi:2606 doc/guix.texi:5840 doc/guix.texi:20598
 #, no-wrap
 msgid "-d"
 msgstr ""
@@ -5736,8 +7541,9 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:2610
 msgid ""
-"Attempt to delete all the store files and directories specified as arguments.  This fails if some of the files are not in the store, "
-"or if they are still live."
+"Attempt to delete all the store files and directories specified as "
+"arguments.  This fails if some of the files are not in the store, or if they "
+"are still live."
 msgstr ""
 
 #. type: item
@@ -5754,8 +7560,8 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:2617
 msgid ""
-"This prints nothing unless the daemon was started with @option{--cache-failures} (@pxref{Invoking guix-daemon, @option{--cache-"
-"failures}})."
+"This prints nothing unless the daemon was started with @option{--cache-"
+"failures} (@pxref{Invoking guix-daemon, @option{--cache-failures}})."
 msgstr ""
 
 #. type: item
@@ -5771,7 +7577,9 @@ msgstr ""
 
 #. type: table
 #: doc/guix.texi:2623
-msgid "Again, this option only makes sense when the daemon is started with @option{--cache-failures}.  Otherwise, it does nothing."
+msgid ""
+"Again, this option only makes sense when the daemon is started with "
+"@option{--cache-failures}.  Otherwise, it does nothing."
 msgstr ""
 
 #. type: item
@@ -5783,8 +7591,8 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:2627
 msgid ""
-"Show the list of dead files and directories still present in the store---i.e., files and directories no longer reachable from any "
-"root."
+"Show the list of dead files and directories still present in the store---i."
+"e., files and directories no longer reachable from any root."
 msgstr ""
 
 #. type: item
@@ -5816,14 +7624,16 @@ msgid "--referrers"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:2639 doc/guix.texi:6931
+#: doc/guix.texi:2639 doc/guix.texi:6935
 #, no-wrap
 msgid "package dependencies"
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:2642
-msgid "List the references (respectively, the referrers) of store files given as arguments."
+msgid ""
+"List the references (respectively, the referrers) of store files given as "
+"arguments."
 msgstr ""
 
 #. type: item
@@ -5839,7 +7649,7 @@ msgid "-R"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:2645 doc/guix.texi:6815 doc/guix.texi:6839 doc/guix.texi:6903
+#: doc/guix.texi:2645 doc/guix.texi:6819 doc/guix.texi:6843 doc/guix.texi:6907
 #, no-wrap
 msgid "closure"
 msgstr ""
@@ -5847,15 +7657,18 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:2650
 msgid ""
-"List the requisites of the store files passed as arguments.  Requisites include the store files themselves, their references, and "
-"the references of these, recursively.  In other words, the returned list is the @dfn{transitive closure} of the store files."
+"List the requisites of the store files passed as arguments.  Requisites "
+"include the store files themselves, their references, and the references of "
+"these, recursively.  In other words, the returned list is the "
+"@dfn{transitive closure} of the store files."
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:2654
 msgid ""
-"@xref{Invoking guix size}, for a tool to profile the size of the closure of an element.  @xref{Invoking guix graph}, for a tool to "
-"visualize the graph of references."
+"@xref{Invoking guix size}, for a tool to profile the size of the closure of "
+"an element.  @xref{Invoking guix graph}, for a tool to visualize the graph "
+"of references."
 msgstr ""
 
 #. type: item
@@ -5865,14 +7678,16 @@ msgid "--derivers"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:2656 doc/guix.texi:3122 doc/guix.texi:7016
+#: doc/guix.texi:2656 doc/guix.texi:3122 doc/guix.texi:7020
 #, no-wrap
 msgid "derivation"
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:2659
-msgid "Return the derivation(s) leading to the given store items (@pxref{Derivations})."
+msgid ""
+"Return the derivation(s) leading to the given store items "
+"(@pxref{Derivations})."
 msgstr ""
 
 #. type: table
@@ -5888,19 +7703,24 @@ msgstr ""
 
 #. type: table
 #: doc/guix.texi:2669
-msgid "returns the @file{.drv} file(s) leading to the @code{emacs} package installed in your profile."
+msgid ""
+"returns the @file{.drv} file(s) leading to the @code{emacs} package "
+"installed in your profile."
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:2673
 msgid ""
-"Note that there may be zero matching @file{.drv} files, for instance because these files have been garbage-collected.  There can "
-"also be more than one matching @file{.drv} due to fixed-output derivations."
+"Note that there may be zero matching @file{.drv} files, for instance because "
+"these files have been garbage-collected.  There can also be more than one "
+"matching @file{.drv} due to fixed-output derivations."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:2677
-msgid "Lastly, the following options allow you to check the integrity of the store and to control disk usage."
+msgid ""
+"Lastly, the following options allow you to check the integrity of the store "
+"and to control disk usage."
 msgstr ""
 
 #. type: item
@@ -5929,20 +7749,25 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:2687
 msgid ""
-"By default, make sure that all the store items marked as valid in the database of the daemon actually exist in @file{/gnu/store}."
+"By default, make sure that all the store items marked as valid in the "
+"database of the daemon actually exist in @file{/gnu/store}."
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:2690
-msgid "When provided, @var{options} must be a comma-separated list containing one or more of @code{contents} and @code{repair}."
+msgid ""
+"When provided, @var{options} must be a comma-separated list containing one "
+"or more of @code{contents} and @code{repair}."
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:2696
 msgid ""
-"When passing @option{--verify=contents}, the daemon computes the content hash of each store item and compares it against its hash in "
-"the database.  Hash mismatches are reported as data corruptions.  Because it traverses @emph{all the files in the store}, this "
-"command can take a long time, especially on systems with a slow disk drive."
+"When passing @option{--verify=contents}, the daemon computes the content "
+"hash of each store item and compares it against its hash in the database.  "
+"Hash mismatches are reported as data corruptions.  Because it traverses "
+"@emph{all the files in the store}, this command can take a long time, "
+"especially on systems with a slow disk drive."
 msgstr ""
 
 #. type: cindex
@@ -5952,7 +7777,7 @@ msgid "repairing the store"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:2698 doc/guix.texi:5829
+#: doc/guix.texi:2698 doc/guix.texi:5833
 #, no-wrap
 msgid "corruption, recovering from"
 msgstr ""
@@ -5960,15 +7785,20 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:2706
 msgid ""
-"Using @option{--verify=repair} or @option{--verify=contents,repair} causes the daemon to try to repair corrupt store items by "
-"fetching substitutes for them (@pxref{Substitutes}).  Because repairing is not atomic, and thus potentially dangerous, it is "
-"available only to the system administrator.  A lightweight alternative, when you know exactly which items in the store are corrupt, "
-"is @command{guix build --repair} (@pxref{Invoking guix build})."
+"Using @option{--verify=repair} or @option{--verify=contents,repair} causes "
+"the daemon to try to repair corrupt store items by fetching substitutes for "
+"them (@pxref{Substitutes}).  Because repairing is not atomic, and thus "
+"potentially dangerous, it is available only to the system administrator.  A "
+"lightweight alternative, when you know exactly which items in the store are "
+"corrupt, is @command{guix build --repair} (@pxref{Invoking guix build})."
 msgstr ""
-"Utiliser @option{--verify=repair} ou @option{--verify=contents,repair} fait que le démon essaie de réparer les objets du dépôt "
-"corrompus en récupérant leurs substituts (@pxref{Substituts}). Comme la réparation n'est pas atomique et donc potentiellement "
-"dangereuse, elle n'est disponible que pour l'administrateur système. Une alternative plus légère lorsque vous connaissez exactement "
-"quelle entrée est corrompue consiste à lancer @command{guix build --repair} (@pxref{Invoking guix build})."
+"Utiliser @option{--verify=repair} ou @option{--verify=contents,repair} fait "
+"que le démon essaie de réparer les objets du dépôt corrompus en récupérant "
+"leurs substituts (@pxref{Substituts}). Comme la réparation n'est pas "
+"atomique et donc potentiellement dangereuse, elle n'est disponible que pour "
+"l'administrateur système. Une alternative plus légère lorsque vous "
+"connaissez exactement quelle entrée est corrompue consiste à lancer "
+"@command{guix build --repair} (@pxref{Invoking guix build})."
 
 #. type: item
 #: doc/guix.texi:2707
@@ -5978,15 +7808,19 @@ msgstr ""
 
 #. type: table
 #: doc/guix.texi:2711
-msgid "Optimize the store by hard-linking identical files---this is @dfn{deduplication}."
+msgid ""
+"Optimize the store by hard-linking identical files---this is "
+"@dfn{deduplication}."
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:2717
 msgid ""
-"The daemon performs deduplication after each successful build or archive import, unless it was started with @code{--disable-"
-"deduplication} (@pxref{Invoking guix-daemon, @code{--disable-deduplication}}).  Thus, this option is primarily useful when the "
-"daemon was running with @code{--disable-deduplication}."
+"The daemon performs deduplication after each successful build or archive "
+"import, unless it was started with @code{--disable-deduplication} "
+"(@pxref{Invoking guix-daemon, @code{--disable-deduplication}}).  Thus, this "
+"option is primarily useful when the daemon was running with @code{--disable-"
+"deduplication}."
 msgstr ""
 
 #. type: section
@@ -6022,37 +7856,48 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:2733
 msgid ""
-"Packages are installed or upgraded to the latest version available in the distribution currently available on your local machine.  "
-"To update that distribution, along with the Guix tools, you must run @command{guix pull}: the command downloads the latest Guix "
-"source code and package descriptions, and deploys it.  Source code is downloaded from a @uref{https://git-scm.com, Git} repository."
+"Packages are installed or upgraded to the latest version available in the "
+"distribution currently available on your local machine.  To update that "
+"distribution, along with the Guix tools, you must run @command{guix pull}: "
+"the command downloads the latest Guix source code and package descriptions, "
+"and deploys it.  Source code is downloaded from a @uref{https://git-scm.com, "
+"Git} repository."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:2739
 msgid ""
-"On completion, @command{guix package} will use packages and package versions from this just-retrieved copy of Guix.  Not only that, "
-"but all the Guix commands and Scheme modules will also be taken from that latest version.  New @command{guix} sub-commands added by "
-"the update also become available."
+"On completion, @command{guix package} will use packages and package versions "
+"from this just-retrieved copy of Guix.  Not only that, but all the Guix "
+"commands and Scheme modules will also be taken from that latest version.  "
+"New @command{guix} sub-commands added by the update also become available."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:2749
 msgid ""
-"Any user can update their Guix copy using @command{guix pull}, and the effect is limited to the user who run @command{guix pull}.  "
-"For instance, when user @code{root} runs @command{guix pull}, this has no effect on the version of Guix that user @code{alice} sees, "
-"and vice versa@footnote{Under the hood, @command{guix pull} updates the @file{~/.config/guix/latest} symbolic link to point to the "
-"latest Guix, and the @command{guix} command loads code from there.  Currently, the only way to roll back an invocation of "
-"@command{guix pull} is to manually update this symlink to point to the previous Guix.}."
+"Any user can update their Guix copy using @command{guix pull}, and the "
+"effect is limited to the user who run @command{guix pull}.  For instance, "
+"when user @code{root} runs @command{guix pull}, this has no effect on the "
+"version of Guix that user @code{alice} sees, and vice versa@footnote{Under "
+"the hood, @command{guix pull} updates the @file{~/.config/guix/latest} "
+"symbolic link to point to the latest Guix, and the @command{guix} command "
+"loads code from there.  Currently, the only way to roll back an invocation "
+"of @command{guix pull} is to manually update this symlink to point to the "
+"previous Guix.}."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:2752
-msgid "The @command{guix pull} command is usually invoked with no arguments, but it supports the following options:"
+msgid ""
+"The @command{guix pull} command is usually invoked with no arguments, but it "
+"supports the following options:"
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:2756
-msgid "Produce verbose output, writing build logs to the standard error output."
+msgid ""
+"Produce verbose output, writing build logs to the standard error output."
 msgstr ""
 
 #. type: item
@@ -6075,8 +7920,9 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:2764
 msgid ""
-"By default, the source is taken from its canonical Git repository at @code{gnu.org}, for the stable branch of Guix.  To use a "
-"different source, set the @code{GUIX_PULL_URL} environment variable."
+"By default, the source is taken from its canonical Git repository at "
+"@code{gnu.org}, for the stable branch of Guix.  To use a different source, "
+"set the @code{GUIX_PULL_URL} environment variable."
 msgstr ""
 
 #. type: item
@@ -6087,7 +7933,9 @@ msgstr ""
 
 #. type: table
 #: doc/guix.texi:2768
-msgid "Deploy @var{commit}, a valid Git commit ID represented as a hexadecimal string."
+msgid ""
+"Deploy @var{commit}, a valid Git commit ID represented as a hexadecimal "
+"string."
 msgstr ""
 
 #. type: item
@@ -6098,17 +7946,23 @@ msgstr ""
 
 #. type: table
 #: doc/guix.texi:2772
-msgid "Deploy the tip of @var{branch}, the name of a Git branch available on the repository at @var{url}."
+msgid ""
+"Deploy the tip of @var{branch}, the name of a Git branch available on the "
+"repository at @var{url}."
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:2776
-msgid "Use the bootstrap Guile to build the latest Guix.  This option is only useful to Guix developers."
+msgid ""
+"Use the bootstrap Guile to build the latest Guix.  This option is only "
+"useful to Guix developers."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:2780
-msgid "In addition, @command{guix pull} supports all the common build options (@pxref{Common Build Options})."
+msgid ""
+"In addition, @command{guix pull} supports all the common build options "
+"(@pxref{Common Build Options})."
 msgstr ""
 
 #. type: section
@@ -6120,15 +7974,18 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:2788
 msgid ""
-"Occasionally you want to pass software to people who are not (yet!)  lucky enough to be using Guix.  You'd tell them to run "
-"@command{guix package -i @var{something}}, but that's not possible in this case.  This is where @command{guix pack} comes in."
+"Occasionally you want to pass software to people who are not (yet!)  lucky "
+"enough to be using Guix.  You'd tell them to run @command{guix package -i "
+"@var{something}}, but that's not possible in this case.  This is where "
+"@command{guix pack} comes in."
 msgstr ""
 
 #. type: quotation
 #: doc/guix.texi:2793
 msgid ""
-"If you are looking for ways to exchange binaries among machines that already run Guix, @pxref{Invoking guix copy}, @ref{Invoking "
-"guix publish}, and @ref{Invoking guix archive}."
+"If you are looking for ways to exchange binaries among machines that already "
+"run Guix, @pxref{Invoking guix copy}, @ref{Invoking guix publish}, and "
+"@ref{Invoking guix archive}."
 msgstr ""
 
 #. type: cindex
@@ -6158,16 +8015,21 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:2807
 msgid ""
-"The @command{guix pack} command creates a shrink-wrapped @dfn{pack} or @dfn{software bundle}: it creates a tarball or some other "
-"archive containing the binaries of the software you're interested in, and all its dependencies.  The resulting archive can be used "
-"on any machine that does not have Guix, and people can run the exact same binaries as those you have with Guix.  The pack itself is "
-"created in a bit-reproducible fashion, so anyone can verify that it really contains the build results that you pretend to be "
-"shipping."
+"The @command{guix pack} command creates a shrink-wrapped @dfn{pack} or "
+"@dfn{software bundle}: it creates a tarball or some other archive containing "
+"the binaries of the software you're interested in, and all its "
+"dependencies.  The resulting archive can be used on any machine that does "
+"not have Guix, and people can run the exact same binaries as those you have "
+"with Guix.  The pack itself is created in a bit-reproducible fashion, so "
+"anyone can verify that it really contains the build results that you pretend "
+"to be shipping."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:2810
-msgid "For example, to create a bundle containing Guile, Emacs, Geiser, and all their dependencies, you can run:"
+msgid ""
+"For example, to create a bundle containing Guile, Emacs, Geiser, and all "
+"their dependencies, you can run:"
 msgstr ""
 
 #. type: example
@@ -6182,16 +8044,19 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:2823
 msgid ""
-"The result here is a tarball containing a @file{/gnu/store} directory with all the relevant packages.  The resulting tarball "
-"contains a @dfn{profile} with the three packages of interest; the profile is the same as would be created by @command{guix package -"
-"i}.  It is this mechanism that is used to create Guix's own standalone binary tarball (@pxref{Binary Installation})."
+"The result here is a tarball containing a @file{/gnu/store} directory with "
+"all the relevant packages.  The resulting tarball contains a @dfn{profile} "
+"with the three packages of interest; the profile is the same as would be "
+"created by @command{guix package -i}.  It is this mechanism that is used to "
+"create Guix's own standalone binary tarball (@pxref{Binary Installation})."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:2828
 msgid ""
-"Users of this pack would have to run @file{/gnu/store/@dots{}-profile/bin/guile} to run Guile, which you may find inconvenient.  To "
-"work around it, you can create, say, a @file{/opt/gnu/bin} symlink to the profile:"
+"Users of this pack would have to run @file{/gnu/store/@dots{}-profile/bin/"
+"guile} to run Guile, which you may find inconvenient.  To work around it, "
+"you can create, say, a @file{/opt/gnu/bin} symlink to the profile:"
 msgstr ""
 
 #. type: example
@@ -6207,7 +8072,9 @@ msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:2838
-msgid "Alternatively, you can produce a pack in the Docker image format using the following command:"
+msgid ""
+"Alternatively, you can produce a pack in the Docker image format using the "
+"following command:"
 msgstr ""
 
 #. type: example
@@ -6219,8 +8086,9 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:2848
 msgid ""
-"The result is a tarball that can be passed to the @command{docker load} command.  See the @uref{https://docs.docker.com/engine/"
-"reference/commandline/load/, Docker documentation} for more information."
+"The result is a tarball that can be passed to the @command{docker load} "
+"command.  See the @uref{https://docs.docker.com/engine/reference/commandline/"
+"load/, Docker documentation} for more information."
 msgstr ""
 
 #. type: Plain text
@@ -6258,7 +8126,9 @@ msgstr ""
 
 #. type: table
 #: doc/guix.texi:2862
-msgid "This is the default format.  It produces a tarball containing all the specified binaries and symlinks."
+msgid ""
+"This is the default format.  It produces a tarball containing all the "
+"specified binaries and symlinks."
 msgstr ""
 
 #. type: item
@@ -6270,76 +8140,87 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:2867
 msgid ""
-"This produces a tarball that follows the @uref{https://github.com/docker/docker/blob/master/image/spec/v1.2.md, Docker Image "
-"Specification}."
+"This produces a tarball that follows the @uref{https://github.com/docker/"
+"docker/blob/master/image/spec/v1.2.md, Docker Image Specification}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:2869 doc/guix.texi:5707 doc/guix.texi:6532 doc/guix.texi:7093 doc/guix.texi:7243 doc/guix.texi:20522
+#: doc/guix.texi:2869 doc/guix.texi:5711 doc/guix.texi:6536 doc/guix.texi:7097
+#: doc/guix.texi:7247 doc/guix.texi:20584
 #, no-wrap
 msgid "--expression=@var{expr}"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:2870 doc/guix.texi:5708 doc/guix.texi:6533 doc/guix.texi:7094 doc/guix.texi:7244 doc/guix.texi:20523
+#: doc/guix.texi:2870 doc/guix.texi:5712 doc/guix.texi:6537 doc/guix.texi:7098
+#: doc/guix.texi:7248 doc/guix.texi:20585
 #, no-wrap
 msgid "-e @var{expr}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:2872 doc/guix.texi:6535 doc/guix.texi:7096
+#: doc/guix.texi:2872 doc/guix.texi:6539 doc/guix.texi:7100
 msgid "Consider the package @var{expr} evaluates to."
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:2876
 msgid ""
-"This has the same purpose as the same-named option in @command{guix build} (@pxref{Additional Build Options, @code{--expression} in "
-"@command{guix build}})."
+"This has the same purpose as the same-named option in @command{guix build} "
+"(@pxref{Additional Build Options, @code{--expression} in @command{guix "
+"build}})."
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:2881
-msgid "Use the packages contained in the manifest object returned by the Scheme code in @var{file}."
+msgid ""
+"Use the packages contained in the manifest object returned by the Scheme "
+"code in @var{file}."
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:2889
 msgid ""
-"This has a similar purpose as the same-named option in @command{guix package} (@pxref{profile-manifest, @option{--manifest}}) and "
-"uses the same manifest files.  It allows you to define a collection of packages once and use it both for creating profiles and for "
-"creating archives for use on machines that do not have Guix installed.  Note that you can specify @emph{either} a manifest file "
-"@emph{or} a list of packages, but not both."
+"This has a similar purpose as the same-named option in @command{guix "
+"package} (@pxref{profile-manifest, @option{--manifest}}) and uses the same "
+"manifest files.  It allows you to define a collection of packages once and "
+"use it both for creating profiles and for creating archives for use on "
+"machines that do not have Guix installed.  Note that you can specify "
+"@emph{either} a manifest file @emph{or} a list of packages, but not both."
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:2891 doc/guix.texi:5780 doc/guix.texi:6921 doc/guix.texi:7329 doc/guix.texi:7963 doc/guix.texi:20531
+#: doc/guix.texi:2891 doc/guix.texi:5784 doc/guix.texi:6925 doc/guix.texi:7333
+#: doc/guix.texi:7967 doc/guix.texi:20593
 #, no-wrap
 msgid "-s @var{system}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:2894 doc/guix.texi:5783
-msgid "Attempt to build for @var{system}---e.g., @code{i686-linux}---instead of the system type of the build host."
+#: doc/guix.texi:2894 doc/guix.texi:5787
+msgid ""
+"Attempt to build for @var{system}---e.g., @code{i686-linux}---instead of the "
+"system type of the build host."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:2895 doc/guix.texi:5804
+#: doc/guix.texi:2895 doc/guix.texi:5808
 #, no-wrap
 msgid "--target=@var{triplet}"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:2896 doc/guix.texi:3322 doc/guix.texi:5805
+#: doc/guix.texi:2896 doc/guix.texi:3322 doc/guix.texi:5809
 #, no-wrap
 msgid "cross-compilation"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:2900 doc/guix.texi:5809
+#: doc/guix.texi:2900 doc/guix.texi:5813
 msgid ""
-"Cross-build for @var{triplet}, which must be a valid GNU triplet, such as @code{\"mips64el-linux-gnu\"} (@pxref{Specifying target "
-"triplets, GNU configuration triplets,, autoconf, Autoconf})."
+"Cross-build for @var{triplet}, which must be a valid GNU triplet, such as "
+"@code{\"mips64el-linux-gnu\"} (@pxref{Specifying target triplets, GNU "
+"configuration triplets,, autoconf, Autoconf})."
 msgstr ""
 
 #. type: item
@@ -6357,8 +8238,8 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:2905
 msgid ""
-"Compress the resulting tarball using @var{tool}---one of @code{gzip}, @code{bzip2}, @code{xz}, @code{lzip}, or @code{none} for no "
-"compression."
+"Compress the resulting tarball using @var{tool}---one of @code{gzip}, "
+"@code{bzip2}, @code{xz}, @code{lzip}, or @code{none} for no compression."
 msgstr ""
 
 #. type: item
@@ -6375,21 +8256,23 @@ msgstr ""
 
 #. type: table
 #: doc/guix.texi:2910
-msgid "Add the symlinks specified by @var{spec} to the pack.  This option can appear several times."
+msgid ""
+"Add the symlinks specified by @var{spec} to the pack.  This option can "
+"appear several times."
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:2914
 msgid ""
-"@var{spec} has the form @code{@var{source}=@var{target}}, where @var{source} is the symlink that will be created and @var{target} is "
-"the symlink target."
+"@var{spec} has the form @code{@var{source}=@var{target}}, where @var{source} "
+"is the symlink that will be created and @var{target} is the symlink target."
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:2917
 msgid ""
-"For instance, @code{-S /opt/gnu/bin=bin} creates a @file{/opt/gnu/bin} symlink pointing to the @file{bin} sub-directory of the "
-"profile."
+"For instance, @code{-S /opt/gnu/bin=bin} creates a @file{/opt/gnu/bin} "
+"symlink pointing to the @file{bin} sub-directory of the profile."
 msgstr ""
 
 #. type: item
@@ -6400,32 +8283,41 @@ msgstr ""
 
 #. type: table
 #: doc/guix.texi:2921
-msgid "Include the ``local state directory'', @file{/var/guix}, in the resulting pack."
+msgid ""
+"Include the ``local state directory'', @file{/var/guix}, in the resulting "
+"pack."
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:2927
 msgid ""
-"@file{/var/guix} contains the store database (@pxref{The Store}) as well as garbage-collector roots (@pxref{Invoking guix gc}).  "
-"Providing it in the pack means that the store is ``complete'' and manageable by Guix; not providing it pack means that the store is "
-"``dead'': items cannot be added to it or removed from it after extraction of the pack."
+"@file{/var/guix} contains the store database (@pxref{The Store}) as well as "
+"garbage-collector roots (@pxref{Invoking guix gc}).  Providing it in the "
+"pack means that the store is ``complete'' and manageable by Guix; not "
+"providing it pack means that the store is ``dead'': items cannot be added to "
+"it or removed from it after extraction of the pack."
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:2930
-msgid "One use case for this is the Guix self-contained binary tarball (@pxref{Binary Installation})."
+msgid ""
+"One use case for this is the Guix self-contained binary tarball "
+"(@pxref{Binary Installation})."
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:2934
-msgid "Use the bootstrap binaries to build the pack.  This option is only useful to Guix developers."
+msgid ""
+"Use the bootstrap binaries to build the pack.  This option is only useful to "
+"Guix developers."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:2939
 msgid ""
-"In addition, @command{guix pack} supports all the common build options (@pxref{Common Build Options}) and all the package "
-"transformation options (@pxref{Package Transformation Options})."
+"In addition, @command{guix pack} supports all the common build options "
+"(@pxref{Common Build Options}) and all the package transformation options "
+"(@pxref{Package Transformation Options})."
 msgstr ""
 
 #. type: section
@@ -6449,14 +8341,17 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:2951
 msgid ""
-"The @command{guix archive} command allows users to @dfn{export} files from the store into a single archive, and to later "
-"@dfn{import} them on a machine that runs Guix.  In particular, it allows store files to be transferred from one machine to the store "
-"on another machine."
+"The @command{guix archive} command allows users to @dfn{export} files from "
+"the store into a single archive, and to later @dfn{import} them on a machine "
+"that runs Guix.  In particular, it allows store files to be transferred from "
+"one machine to the store on another machine."
 msgstr ""
 
 #. type: quotation
 #: doc/guix.texi:2955
-msgid "If you're looking for a way to produce archives in a format suitable for tools other than Guix, @pxref{Invoking guix pack}."
+msgid ""
+"If you're looking for a way to produce archives in a format suitable for "
+"tools other than Guix, @pxref{Invoking guix pack}."
 msgstr ""
 
 #. type: cindex
@@ -6479,9 +8374,11 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:2969
 msgid ""
-"@var{specifications} may be either store file names or package specifications, as for @command{guix package} (@pxref{Invoking guix "
-"package}).  For instance, the following command creates an archive containing the @code{gui} output of the @code{git} package and "
-"the main output of @code{emacs}:"
+"@var{specifications} may be either store file names or package "
+"specifications, as for @command{guix package} (@pxref{Invoking guix "
+"package}).  For instance, the following command creates an archive "
+"containing the @code{gui} output of the @code{git} package and the main "
+"output of @code{emacs}:"
 msgstr ""
 
 #. type: example
@@ -6493,13 +8390,16 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:2977
 msgid ""
-"If the specified packages are not built yet, @command{guix archive} automatically builds them.  The build process may be controlled "
-"with the common build options (@pxref{Common Build Options})."
+"If the specified packages are not built yet, @command{guix archive} "
+"automatically builds them.  The build process may be controlled with the "
+"common build options (@pxref{Common Build Options})."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:2980
-msgid "To transfer the @code{emacs} package to a machine connected over SSH, one would run:"
+msgid ""
+"To transfer the @code{emacs} package to a machine connected over SSH, one "
+"would run:"
 msgstr ""
 
 #. type: example
@@ -6510,7 +8410,9 @@ msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:2988
-msgid "Similarly, a complete user profile may be transferred from one machine to another like this:"
+msgid ""
+"Similarly, a complete user profile may be transferred from one machine to "
+"another like this:"
 msgstr ""
 
 #. type: example
@@ -6524,10 +8426,13 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:3002
 msgid ""
-"However, note that, in both examples, all of @code{emacs} and the profile as well as all of their dependencies are transferred (due "
-"to @code{-r}), regardless of what is already available in the store on the target machine.  The @code{--missing} option can help "
-"figure out which items are missing from the target store.  The @command{guix copy} command simplifies and optimizes this whole "
-"process, so this is probably what you should use in this case (@pxref{Invoking guix copy})."
+"However, note that, in both examples, all of @code{emacs} and the profile as "
+"well as all of their dependencies are transferred (due to @code{-r}), "
+"regardless of what is already available in the store on the target machine.  "
+"The @code{--missing} option can help figure out which items are missing from "
+"the target store.  The @command{guix copy} command simplifies and optimizes "
+"this whole process, so this is probably what you should use in this case "
+"(@pxref{Invoking guix copy})."
 msgstr ""
 
 #. type: cindex
@@ -6545,18 +8450,23 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:3014
 msgid ""
-"Archives are stored in the ``normalized archive'' or ``nar'' format, which is comparable in spirit to `tar', but with differences "
-"that make it more appropriate for our purposes.  First, rather than recording all Unix metadata for each file, the nar format only "
-"mentions the file type (regular, directory, or symbolic link); Unix permissions and owner/group are dismissed.  Second, the order in "
-"which directory entries are stored always follows the order of file names according to the C locale collation order.  This makes "
-"archive production fully deterministic."
+"Archives are stored in the ``normalized archive'' or ``nar'' format, which "
+"is comparable in spirit to `tar', but with differences that make it more "
+"appropriate for our purposes.  First, rather than recording all Unix "
+"metadata for each file, the nar format only mentions the file type (regular, "
+"directory, or symbolic link); Unix permissions and owner/group are "
+"dismissed.  Second, the order in which directory entries are stored always "
+"follows the order of file names according to the C locale collation order.  "
+"This makes archive production fully deterministic."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:3020
 msgid ""
-"When exporting, the daemon digitally signs the contents of the archive, and that digital signature is appended.  When importing, the "
-"daemon verifies the signature and rejects the import in case of an invalid signature or if the signing key is not authorized."
+"When exporting, the daemon digitally signs the contents of the archive, and "
+"that digital signature is appended.  When importing, the daemon verifies the "
+"signature and rejects the import in case of an invalid signature or if the "
+"signing key is not authorized."
 msgstr ""
 
 #. type: Plain text
@@ -6572,22 +8482,26 @@ msgstr ""
 
 #. type: table
 #: doc/guix.texi:3027
-msgid "Export the specified store files or packages (see below.)  Write the resulting archive to the standard output."
+msgid ""
+"Export the specified store files or packages (see below.)  Write the "
+"resulting archive to the standard output."
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:3030
-msgid "Dependencies are @emph{not} included in the output, unless @code{--recursive} is passed."
+msgid ""
+"Dependencies are @emph{not} included in the output, unless @code{--"
+"recursive} is passed."
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:3031 doc/guix.texi:6076
+#: doc/guix.texi:3031 doc/guix.texi:6080
 #, no-wrap
 msgid "-r"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:3032 doc/guix.texi:6075
+#: doc/guix.texi:3032 doc/guix.texi:6079
 #, no-wrap
 msgid "--recursive"
 msgstr ""
@@ -6595,8 +8509,10 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:3037
 msgid ""
-"When combined with @code{--export}, this instructs @command{guix archive} to include dependencies of the given items in the "
-"archive.  Thus, the resulting archive is self-contained: it contains the closure of the exported store items."
+"When combined with @code{--export}, this instructs @command{guix archive} to "
+"include dependencies of the given items in the archive.  Thus, the resulting "
+"archive is self-contained: it contains the closure of the exported store "
+"items."
 msgstr ""
 
 #. type: item
@@ -6608,8 +8524,10 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:3043
 msgid ""
-"Read an archive from the standard input, and import the files listed therein into the store.  Abort if the archive has an invalid "
-"digital signature, or if it is signed by a public key not among the authorized keys (see @code{--authorize} below.)"
+"Read an archive from the standard input, and import the files listed therein "
+"into the store.  Abort if the archive has an invalid digital signature, or "
+"if it is signed by a public key not among the authorized keys (see @code{--"
+"authorize} below.)"
 msgstr ""
 
 #. type: item
@@ -6621,8 +8539,9 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:3048
 msgid ""
-"Read a list of store file names from the standard input, one per line, and write on the standard output the subset of these files "
-"missing from the store."
+"Read a list of store file names from the standard input, one per line, and "
+"write on the standard output the subset of these files missing from the "
+"store."
 msgstr ""
 
 #. type: item
@@ -6640,18 +8559,23 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:3055
 msgid ""
-"Generate a new key pair for the daemon.  This is a prerequisite before archives can be exported with @code{--export}.  Note that "
-"this operation usually takes time, because it needs to gather enough entropy to generate the key pair."
+"Generate a new key pair for the daemon.  This is a prerequisite before "
+"archives can be exported with @code{--export}.  Note that this operation "
+"usually takes time, because it needs to gather enough entropy to generate "
+"the key pair."
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:3065
 msgid ""
-"The generated key pair is typically stored under @file{/etc/guix}, in @file{signing-key.pub} (public key) and @file{signing-key.sec} "
-"(private key, which must be kept secret.)  When @var{parameters} is omitted, an ECDSA key using the Ed25519 curve is generated, or, "
-"for Libgcrypt versions before 1.6.0, it is a 4096-bit RSA key.  Alternatively, @var{parameters} can specify @code{genkey} parameters "
-"suitable for Libgcrypt (@pxref{General public-key related Functions, @code{gcry_pk_genkey},, gcrypt, The Libgcrypt Reference "
-"Manual})."
+"The generated key pair is typically stored under @file{/etc/guix}, in "
+"@file{signing-key.pub} (public key) and @file{signing-key.sec} (private key, "
+"which must be kept secret.)  When @var{parameters} is omitted, an ECDSA key "
+"using the Ed25519 curve is generated, or, for Libgcrypt versions before "
+"1.6.0, it is a 4096-bit RSA key.  Alternatively, @var{parameters} can "
+"specify @code{genkey} parameters suitable for Libgcrypt (@pxref{General "
+"public-key related Functions, @code{gcry_pk_genkey},, gcrypt, The Libgcrypt "
+"Reference Manual})."
 msgstr ""
 
 #. type: item
@@ -6669,16 +8593,19 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:3071
 msgid ""
-"Authorize imports signed by the public key passed on standard input.  The public key must be in ``s-expression advanced format''---i."
-"e., the same format as the @file{signing-key.pub} file."
+"Authorize imports signed by the public key passed on standard input.  The "
+"public key must be in ``s-expression advanced format''---i.e., the same "
+"format as the @file{signing-key.pub} file."
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:3078
 msgid ""
-"The list of authorized keys is kept in the human-editable file @file{/etc/guix/acl}.  The file contains @url{http://people.csail.mit."
-"edu/rivest/Sexp.txt, ``advanced-format s-expressions''} and is structured as an access-control list in the @url{http://theworld.com/"
-"~cme/spki.txt, Simple Public-Key Infrastructure (SPKI)}."
+"The list of authorized keys is kept in the human-editable file @file{/etc/"
+"guix/acl}.  The file contains @url{http://people.csail.mit.edu/rivest/Sexp."
+"txt, ``advanced-format s-expressions''} and is structured as an access-"
+"control list in the @url{http://theworld.com/~cme/spki.txt, Simple Public-"
+"Key Infrastructure (SPKI)}."
 msgstr ""
 
 #. type: item
@@ -6696,15 +8623,20 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:3084
 msgid ""
-"Read a single-item archive as served by substitute servers (@pxref{Substitutes}) and extract it to @var{directory}.  This is a low-"
+"Read a single-item archive as served by substitute servers "
+"(@pxref{Substitutes}) and extract it to @var{directory}.  This is a low-"
 "level operation needed in only very narrow use cases; see below."
 msgstr ""
-"Lit une archive à un seul élément telle que servie par un serveur de substituts (@pxref{Substituts}) et l'extrait dans "
-"@var{directory}. C'est une opération de bas niveau requise seulement dans de rares cas d'usage ; voir plus loin."
+"Lit une archive à un seul élément telle que servie par un serveur de "
+"substituts (@pxref{Substituts}) et l'extrait dans @var{directory}. C'est une "
+"opération de bas niveau requise seulement dans de rares cas d'usage ; voir "
+"plus loin."
 
 #. type: table
 #: doc/guix.texi:3087
-msgid "For example, the following command extracts the substitute for Emacs served by @code{hydra.gnu.org} to @file{/tmp/emacs}:"
+msgid ""
+"For example, the following command extracts the substitute for Emacs served "
+"by @code{hydra.gnu.org} to @file{/tmp/emacs}:"
 msgstr ""
 
 #. type: example
@@ -6719,53 +8651,66 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:3099
 msgid ""
-"Single-item archives are different from multiple-item archives produced by @command{guix archive --export}; they contain a single "
-"store item, and they do @emph{not} embed a signature.  Thus this operation does @emph{no} signature verification and its output "
-"should be considered unsafe."
+"Single-item archives are different from multiple-item archives produced by "
+"@command{guix archive --export}; they contain a single store item, and they "
+"do @emph{not} embed a signature.  Thus this operation does @emph{no} "
+"signature verification and its output should be considered unsafe."
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:3102
 msgid ""
-"The primary purpose of this operation is to facilitate inspection of archive contents coming from possibly untrusted substitute "
-"servers."
+"The primary purpose of this operation is to facilitate inspection of archive "
+"contents coming from possibly untrusted substitute servers."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:3115
 msgid ""
-"GNU Guix provides several Scheme programming interfaces (APIs) to define, build, and query packages.  The first interface allows "
-"users to write high-level package definitions.  These definitions refer to familiar packaging concepts, such as the name and version "
-"of a package, its build system, and its dependencies.  These definitions can then be turned into concrete build actions."
+"GNU Guix provides several Scheme programming interfaces (APIs) to define, "
+"build, and query packages.  The first interface allows users to write high-"
+"level package definitions.  These definitions refer to familiar packaging "
+"concepts, such as the name and version of a package, its build system, and "
+"its dependencies.  These definitions can then be turned into concrete build "
+"actions."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:3121
 msgid ""
-"Build actions are performed by the Guix daemon, on behalf of users.  In a standard setup, the daemon has write access to the store---"
-"the @file{/gnu/store} directory---whereas users do not.  The recommended setup also has the daemon perform builds in chroots, under "
-"a specific build users, to minimize interference with the rest of the system."
+"Build actions are performed by the Guix daemon, on behalf of users.  In a "
+"standard setup, the daemon has write access to the store---the @file{/gnu/"
+"store} directory---whereas users do not.  The recommended setup also has the "
+"daemon perform builds in chroots, under a specific build users, to minimize "
+"interference with the rest of the system."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:3130
 msgid ""
-"Lower-level APIs are available to interact with the daemon and the store.  To instruct the daemon to perform a build action, users "
-"actually provide it with a @dfn{derivation}.  A derivation is a low-level representation of the build actions to be taken, and the "
-"environment in which they should occur---derivations are to package definitions what assembly is to C programs.  The term "
-"``derivation'' comes from the fact that build results @emph{derive} from them."
+"Lower-level APIs are available to interact with the daemon and the store.  "
+"To instruct the daemon to perform a build action, users actually provide it "
+"with a @dfn{derivation}.  A derivation is a low-level representation of the "
+"build actions to be taken, and the environment in which they should occur---"
+"derivations are to package definitions what assembly is to C programs.  The "
+"term ``derivation'' comes from the fact that build results @emph{derive} "
+"from them."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:3133
-msgid "This chapter describes all these APIs in turn, starting from high-level package definitions."
+msgid ""
+"This chapter describes all these APIs in turn, starting from high-level "
+"package definitions."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:3150
 msgid ""
-"The high-level interface to package definitions is implemented in the @code{(guix packages)} and @code{(guix build-system)} "
-"modules.  As an example, the package definition, or @dfn{recipe}, for the GNU Hello package looks like this:"
+"The high-level interface to package definitions is implemented in the "
+"@code{(guix packages)} and @code{(guix build-system)} modules.  As an "
+"example, the package definition, or @dfn{recipe}, for the GNU Hello package "
+"looks like this:"
 msgstr ""
 
 #. type: example
@@ -6808,25 +8753,31 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:3187
 msgid ""
-"Without being a Scheme expert, the reader may have guessed the meaning of the various fields here.  This expression binds the "
-"variable @code{hello} to a @code{<package>} object, which is essentially a record (@pxref{SRFI-9, Scheme records,, guile, GNU Guile "
-"Reference Manual}).  This package object can be inspected using procedures found in the @code{(guix packages)} module; for instance, "
-"@code{(package-name hello)} returns---surprise!---@code{\"hello\"}."
+"Without being a Scheme expert, the reader may have guessed the meaning of "
+"the various fields here.  This expression binds the variable @code{hello} to "
+"a @code{<package>} object, which is essentially a record (@pxref{SRFI-9, "
+"Scheme records,, guile, GNU Guile Reference Manual}).  This package object "
+"can be inspected using procedures found in the @code{(guix packages)} "
+"module; for instance, @code{(package-name hello)} returns---surprise!---"
+"@code{\"hello\"}."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:3191
 msgid ""
-"With luck, you may be able to import part or all of the definition of the package you are interested in from another repository, "
-"using the @code{guix import} command (@pxref{Invoking guix import})."
+"With luck, you may be able to import part or all of the definition of the "
+"package you are interested in from another repository, using the @code{guix "
+"import} command (@pxref{Invoking guix import})."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:3197
 msgid ""
-"In the example above, @var{hello} is defined in a module of its own, @code{(gnu packages hello)}.  Technically, this is not strictly "
-"necessary, but it is convenient to do so: all the packages defined in modules under @code{(gnu packages @dots{})} are automatically "
-"known to the command-line tools (@pxref{Package Modules})."
+"In the example above, @var{hello} is defined in a module of its own, "
+"@code{(gnu packages hello)}.  Technically, this is not strictly necessary, "
+"but it is convenient to do so: all the packages defined in modules under "
+"@code{(gnu packages @dots{})} are automatically known to the command-line "
+"tools (@pxref{Package Modules})."
 msgstr ""
 
 #. type: Plain text
@@ -6837,21 +8788,28 @@ msgstr ""
 #. type: itemize
 #: doc/guix.texi:3206
 msgid ""
-"The @code{source} field of the package is an @code{<origin>} object (@pxref{origin Reference}, for the complete reference).  Here, "
-"the @code{url-fetch} method from @code{(guix download)} is used, meaning that the source is a file to be downloaded over FTP or HTTP."
+"The @code{source} field of the package is an @code{<origin>} object "
+"(@pxref{origin Reference}, for the complete reference).  Here, the @code{url-"
+"fetch} method from @code{(guix download)} is used, meaning that the source "
+"is a file to be downloaded over FTP or HTTP."
 msgstr ""
 
 #. type: itemize
 #: doc/guix.texi:3209
-msgid "The @code{mirror://gnu} prefix instructs @code{url-fetch} to use one of the GNU mirrors defined in @code{(guix download)}."
+msgid ""
+"The @code{mirror://gnu} prefix instructs @code{url-fetch} to use one of the "
+"GNU mirrors defined in @code{(guix download)}."
 msgstr ""
 
 #. type: itemize
 #: doc/guix.texi:3216
 msgid ""
-"The @code{sha256} field specifies the expected SHA256 hash of the file being downloaded.  It is mandatory, and allows Guix to check "
-"the integrity of the file.  The @code{(base32 @dots{})} form introduces the base32 representation of the hash.  You can obtain this "
-"information with @code{guix download} (@pxref{Invoking guix download}) and @code{guix hash} (@pxref{Invoking guix hash})."
+"The @code{sha256} field specifies the expected SHA256 hash of the file being "
+"downloaded.  It is mandatory, and allows Guix to check the integrity of the "
+"file.  The @code{(base32 @dots{})} form introduces the base32 representation "
+"of the hash.  You can obtain this information with @code{guix download} "
+"(@pxref{Invoking guix download}) and @code{guix hash} (@pxref{Invoking guix "
+"hash})."
 msgstr ""
 
 #. type: cindex
@@ -6863,8 +8821,9 @@ msgstr ""
 #. type: itemize
 #: doc/guix.texi:3221
 msgid ""
-"When needed, the @code{origin} form can also have a @code{patches} field listing patches to be applied, and a @code{snippet} field "
-"giving a Scheme expression to modify the source code."
+"When needed, the @code{origin} form can also have a @code{patches} field "
+"listing patches to be applied, and a @code{snippet} field giving a Scheme "
+"expression to modify the source code."
 msgstr ""
 
 #. type: cindex
@@ -6876,16 +8835,19 @@ msgstr ""
 #. type: itemize
 #: doc/guix.texi:3229
 msgid ""
-"The @code{build-system} field specifies the procedure to build the package (@pxref{Build Systems}).  Here, @var{gnu-build-system} "
-"represents the familiar GNU Build System, where packages may be configured, built, and installed with the usual @code{./configure && "
-"make && make check && make install} command sequence."
+"The @code{build-system} field specifies the procedure to build the package "
+"(@pxref{Build Systems}).  Here, @var{gnu-build-system} represents the "
+"familiar GNU Build System, where packages may be configured, built, and "
+"installed with the usual @code{./configure && make && make check && make "
+"install} command sequence."
 msgstr ""
 
 #. type: itemize
 #: doc/guix.texi:3235
 msgid ""
-"The @code{arguments} field specifies options for the build system (@pxref{Build Systems}).  Here it is interpreted by @var{gnu-build-"
-"system} as a request run @file{configure} with the @code{--enable-silent-rules} flag."
+"The @code{arguments} field specifies options for the build system "
+"(@pxref{Build Systems}).  Here it is interpreted by @var{gnu-build-system} "
+"as a request run @file{configure} with the @code{--enable-silent-rules} flag."
 msgstr ""
 
 #. type: findex
@@ -6909,26 +8871,30 @@ msgstr ""
 #. type: itemize
 #: doc/guix.texi:3247
 msgid ""
-"What about these quote (@code{'}) characters? They are Scheme syntax to introduce a literal list; @code{'} is synonymous with "
-"@code{quote}.  @xref{Expression Syntax, quoting,, guile, GNU Guile Reference Manual}, for details.  Here the value of the "
-"@code{arguments} field is a list of arguments passed to the build system down the road, as with @code{apply} (@pxref{Fly Evaluation, "
-"@code{apply},, guile, GNU Guile Reference Manual})."
+"What about these quote (@code{'}) characters? They are Scheme syntax to "
+"introduce a literal list; @code{'} is synonymous with @code{quote}.  "
+"@xref{Expression Syntax, quoting,, guile, GNU Guile Reference Manual}, for "
+"details.  Here the value of the @code{arguments} field is a list of "
+"arguments passed to the build system down the road, as with @code{apply} "
+"(@pxref{Fly Evaluation, @code{apply},, guile, GNU Guile Reference Manual})."
 msgstr ""
 
 #. type: itemize
 #: doc/guix.texi:3253
 msgid ""
-"The hash-colon (@code{#:}) sequence defines a Scheme @dfn{keyword} (@pxref{Keywords,,, guile, GNU Guile Reference Manual}), and "
-"@code{#:configure-flags} is a keyword used to pass a keyword argument to the build system (@pxref{Coding With Keywords,,, guile, GNU "
-"Guile Reference Manual})."
+"The hash-colon (@code{#:}) sequence defines a Scheme @dfn{keyword} "
+"(@pxref{Keywords,,, guile, GNU Guile Reference Manual}), and @code{#:"
+"configure-flags} is a keyword used to pass a keyword argument to the build "
+"system (@pxref{Coding With Keywords,,, guile, GNU Guile Reference Manual})."
 msgstr ""
 
 #. type: itemize
 #: doc/guix.texi:3259
 msgid ""
-"The @code{inputs} field specifies inputs to the build process---i.e., build-time or run-time dependencies of the package.  Here, we "
-"define an input called @code{\"gawk\"} whose value is that of the @var{gawk} variable; @var{gawk} is itself bound to a "
-"@code{<package>} object."
+"The @code{inputs} field specifies inputs to the build process---i.e., build-"
+"time or run-time dependencies of the package.  Here, we define an input "
+"called @code{\"gawk\"} whose value is that of the @var{gawk} variable; "
+"@var{gawk} is itself bound to a @code{<package>} object."
 msgstr ""
 
 #. type: cindex
@@ -6982,23 +8948,27 @@ msgstr ""
 #. type: itemize
 #: doc/guix.texi:3273
 msgid ""
-"Again, @code{`} (a backquote, synonymous with @code{quasiquote}) allows us to introduce a literal list in the @code{inputs} field, "
-"while @code{,} (a comma, synonymous with @code{unquote}) allows us to insert a value in that list (@pxref{Expression Syntax, "
-"unquote,, guile, GNU Guile Reference Manual})."
+"Again, @code{`} (a backquote, synonymous with @code{quasiquote}) allows us "
+"to introduce a literal list in the @code{inputs} field, while @code{,} (a "
+"comma, synonymous with @code{unquote}) allows us to insert a value in that "
+"list (@pxref{Expression Syntax, unquote,, guile, GNU Guile Reference "
+"Manual})."
 msgstr ""
 
 #. type: itemize
 #: doc/guix.texi:3277
 msgid ""
-"Note that GCC, Coreutils, Bash, and other essential tools do not need to be specified as inputs here.  Instead, @var{gnu-build-"
-"system} takes care of ensuring that they are present (@pxref{Build Systems})."
+"Note that GCC, Coreutils, Bash, and other essential tools do not need to be "
+"specified as inputs here.  Instead, @var{gnu-build-system} takes care of "
+"ensuring that they are present (@pxref{Build Systems})."
 msgstr ""
 
 #. type: itemize
 #: doc/guix.texi:3281
 msgid ""
-"However, any other dependencies need to be specified in the @code{inputs} field.  Any dependency not specified here will simply be "
-"unavailable to the build process, possibly leading to a build failure."
+"However, any other dependencies need to be specified in the @code{inputs} "
+"field.  Any dependency not specified here will simply be unavailable to the "
+"build process, possibly leading to a build failure."
 msgstr ""
 
 #. type: Plain text
@@ -7009,11 +8979,14 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:3295
 msgid ""
-"Once a package definition is in place, the package may actually be built using the @code{guix build} command-line tool "
-"(@pxref{Invoking guix build}), troubleshooting any build failures you encounter (@pxref{Debugging Build Failures}).  You can easily "
-"jump back to the package definition using the @command{guix edit} command (@pxref{Invoking guix edit}).  @xref{Packaging "
-"Guidelines}, for more information on how to test package definitions, and @ref{Invoking guix lint}, for information on how to check "
-"a definition for style conformance."
+"Once a package definition is in place, the package may actually be built "
+"using the @code{guix build} command-line tool (@pxref{Invoking guix build}), "
+"troubleshooting any build failures you encounter (@pxref{Debugging Build "
+"Failures}).  You can easily jump back to the package definition using the "
+"@command{guix edit} command (@pxref{Invoking guix edit}).  @xref{Packaging "
+"Guidelines}, for more information on how to test package definitions, and "
+"@ref{Invoking guix lint}, for information on how to check a definition for "
+"style conformance."
 msgstr ""
 
 #. type: vindex
@@ -7025,23 +8998,27 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:3299
 msgid ""
-"Lastly, @pxref{Package Modules}, for information on how to extend the distribution by adding your own package definitions to "
+"Lastly, @pxref{Package Modules}, for information on how to extend the "
+"distribution by adding your own package definitions to "
 "@code{GUIX_PACKAGE_PATH}."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:3303
 msgid ""
-"Finally, updating the package definition to a new upstream version can be partly automated by the @command{guix refresh} command "
-"(@pxref{Invoking guix refresh})."
+"Finally, updating the package definition to a new upstream version can be "
+"partly automated by the @command{guix refresh} command (@pxref{Invoking guix "
+"refresh})."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:3309
 msgid ""
-"Behind the scenes, a derivation corresponding to the @code{<package>} object is first computed by the @code{package-derivation} "
-"procedure.  That derivation is stored in a @code{.drv} file under @file{/gnu/store}.  The build actions it prescribes may then be "
-"realized by using the @code{build-derivations} procedure (@pxref{The Store})."
+"Behind the scenes, a derivation corresponding to the @code{<package>} object "
+"is first computed by the @code{package-derivation} procedure.  That "
+"derivation is stored in a @code{.drv} file under @file{/gnu/store}.  The "
+"build actions it prescribes may then be realized by using the @code{build-"
+"derivations} procedure (@pxref{The Store})."
 msgstr ""
 
 #. type: deffn
@@ -7052,20 +9029,25 @@ msgstr ""
 
 #. type: deffn
 #: doc/guix.texi:3313
-msgid "Return the @code{<derivation>} object of @var{package} for @var{system} (@pxref{Derivations})."
+msgid ""
+"Return the @code{<derivation>} object of @var{package} for @var{system} "
+"(@pxref{Derivations})."
 msgstr ""
 
 #. type: deffn
 #: doc/guix.texi:3319
 msgid ""
-"@var{package} must be a valid @code{<package>} object, and @var{system} must be a string denoting the target system type---e.g., "
-"@code{\"x86_64-linux\"} for an x86_64 Linux-based GNU system.  @var{store} must be a connection to the daemon, which operates on the "
-"store (@pxref{The Store})."
+"@var{package} must be a valid @code{<package>} object, and @var{system} must "
+"be a string denoting the target system type---e.g., @code{\"x86_64-linux\"} "
+"for an x86_64 Linux-based GNU system.  @var{store} must be a connection to "
+"the daemon, which operates on the store (@pxref{The Store})."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:3325
-msgid "Similarly, it is possible to compute a derivation that cross-builds a package for some other system:"
+msgid ""
+"Similarly, it is possible to compute a derivation that cross-builds a "
+"package for some other system:"
 msgstr ""
 
 #. type: deffn
@@ -7077,15 +9059,17 @@ msgstr ""
 #. type: deffn
 #: doc/guix.texi:3330
 msgid ""
-"@var{package} @var{target} [@var{system}] Return the @code{<derivation>} object of @var{package} cross-built from @var{system} to "
-"@var{target}."
+"@var{package} @var{target} [@var{system}] Return the @code{<derivation>} "
+"object of @var{package} cross-built from @var{system} to @var{target}."
 msgstr ""
 
 #. type: deffn
 #: doc/guix.texi:3335
 msgid ""
-"@var{target} must be a valid GNU triplet denoting the target hardware and operating system, such as @code{\"mips64el-linux-gnu\"} "
-"(@pxref{Configuration Names, GNU configuration triplets,, configure, GNU Configure and Build System})."
+"@var{target} must be a valid GNU triplet denoting the target hardware and "
+"operating system, such as @code{\"mips64el-linux-gnu\"} "
+"(@pxref{Configuration Names, GNU configuration triplets,, configure, GNU "
+"Configure and Build System})."
 msgstr ""
 
 #. type: cindex
@@ -7109,8 +9093,9 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:3343
 msgid ""
-"Packages can be manipulated in arbitrary ways.  An example of a useful transformation is @dfn{input rewriting}, whereby the "
-"dependency tree of a package is rewritten by replacing specific inputs by others:"
+"Packages can be manipulated in arbitrary ways.  An example of a useful "
+"transformation is @dfn{input rewriting}, whereby the dependency tree of a "
+"package is rewritten by replacing specific inputs by others:"
 msgstr ""
 
 #. type: deffn
@@ -7122,15 +9107,18 @@ msgstr ""
 #. type: deffn
 #: doc/guix.texi:3351
 msgid ""
-"[@var{rewrite-name}] Return a procedure that, when passed a package, replaces its direct and indirect dependencies (but not its "
-"implicit inputs) according to @var{replacements}.  @var{replacements} is a list of package pairs; the first element of each pair is "
-"the package to replace, and the second one is the replacement."
+"[@var{rewrite-name}] Return a procedure that, when passed a package, "
+"replaces its direct and indirect dependencies (but not its implicit inputs) "
+"according to @var{replacements}.  @var{replacements} is a list of package "
+"pairs; the first element of each pair is the package to replace, and the "
+"second one is the replacement."
 msgstr ""
 
 #. type: deffn
 #: doc/guix.texi:3354
 msgid ""
-"Optionally, @var{rewrite-name} is a one-argument procedure that takes the name of a package and returns its new name after rewrite."
+"Optionally, @var{rewrite-name} is a one-argument procedure that takes the "
+"name of a package and returns its new name after rewrite."
 msgstr ""
 
 #. type: Plain text
@@ -7160,16 +9148,18 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:3375
 msgid ""
-"Here we first define a rewriting procedure that replaces @var{openssl} with @var{libressl}.  Then we use it to define a "
-"@dfn{variant} of the @var{git} package that uses @var{libressl} instead of @var{openssl}.  This is exactly what the @option{--with-"
-"input} command-line option does (@pxref{Package Transformation Options, @option{--with-input}})."
+"Here we first define a rewriting procedure that replaces @var{openssl} with "
+"@var{libressl}.  Then we use it to define a @dfn{variant} of the @var{git} "
+"package that uses @var{libressl} instead of @var{openssl}.  This is exactly "
+"what the @option{--with-input} command-line option does (@pxref{Package "
+"Transformation Options, @option{--with-input}})."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:3379
 msgid ""
-"A more generic procedure to rewrite a package dependency graph is @code{package-mapping}: it supports arbitrary changes to nodes in "
-"the graph."
+"A more generic procedure to rewrite a package dependency graph is "
+"@code{package-mapping}: it supports arbitrary changes to nodes in the graph."
 msgstr ""
 
 #. type: deffn
@@ -7181,8 +9171,9 @@ msgstr ""
 #. type: deffn
 #: doc/guix.texi:3384
 msgid ""
-"Return a procedure that, given a package, applies @var{proc} to all the packages depended on and returns the resulting package.  The "
-"procedure stops recursion when @var{cut?} returns true for a given package."
+"Return a procedure that, given a package, applies @var{proc} to all the "
+"packages depended on and returns the resulting package.  The procedure stops "
+"recursion when @var{cut?} returns true for a given package."
 msgstr ""
 
 #. type: subsection
@@ -7193,7 +9184,9 @@ msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:3397
-msgid "This section summarizes all the options available in @code{package} declarations (@pxref{Defining Packages})."
+msgid ""
+"This section summarizes all the options available in @code{package} "
+"declarations (@pxref{Defining Packages})."
 msgstr ""
 
 #. type: deftp
@@ -7224,7 +9217,7 @@ msgid "The version of the package, as a string."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:3408 doc/guix.texi:6739 doc/guix.texi:9277 doc/guix.texi:9565
+#: doc/guix.texi:3408 doc/guix.texi:6743 doc/guix.texi:9281 doc/guix.texi:9569
 #, no-wrap
 msgid "source"
 msgstr ""
@@ -7232,9 +9225,11 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:3415
 msgid ""
-"An object telling how the source code for the package should be acquired.  Most of the time, this is an @code{origin} object, which "
-"denotes a file fetched from the Internet (@pxref{origin Reference}).  It can also be any other ``file-like'' object such as a "
-"@code{local-file}, which denotes a file from the local file system (@pxref{G-Expressions, @code{local-file}})."
+"An object telling how the source code for the package should be acquired.  "
+"Most of the time, this is an @code{origin} object, which denotes a file "
+"fetched from the Internet (@pxref{origin Reference}).  It can also be any "
+"other ``file-like'' object such as a @code{local-file}, which denotes a file "
+"from the local file system (@pxref{G-Expressions, @code{local-file}})."
 msgstr ""
 
 #. type: code{#1}
@@ -7245,18 +9240,22 @@ msgstr ""
 
 #. type: table
 #: doc/guix.texi:3419
-msgid "The build system that should be used to build the package (@pxref{Build Systems})."
+msgid ""
+"The build system that should be used to build the package (@pxref{Build "
+"Systems})."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:3420 doc/guix.texi:10969
+#: doc/guix.texi:3420 doc/guix.texi:11018
 #, no-wrap
 msgid "@code{arguments} (default: @code{'()})"
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:3423
-msgid "The arguments that should be passed to the build system.  This is a list, typically containing sequential keyword-value pairs."
+msgid ""
+"The arguments that should be passed to the build system.  This is a list, "
+"typically containing sequential keyword-value pairs."
 msgstr ""
 
 #. type: item
@@ -7286,10 +9285,12 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:3435
 msgid ""
-"These fields list dependencies of the package.  Each one is a list of tuples, where each tuple has a label for the input (a string) "
-"as its first element, a package, origin, or derivation as its second element, and optionally the name of the output thereof that "
-"should be used, which defaults to @code{\"out\"} (@pxref{Packages with Multiple Outputs}, for more on package outputs).  For "
-"example, the list below specifies three inputs:"
+"These fields list dependencies of the package.  Each one is a list of "
+"tuples, where each tuple has a label for the input (a string) as its first "
+"element, a package, origin, or derivation as its second element, and "
+"optionally the name of the output thereof that should be used, which "
+"defaults to @code{\"out\"} (@pxref{Packages with Multiple Outputs}, for more "
+"on package outputs).  For example, the list below specifies three inputs:"
 msgstr ""
 
 #. type: example
@@ -7310,16 +9311,20 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:3448
 msgid ""
-"The distinction between @code{native-inputs} and @code{inputs} is necessary when considering cross-compilation.  When cross-"
-"compiling, dependencies listed in @code{inputs} are built for the @emph{target} architecture; conversely, dependencies listed in "
-"@code{native-inputs} are built for the architecture of the @emph{build} machine."
+"The distinction between @code{native-inputs} and @code{inputs} is necessary "
+"when considering cross-compilation.  When cross-compiling, dependencies "
+"listed in @code{inputs} are built for the @emph{target} architecture; "
+"conversely, dependencies listed in @code{native-inputs} are built for the "
+"architecture of the @emph{build} machine."
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:3453
 msgid ""
-"@code{native-inputs} is typically used to list tools needed at build time, but not at run time, such as Autoconf, Automake, pkg-"
-"config, Gettext, or Bison.  @command{guix lint} can report likely mistakes in this area (@pxref{Invoking guix lint})."
+"@code{native-inputs} is typically used to list tools needed at build time, "
+"but not at run time, such as Autoconf, Automake, pkg-config, Gettext, or "
+"Bison.  @command{guix lint} can report likely mistakes in this area "
+"(@pxref{Invoking guix lint})."
 msgstr ""
 
 #. type: anchor{#1}
@@ -7330,25 +9335,30 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:3460
 msgid ""
-"Lastly, @code{propagated-inputs} is similar to @code{inputs}, but the specified packages will be automatically installed alongside "
-"the package they belong to (@pxref{package-cmd-propagated-inputs, @command{guix package}}, for information on how @command{guix "
-"package} deals with propagated inputs.)"
+"Lastly, @code{propagated-inputs} is similar to @code{inputs}, but the "
+"specified packages will be automatically installed alongside the package "
+"they belong to (@pxref{package-cmd-propagated-inputs, @command{guix "
+"package}}, for information on how @command{guix package} deals with "
+"propagated inputs.)"
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:3464
 msgid ""
-"For example this is necessary when a C/C++ library needs headers of another library to compile, or when a pkg-config file refers to "
-"another one @i{via} its @code{Requires} field."
+"For example this is necessary when a C/C++ library needs headers of another "
+"library to compile, or when a pkg-config file refers to another one @i{via} "
+"its @code{Requires} field."
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:3471
 msgid ""
-"Another example where @code{propagated-inputs} is useful is for languages that lack a facility to record the run-time search path "
-"akin to the @code{RUNPATH} of ELF files; this includes Guile, Python, Perl, and more.  To ensure that libraries written in those "
-"languages can find library code they depend on at run time, run-time dependencies must be listed in @code{propagated-inputs} rather "
-"than @code{inputs}."
+"Another example where @code{propagated-inputs} is useful is for languages "
+"that lack a facility to record the run-time search path akin to the "
+"@code{RUNPATH} of ELF files; this includes Guile, Python, Perl, and more.  "
+"To ensure that libraries written in those languages can find library code "
+"they depend on at run time, run-time dependencies must be listed in "
+"@code{propagated-inputs} rather than @code{inputs}."
 msgstr ""
 
 #. type: item
@@ -7359,7 +9369,9 @@ msgstr ""
 
 #. type: table
 #: doc/guix.texi:3475
-msgid "This is a Boolean field telling whether the package should use itself as a native input when cross-compiling."
+msgid ""
+"This is a Boolean field telling whether the package should use itself as a "
+"native input when cross-compiling."
 msgstr ""
 
 #. type: item
@@ -7370,7 +9382,9 @@ msgstr ""
 
 #. type: table
 #: doc/guix.texi:3479
-msgid "The list of output names of the package.  @xref{Packages with Multiple Outputs}, for typical uses of additional outputs."
+msgid ""
+"The list of output names of the package.  @xref{Packages with Multiple "
+"Outputs}, for typical uses of additional outputs."
 msgstr ""
 
 #. type: item
@@ -7387,7 +9401,9 @@ msgstr ""
 
 #. type: table
 #: doc/guix.texi:3484
-msgid "A list of @code{search-path-specification} objects describing search-path environment variables honored by the package."
+msgid ""
+"A list of @code{search-path-specification} objects describing search-path "
+"environment variables honored by the package."
 msgstr ""
 
 #. type: item
@@ -7399,12 +9415,13 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:3489
 msgid ""
-"This must be either @code{#f} or a package object that will be used as a @dfn{replacement} for this package.  @xref{Security "
-"Updates, grafts}, for details."
+"This must be either @code{#f} or a package object that will be used as a "
+"@dfn{replacement} for this package.  @xref{Security Updates, grafts}, for "
+"details."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:3490 doc/guix.texi:6731
+#: doc/guix.texi:3490 doc/guix.texi:6735
 #, no-wrap
 msgid "synopsis"
 msgstr ""
@@ -7415,7 +9432,7 @@ msgid "A one-line description of the package."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:3493 doc/guix.texi:6732 doc/guix.texi:20965
+#: doc/guix.texi:3493 doc/guix.texi:6736 doc/guix.texi:21027
 #, no-wrap
 msgid "description"
 msgstr ""
@@ -7439,11 +9456,13 @@ msgstr ""
 
 #. type: table
 #: doc/guix.texi:3500
-msgid "The license of the package; a value from @code{(guix licenses)}, or a list of such values."
+msgid ""
+"The license of the package; a value from @code{(guix licenses)}, or a list "
+"of such values."
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:3501 doc/guix.texi:6740
+#: doc/guix.texi:3501 doc/guix.texi:6744
 #, no-wrap
 msgid "home-page"
 msgstr ""
@@ -7462,7 +9481,8 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:3507
 msgid ""
-"The list of systems supported by the package, as strings of the form @code{architecture-kernel}, for example @code{\"x86_64-linux\"}."
+"The list of systems supported by the package, as strings of the form "
+"@code{architecture-kernel}, for example @code{\"x86_64-linux\"}."
 msgstr ""
 
 #. type: item
@@ -7485,8 +9505,9 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:3515
 msgid ""
-"The source location of the package.  It is useful to override this when inheriting from another package, in which case this field is "
-"not automatically corrected."
+"The source location of the package.  It is useful to override this when "
+"inheriting from another package, in which case this field is not "
+"automatically corrected."
 msgstr ""
 
 #. type: subsection
@@ -7497,7 +9518,9 @@ msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:3524
-msgid "This section summarizes all the options available in @code{origin} declarations (@pxref{Defining Packages})."
+msgid ""
+"This section summarizes all the options available in @code{origin} "
+"declarations (@pxref{Defining Packages})."
 msgstr ""
 
 #. type: deftp
@@ -7512,7 +9535,7 @@ msgid "This is the data type representing a source code origin."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:3529 doc/guix.texi:15647
+#: doc/guix.texi:3529 doc/guix.texi:15696
 #, no-wrap
 msgid "uri"
 msgstr ""
@@ -7520,8 +9543,10 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:3534
 msgid ""
-"An object containing the URI of the source.  The object type depends on the @code{method} (see below).  For example, when using the "
-"@var{url-fetch} method of @code{(guix download)}, the valid @code{uri} values are: a URL represented as a string, or a list thereof."
+"An object containing the URI of the source.  The object type depends on the "
+"@code{method} (see below).  For example, when using the @var{url-fetch} "
+"method of @code{(guix download)}, the valid @code{uri} values are: a URL "
+"represented as a string, or a list thereof."
 msgstr ""
 
 #. type: code{#1}
@@ -7548,11 +9573,13 @@ msgstr ""
 
 #. type: table
 #: doc/guix.texi:3544
-msgid "download a file from the HTTP, HTTPS, or FTP URL specified in the @code{uri} field;"
+msgid ""
+"download a file from the HTTP, HTTPS, or FTP URL specified in the @code{uri} "
+"field;"
 msgstr ""
 
 #. type: vindex
-#: doc/guix.texi:3545 doc/guix.texi:6093
+#: doc/guix.texi:3545 doc/guix.texi:6097
 #, no-wrap
 msgid "git-fetch"
 msgstr ""
@@ -7566,8 +9593,9 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:3550
 msgid ""
-"clone the Git version control repository, and check out the revision specified in the @code{uri} field as a @code{git-reference} "
-"object; a @code{git-reference} looks like this:"
+"clone the Git version control repository, and check out the revision "
+"specified in the @code{uri} field as a @code{git-reference} object; a "
+"@code{git-reference} looks like this:"
 msgstr ""
 
 #. type: example
@@ -7588,15 +9616,16 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:3562
 msgid ""
-"A bytevector containing the SHA-256 hash of the source.  Typically the @code{base32} form is used here to generate the bytevector "
-"from a base-32 string."
+"A bytevector containing the SHA-256 hash of the source.  Typically the "
+"@code{base32} form is used here to generate the bytevector from a base-32 "
+"string."
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:3566
 msgid ""
-"You can obtain this information using @code{guix download} (@pxref{Invoking guix download}) or @code{guix hash} (@pxref{Invoking "
-"guix hash})."
+"You can obtain this information using @code{guix download} (@pxref{Invoking "
+"guix download}) or @code{guix hash} (@pxref{Invoking guix hash})."
 msgstr ""
 
 #. type: item
@@ -7608,9 +9637,11 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:3573
 msgid ""
-"The file name under which the source code should be saved.  When this is @code{#f}, a sensible default value will be used in most "
-"cases.  In case the source is fetched from a URL, the file name from the URL will be used.  For version control checkouts, it is "
-"recommended to provide the file name explicitly because the default is not very descriptive."
+"The file name under which the source code should be saved.  When this is "
+"@code{#f}, a sensible default value will be used in most cases.  In case the "
+"source is fetched from a URL, the file name from the URL will be used.  For "
+"version control checkouts, it is recommended to provide the file name "
+"explicitly because the default is not very descriptive."
 msgstr ""
 
 #. type: item
@@ -7622,15 +9653,15 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:3577
 msgid ""
-"A list of file names, origins, or file-like objects (@pxref{G-Expressions, file-like objects}) pointing to patches to be applied to "
-"the source."
+"A list of file names, origins, or file-like objects (@pxref{G-Expressions, "
+"file-like objects}) pointing to patches to be applied to the source."
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:3581
 msgid ""
-"This list of patches must be unconditional.  In particular, it cannot depend on the value of @code{%current-system} or "
-"@code{%current-target-system}."
+"This list of patches must be unconditional.  In particular, it cannot depend "
+"on the value of @code{%current-system} or @code{%current-target-system}."
 msgstr ""
 
 #. type: item
@@ -7642,8 +9673,9 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:3586
 msgid ""
-"A G-expression (@pxref{G-Expressions}) or S-expression that will be run in the source directory.  This is a convenient way to modify "
-"the source, sometimes more convenient than a patch."
+"A G-expression (@pxref{G-Expressions}) or S-expression that will be run in "
+"the source directory.  This is a convenient way to modify the source, "
+"sometimes more convenient than a patch."
 msgstr ""
 
 #. type: item
@@ -7654,7 +9686,9 @@ msgstr ""
 
 #. type: table
 #: doc/guix.texi:3590
-msgid "A list of command-line flags that should be passed to the @code{patch} command."
+msgid ""
+"A list of command-line flags that should be passed to the @code{patch} "
+"command."
 msgstr ""
 
 #. type: item
@@ -7666,8 +9700,9 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:3595
 msgid ""
-"Input packages or derivations to the patching process.  When this is @code{#f}, the usual set of inputs necessary for patching are "
-"provided, such as GNU@tie{}Patch."
+"Input packages or derivations to the patching process.  When this is "
+"@code{#f}, the usual set of inputs necessary for patching are provided, such "
+"as GNU@tie{}Patch."
 msgstr ""
 
 #. type: item
@@ -7679,7 +9714,8 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:3599
 msgid ""
-"A list of Guile modules that should be loaded during the patching process and while running the code in the @code{snippet} field."
+"A list of Guile modules that should be loaded during the patching process "
+"and while running the code in the @code{snippet} field."
 msgstr ""
 
 #. type: item
@@ -7690,7 +9726,9 @@ msgstr ""
 
 #. type: table
 #: doc/guix.texi:3603
-msgid "The Guile package that should be used in the patching process.  When this is @code{#f}, a sensible default is used."
+msgid ""
+"The Guile package that should be used in the patching process.  When this is "
+"@code{#f}, a sensible default is used."
 msgstr ""
 
 #. type: cindex
@@ -7702,15 +9740,18 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:3615
 msgid ""
-"Each package definition specifies a @dfn{build system} and arguments for that build system (@pxref{Defining Packages}).  This "
-"@code{build-system} field represents the build procedure of the package, as well as implicit dependencies of that build procedure."
+"Each package definition specifies a @dfn{build system} and arguments for "
+"that build system (@pxref{Defining Packages}).  This @code{build-system} "
+"field represents the build procedure of the package, as well as implicit "
+"dependencies of that build procedure."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:3619
 msgid ""
-"Build systems are @code{<build-system>} objects.  The interface to create and manipulate them is provided by the @code{(guix build-"
-"system)} module, and actual build systems are exported by specific modules."
+"Build systems are @code{<build-system>} objects.  The interface to create "
+"and manipulate them is provided by the @code{(guix build-system)} module, "
+"and actual build systems are exported by specific modules."
 msgstr ""
 
 #. type: cindex
@@ -7722,26 +9763,32 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:3627
 msgid ""
-"Under the hood, build systems first compile package objects to @dfn{bags}.  A @dfn{bag} is like a package, but with less "
-"ornamentation---in other words, a bag is a lower-level representation of a package, which includes all the inputs of that package, "
-"including some that were implicitly added by the build system.  This intermediate representation is then compiled to a derivation "
-"(@pxref{Derivations})."
+"Under the hood, build systems first compile package objects to @dfn{bags}.  "
+"A @dfn{bag} is like a package, but with less ornamentation---in other words, "
+"a bag is a lower-level representation of a package, which includes all the "
+"inputs of that package, including some that were implicitly added by the "
+"build system.  This intermediate representation is then compiled to a "
+"derivation (@pxref{Derivations})."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:3635
 msgid ""
-"Build systems accept an optional list of @dfn{arguments}.  In package definitions, these are passed @i{via} the @code{arguments} "
-"field (@pxref{Defining Packages}).  They are typically keyword arguments (@pxref{Optional Arguments, keyword arguments in Guile,, "
-"guile, GNU Guile Reference Manual}).  The value of these arguments is usually evaluated in the @dfn{build stratum}---i.e., by a "
-"Guile process launched by the daemon (@pxref{Derivations})."
+"Build systems accept an optional list of @dfn{arguments}.  In package "
+"definitions, these are passed @i{via} the @code{arguments} field "
+"(@pxref{Defining Packages}).  They are typically keyword arguments "
+"(@pxref{Optional Arguments, keyword arguments in Guile,, guile, GNU Guile "
+"Reference Manual}).  The value of these arguments is usually evaluated in "
+"the @dfn{build stratum}---i.e., by a Guile process launched by the daemon "
+"(@pxref{Derivations})."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:3639
 msgid ""
-"The main build system is @var{gnu-build-system}, which implements the standard build procedure for GNU and many other packages.  It "
-"is provided by the @code{(guix build-system gnu)} module."
+"The main build system is @var{gnu-build-system}, which implements the "
+"standard build procedure for GNU and many other packages.  It is provided by "
+"the @code{(guix build-system gnu)} module."
 msgstr ""
 
 #. type: defvr
@@ -7753,8 +9800,9 @@ msgstr ""
 #. type: defvr
 #: doc/guix.texi:3644
 msgid ""
-"@var{gnu-build-system} represents the GNU Build System, and variants thereof (@pxref{Configuration, configuration and makefile "
-"conventions,, standards, GNU Coding Standards})."
+"@var{gnu-build-system} represents the GNU Build System, and variants thereof "
+"(@pxref{Configuration, configuration and makefile conventions,, standards, "
+"GNU Coding Standards})."
 msgstr ""
 
 #. type: cindex
@@ -7766,9 +9814,12 @@ msgstr ""
 #. type: defvr
 #: doc/guix.texi:3652
 msgid ""
-"In a nutshell, packages using it are configured, built, and installed with the usual @code{./configure && make && make check && make "
-"install} command sequence.  In practice, a few additional steps are often needed.  All these steps are split up in separate "
-"@dfn{phases}, notably@footnote{Please see the @code{(guix build gnu-build-system)} modules for more details about the build phases.}:"
+"In a nutshell, packages using it are configured, built, and installed with "
+"the usual @code{./configure && make && make check && make install} command "
+"sequence.  In practice, a few additional steps are often needed.  All these "
+"steps are split up in separate @dfn{phases}, notably@footnote{Please see the "
+"@code{(guix build gnu-build-system)} modules for more details about the "
+"build phases.}:"
 msgstr ""
 
 #. type: item
@@ -7780,8 +9831,9 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:3658
 msgid ""
-"Unpack the source tarball, and change the current directory to the extracted source tree.  If the source is actually a directory, "
-"copy it to the build tree, and enter that directory."
+"Unpack the source tarball, and change the current directory to the extracted "
+"source tree.  If the source is actually a directory, copy it to the build "
+"tree, and enter that directory."
 msgstr ""
 
 #. type: item
@@ -7793,8 +9845,9 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:3663
 msgid ""
-"Patch shebangs encountered in source files so they refer to the right store file names.  For instance, this changes @code{#!/bin/sh} "
-"to @code{#!/gnu/store/@dots{}-bash-4.3/bin/sh}."
+"Patch shebangs encountered in source files so they refer to the right store "
+"file names.  For instance, this changes @code{#!/bin/sh} to @code{#!/gnu/"
+"store/@dots{}-bash-4.3/bin/sh}."
 msgstr ""
 
 #. type: item
@@ -7806,12 +9859,13 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:3668
 msgid ""
-"Run the @file{configure} script with a number of default options, such as @code{--prefix=/gnu/store/@dots{}}, as well as the options "
-"specified by the @code{#:configure-flags} argument."
+"Run the @file{configure} script with a number of default options, such as "
+"@code{--prefix=/gnu/store/@dots{}}, as well as the options specified by the "
+"@code{#:configure-flags} argument."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:3669 doc/guix.texi:4135 doc/guix.texi:20375
+#: doc/guix.texi:3669 doc/guix.texi:4135 doc/guix.texi:20437
 #, no-wrap
 msgid "build"
 msgstr ""
@@ -7819,8 +9873,9 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:3673
 msgid ""
-"Run @code{make} with the list of flags specified with @code{#:make-flags}.  If the @code{#:parallel-build?} argument is true (the "
-"default), build with @code{make -j}."
+"Run @code{make} with the list of flags specified with @code{#:make-flags}.  "
+"If the @code{#:parallel-build?} argument is true (the default), build with "
+"@code{make -j}."
 msgstr ""
 
 #. type: item
@@ -7832,8 +9887,9 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:3679
 msgid ""
-"Run @code{make check}, or some other target specified with @code{#:test-target}, unless @code{#:tests? #f} is passed.  If the "
-"@code{#:parallel-tests?} argument is true (the default), run @code{make check -j}."
+"Run @code{make check}, or some other target specified with @code{#:test-"
+"target}, unless @code{#:tests? #f} is passed.  If the @code{#:parallel-"
+"tests?} argument is true (the default), run @code{make check -j}."
 msgstr ""
 
 #. type: item
@@ -7867,8 +9923,9 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:3690
 msgid ""
-"Strip debugging symbols from ELF files (unless @code{#:strip-binaries?} is false), copying them to the @code{debug} output when "
-"available (@pxref{Installing Debugging Files})."
+"Strip debugging symbols from ELF files (unless @code{#:strip-binaries?} is "
+"false), copying them to the @code{debug} output when available "
+"(@pxref{Installing Debugging Files})."
 msgstr ""
 
 #. type: vindex
@@ -7880,13 +9937,17 @@ msgstr ""
 #. type: defvr
 #: doc/guix.texi:3697
 msgid ""
-"The build-side module @code{(guix build gnu-build-system)} defines @var{%standard-phases} as the default list of build phases.  "
-"@var{%standard-phases} is a list of symbol/procedure pairs, where the procedure implements the actual phase."
+"The build-side module @code{(guix build gnu-build-system)} defines "
+"@var{%standard-phases} as the default list of build phases.  @var{%standard-"
+"phases} is a list of symbol/procedure pairs, where the procedure implements "
+"the actual phase."
 msgstr ""
 
 #. type: defvr
 #: doc/guix.texi:3700
-msgid "The list of phases used for a particular package can be changed with the @code{#:phases} parameter.  For instance, passing:"
+msgid ""
+"The list of phases used for a particular package can be changed with the "
+"@code{#:phases} parameter.  For instance, passing:"
 msgstr ""
 
 #. type: example
@@ -7897,23 +9958,30 @@ msgstr ""
 
 #. type: defvr
 #: doc/guix.texi:3707
-msgid "means that all the phases described above will be used, except the @code{configure} phase."
+msgid ""
+"means that all the phases described above will be used, except the "
+"@code{configure} phase."
 msgstr ""
 
 #. type: defvr
 #: doc/guix.texi:3714
 msgid ""
-"In addition, this build system ensures that the ``standard'' environment for GNU packages is available.  This includes tools such as "
-"GCC, libc, Coreutils, Bash, Make, Diffutils, grep, and sed (see the @code{(guix build-system gnu)} module for a complete list).  We "
-"call these the @dfn{implicit inputs} of a package, because package definitions do not have to mention them."
+"In addition, this build system ensures that the ``standard'' environment for "
+"GNU packages is available.  This includes tools such as GCC, libc, "
+"Coreutils, Bash, Make, Diffutils, grep, and sed (see the @code{(guix build-"
+"system gnu)} module for a complete list).  We call these the @dfn{implicit "
+"inputs} of a package, because package definitions do not have to mention "
+"them."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:3721
 msgid ""
-"Other @code{<build-system>} objects are defined to support other conventions and tools used by free software packages.  They inherit "
-"most of @var{gnu-build-system}, and differ mainly in the set of inputs implicitly added to the build process, and in the list of "
-"phases executed.  Some of these build systems are listed below."
+"Other @code{<build-system>} objects are defined to support other conventions "
+"and tools used by free software packages.  They inherit most of @var{gnu-"
+"build-system}, and differ mainly in the set of inputs implicitly added to "
+"the build process, and in the list of phases executed.  Some of these build "
+"systems are listed below."
 msgstr ""
 
 #. type: defvr
@@ -7925,39 +9993,47 @@ msgstr ""
 #. type: defvr
 #: doc/guix.texi:3726
 msgid ""
-"This variable is exported by @code{(guix build-system ant)}.  It implements the build procedure for Java packages that can be built "
-"with @url{http://ant.apache.org/, Ant build tool}."
+"This variable is exported by @code{(guix build-system ant)}.  It implements "
+"the build procedure for Java packages that can be built with @url{http://ant."
+"apache.org/, Ant build tool}."
 msgstr ""
 
 #. type: defvr
 #: doc/guix.texi:3731
 msgid ""
-"It adds both @code{ant} and the @dfn{Java Development Kit} (JDK) as provided by the @code{icedtea} package to the set of inputs.  "
-"Different packages can be specified with the @code{#:ant} and @code{#:jdk} parameters, respectively."
+"It adds both @code{ant} and the @dfn{Java Development Kit} (JDK) as provided "
+"by the @code{icedtea} package to the set of inputs.  Different packages can "
+"be specified with the @code{#:ant} and @code{#:jdk} parameters, respectively."
 msgstr ""
 
 #. type: defvr
 #: doc/guix.texi:3737
 msgid ""
-"When the original package does not provide a suitable Ant build file, the parameter @code{#:jar-name} can be used to generate a "
-"minimal Ant build file @file{build.xml} with tasks to build the specified jar archive.  In this case the parameter @code{#:source-"
-"dir} can be used to specify the source sub-directory, defaulting to ``src''."
+"When the original package does not provide a suitable Ant build file, the "
+"parameter @code{#:jar-name} can be used to generate a minimal Ant build file "
+"@file{build.xml} with tasks to build the specified jar archive.  In this "
+"case the parameter @code{#:source-dir} can be used to specify the source sub-"
+"directory, defaulting to ``src''."
 msgstr ""
 
 #. type: defvr
 #: doc/guix.texi:3745
 msgid ""
-"The @code{#:main-class} parameter can be used with the minimal ant buildfile to specify the main class of the resulting jar.  This "
-"makes the jar file executable.  The @code{#:test-include} parameter can be used to specify the list of junit tests to run. It "
-"defaults to @code{(list \"**/*Test.java\")}.  The @code{#:test-exclude} can be used to disable some tests. It defaults to "
-"@code{(list \"**/Abstract*.java\")}, because abstract classes cannot be run as tests."
+"The @code{#:main-class} parameter can be used with the minimal ant buildfile "
+"to specify the main class of the resulting jar.  This makes the jar file "
+"executable.  The @code{#:test-include} parameter can be used to specify the "
+"list of junit tests to run. It defaults to @code{(list \"**/*Test.java\")}.  "
+"The @code{#:test-exclude} can be used to disable some tests. It defaults to "
+"@code{(list \"**/Abstract*.java\")}, because abstract classes cannot be run "
+"as tests."
 msgstr ""
 
 #. type: defvr
 #: doc/guix.texi:3749
 msgid ""
-"The parameter @code{#:build-target} can be used to specify the Ant task that should be run during the @code{build} phase.  By "
-"default the ``jar'' task will be run."
+"The parameter @code{#:build-target} can be used to specify the Ant task that "
+"should be run during the @code{build} phase.  By default the ``jar'' task "
+"will be run."
 msgstr ""
 
 #. type: defvr
@@ -7981,64 +10057,77 @@ msgstr ""
 #. type: defvr
 #: doc/guix.texi:3760
 msgid ""
-"These variables, exported by @code{(guix build-system asdf)}, implement build procedures for Common Lisp packages using @url{https://"
-"common-lisp.net/project/asdf/, ``ASDF''}. ASDF is a system definition facility for Common Lisp programs and libraries."
+"These variables, exported by @code{(guix build-system asdf)}, implement "
+"build procedures for Common Lisp packages using @url{https://common-lisp.net/"
+"project/asdf/, ``ASDF''}. ASDF is a system definition facility for Common "
+"Lisp programs and libraries."
 msgstr ""
 
 #. type: defvr
 #: doc/guix.texi:3767
 msgid ""
-"The @code{asdf-build-system/source} system installs the packages in source form, and can be loaded using any common lisp "
-"implementation, via ASDF.  The others, such as @code{asdf-build-system/sbcl}, install binary systems in the format which a "
-"particular implementation understands.  These build systems can also be used to produce executable programs, or lisp images which "
+"The @code{asdf-build-system/source} system installs the packages in source "
+"form, and can be loaded using any common lisp implementation, via ASDF.  The "
+"others, such as @code{asdf-build-system/sbcl}, install binary systems in the "
+"format which a particular implementation understands.  These build systems "
+"can also be used to produce executable programs, or lisp images which "
 "contain a set of packages pre-loaded."
 msgstr ""
 
 #. type: defvr
 #: doc/guix.texi:3771
 msgid ""
-"The build system uses naming conventions.  For binary packages, the package name should be prefixed with the lisp implementation, "
-"such as @code{sbcl-} for @code{asdf-build-system/sbcl}."
+"The build system uses naming conventions.  For binary packages, the package "
+"name should be prefixed with the lisp implementation, such as @code{sbcl-} "
+"for @code{asdf-build-system/sbcl}."
 msgstr ""
 
 #. type: defvr
 #: doc/guix.texi:3775
 msgid ""
-"Additionally, the corresponding source package should be labeled using the same convention as python packages (see @ref{Python "
-"Modules}), using the @code{cl-} prefix."
+"Additionally, the corresponding source package should be labeled using the "
+"same convention as python packages (see @ref{Python Modules}), using the "
+"@code{cl-} prefix."
 msgstr ""
 
 #. type: defvr
 #: doc/guix.texi:3780
 msgid ""
-"For binary packages, each system should be defined as a Guix package.  If one package @code{origin} contains several systems, "
-"package variants can be created in order to build all the systems.  Source packages, which use @code{asdf-build-system/source}, may "
-"contain several systems."
+"For binary packages, each system should be defined as a Guix package.  If "
+"one package @code{origin} contains several systems, package variants can be "
+"created in order to build all the systems.  Source packages, which use "
+"@code{asdf-build-system/source}, may contain several systems."
 msgstr ""
 
 #. type: defvr
 #: doc/guix.texi:3787
 msgid ""
-"In order to create executable programs and images, the build-side procedures @code{build-program} and @code{build-image} can be "
-"used.  They should be called in a build phase after the @code{create-symlinks} phase, so that the system which was just built can be "
-"used within the resulting image.  @code{build-program} requires a list of Common Lisp expressions to be passed as the @code{#:entry-"
-"program} argument."
+"In order to create executable programs and images, the build-side procedures "
+"@code{build-program} and @code{build-image} can be used.  They should be "
+"called in a build phase after the @code{create-symlinks} phase, so that the "
+"system which was just built can be used within the resulting image.  "
+"@code{build-program} requires a list of Common Lisp expressions to be passed "
+"as the @code{#:entry-program} argument."
 msgstr ""
 
 #. type: defvr
 #: doc/guix.texi:3796
 msgid ""
-"If the system is not defined within its own @code{.asd} file of the same name, then the @code{#:asd-file} parameter should be used "
-"to specify which file the system is defined in.  Furthermore, if the package defines a system for its tests in a separate file, it "
-"will be loaded before the tests are run if it is specified by the @code{#:test-asd-file} parameter.  If it is not set, the files "
-"@code{<system>-tests.asd}, @code{<system>-test.asd}, @code{tests.asd}, and @code{test.asd} will be tried if they exist."
+"If the system is not defined within its own @code{.asd} file of the same "
+"name, then the @code{#:asd-file} parameter should be used to specify which "
+"file the system is defined in.  Furthermore, if the package defines a system "
+"for its tests in a separate file, it will be loaded before the tests are run "
+"if it is specified by the @code{#:test-asd-file} parameter.  If it is not "
+"set, the files @code{<system>-tests.asd}, @code{<system>-test.asd}, "
+"@code{tests.asd}, and @code{test.asd} will be tried if they exist."
 msgstr ""
 
 #. type: defvr
 #: doc/guix.texi:3800
 msgid ""
-"If for some reason the package must be named in a different way than the naming conventions suggest, the @code{#:asd-system-name} "
-"parameter can be used to specify the name of the system."
+"If for some reason the package must be named in a different way than the "
+"naming conventions suggest, the @code{#:asd-system-name} parameter can be "
+"used to specify the name of the system."
 msgstr ""
 
 #. type: defvr
@@ -8062,15 +10151,18 @@ msgstr ""
 #. type: defvr
 #: doc/guix.texi:3809
 msgid ""
-"This variable is exported by @code{(guix build-system cargo)}.  It supports builds of packages using Cargo, the build tool of the "
-"@uref{https://www.rust-lang.org, Rust programming language}."
+"This variable is exported by @code{(guix build-system cargo)}.  It supports "
+"builds of packages using Cargo, the build tool of the @uref{https://www.rust-"
+"lang.org, Rust programming language}."
 msgstr ""
 
 #. type: defvr
 #: doc/guix.texi:3814
 msgid ""
-"In its @code{configure} phase, this build system replaces dependencies specified in the @file{Carto.toml} file with inputs to the "
-"Guix package.  The @code{install} phase installs the binaries, and it also installs the source code and @file{Cargo.toml} file."
+"In its @code{configure} phase, this build system replaces dependencies "
+"specified in the @file{Carto.toml} file with inputs to the Guix package.  "
+"The @code{install} phase installs the binaries, and it also installs the "
+"source code and @file{Cargo.toml} file."
 msgstr ""
 
 #. type: defvr
@@ -8082,24 +10174,27 @@ msgstr ""
 #. type: defvr
 #: doc/guix.texi:3820
 msgid ""
-"This variable is exported by @code{(guix build-system cmake)}.  It implements the build procedure for packages using the @url{http://"
-"www.cmake.org, CMake build tool}."
+"This variable is exported by @code{(guix build-system cmake)}.  It "
+"implements the build procedure for packages using the @url{http://www.cmake."
+"org, CMake build tool}."
 msgstr ""
 
 #. type: defvr
 #: doc/guix.texi:3824
 msgid ""
-"It automatically adds the @code{cmake} package to the set of inputs.  Which package is used can be specified with the @code{#:cmake} "
-"parameter."
+"It automatically adds the @code{cmake} package to the set of inputs.  Which "
+"package is used can be specified with the @code{#:cmake} parameter."
 msgstr ""
 
 #. type: defvr
 #: doc/guix.texi:3831
 msgid ""
-"The @code{#:configure-flags} parameter is taken as a list of flags passed to the @command{cmake} command.  The @code{#:build-type} "
-"parameter specifies in abstract terms the flags passed to the compiler; it defaults to @code{\"RelWithDebInfo\"} (short for "
-"``release mode with debugging information''), which roughly means that code is compiled with @code{-O2 -g}, as is the case for "
-"Autoconf-based packages by default."
+"The @code{#:configure-flags} parameter is taken as a list of flags passed to "
+"the @command{cmake} command.  The @code{#:build-type} parameter specifies in "
+"abstract terms the flags passed to the compiler; it defaults to "
+"@code{\"RelWithDebInfo\"} (short for ``release mode with debugging "
+"information''), which roughly means that code is compiled with @code{-O2 -"
+"g}, as is the case for Autoconf-based packages by default."
 msgstr ""
 
 #. type: defvr
@@ -8111,26 +10206,32 @@ msgstr ""
 #. type: defvr
 #: doc/guix.texi:3838
 msgid ""
-"This variable is exported by @code{(guix build-system go)}.  It implements a build procedure for Go packages using the standard "
-"@url{https://golang.org/cmd/go/#hdr-Compile_packages_and_dependencies, Go build mechanisms}."
+"This variable is exported by @code{(guix build-system go)}.  It implements a "
+"build procedure for Go packages using the standard @url{https://golang.org/"
+"cmd/go/#hdr-Compile_packages_and_dependencies, Go build mechanisms}."
 msgstr ""
 
 #. type: defvr
 #: doc/guix.texi:3849
 msgid ""
-"The user is expected to provide a value for the key @code{#:import-path} and, in some cases, @code{#:unpack-path}.  The @url{https://"
-"golang.org/doc/code.html#ImportPaths, import path} corresponds to the file system path expected by the package's build scripts and "
-"any referring packages, and provides a unique way to refer to a Go package.  It is typically based on a combination of the package "
-"source code's remote URI and file system hierarchy structure.  In some cases, you will need to unpack the package's source code to a "
-"different directory structure than the one indicated by the import path, and @code{#:unpack-path} should be used in such cases."
+"The user is expected to provide a value for the key @code{#:import-path} "
+"and, in some cases, @code{#:unpack-path}.  The @url{https://golang.org/doc/"
+"code.html#ImportPaths, import path} corresponds to the file system path "
+"expected by the package's build scripts and any referring packages, and "
+"provides a unique way to refer to a Go package.  It is typically based on a "
+"combination of the package source code's remote URI and file system "
+"hierarchy structure.  In some cases, you will need to unpack the package's "
+"source code to a different directory structure than the one indicated by the "
+"import path, and @code{#:unpack-path} should be used in such cases."
 msgstr ""
 
 #. type: defvr
 #: doc/guix.texi:3854
 msgid ""
-"Packages that provide Go libraries should be installed along with their source code.  The key @code{#:install-source?}, which "
-"defaults to @code{#t}, controls whether or not the source code is installed.  It can be set to @code{#f} for packages that only "
-"provide executable files."
+"Packages that provide Go libraries should be installed along with their "
+"source code.  The key @code{#:install-source?}, which defaults to @code{#t}, "
+"controls whether or not the source code is installed.  It can be set to "
+"@code{#f} for packages that only provide executable files."
 msgstr ""
 
 #. type: defvr
@@ -8142,13 +10243,15 @@ msgstr ""
 #. type: defvr
 #: doc/guix.texi:3859
 msgid ""
-"This variable is exported by @code{(guix build-system glib-or-gtk)}.  It is intended for use with packages making use of GLib or GTK"
-"+."
+"This variable is exported by @code{(guix build-system glib-or-gtk)}.  It is "
+"intended for use with packages making use of GLib or GTK+."
 msgstr ""
 
 #. type: defvr
 #: doc/guix.texi:3862
-msgid "This build system adds the following two phases to the ones defined by @var{gnu-build-system}:"
+msgid ""
+"This build system adds the following two phases to the ones defined by "
+"@var{gnu-build-system}:"
 msgstr ""
 
 #. type: item
@@ -8160,17 +10263,21 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:3871
 msgid ""
-"The phase @code{glib-or-gtk-wrap} ensures that programs in @file{bin/} are able to find GLib ``schemas'' and @uref{https://developer."
-"gnome.org/gtk3/stable/gtk-running.html, GTK+ modules}.  This is achieved by wrapping the programs in launch scripts that "
-"appropriately set the @code{XDG_DATA_DIRS} and @code{GTK_PATH} environment variables."
+"The phase @code{glib-or-gtk-wrap} ensures that programs in @file{bin/} are "
+"able to find GLib ``schemas'' and @uref{https://developer.gnome.org/gtk3/"
+"stable/gtk-running.html, GTK+ modules}.  This is achieved by wrapping the "
+"programs in launch scripts that appropriately set the @code{XDG_DATA_DIRS} "
+"and @code{GTK_PATH} environment variables."
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:3878
 msgid ""
-"It is possible to exclude specific package outputs from that wrapping process by listing their names in the @code{#:glib-or-gtk-wrap-"
-"excluded-outputs} parameter.  This is useful when an output is known not to contain any GLib or GTK+ binaries, and where wrapping "
-"would gratuitously add a dependency of that output on GLib and GTK+."
+"It is possible to exclude specific package outputs from that wrapping "
+"process by listing their names in the @code{#:glib-or-gtk-wrap-excluded-"
+"outputs} parameter.  This is useful when an output is known not to contain "
+"any GLib or GTK+ binaries, and where wrapping would gratuitously add a "
+"dependency of that output on GLib and GTK+."
 msgstr ""
 
 #. type: item
@@ -8182,10 +10289,13 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:3887
 msgid ""
-"The phase @code{glib-or-gtk-compile-schemas} makes sure that all @uref{https://developer.gnome.org/gio/stable/glib-compile-schemas."
-"html, GSettings schemas} of GLib are compiled.  Compilation is performed by the @command{glib-compile-schemas} program.  It is "
-"provided by the package @code{glib:bin} which is automatically imported by the build system.  The @code{glib} package providing "
-"@command{glib-compile-schemas} can be specified with the @code{#:glib} parameter."
+"The phase @code{glib-or-gtk-compile-schemas} makes sure that all "
+"@uref{https://developer.gnome.org/gio/stable/glib-compile-schemas.html, "
+"GSettings schemas} of GLib are compiled.  Compilation is performed by the "
+"@command{glib-compile-schemas} program.  It is provided by the package "
+"@code{glib:bin} which is automatically imported by the build system.  The "
+"@code{glib} package providing @command{glib-compile-schemas} can be "
+"specified with the @code{#:glib} parameter."
 msgstr ""
 
 #. type: defvr
@@ -8202,23 +10312,25 @@ msgstr ""
 #. type: defvr
 #: doc/guix.texi:3895
 msgid ""
-"This variable is exported by @code{(guix build-system minify)}.  It implements a minification procedure for simple JavaScript "
-"packages."
+"This variable is exported by @code{(guix build-system minify)}.  It "
+"implements a minification procedure for simple JavaScript packages."
 msgstr ""
 
 #. type: defvr
 #: doc/guix.texi:3901
 msgid ""
-"It adds @code{uglify-js} to the set of inputs and uses it to compress all JavaScript files in the @file{src} directory.  A different "
-"minifier package can be specified with the @code{#:uglify-js} parameter, but it is expected that the package writes the minified "
-"code to the standard output."
+"It adds @code{uglify-js} to the set of inputs and uses it to compress all "
+"JavaScript files in the @file{src} directory.  A different minifier package "
+"can be specified with the @code{#:uglify-js} parameter, but it is expected "
+"that the package writes the minified code to the standard output."
 msgstr ""
 
 #. type: defvr
 #: doc/guix.texi:3905
 msgid ""
-"When the input JavaScript files are not all located in the @file{src} directory, the parameter @code{#:javascript-files} can be used "
-"to specify a list of file names to feed to the minifier."
+"When the input JavaScript files are not all located in the @file{src} "
+"directory, the parameter @code{#:javascript-files} can be used to specify a "
+"list of file names to feed to the minifier."
 msgstr ""
 
 #. type: defvr
@@ -8230,52 +10342,66 @@ msgstr ""
 #. type: defvr
 #: doc/guix.texi:3913
 msgid ""
-"This variable is exported by @code{(guix build-system ocaml)}.  It implements a build procedure for @uref{https://ocaml.org, OCaml} "
-"packages, which consists of choosing the correct set of commands to run for each package.  OCaml packages can expect many different "
-"commands to be run.  This build system will try some of them."
+"This variable is exported by @code{(guix build-system ocaml)}.  It "
+"implements a build procedure for @uref{https://ocaml.org, OCaml} packages, "
+"which consists of choosing the correct set of commands to run for each "
+"package.  OCaml packages can expect many different commands to be run.  This "
+"build system will try some of them."
 msgstr ""
 
 #. type: defvr
 #: doc/guix.texi:3923
 msgid ""
-"When the package has a @file{setup.ml} file present at the top-level, it will run @code{ocaml setup.ml -configure}, @code{ocaml "
-"setup.ml -build} and @code{ocaml setup.ml -install}.  The build system will assume that this file was generated by @uref{http://"
-"oasis.forge.ocamlcore.org/, OASIS} and will take care of setting the prefix and enabling tests if they are not disabled.  You can "
-"pass configure and build flags with the @code{#:configure-flags} and @code{#:build-flags}.  The @code{#:test-flags} key can be "
-"passed to change the set of flags used to enable tests.  The @code{#:use-make?} key can be used to bypass this system in the build "
-"and install phases."
+"When the package has a @file{setup.ml} file present at the top-level, it "
+"will run @code{ocaml setup.ml -configure}, @code{ocaml setup.ml -build} and "
+"@code{ocaml setup.ml -install}.  The build system will assume that this file "
+"was generated by @uref{http://oasis.forge.ocamlcore.org/, OASIS} and will "
+"take care of setting the prefix and enabling tests if they are not "
+"disabled.  You can pass configure and build flags with the @code{#:configure-"
+"flags} and @code{#:build-flags}.  The @code{#:test-flags} key can be passed "
+"to change the set of flags used to enable tests.  The @code{#:use-make?} key "
+"can be used to bypass this system in the build and install phases."
 msgstr ""
 
 #. type: defvr
 #: doc/guix.texi:3928
 msgid ""
-"When the package has a @file{configure} file, it is assumed that it is a hand-made configure script that requires a different "
-"argument format than in the @code{gnu-build-system}.  You can add more flags with the @code{#:configure-flags} key."
+"When the package has a @file{configure} file, it is assumed that it is a "
+"hand-made configure script that requires a different argument format than in "
+"the @code{gnu-build-system}.  You can add more flags with the @code{#:"
+"configure-flags} key."
 msgstr ""
 
 #. type: defvr
 #: doc/guix.texi:3932
 msgid ""
-"When the package has a @file{Makefile} file (or @code{#:use-make?} is @code{#t}), it will be used and more flags can be passed to "
-"the build and install phases with the @code{#:make-flags} key."
+"When the package has a @file{Makefile} file (or @code{#:use-make?} is "
+"@code{#t}), it will be used and more flags can be passed to the build and "
+"install phases with the @code{#:make-flags} key."
 msgstr ""
 
 #. type: defvr
 #: doc/guix.texi:3940
 msgid ""
-"Finally, some packages do not have these files and use a somewhat standard location for its build system.  In that case, the build "
-"system will run @code{ocaml pkg/pkg.ml} or @code{ocaml pkg/build.ml} and take care of providing the path to the required findlib "
-"module.  Additional flags can be passed via the @code{#:build-flags} key.  Install is taken care of by @command{opam-installer}.  In "
-"this case, the @code{opam} package must be added to the @code{native-inputs} field of the package definition."
+"Finally, some packages do not have these files and use a somewhat standard "
+"location for its build system.  In that case, the build system will run "
+"@code{ocaml pkg/pkg.ml} or @code{ocaml pkg/build.ml} and take care of "
+"providing the path to the required findlib module.  Additional flags can be "
+"passed via the @code{#:build-flags} key.  Install is taken care of by "
+"@command{opam-installer}.  In this case, the @code{opam} package must be "
+"added to the @code{native-inputs} field of the package definition."
 msgstr ""
 
 #. type: defvr
 #: doc/guix.texi:3948
 msgid ""
-"Note that most OCaml packages assume they will be installed in the same directory as OCaml, which is not what we want in guix.  In "
-"particular, they will install @file{.so} files in their module's directory, which is usually fine because it is in the OCaml "
-"compiler directory.  In guix though, these libraries cannot be found and we use @code{CAML_LD_LIBRARY_PATH}.  This variable points "
-"to @file{lib/ocaml/site-lib/stubslibs} and this is where @file{.so} libraries should be installed."
+"Note that most OCaml packages assume they will be installed in the same "
+"directory as OCaml, which is not what we want in guix.  In particular, they "
+"will install @file{.so} files in their module's directory, which is usually "
+"fine because it is in the OCaml compiler directory.  In guix though, these "
+"libraries cannot be found and we use @code{CAML_LD_LIBRARY_PATH}.  This "
+"variable points to @file{lib/ocaml/site-lib/stubslibs} and this is where "
+"@file{.so} libraries should be installed."
 msgstr ""
 
 #. type: defvr
@@ -8287,31 +10413,37 @@ msgstr ""
 #. type: defvr
 #: doc/guix.texi:3955
 msgid ""
-"This variable is exported by @code{(guix build-system python)}.  It implements the more or less standard build procedure used by "
-"Python packages, which consists in running @code{python setup.py build} and then @code{python setup.py install --prefix=/gnu/store/"
-"@dots{}}."
+"This variable is exported by @code{(guix build-system python)}.  It "
+"implements the more or less standard build procedure used by Python "
+"packages, which consists in running @code{python setup.py build} and then "
+"@code{python setup.py install --prefix=/gnu/store/@dots{}}."
 msgstr ""
 
 #. type: defvr
 #: doc/guix.texi:3959
 msgid ""
-"For packages that install stand-alone Python programs under @code{bin/}, it takes care of wrapping these programs so that their "
-"@code{PYTHONPATH} environment variable points to all the Python libraries they depend on."
+"For packages that install stand-alone Python programs under @code{bin/}, it "
+"takes care of wrapping these programs so that their @code{PYTHONPATH} "
+"environment variable points to all the Python libraries they depend on."
 msgstr ""
 
 #. type: defvr
 #: doc/guix.texi:3965
 msgid ""
-"Which Python package is used to perform the build can be specified with the @code{#:python} parameter.  This is a useful way to "
-"force a package to be built for a specific version of the Python interpreter, which might be necessary if the package is only "
-"compatible with a single interpreter version."
+"Which Python package is used to perform the build can be specified with the "
+"@code{#:python} parameter.  This is a useful way to force a package to be "
+"built for a specific version of the Python interpreter, which might be "
+"necessary if the package is only compatible with a single interpreter "
+"version."
 msgstr ""
 
 #. type: defvr
 #: doc/guix.texi:3970
 msgid ""
-"By default guix calls @code{setup.py} under control of @code{setuptools}, much like @command{pip} does.  Some packages are not "
-"compatible with setuptools (and pip), thus you can disable this by setting the @code{#:use-setuptools} parameter to @code{#f}."
+"By default guix calls @code{setup.py} under control of @code{setuptools}, "
+"much like @command{pip} does.  Some packages are not compatible with "
+"setuptools (and pip), thus you can disable this by setting the @code{#:use-"
+"setuptools} parameter to @code{#f}."
 msgstr ""
 
 #. type: defvr
@@ -8323,19 +10455,24 @@ msgstr ""
 #. type: defvr
 #: doc/guix.texi:3984
 msgid ""
-"This variable is exported by @code{(guix build-system perl)}.  It implements the standard build procedure for Perl packages, which "
-"either consists in running @code{perl Build.PL --prefix=/gnu/store/@dots{}}, followed by @code{Build} and @code{Build install}; or "
-"in running @code{perl Makefile.PL PREFIX=/gnu/store/@dots{}}, followed by @code{make} and @code{make install}, depending on which of "
-"@code{Build.PL} or @code{Makefile.PL} is present in the package distribution.  Preference is given to the former if both @code{Build."
-"PL} and @code{Makefile.PL} exist in the package distribution.  This preference can be reversed by specifying @code{#t} for the "
-"@code{#:make-maker?} parameter."
+"This variable is exported by @code{(guix build-system perl)}.  It implements "
+"the standard build procedure for Perl packages, which either consists in "
+"running @code{perl Build.PL --prefix=/gnu/store/@dots{}}, followed by "
+"@code{Build} and @code{Build install}; or in running @code{perl Makefile.PL "
+"PREFIX=/gnu/store/@dots{}}, followed by @code{make} and @code{make install}, "
+"depending on which of @code{Build.PL} or @code{Makefile.PL} is present in "
+"the package distribution.  Preference is given to the former if both "
+"@code{Build.PL} and @code{Makefile.PL} exist in the package distribution.  "
+"This preference can be reversed by specifying @code{#t} for the @code{#:make-"
+"maker?} parameter."
 msgstr ""
 
 #. type: defvr
 #: doc/guix.texi:3988
 msgid ""
-"The initial @code{perl Makefile.PL} or @code{perl Build.PL} invocation passes flags specified by the @code{#:make-maker-flags} or "
-"@code{#:module-build-flags} parameter, respectively."
+"The initial @code{perl Makefile.PL} or @code{perl Build.PL} invocation "
+"passes flags specified by the @code{#:make-maker-flags} or @code{#:module-"
+"build-flags} parameter, respectively."
 msgstr ""
 
 #. type: defvr
@@ -8352,10 +10489,12 @@ msgstr ""
 #. type: defvr
 #: doc/guix.texi:4000
 msgid ""
-"This variable is exported by @code{(guix build-system r)}.  It implements the build procedure used by @uref{http://r-project.org, R} "
-"packages, which essentially is little more than running @code{R CMD INSTALL --library=/gnu/store/@dots{}} in an environment where "
-"@code{R_LIBS_SITE} contains the paths to all R package inputs.  Tests are run after installation using the R function @code{tools::"
-"testInstalledPackage}."
+"This variable is exported by @code{(guix build-system r)}.  It implements "
+"the build procedure used by @uref{http://r-project.org, R} packages, which "
+"essentially is little more than running @code{R CMD INSTALL --library=/gnu/"
+"store/@dots{}} in an environment where @code{R_LIBS_SITE} contains the paths "
+"to all R package inputs.  Tests are run after installation using the R "
+"function @code{tools::testInstalledPackage}."
 msgstr ""
 
 #. type: defvr
@@ -8367,22 +10506,29 @@ msgstr ""
 #. type: defvr
 #: doc/guix.texi:4007
 msgid ""
-"This variable is exported by @code{(guix build-system texlive)}.  It is used to build TeX packages in batch mode with a specified "
-"engine.  The build system sets the @code{TEXINPUTS} variable to find all TeX source files in the inputs."
+"This variable is exported by @code{(guix build-system texlive)}.  It is used "
+"to build TeX packages in batch mode with a specified engine.  The build "
+"system sets the @code{TEXINPUTS} variable to find all TeX source files in "
+"the inputs."
 msgstr ""
 
 #. type: defvr
 #: doc/guix.texi:4016
 msgid ""
-"By default it runs @code{luatex} on all files ending on @code{ins}.  A different engine and format can be specified with the @code{#:"
-"tex-format} argument.  Different build targets can be specified with the @code{#:build-targets} argument, which expects a list of "
-"file names.  The build system adds only @code{texlive-bin} and @code{texlive-latex-base} (both from @code{(gnu packages tex}) to the "
-"inputs.  Both can be overridden with the arguments @code{#:texlive-bin} and @code{#:texlive-latex-base}, respectively."
+"By default it runs @code{luatex} on all files ending on @code{ins}.  A "
+"different engine and format can be specified with the @code{#:tex-format} "
+"argument.  Different build targets can be specified with the @code{#:build-"
+"targets} argument, which expects a list of file names.  The build system "
+"adds only @code{texlive-bin} and @code{texlive-latex-base} (both from "
+"@code{(gnu packages tex}) to the inputs.  Both can be overridden with the "
+"arguments @code{#:texlive-bin} and @code{#:texlive-latex-base}, respectively."
 msgstr ""
 
 #. type: defvr
 #: doc/guix.texi:4019
-msgid "The @code{#:tex-directory} parameter tells the build system where to install the built files under the texmf tree."
+msgid ""
+"The @code{#:tex-directory} parameter tells the build system where to install "
+"the built files under the texmf tree."
 msgstr ""
 
 #. type: defvr
@@ -8394,24 +10540,29 @@ msgstr ""
 #. type: defvr
 #: doc/guix.texi:4025
 msgid ""
-"This variable is exported by @code{(guix build-system ruby)}.  It implements the RubyGems build procedure used by Ruby packages, "
-"which involves running @code{gem build} followed by @code{gem install}."
+"This variable is exported by @code{(guix build-system ruby)}.  It implements "
+"the RubyGems build procedure used by Ruby packages, which involves running "
+"@code{gem build} followed by @code{gem install}."
 msgstr ""
 
 #. type: defvr
 #: doc/guix.texi:4033
 msgid ""
-"The @code{source} field of a package that uses this build system typically references a gem archive, since this is the format that "
-"Ruby developers use when releasing their software.  The build system unpacks the gem archive, potentially patches the source, runs "
-"the test suite, repackages the gem, and installs it.  Additionally, directories and tarballs may be referenced to allow building "
-"unreleased gems from Git or a traditional source release tarball."
+"The @code{source} field of a package that uses this build system typically "
+"references a gem archive, since this is the format that Ruby developers use "
+"when releasing their software.  The build system unpacks the gem archive, "
+"potentially patches the source, runs the test suite, repackages the gem, and "
+"installs it.  Additionally, directories and tarballs may be referenced to "
+"allow building unreleased gems from Git or a traditional source release "
+"tarball."
 msgstr ""
 
 #. type: defvr
 #: doc/guix.texi:4037
 msgid ""
-"Which Ruby package is used can be specified with the @code{#:ruby} parameter.  A list of additional flags to be passed to the "
-"@command{gem} command can be specified with the @code{#:gem-flags} parameter."
+"Which Ruby package is used can be specified with the @code{#:ruby} "
+"parameter.  A list of additional flags to be passed to the @command{gem} "
+"command can be specified with the @code{#:gem-flags} parameter."
 msgstr ""
 
 #. type: defvr
@@ -8423,16 +10574,18 @@ msgstr ""
 #. type: defvr
 #: doc/guix.texi:4045
 msgid ""
-"This variable is exported by @code{(guix build-system waf)}.  It implements a build procedure around the @code{waf} script.  The "
-"common phases---@code{configure}, @code{build}, and @code{install}---are implemented by passing their names as arguments to the "
-"@code{waf} script."
+"This variable is exported by @code{(guix build-system waf)}.  It implements "
+"a build procedure around the @code{waf} script.  The common phases---"
+"@code{configure}, @code{build}, and @code{install}---are implemented by "
+"passing their names as arguments to the @code{waf} script."
 msgstr ""
 
 #. type: defvr
 #: doc/guix.texi:4049
 msgid ""
-"The @code{waf} script is executed by the Python interpreter.  Which Python package is used to run the script can be specified with "
-"the @code{#:python} parameter."
+"The @code{waf} script is executed by the Python interpreter.  Which Python "
+"package is used to run the script can be specified with the @code{#:python} "
+"parameter."
 msgstr ""
 
 #. type: defvr
@@ -8444,16 +10597,19 @@ msgstr ""
 #. type: defvr
 #: doc/guix.texi:4057
 msgid ""
-"This variable is exported by @code{(guix build-system scons)}.  It implements the build procedure used by the SCons software "
-"construction tool.  This build system runs @code{scons} to build the package, @code{scons test} to run tests, and then @code{scons "
-"install} to install the package."
+"This variable is exported by @code{(guix build-system scons)}.  It "
+"implements the build procedure used by the SCons software construction "
+"tool.  This build system runs @code{scons} to build the package, @code{scons "
+"test} to run tests, and then @code{scons install} to install the package."
 msgstr ""
 
 #. type: defvr
 #: doc/guix.texi:4062
 msgid ""
-"Additional flags to be passed to @code{scons} can be specified with the @code{#:scons-flags} parameter.  The version of Python used "
-"to run SCons can be specified by selecting the appropriate SCons package with the @code{#:scons} parameter."
+"Additional flags to be passed to @code{scons} can be specified with the "
+"@code{#:scons-flags} parameter.  The version of Python used to run SCons can "
+"be specified by selecting the appropriate SCons package with the @code{#:"
+"scons} parameter."
 msgstr ""
 
 #. type: defvr
@@ -8465,18 +10621,25 @@ msgstr ""
 #. type: defvr
 #: doc/guix.texi:4078
 msgid ""
-"This variable is exported by @code{(guix build-system haskell)}.  It implements the Cabal build procedure used by Haskell packages, "
-"which involves running @code{runhaskell Setup.hs configure --prefix=/gnu/store/@dots{}} and @code{runhaskell Setup.hs build}.  "
-"Instead of installing the package by running @code{runhaskell Setup.hs install}, to avoid trying to register libraries in the read-"
-"only compiler store directory, the build system uses @code{runhaskell Setup.hs copy}, followed by @code{runhaskell Setup.hs "
-"register}.  In addition, the build system generates the package documentation by running @code{runhaskell Setup.hs haddock}, unless "
-"@code{#:haddock? #f} is passed.  Optional Haddock parameters can be passed with the help of the @code{#:haddock-flags} parameter.  "
-"If the file @code{Setup.hs} is not found, the build system looks for @code{Setup.lhs} instead."
+"This variable is exported by @code{(guix build-system haskell)}.  It "
+"implements the Cabal build procedure used by Haskell packages, which "
+"involves running @code{runhaskell Setup.hs configure --prefix=/gnu/store/"
+"@dots{}} and @code{runhaskell Setup.hs build}.  Instead of installing the "
+"package by running @code{runhaskell Setup.hs install}, to avoid trying to "
+"register libraries in the read-only compiler store directory, the build "
+"system uses @code{runhaskell Setup.hs copy}, followed by @code{runhaskell "
+"Setup.hs register}.  In addition, the build system generates the package "
+"documentation by running @code{runhaskell Setup.hs haddock}, unless @code{#:"
+"haddock? #f} is passed.  Optional Haddock parameters can be passed with the "
+"help of the @code{#:haddock-flags} parameter.  If the file @code{Setup.hs} "
+"is not found, the build system looks for @code{Setup.lhs} instead."
 msgstr ""
 
 #. type: defvr
 #: doc/guix.texi:4081
-msgid "Which Haskell compiler is used can be specified with the @code{#:haskell} parameter which defaults to @code{ghc}."
+msgid ""
+"Which Haskell compiler is used can be specified with the @code{#:haskell} "
+"parameter which defaults to @code{ghc}."
 msgstr ""
 
 #. type: defvr
@@ -8488,13 +10651,17 @@ msgstr ""
 #. type: defvr
 #: doc/guix.texi:4088
 msgid ""
-"This variable is exported by @code{(guix build-system dub)}.  It implements the Dub build procedure used by D packages, which "
-"involves running @code{dub build} and @code{dub run}.  Installation is done by copying the files manually."
+"This variable is exported by @code{(guix build-system dub)}.  It implements "
+"the Dub build procedure used by D packages, which involves running @code{dub "
+"build} and @code{dub run}.  Installation is done by copying the files "
+"manually."
 msgstr ""
 
 #. type: defvr
 #: doc/guix.texi:4091
-msgid "Which D compiler is used can be specified with the @code{#:ldc} parameter which defaults to @code{ldc}."
+msgid ""
+"Which D compiler is used can be specified with the @code{#:ldc} parameter "
+"which defaults to @code{ldc}."
 msgstr ""
 
 #. type: defvr
@@ -8506,16 +10673,19 @@ msgstr ""
 #. type: defvr
 #: doc/guix.texi:4097
 msgid ""
-"This variable is exported by @code{(guix build-system emacs)}.  It implements an installation procedure similar to the packaging "
-"system of Emacs itself (@pxref{Packages,,, emacs, The GNU Emacs Manual})."
+"This variable is exported by @code{(guix build-system emacs)}.  It "
+"implements an installation procedure similar to the packaging system of "
+"Emacs itself (@pxref{Packages,,, emacs, The GNU Emacs Manual})."
 msgstr ""
 
 #. type: defvr
 #: doc/guix.texi:4104
 msgid ""
-"It first creates the @code{@var{package}-autoloads.el} file, then it byte compiles all Emacs Lisp files.  Differently from the Emacs "
-"packaging system, the Info documentation files are moved to the standard documentation directory and the @file{dir} file is "
-"deleted.  Each package is installed in its own directory under @file{share/emacs/site-lisp/guix.d}."
+"It first creates the @code{@var{package}-autoloads.el} file, then it byte "
+"compiles all Emacs Lisp files.  Differently from the Emacs packaging system, "
+"the Info documentation files are moved to the standard documentation "
+"directory and the @file{dir} file is deleted.  Each package is installed in "
+"its own directory under @file{share/emacs/site-lisp/guix.d}."
 msgstr ""
 
 #. type: defvr
@@ -8527,9 +10697,11 @@ msgstr ""
 #. type: defvr
 #: doc/guix.texi:4112
 msgid ""
-"This variable is exported by @code{(guix build-system font)}.  It implements an installation procedure for font packages where "
-"upstream provides pre-compiled TrueType, OpenType, etc. font files that merely need to be copied into place.  It copies font files "
-"to standard locations in the output directory."
+"This variable is exported by @code{(guix build-system font)}.  It implements "
+"an installation procedure for font packages where upstream provides pre-"
+"compiled TrueType, OpenType, etc. font files that merely need to be copied "
+"into place.  It copies font files to standard locations in the output "
+"directory."
 msgstr ""
 
 #. type: defvr
@@ -8541,38 +10713,48 @@ msgstr ""
 #. type: defvr
 #: doc/guix.texi:4118
 msgid ""
-"This variable is exported by @code{(guix build-system meson)}.  It implements the build procedure for packages that use @url{http://"
-"mesonbuild.com, Meson} as their build system."
+"This variable is exported by @code{(guix build-system meson)}.  It "
+"implements the build procedure for packages that use @url{http://mesonbuild."
+"com, Meson} as their build system."
 msgstr ""
 
 #. type: defvr
 #: doc/guix.texi:4124
 msgid ""
-"It adds both Meson and @uref{https://ninja-build.org/, Ninja} to the set of inputs, and they can be changed with the parameters "
-"@code{#:meson} and @code{#:ninja} if needed.  The default Meson is @code{meson-for-build}, which is special because it doesn't clear "
-"the @code{RUNPATH} of binaries and libraries when they are installed."
+"It adds both Meson and @uref{https://ninja-build.org/, Ninja} to the set of "
+"inputs, and they can be changed with the parameters @code{#:meson} and "
+"@code{#:ninja} if needed.  The default Meson is @code{meson-for-build}, "
+"which is special because it doesn't clear the @code{RUNPATH} of binaries and "
+"libraries when they are installed."
 msgstr ""
 
 #. type: defvr
 #: doc/guix.texi:4127
-msgid "This build system is an extension of @var{gnu-build-system}, but with the following phases changed to some specific for Meson:"
+msgid ""
+"This build system is an extension of @var{gnu-build-system}, but with the "
+"following phases changed to some specific for Meson:"
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:4134
 msgid ""
-"The phase runs @code{meson} with the flags specified in @code{#:configure-flags}.  The flag @code{--build-type} is always set to "
-"@code{plain} unless something else is specified in @code{#:build-type}."
+"The phase runs @code{meson} with the flags specified in @code{#:configure-"
+"flags}.  The flag @code{--build-type} is always set to @code{plain} unless "
+"something else is specified in @code{#:build-type}."
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:4138
-msgid "The phase runs @code{ninja} to build the package in parallel by default, but this can be changed with @code{#:parallel-build?}."
+msgid ""
+"The phase runs @code{ninja} to build the package in parallel by default, but "
+"this can be changed with @code{#:parallel-build?}."
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:4142
-msgid "The phase runs @code{ninja} with the target specified in @code{#:test-target}, which is @code{\"test\"} by default."
+msgid ""
+"The phase runs @code{ninja} with the target specified in @code{#:test-"
+"target}, which is @code{\"test\"} by default."
 msgstr ""
 
 #. type: table
@@ -8594,23 +10776,28 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:4158
 msgid ""
-"This phase ensures that all binaries can find the libraries they need.  It searches for required libraries in subdirectories of the "
-"package being built, and adds those to @code{RUNPATH} where needed.  It also removes references to libraries left over from the "
-"build phase by @code{meson-for-build}, such as test dependencies, that aren't actually required for the program to run."
+"This phase ensures that all binaries can find the libraries they need.  It "
+"searches for required libraries in subdirectories of the package being "
+"built, and adds those to @code{RUNPATH} where needed.  It also removes "
+"references to libraries left over from the build phase by @code{meson-for-"
+"build}, such as test dependencies, that aren't actually required for the "
+"program to run."
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:4162 doc/guix.texi:4166
 msgid ""
-"This phase is the phase provided by @code{glib-or-gtk-build-system}, and it is not enabled by default.  It can be enabled with "
-"@code{#:glib-or-gtk?}."
+"This phase is the phase provided by @code{glib-or-gtk-build-system}, and it "
+"is not enabled by default.  It can be enabled with @code{#:glib-or-gtk?}."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:4173
 msgid ""
-"Lastly, for packages that do not need anything as sophisticated, a ``trivial'' build system is provided.  It is trivial in the sense "
-"that it provides basically no support: it does not pull any implicit inputs, and does not have a notion of build phases."
+"Lastly, for packages that do not need anything as sophisticated, a "
+"``trivial'' build system is provided.  It is trivial in the sense that it "
+"provides basically no support: it does not pull any implicit inputs, and "
+"does not have a notion of build phases."
 msgstr ""
 
 #. type: defvr
@@ -8627,8 +10814,10 @@ msgstr ""
 #. type: defvr
 #: doc/guix.texi:4181
 msgid ""
-"This build system requires a @code{#:builder} argument.  This argument must be a Scheme expression that builds the package "
-"output(s)---as with @code{build-expression->derivation} (@pxref{Derivations, @code{build-expression->derivation}})."
+"This build system requires a @code{#:builder} argument.  This argument must "
+"be a Scheme expression that builds the package output(s)---as with "
+"@code{build-expression->derivation} (@pxref{Derivations, @code{build-"
+"expression->derivation}})."
 msgstr ""
 
 #. type: cindex
@@ -8646,41 +10835,50 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:4199
 msgid ""
-"Conceptually, the @dfn{store} is the place where derivations that have been built successfully are stored---by default, @file{/gnu/"
-"store}.  Sub-directories in the store are referred to as @dfn{store items} or sometimes @dfn{store paths}.  The store has an "
-"associated database that contains information such as the store paths referred to by each store path, and the list of @emph{valid} "
-"store items---results of successful builds.  This database resides in @file{@var{localstatedir}/guix/db}, where @var{localstatedir} "
-"is the state directory specified @i{via} @option{--localstatedir} at configure time, usually @file{/var}."
+"Conceptually, the @dfn{store} is the place where derivations that have been "
+"built successfully are stored---by default, @file{/gnu/store}.  Sub-"
+"directories in the store are referred to as @dfn{store items} or sometimes "
+"@dfn{store paths}.  The store has an associated database that contains "
+"information such as the store paths referred to by each store path, and the "
+"list of @emph{valid} store items---results of successful builds.  This "
+"database resides in @file{@var{localstatedir}/guix/db}, where "
+"@var{localstatedir} is the state directory specified @i{via} @option{--"
+"localstatedir} at configure time, usually @file{/var}."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:4204
 msgid ""
-"The store is @emph{always} accessed by the daemon on behalf of its clients (@pxref{Invoking guix-daemon}).  To manipulate the store, "
-"clients connect to the daemon over a Unix-domain socket, send requests to it, and read the result---these are remote procedure "
-"calls, or RPCs."
+"The store is @emph{always} accessed by the daemon on behalf of its clients "
+"(@pxref{Invoking guix-daemon}).  To manipulate the store, clients connect to "
+"the daemon over a Unix-domain socket, send requests to it, and read the "
+"result---these are remote procedure calls, or RPCs."
 msgstr ""
 
 #. type: quotation
 #: doc/guix.texi:4209
 msgid ""
-"Users must @emph{never} modify files under @file{/gnu/store} directly.  This would lead to inconsistencies and break the "
-"immutability assumptions of Guix's functional model (@pxref{Introduction})."
+"Users must @emph{never} modify files under @file{/gnu/store} directly.  This "
+"would lead to inconsistencies and break the immutability assumptions of "
+"Guix's functional model (@pxref{Introduction})."
 msgstr ""
 
 #. type: quotation
 #: doc/guix.texi:4213
 msgid ""
-"@xref{Invoking guix gc, @command{guix gc --verify}}, for information on how to check the integrity of the store and attempt recovery "
-"from accidental modifications."
+"@xref{Invoking guix gc, @command{guix gc --verify}}, for information on how "
+"to check the integrity of the store and attempt recovery from accidental "
+"modifications."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:4220
 msgid ""
-"The @code{(guix store)} module provides procedures to connect to the daemon, and to perform RPCs.  These are described below.  By "
-"default, @code{open-connection}, and thus all the @command{guix} commands, connect to the local daemon or to the URI specified by "
-"the @code{GUIX_DAEMON_SOCKET} environment variable."
+"The @code{(guix store)} module provides procedures to connect to the daemon, "
+"and to perform RPCs.  These are described below.  By default, @code{open-"
+"connection}, and thus all the @command{guix} commands, connect to the local "
+"daemon or to the URI specified by the @code{GUIX_DAEMON_SOCKET} environment "
+"variable."
 msgstr ""
 
 #. type: defvr
@@ -8692,12 +10890,14 @@ msgstr ""
 #. type: defvr
 #: doc/guix.texi:4226
 msgid ""
-"When set, the value of this variable should be a file name or a URI designating the daemon endpoint.  When it is a file name, it "
-"denotes a Unix-domain socket to connect to.  In addition to file names, the supported URI schemes are:"
+"When set, the value of this variable should be a file name or a URI "
+"designating the daemon endpoint.  When it is a file name, it denotes a Unix-"
+"domain socket to connect to.  In addition to file names, the supported URI "
+"schemes are:"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:4228 doc/guix.texi:15357
+#: doc/guix.texi:4228 doc/guix.texi:15406
 #, no-wrap
 msgid "file"
 msgstr ""
@@ -8711,8 +10911,8 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:4233
 msgid ""
-"These are for Unix-domain sockets.  @code{file:///var/guix/daemon-socket/socket} is equivalent to @file{/var/guix/daemon-socket/"
-"socket}."
+"These are for Unix-domain sockets.  @code{file:///var/guix/daemon-socket/"
+"socket} is equivalent to @file{/var/guix/daemon-socket/socket}."
 msgstr ""
 
 #. type: item
@@ -8724,8 +10924,9 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:4242
 msgid ""
-"These URIs denote connections over TCP/IP, without encryption nor authentication of the remote host.  The URI must specify the host "
-"name and optionally a port number (by default port 44146 is used):"
+"These URIs denote connections over TCP/IP, without encryption nor "
+"authentication of the remote host.  The URI must specify the host name and "
+"optionally a port number (by default port 44146 is used):"
 msgstr ""
 
 #. type: example
@@ -8737,15 +10938,17 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:4250
 msgid ""
-"This setup is suitable on local networks, such as clusters, where only trusted nodes may connect to the build daemon at @code{master."
-"guix.example.org}."
+"This setup is suitable on local networks, such as clusters, where only "
+"trusted nodes may connect to the build daemon at @code{master.guix.example."
+"org}."
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:4254
 msgid ""
-"The @code{--listen} option of @command{guix-daemon} can be used to instruct it to listen for TCP connections (@pxref{Invoking guix-"
-"daemon, @code{--listen}})."
+"The @code{--listen} option of @command{guix-daemon} can be used to instruct "
+"it to listen for TCP connections (@pxref{Invoking guix-daemon, @code{--"
+"listen}})."
 msgstr ""
 
 #. type: item
@@ -8763,8 +10966,9 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:4260
 msgid ""
-"These URIs allow you to connect to a remote daemon over SSH@footnote{This feature requires Guile-SSH (@pxref{Requirements}).}.  A "
-"typical URL might look like this:"
+"These URIs allow you to connect to a remote daemon over SSH@footnote{This "
+"feature requires Guile-SSH (@pxref{Requirements}).}.  A typical URL might "
+"look like this:"
 msgstr ""
 
 #. type: example
@@ -8775,7 +10979,9 @@ msgstr ""
 
 #. type: table
 #: doc/guix.texi:4267
-msgid "As for @command{guix copy}, the usual OpenSSH client configuration files are honored (@pxref{Invoking guix copy})."
+msgid ""
+"As for @command{guix copy}, the usual OpenSSH client configuration files are "
+"honored (@pxref{Invoking guix copy})."
 msgstr ""
 
 #. type: defvr
@@ -8786,8 +10992,9 @@ msgstr ""
 #. type: quotation
 #: doc/guix.texi:4277
 msgid ""
-"The ability to connect to remote build daemons is considered experimental as of @value{VERSION}.  Please get in touch with us to "
-"share any problems or suggestions you may have (@pxref{Contributing})."
+"The ability to connect to remote build daemons is considered experimental as "
+"of @value{VERSION}.  Please get in touch with us to share any problems or "
+"suggestions you may have (@pxref{Contributing})."
 msgstr ""
 
 #. type: deffn
@@ -8799,16 +11006,17 @@ msgstr ""
 #. type: deffn
 #: doc/guix.texi:4285
 msgid ""
-"Connect to the daemon over the Unix-domain socket at @var{uri} (a string).  When @var{reserve-space?} is true, instruct it to "
-"reserve a little bit of extra space on the file system so that the garbage collector can still operate should the disk become full.  "
-"Return a server object."
+"Connect to the daemon over the Unix-domain socket at @var{uri} (a string).  "
+"When @var{reserve-space?} is true, instruct it to reserve a little bit of "
+"extra space on the file system so that the garbage collector can still "
+"operate should the disk become full.  Return a server object."
 msgstr ""
 
 #. type: deffn
 #: doc/guix.texi:4288
 msgid ""
-"@var{file} defaults to @var{%default-socket-path}, which is the normal location given the options that were passed to "
-"@command{configure}."
+"@var{file} defaults to @var{%default-socket-path}, which is the normal "
+"location given the options that were passed to @command{configure}."
 msgstr ""
 
 #. type: deffn
@@ -8831,13 +11039,14 @@ msgstr ""
 #. type: defvr
 #: doc/guix.texi:4297
 msgid ""
-"This variable is bound to a SRFI-39 parameter, which refers to the port where build and error logs sent by the daemon should be "
-"written."
+"This variable is bound to a SRFI-39 parameter, which refers to the port "
+"where build and error logs sent by the daemon should be written."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:4301
-msgid "Procedures that make RPCs all take a server object as their first argument."
+msgid ""
+"Procedures that make RPCs all take a server object as their first argument."
 msgstr ""
 
 #. type: deffn
@@ -8855,13 +11064,16 @@ msgstr ""
 #. type: deffn
 #: doc/guix.texi:4308
 msgid ""
-"Return @code{#t} when @var{path} designates a valid store item and @code{#f} otherwise (an invalid item may exist on disk but still "
-"be invalid, for instance because it is the result of an aborted or failed build.)"
+"Return @code{#t} when @var{path} designates a valid store item and @code{#f} "
+"otherwise (an invalid item may exist on disk but still be invalid, for "
+"instance because it is the result of an aborted or failed build.)"
 msgstr ""
 
 #. type: deffn
 #: doc/guix.texi:4311
-msgid "A @code{&nix-protocol-error} condition is raised if @var{path} is not prefixed by the store directory (@file{/gnu/store})."
+msgid ""
+"A @code{&nix-protocol-error} condition is raised if @var{path} is not "
+"prefixed by the store directory (@file{/gnu/store})."
 msgstr ""
 
 #. type: deffn
@@ -8873,8 +11085,9 @@ msgstr ""
 #. type: deffn
 #: doc/guix.texi:4317
 msgid ""
-"Add @var{text} under file @var{name} in the store, and return its store path.  @var{references} is the list of store paths referred "
-"to by the resulting store path."
+"Add @var{text} under file @var{name} in the store, and return its store "
+"path.  @var{references} is the list of store paths referred to by the "
+"resulting store path."
 msgstr ""
 
 #. type: deffn
@@ -8886,15 +11099,18 @@ msgstr ""
 #. type: deffn
 #: doc/guix.texi:4323
 msgid ""
-"Build @var{derivations} (a list of @code{<derivation>} objects or derivation paths), and return when the worker is done building "
-"them.  Return @code{#t} on success."
+"Build @var{derivations} (a list of @code{<derivation>} objects or derivation "
+"paths), and return when the worker is done building them.  Return @code{#t} "
+"on success."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:4329
 msgid ""
-"Note that the @code{(guix monads)} module provides a monad as well as monadic versions of the above procedures, with the goal of "
-"making it more convenient to work with code that accesses the store (@pxref{The Store Monad})."
+"Note that the @code{(guix monads)} module provides a monad as well as "
+"monadic versions of the above procedures, with the goal of making it more "
+"convenient to work with code that accesses the store (@pxref{The Store "
+"Monad})."
 msgstr ""
 
 #. type: i{#1}
@@ -8911,18 +11127,23 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:4340
 msgid ""
-"Low-level build actions and the environment in which they are performed are represented by @dfn{derivations}.  A derivation contains "
-"the following pieces of information:"
+"Low-level build actions and the environment in which they are performed are "
+"represented by @dfn{derivations}.  A derivation contains the following "
+"pieces of information:"
 msgstr ""
 
 #. type: itemize
 #: doc/guix.texi:4345
-msgid "The outputs of the derivation---derivations produce at least one file or directory in the store, but may produce more."
+msgid ""
+"The outputs of the derivation---derivations produce at least one file or "
+"directory in the store, but may produce more."
 msgstr ""
 
 #. type: itemize
 #: doc/guix.texi:4349
-msgid "The inputs of the derivations, which may be other derivations or plain files in the store (patches, build scripts, etc.)"
+msgid ""
+"The inputs of the derivations, which may be other derivations or plain files "
+"in the store (patches, build scripts, etc.)"
 msgstr ""
 
 #. type: itemize
@@ -8932,7 +11153,9 @@ msgstr ""
 
 #. type: itemize
 #: doc/guix.texi:4356
-msgid "The file name of a build script in the store, along with the arguments to be passed."
+msgid ""
+"The file name of a build script in the store, along with the arguments to be "
+"passed."
 msgstr ""
 
 #. type: itemize
@@ -8949,9 +11172,11 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:4370
 msgid ""
-"Derivations allow clients of the daemon to communicate build actions to the store.  They exist in two forms: as an in-memory "
-"representation, both on the client- and daemon-side, and as files in the store whose name end in @code{.drv}---these files are "
-"referred to as @dfn{derivation paths}.  Derivations paths can be passed to the @code{build-derivations} procedure to perform the "
+"Derivations allow clients of the daemon to communicate build actions to the "
+"store.  They exist in two forms: as an in-memory representation, both on the "
+"client- and daemon-side, and as files in the store whose name end in @code{."
+"drv}---these files are referred to as @dfn{derivation paths}.  Derivations "
+"paths can be passed to the @code{build-derivations} procedure to perform the "
 "build actions they prescribe (@pxref{The Store})."
 msgstr ""
 
@@ -8964,16 +11189,21 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:4378
 msgid ""
-"Operations such as file downloads and version-control checkouts for which the expected content hash is known in advance are modeled "
-"as @dfn{fixed-output derivations}.  Unlike regular derivations, the outputs of a fixed-output derivation are independent of its "
-"inputs---e.g., a source code download produces the same result regardless of the download method and tools being used."
+"Operations such as file downloads and version-control checkouts for which "
+"the expected content hash is known in advance are modeled as @dfn{fixed-"
+"output derivations}.  Unlike regular derivations, the outputs of a fixed-"
+"output derivation are independent of its inputs---e.g., a source code "
+"download produces the same result regardless of the download method and "
+"tools being used."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:4383
 msgid ""
-"The @code{(guix derivations)} module provides a representation of derivations as Scheme objects, along with procedures to create and "
-"otherwise manipulate derivations.  The lowest-level primitive to create a derivation is the @code{derivation} procedure:"
+"The @code{(guix derivations)} module provides a representation of "
+"derivations as Scheme objects, along with procedures to create and otherwise "
+"manipulate derivations.  The lowest-level primitive to create a derivation "
+"is the @code{derivation} procedure:"
 msgstr ""
 
 #. type: deffn
@@ -8985,69 +11215,87 @@ msgstr "{Scheme Procedure} derivation @var{store} @var{name} @var{builder} @"
 #. type: deffn
 #: doc/guix.texi:4393
 msgid ""
-"@var{args} [#:outputs '(\"out\")] [#:hash #f] [#:hash-algo #f] @ [#:recursive? #f] [#:inputs '()] [#:env-vars '()] @ [#:system "
-"(%current-system)] [#:references-graphs #f] @ [#:allowed-references #f] [#:disallowed-references #f] @ [#:leaked-env-vars #f] [#:"
-"local-build? #f] @ [#:substitutable? #t] Build a derivation with the given arguments, and return the resulting @code{<derivation>} "
-"object."
+"@var{args} [#:outputs '(\"out\")] [#:hash #f] [#:hash-algo #f] @ [#:"
+"recursive? #f] [#:inputs '()] [#:env-vars '()] @ [#:system (%current-"
+"system)] [#:references-graphs #f] @ [#:allowed-references #f] [#:disallowed-"
+"references #f] @ [#:leaked-env-vars #f] [#:local-build? #f] @ [#:"
+"substitutable? #t] Build a derivation with the given arguments, and return "
+"the resulting @code{<derivation>} object."
 msgstr ""
-"@var{args} [#:outputs '(\"out\")] [#:hash #f] [#:hash-algo #f] @ [#:recursive? #f] [#:inputs '()] [#:env-vars '()] @ [#:system "
-"(%current-system)] [#:references-graphs #f] @ [#:allowed-references #f] [#:disallowed-references #f] @ [#:leaked-env-vars #f] [#:"
-"local-build? #f] @ [#:substitutable? #t] Construit une dérivation avec les arguments donnés et renvie l'objet @code{<derivation>} "
-"obtenu."
+"@var{args} [#:outputs '(\"out\")] [#:hash #f] [#:hash-algo #f] @ [#:"
+"recursive? #f] [#:inputs '()] [#:env-vars '()] @ [#:system (%current-"
+"system)] [#:references-graphs #f] @ [#:allowed-references #f] [#:disallowed-"
+"references #f] @ [#:leaked-env-vars #f] [#:local-build? #f] @ [#:"
+"substitutable? #t] Construit une dérivation avec les arguments donnés et "
+"renvie l'objet @code{<derivation>} obtenu."
 
 #. type: deffn
 #: doc/guix.texi:4400
 msgid ""
-"When @var{hash} and @var{hash-algo} are given, a @dfn{fixed-output derivation} is created---i.e., one whose result is known in "
-"advance, such as a file download.  If, in addition, @var{recursive?} is true, then that fixed output may be an executable file or a "
-"directory and @var{hash} must be the hash of an archive containing this output."
+"When @var{hash} and @var{hash-algo} are given, a @dfn{fixed-output "
+"derivation} is created---i.e., one whose result is known in advance, such as "
+"a file download.  If, in addition, @var{recursive?} is true, then that fixed "
+"output may be an executable file or a directory and @var{hash} must be the "
+"hash of an archive containing this output."
 msgstr ""
 
 #. type: deffn
 #: doc/guix.texi:4405
 msgid ""
-"When @var{references-graphs} is true, it must be a list of file name/store path pairs.  In that case, the reference graph of each "
-"store path is exported in the build environment in the corresponding file, in a simple text format."
+"When @var{references-graphs} is true, it must be a list of file name/store "
+"path pairs.  In that case, the reference graph of each store path is "
+"exported in the build environment in the corresponding file, in a simple "
+"text format."
 msgstr ""
 
 #. type: deffn
 #: doc/guix.texi:4410
 msgid ""
-"When @var{allowed-references} is true, it must be a list of store items or outputs that the derivation's output may refer to.  "
-"Likewise, @var{disallowed-references}, if true, must be a list of things the outputs may @emph{not} refer to."
+"When @var{allowed-references} is true, it must be a list of store items or "
+"outputs that the derivation's output may refer to.  Likewise, "
+"@var{disallowed-references}, if true, must be a list of things the outputs "
+"may @emph{not} refer to."
 msgstr ""
 
 #. type: deffn
 #: doc/guix.texi:4417
 msgid ""
-"When @var{leaked-env-vars} is true, it must be a list of strings denoting environment variables that are allowed to ``leak'' from "
-"the daemon's environment to the build environment.  This is only applicable to fixed-output derivations---i.e., when @var{hash} is "
-"true.  The main use is to allow variables such as @code{http_proxy} to be passed to derivations that download files."
+"When @var{leaked-env-vars} is true, it must be a list of strings denoting "
+"environment variables that are allowed to ``leak'' from the daemon's "
+"environment to the build environment.  This is only applicable to fixed-"
+"output derivations---i.e., when @var{hash} is true.  The main use is to "
+"allow variables such as @code{http_proxy} to be passed to derivations that "
+"download files."
 msgstr ""
 
 #. type: deffn
 #: doc/guix.texi:4422
 msgid ""
-"When @var{local-build?} is true, declare that the derivation is not a good candidate for offloading and should rather be built "
-"locally (@pxref{Daemon Offload Setup}).  This is the case for small derivations where the costs of data transfers would outweigh the "
-"benefits."
+"When @var{local-build?} is true, declare that the derivation is not a good "
+"candidate for offloading and should rather be built locally (@pxref{Daemon "
+"Offload Setup}).  This is the case for small derivations where the costs of "
+"data transfers would outweigh the benefits."
 msgstr ""
 
 #. type: deffn
 #: doc/guix.texi:4427
 msgid ""
-"When @var{substitutable?} is false, declare that substitutes of the derivation's output should not be used (@pxref{Substitutes}).  "
-"This is useful, for instance, when building packages that capture details of the host CPU instruction set."
+"When @var{substitutable?} is false, declare that substitutes of the "
+"derivation's output should not be used (@pxref{Substitutes}).  This is "
+"useful, for instance, when building packages that capture details of the "
+"host CPU instruction set."
 msgstr ""
-"Lorsque que @var{substitutable?} est faux, déclare que les substituts de la sortie de la dérivation ne devraient pas être utilisés "
-"(@pxref{Substituts}). Cela est utile par exemple pour construire des paquets qui utilisent des détails du jeu d'instruction du CPU "
-"hôte."
+"Lorsque que @var{substitutable?} est faux, déclare que les substituts de la "
+"sortie de la dérivation ne devraient pas être utilisés (@pxref{Substituts}). "
+"Cela est utile par exemple pour construire des paquets qui utilisent des "
+"détails du jeu d'instruction du CPU hôte."
 
 #. type: Plain text
 #: doc/guix.texi:4433
 msgid ""
-"Here's an example with a shell script as its builder, assuming @var{store} is an open connection to the daemon, and @var{bash} "
-"points to a Bash executable in the store:"
+"Here's an example with a shell script as its builder, assuming @var{store} "
+"is an open connection to the daemon, and @var{bash} points to a Bash "
+"executable in the store:"
 msgstr ""
 
 #. type: lisp
@@ -9077,17 +11325,20 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:4454
 msgid ""
-"As can be guessed, this primitive is cumbersome to use directly.  A better approach is to write build scripts in Scheme, of course! "
-"The best course of action for that is to write the build code as a ``G-expression'', and to pass it to @code{gexp->derivation}.  For "
-"more information, @pxref{G-Expressions}."
+"As can be guessed, this primitive is cumbersome to use directly.  A better "
+"approach is to write build scripts in Scheme, of course! The best course of "
+"action for that is to write the build code as a ``G-expression'', and to "
+"pass it to @code{gexp->derivation}.  For more information, @pxref{G-"
+"Expressions}."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:4459
 msgid ""
-"Once upon a time, @code{gexp->derivation} did not exist and constructing derivations with build code written in Scheme was achieved "
-"with @code{build-expression->derivation}, documented below.  This procedure is now deprecated in favor of the much nicer @code{gexp-"
-">derivation}."
+"Once upon a time, @code{gexp->derivation} did not exist and constructing "
+"derivations with build code written in Scheme was achieved with @code{build-"
+"expression->derivation}, documented below.  This procedure is now deprecated "
+"in favor of the much nicer @code{gexp->derivation}."
 msgstr ""
 
 #. type: deffn
@@ -9099,41 +11350,52 @@ msgstr ""
 #. type: deffn
 #: doc/guix.texi:4476
 msgid ""
-"@var{name} @var{exp} @ [#:system (%current-system)] [#:inputs '()] @ [#:outputs '(\"out\")] [#:hash #f] [#:hash-algo #f] @ [#:"
-"recursive? #f] [#:env-vars '()] [#:modules '()] @ [#:references-graphs #f] [#:allowed-references #f] @ [#:disallowed-references #f] "
-"@ [#:local-build? #f] [#:substitutable? #t] [#:guile-for-build #f] Return a derivation that executes Scheme expression @var{exp} as "
-"a builder for derivation @var{name}.  @var{inputs} must be a list of @code{(name drv-path sub-drv)} tuples; when @var{sub-drv} is "
-"omitted, @code{\"out\"} is assumed.  @var{modules} is a list of names of Guile modules from the current search path to be copied in "
-"the store, compiled, and made available in the load path during the execution of @var{exp}---e.g., @code{((guix build utils) (guix "
-"build gnu-build-system))}."
+"@var{name} @var{exp} @ [#:system (%current-system)] [#:inputs '()] @ [#:"
+"outputs '(\"out\")] [#:hash #f] [#:hash-algo #f] @ [#:recursive? #f] [#:env-"
+"vars '()] [#:modules '()] @ [#:references-graphs #f] [#:allowed-references "
+"#f] @ [#:disallowed-references #f] @ [#:local-build? #f] [#:substitutable? "
+"#t] [#:guile-for-build #f] Return a derivation that executes Scheme "
+"expression @var{exp} as a builder for derivation @var{name}.  @var{inputs} "
+"must be a list of @code{(name drv-path sub-drv)} tuples; when @var{sub-drv} "
+"is omitted, @code{\"out\"} is assumed.  @var{modules} is a list of names of "
+"Guile modules from the current search path to be copied in the store, "
+"compiled, and made available in the load path during the execution of "
+"@var{exp}---e.g., @code{((guix build utils) (guix build gnu-build-system))}."
 msgstr ""
 
 #. type: deffn
 #: doc/guix.texi:4484
 msgid ""
-"@var{exp} is evaluated in an environment where @code{%outputs} is bound to a list of output/path pairs, and where @code{%build-"
-"inputs} is bound to a list of string/output-path pairs made from @var{inputs}.  Optionally, @var{env-vars} is a list of string pairs "
-"specifying the name and value of environment variables visible to the builder.  The builder terminates by passing the result of "
-"@var{exp} to @code{exit}; thus, when @var{exp} returns @code{#f}, the build is considered to have failed."
+"@var{exp} is evaluated in an environment where @code{%outputs} is bound to a "
+"list of output/path pairs, and where @code{%build-inputs} is bound to a list "
+"of string/output-path pairs made from @var{inputs}.  Optionally, @var{env-"
+"vars} is a list of string pairs specifying the name and value of environment "
+"variables visible to the builder.  The builder terminates by passing the "
+"result of @var{exp} to @code{exit}; thus, when @var{exp} returns @code{#f}, "
+"the build is considered to have failed."
 msgstr ""
 
 #. type: deffn
 #: doc/guix.texi:4488
 msgid ""
-"@var{exp} is built using @var{guile-for-build} (a derivation).  When @var{guile-for-build} is omitted or is @code{#f}, the value of "
-"the @code{%guile-for-build} fluid is used instead."
+"@var{exp} is built using @var{guile-for-build} (a derivation).  When "
+"@var{guile-for-build} is omitted or is @code{#f}, the value of the "
+"@code{%guile-for-build} fluid is used instead."
 msgstr ""
 
 #. type: deffn
 #: doc/guix.texi:4493
 msgid ""
-"See the @code{derivation} procedure for the meaning of @var{references-graphs}, @var{allowed-references}, @var{disallowed-"
-"references}, @var{local-build?}, and @var{substitutable?}."
+"See the @code{derivation} procedure for the meaning of @var{references-"
+"graphs}, @var{allowed-references}, @var{disallowed-references}, @var{local-"
+"build?}, and @var{substitutable?}."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:4498
-msgid "Here's an example of a single-output derivation that creates a directory containing one file:"
+msgid ""
+"Here's an example of a single-output derivation that creates a directory "
+"containing one file:"
 msgstr ""
 
 #. type: lisp
@@ -9164,17 +11426,20 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:4520
 msgid ""
-"The procedures that operate on the store described in the previous sections all take an open connection to the build daemon as their "
-"first argument.  Although the underlying model is functional, they either have side effects or depend on the current state of the "
-"store."
+"The procedures that operate on the store described in the previous sections "
+"all take an open connection to the build daemon as their first argument.  "
+"Although the underlying model is functional, they either have side effects "
+"or depend on the current state of the store."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:4526
 msgid ""
-"The former is inconvenient: the connection to the build daemon has to be carried around in all those functions, making it impossible "
-"to compose functions that do not take that parameter with functions that do.  The latter can be problematic: since store operations "
-"have side effects and/or depend on external state, they have to be properly sequenced."
+"The former is inconvenient: the connection to the build daemon has to be "
+"carried around in all those functions, making it impossible to compose "
+"functions that do not take that parameter with functions that do.  The "
+"latter can be problematic: since store operations have side effects and/or "
+"depend on external state, they have to be properly sequenced."
 msgstr ""
 
 #. type: cindex
@@ -9192,11 +11457,14 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:4538
 msgid ""
-"This is where the @code{(guix monads)} module comes in.  This module provides a framework for working with @dfn{monads}, and a "
-"particularly useful monad for our uses, the @dfn{store monad}.  Monads are a construct that allows two things: associating "
-"``context'' with values (in our case, the context is the store), and building sequences of computations (here computations include "
-"accesses to the store).  Values in a monad---values that carry this additional context---are called @dfn{monadic values}; procedures "
-"that return such values are called @dfn{monadic procedures}."
+"This is where the @code{(guix monads)} module comes in.  This module "
+"provides a framework for working with @dfn{monads}, and a particularly "
+"useful monad for our uses, the @dfn{store monad}.  Monads are a construct "
+"that allows two things: associating ``context'' with values (in our case, "
+"the context is the store), and building sequences of computations (here "
+"computations include accesses to the store).  Values in a monad---values "
+"that carry this additional context---are called @dfn{monadic values}; "
+"procedures that return such values are called @dfn{monadic procedures}."
 msgstr ""
 
 #. type: Plain text
@@ -9219,7 +11487,9 @@ msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:4553
-msgid "Using @code{(guix monads)} and @code{(guix gexp)}, it may be rewritten as a monadic function:"
+msgid ""
+"Using @code{(guix monads)} and @code{(guix gexp)}, it may be rewritten as a "
+"monadic function:"
 msgstr ""
 
 #. type: example
@@ -9237,16 +11507,19 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:4568
 msgid ""
-"There are several things to note in the second version: the @code{store} parameter is now implicit and is ``threaded'' in the calls "
-"to the @code{package->derivation} and @code{gexp->derivation} monadic procedures, and the monadic value returned by @code{package-"
-">derivation} is @dfn{bound} using @code{mlet} instead of plain @code{let}."
+"There are several things to note in the second version: the @code{store} "
+"parameter is now implicit and is ``threaded'' in the calls to the "
+"@code{package->derivation} and @code{gexp->derivation} monadic procedures, "
+"and the monadic value returned by @code{package->derivation} is @dfn{bound} "
+"using @code{mlet} instead of plain @code{let}."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:4572
 msgid ""
-"As it turns out, the call to @code{package->derivation} can even be omitted since it will take place implicitly, as we will see "
-"later (@pxref{G-Expressions}):"
+"As it turns out, the call to @code{package->derivation} can even be omitted "
+"since it will take place implicitly, as we will see later (@pxref{G-"
+"Expressions}):"
 msgstr ""
 
 #. type: example
@@ -9262,8 +11535,10 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:4587
 msgid ""
-"Calling the monadic @code{sh-symlink} has no effect.  As someone once said, ``you exit a monad like you exit a building on fire: by "
-"running''.  So, to exit the monad and get the desired effect, one must use @code{run-with-store}:"
+"Calling the monadic @code{sh-symlink} has no effect.  As someone once said, "
+"``you exit a monad like you exit a building on fire: by running''.  So, to "
+"exit the monad and get the desired effect, one must use @code{run-with-"
+"store}:"
 msgstr ""
 
 #. type: example
@@ -9277,9 +11552,10 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:4597
 msgid ""
-"Note that the @code{(guix monad-repl)} module extends the Guile REPL with new ``meta-commands'' to make it easier to deal with "
-"monadic procedures: @code{run-in-store}, and @code{enter-store-monad}.  The former is used to ``run'' a single monadic value through "
-"the store:"
+"Note that the @code{(guix monad-repl)} module extends the Guile REPL with "
+"new ``meta-commands'' to make it easier to deal with monadic procedures: "
+"@code{run-in-store}, and @code{enter-store-monad}.  The former is used to "
+"``run'' a single monadic value through the store:"
 msgstr ""
 
 #. type: example
@@ -9292,7 +11568,9 @@ msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:4605
-msgid "The latter enters a recursive REPL, where all the return values are automatically run through the store:"
+msgid ""
+"The latter enters a recursive REPL, where all the return values are "
+"automatically run through the store:"
 msgstr ""
 
 #. type: example
@@ -9310,13 +11588,16 @@ msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:4619
-msgid "Note that non-monadic values cannot be returned in the @code{store-monad} REPL."
+msgid ""
+"Note that non-monadic values cannot be returned in the @code{store-monad} "
+"REPL."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:4622
 msgid ""
-"The main syntactic forms to deal with monads in general are provided by the @code{(guix monads)} module and are described below."
+"The main syntactic forms to deal with monads in general are provided by the "
+"@code{(guix monads)} module and are described below."
 msgstr ""
 
 #. type: deffn
@@ -9327,7 +11608,9 @@ msgstr ""
 
 #. type: deffn
 #: doc/guix.texi:4626
-msgid "Evaluate any @code{>>=} or @code{return} forms in @var{body} as being in @var{monad}."
+msgid ""
+"Evaluate any @code{>>=} or @code{return} forms in @var{body} as being in "
+"@var{monad}."
 msgstr ""
 
 #. type: deffn
@@ -9350,9 +11633,11 @@ msgstr ""
 #. type: deffn
 #: doc/guix.texi:4639
 msgid ""
-"@dfn{Bind} monadic value @var{mval}, passing its ``contents'' to monadic procedures @var{mproc}@dots{}@footnote{This operation is "
-"commonly referred to as ``bind'', but that name denotes an unrelated procedure in Guile.  Thus we use this somewhat cryptic symbol "
-"inherited from the Haskell language.}.  There can be one @var{mproc} or several of them, as in this example:"
+"@dfn{Bind} monadic value @var{mval}, passing its ``contents'' to monadic "
+"procedures @var{mproc}@dots{}@footnote{This operation is commonly referred "
+"to as ``bind'', but that name denotes an unrelated procedure in Guile.  Thus "
+"we use this somewhat cryptic symbol inherited from the Haskell language.}.  "
+"There can be one @var{mproc} or several of them, as in this example:"
 msgstr ""
 
 #. type: example
@@ -9396,17 +11681,23 @@ msgstr ""
 #. type: deffn
 #: doc/guix.texi:4667
 msgid ""
-"@var{body} ...  Bind the variables @var{var} to the monadic values @var{mval} in @var{body}, which is a sequence of expressions.  As "
-"with the bind operator, this can be thought of as ``unpacking'' the raw, non-monadic value ``contained'' in @var{mval} and making "
-"@var{var} refer to that raw, non-monadic value within the scope of the @var{body}.  The form (@var{var} -> @var{val}) binds "
-"@var{var} to the ``normal'' value @var{val}, as per @code{let}.  The binding operations occur in sequence from left to right.  The "
-"last expression of @var{body} must be a monadic expression, and its result will become the result of the @code{mlet} or @code{mlet*} "
-"when run in the @var{monad}."
+"@var{body} ...  Bind the variables @var{var} to the monadic values "
+"@var{mval} in @var{body}, which is a sequence of expressions.  As with the "
+"bind operator, this can be thought of as ``unpacking'' the raw, non-monadic "
+"value ``contained'' in @var{mval} and making @var{var} refer to that raw, "
+"non-monadic value within the scope of the @var{body}.  The form (@var{var} -"
+"> @var{val}) binds @var{var} to the ``normal'' value @var{val}, as per "
+"@code{let}.  The binding operations occur in sequence from left to right.  "
+"The last expression of @var{body} must be a monadic expression, and its "
+"result will become the result of the @code{mlet} or @code{mlet*} when run in "
+"the @var{monad}."
 msgstr ""
 
 #. type: deffn
 #: doc/guix.texi:4670
-msgid "@code{mlet*} is to @code{mlet} what @code{let*} is to @code{let} (@pxref{Local Bindings,,, guile, GNU Guile Reference Manual})."
+msgid ""
+"@code{mlet*} is to @code{mlet} what @code{let*} is to @code{let} "
+"(@pxref{Local Bindings,,, guile, GNU Guile Reference Manual})."
 msgstr ""
 
 #. type: deffn
@@ -9418,15 +11709,17 @@ msgstr ""
 #. type: deffn
 #: doc/guix.texi:4676
 msgid ""
-"Bind @var{mexp} and the following monadic expressions in sequence, returning the result of the last expression.  Every expression in "
-"the sequence must be a monadic expression."
+"Bind @var{mexp} and the following monadic expressions in sequence, returning "
+"the result of the last expression.  Every expression in the sequence must be "
+"a monadic expression."
 msgstr ""
 
 #. type: deffn
 #: doc/guix.texi:4680
 msgid ""
-"This is akin to @code{mlet}, except that the return values of the monadic expressions are ignored.  In that sense, it is analogous "
-"to @code{begin}, but applied to monadic expressions."
+"This is akin to @code{mlet}, except that the return values of the monadic "
+"expressions are ignored.  In that sense, it is analogous to @code{begin}, "
+"but applied to monadic expressions."
 msgstr ""
 
 #. type: deffn
@@ -9438,9 +11731,10 @@ msgstr ""
 #. type: deffn
 #: doc/guix.texi:4687
 msgid ""
-"When @var{condition} is true, evaluate the sequence of monadic expressions @var{mexp0}..@var{mexp*} as in an @code{mbegin}.  When "
-"@var{condition} is false, return @code{*unspecified*} in the current monad.  Every expression in the sequence must be a monadic "
-"expression."
+"When @var{condition} is true, evaluate the sequence of monadic expressions "
+"@var{mexp0}..@var{mexp*} as in an @code{mbegin}.  When @var{condition} is "
+"false, return @code{*unspecified*} in the current monad.  Every expression "
+"in the sequence must be a monadic expression."
 msgstr ""
 
 #. type: deffn
@@ -9452,9 +11746,10 @@ msgstr ""
 #. type: deffn
 #: doc/guix.texi:4694
 msgid ""
-"When @var{condition} is false, evaluate the sequence of monadic expressions @var{mexp0}..@var{mexp*} as in an @code{mbegin}.  When "
-"@var{condition} is true, return @code{*unspecified*} in the current monad.  Every expression in the sequence must be a monadic "
-"expression."
+"When @var{condition} is false, evaluate the sequence of monadic expressions "
+"@var{mexp0}..@var{mexp*} as in an @code{mbegin}.  When @var{condition} is "
+"true, return @code{*unspecified*} in the current monad.  Every expression in "
+"the sequence must be a monadic expression."
 msgstr ""
 
 #. type: cindex
@@ -9466,8 +11761,9 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:4700
 msgid ""
-"The @code{(guix monads)} module provides the @dfn{state monad}, which allows an additional value---the state---to be @emph{threaded} "
-"through monadic procedure calls."
+"The @code{(guix monads)} module provides the @dfn{state monad}, which allows "
+"an additional value---the state---to be @emph{threaded} through monadic "
+"procedure calls."
 msgstr ""
 
 #. type: defvr
@@ -9478,14 +11774,17 @@ msgstr ""
 
 #. type: defvr
 #: doc/guix.texi:4704
-msgid "The state monad.  Procedures in the state monad can access and change the state that is threaded."
+msgid ""
+"The state monad.  Procedures in the state monad can access and change the "
+"state that is threaded."
 msgstr ""
 
 #. type: defvr
 #: doc/guix.texi:4708
 msgid ""
-"Consider the example below.  The @code{square} procedure returns a value in the state monad.  It returns the square of its argument, "
-"but also increments the current state value:"
+"Consider the example below.  The @code{square} procedure returns a value in "
+"the state monad.  It returns the square of its argument, but also increments "
+"the current state value:"
 msgstr ""
 
 #. type: example
@@ -9511,7 +11810,9 @@ msgstr ""
 
 #. type: defvr
 #: doc/guix.texi:4723
-msgid "When ``run'' through @var{%state-monad}, we obtain that additional state value, which is the number of @code{square} calls."
+msgid ""
+"When ``run'' through @var{%state-monad}, we obtain that additional state "
+"value, which is the number of @code{square} calls."
 msgstr ""
 
 #. type: deffn
@@ -9533,7 +11834,9 @@ msgstr ""
 
 #. type: deffn
 #: doc/guix.texi:4732
-msgid "Set the current state to @var{value} and return the previous state as a monadic value."
+msgid ""
+"Set the current state to @var{value} and return the previous state as a "
+"monadic value."
 msgstr ""
 
 #. type: deffn
@@ -9544,7 +11847,9 @@ msgstr ""
 
 #. type: deffn
 #: doc/guix.texi:4737
-msgid "Push @var{value} to the current state, which is assumed to be a list, and return the previous state as a monadic value."
+msgid ""
+"Push @var{value} to the current state, which is assumed to be a list, and "
+"return the previous state as a monadic value."
 msgstr ""
 
 #. type: deffn
@@ -9555,7 +11860,9 @@ msgstr ""
 
 #. type: deffn
 #: doc/guix.texi:4742
-msgid "Pop a value from the current state and return it as a monadic value.  The state is assumed to be a list."
+msgid ""
+"Pop a value from the current state and return it as a monadic value.  The "
+"state is assumed to be a list."
 msgstr ""
 
 #. type: deffn
@@ -9567,13 +11874,15 @@ msgstr ""
 #. type: deffn
 #: doc/guix.texi:4747
 msgid ""
-"Run monadic value @var{mval} starting with @var{state} as the initial state.  Return two values: the resulting value, and the "
-"resulting state."
+"Run monadic value @var{mval} starting with @var{state} as the initial "
+"state.  Return two values: the resulting value, and the resulting state."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:4751
-msgid "The main interface to the store monad, provided by the @code{(guix store)} module, is as follows."
+msgid ""
+"The main interface to the store monad, provided by the @code{(guix store)} "
+"module, is as follows."
 msgstr ""
 
 #. type: defvr
@@ -9590,8 +11899,9 @@ msgstr ""
 #. type: defvr
 #: doc/guix.texi:4758
 msgid ""
-"Values in the store monad encapsulate accesses to the store.  When its effect is needed, a value of the store monad must be "
-"``evaluated'' by passing it to the @code{run-with-store} procedure (see below.)"
+"Values in the store monad encapsulate accesses to the store.  When its "
+"effect is needed, a value of the store monad must be ``evaluated'' by "
+"passing it to the @code{run-with-store} procedure (see below.)"
 msgstr ""
 
 #. type: deffn
@@ -9602,7 +11912,9 @@ msgstr ""
 
 #. type: deffn
 #: doc/guix.texi:4763
-msgid "Run @var{mval}, a monadic value in the store monad, in @var{store}, an open store connection."
+msgid ""
+"Run @var{mval}, a monadic value in the store monad, in @var{store}, an open "
+"store connection."
 msgstr ""
 
 #. type: deffn
@@ -9614,8 +11926,9 @@ msgstr ""
 #. type: deffn
 #: doc/guix.texi:4769
 msgid ""
-"Return as a monadic value the absolute file name in the store of the file containing @var{text}, a string.  @var{references} is a "
-"list of store items that the resulting text file refers to; it defaults to the empty list."
+"Return as a monadic value the absolute file name in the store of the file "
+"containing @var{text}, a string.  @var{references} is a list of store items "
+"that the resulting text file refers to; it defaults to the empty list."
 msgstr ""
 
 #. type: deffn
@@ -9627,23 +11940,26 @@ msgstr ""
 #. type: deffn
 #: doc/guix.texi:4776
 msgid ""
-"[#:recursive? #t] [#:select? (const #t)] Return the name of @var{file} once interned in the store.  Use @var{name} as its store "
-"name, or the basename of @var{file} if @var{name} is omitted."
+"[#:recursive? #t] [#:select? (const #t)] Return the name of @var{file} once "
+"interned in the store.  Use @var{name} as its store name, or the basename of "
+"@var{file} if @var{name} is omitted."
 msgstr ""
 
 #. type: deffn
 #: doc/guix.texi:4780 doc/guix.texi:5159
 msgid ""
-"When @var{recursive?} is true, the contents of @var{file} are added recursively; if @var{file} designates a flat file and "
-"@var{recursive?} is true, its contents are added, and its permission bits are kept."
+"When @var{recursive?} is true, the contents of @var{file} are added "
+"recursively; if @var{file} designates a flat file and @var{recursive?} is "
+"true, its contents are added, and its permission bits are kept."
 msgstr ""
 
 #. type: deffn
 #: doc/guix.texi:4785 doc/guix.texi:5164
 msgid ""
-"When @var{recursive?} is true, call @code{(@var{select?} @var{file} @var{stat})} for each directory entry, where @var{file} is the "
-"entry's absolute file name and @var{stat} is the result of @code{lstat}; exclude entries for which @var{select?} does not return "
-"true."
+"When @var{recursive?} is true, call @code{(@var{select?} @var{file} "
+"@var{stat})} for each directory entry, where @var{file} is the entry's "
+"absolute file name and @var{stat} is the result of @code{lstat}; exclude "
+"entries for which @var{select?} does not return true."
 msgstr ""
 
 #. type: deffn
@@ -9670,7 +11986,9 @@ msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:4801
-msgid "The @code{(guix packages)} module exports the following package-related monadic procedures:"
+msgid ""
+"The @code{(guix packages)} module exports the following package-related "
+"monadic procedures:"
 msgstr ""
 
 #. type: deffn
@@ -9682,9 +12000,11 @@ msgstr ""
 #. type: deffn
 #: doc/guix.texi:4810
 msgid ""
-"[#:system (%current-system)] [#:target #f] @ [#:output \"out\"] Return as a monadic value in the absolute file name of @var{file} "
-"within the @var{output} directory of @var{package}.  When @var{file} is omitted, return the name of the @var{output} directory of "
-"@var{package}.  When @var{target} is true, use it as a cross-compilation target triplet."
+"[#:system (%current-system)] [#:target #f] @ [#:output \"out\"] Return as a "
+"monadic value in the absolute file name of @var{file} within the "
+"@var{output} directory of @var{package}.  When @var{file} is omitted, return "
+"the name of the @var{output} directory of @var{package}.  When @var{target} "
+"is true, use it as a cross-compilation target triplet."
 msgstr ""
 
 #. type: deffn
@@ -9702,8 +12022,8 @@ msgstr ""
 #. type: deffn
 #: doc/guix.texi:4817
 msgid ""
-"@var{target} [@var{system}] Monadic version of @code{package-derivation} and @code{package-cross-derivation} (@pxref{Defining "
-"Packages})."
+"@var{target} [@var{system}] Monadic version of @code{package-derivation} and "
+"@code{package-cross-derivation} (@pxref{Defining Packages})."
 msgstr ""
 
 #. type: cindex
@@ -9721,9 +12041,11 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:4830
 msgid ""
-"So we have ``derivations'', which represent a sequence of build actions to be performed to produce an item in the store "
-"(@pxref{Derivations}).  These build actions are performed when asking the daemon to actually build the derivations; they are run by "
-"the daemon in a container (@pxref{Invoking guix-daemon})."
+"So we have ``derivations'', which represent a sequence of build actions to "
+"be performed to produce an item in the store (@pxref{Derivations}).  These "
+"build actions are performed when asking the daemon to actually build the "
+"derivations; they are run by the daemon in a container (@pxref{Invoking guix-"
+"daemon})."
 msgstr ""
 
 #. type: cindex
@@ -9735,53 +12057,65 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:4843
 msgid ""
-"It should come as no surprise that we like to write these build actions in Scheme.  When we do that, we end up with two @dfn{strata} "
-"of Scheme code@footnote{The term @dfn{stratum} in this context was coined by Manuel Serrano et al.@: in the context of their work on "
-"Hop.  Oleg Kiselyov, who has written insightful @url{http://okmij.org/ftp/meta-programming/#meta-scheme, essays and code on this "
-"topic}, refers to this kind of code generation as @dfn{staging}.}: the ``host code''---code that defines packages, talks to the "
-"daemon, etc.---and the ``build code''---code that actually performs build actions, such as making directories, invoking "
+"It should come as no surprise that we like to write these build actions in "
+"Scheme.  When we do that, we end up with two @dfn{strata} of Scheme "
+"code@footnote{The term @dfn{stratum} in this context was coined by Manuel "
+"Serrano et al.@: in the context of their work on Hop.  Oleg Kiselyov, who "
+"has written insightful @url{http://okmij.org/ftp/meta-programming/#meta-"
+"scheme, essays and code on this topic}, refers to this kind of code "
+"generation as @dfn{staging}.}: the ``host code''---code that defines "
+"packages, talks to the daemon, etc.---and the ``build code''---code that "
+"actually performs build actions, such as making directories, invoking "
 "@command{make}, etc."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:4850
 msgid ""
-"To describe a derivation and its build actions, one typically needs to embed build code inside host code.  It boils down to "
-"manipulating build code as data, and the homoiconicity of Scheme---code has a direct representation as data---comes in handy for "
-"that.  But we need more than the normal @code{quasiquote} mechanism in Scheme to construct build expressions."
+"To describe a derivation and its build actions, one typically needs to embed "
+"build code inside host code.  It boils down to manipulating build code as "
+"data, and the homoiconicity of Scheme---code has a direct representation as "
+"data---comes in handy for that.  But we need more than the normal "
+"@code{quasiquote} mechanism in Scheme to construct build expressions."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:4859
 msgid ""
-"The @code{(guix gexp)} module implements @dfn{G-expressions}, a form of S-expressions adapted to build expressions.  G-expressions, "
-"or @dfn{gexps}, consist essentially of three syntactic forms: @code{gexp}, @code{ungexp}, and @code{ungexp-splicing} (or simply: "
-"@code{#~}, @code{#$}, and @code{#$@@}), which are comparable to @code{quasiquote}, @code{unquote}, and @code{unquote-splicing}, "
-"respectively (@pxref{Expression Syntax, @code{quasiquote},, guile, GNU Guile Reference Manual}).  However, there are major "
-"differences:"
+"The @code{(guix gexp)} module implements @dfn{G-expressions}, a form of S-"
+"expressions adapted to build expressions.  G-expressions, or @dfn{gexps}, "
+"consist essentially of three syntactic forms: @code{gexp}, @code{ungexp}, "
+"and @code{ungexp-splicing} (or simply: @code{#~}, @code{#$}, and @code{#"
+"$@@}), which are comparable to @code{quasiquote}, @code{unquote}, and "
+"@code{unquote-splicing}, respectively (@pxref{Expression Syntax, "
+"@code{quasiquote},, guile, GNU Guile Reference Manual}).  However, there are "
+"major differences:"
 msgstr ""
 
 #. type: itemize
 #: doc/guix.texi:4864
-msgid "Gexps are meant to be written to a file and run or manipulated by other processes."
+msgid ""
+"Gexps are meant to be written to a file and run or manipulated by other "
+"processes."
 msgstr ""
 
 #. type: itemize
 #: doc/guix.texi:4869
 msgid ""
-"When a high-level object such as a package or derivation is unquoted inside a gexp, the result is as if its output file name had "
-"been introduced."
+"When a high-level object such as a package or derivation is unquoted inside "
+"a gexp, the result is as if its output file name had been introduced."
 msgstr ""
 
 #. type: itemize
 #: doc/guix.texi:4874
 msgid ""
-"Gexps carry information about the packages or derivations they refer to, and these dependencies are automatically added as inputs to "
-"the build processes that use them."
+"Gexps carry information about the packages or derivations they refer to, and "
+"these dependencies are automatically added as inputs to the build processes "
+"that use them."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:4876 doc/guix.texi:5342
+#: doc/guix.texi:4876 doc/guix.texi:5346
 #, no-wrap
 msgid "lowering, of high-level objects in gexps"
 msgstr ""
@@ -9789,10 +12123,13 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:4886
 msgid ""
-"This mechanism is not limited to package and derivation objects: @dfn{compilers} able to ``lower'' other high-level objects to "
-"derivations or files in the store can be defined, such that these objects can also be inserted into gexps.  For example, a useful "
-"type of high-level objects that can be inserted in a gexp is ``file-like objects'', which make it easy to add files to the store and "
-"to refer to them in derivations and such (see @code{local-file} and @code{plain-file} below.)"
+"This mechanism is not limited to package and derivation objects: "
+"@dfn{compilers} able to ``lower'' other high-level objects to derivations or "
+"files in the store can be defined, such that these objects can also be "
+"inserted into gexps.  For example, a useful type of high-level objects that "
+"can be inserted in a gexp is ``file-like objects'', which make it easy to "
+"add files to the store and to refer to them in derivations and such (see "
+"@code{local-file} and @code{plain-file} below.)"
 msgstr ""
 
 #. type: Plain text
@@ -9815,8 +12152,9 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:4901
 msgid ""
-"This gexp can be passed to @code{gexp->derivation}; we obtain a derivation that builds a directory containing exactly one symlink to "
-"@file{/gnu/store/@dots{}-coreutils-8.22/bin/ls}:"
+"This gexp can be passed to @code{gexp->derivation}; we obtain a derivation "
+"that builds a directory containing exactly one symlink to @file{/gnu/store/"
+"@dots{}-coreutils-8.22/bin/ls}:"
 msgstr ""
 
 #. type: example
@@ -9828,9 +12166,12 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:4912
 msgid ""
-"As one would expect, the @code{\"/gnu/store/@dots{}-coreutils-8.22\"} string is substituted to the reference to the @var{coreutils} "
-"package in the actual build code, and @var{coreutils} is automatically made an input to the derivation.  Likewise, @code{#$output} "
-"(equivalent to @code{(ungexp output)}) is replaced by a string containing the directory name of the output of the derivation."
+"As one would expect, the @code{\"/gnu/store/@dots{}-coreutils-8.22\"} string "
+"is substituted to the reference to the @var{coreutils} package in the actual "
+"build code, and @var{coreutils} is automatically made an input to the "
+"derivation.  Likewise, @code{#$output} (equivalent to @code{(ungexp "
+"output)}) is replaced by a string containing the directory name of the "
+"output of the derivation."
 msgstr ""
 
 #. type: cindex
@@ -9842,9 +12183,11 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:4919
 msgid ""
-"In a cross-compilation context, it is useful to distinguish between references to the @emph{native} build of a package---that can "
-"run on the host---versus references to cross builds of a package.  To that end, the @code{#+} plays the same role as @code{#$}, but "
-"is a reference to a native package build:"
+"In a cross-compilation context, it is useful to distinguish between "
+"references to the @emph{native} build of a package---that can run on the "
+"host---versus references to cross builds of a package.  To that end, the "
+"@code{#+} plays the same role as @code{#$}, but is a reference to a native "
+"package build:"
 msgstr ""
 
 #. type: example
@@ -9864,8 +12207,9 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:4935
 msgid ""
-"In the example above, the native build of @var{coreutils} is used, so that @command{ln} can actually run on the host; but then the "
-"cross-compiled build of @var{emacs} is referenced."
+"In the example above, the native build of @var{coreutils} is used, so that "
+"@command{ln} can actually run on the host; but then the cross-compiled build "
+"of @var{emacs} is referenced."
 msgstr ""
 
 #. type: cindex
@@ -9883,9 +12227,10 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:4942
 msgid ""
-"Another gexp feature is @dfn{imported modules}: sometimes you want to be able to use certain Guile modules from the ``host "
-"environment'' in the gexp, so those modules should be imported in the ``build environment''.  The @code{with-imported-modules} form "
-"allows you to express that:"
+"Another gexp feature is @dfn{imported modules}: sometimes you want to be "
+"able to use certain Guile modules from the ``host environment'' in the gexp, "
+"so those modules should be imported in the ``build environment''.  The "
+"@code{with-imported-modules} form allows you to express that:"
 msgstr ""
 
 #. type: example
@@ -9906,8 +12251,9 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:4959
 msgid ""
-"In this example, the @code{(guix build utils)} module is automatically pulled into the isolated build environment of our gexp, such "
-"that @code{(use-modules (guix build utils))} works as expected."
+"In this example, the @code{(guix build utils)} module is automatically "
+"pulled into the isolated build environment of our gexp, such that @code{(use-"
+"modules (guix build utils))} works as expected."
 msgstr ""
 
 #. type: cindex
@@ -9925,10 +12271,12 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:4968
 msgid ""
-"Usually you want the @emph{closure} of the module to be imported---i.e., the module itself and all the modules it depends on---"
-"rather than just the module; failing to do that, attempts to use the module will fail because of missing dependent modules.  The "
-"@code{source-module-closure} procedure computes the closure of a module by looking at its source file headers, which comes in handy "
-"in this case:"
+"Usually you want the @emph{closure} of the module to be imported---i.e., the "
+"module itself and all the modules it depends on---rather than just the "
+"module; failing to do that, attempts to use the module will fail because of "
+"missing dependent modules.  The @code{source-module-closure} procedure "
+"computes the closure of a module by looking at its source file headers, "
+"which comes in handy in this case:"
 msgstr ""
 
 #. type: example
@@ -9972,7 +12320,9 @@ msgstr ""
 
 #. type: deffn
 #: doc/guix.texi:4988
-msgid "Return a G-expression containing @var{exp}.  @var{exp} may contain one or more of the following forms:"
+msgid ""
+"Return a G-expression containing @var{exp}.  @var{exp} may contain one or "
+"more of the following forms:"
 msgstr ""
 
 #. type: item
@@ -9990,18 +12340,24 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:4996
 msgid ""
-"Introduce a reference to @var{obj}.  @var{obj} may have one of the supported types, for example a package or a derivation, in which "
-"case the @code{ungexp} form is replaced by its output file name---e.g., @code{\"/gnu/store/@dots{}-coreutils-8.22}."
+"Introduce a reference to @var{obj}.  @var{obj} may have one of the supported "
+"types, for example a package or a derivation, in which case the "
+"@code{ungexp} form is replaced by its output file name---e.g., @code{\"/gnu/"
+"store/@dots{}-coreutils-8.22}."
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:4999
-msgid "If @var{obj} is a list, it is traversed and references to supported objects are substituted similarly."
+msgid ""
+"If @var{obj} is a list, it is traversed and references to supported objects "
+"are substituted similarly."
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:5002
-msgid "If @var{obj} is another gexp, its contents are inserted and its dependencies are added to those of the containing gexp."
+msgid ""
+"If @var{obj} is another gexp, its contents are inserted and its dependencies "
+"are added to those of the containing gexp."
 msgstr ""
 
 #. type: table
@@ -10024,8 +12380,9 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:5010
 msgid ""
-"This is like the form above, but referring explicitly to the @var{output} of @var{obj}---this is useful when @var{obj} produces "
-"multiple outputs (@pxref{Packages with Multiple Outputs})."
+"This is like the form above, but referring explicitly to the @var{output} of "
+"@var{obj}---this is useful when @var{obj} produces multiple outputs "
+"(@pxref{Packages with Multiple Outputs})."
 msgstr ""
 
 #. type: item
@@ -10055,7 +12412,8 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:5017
 msgid ""
-"Same as @code{ungexp}, but produces a reference to the @emph{native} build of @var{obj} when used in a cross compilation context."
+"Same as @code{ungexp}, but produces a reference to the @emph{native} build "
+"of @var{obj} when used in a cross compilation context."
 msgstr ""
 
 #. type: item
@@ -10072,7 +12430,9 @@ msgstr ""
 
 #. type: table
 #: doc/guix.texi:5022
-msgid "Insert a reference to derivation output @var{output}, or to the main output when @var{output} is omitted."
+msgid ""
+"Insert a reference to derivation output @var{output}, or to the main output "
+"when @var{output} is omitted."
 msgstr ""
 
 #. type: table
@@ -10094,7 +12454,9 @@ msgstr ""
 
 #. type: table
 #: doc/guix.texi:5029
-msgid "Like the above, but splices the contents of @var{lst} inside the containing list."
+msgid ""
+"Like the above, but splices the contents of @var{lst} inside the containing "
+"list."
 msgstr ""
 
 #. type: item
@@ -10111,12 +12473,16 @@ msgstr ""
 
 #. type: table
 #: doc/guix.texi:5034
-msgid "Like the above, but refers to native builds of the objects listed in @var{lst}."
+msgid ""
+"Like the above, but refers to native builds of the objects listed in "
+"@var{lst}."
 msgstr ""
 
 #. type: deffn
 #: doc/guix.texi:5039
-msgid "G-expressions created by @code{gexp} or @code{#~} are run-time objects of the @code{gexp?} type (see below.)"
+msgid ""
+"G-expressions created by @code{gexp} or @code{#~} are run-time objects of "
+"the @code{gexp?} type (see below.)"
 msgstr ""
 
 #. type: deffn
@@ -10127,14 +12493,17 @@ msgstr ""
 
 #. type: deffn
 #: doc/guix.texi:5044
-msgid "Mark the gexps defined in @var{body}@dots{} as requiring @var{modules} in their execution environment."
+msgid ""
+"Mark the gexps defined in @var{body}@dots{} as requiring @var{modules} in "
+"their execution environment."
 msgstr ""
 
 #. type: deffn
 #: doc/guix.texi:5048
 msgid ""
-"Each item in @var{modules} can be the name of a module, such as @code{(guix build utils)}, or it can be a module name, followed by "
-"an arrow, followed by a file-like object:"
+"Each item in @var{modules} can be the name of a module, such as @code{(guix "
+"build utils)}, or it can be a module name, followed by an arrow, followed by "
+"a file-like object:"
 msgstr ""
 
 #. type: example
@@ -10150,15 +12519,16 @@ msgstr ""
 #. type: deffn
 #: doc/guix.texi:5059
 msgid ""
-"In the example above, the first two modules are taken from the search path, and the last one is created from the given file-like "
-"object."
+"In the example above, the first two modules are taken from the search path, "
+"and the last one is created from the given file-like object."
 msgstr ""
 
 #. type: deffn
 #: doc/guix.texi:5063
 msgid ""
-"This form has @emph{lexical} scope: it has an effect on the gexps directly defined in @var{body}@dots{}, but not on those defined, "
-"say, in procedures called from @var{body}@dots{}."
+"This form has @emph{lexical} scope: it has an effect on the gexps directly "
+"defined in @var{body}@dots{}, but not on those defined, say, in procedures "
+"called from @var{body}@dots{}."
 msgstr ""
 
 #. type: deffn
@@ -10175,8 +12545,10 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:5073
 msgid ""
-"G-expressions are meant to be written to disk, either as code building some derivation, or as plain files in the store.  The monadic "
-"procedures below allow you to do that (@pxref{The Store Monad}, for more information about monads.)"
+"G-expressions are meant to be written to disk, either as code building some "
+"derivation, or as plain files in the store.  The monadic procedures below "
+"allow you to do that (@pxref{The Store Monad}, for more information about "
+"monads.)"
 msgstr ""
 
 #. type: deffn
@@ -10188,31 +12560,41 @@ msgstr ""
 #. type: deffn
 #: doc/guix.texi:5090
 msgid ""
-"[#:system (%current-system)] [#:target #f] [#:graft? #t] @ [#:hash #f] [#:hash-algo #f] @ [#:recursive? #f] [#:env-vars '()] [#:"
-"modules '()] @ [#:module-path @var{%load-path}] @ [#:references-graphs #f] [#:allowed-references #f] @ [#:disallowed-references #f] "
-"@ [#:leaked-env-vars #f] @ [#:script-name (string-append @var{name} \"-builder\")] @ [#:deprecation-warnings #f] @ [#:local-build? "
-"#f] [#:substitutable? #t] [#:guile-for-build #f] Return a derivation @var{name} that runs @var{exp} (a gexp) with @var{guile-for-"
-"build} (a derivation) on @var{system}; @var{exp} is stored in a file called @var{script-name}.  When @var{target} is true, it is "
-"used as the cross-compilation target triplet for packages referred to by @var{exp}."
+"[#:system (%current-system)] [#:target #f] [#:graft? #t] @ [#:hash #f] [#:"
+"hash-algo #f] @ [#:recursive? #f] [#:env-vars '()] [#:modules '()] @ [#:"
+"module-path @var{%load-path}] @ [#:references-graphs #f] [#:allowed-"
+"references #f] @ [#:disallowed-references #f] @ [#:leaked-env-vars #f] @ [#:"
+"script-name (string-append @var{name} \"-builder\")] @ [#:deprecation-"
+"warnings #f] @ [#:local-build? #f] [#:substitutable? #t] [#:guile-for-build "
+"#f] Return a derivation @var{name} that runs @var{exp} (a gexp) with "
+"@var{guile-for-build} (a derivation) on @var{system}; @var{exp} is stored in "
+"a file called @var{script-name}.  When @var{target} is true, it is used as "
+"the cross-compilation target triplet for packages referred to by @var{exp}."
 msgstr ""
 
 #. type: deffn
 #: doc/guix.texi:5098
 msgid ""
-"@var{modules} is deprecated in favor of @code{with-imported-modules}.  Its meaning is to make @var{modules} available in the "
-"evaluation context of @var{exp}; @var{modules} is a list of names of Guile modules searched in @var{module-path} to be copied in the "
-"store, compiled, and made available in the load path during the execution of @var{exp}---e.g., @code{((guix build utils) (guix build "
-"gnu-build-system))}."
+"@var{modules} is deprecated in favor of @code{with-imported-modules}.  Its "
+"meaning is to make @var{modules} available in the evaluation context of "
+"@var{exp}; @var{modules} is a list of names of Guile modules searched in "
+"@var{module-path} to be copied in the store, compiled, and made available in "
+"the load path during the execution of @var{exp}---e.g., @code{((guix build "
+"utils) (guix build gnu-build-system))}."
 msgstr ""
 
 #. type: deffn
 #: doc/guix.texi:5101
-msgid "@var{graft?} determines whether packages referred to by @var{exp} should be grafted when applicable."
+msgid ""
+"@var{graft?} determines whether packages referred to by @var{exp} should be "
+"grafted when applicable."
 msgstr ""
 
 #. type: deffn
 #: doc/guix.texi:5104
-msgid "When @var{references-graphs} is true, it must be a list of tuples of one of the following forms:"
+msgid ""
+"When @var{references-graphs} is true, it must be a list of tuples of one of "
+"the following forms:"
 msgstr ""
 
 #. type: example
@@ -10229,23 +12611,28 @@ msgstr ""
 #. type: deffn
 #: doc/guix.texi:5117
 msgid ""
-"The right-hand-side of each element of @var{references-graphs} is automatically made an input of the build process of @var{exp}.  In "
-"the build environment, each @var{file-name} contains the reference graph of the corresponding item, in a simple text format."
+"The right-hand-side of each element of @var{references-graphs} is "
+"automatically made an input of the build process of @var{exp}.  In the build "
+"environment, each @var{file-name} contains the reference graph of the "
+"corresponding item, in a simple text format."
 msgstr ""
 
 #. type: deffn
 #: doc/guix.texi:5123
 msgid ""
-"@var{allowed-references} must be either @code{#f} or a list of output names and packages.  In the latter case, the list denotes "
-"store items that the result is allowed to refer to.  Any reference to another store item will lead to a build error.  Similarly for "
-"@var{disallowed-references}, which can list items that must not be referenced by the outputs."
+"@var{allowed-references} must be either @code{#f} or a list of output names "
+"and packages.  In the latter case, the list denotes store items that the "
+"result is allowed to refer to.  Any reference to another store item will "
+"lead to a build error.  Similarly for @var{disallowed-references}, which can "
+"list items that must not be referenced by the outputs."
 msgstr ""
 
 #. type: deffn
 #: doc/guix.texi:5126
 msgid ""
-"@var{deprecation-warnings} determines whether to show deprecation warnings while compiling modules.  It can be @code{#f}, @code{#t}, "
-"or @code{'detailed}."
+"@var{deprecation-warnings} determines whether to show deprecation warnings "
+"while compiling modules.  It can be @code{#f}, @code{#t}, or "
+"@code{'detailed}."
 msgstr ""
 
 #. type: deffn
@@ -10262,9 +12649,10 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:5135
 msgid ""
-"The @code{local-file}, @code{plain-file}, @code{computed-file}, @code{program-file}, and @code{scheme-file} procedures below return "
-"@dfn{file-like objects}.  That is, when unquoted in a G-expression, these objects lead to a file in the store.  Consider this G-"
-"expression:"
+"The @code{local-file}, @code{plain-file}, @code{computed-file}, "
+"@code{program-file}, and @code{scheme-file} procedures below return "
+"@dfn{file-like objects}.  That is, when unquoted in a G-expression, these "
+"objects lead to a file in the store.  Consider this G-expression:"
 msgstr ""
 
 #. type: example
@@ -10278,10 +12666,12 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:5148
 msgid ""
-"The effect here is to ``intern'' @file{/tmp/my-nscd.conf} by copying it to the store.  Once expanded, for instance @i{via} "
-"@code{gexp->derivation}, the G-expression refers to that copy under @file{/gnu/store}; thus, modifying or removing the file in "
-"@file{/tmp} does not have any effect on what the G-expression does.  @code{plain-file} can be used similarly; it differs in that the "
-"file content is directly passed as a string."
+"The effect here is to ``intern'' @file{/tmp/my-nscd.conf} by copying it to "
+"the store.  Once expanded, for instance @i{via} @code{gexp->derivation}, the "
+"G-expression refers to that copy under @file{/gnu/store}; thus, modifying or "
+"removing the file in @file{/tmp} does not have any effect on what the G-"
+"expression does.  @code{plain-file} can be used similarly; it differs in "
+"that the file content is directly passed as a string."
 msgstr ""
 
 #. type: deffn
@@ -10293,15 +12683,18 @@ msgstr ""
 #. type: deffn
 #: doc/guix.texi:5155
 msgid ""
-"[#:recursive? #f] [#:select? (const #t)] Return an object representing local file @var{file} to add to the store; this object can be "
-"used in a gexp.  If @var{file} is a relative file name, it is looked up relative to the source file where this form appears.  "
-"@var{file} will be added to the store under @var{name}--by default the base name of @var{file}."
+"[#:recursive? #f] [#:select? (const #t)] Return an object representing local "
+"file @var{file} to add to the store; this object can be used in a gexp.  If "
+"@var{file} is a relative file name, it is looked up relative to the source "
+"file where this form appears.  @var{file} will be added to the store under "
+"@var{name}--by default the base name of @var{file}."
 msgstr ""
 
 #. type: deffn
 #: doc/guix.texi:5167
 msgid ""
-"This is the declarative counterpart of the @code{interned-file} monadic procedure (@pxref{The Store Monad, @code{interned-file}})."
+"This is the declarative counterpart of the @code{interned-file} monadic "
+"procedure (@pxref{The Store Monad, @code{interned-file}})."
 msgstr ""
 
 #. type: deffn
@@ -10312,7 +12705,9 @@ msgstr ""
 
 #. type: deffn
 #: doc/guix.texi:5172
-msgid "Return an object representing a text file called @var{name} with the given @var{content} (a string) to be added to the store."
+msgid ""
+"Return an object representing a text file called @var{name} with the given "
+"@var{content} (a string) to be added to the store."
 msgstr ""
 
 #. type: deffn
@@ -10329,8 +12724,9 @@ msgstr ""
 #. type: deffn
 #: doc/guix.texi:5181
 msgid ""
-"[#:options '(#:local-build? #t)] Return an object representing the store item @var{name}, a file or directory computed by "
-"@var{gexp}.  @var{options} is a list of additional arguments to pass to @code{gexp->derivation}."
+"[#:options '(#:local-build? #t)] Return an object representing the store "
+"item @var{name}, a file or directory computed by @var{gexp}.  @var{options} "
+"is a list of additional arguments to pass to @code{gexp->derivation}."
 msgstr ""
 
 #. type: deffn
@@ -10347,13 +12743,17 @@ msgstr ""
 #. type: deffn
 #: doc/guix.texi:5190
 msgid ""
-"[#:guile (default-guile)] [#:module-path %load-path] Return an executable script @var{name} that runs @var{exp} using @var{guile}, "
-"with @var{exp}'s imported modules in its search path.  Look up @var{exp}'s modules in @var{module-path}."
+"[#:guile (default-guile)] [#:module-path %load-path] Return an executable "
+"script @var{name} that runs @var{exp} using @var{guile}, with @var{exp}'s "
+"imported modules in its search path.  Look up @var{exp}'s modules in "
+"@var{module-path}."
 msgstr ""
 
 #. type: deffn
 #: doc/guix.texi:5193
-msgid "The example below builds a script that simply invokes the @command{ls} command:"
+msgid ""
+"The example below builds a script that simply invokes the @command{ls} "
+"command:"
 msgstr ""
 
 #. type: example
@@ -10376,8 +12776,9 @@ msgstr ""
 #. type: deffn
 #: doc/guix.texi:5205
 msgid ""
-"When ``running'' it through the store (@pxref{The Store Monad, @code{run-with-store}}), we obtain a derivation that produces an "
-"executable file @file{/gnu/store/@dots{}-list-files} along these lines:"
+"When ``running'' it through the store (@pxref{The Store Monad, @code{run-"
+"with-store}}), we obtain a derivation that produces an executable file "
+"@file{/gnu/store/@dots{}-list-files} along these lines:"
 msgstr ""
 
 #. type: example
@@ -10398,8 +12799,10 @@ msgstr ""
 #. type: deffn
 #: doc/guix.texi:5218
 msgid ""
-"[#:guile #f] [#:module-path %load-path] Return an object representing the executable store item @var{name} that runs @var{gexp}.  "
-"@var{guile} is the Guile package used to execute that script.  Imported modules of @var{gexp} are looked up in @var{module-path}."
+"[#:guile #f] [#:module-path %load-path] Return an object representing the "
+"executable store item @var{name} that runs @var{gexp}.  @var{guile} is the "
+"Guile package used to execute that script.  Imported modules of @var{gexp} "
+"are looked up in @var{module-path}."
 msgstr ""
 
 #. type: deffn
@@ -10414,57 +12817,72 @@ msgid "{Monadic Procedure} gexp->file @var{name} @var{exp} @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:5230
+#: doc/guix.texi:5229
 msgid ""
-"[#:set-load-path? #t] [#:module-path %load-path] @ [#:guile (default-guile)] Return a derivation that builds a file @var{name} "
-"containing @var{exp}.  When @var{set-load-path?} is true, emit code in the resulting file to set @code{%load-path} and @code{%load-"
-"compiled-path} to honor @var{exp}'s imported modules.  Look up @var{exp}'s modules in @var{module-path}."
+"[#:set-load-path? #t] [#:module-path %load-path] @ [#:splice? #f] @ [#:guile "
+"(default-guile)] Return a derivation that builds a file @var{name} "
+"containing @var{exp}.  When @var{splice?} is true, @var{exp} is considered "
+"to be a list of expressions that will be spliced in the resulting file."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:5233
-msgid "The resulting file holds references to all the dependencies of @var{exp} or a subset thereof."
+#: doc/guix.texi:5234
+msgid ""
+"When @var{set-load-path?} is true, emit code in the resulting file to set "
+"@code{%load-path} and @code{%load-compiled-path} to honor @var{exp}'s "
+"imported modules.  Look up @var{exp}'s modules in @var{module-path}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:5235
-#, no-wrap
-msgid "{Scheme Procedure} scheme-file @var{name} @var{exp}"
+#: doc/guix.texi:5237
+msgid ""
+"The resulting file holds references to all the dependencies of @var{exp} or "
+"a subset thereof."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:5238
-msgid "Return an object representing the Scheme file @var{name} that contains @var{exp}."
+#: doc/guix.texi:5239
+#, fuzzy, no-wrap
+msgid "{Scheme Procedure} scheme-file @var{name} @var{exp} [#:splice? #f]"
+msgstr "{Scheme Procedure} derivation @var{store} @var{name} @var{builder} @"
+
+#. type: deffn
+#: doc/guix.texi:5242
+msgid ""
+"Return an object representing the Scheme file @var{name} that contains "
+"@var{exp}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:5240
+#: doc/guix.texi:5244
 msgid "This is the declarative counterpart of @code{gexp->file}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:5242
+#: doc/guix.texi:5246
 #, no-wrap
 msgid "{Monadic Procedure} text-file* @var{name} @var{text} @dots{}"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:5248
+#: doc/guix.texi:5252
 msgid ""
-"Return as a monadic value a derivation that builds a text file containing all of @var{text}.  @var{text} may list, in addition to "
-"strings, objects of any type that can be used in a gexp: packages, derivations, local file objects, etc.  The resulting store file "
-"holds references to all these."
+"Return as a monadic value a derivation that builds a text file containing "
+"all of @var{text}.  @var{text} may list, in addition to strings, objects of "
+"any type that can be used in a gexp: packages, derivations, local file "
+"objects, etc.  The resulting store file holds references to all these."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:5253
+#: doc/guix.texi:5257
 msgid ""
-"This variant should be preferred over @code{text-file} anytime the file to create will reference items from the store.  This is "
-"typically the case when building a configuration file that embeds store file names, like this:"
+"This variant should be preferred over @code{text-file} anytime the file to "
+"create will reference items from the store.  This is typically the case when "
+"building a configuration file that embeds store file names, like this:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:5261
+#: doc/guix.texi:5265
 #, no-wrap
 msgid ""
 "(define (profile.sh)\n"
@@ -10476,27 +12894,28 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:5266
+#: doc/guix.texi:5270
 msgid ""
-"In this example, the resulting @file{/gnu/store/@dots{}-profile.sh} file will reference @var{coreutils}, @var{grep}, and @var{sed}, "
-"thereby preventing them from being garbage-collected during its lifetime."
+"In this example, the resulting @file{/gnu/store/@dots{}-profile.sh} file "
+"will reference @var{coreutils}, @var{grep}, and @var{sed}, thereby "
+"preventing them from being garbage-collected during its lifetime."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:5268
+#: doc/guix.texi:5272
 #, no-wrap
 msgid "{Scheme Procedure} mixed-text-file @var{name} @var{text} @dots{}"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:5272
+#: doc/guix.texi:5276
 msgid ""
-"Return an object representing store file @var{name} containing @var{text}.  @var{text} is a sequence of strings and file-like "
-"objects, as in:"
+"Return an object representing store file @var{name} containing @var{text}.  "
+"@var{text} is a sequence of strings and file-like objects, as in:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:5276
+#: doc/guix.texi:5280
 #, no-wrap
 msgid ""
 "(mixed-text-file \"profile\"\n"
@@ -10504,26 +12923,27 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:5279
+#: doc/guix.texi:5283
 msgid "This is the declarative counterpart of @code{text-file*}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:5281
+#: doc/guix.texi:5285
 #, no-wrap
 msgid "{Scheme Procedure} file-union @var{name} @var{files}"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:5286
+#: doc/guix.texi:5290
 msgid ""
-"Return a @code{<computed-file>} that builds a directory containing all of @var{files}.  Each item in @var{files} must be a two-"
-"element list where the first element is the file name to use in the new directory, and the second element is a gexp denoting the "
-"target file.  Here's an example:"
+"Return a @code{<computed-file>} that builds a directory containing all of "
+"@var{files}.  Each item in @var{files} must be a two-element list where the "
+"first element is the file name to use in the new directory, and the second "
+"element is a gexp denoting the target file.  Here's an example:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:5293
+#: doc/guix.texi:5297
 #, no-wrap
 msgid ""
 "(file-union \"etc\"\n"
@@ -10534,54 +12954,57 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:5296
+#: doc/guix.texi:5300
 msgid "This yields an @code{etc} directory containing these two files."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:5298
+#: doc/guix.texi:5302
 #, no-wrap
 msgid "{Scheme Procedure} directory-union @var{name} @var{things}"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:5301
+#: doc/guix.texi:5305
 msgid ""
-"Return a directory that is the union of @var{things}, where @var{things} is a list of file-like objects denoting directories.  For "
-"example:"
+"Return a directory that is the union of @var{things}, where @var{things} is "
+"a list of file-like objects denoting directories.  For example:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:5304
+#: doc/guix.texi:5308
 #, no-wrap
 msgid "(directory-union \"guile+emacs\" (list guile emacs))\n"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:5307
-msgid "yields a directory that is the union of the @code{guile} and @code{emacs} packages."
+#: doc/guix.texi:5311
+msgid ""
+"yields a directory that is the union of the @code{guile} and @code{emacs} "
+"packages."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:5309
+#: doc/guix.texi:5313
 #, no-wrap
 msgid "{Scheme Procedure} file-append @var{obj} @var{suffix} @dots{}"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:5313
+#: doc/guix.texi:5317
 msgid ""
-"Return a file-like object that expands to the concatenation of @var{obj} and @var{suffix}, where @var{obj} is a lowerable object and "
-"each @var{suffix} is a string."
+"Return a file-like object that expands to the concatenation of @var{obj} and "
+"@var{suffix}, where @var{obj} is a lowerable object and each @var{suffix} is "
+"a string."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:5315
+#: doc/guix.texi:5319
 msgid "As an example, consider this gexp:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:5320
+#: doc/guix.texi:5324
 #, no-wrap
 msgid ""
 "(gexp->script \"run-uname\"\n"
@@ -10590,12 +13013,12 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:5323
+#: doc/guix.texi:5327
 msgid "The same effect could be achieved with:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:5328
+#: doc/guix.texi:5332
 #, no-wrap
 msgid ""
 "(gexp->script \"run-uname\"\n"
@@ -10604,102 +13027,112 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:5334
+#: doc/guix.texi:5338
 msgid ""
-"There is one difference though: in the @code{file-append} case, the resulting script contains the absolute file name as a string, "
-"whereas in the second case, the resulting script contains a @code{(string-append @dots{})} expression to construct the file name "
-"@emph{at run time}."
+"There is one difference though: in the @code{file-append} case, the "
+"resulting script contains the absolute file name as a string, whereas in the "
+"second case, the resulting script contains a @code{(string-append @dots{})} "
+"expression to construct the file name @emph{at run time}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:5341
+#: doc/guix.texi:5345
 msgid ""
-"Of course, in addition to gexps embedded in ``host'' code, there are also modules containing build tools.  To make it clear that "
-"they are meant to be used in the build stratum, these modules are kept in the @code{(guix build @dots{})} name space."
+"Of course, in addition to gexps embedded in ``host'' code, there are also "
+"modules containing build tools.  To make it clear that they are meant to be "
+"used in the build stratum, these modules are kept in the @code{(guix build "
+"@dots{})} name space."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:5347
+#: doc/guix.texi:5351
 msgid ""
-"Internally, high-level objects are @dfn{lowered}, using their compiler, to either derivations or store items.  For instance, "
-"lowering a package yields a derivation, and lowering a @code{plain-file} yields a store item.  This is achieved using the "
-"@code{lower-object} monadic procedure."
+"Internally, high-level objects are @dfn{lowered}, using their compiler, to "
+"either derivations or store items.  For instance, lowering a package yields "
+"a derivation, and lowering a @code{plain-file} yields a store item.  This is "
+"achieved using the @code{lower-object} monadic procedure."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:5348
+#: doc/guix.texi:5352
 #, no-wrap
 msgid "{Monadic Procedure} lower-object @var{obj} [@var{system}] @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:5354
+#: doc/guix.texi:5358
 msgid ""
-"[#:target #f] Return as a value in @var{%store-monad} the derivation or store item corresponding to @var{obj} for @var{system}, "
-"cross-compiling for @var{target} if @var{target} is true.  @var{obj} must be an object that has an associated gexp compiler, such as "
-"a @code{<package>}."
+"[#:target #f] Return as a value in @var{%store-monad} the derivation or "
+"store item corresponding to @var{obj} for @var{system}, cross-compiling for "
+"@var{target} if @var{target} is true.  @var{obj} must be an object that has "
+"an associated gexp compiler, such as a @code{<package>}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:5365
+#: doc/guix.texi:5369
 msgid ""
-"This section describes Guix command-line utilities.  Some of them are primarily targeted at developers and users who write new "
-"package definitions, while others are more generally useful.  They complement the Scheme programming interface of Guix in a "
-"convenient way."
+"This section describes Guix command-line utilities.  Some of them are "
+"primarily targeted at developers and users who write new package "
+"definitions, while others are more generally useful.  They complement the "
+"Scheme programming interface of Guix in a convenient way."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:5387
+#: doc/guix.texi:5391
 #, no-wrap
 msgid "package building"
 msgstr ""
 
 #. type: command{#1}
-#: doc/guix.texi:5388
+#: doc/guix.texi:5392
 #, no-wrap
 msgid "guix build"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:5394
+#: doc/guix.texi:5398
 msgid ""
-"The @command{guix build} command builds packages or derivations and their dependencies, and prints the resulting store paths.  Note "
-"that it does not modify the user's profile---this is the job of the @command{guix package} command (@pxref{Invoking guix package}).  "
-"Thus, it is mainly useful for distribution developers."
+"The @command{guix build} command builds packages or derivations and their "
+"dependencies, and prints the resulting store paths.  Note that it does not "
+"modify the user's profile---this is the job of the @command{guix package} "
+"command (@pxref{Invoking guix package}).  Thus, it is mainly useful for "
+"distribution developers."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:5396 doc/guix.texi:6053 doc/guix.texi:6120 doc/guix.texi:6789 doc/guix.texi:7119 doc/guix.texi:7449 doc/guix.texi:7754
-#: doc/guix.texi:7820 doc/guix.texi:7859
+#: doc/guix.texi:5400 doc/guix.texi:6057 doc/guix.texi:6124 doc/guix.texi:6793
+#: doc/guix.texi:7123 doc/guix.texi:7453 doc/guix.texi:7758 doc/guix.texi:7824
+#: doc/guix.texi:7863
 msgid "The general syntax is:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:5399
+#: doc/guix.texi:5403
 #, no-wrap
 msgid "guix build @var{options} @var{package-or-derivation}@dots{}\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:5404
+#: doc/guix.texi:5408
 msgid ""
-"As an example, the following command builds the latest versions of Emacs and of Guile, displays their build logs, and finally "
-"displays the resulting directories:"
+"As an example, the following command builds the latest versions of Emacs and "
+"of Guile, displays their build logs, and finally displays the resulting "
+"directories:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:5407
+#: doc/guix.texi:5411
 #, no-wrap
 msgid "guix build emacs guile\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:5410
+#: doc/guix.texi:5414
 msgid "Similarly, the following command builds all the available packages:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:5414
+#: doc/guix.texi:5418
 #, no-wrap
 msgid ""
 "guix build --quiet --keep-going \\\n"
@@ -10707,361 +13140,412 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:5422
+#: doc/guix.texi:5426
 msgid ""
-"@var{package-or-derivation} may be either the name of a package found in the software distribution such as @code{coreutils} or "
-"@code{coreutils@@8.20}, or a derivation such as @file{/gnu/store/@dots{}-coreutils-8.19.drv}.  In the former case, a package with "
-"the corresponding name (and optionally version) is searched for among the GNU distribution modules (@pxref{Package Modules})."
+"@var{package-or-derivation} may be either the name of a package found in the "
+"software distribution such as @code{coreutils} or @code{coreutils@@8.20}, or "
+"a derivation such as @file{/gnu/store/@dots{}-coreutils-8.19.drv}.  In the "
+"former case, a package with the corresponding name (and optionally version) "
+"is searched for among the GNU distribution modules (@pxref{Package Modules})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:5427
+#: doc/guix.texi:5431
 msgid ""
-"Alternatively, the @code{--expression} option may be used to specify a Scheme expression that evaluates to a package; this is useful "
-"when disambiguating among several same-named packages or package variants is needed."
+"Alternatively, the @code{--expression} option may be used to specify a "
+"Scheme expression that evaluates to a package; this is useful when "
+"disambiguating among several same-named packages or package variants is "
+"needed."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:5430
-msgid "There may be zero or more @var{options}.  The available options are described in the subsections below."
+#: doc/guix.texi:5434
+msgid ""
+"There may be zero or more @var{options}.  The available options are "
+"described in the subsections below."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:5445
+#: doc/guix.texi:5449
 msgid ""
-"A number of options that control the build process are common to @command{guix build} and other commands that can spawn builds, such "
-"as @command{guix package} or @command{guix archive}.  These are the following:"
+"A number of options that control the build process are common to "
+"@command{guix build} and other commands that can spawn builds, such as "
+"@command{guix package} or @command{guix archive}.  These are the following:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:5448
+#: doc/guix.texi:5452
 #, no-wrap
 msgid "--load-path=@var{directory}"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:5449
+#: doc/guix.texi:5453
 #, no-wrap
 msgid "-L @var{directory}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5452
-msgid "Add @var{directory} to the front of the package module search path (@pxref{Package Modules})."
+#: doc/guix.texi:5456
+msgid ""
+"Add @var{directory} to the front of the package module search path "
+"(@pxref{Package Modules})."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5455
-msgid "This allows users to define their own packages and make them visible to the command-line tools."
+#: doc/guix.texi:5459
+msgid ""
+"This allows users to define their own packages and make them visible to the "
+"command-line tools."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:5456
+#: doc/guix.texi:5460
 #, no-wrap
 msgid "--keep-failed"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:5457
+#: doc/guix.texi:5461
 #, no-wrap
 msgid "-K"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5463
+#: doc/guix.texi:5467
 msgid ""
-"Keep the build tree of failed builds.  Thus, if a build fails, its build tree is kept under @file{/tmp}, in a directory whose name "
-"is shown at the end of the build log.  This is useful when debugging build issues.  @xref{Debugging Build Failures}, for tips and "
-"tricks on how to debug build issues."
+"Keep the build tree of failed builds.  Thus, if a build fails, its build "
+"tree is kept under @file{/tmp}, in a directory whose name is shown at the "
+"end of the build log.  This is useful when debugging build issues.  "
+"@xref{Debugging Build Failures}, for tips and tricks on how to debug build "
+"issues."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:5464
+#: doc/guix.texi:5468
 #, no-wrap
 msgid "--keep-going"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:5465
+#: doc/guix.texi:5469
 #, no-wrap
 msgid "-k"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5468
-msgid "Keep going when some of the derivations fail to build; return only once all the builds have either completed or failed."
+#: doc/guix.texi:5472
+msgid ""
+"Keep going when some of the derivations fail to build; return only once all "
+"the builds have either completed or failed."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5471
-msgid "The default behavior is to stop as soon as one of the specified derivations has failed."
+#: doc/guix.texi:5475
+msgid ""
+"The default behavior is to stop as soon as one of the specified derivations "
+"has failed."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:5472
+#: doc/guix.texi:5476
 #, no-wrap
 msgid "--dry-run"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:5473
+#: doc/guix.texi:5477
 #, no-wrap
 msgid "-n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5475
+#: doc/guix.texi:5479
 msgid "Do not build the derivations."
 msgstr ""
 
 #. type: anchor{#1}
-#: doc/guix.texi:5477
+#: doc/guix.texi:5481
 msgid "fallback-option"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:5477
+#: doc/guix.texi:5481
 #, no-wrap
 msgid "--fallback"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5480
-msgid "When substituting a pre-built binary fails, fall back to building packages locally (@pxref{Substitution Failure})."
+#: doc/guix.texi:5484
+msgid ""
+"When substituting a pre-built binary fails, fall back to building packages "
+"locally (@pxref{Substitution Failure})."
 msgstr ""
 
 #. type: anchor{#1}
-#: doc/guix.texi:5486
+#: doc/guix.texi:5490
 msgid "client-substitute-urls"
 msgstr ""
 
-#. type: table
-#: doc/guix.texi:5486
-msgid ""
-"Consider @var{urls} the whitespace-separated list of substitute source URLs, overriding the default list of URLs of @command{guix-"
-"daemon} (@pxref{daemon-substitute-urls,, @command{guix-daemon} URLs})."
-msgstr ""
-
 #. type: table
 #: doc/guix.texi:5490
 msgid ""
-"This means that substitutes may be downloaded from @var{urls}, provided they are signed by a key authorized by the system "
-"administrator (@pxref{Substitutes})."
+"Consider @var{urls} the whitespace-separated list of substitute source URLs, "
+"overriding the default list of URLs of @command{guix-daemon} (@pxref{daemon-"
+"substitute-urls,, @command{guix-daemon} URLs})."
 msgstr ""
-"Cela signifie que les substituts peuvent être téléchargés depuis @var{urls}, tant qu'ils sont signés par une clef autorisée par "
-"l'administrateur système (@pxref{Substituts})."
 
 #. type: table
-#: doc/guix.texi:5493
-msgid "When @var{urls} is the empty string, substitutes are effectively disabled."
+#: doc/guix.texi:5494
+msgid ""
+"This means that substitutes may be downloaded from @var{urls}, provided they "
+"are signed by a key authorized by the system administrator "
+"(@pxref{Substitutes})."
+msgstr ""
+"Cela signifie que les substituts peuvent être téléchargés depuis @var{urls}, "
+"tant qu'ils sont signés par une clef autorisée par l'administrateur système "
+"(@pxref{Substituts})."
+
+#. type: table
+#: doc/guix.texi:5497
+msgid ""
+"When @var{urls} is the empty string, substitutes are effectively disabled."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:5499
+#: doc/guix.texi:5503
 #, no-wrap
 msgid "--no-grafts"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5503
+#: doc/guix.texi:5507
 msgid ""
-"Do not ``graft'' packages.  In practice, this means that package updates available as grafts are not applied.  @xref{Security "
-"Updates}, for more information on grafts."
+"Do not ``graft'' packages.  In practice, this means that package updates "
+"available as grafts are not applied.  @xref{Security Updates}, for more "
+"information on grafts."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:5504
+#: doc/guix.texi:5508
 #, no-wrap
 msgid "--rounds=@var{n}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5507
-msgid "Build each derivation @var{n} times in a row, and raise an error if consecutive build results are not bit-for-bit identical."
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:5512
+#: doc/guix.texi:5511
 msgid ""
-"This is a useful way to detect non-deterministic builds processes.  Non-deterministic build processes are a problem because they "
-"make it practically impossible for users to @emph{verify} whether third-party binaries are genuine.  @xref{Invoking guix challenge}, "
-"for more."
+"Build each derivation @var{n} times in a row, and raise an error if "
+"consecutive build results are not bit-for-bit identical."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5518
+#: doc/guix.texi:5516
 msgid ""
-"Note that, currently, the differing build results are not kept around, so you will have to manually investigate in case of an "
-"error---e.g., by stashing one of the build results with @code{guix archive --export} (@pxref{Invoking guix archive}), then "
-"rebuilding, and finally comparing the two results."
+"This is a useful way to detect non-deterministic builds processes.  Non-"
+"deterministic build processes are a problem because they make it practically "
+"impossible for users to @emph{verify} whether third-party binaries are "
+"genuine.  @xref{Invoking guix challenge}, for more."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5523
+#: doc/guix.texi:5522
 msgid ""
-"Do not attempt to offload builds @i{via} the ``build hook'' of the daemon (@pxref{Daemon Offload Setup}).  That is, always build "
-"things locally instead of offloading builds to remote machines."
+"Note that, currently, the differing build results are not kept around, so "
+"you will have to manually investigate in case of an error---e.g., by "
+"stashing one of the build results with @code{guix archive --export} "
+"(@pxref{Invoking guix archive}), then rebuilding, and finally comparing the "
+"two results."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5530
-msgid "By default, the daemon's setting is honored (@pxref{Invoking guix-daemon, @code{--max-silent-time}})."
+#: doc/guix.texi:5527
+msgid ""
+"Do not attempt to offload builds @i{via} the ``build hook'' of the daemon "
+"(@pxref{Daemon Offload Setup}).  That is, always build things locally "
+"instead of offloading builds to remote machines."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5537
-msgid "By default, the daemon's setting is honored (@pxref{Invoking guix-daemon, @code{--timeout}})."
+#: doc/guix.texi:5534
+msgid ""
+"By default, the daemon's setting is honored (@pxref{Invoking guix-daemon, "
+"@code{--max-silent-time}})."
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:5541
+msgid ""
+"By default, the daemon's setting is honored (@pxref{Invoking guix-daemon, "
+"@code{--timeout}})."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:5538
+#: doc/guix.texi:5542
 #, no-wrap
 msgid "--verbosity=@var{level}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5542
+#: doc/guix.texi:5546
 msgid ""
-"Use the given verbosity level.  @var{level} must be an integer between 0 and 5; higher means more verbose output.  Setting a level "
-"of 4 or more may be helpful when debugging setup issues with the build daemon."
+"Use the given verbosity level.  @var{level} must be an integer between 0 and "
+"5; higher means more verbose output.  Setting a level of 4 or more may be "
+"helpful when debugging setup issues with the build daemon."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5547
+#: doc/guix.texi:5551
 msgid ""
-"Allow the use of up to @var{n} CPU cores for the build.  The special value @code{0} means to use as many CPU cores as available."
+"Allow the use of up to @var{n} CPU cores for the build.  The special value "
+"@code{0} means to use as many CPU cores as available."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5553
+#: doc/guix.texi:5557
 msgid ""
-"Allow at most @var{n} build jobs in parallel.  @xref{Invoking guix-daemon, @code{--max-jobs}}, for details about this option and the "
-"equivalent @command{guix-daemon} option."
-msgstr ""
-
-#. type: Plain text
-#: doc/guix.texi:5560
-msgid ""
-"Behind the scenes, @command{guix build} is essentially an interface to the @code{package-derivation} procedure of the @code{(guix "
-"packages)} module, and to the @code{build-derivations} procedure of the @code{(guix derivations)} module."
+"Allow at most @var{n} build jobs in parallel.  @xref{Invoking guix-daemon, "
+"@code{--max-jobs}}, for details about this option and the equivalent "
+"@command{guix-daemon} option."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:5564
 msgid ""
-"In addition to options explicitly passed on the command line, @command{guix build} and other @command{guix} commands that support "
-"building honor the @code{GUIX_BUILD_OPTIONS} environment variable."
+"Behind the scenes, @command{guix build} is essentially an interface to the "
+"@code{package-derivation} procedure of the @code{(guix packages)} module, "
+"and to the @code{build-derivations} procedure of the @code{(guix "
+"derivations)} module."
+msgstr ""
+
+#. type: Plain text
+#: doc/guix.texi:5568
+msgid ""
+"In addition to options explicitly passed on the command line, @command{guix "
+"build} and other @command{guix} commands that support building honor the "
+"@code{GUIX_BUILD_OPTIONS} environment variable."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:5565
+#: doc/guix.texi:5569
 #, no-wrap
 msgid "{Environment Variable} GUIX_BUILD_OPTIONS"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:5570
+#: doc/guix.texi:5574
 msgid ""
-"Users can define this variable to a list of command line options that will automatically be used by @command{guix build} and other "
-"@command{guix} commands that can perform builds, as in the example below:"
+"Users can define this variable to a list of command line options that will "
+"automatically be used by @command{guix build} and other @command{guix} "
+"commands that can perform builds, as in the example below:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:5573
+#: doc/guix.texi:5577
 #, no-wrap
 msgid "$ export GUIX_BUILD_OPTIONS=\"--no-substitutes -c 2 -L /foo/bar\"\n"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:5577
-msgid "These options are parsed independently, and the result is appended to the parsed command-line options."
+#: doc/guix.texi:5581
+msgid ""
+"These options are parsed independently, and the result is appended to the "
+"parsed command-line options."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:5583
+#: doc/guix.texi:5587
 #, no-wrap
 msgid "package variants"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:5591
+#: doc/guix.texi:5595
 msgid ""
-"Another set of command-line options supported by @command{guix build} and also @command{guix package} are @dfn{package "
-"transformation options}.  These are options that make it possible to define @dfn{package variants}---for instance, packages built "
-"from different source code.  This is a convenient way to create customized packages on the fly without having to type in the "
+"Another set of command-line options supported by @command{guix build} and "
+"also @command{guix package} are @dfn{package transformation options}.  These "
+"are options that make it possible to define @dfn{package variants}---for "
+"instance, packages built from different source code.  This is a convenient "
+"way to create customized packages on the fly without having to type in the "
 "definitions of package variants (@pxref{Defining Packages})."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:5594
+#: doc/guix.texi:5598
 #, no-wrap
 msgid "--with-source=@var{source}"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:5595
+#: doc/guix.texi:5599
 #, no-wrap
 msgid "--with-source=@var{package}=@var{source}"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:5596
+#: doc/guix.texi:5600
 #, no-wrap
 msgid "--with-source=@var{package}@@@var{version}=@var{source}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5601
+#: doc/guix.texi:5605
 msgid ""
-"Use @var{source} as the source of @var{package}, and @var{version} as its version number.  @var{source} must be a file name or a "
-"URL, as for @command{guix download} (@pxref{Invoking guix download})."
+"Use @var{source} as the source of @var{package}, and @var{version} as its "
+"version number.  @var{source} must be a file name or a URL, as for "
+"@command{guix download} (@pxref{Invoking guix download})."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5607
+#: doc/guix.texi:5611
 msgid ""
-"When @var{package} is omitted, it is taken to be the package name specified on the command line that matches the base of "
-"@var{source}---e.g., if @var{source} is @code{/src/guile-2.0.10.tar.gz}, the corresponding package is @code{guile}."
+"When @var{package} is omitted, it is taken to be the package name specified "
+"on the command line that matches the base of @var{source}---e.g., if "
+"@var{source} is @code{/src/guile-2.0.10.tar.gz}, the corresponding package "
+"is @code{guile}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5610
+#: doc/guix.texi:5614
 msgid ""
-"Likewise, when @var{version} is omitted, the version string is inferred from @var{source}; in the previous example, it is "
-"@code{2.0.10}."
+"Likewise, when @var{version} is omitted, the version string is inferred from "
+"@var{source}; in the previous example, it is @code{2.0.10}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5615
+#: doc/guix.texi:5619
 msgid ""
-"This option allows users to try out versions of packages other than the one provided by the distribution.  The example below "
-"downloads @file{ed-1.7.tar.gz} from a GNU mirror and uses that as the source for the @code{ed} package:"
+"This option allows users to try out versions of packages other than the one "
+"provided by the distribution.  The example below downloads @file{ed-1.7.tar."
+"gz} from a GNU mirror and uses that as the source for the @code{ed} package:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:5618
+#: doc/guix.texi:5622
 #, no-wrap
 msgid "guix build ed --with-source=mirror://gnu/ed/ed-1.7.tar.gz\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5622
-msgid "As a developer, @code{--with-source} makes it easy to test release candidates:"
+#: doc/guix.texi:5626
+msgid ""
+"As a developer, @code{--with-source} makes it easy to test release "
+"candidates:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:5625
+#: doc/guix.texi:5629
 #, no-wrap
 msgid "guix build guile --with-source=../guile-2.0.9.219-e1bb7.tar.xz\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5628
+#: doc/guix.texi:5632
 msgid "@dots{} or to build from a checkout in a pristine environment:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:5632
+#: doc/guix.texi:5636
 #, no-wrap
 msgid ""
 "$ git clone git://git.sv.gnu.org/guix.git\n"
@@ -11069,217 +13553,239 @@ msgid ""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:5634
+#: doc/guix.texi:5638
 #, no-wrap
 msgid "--with-input=@var{package}=@var{replacement}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5639
+#: doc/guix.texi:5643
 msgid ""
-"Replace dependency on @var{package} by a dependency on @var{replacement}.  @var{package} must be a package name, and "
-"@var{replacement} must be a package specification such as @code{guile} or @code{guile@@1.8}."
+"Replace dependency on @var{package} by a dependency on @var{replacement}.  "
+"@var{package} must be a package name, and @var{replacement} must be a "
+"package specification such as @code{guile} or @code{guile@@1.8}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5643
+#: doc/guix.texi:5647
 msgid ""
-"For instance, the following command builds Guix, but replaces its dependency on the current stable version of Guile with a "
-"dependency on the legacy version of Guile, @code{guile@@2.0}:"
+"For instance, the following command builds Guix, but replaces its dependency "
+"on the current stable version of Guile with a dependency on the legacy "
+"version of Guile, @code{guile@@2.0}:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:5646
+#: doc/guix.texi:5650
 #, no-wrap
 msgid "guix build --with-input=guile=guile@@2.0 guix\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5651
+#: doc/guix.texi:5655
 msgid ""
-"This is a recursive, deep replacement.  So in this example, both @code{guix} and its dependency @code{guile-json} (which also "
-"depends on @code{guile}) get rebuilt against @code{guile@@2.0}."
+"This is a recursive, deep replacement.  So in this example, both @code{guix} "
+"and its dependency @code{guile-json} (which also depends on @code{guile}) "
+"get rebuilt against @code{guile@@2.0}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5654
+#: doc/guix.texi:5658
 msgid ""
-"This is implemented using the @code{package-input-rewriting} Scheme procedure (@pxref{Defining Packages, @code{package-input-"
-"rewriting}})."
+"This is implemented using the @code{package-input-rewriting} Scheme "
+"procedure (@pxref{Defining Packages, @code{package-input-rewriting}})."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:5655
+#: doc/guix.texi:5659
 #, no-wrap
 msgid "--with-graft=@var{package}=@var{replacement}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5661
+#: doc/guix.texi:5665
 msgid ""
-"This is similar to @code{--with-input} but with an important difference: instead of rebuilding the whole dependency chain, "
-"@var{replacement} is built and then @dfn{grafted} onto the binaries that were initially referring to @var{package}.  @xref{Security "
-"Updates}, for more information on grafts."
+"This is similar to @code{--with-input} but with an important difference: "
+"instead of rebuilding the whole dependency chain, @var{replacement} is built "
+"and then @dfn{grafted} onto the binaries that were initially referring to "
+"@var{package}.  @xref{Security Updates}, for more information on grafts."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5665
+#: doc/guix.texi:5669
 msgid ""
-"For example, the command below grafts version 3.5.4 of GnuTLS onto Wget and all its dependencies, replacing references to the "
-"version of GnuTLS they currently refer to:"
+"For example, the command below grafts version 3.5.4 of GnuTLS onto Wget and "
+"all its dependencies, replacing references to the version of GnuTLS they "
+"currently refer to:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:5668
+#: doc/guix.texi:5672
 #, no-wrap
 msgid "guix build --with-graft=gnutls=gnutls@@3.5.4 wget\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5677
+#: doc/guix.texi:5681
 msgid ""
-"This has the advantage of being much faster than rebuilding everything.  But there is a caveat: it works if and only if "
-"@var{package} and @var{replacement} are strictly compatible---for example, if they provide a library, the application binary "
-"interface (ABI) of those libraries must be compatible.  If @var{replacement} is somehow incompatible with @var{package}, then the "
-"resulting package may be unusable.  Use with care!"
+"This has the advantage of being much faster than rebuilding everything.  But "
+"there is a caveat: it works if and only if @var{package} and "
+"@var{replacement} are strictly compatible---for example, if they provide a "
+"library, the application binary interface (ABI) of those libraries must be "
+"compatible.  If @var{replacement} is somehow incompatible with "
+"@var{package}, then the resulting package may be unusable.  Use with care!"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:5685
-msgid "The command-line options presented below are specific to @command{guix build}."
+#: doc/guix.texi:5689
+msgid ""
+"The command-line options presented below are specific to @command{guix "
+"build}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:5688
+#: doc/guix.texi:5692
 #, no-wrap
 msgid "--quiet"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:5689
+#: doc/guix.texi:5693
 #, no-wrap
 msgid "-q"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5693
+#: doc/guix.texi:5697
 msgid ""
-"Build quietly, without displaying the build log.  Upon completion, the build log is kept in @file{/var} (or similar) and can always "
-"be retrieved using the @option{--log-file} option."
+"Build quietly, without displaying the build log.  Upon completion, the build "
+"log is kept in @file{/var} (or similar) and can always be retrieved using "
+"the @option{--log-file} option."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:5694
+#: doc/guix.texi:5698
 #, no-wrap
 msgid "--file=@var{file}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5699
-msgid "Build the package or derivation that the code within @var{file} evaluates to."
+#: doc/guix.texi:5703
+msgid ""
+"Build the package or derivation that the code within @var{file} evaluates to."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5702
-msgid "As an example, @var{file} might contain a package definition like this (@pxref{Defining Packages}):"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:5710
-msgid "Build the package or derivation @var{expr} evaluates to."
+#: doc/guix.texi:5706
+msgid ""
+"As an example, @var{file} might contain a package definition like this "
+"(@pxref{Defining Packages}):"
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:5714
-msgid ""
-"For example, @var{expr} may be @code{(@@ (gnu packages guile)  guile-1.8)}, which unambiguously designates this specific variant of "
-"version 1.8 of Guile."
+msgid "Build the package or derivation @var{expr} evaluates to."
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:5718
 msgid ""
-"Alternatively, @var{expr} may be a G-expression, in which case it is used as a build program passed to @code{gexp->derivation} "
-"(@pxref{G-Expressions})."
+"For example, @var{expr} may be @code{(@@ (gnu packages guile)  guile-1.8)}, "
+"which unambiguously designates this specific variant of version 1.8 of Guile."
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:5722
 msgid ""
-"Lastly, @var{expr} may refer to a zero-argument monadic procedure (@pxref{The Store Monad}).  The procedure must return a derivation "
-"as a monadic value, which is then passed through @code{run-with-store}."
+"Alternatively, @var{expr} may be a G-expression, in which case it is used as "
+"a build program passed to @code{gexp->derivation} (@pxref{G-Expressions})."
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:5726
+msgid ""
+"Lastly, @var{expr} may refer to a zero-argument monadic procedure "
+"(@pxref{The Store Monad}).  The procedure must return a derivation as a "
+"monadic value, which is then passed through @code{run-with-store}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:5723
+#: doc/guix.texi:5727
 #, no-wrap
 msgid "--source"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:5724
+#: doc/guix.texi:5728
 #, no-wrap
 msgid "-S"
 msgstr ""
 
-#. type: table
-#: doc/guix.texi:5727
-msgid "Build the source derivations of the packages, rather than the packages themselves."
-msgstr ""
-
 #. type: table
 #: doc/guix.texi:5731
 msgid ""
-"For instance, @code{guix build -S gcc} returns something like @file{/gnu/store/@dots{}-gcc-4.7.2.tar.bz2}, which is the GCC source "
-"tarball."
+"Build the source derivations of the packages, rather than the packages "
+"themselves."
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:5735
 msgid ""
-"The returned source tarball is the result of applying any patches and code snippets specified in the package @code{origin} "
-"(@pxref{Defining Packages})."
+"For instance, @code{guix build -S gcc} returns something like @file{/gnu/"
+"store/@dots{}-gcc-4.7.2.tar.bz2}, which is the GCC source tarball."
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:5739
+msgid ""
+"The returned source tarball is the result of applying any patches and code "
+"snippets specified in the package @code{origin} (@pxref{Defining Packages})."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:5736
+#: doc/guix.texi:5740
 #, no-wrap
 msgid "--sources"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5743
+#: doc/guix.texi:5747
 msgid ""
-"Fetch and return the source of @var{package-or-derivation} and all their dependencies, recursively.  This is a handy way to obtain a "
-"local copy of all the source code needed to build @var{packages}, allowing you to eventually build them even without network "
-"access.  It is an extension of the @code{--source} option and can accept one of the following optional argument values:"
+"Fetch and return the source of @var{package-or-derivation} and all their "
+"dependencies, recursively.  This is a handy way to obtain a local copy of "
+"all the source code needed to build @var{packages}, allowing you to "
+"eventually build them even without network access.  It is an extension of "
+"the @code{--source} option and can accept one of the following optional "
+"argument values:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:5745 doc/guix.texi:6970
+#: doc/guix.texi:5749 doc/guix.texi:6974
 #, no-wrap
 msgid "package"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5748
-msgid "This value causes the @code{--sources} option to behave in the same way as the @code{--source} option."
+#: doc/guix.texi:5752
+msgid ""
+"This value causes the @code{--sources} option to behave in the same way as "
+"the @code{--source} option."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:5749 doc/guix.texi:11749
+#: doc/guix.texi:5753 doc/guix.texi:11798
 #, no-wrap
 msgid "all"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5752
+#: doc/guix.texi:5756
 msgid ""
-"Build the source derivations of all packages, including any source that might be listed as @code{inputs}.  This is the default value."
+"Build the source derivations of all packages, including any source that "
+"might be listed as @code{inputs}.  This is the default value."
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:5758
+#: doc/guix.texi:5762
 #, no-wrap
 msgid ""
 "$ guix build --sources tzdata\n"
@@ -11289,20 +13795,21 @@ msgid ""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:5760
+#: doc/guix.texi:5764
 #, no-wrap
 msgid "transitive"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5764
+#: doc/guix.texi:5768
 msgid ""
-"Build the source derivations of all packages, as well of all transitive inputs to the packages.  This can be used e.g. to prefetch "
-"package source for later offline building."
+"Build the source derivations of all packages, as well of all transitive "
+"inputs to the packages.  This can be used e.g. to prefetch package source "
+"for later offline building."
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:5775
+#: doc/guix.texi:5779
 #, no-wrap
 msgid ""
 "$ guix build --sources=transitive tzdata\n"
@@ -11317,166 +13824,186 @@ msgid ""
 msgstr ""
 
 #. type: quotation
-#: doc/guix.texi:5788
+#: doc/guix.texi:5792
 msgid ""
-"The @code{--system} flag is for @emph{native} compilation and must not be confused with cross-compilation.  See @code{--target} "
-"below for information on cross-compilation."
+"The @code{--system} flag is for @emph{native} compilation and must not be "
+"confused with cross-compilation.  See @code{--target} below for information "
+"on cross-compilation."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5794
+#: doc/guix.texi:5798
 msgid ""
-"An example use of this is on Linux-based systems, which can emulate different personalities.  For instance, passing @code{--"
-"system=i686-linux} on an @code{x86_64-linux} system allows you to build packages in a complete 32-bit environment."
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:5799
-msgid ""
-"Similarly, when transparent emulation with QEMU and @code{binfmt_misc} is enabled (@pxref{Virtualization Services, @code{qemu-binfmt-"
-"service-type}}), you can build for any system for which a QEMU @code{binfmt_misc} handler is installed."
+"An example use of this is on Linux-based systems, which can emulate "
+"different personalities.  For instance, passing @code{--system=i686-linux} "
+"on an @code{x86_64-linux} system allows you to build packages in a complete "
+"32-bit environment."
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:5803
 msgid ""
-"Builds for a system other than that of the machine you are using can also be offloaded to a remote machine of the right "
-"architecture.  @xref{Daemon Offload Setup}, for more information on offloading."
+"Similarly, when transparent emulation with QEMU and @code{binfmt_misc} is "
+"enabled (@pxref{Virtualization Services, @code{qemu-binfmt-service-type}}), "
+"you can build for any system for which a QEMU @code{binfmt_misc} handler is "
+"installed."
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:5807
+msgid ""
+"Builds for a system other than that of the machine you are using can also be "
+"offloaded to a remote machine of the right architecture.  @xref{Daemon "
+"Offload Setup}, for more information on offloading."
 msgstr ""
 
 #. type: anchor{#1}
-#: doc/guix.texi:5811
+#: doc/guix.texi:5815
 msgid "build-check"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:5811
+#: doc/guix.texi:5815
 #, no-wrap
 msgid "--check"
 msgstr "--check"
 
 #. type: cindex
-#: doc/guix.texi:5812
+#: doc/guix.texi:5816
 #, no-wrap
 msgid "determinism, checking"
 msgstr "déterminisme, vérification"
 
 #. type: cindex
-#: doc/guix.texi:5813
+#: doc/guix.texi:5817
 #, no-wrap
 msgid "reproducibility, checking"
 msgstr "reproductibilité, vérification"
 
 #. type: table
-#: doc/guix.texi:5817
+#: doc/guix.texi:5821
 msgid ""
-"Rebuild @var{package-or-derivation}, which are already available in the store, and raise an error if the build results are not bit-"
-"for-bit identical."
+"Rebuild @var{package-or-derivation}, which are already available in the "
+"store, and raise an error if the build results are not bit-for-bit identical."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5822
+#: doc/guix.texi:5826
 msgid ""
-"This mechanism allows you to check whether previously installed substitutes are genuine (@pxref{Substitutes}), or whether the build "
-"result of a package is deterministic.  @xref{Invoking guix challenge}, for more background information and tools."
+"This mechanism allows you to check whether previously installed substitutes "
+"are genuine (@pxref{Substitutes}), or whether the build result of a package "
+"is deterministic.  @xref{Invoking guix challenge}, for more background "
+"information and tools."
 msgstr ""
-"Ce mécanisme vous permet de vérifier si les substituts précédemment installés sont authentiques (@pxref{Substituts}) ou si le "
-"résultat de la construction d'un paquet est déterministe. @xref{Invoking guix challenge} pour plus d'informations et pour les outils."
+"Ce mécanisme vous permet de vérifier si les substituts précédemment "
+"installés sont authentiques (@pxref{Substituts}) ou si le résultat de la "
+"construction d'un paquet est déterministe. @xref{Invoking guix challenge} "
+"pour plus d'informations et pour les outils."
 
 #. type: item
-#: doc/guix.texi:5827
+#: doc/guix.texi:5831
 #, no-wrap
 msgid "--repair"
 msgstr "--repair"
 
 #. type: cindex
-#: doc/guix.texi:5828
+#: doc/guix.texi:5832
 #, no-wrap
 msgid "repairing store items"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5832
-msgid "Attempt to repair the specified store items, if they are corrupt, by re-downloading or rebuilding them."
+#: doc/guix.texi:5836
+msgid ""
+"Attempt to repair the specified store items, if they are corrupt, by re-"
+"downloading or rebuilding them."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5834
+#: doc/guix.texi:5838
 msgid "This operation is not atomic and thus restricted to @code{root}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:5835
+#: doc/guix.texi:5839
 #, no-wrap
 msgid "--derivations"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5839
-msgid "Return the derivation paths, not the output paths, of the given packages."
+#: doc/guix.texi:5843
+msgid ""
+"Return the derivation paths, not the output paths, of the given packages."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:5840 doc/guix.texi:7227 doc/guix.texi:20563
+#: doc/guix.texi:5844 doc/guix.texi:7231 doc/guix.texi:20625
 #, no-wrap
 msgid "--root=@var{file}"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:5841 doc/guix.texi:7228 doc/guix.texi:20564
+#: doc/guix.texi:5845 doc/guix.texi:7232 doc/guix.texi:20626
 #, no-wrap
 msgid "-r @var{file}"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:5842
+#: doc/guix.texi:5846
 #, no-wrap
 msgid "GC roots, adding"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:5843
+#: doc/guix.texi:5847
 #, no-wrap
 msgid "garbage collector roots, adding"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5846 doc/guix.texi:20567
-msgid "Make @var{file} a symlink to the result, and register it as a garbage collector root."
+#: doc/guix.texi:5850 doc/guix.texi:20629
+msgid ""
+"Make @var{file} a symlink to the result, and register it as a garbage "
+"collector root."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5852
+#: doc/guix.texi:5856
 msgid ""
-"Consequently, the results of this @command{guix build} invocation are protected from garbage collection until @var{file} is "
-"removed.  When that option is omitted, build results are eligible for garbage collection as soon as the build completes.  "
-"@xref{Invoking guix gc}, for more on GC roots."
+"Consequently, the results of this @command{guix build} invocation are "
+"protected from garbage collection until @var{file} is removed.  When that "
+"option is omitted, build results are eligible for garbage collection as soon "
+"as the build completes.  @xref{Invoking guix gc}, for more on GC roots."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:5853
+#: doc/guix.texi:5857
 #, no-wrap
 msgid "--log-file"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:5854
+#: doc/guix.texi:5858
 #, no-wrap
 msgid "build logs, access"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5858
-msgid "Return the build log file names or URLs for the given @var{package-or-derivation}, or raise an error if build logs are missing."
+#: doc/guix.texi:5862
+msgid ""
+"Return the build log file names or URLs for the given @var{package-or-"
+"derivation}, or raise an error if build logs are missing."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5861
-msgid "This works regardless of how packages or derivations are specified.  For instance, the following invocations are equivalent:"
+#: doc/guix.texi:5865
+msgid ""
+"This works regardless of how packages or derivations are specified.  For "
+"instance, the following invocations are equivalent:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:5867
+#: doc/guix.texi:5871
 #, no-wrap
 msgid ""
 "guix build --log-file `guix build -d guile`\n"
@@ -11486,19 +14013,22 @@ msgid ""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5872
+#: doc/guix.texi:5876
 msgid ""
-"If a log is unavailable locally, and unless @code{--no-substitutes} is passed, the command looks for a corresponding log on one of "
-"the substitute servers (as specified with @code{--substitute-urls}.)"
+"If a log is unavailable locally, and unless @code{--no-substitutes} is "
+"passed, the command looks for a corresponding log on one of the substitute "
+"servers (as specified with @code{--substitute-urls}.)"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5875
-msgid "So for instance, imagine you want to see the build log of GDB on MIPS, but you are actually on an @code{x86_64} machine:"
+#: doc/guix.texi:5879
+msgid ""
+"So for instance, imagine you want to see the build log of GDB on MIPS, but "
+"you are actually on an @code{x86_64} machine:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:5879
+#: doc/guix.texi:5883
 #, no-wrap
 msgid ""
 "$ guix build --log-file gdb -s mips64el-linux\n"
@@ -11506,42 +14036,46 @@ msgid ""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5882
+#: doc/guix.texi:5886
 msgid "You can freely access a huge library of build logs!"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:5887
+#: doc/guix.texi:5891
 #, no-wrap
 msgid "build failures, debugging"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:5893
+#: doc/guix.texi:5897
 msgid ""
-"When defining a new package (@pxref{Defining Packages}), you will probably find yourself spending some time debugging and tweaking "
-"the build until it succeeds.  To do that, you need to operate the build commands yourself in an environment as close as possible to "
-"the one the build daemon uses."
+"When defining a new package (@pxref{Defining Packages}), you will probably "
+"find yourself spending some time debugging and tweaking the build until it "
+"succeeds.  To do that, you need to operate the build commands yourself in an "
+"environment as close as possible to the one the build daemon uses."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:5898
+#: doc/guix.texi:5902
 msgid ""
-"To that end, the first thing to do is to use the @option{--keep-failed} or @option{-K} option of @command{guix build}, which will "
-"keep the failed build tree in @file{/tmp} or whatever directory you specified as @code{TMPDIR} (@pxref{Invoking guix build, @code{--"
-"keep-failed}})."
+"To that end, the first thing to do is to use the @option{--keep-failed} or "
+"@option{-K} option of @command{guix build}, which will keep the failed build "
+"tree in @file{/tmp} or whatever directory you specified as @code{TMPDIR} "
+"(@pxref{Invoking guix build, @code{--keep-failed}})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:5904
+#: doc/guix.texi:5908
 msgid ""
-"From there on, you can @command{cd} to the failed build tree and source the @file{environment-variables} file, which contains all "
-"the environment variable definitions that were in place when the build failed.  So let's say you're debugging a build failure in "
-"package @code{foo}; a typical session would look like this:"
+"From there on, you can @command{cd} to the failed build tree and source the "
+"@file{environment-variables} file, which contains all the environment "
+"variable definitions that were in place when the build failed.  So let's say "
+"you're debugging a build failure in package @code{foo}; a typical session "
+"would look like this:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:5911
+#: doc/guix.texi:5915
 #, no-wrap
 msgid ""
 "$ guix build foo -K\n"
@@ -11552,26 +14086,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:5915
-msgid "Now, you can invoke commands as if you were the daemon (almost) and troubleshoot your build process."
+#: doc/guix.texi:5919
+msgid ""
+"Now, you can invoke commands as if you were the daemon (almost) and "
+"troubleshoot your build process."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:5921
+#: doc/guix.texi:5925
 msgid ""
-"Sometimes it happens that, for example, a package's tests pass when you run them manually but they fail when the daemon runs them.  "
-"This can happen because the daemon runs builds in containers where, unlike in our environment above, network access is missing, "
-"@file{/bin/sh} does not exist, etc. (@pxref{Build Environment Setup})."
+"Sometimes it happens that, for example, a package's tests pass when you run "
+"them manually but they fail when the daemon runs them.  This can happen "
+"because the daemon runs builds in containers where, unlike in our "
+"environment above, network access is missing, @file{/bin/sh} does not exist, "
+"etc. (@pxref{Build Environment Setup})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:5924
+#: doc/guix.texi:5928
 msgid ""
-"In such cases, you may need to run inspect the build process from within a container similar to the one the build daemon creates:"
+"In such cases, you may need to run inspect the build process from within a "
+"container similar to the one the build daemon creates:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:5932
+#: doc/guix.texi:5936
 #, no-wrap
 msgid ""
 "$ guix build -K foo\n"
@@ -11583,294 +14122,328 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:5941
+#: doc/guix.texi:5945
 msgid ""
-"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 @option{--no-grafts} option makes sure we get the exact same environment, with ungrafted packages "
-"(@pxref{Security Updates}, for more info on grafts)."
+"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 @option{--no-"
+"grafts} option makes sure we get the exact same environment, with ungrafted "
+"packages (@pxref{Security Updates}, for more info on grafts)."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:5944
-msgid "To get closer to a container like that used by the build daemon, we can remove @file{/bin/sh}:"
+#: doc/guix.texi:5948
+msgid ""
+"To get closer to a container like that used by the build daemon, we can "
+"remove @file{/bin/sh}:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:5947
+#: doc/guix.texi:5951
 #, no-wrap
 msgid "[env]# rm /bin/sh\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:5951
-msgid "(Don't worry, this is harmless: this is all happening in the throw-away container created by @command{guix environment}.)"
+#: doc/guix.texi:5955
+msgid ""
+"(Don't worry, this is harmless: this is all happening in the throw-away "
+"container created by @command{guix environment}.)"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:5954
-msgid "The @command{strace} command is probably not in the search path, but we can run:"
+#: doc/guix.texi:5958
+msgid ""
+"The @command{strace} command is probably not in the search path, but we can "
+"run:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:5957
+#: doc/guix.texi:5961
 #, no-wrap
 msgid "[env]# $GUIX_ENVIRONMENT/bin/strace -f -o log make check\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:5962
+#: doc/guix.texi:5966
 msgid ""
-"In this way, not only you will have reproduced the environment variables the daemon uses, you will also be running the build process "
-"in a container similar to the one the daemon uses."
+"In this way, not only you will have reproduced the environment variables the "
+"daemon uses, you will also be running the build process in a container "
+"similar to the one the daemon uses."
 msgstr ""
 
 #. type: section
-#: doc/guix.texi:5965
+#: doc/guix.texi:5969
 #, no-wrap
 msgid "Invoking @command{guix edit}"
 msgstr ""
 
 #. type: command{#1}
-#: doc/guix.texi:5967
+#: doc/guix.texi:5971
 #, no-wrap
 msgid "guix edit"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:5968
+#: doc/guix.texi:5972
 #, no-wrap
 msgid "package definition, editing"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:5973
+#: doc/guix.texi:5977
 msgid ""
-"So many packages, so many source files! The @command{guix edit} command facilitates the life of users and packagers by pointing "
-"their editor at the source file containing the definition of the specified packages.  For instance:"
+"So many packages, so many source files! The @command{guix edit} command "
+"facilitates the life of users and packagers by pointing their editor at the "
+"source file containing the definition of the specified packages.  For "
+"instance:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:5976
+#: doc/guix.texi:5980
 #, no-wrap
 msgid "guix edit gcc@@4.9 vim\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:5982
+#: doc/guix.texi:5986
 msgid ""
-"launches the program specified in the @code{VISUAL} or in the @code{EDITOR} environment variable to view the recipe of GCC@tie{}"
-"4.9.3 and that of Vim."
+"launches the program specified in the @code{VISUAL} or in the @code{EDITOR} "
+"environment variable to view the recipe of GCC@tie{}4.9.3 and that of Vim."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:5988
+#: doc/guix.texi:5992
 msgid ""
-"If you are using a Guix Git checkout (@pxref{Building from Git}), or have created your own packages on @code{GUIX_PACKAGE_PATH} "
-"(@pxref{Defining Packages}), you will be able to edit the package recipes. Otherwise, you will be able to examine the read-only "
-"recipes for packages currently in the store."
+"If you are using a Guix Git checkout (@pxref{Building from Git}), or have "
+"created your own packages on @code{GUIX_PACKAGE_PATH} (@pxref{Defining "
+"Packages}), you will be able to edit the package recipes. Otherwise, you "
+"will be able to examine the read-only recipes for packages currently in the "
+"store."
 msgstr ""
 
 #. type: section
-#: doc/guix.texi:5991
+#: doc/guix.texi:5995
 #, no-wrap
 msgid "Invoking @command{guix download}"
 msgstr ""
 
 #. type: command{#1}
-#: doc/guix.texi:5993
+#: doc/guix.texi:5997
 #, no-wrap
 msgid "guix download"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:5994
+#: doc/guix.texi:5998
 #, no-wrap
 msgid "downloading package sources"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:6001
+#: doc/guix.texi:6005
 msgid ""
-"When writing a package definition, developers typically need to download a source tarball, compute its SHA256 hash, and write that "
-"hash in the package definition (@pxref{Defining Packages}).  The @command{guix download} tool helps with this task: it downloads a "
-"file from the given URI, adds it to the store, and prints both its file name in the store and its SHA256 hash."
+"When writing a package definition, developers typically need to download a "
+"source tarball, compute its SHA256 hash, and write that hash in the package "
+"definition (@pxref{Defining Packages}).  The @command{guix download} tool "
+"helps with this task: it downloads a file from the given URI, adds it to the "
+"store, and prints both its file name in the store and its SHA256 hash."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:6008
+#: doc/guix.texi:6012
 msgid ""
-"The fact that the downloaded file is added to the store saves bandwidth: when the developer eventually tries to build the newly "
-"defined package with @command{guix build}, the source tarball will not have to be downloaded again because it is already in the "
-"store.  It is also a convenient way to temporarily stash files, which may be deleted eventually (@pxref{Invoking guix gc})."
+"The fact that the downloaded file is added to the store saves bandwidth: "
+"when the developer eventually tries to build the newly defined package with "
+"@command{guix build}, the source tarball will not have to be downloaded "
+"again because it is already in the store.  It is also a convenient way to "
+"temporarily stash files, which may be deleted eventually (@pxref{Invoking "
+"guix gc})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:6016
+#: doc/guix.texi:6020
 msgid ""
-"The @command{guix download} command supports the same URIs as used in package definitions.  In particular, it supports "
-"@code{mirror://} URIs.  @code{https} URIs (HTTP over TLS) are supported @emph{provided} the Guile bindings for GnuTLS are available "
-"in the user's environment; when they are not available, an error is raised.  @xref{Guile Preparations, how to install the GnuTLS "
-"bindings for Guile,, gnutls-guile, GnuTLS-Guile}, for more information."
+"The @command{guix download} command supports the same URIs as used in "
+"package definitions.  In particular, it supports @code{mirror://} URIs.  "
+"@code{https} URIs (HTTP over TLS) are supported @emph{provided} the Guile "
+"bindings for GnuTLS are available in the user's environment; when they are "
+"not available, an error is raised.  @xref{Guile Preparations, how to install "
+"the GnuTLS bindings for Guile,, gnutls-guile, GnuTLS-Guile}, for more "
+"information."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:6021
+#: doc/guix.texi:6025
 msgid ""
-"@command{guix download} verifies HTTPS server certificates by loading the certificates of X.509 authorities from the directory "
-"pointed to by the @code{SSL_CERT_DIR} environment variable (@pxref{X.509 Certificates}), unless @option{--no-check-certificate} is "
-"used."
+"@command{guix download} verifies HTTPS server certificates by loading the "
+"certificates of X.509 authorities from the directory pointed to by the "
+"@code{SSL_CERT_DIR} environment variable (@pxref{X.509 Certificates}), "
+"unless @option{--no-check-certificate} is used."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:6023 doc/guix.texi:7507
+#: doc/guix.texi:6027 doc/guix.texi:7511
 msgid "The following options are available:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:6025 doc/guix.texi:6064
+#: doc/guix.texi:6029 doc/guix.texi:6068
 #, no-wrap
 msgid "--format=@var{fmt}"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:6026 doc/guix.texi:6065
+#: doc/guix.texi:6030 doc/guix.texi:6069
 #, no-wrap
 msgid "-f @var{fmt}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6029
+#: doc/guix.texi:6033
 msgid ""
-"Write the hash in the format specified by @var{fmt}.  For more information on the valid values for @var{fmt}, @pxref{Invoking guix "
-"hash}."
+"Write the hash in the format specified by @var{fmt}.  For more information "
+"on the valid values for @var{fmt}, @pxref{Invoking guix hash}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:6030
+#: doc/guix.texi:6034
 #, no-wrap
 msgid "--no-check-certificate"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6032
+#: doc/guix.texi:6036
 msgid "Do not validate the X.509 certificates of HTTPS servers."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6036
+#: doc/guix.texi:6040
 msgid ""
-"When using this option, you have @emph{absolutely no guarantee} that you are communicating with the authentic server responsible for "
-"the given URL, which makes you vulnerable to ``man-in-the-middle'' attacks."
+"When using this option, you have @emph{absolutely no guarantee} that you are "
+"communicating with the authentic server responsible for the given URL, which "
+"makes you vulnerable to ``man-in-the-middle'' attacks."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:6037
+#: doc/guix.texi:6041
 #, no-wrap
 msgid "--output=@var{file}"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:6038
+#: doc/guix.texi:6042
 #, no-wrap
 msgid "-o @var{file}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6041
-msgid "Save the downloaded file to @var{file} instead of adding it to the store."
+#: doc/guix.texi:6045
+msgid ""
+"Save the downloaded file to @var{file} instead of adding it to the store."
 msgstr ""
 
 #. type: section
-#: doc/guix.texi:6044
+#: doc/guix.texi:6048
 #, no-wrap
 msgid "Invoking @command{guix hash}"
 msgstr ""
 
 #. type: command{#1}
-#: doc/guix.texi:6046
+#: doc/guix.texi:6050
 #, no-wrap
 msgid "guix hash"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:6051
+#: doc/guix.texi:6055
 msgid ""
-"The @command{guix hash} command computes the SHA256 hash of a file.  It is primarily a convenience tool for anyone contributing to "
-"the distribution: it computes the cryptographic hash of a file, which can be used in the definition of a package (@pxref{Defining "
-"Packages})."
+"The @command{guix hash} command computes the SHA256 hash of a file.  It is "
+"primarily a convenience tool for anyone contributing to the distribution: it "
+"computes the cryptographic hash of a file, which can be used in the "
+"definition of a package (@pxref{Defining Packages})."
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:6056
+#: doc/guix.texi:6060
 #, no-wrap
 msgid "guix hash @var{option} @var{file}\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:6061
+#: doc/guix.texi:6065
 msgid ""
-"When @var{file} is @code{-} (a hyphen), @command{guix hash} computes the hash of data read from standard input.  @command{guix hash} "
-"has the following options:"
+"When @var{file} is @code{-} (a hyphen), @command{guix hash} computes the "
+"hash of data read from standard input.  @command{guix hash} has the "
+"following options:"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6067
+#: doc/guix.texi:6071
 msgid "Write the hash in the format specified by @var{fmt}."
 msgstr ""
 
-#. type: table
-#: doc/guix.texi:6070
-msgid "Supported formats: @code{nix-base32}, @code{base32}, @code{base16} (@code{hex} and @code{hexadecimal} can be used as well)."
-msgstr ""
-
 #. type: table
 #: doc/guix.texi:6074
 msgid ""
-"If the @option{--format} option is not specified, @command{guix hash} will output the hash in @code{nix-base32}.  This "
-"representation is used in the definitions of packages."
+"Supported formats: @code{nix-base32}, @code{base32}, @code{base16} "
+"(@code{hex} and @code{hexadecimal} can be used as well)."
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:6078
+msgid ""
+"If the @option{--format} option is not specified, @command{guix hash} will "
+"output the hash in @code{nix-base32}.  This representation is used in the "
+"definitions of packages."
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:6082
 msgid "Compute the hash on @var{file} recursively."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6087
+#: doc/guix.texi:6091
 msgid ""
-"In this case, the hash is computed on an archive containing @var{file}, including its children if it is a directory.  Some of the "
-"metadata of @var{file} is part of the archive; for instance, when @var{file} is a regular file, the hash is different depending on "
-"whether @var{file} is executable or not.  Metadata such as time stamps has no impact on the hash (@pxref{Invoking guix archive})."
+"In this case, the hash is computed on an archive containing @var{file}, "
+"including its children if it is a directory.  Some of the metadata of "
+"@var{file} is part of the archive; for instance, when @var{file} is a "
+"regular file, the hash is different depending on whether @var{file} is "
+"executable or not.  Metadata such as time stamps has no impact on the hash "
+"(@pxref{Invoking guix archive})."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:6088
+#: doc/guix.texi:6092
 #, no-wrap
 msgid "--exclude-vcs"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:6089
+#: doc/guix.texi:6093
 #, no-wrap
 msgid "-x"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6092
+#: doc/guix.texi:6096
 msgid ""
-"When combined with @option{--recursive}, exclude version control system directories (@file{.bzr}, @file{.git}, @file{.hg}, etc.)"
+"When combined with @option{--recursive}, exclude version control system "
+"directories (@file{.bzr}, @file{.git}, @file{.hg}, etc.)"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6097
+#: doc/guix.texi:6101
 msgid ""
-"As an example, here is how you would compute the hash of a Git checkout, which is useful when using the @code{git-fetch} method "
-"(@pxref{origin Reference}):"
+"As an example, here is how you would compute the hash of a Git checkout, "
+"which is useful when using the @code{git-fetch} method (@pxref{origin "
+"Reference}):"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:6102
+#: doc/guix.texi:6106
 #, no-wrap
 msgid ""
 "$ git clone http://example.org/foo.git\n"
@@ -11879,340 +14452,378 @@ msgid ""
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:6106 doc/guix.texi:6111
+#: doc/guix.texi:6110 doc/guix.texi:6115
 #, no-wrap
 msgid "Invoking @command{guix import}"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:6108
+#: doc/guix.texi:6112
 #, no-wrap
 msgid "importing packages"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:6109
+#: doc/guix.texi:6113
 #, no-wrap
 msgid "package import"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:6110
+#: doc/guix.texi:6114
 #, no-wrap
 msgid "package conversion"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:6118
+#: doc/guix.texi:6122
 msgid ""
-"The @command{guix import} command is useful for people who would like to add a package to the distribution with as little work as "
-"possible---a legitimate demand.  The command knows of a few repositories from which it can ``import'' package metadata.  The result "
-"is a package definition, or a template thereof, in the format we know (@pxref{Defining Packages})."
+"The @command{guix import} command is useful for people who would like to add "
+"a package to the distribution with as little work as possible---a legitimate "
+"demand.  The command knows of a few repositories from which it can "
+"``import'' package metadata.  The result is a package definition, or a "
+"template thereof, in the format we know (@pxref{Defining Packages})."
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:6123
+#: doc/guix.texi:6127
 #, no-wrap
 msgid "guix import @var{importer} @var{options}@dots{}\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:6129
+#: doc/guix.texi:6133
 msgid ""
-"@var{importer} specifies the source from which to import package metadata, and @var{options} specifies a package identifier and "
-"other options specific to @var{importer}.  Currently, the available ``importers'' are:"
+"@var{importer} specifies the source from which to import package metadata, "
+"and @var{options} specifies a package identifier and other options specific "
+"to @var{importer}.  Currently, the available ``importers'' are:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:6131 doc/guix.texi:6584
+#: doc/guix.texi:6135 doc/guix.texi:6588
 #, no-wrap
 msgid "gnu"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6135
+#: doc/guix.texi:6139
 msgid ""
-"Import metadata for the given GNU package.  This provides a template for the latest version of that GNU package, including the hash "
-"of its source tarball, and its canonical synopsis and description."
+"Import metadata for the given GNU package.  This provides a template for the "
+"latest version of that GNU package, including the hash of its source "
+"tarball, and its canonical synopsis and description."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6138
-msgid "Additional information such as the package dependencies and its license needs to be figured out manually."
+#: doc/guix.texi:6142
+msgid ""
+"Additional information such as the package dependencies and its license "
+"needs to be figured out manually."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6141
-msgid "For example, the following command returns a package definition for GNU@tie{}Hello:"
+#: doc/guix.texi:6145
+msgid ""
+"For example, the following command returns a package definition for GNU@tie{}"
+"Hello:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:6144
+#: doc/guix.texi:6148
 #, no-wrap
 msgid "guix import gnu hello\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6147 doc/guix.texi:6365 doc/guix.texi:6410 doc/guix.texi:6434
+#: doc/guix.texi:6151 doc/guix.texi:6369 doc/guix.texi:6414 doc/guix.texi:6438
 msgid "Specific command-line options are:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:6149 doc/guix.texi:6685
+#: doc/guix.texi:6153 doc/guix.texi:6689
 #, no-wrap
 msgid "--key-download=@var{policy}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6153
+#: doc/guix.texi:6157
 msgid ""
-"As for @code{guix refresh}, specify the policy to handle missing OpenPGP keys when verifying the package signature.  @xref{Invoking "
-"guix refresh, @code{--key-download}}."
+"As for @code{guix refresh}, specify the policy to handle missing OpenPGP "
+"keys when verifying the package signature.  @xref{Invoking guix refresh, "
+"@code{--key-download}}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:6155 doc/guix.texi:6156 doc/guix.texi:6602
+#: doc/guix.texi:6159 doc/guix.texi:6160 doc/guix.texi:6606
 #, no-wrap
 msgid "pypi"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6164
+#: doc/guix.texi:6168
 msgid ""
-"Import metadata from the @uref{https://pypi.python.org/, Python Package Index}@footnote{This functionality requires Guile-JSON to be "
-"installed.  @xref{Requirements}.}.  Information is taken from the JSON-formatted description available at @code{pypi.python.org} and "
-"usually includes all the relevant information, including package dependencies.  For maximum efficiency, it is recommended to install "
-"the @command{unzip} utility, so that the importer can unzip Python wheels and gather data from them."
+"Import metadata from the @uref{https://pypi.python.org/, Python Package "
+"Index}@footnote{This functionality requires Guile-JSON to be installed.  "
+"@xref{Requirements}.}.  Information is taken from the JSON-formatted "
+"description available at @code{pypi.python.org} and usually includes all the "
+"relevant information, including package dependencies.  For maximum "
+"efficiency, it is recommended to install the @command{unzip} utility, so "
+"that the importer can unzip Python wheels and gather data from them."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6167
-msgid "The command below imports metadata for the @code{itsdangerous} Python package:"
+#: doc/guix.texi:6171
+msgid ""
+"The command below imports metadata for the @code{itsdangerous} Python "
+"package:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:6170
+#: doc/guix.texi:6174
 #, no-wrap
 msgid "guix import pypi itsdangerous\n"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:6172 doc/guix.texi:6173 doc/guix.texi:6604
+#: doc/guix.texi:6176 doc/guix.texi:6177 doc/guix.texi:6608
 #, no-wrap
 msgid "gem"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6184
+#: doc/guix.texi:6188
 msgid ""
-"Import metadata from @uref{https://rubygems.org/, RubyGems}@footnote{This functionality requires Guile-JSON to be installed.  "
-"@xref{Requirements}.}.  Information is taken from the JSON-formatted description available at @code{rubygems.org} and includes most "
-"relevant information, including runtime dependencies.  There are some caveats, however.  The metadata doesn't distinguish between "
-"synopses and descriptions, so the same string is used for both fields.  Additionally, the details of non-Ruby dependencies required "
-"to build native extensions is unavailable and left as an exercise to the packager."
+"Import metadata from @uref{https://rubygems.org/, RubyGems}@footnote{This "
+"functionality requires Guile-JSON to be installed.  @xref{Requirements}.}.  "
+"Information is taken from the JSON-formatted description available at "
+"@code{rubygems.org} and includes most relevant information, including "
+"runtime dependencies.  There are some caveats, however.  The metadata "
+"doesn't distinguish between synopses and descriptions, so the same string is "
+"used for both fields.  Additionally, the details of non-Ruby dependencies "
+"required to build native extensions is unavailable and left as an exercise "
+"to the packager."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6186
+#: doc/guix.texi:6190
 msgid "The command below imports metadata for the @code{rails} Ruby package:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:6189
+#: doc/guix.texi:6193
 #, no-wrap
 msgid "guix import gem rails\n"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:6191 doc/guix.texi:6600
+#: doc/guix.texi:6195 doc/guix.texi:6604
 #, no-wrap
 msgid "cpan"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:6192
+#: doc/guix.texi:6196
 #, no-wrap
 msgid "CPAN"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6202
+#: doc/guix.texi:6206
 msgid ""
-"Import metadata from @uref{https://www.metacpan.org/, MetaCPAN}@footnote{This functionality requires Guile-JSON to be installed.  "
-"@xref{Requirements}.}.  Information is taken from the JSON-formatted metadata provided through @uref{https://fastapi.metacpan.org/, "
-"MetaCPAN's API} and includes most relevant information, such as module dependencies.  License information should be checked "
-"closely.  If Perl is available in the store, then the @code{corelist} utility will be used to filter core modules out of the list of "
-"dependencies."
+"Import metadata from @uref{https://www.metacpan.org/, MetaCPAN}"
+"@footnote{This functionality requires Guile-JSON to be installed.  "
+"@xref{Requirements}.}.  Information is taken from the JSON-formatted "
+"metadata provided through @uref{https://fastapi.metacpan.org/, MetaCPAN's "
+"API} and includes most relevant information, such as module dependencies.  "
+"License information should be checked closely.  If Perl is available in the "
+"store, then the @code{corelist} utility will be used to filter core modules "
+"out of the list of dependencies."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6205
-msgid "The command command below imports metadata for the @code{Acme::Boolean} Perl module:"
+#: doc/guix.texi:6209
+msgid ""
+"The command command below imports metadata for the @code{Acme::Boolean} Perl "
+"module:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:6208
+#: doc/guix.texi:6212
 #, no-wrap
 msgid "guix import cpan Acme::Boolean\n"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:6210 doc/guix.texi:6596
+#: doc/guix.texi:6214 doc/guix.texi:6600
 #, no-wrap
 msgid "cran"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:6211
+#: doc/guix.texi:6215
 #, no-wrap
 msgid "CRAN"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:6212
+#: doc/guix.texi:6216
 #, no-wrap
 msgid "Bioconductor"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6216
+#: doc/guix.texi:6220
 msgid ""
-"Import metadata from @uref{https://cran.r-project.org/, CRAN}, the central repository for the @uref{http://r-project.org, GNU@tie{}R "
-"statistical and graphical environment}."
+"Import metadata from @uref{https://cran.r-project.org/, CRAN}, the central "
+"repository for the @uref{http://r-project.org, GNU@tie{}R statistical and "
+"graphical environment}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6218
-msgid "Information is extracted from the @code{DESCRIPTION} file of the package."
+#: doc/guix.texi:6222
+msgid ""
+"Information is extracted from the @code{DESCRIPTION} file of the package."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6221
-msgid "The command command below imports metadata for the @code{Cairo} R package:"
+#: doc/guix.texi:6225
+msgid ""
+"The command command below imports metadata for the @code{Cairo} R package:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:6224
+#: doc/guix.texi:6228
 #, no-wrap
 msgid "guix import cran Cairo\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6229
+#: doc/guix.texi:6233
 msgid ""
-"When @code{--recursive} is added, the importer will traverse the dependency graph of the given upstream package recursively and "
-"generate package expressions for all those packages that are not yet in Guix."
+"When @code{--recursive} is added, the importer will traverse the dependency "
+"graph of the given upstream package recursively and generate package "
+"expressions for all those packages that are not yet in Guix."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6234
+#: doc/guix.texi:6238
 msgid ""
-"When @code{--archive=bioconductor} is added, metadata is imported from @uref{https://www.bioconductor.org/, Bioconductor}, a "
-"repository of R packages for for the analysis and comprehension of high-throughput genomic data in bioinformatics."
+"When @code{--archive=bioconductor} is added, metadata is imported from "
+"@uref{https://www.bioconductor.org/, Bioconductor}, a repository of R "
+"packages for for the analysis and comprehension of high-throughput genomic "
+"data in bioinformatics."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6237
+#: doc/guix.texi:6241
 msgid ""
-"Information is extracted from the @code{DESCRIPTION} file of a package published on the web interface of the Bioconductor SVN "
-"repository."
+"Information is extracted from the @code{DESCRIPTION} file of a package "
+"published on the web interface of the Bioconductor SVN repository."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6240
-msgid "The command below imports metadata for the @code{GenomicRanges} R package:"
+#: doc/guix.texi:6244
+msgid ""
+"The command below imports metadata for the @code{GenomicRanges} R package:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:6243
+#: doc/guix.texi:6247
 #, no-wrap
 msgid "guix import cran --archive=bioconductor GenomicRanges\n"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:6245
+#: doc/guix.texi:6249
 #, no-wrap
 msgid "texlive"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:6246
+#: doc/guix.texi:6250
 #, no-wrap
 msgid "TeX Live"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:6247
+#: doc/guix.texi:6251
 #, no-wrap
 msgid "CTAN"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6251
+#: doc/guix.texi:6255
 msgid ""
-"Import metadata from @uref{http://www.ctan.org/, CTAN}, the comprehensive TeX archive network for TeX packages that are part of the "
-"@uref{https://www.tug.org/texlive/, TeX Live distribution}."
+"Import metadata from @uref{http://www.ctan.org/, CTAN}, the comprehensive "
+"TeX archive network for TeX packages that are part of the @uref{https://www."
+"tug.org/texlive/, TeX Live distribution}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6256
+#: doc/guix.texi:6260
 msgid ""
-"Information about the package is obtained through the XML API provided by CTAN, while the source code is downloaded from the SVN "
-"repository of the Tex Live project.  This is done because the CTAN does not keep versioned archives."
+"Information about the package is obtained through the XML API provided by "
+"CTAN, while the source code is downloaded from the SVN repository of the Tex "
+"Live project.  This is done because the CTAN does not keep versioned "
+"archives."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6259
-msgid "The command command below imports metadata for the @code{fontspec} TeX package:"
+#: doc/guix.texi:6263
+msgid ""
+"The command command below imports metadata for the @code{fontspec} TeX "
+"package:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:6262
+#: doc/guix.texi:6266
 #, no-wrap
 msgid "guix import texlive fontspec\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6268
+#: doc/guix.texi:6272
 msgid ""
-"When @code{--archive=DIRECTORY} is added, the source code is downloaded not from the @file{latex} sub-directory of the @file{texmf-"
-"dist/source} tree in the TeX Live SVN repository, but from the specified sibling directory under the same root."
+"When @code{--archive=DIRECTORY} is added, the source code is downloaded not "
+"from the @file{latex} sub-directory of the @file{texmf-dist/source} tree in "
+"the TeX Live SVN repository, but from the specified sibling directory under "
+"the same root."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6272
+#: doc/guix.texi:6276
 msgid ""
-"The command below imports metadata for the @code{ifxetex} package from CTAN while fetching the sources from the directory "
-"@file{texmf/source/generic}:"
+"The command below imports metadata for the @code{ifxetex} package from CTAN "
+"while fetching the sources from the directory @file{texmf/source/generic}:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:6275
+#: doc/guix.texi:6279
 #, no-wrap
 msgid "guix import texlive --archive=generic ifxetex\n"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:6277
+#: doc/guix.texi:6281
 #, no-wrap
 msgid "json"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:6278
+#: doc/guix.texi:6282
 #, no-wrap
 msgid "JSON, import"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6283
+#: doc/guix.texi:6287
 msgid ""
-"Import package metadata from a local JSON file@footnote{This functionality requires Guile-JSON to be installed.  "
-"@xref{Requirements}.}.  Consider the following example package definition in JSON format:"
+"Import package metadata from a local JSON file@footnote{This functionality "
+"requires Guile-JSON to be installed.  @xref{Requirements}.}.  Consider the "
+"following example package definition in JSON format:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:6296
+#: doc/guix.texi:6300
 #, no-wrap
 msgid ""
 "@{\n"
@@ -12229,19 +14840,23 @@ msgid ""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6302
+#: doc/guix.texi:6306
 msgid ""
-"The field names are the same as for the @code{<package>} record (@xref{Defining Packages}).  References to other packages are "
-"provided as JSON lists of quoted package specification strings such as @code{guile} or @code{guile@@2.0}."
+"The field names are the same as for the @code{<package>} record "
+"(@xref{Defining Packages}).  References to other packages are provided as "
+"JSON lists of quoted package specification strings such as @code{guile} or "
+"@code{guile@@2.0}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6305
-msgid "The importer also supports a more explicit source definition using the common fields for @code{<origin>} records:"
+#: doc/guix.texi:6309
+msgid ""
+"The importer also supports a more explicit source definition using the "
+"common fields for @code{<origin>} records:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:6318
+#: doc/guix.texi:6322
 #, no-wrap
 msgid ""
 "@{\n"
@@ -12258,294 +14873,329 @@ msgid ""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6322
-msgid "The command below reads metadata from the JSON file @code{hello.json} and outputs a package expression:"
+#: doc/guix.texi:6326
+msgid ""
+"The command below reads metadata from the JSON file @code{hello.json} and "
+"outputs a package expression:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:6325
+#: doc/guix.texi:6329
 #, no-wrap
 msgid "guix import json hello.json\n"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:6327
+#: doc/guix.texi:6331
 #, no-wrap
 msgid "nix"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6336
+#: doc/guix.texi:6340
 msgid ""
-"Import metadata from a local copy of the source of the @uref{http://nixos.org/nixpkgs/, Nixpkgs distribution}@footnote{This relies "
-"on the @command{nix-instantiate} command of @uref{http://nixos.org/nix/, Nix}.}.  Package definitions in Nixpkgs are typically "
-"written in a mixture of Nix-language and Bash code.  This command only imports the high-level package structure that is written in "
-"the Nix language.  It normally includes all the basic fields of a package definition."
+"Import metadata from a local copy of the source of the @uref{http://nixos."
+"org/nixpkgs/, Nixpkgs distribution}@footnote{This relies on the @command{nix-"
+"instantiate} command of @uref{http://nixos.org/nix/, Nix}.}.  Package "
+"definitions in Nixpkgs are typically written in a mixture of Nix-language "
+"and Bash code.  This command only imports the high-level package structure "
+"that is written in the Nix language.  It normally includes all the basic "
+"fields of a package definition."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6339
-msgid "When importing a GNU package, the synopsis and descriptions are replaced by their canonical upstream variant."
+#: doc/guix.texi:6343
+msgid ""
+"When importing a GNU package, the synopsis and descriptions are replaced by "
+"their canonical upstream variant."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6341
+#: doc/guix.texi:6345
 msgid "Usually, you will first need to do:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:6344
+#: doc/guix.texi:6348
 #, no-wrap
 msgid "export NIX_REMOTE=daemon\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6348
-msgid "so that @command{nix-instantiate} does not try to open the Nix database."
+#: doc/guix.texi:6352
+msgid ""
+"so that @command{nix-instantiate} does not try to open the Nix database."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6352
+#: doc/guix.texi:6356
 msgid ""
-"As an example, the command below imports the package definition of LibreOffice (more precisely, it imports the definition of the "
-"package bound to the @code{libreoffice} top-level attribute):"
+"As an example, the command below imports the package definition of "
+"LibreOffice (more precisely, it imports the definition of the package bound "
+"to the @code{libreoffice} top-level attribute):"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:6355
+#: doc/guix.texi:6359
 #, no-wrap
 msgid "guix import nix ~/path/to/nixpkgs libreoffice\n"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:6357 doc/guix.texi:6358 doc/guix.texi:6608
+#: doc/guix.texi:6361 doc/guix.texi:6362 doc/guix.texi:6612
 #, no-wrap
 msgid "hackage"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6363
+#: doc/guix.texi:6367
 msgid ""
-"Import metadata from the Haskell community's central package archive @uref{https://hackage.haskell.org/, Hackage}.  Information is "
-"taken from Cabal files and includes all the relevant information, including package dependencies."
+"Import metadata from the Haskell community's central package archive "
+"@uref{https://hackage.haskell.org/, Hackage}.  Information is taken from "
+"Cabal files and includes all the relevant information, including package "
+"dependencies."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:6367
+#: doc/guix.texi:6371
 #, no-wrap
 msgid "--stdin"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:6368
+#: doc/guix.texi:6372
 #, no-wrap
 msgid "-s"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6370
+#: doc/guix.texi:6374
 msgid "Read a Cabal file from standard input."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:6370 doc/guix.texi:6412
+#: doc/guix.texi:6374 doc/guix.texi:6416
 #, no-wrap
 msgid "--no-test-dependencies"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:6371 doc/guix.texi:6413
+#: doc/guix.texi:6375 doc/guix.texi:6417
 #, no-wrap
 msgid "-t"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6373 doc/guix.texi:6415
+#: doc/guix.texi:6377 doc/guix.texi:6419
 msgid "Do not include dependencies required only by the test suites."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:6373
+#: doc/guix.texi:6377
 #, no-wrap
 msgid "--cabal-environment=@var{alist}"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:6374
+#: doc/guix.texi:6378
 #, no-wrap
 msgid "-e @var{alist}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6383
+#: doc/guix.texi:6387
 msgid ""
-"@var{alist} is a Scheme alist defining the environment in which the Cabal conditionals are evaluated.  The accepted keys are: "
-"@code{os}, @code{arch}, @code{impl} and a string representing the name of a flag.  The value associated with a flag has to be either "
-"the symbol @code{true} or @code{false}.  The value associated with other keys has to conform to the Cabal file format definition.  "
-"The default value associated with the keys @code{os}, @code{arch} and @code{impl} is @samp{linux}, @samp{x86_64} and @samp{ghc}, "
-"respectively."
+"@var{alist} is a Scheme alist defining the environment in which the Cabal "
+"conditionals are evaluated.  The accepted keys are: @code{os}, @code{arch}, "
+"@code{impl} and a string representing the name of a flag.  The value "
+"associated with a flag has to be either the symbol @code{true} or "
+"@code{false}.  The value associated with other keys has to conform to the "
+"Cabal file format definition.  The default value associated with the keys "
+"@code{os}, @code{arch} and @code{impl} is @samp{linux}, @samp{x86_64} and "
+"@samp{ghc}, respectively."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6388
+#: doc/guix.texi:6392
 msgid ""
-"The command below imports metadata for the latest version of the @code{HTTP} Haskell package without including test dependencies and "
-"specifying the value of the flag @samp{network-uri} as @code{false}:"
+"The command below imports metadata for the latest version of the @code{HTTP} "
+"Haskell package without including test dependencies and specifying the value "
+"of the flag @samp{network-uri} as @code{false}:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:6391
+#: doc/guix.texi:6395
 #, no-wrap
 msgid "guix import hackage -t -e \"'((\\\"network-uri\\\" . false))\" HTTP\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6395
+#: doc/guix.texi:6399
 msgid ""
-"A specific package version may optionally be specified by following the package name by an at-sign and a version number as in the "
-"following example:"
+"A specific package version may optionally be specified by following the "
+"package name by an at-sign and a version number as in the following example:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:6398
+#: doc/guix.texi:6402
 #, no-wrap
 msgid "guix import hackage mtl@@2.1.3.1\n"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:6400 doc/guix.texi:6401 doc/guix.texi:6610
+#: doc/guix.texi:6404 doc/guix.texi:6405 doc/guix.texi:6614
 #, no-wrap
 msgid "stackage"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6408
+#: doc/guix.texi:6412
 msgid ""
-"The @code{stackage} importer is a wrapper around the @code{hackage} one.  It takes a package name, looks up the package version "
-"included in a long-term support (LTS) @uref{https://www.stackage.org, Stackage} release and uses the @code{hackage} importer to "
-"retrieve its metadata.  Note that it is up to you to select an LTS release compatible with the GHC compiler used by Guix."
+"The @code{stackage} importer is a wrapper around the @code{hackage} one.  It "
+"takes a package name, looks up the package version included in a long-term "
+"support (LTS) @uref{https://www.stackage.org, Stackage} release and uses the "
+"@code{hackage} importer to retrieve its metadata.  Note that it is up to you "
+"to select an LTS release compatible with the GHC compiler used by Guix."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:6415
+#: doc/guix.texi:6419
 #, no-wrap
 msgid "--lts-version=@var{version}"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:6416
+#: doc/guix.texi:6420
 #, no-wrap
 msgid "-r @var{version}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6419
-msgid "@var{version} is the desired LTS release version.  If omitted the latest release is used."
+#: doc/guix.texi:6423
+msgid ""
+"@var{version} is the desired LTS release version.  If omitted the latest "
+"release is used."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6423
-msgid "The command below imports metadata for the @code{HTTP} Haskell package included in the LTS Stackage release version 7.18:"
+#: doc/guix.texi:6427
+msgid ""
+"The command below imports metadata for the @code{HTTP} Haskell package "
+"included in the LTS Stackage release version 7.18:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:6426
+#: doc/guix.texi:6430
 #, no-wrap
 msgid "guix import stackage --lts-version=7.18 HTTP\n"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:6428 doc/guix.texi:6429 doc/guix.texi:6594
+#: doc/guix.texi:6432 doc/guix.texi:6433 doc/guix.texi:6598
 #, no-wrap
 msgid "elpa"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6432
-msgid "Import metadata from an Emacs Lisp Package Archive (ELPA) package repository (@pxref{Packages,,, emacs, The GNU Emacs Manual})."
+#: doc/guix.texi:6436
+msgid ""
+"Import metadata from an Emacs Lisp Package Archive (ELPA) package repository "
+"(@pxref{Packages,,, emacs, The GNU Emacs Manual})."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:6436
+#: doc/guix.texi:6440
 #, no-wrap
 msgid "--archive=@var{repo}"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:6437
+#: doc/guix.texi:6441
 #, no-wrap
 msgid "-a @var{repo}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6441
-msgid ""
-"@var{repo} identifies the archive repository from which to retrieve the information.  Currently the supported repositories and their "
-"identifiers are:"
-msgstr ""
-
-#. type: itemize
 #: doc/guix.texi:6445
-msgid "@uref{http://elpa.gnu.org/packages, GNU}, selected by the @code{gnu} identifier.  This is the default."
+msgid ""
+"@var{repo} identifies the archive repository from which to retrieve the "
+"information.  Currently the supported repositories and their identifiers are:"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:6451
+#: doc/guix.texi:6449
 msgid ""
-"Packages from @code{elpa.gnu.org} are signed with one of the keys contained in the GnuPG keyring at @file{share/emacs/25.1/etc/"
-"package-keyring.gpg} (or similar) in the @code{emacs} package (@pxref{Package Installation, ELPA package signatures,, emacs, The GNU "
-"Emacs Manual})."
+"@uref{http://elpa.gnu.org/packages, GNU}, selected by the @code{gnu} "
+"identifier.  This is the default."
 msgstr ""
 
 #. type: itemize
 #: doc/guix.texi:6455
-msgid "@uref{http://stable.melpa.org/packages, MELPA-Stable}, selected by the @code{melpa-stable} identifier."
+msgid ""
+"Packages from @code{elpa.gnu.org} are signed with one of the keys contained "
+"in the GnuPG keyring at @file{share/emacs/25.1/etc/package-keyring.gpg} (or "
+"similar) in the @code{emacs} package (@pxref{Package Installation, ELPA "
+"package signatures,, emacs, The GNU Emacs Manual})."
 msgstr ""
 
 #. type: itemize
 #: doc/guix.texi:6459
-msgid "@uref{http://melpa.org/packages, MELPA}, selected by the @code{melpa} identifier."
+msgid ""
+"@uref{http://stable.melpa.org/packages, MELPA-Stable}, selected by the "
+"@code{melpa-stable} identifier."
+msgstr ""
+
+#. type: itemize
+#: doc/guix.texi:6463
+msgid ""
+"@uref{http://melpa.org/packages, MELPA}, selected by the @code{melpa} "
+"identifier."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:6462 doc/guix.texi:6463 doc/guix.texi:6612
+#: doc/guix.texi:6466 doc/guix.texi:6467 doc/guix.texi:6616
 #, no-wrap
 msgid "crate"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6466
-msgid "Import metadata from the crates.io Rust package repository @uref{https://crates.io, crates.io}."
+#: doc/guix.texi:6470
+msgid ""
+"Import metadata from the crates.io Rust package repository @uref{https://"
+"crates.io, crates.io}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:6471
+#: doc/guix.texi:6475
 msgid ""
-"The structure of the @command{guix import} code is modular.  It would be useful to have more importers for other package formats, "
-"and your help is welcome here (@pxref{Contributing})."
+"The structure of the @command{guix import} code is modular.  It would be "
+"useful to have more importers for other package formats, and your help is "
+"welcome here (@pxref{Contributing})."
 msgstr ""
 
 #. type: section
-#: doc/guix.texi:6473
+#: doc/guix.texi:6477
 #, no-wrap
 msgid "Invoking @command{guix refresh}"
 msgstr ""
 
 #. type: command{#1}
-#: doc/guix.texi:6475
+#: doc/guix.texi:6479
 #, no-wrap
 msgid "guix refresh"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:6480
+#: doc/guix.texi:6484
 msgid ""
-"The primary audience of the @command{guix refresh} command is developers of the GNU software distribution.  By default, it reports "
-"any packages provided by the distribution that are outdated compared to the latest upstream version, like this:"
+"The primary audience of the @command{guix refresh} command is developers of "
+"the GNU software distribution.  By default, it reports any packages provided "
+"by the distribution that are outdated compared to the latest upstream "
+"version, like this:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:6485
+#: doc/guix.texi:6489
 #, no-wrap
 msgid ""
 "$ guix refresh\n"
@@ -12554,12 +15204,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:6489
-msgid "Alternately, one can specify packages to consider, in which case a warning is emitted for packages that lack an updater:"
+#: doc/guix.texi:6493
+msgid ""
+"Alternately, one can specify packages to consider, in which case a warning "
+"is emitted for packages that lack an updater:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:6494
+#: doc/guix.texi:6498
 #, no-wrap
 msgid ""
 "$ guix refresh coreutils guile guile-ssh\n"
@@ -12568,23 +15220,28 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:6503
+#: doc/guix.texi:6507
 msgid ""
-"@command{guix refresh} browses the upstream repository of each package and determines the highest version number of the releases "
-"therein.  The command knows how to update specific types of packages: GNU packages, ELPA packages, etc.---see the documentation for "
-"@option{--type} below.  There are many packages, though, for which it lacks a method to determine whether a new upstream release is "
-"available.  However, the mechanism is extensible, so feel free to get in touch with us to add a new method!"
+"@command{guix refresh} browses the upstream repository of each package and "
+"determines the highest version number of the releases therein.  The command "
+"knows how to update specific types of packages: GNU packages, ELPA packages, "
+"etc.---see the documentation for @option{--type} below.  There are many "
+"packages, though, for which it lacks a method to determine whether a new "
+"upstream release is available.  However, the mechanism is extensible, so "
+"feel free to get in touch with us to add a new method!"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:6508
+#: doc/guix.texi:6512
 msgid ""
-"Sometimes the upstream name differs from the package name used in Guix, and @command{guix refresh} needs a little help.  Most "
-"updaters honor the @code{upstream-name} property in package definitions, which can be used to that effect:"
+"Sometimes the upstream name differs from the package name used in Guix, and "
+"@command{guix refresh} needs a little help.  Most updaters honor the "
+"@code{upstream-name} property in package definitions, which can be used to "
+"that effect:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:6515
+#: doc/guix.texi:6519
 #, no-wrap
 msgid ""
 "(define-public network-manager\n"
@@ -12595,244 +15252,260 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:6527
+#: doc/guix.texi:6531
 msgid ""
-"When passed @code{--update}, it modifies distribution source files to update the version numbers and source tarball hashes of those "
-"package recipes (@pxref{Defining Packages}).  This is achieved by downloading each package's latest source tarball and its "
-"associated OpenPGP signature, authenticating the downloaded tarball against its signature using @command{gpg}, and finally computing "
-"its hash.  When the public key used to sign the tarball is missing from the user's keyring, an attempt is made to automatically "
-"retrieve it from a public key server; when this is successful, the key is added to the user's keyring; otherwise, @command{guix "
-"refresh} reports an error."
+"When passed @code{--update}, it modifies distribution source files to update "
+"the version numbers and source tarball hashes of those package recipes "
+"(@pxref{Defining Packages}).  This is achieved by downloading each package's "
+"latest source tarball and its associated OpenPGP signature, authenticating "
+"the downloaded tarball against its signature using @command{gpg}, and "
+"finally computing its hash.  When the public key used to sign the tarball is "
+"missing from the user's keyring, an attempt is made to automatically "
+"retrieve it from a public key server; when this is successful, the key is "
+"added to the user's keyring; otherwise, @command{guix refresh} reports an "
+"error."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:6529
+#: doc/guix.texi:6533
 msgid "The following options are supported:"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6537 doc/guix.texi:7098
+#: doc/guix.texi:6541 doc/guix.texi:7102
 msgid "This is useful to precisely refer to a package, as in this example:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:6540
+#: doc/guix.texi:6544
 #, no-wrap
 msgid "guix refresh -l -e '(@@@@ (gnu packages commencement) glibc-final)'\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6544
-msgid "This command lists the dependents of the ``final'' libc (essentially all the packages.)"
+#: doc/guix.texi:6548
+msgid ""
+"This command lists the dependents of the ``final'' libc (essentially all the "
+"packages.)"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:6545
+#: doc/guix.texi:6549
 #, no-wrap
 msgid "--update"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:6546
+#: doc/guix.texi:6550
 #, no-wrap
 msgid "-u"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6550
+#: doc/guix.texi:6554
 msgid ""
-"Update distribution source files (package recipes) in place.  This is usually run from a checkout of the Guix source tree "
-"(@pxref{Running Guix Before It Is Installed}):"
+"Update distribution source files (package recipes) in place.  This is "
+"usually run from a checkout of the Guix source tree (@pxref{Running Guix "
+"Before It Is Installed}):"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:6553
+#: doc/guix.texi:6557
 #, no-wrap
 msgid "$ ./pre-inst-env guix refresh -s non-core -u\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6556
+#: doc/guix.texi:6560
 msgid "@xref{Defining Packages}, for more information on package definitions."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:6557
+#: doc/guix.texi:6561
 #, no-wrap
 msgid "--select=[@var{subset}]"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:6558
+#: doc/guix.texi:6562
 #, no-wrap
 msgid "-s @var{subset}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6561
-msgid "Select all the packages in @var{subset}, one of @code{core} or @code{non-core}."
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:6568
+#: doc/guix.texi:6565
 msgid ""
-"The @code{core} subset refers to all the packages at the core of the distribution---i.e., packages that are used to build "
-"``everything else''.  This includes GCC, libc, Binutils, Bash, etc.  Usually, changing one of these packages in the distribution "
-"entails a rebuild of all the others.  Thus, such updates are an inconvenience to users in terms of build time or bandwidth used to "
-"achieve the upgrade."
+"Select all the packages in @var{subset}, one of @code{core} or @code{non-"
+"core}."
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:6572
 msgid ""
-"The @code{non-core} subset refers to the remaining packages.  It is typically useful in cases where an update of the core packages "
-"would be inconvenient."
+"The @code{core} subset refers to all the packages at the core of the "
+"distribution---i.e., packages that are used to build ``everything else''.  "
+"This includes GCC, libc, Binutils, Bash, etc.  Usually, changing one of "
+"these packages in the distribution entails a rebuild of all the others.  "
+"Thus, such updates are an inconvenience to users in terms of build time or "
+"bandwidth used to achieve the upgrade."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6577
+#: doc/guix.texi:6576
 msgid ""
-"Select all the packages from the manifest in @var{file}. This is useful to check if any packages of the user manifest can be updated."
+"The @code{non-core} subset refers to the remaining packages.  It is "
+"typically useful in cases where an update of the core packages would be "
+"inconvenient."
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:6581
+msgid ""
+"Select all the packages from the manifest in @var{file}. This is useful to "
+"check if any packages of the user manifest can be updated."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:6578
+#: doc/guix.texi:6582
 #, no-wrap
 msgid "--type=@var{updater}"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:6579
+#: doc/guix.texi:6583
 #, no-wrap
 msgid "-t @var{updater}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6582
+#: doc/guix.texi:6586
 msgid ""
-"Select only packages handled by @var{updater} (may be a comma-separated list of updaters).  Currently, @var{updater} may be one of:"
+"Select only packages handled by @var{updater} (may be a comma-separated list "
+"of updaters).  Currently, @var{updater} may be one of:"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6586
+#: doc/guix.texi:6590
 msgid "the updater for GNU packages;"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:6586
+#: doc/guix.texi:6590
 #, no-wrap
 msgid "gnome"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6588
+#: doc/guix.texi:6592
 msgid "the updater for GNOME packages;"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:6588
+#: doc/guix.texi:6592
 #, no-wrap
 msgid "kde"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6590
+#: doc/guix.texi:6594
 msgid "the updater for KDE packages;"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:6590
+#: doc/guix.texi:6594
 #, no-wrap
 msgid "xorg"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6592
+#: doc/guix.texi:6596
 msgid "the updater for X.org packages;"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:6592
+#: doc/guix.texi:6596
 #, no-wrap
 msgid "kernel.org"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6594
+#: doc/guix.texi:6598
 msgid "the updater for packages hosted on kernel.org;"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6596
+#: doc/guix.texi:6600
 msgid "the updater for @uref{http://elpa.gnu.org/, ELPA} packages;"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6598
+#: doc/guix.texi:6602
 msgid "the updater for @uref{https://cran.r-project.org/, CRAN} packages;"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:6598
+#: doc/guix.texi:6602
 #, no-wrap
 msgid "bioconductor"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6600
-msgid "the updater for @uref{https://www.bioconductor.org/, Bioconductor} R packages;"
+#: doc/guix.texi:6604
+msgid ""
+"the updater for @uref{https://www.bioconductor.org/, Bioconductor} R "
+"packages;"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6602
+#: doc/guix.texi:6606
 msgid "the updater for @uref{http://www.cpan.org/, CPAN} packages;"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6604
+#: doc/guix.texi:6608
 msgid "the updater for @uref{https://pypi.python.org, PyPI} packages."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6606
+#: doc/guix.texi:6610
 msgid "the updater for @uref{https://rubygems.org, RubyGems} packages."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:6606
+#: doc/guix.texi:6610
 #, no-wrap
 msgid "github"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6608
+#: doc/guix.texi:6612
 msgid "the updater for @uref{https://github.com, GitHub} packages."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6610
+#: doc/guix.texi:6614
 msgid "the updater for @uref{https://hackage.haskell.org, Hackage} packages."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6612
+#: doc/guix.texi:6616
 msgid "the updater for @uref{https://www.stackage.org, Stackage} packages."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6614
+#: doc/guix.texi:6618
 msgid "the updater for @uref{https://crates.io, Crates} packages."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6618
+#: doc/guix.texi:6622
 msgid ""
-"For instance, the following command only checks for updates of Emacs packages hosted at @code{elpa.gnu.org} and for updates of CRAN "
-"packages:"
+"For instance, the following command only checks for updates of Emacs "
+"packages hosted at @code{elpa.gnu.org} and for updates of CRAN packages:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:6623
+#: doc/guix.texi:6627
 #, no-wrap
 msgid ""
 "$ guix refresh --type=elpa,cran\n"
@@ -12841,88 +15514,95 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:6629
-msgid "In addition, @command{guix refresh} can be passed one or more package names, as in this example:"
+#: doc/guix.texi:6633
+msgid ""
+"In addition, @command{guix refresh} can be passed one or more package names, "
+"as in this example:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:6632
+#: doc/guix.texi:6636
 #, no-wrap
 msgid "$ ./pre-inst-env guix refresh -u emacs idutils gcc@@4.8\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:6638
+#: doc/guix.texi:6642
 msgid ""
-"The command above specifically updates the @code{emacs} and @code{idutils} packages.  The @code{--select} option would have no "
-"effect in this case."
+"The command above specifically updates the @code{emacs} and @code{idutils} "
+"packages.  The @code{--select} option would have no effect in this case."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:6643
+#: doc/guix.texi:6647
 msgid ""
-"When considering whether to upgrade a package, it is sometimes convenient to know which packages would be affected by the upgrade "
-"and should be checked for compatibility.  For this the following option may be used when passing @command{guix refresh} one or more "
-"package names:"
+"When considering whether to upgrade a package, it is sometimes convenient to "
+"know which packages would be affected by the upgrade and should be checked "
+"for compatibility.  For this the following option may be used when passing "
+"@command{guix refresh} one or more package names:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:6646
+#: doc/guix.texi:6650
 #, no-wrap
 msgid "--list-updaters"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:6647
+#: doc/guix.texi:6651
 #, no-wrap
 msgid "-L"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6649
+#: doc/guix.texi:6653
 msgid "List available updaters and exit (see @option{--type} above.)"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6652
+#: doc/guix.texi:6656
 msgid ""
-"For each updater, display the fraction of packages it covers; at the end, display the fraction of packages covered by all these "
-"updaters."
+"For each updater, display the fraction of packages it covers; at the end, "
+"display the fraction of packages covered by all these updaters."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:6653
+#: doc/guix.texi:6657
 #, no-wrap
 msgid "--list-dependent"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:6654 doc/guix.texi:6799
+#: doc/guix.texi:6658 doc/guix.texi:6803
 #, no-wrap
 msgid "-l"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6657
-msgid "List top-level dependent packages that would need to be rebuilt as a result of upgrading one or more packages."
+#: doc/guix.texi:6661
+msgid ""
+"List top-level dependent packages that would need to be rebuilt as a result "
+"of upgrading one or more packages."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6661
+#: doc/guix.texi:6665
 msgid ""
-"@xref{Invoking guix graph, the @code{reverse-package} type of @command{guix graph}}, for information on how to visualize the list of "
-"dependents of a package."
+"@xref{Invoking guix graph, the @code{reverse-package} type of @command{guix "
+"graph}}, for information on how to visualize the list of dependents of a "
+"package."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:6667
+#: doc/guix.texi:6671
 msgid ""
-"Be aware that the @code{--list-dependent} option only @emph{approximates} the rebuilds that would be required as a result of an "
-"upgrade.  More rebuilds might be required under some circumstances."
+"Be aware that the @code{--list-dependent} option only @emph{approximates} "
+"the rebuilds that would be required as a result of an upgrade.  More "
+"rebuilds might be required under some circumstances."
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:6672
+#: doc/guix.texi:6676
 #, no-wrap
 msgid ""
 "$ guix refresh --list-dependent flex\n"
@@ -12931,203 +15611,224 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:6676
-msgid "The command above lists a set of packages that could be built to check for compatibility with an upgraded @code{flex} package."
+#: doc/guix.texi:6680
+msgid ""
+"The command above lists a set of packages that could be built to check for "
+"compatibility with an upgraded @code{flex} package."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:6678
+#: doc/guix.texi:6682
 msgid "The following options can be used to customize GnuPG operation:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:6681
+#: doc/guix.texi:6685
 #, no-wrap
 msgid "--gpg=@var{command}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6684
-msgid "Use @var{command} as the GnuPG 2.x command.  @var{command} is searched for in @code{$PATH}."
+#: doc/guix.texi:6688
+msgid ""
+"Use @var{command} as the GnuPG 2.x command.  @var{command} is searched for "
+"in @code{$PATH}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6688
-msgid "Handle missing OpenPGP keys according to @var{policy}, which may be one of:"
+#: doc/guix.texi:6692
+msgid ""
+"Handle missing OpenPGP keys according to @var{policy}, which may be one of:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:6690 doc/guix.texi:13666
+#: doc/guix.texi:6694 doc/guix.texi:13715
 #, no-wrap
 msgid "always"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6693
-msgid "Always download missing OpenPGP keys from the key server, and add them to the user's GnuPG keyring."
+#: doc/guix.texi:6697
+msgid ""
+"Always download missing OpenPGP keys from the key server, and add them to "
+"the user's GnuPG keyring."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:6694 doc/guix.texi:13668
+#: doc/guix.texi:6698 doc/guix.texi:13717
 #, no-wrap
 msgid "never"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6696
+#: doc/guix.texi:6700
 msgid "Never try to download missing OpenPGP keys.  Instead just bail out."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:6697
+#: doc/guix.texi:6701
 #, no-wrap
 msgid "interactive"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6700
+#: doc/guix.texi:6704
 msgid ""
-"When a package signed with an unknown OpenPGP key is encountered, ask the user whether to download it or not.  This is the default "
-"behavior."
+"When a package signed with an unknown OpenPGP key is encountered, ask the "
+"user whether to download it or not.  This is the default behavior."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:6702
+#: doc/guix.texi:6706
 #, no-wrap
 msgid "--key-server=@var{host}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6704
+#: doc/guix.texi:6708
 msgid "Use @var{host} as the OpenPGP key server when importing a public key."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:6717
+#: doc/guix.texi:6721
 msgid ""
-"The @code{github} updater uses the @uref{https://developer.github.com/v3/, GitHub API} to query for new releases.  When used "
-"repeatedly e.g. when refreshing all packages, GitHub will eventually refuse to answer any further API requests.  By default 60 API "
-"requests per hour are allowed, and a full refresh on all GitHub packages in Guix requires more than this.  Authentication with "
-"GitHub through the use of an API token alleviates these limits.  To use an API token, set the environment variable "
-"@code{GUIX_GITHUB_TOKEN} to a token procured from @uref{https://github.com/settings/tokens} or otherwise."
+"The @code{github} updater uses the @uref{https://developer.github.com/v3/, "
+"GitHub API} to query for new releases.  When used repeatedly e.g. when "
+"refreshing all packages, GitHub will eventually refuse to answer any further "
+"API requests.  By default 60 API requests per hour are allowed, and a full "
+"refresh on all GitHub packages in Guix requires more than this.  "
+"Authentication with GitHub through the use of an API token alleviates these "
+"limits.  To use an API token, set the environment variable "
+"@code{GUIX_GITHUB_TOKEN} to a token procured from @uref{https://github.com/"
+"settings/tokens} or otherwise."
 msgstr ""
 
 #. type: section
-#: doc/guix.texi:6720
+#: doc/guix.texi:6724
 #, no-wrap
 msgid "Invoking @command{guix lint}"
 msgstr ""
 
 #. type: command{#1}
-#: doc/guix.texi:6722
+#: doc/guix.texi:6726
 #, no-wrap
 msgid "guix lint"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:6723
+#: doc/guix.texi:6727
 #, no-wrap
 msgid "package, checking for errors"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:6729
+#: doc/guix.texi:6733
 msgid ""
-"The @command{guix lint} command is meant to help package developers avoid common errors and use a consistent style.  It runs a "
-"number of checks on a given set of packages in order to find common mistakes in their definitions.  Available @dfn{checkers} include "
-"(see @code{--list-checkers} for a complete list):"
+"The @command{guix lint} command is meant to help package developers avoid "
+"common errors and use a consistent style.  It runs a number of checks on a "
+"given set of packages in order to find common mistakes in their "
+"definitions.  Available @dfn{checkers} include (see @code{--list-checkers} "
+"for a complete list):"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6735
-msgid "Validate certain typographical and stylistic rules about package descriptions and synopses."
+#: doc/guix.texi:6739
+msgid ""
+"Validate certain typographical and stylistic rules about package "
+"descriptions and synopses."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:6736
+#: doc/guix.texi:6740
 #, no-wrap
 msgid "inputs-should-be-native"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6738
+#: doc/guix.texi:6742
 msgid "Identify inputs that should most likely be native inputs."
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:6741
+#: doc/guix.texi:6745
 #, no-wrap
 msgid "mirror-url"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:6742
+#: doc/guix.texi:6746
 #, no-wrap
 msgid "source-file-name"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6748
+#: doc/guix.texi:6752
 msgid ""
-"Probe @code{home-page} and @code{source} URLs and report those that are invalid.  Suggest a @code{mirror://} URL when applicable.  "
-"Check that the source file name is meaningful, e.g. is not just a version number or ``git-checkout'', without a declared @code{file-"
-"name} (@pxref{origin Reference})."
+"Probe @code{home-page} and @code{source} URLs and report those that are "
+"invalid.  Suggest a @code{mirror://} URL when applicable.  Check that the "
+"source file name is meaningful, e.g. is not just a version number or ``git-"
+"checkout'', without a declared @code{file-name} (@pxref{origin Reference})."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:6749
+#: doc/guix.texi:6753
 #, no-wrap
 msgid "cve"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:6750 doc/guix.texi:21423
+#: doc/guix.texi:6754 doc/guix.texi:21485
 #, no-wrap
 msgid "security vulnerabilities"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:6751
+#: doc/guix.texi:6755
 #, no-wrap
 msgid "CVE, Common Vulnerabilities and Exposures"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6756
+#: doc/guix.texi:6760
 msgid ""
-"Report known vulnerabilities found in the Common Vulnerabilities and Exposures (CVE) databases of the current and past year "
-"@uref{https://nvd.nist.gov/download.cfm#CVE_FEED, published by the US NIST}."
+"Report known vulnerabilities found in the Common Vulnerabilities and "
+"Exposures (CVE) databases of the current and past year @uref{https://nvd."
+"nist.gov/download.cfm#CVE_FEED, published by the US NIST}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6758
-msgid "To view information about a particular vulnerability, visit pages such as:"
+#: doc/guix.texi:6762
+msgid ""
+"To view information about a particular vulnerability, visit pages such as:"
 msgstr ""
 
 #. type: indicateurl{#1}
-#: doc/guix.texi:6762
+#: doc/guix.texi:6766
 msgid "https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-YYYY-ABCD"
 msgstr ""
 
 #. type: indicateurl{#1}
-#: doc/guix.texi:6764
+#: doc/guix.texi:6768
 msgid "https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-YYYY-ABCD"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6769
-msgid "where @code{CVE-YYYY-ABCD} is the CVE identifier---e.g., @code{CVE-2015-7554}."
+#: doc/guix.texi:6773
+msgid ""
+"where @code{CVE-YYYY-ABCD} is the CVE identifier---e.g., "
+"@code{CVE-2015-7554}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6774
+#: doc/guix.texi:6778
 msgid ""
-"Package developers can specify in package recipes the @uref{https://nvd.nist.gov/cpe.cfm,Common Platform Enumeration (CPE)} name and "
-"version of the package when they differ from the name that Guix uses, as in this example:"
+"Package developers can specify in package recipes the @uref{https://nvd.nist."
+"gov/cpe.cfm,Common Platform Enumeration (CPE)} name and version of the "
+"package when they differ from the name that Guix uses, as in this example:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:6781
+#: doc/guix.texi:6785
 #, no-wrap
 msgid ""
 "(package\n"
@@ -13138,97 +15839,107 @@ msgid ""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:6783
+#: doc/guix.texi:6787
 #, no-wrap
 msgid "formatting"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6786
-msgid "Warn about obvious source code formatting issues: trailing white space, use of tabulations, etc."
+#: doc/guix.texi:6790
+msgid ""
+"Warn about obvious source code formatting issues: trailing white space, use "
+"of tabulations, etc."
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:6792
+#: doc/guix.texi:6796
 #, no-wrap
 msgid "guix lint @var{options} @var{package}@dots{}\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:6796
+#: doc/guix.texi:6800
 msgid ""
-"If no package is given on the command line, then all packages are checked.  The @var{options} may be zero or more of the following:"
+"If no package is given on the command line, then all packages are checked.  "
+"The @var{options} may be zero or more of the following:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:6798
+#: doc/guix.texi:6802
 #, no-wrap
 msgid "--list-checkers"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6802
-msgid "List and describe all the available checkers that will be run on packages and exit."
+#: doc/guix.texi:6806
+msgid ""
+"List and describe all the available checkers that will be run on packages "
+"and exit."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:6803
+#: doc/guix.texi:6807
 #, no-wrap
 msgid "--checkers"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:6804
+#: doc/guix.texi:6808
 #, no-wrap
 msgid "-c"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6807
-msgid "Only enable the checkers specified in a comma-separated list using the names returned by @code{--list-checkers}."
+#: doc/guix.texi:6811
+msgid ""
+"Only enable the checkers specified in a comma-separated list using the names "
+"returned by @code{--list-checkers}."
 msgstr ""
 
 #. type: section
-#: doc/guix.texi:6811
+#: doc/guix.texi:6815
 #, no-wrap
 msgid "Invoking @command{guix size}"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:6813
+#: doc/guix.texi:6817
 #, no-wrap
 msgid "size"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:6814
+#: doc/guix.texi:6818
 #, no-wrap
 msgid "package size"
 msgstr ""
 
 #. type: command{#1}
-#: doc/guix.texi:6816
+#: doc/guix.texi:6820
 #, no-wrap
 msgid "guix size"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:6823
+#: doc/guix.texi:6827
 msgid ""
-"The @command{guix size} command helps package developers profile the disk usage of packages.  It is easy to overlook the impact of "
-"an additional dependency added to a package, or the impact of using a single output for a package that could easily be split "
-"(@pxref{Packages with Multiple Outputs}).  Such are the typical issues that @command{guix size} can highlight."
+"The @command{guix size} command helps package developers profile the disk "
+"usage of packages.  It is easy to overlook the impact of an additional "
+"dependency added to a package, or the impact of using a single output for a "
+"package that could easily be split (@pxref{Packages with Multiple "
+"Outputs}).  Such are the typical issues that @command{guix size} can "
+"highlight."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:6827
+#: doc/guix.texi:6831
 msgid ""
-"The command can be passed a package specification such as @code{gcc@@4.8} or @code{guile:debug}, or a file name in the store.  "
-"Consider this example:"
+"The command can be passed a package specification such as @code{gcc@@4.8} or "
+"@code{guile:debug}, or a file name in the store.  Consider this example:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:6837
+#: doc/guix.texi:6841
 #, no-wrap
 msgid ""
 "$ guix size coreutils\n"
@@ -13242,60 +15953,69 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:6843
+#: doc/guix.texi:6847
 msgid ""
-"The store items listed here constitute the @dfn{transitive closure} of Coreutils---i.e., Coreutils and all its dependencies, "
-"recursively---as would be returned by:"
+"The store items listed here constitute the @dfn{transitive closure} of "
+"Coreutils---i.e., Coreutils and all its dependencies, recursively---as would "
+"be returned by:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:6846
+#: doc/guix.texi:6850
 #, no-wrap
 msgid "$ guix gc -R /gnu/store/@dots{}-coreutils-8.23\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:6854
+#: doc/guix.texi:6858
 msgid ""
-"Here the output shows three columns next to store items.  The first column, labeled ``total'', shows the size in mebibytes (MiB) of "
-"the closure of the store item---that is, its own size plus the size of all its dependencies.  The next column, labeled ``self'', "
-"shows the size of the item itself.  The last column shows the ratio of the size of the item itself to the space occupied by all the "
-"items listed here."
+"Here the output shows three columns next to store items.  The first column, "
+"labeled ``total'', shows the size in mebibytes (MiB) of the closure of the "
+"store item---that is, its own size plus the size of all its dependencies.  "
+"The next column, labeled ``self'', shows the size of the item itself.  The "
+"last column shows the ratio of the size of the item itself to the space "
+"occupied by all the items listed here."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:6859
+#: doc/guix.texi:6863
 msgid ""
-"In this example, we see that the closure of Coreutils weighs in at 70@tie{}MiB, half of which is taken by libc.  (That libc "
-"represents a large fraction of the closure is not a problem @i{per se} because it is always available on the system anyway.)"
+"In this example, we see that the closure of Coreutils weighs in at 70@tie{}"
+"MiB, half of which is taken by libc.  (That libc represents a large fraction "
+"of the closure is not a problem @i{per se} because it is always available on "
+"the system anyway.)"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:6865
+#: doc/guix.texi:6869
 msgid ""
-"When the package passed to @command{guix size} is available in the store, @command{guix size} queries the daemon to determine its "
-"dependencies, and measures its size in the store, similar to @command{du -ms --apparent-size} (@pxref{du invocation,,, coreutils, "
-"GNU Coreutils})."
+"When the package passed to @command{guix size} is available in the store, "
+"@command{guix size} queries the daemon to determine its dependencies, and "
+"measures its size in the store, similar to @command{du -ms --apparent-size} "
+"(@pxref{du invocation,,, coreutils, GNU Coreutils})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:6870
+#: doc/guix.texi:6874
 msgid ""
-"When the given package is @emph{not} in the store, @command{guix size} reports information based on the available substitutes "
-"(@pxref{Substitutes}).  This makes it possible it to profile disk usage of store items that are not even on disk, only available "
-"remotely."
+"When the given package is @emph{not} in the store, @command{guix size} "
+"reports information based on the available substitutes "
+"(@pxref{Substitutes}).  This makes it possible it to profile disk usage of "
+"store items that are not even on disk, only available remotely."
 msgstr ""
-"Lorsque le paquet donné n'est @emph{pas} dans le dépôt, @command{guix size} rapporte les informations en se basant sur les "
-"substituts disponibles (@pxref{Substituts}). Cela permet de profiler l'utilisation du disque des éléments du dépôt qui ne sont pas "
-"sur le disque, mais seulement disponibles à distance."
+"Lorsque le paquet donné n'est @emph{pas} dans le dépôt, @command{guix size} "
+"rapporte les informations en se basant sur les substituts disponibles "
+"(@pxref{Substituts}). Cela permet de profiler l'utilisation du disque des "
+"éléments du dépôt qui ne sont pas sur le disque, mais seulement disponibles "
+"à distance."
 
 #. type: Plain text
-#: doc/guix.texi:6872
+#: doc/guix.texi:6876
 msgid "You can also specify several package names:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:6882
+#: doc/guix.texi:6886
 #, no-wrap
 msgid ""
 "$ guix size coreutils grep sed bash\n"
@@ -13309,515 +16029,562 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:6888
+#: doc/guix.texi:6892
 msgid ""
-"In this example we see that the combination of the four packages takes 102.3@tie{}MiB in total, which is much less than the sum of "
-"each closure since they have a lot of dependencies in common."
+"In this example we see that the combination of the four packages takes "
+"102.3@tie{}MiB in total, which is much less than the sum of each closure "
+"since they have a lot of dependencies in common."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:6890
+#: doc/guix.texi:6894
 msgid "The available options are:"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6896
-msgid "Use substitute information from @var{urls}.  @xref{client-substitute-urls, the same option for @code{guix build}}."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:6897
-#, no-wrap
-msgid "--sort=@var{key}"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:6899
-msgid "Sort lines according to @var{key}, one of the following options:"
+#: doc/guix.texi:6900
+msgid ""
+"Use substitute information from @var{urls}.  @xref{client-substitute-urls, "
+"the same option for @code{guix build}}."
 msgstr ""
 
 #. type: item
 #: doc/guix.texi:6901
 #, no-wrap
-msgid "self"
+msgid "--sort=@var{key}"
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:6903
+msgid "Sort lines according to @var{key}, one of the following options:"
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:6905
+#, no-wrap
+msgid "self"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:6907
 msgid "the size of each item (the default);"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6905
+#: doc/guix.texi:6909
 msgid "the total size of the item's closure."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:6907
+#: doc/guix.texi:6911
 #, no-wrap
 msgid "--map-file=@var{file}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6909
+#: doc/guix.texi:6913
 msgid "Write a graphical map of disk usage in PNG format to @var{file}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6911
+#: doc/guix.texi:6915
 msgid "For the example above, the map looks like this:"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6914
-msgid "@image{images/coreutils-size-map,5in,, map of Coreutils disk usage produced by @command{guix size}}"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:6919
+#: doc/guix.texi:6918
 msgid ""
-"This option requires that @uref{http://wingolog.org/software/guile-charting/, Guile-Charting} be installed and visible in Guile's "
-"module search path.  When that is not the case, @command{guix size} fails as it tries to load it."
+"@image{images/coreutils-size-map,5in,, map of Coreutils disk usage produced "
+"by @command{guix size}}"
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:6923
+msgid ""
+"This option requires that @uref{http://wingolog.org/software/guile-"
+"charting/, Guile-Charting} be installed and visible in Guile's module search "
+"path.  When that is not the case, @command{guix size} fails as it tries to "
+"load it."
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:6927
 msgid "Consider packages for @var{system}---e.g., @code{x86_64-linux}."
 msgstr ""
 
 #. type: section
-#: doc/guix.texi:6927
+#: doc/guix.texi:6931
 #, no-wrap
 msgid "Invoking @command{guix graph}"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:6929
+#: doc/guix.texi:6933
 #, no-wrap
 msgid "DAG"
 msgstr ""
 
 #. type: command{#1}
-#: doc/guix.texi:6930
+#: doc/guix.texi:6934
 #, no-wrap
 msgid "guix graph"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:6944
+#: doc/guix.texi:6948
 msgid ""
-"Packages and their dependencies form a @dfn{graph}, specifically a directed acyclic graph (DAG).  It can quickly become difficult to "
-"have a mental model of the package DAG, so the @command{guix graph} command provides a visual representation of the DAG.  By "
-"default, @command{guix graph} emits a DAG representation in the input format of @uref{http://www.graphviz.org/, Graphviz}, so its "
-"output can be passed directly to the @command{dot} command of Graphviz.  It can also emit an HTML page with embedded JavaScript code "
-"to display a ``chord diagram'' in a Web browser, using the @uref{https://d3js.org/, d3.js} library, or emit Cypher queries to "
-"construct a graph in a graph database supporting the @uref{http://www.opencypher.org/, openCypher} query language.  The general "
-"syntax is:"
+"Packages and their dependencies form a @dfn{graph}, specifically a directed "
+"acyclic graph (DAG).  It can quickly become difficult to have a mental model "
+"of the package DAG, so the @command{guix graph} command provides a visual "
+"representation of the DAG.  By default, @command{guix graph} emits a DAG "
+"representation in the input format of @uref{http://www.graphviz.org/, "
+"Graphviz}, so its output can be passed directly to the @command{dot} command "
+"of Graphviz.  It can also emit an HTML page with embedded JavaScript code to "
+"display a ``chord diagram'' in a Web browser, using the @uref{https://d3js."
+"org/, d3.js} library, or emit Cypher queries to construct a graph in a graph "
+"database supporting the @uref{http://www.opencypher.org/, openCypher} query "
+"language.  The general syntax is:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:6947
+#: doc/guix.texi:6951
 #, no-wrap
 msgid "guix graph @var{options} @var{package}@dots{}\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:6952
+#: doc/guix.texi:6956
 msgid ""
-"For example, the following command generates a PDF file representing the package DAG for the GNU@tie{}Core Utilities, showing its "
-"build-time dependencies:"
+"For example, the following command generates a PDF file representing the "
+"package DAG for the GNU@tie{}Core Utilities, showing its build-time "
+"dependencies:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:6955
+#: doc/guix.texi:6959
 #, no-wrap
 msgid "guix graph coreutils | dot -Tpdf > dag.pdf\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:6958
+#: doc/guix.texi:6962
 msgid "The output looks like this:"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:6960
-msgid "@image{images/coreutils-graph,2in,,Dependency graph of the GNU Coreutils}"
+#: doc/guix.texi:6964
+msgid ""
+"@image{images/coreutils-graph,2in,,Dependency graph of the GNU Coreutils}"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:6962
+#: doc/guix.texi:6966
 msgid "Nice little graph, no?"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:6968
+#: doc/guix.texi:6972
 msgid ""
-"But there is more than one graph! The one above is concise: it is the graph of package objects, omitting implicit inputs such as "
-"GCC, libc, grep, etc.  It is often useful to have such a concise graph, but sometimes one may want to see more details.  "
-"@command{guix graph} supports several types of graphs, allowing you to choose the level of detail:"
+"But there is more than one graph! The one above is concise: it is the graph "
+"of package objects, omitting implicit inputs such as GCC, libc, grep, etc.  "
+"It is often useful to have such a concise graph, but sometimes one may want "
+"to see more details.  @command{guix graph} supports several types of graphs, "
+"allowing you to choose the level of detail:"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6974
+#: doc/guix.texi:6978
 msgid ""
-"This is the default type used in the example above.  It shows the DAG of package objects, excluding implicit dependencies.  It is "
-"concise, but filters out many details."
+"This is the default type used in the example above.  It shows the DAG of "
+"package objects, excluding implicit dependencies.  It is concise, but "
+"filters out many details."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:6975
+#: doc/guix.texi:6979
 #, no-wrap
 msgid "reverse-package"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6977
+#: doc/guix.texi:6981
 msgid "This shows the @emph{reverse} DAG of packages.  For example:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:6980
+#: doc/guix.texi:6984
 #, no-wrap
 msgid "guix graph --type=reverse-package ocaml\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6983
+#: doc/guix.texi:6987
 msgid "... yields the graph of packages that depend on OCaml."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6988
+#: doc/guix.texi:6992
 msgid ""
-"Note that for core packages this can yield huge graphs.  If all you want is to know the number of packages that depend on a given "
-"package, use @command{guix refresh --list-dependent} (@pxref{Invoking guix refresh, @option{--list-dependent}})."
+"Note that for core packages this can yield huge graphs.  If all you want is "
+"to know the number of packages that depend on a given package, use "
+"@command{guix refresh --list-dependent} (@pxref{Invoking guix refresh, "
+"@option{--list-dependent}})."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:6989
+#: doc/guix.texi:6993
 #, no-wrap
 msgid "bag-emerged"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6991
+#: doc/guix.texi:6995
 msgid "This is the package DAG, @emph{including} implicit inputs."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6993
+#: doc/guix.texi:6997
 msgid "For instance, the following command:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:6996
+#: doc/guix.texi:7000
 #, no-wrap
 msgid "guix graph --type=bag-emerged coreutils | dot -Tpdf > dag.pdf\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6999
+#: doc/guix.texi:7003
 msgid "... yields this bigger graph:"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7001
-msgid "@image{images/coreutils-bag-graph,,5in,Detailed dependency graph of the GNU Coreutils}"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:7004
+#: doc/guix.texi:7005
 msgid ""
-"At the bottom of the graph, we see all the implicit inputs of @var{gnu-build-system} (@pxref{Build Systems, @code{gnu-build-"
-"system}})."
+"@image{images/coreutils-bag-graph,,5in,Detailed dependency graph of the GNU "
+"Coreutils}"
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:7008
 msgid ""
-"Now, note that the dependencies of these implicit inputs---that is, the @dfn{bootstrap dependencies} (@pxref{Bootstrapping})---are "
-"not shown here, for conciseness."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:7009
-#, no-wrap
-msgid "bag"
+"At the bottom of the graph, we see all the implicit inputs of @var{gnu-build-"
+"system} (@pxref{Build Systems, @code{gnu-build-system}})."
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:7012
-msgid "Similar to @code{bag-emerged}, but this time including all the bootstrap dependencies."
+msgid ""
+"Now, note that the dependencies of these implicit inputs---that is, the "
+"@dfn{bootstrap dependencies} (@pxref{Bootstrapping})---are not shown here, "
+"for conciseness."
 msgstr ""
 
 #. type: item
 #: doc/guix.texi:7013
 #, no-wrap
+msgid "bag"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:7016
+msgid ""
+"Similar to @code{bag-emerged}, but this time including all the bootstrap "
+"dependencies."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:7017
+#, no-wrap
 msgid "bag-with-origins"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7015
+#: doc/guix.texi:7019
 msgid "Similar to @code{bag}, but also showing origins and their dependencies."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7021
+#: doc/guix.texi:7025
 msgid ""
-"This is the most detailed representation: It shows the DAG of derivations (@pxref{Derivations}) and plain store items.  Compared to "
-"the above representation, many additional nodes are visible, including build scripts, patches, Guile modules, etc."
+"This is the most detailed representation: It shows the DAG of derivations "
+"(@pxref{Derivations}) and plain store items.  Compared to the above "
+"representation, many additional nodes are visible, including build scripts, "
+"patches, Guile modules, etc."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7024
-msgid "For this type of graph, it is also possible to pass a @file{.drv} file name instead of a package name, as in:"
+#: doc/guix.texi:7028
+msgid ""
+"For this type of graph, it is also possible to pass a @file{.drv} file name "
+"instead of a package name, as in:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:7027
+#: doc/guix.texi:7031
 #, no-wrap
 msgid "guix graph -t derivation `guix system build -d my-config.scm`\n"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:7029
+#: doc/guix.texi:7033
 #, no-wrap
 msgid "module"
 msgstr "module"
 
 #. type: table
-#: doc/guix.texi:7033
+#: doc/guix.texi:7037
 msgid ""
-"This is the graph of @dfn{package modules} (@pxref{Package Modules}).  For example, the following command shows the graph for the "
-"package module that defines the @code{guile} package:"
+"This is the graph of @dfn{package modules} (@pxref{Package Modules}).  For "
+"example, the following command shows the graph for the package module that "
+"defines the @code{guile} package:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:7036
+#: doc/guix.texi:7040
 #, no-wrap
 msgid "guix graph -t module guile | dot -Tpdf > module-graph.pdf\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7041
+#: doc/guix.texi:7045
 msgid ""
-"All the types above correspond to @emph{build-time dependencies}.  The following graph type represents the @emph{run-time "
-"dependencies}:"
+"All the types above correspond to @emph{build-time dependencies}.  The "
+"following graph type represents the @emph{run-time dependencies}:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:7043
+#: doc/guix.texi:7047
 #, no-wrap
 msgid "references"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7046
+#: doc/guix.texi:7050
 msgid ""
-"This is the graph of @dfn{references} of a package output, as returned by @command{guix gc --references} (@pxref{Invoking guix gc})."
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:7049
-msgid ""
-"If the given package output is not available in the store, @command{guix graph} attempts to obtain dependency information from "
-"substitutes."
+"This is the graph of @dfn{references} of a package output, as returned by "
+"@command{guix gc --references} (@pxref{Invoking guix gc})."
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:7053
 msgid ""
-"Here you can also pass a store file name instead of a package name.  For example, the command below produces the reference graph of "
-"your profile (which can be big!):"
+"If the given package output is not available in the store, @command{guix "
+"graph} attempts to obtain dependency information from substitutes."
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:7057
+msgid ""
+"Here you can also pass a store file name instead of a package name.  For "
+"example, the command below produces the reference graph of your profile "
+"(which can be big!):"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:7056
+#: doc/guix.texi:7060
 #, no-wrap
 msgid "guix graph -t references `readlink -f ~/.guix-profile`\n"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:7058
+#: doc/guix.texi:7062
 #, no-wrap
 msgid "referrers"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7061
+#: doc/guix.texi:7065
 msgid ""
-"This is the graph of the @dfn{referrers} of a store item, as returned by @command{guix gc --referrers} (@pxref{Invoking guix gc})."
+"This is the graph of the @dfn{referrers} of a store item, as returned by "
+"@command{guix gc --referrers} (@pxref{Invoking guix gc})."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7067
+#: doc/guix.texi:7071
 msgid ""
-"This relies exclusively on local information from your store.  For instance, let us suppose that the current Inkscape is available "
-"in 10 profiles on your machine; @command{guix graph -t referrers inkscape} will show a graph rooted at Inkscape and with those 10 "
-"profiles linked to it."
+"This relies exclusively on local information from your store.  For instance, "
+"let us suppose that the current Inkscape is available in 10 profiles on your "
+"machine; @command{guix graph -t referrers inkscape} will show a graph rooted "
+"at Inkscape and with those 10 profiles linked to it."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7070
-msgid "It can help determine what is preventing a store item from being garbage collected."
+#: doc/guix.texi:7074
+msgid ""
+"It can help determine what is preventing a store item from being garbage "
+"collected."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7074
+#: doc/guix.texi:7078
 msgid "The available options are the following:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:7076
+#: doc/guix.texi:7080
 #, no-wrap
 msgid "--type=@var{type}"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:7077 doc/guix.texi:20541
+#: doc/guix.texi:7081 doc/guix.texi:20603
 #, no-wrap
 msgid "-t @var{type}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7080
-msgid "Produce a graph output of @var{type}, where @var{type} must be one of the values listed above."
+#: doc/guix.texi:7084
+msgid ""
+"Produce a graph output of @var{type}, where @var{type} must be one of the "
+"values listed above."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:7081
+#: doc/guix.texi:7085
 #, no-wrap
 msgid "--list-types"
 msgstr ""
 
-#. type: table
-#: doc/guix.texi:7083
-msgid "List the supported graph types."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:7084
-#, no-wrap
-msgid "--backend=@var{backend}"
-msgstr ""
-
-#. type: itemx
-#: doc/guix.texi:7085
-#, no-wrap
-msgid "-b @var{backend}"
-msgstr ""
-
 #. type: table
 #: doc/guix.texi:7087
-msgid "Produce a graph using the selected @var{backend}."
+msgid "List the supported graph types."
 msgstr ""
 
 #. type: item
 #: doc/guix.texi:7088
 #, no-wrap
+msgid "--backend=@var{backend}"
+msgstr ""
+
+#. type: itemx
+#: doc/guix.texi:7089
+#, no-wrap
+msgid "-b @var{backend}"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:7091
+msgid "Produce a graph using the selected @var{backend}."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:7092
+#, no-wrap
 msgid "--list-backends"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7090
+#: doc/guix.texi:7094
 msgid "List the supported graph backends."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7092
+#: doc/guix.texi:7096
 msgid "Currently, the available backends are Graphviz and d3.js."
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:7101
+#: doc/guix.texi:7105
 #, no-wrap
 msgid "guix graph -e '(@@@@ (gnu packages commencement) gnu-make-final)'\n"
 msgstr ""
 
 #. type: section
-#: doc/guix.texi:7106
+#: doc/guix.texi:7110
 #, no-wrap
 msgid "Invoking @command{guix environment}"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:7108
+#: doc/guix.texi:7112
 #, no-wrap
 msgid "reproducible build environments"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:7109
+#: doc/guix.texi:7113
 #, no-wrap
 msgid "development environments"
 msgstr ""
 
 #. type: command{#1}
-#: doc/guix.texi:7110
+#: doc/guix.texi:7114
 #, no-wrap
 msgid "guix environment"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:7111
+#: doc/guix.texi:7115
 #, no-wrap
 msgid "environment, package build environment"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7117
+#: doc/guix.texi:7121
 msgid ""
-"The purpose of @command{guix environment} is to assist hackers in creating reproducible development environments without polluting "
-"their package profile.  The @command{guix environment} tool takes one or more packages, builds all of their inputs, and creates a "
-"shell environment to use them."
+"The purpose of @command{guix environment} is to assist hackers in creating "
+"reproducible development environments without polluting their package "
+"profile.  The @command{guix environment} tool takes one or more packages, "
+"builds all of their inputs, and creates a shell environment to use them."
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:7122
+#: doc/guix.texi:7126
 #, no-wrap
 msgid "guix environment @var{options} @var{package}@dots{}\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7126
-msgid "The following example spawns a new shell set up for the development of GNU@tie{}Guile:"
+#: doc/guix.texi:7130
+msgid ""
+"The following example spawns a new shell set up for the development of "
+"GNU@tie{}Guile:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:7129
+#: doc/guix.texi:7133
 #, no-wrap
 msgid "guix environment guile\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7146
+#: doc/guix.texi:7150
 msgid ""
-"If the needed dependencies are not built yet, @command{guix environment} automatically builds them.  The environment of the new "
-"shell is an augmented version of the environment that @command{guix environment} was run in.  It contains the necessary search paths "
-"for building the given package added to the existing environment variables.  To create a ``pure'' environment, in which the original "
-"environment variables have been unset, use the @code{--pure} option@footnote{Users sometimes wrongfully augment environment "
-"variables such as @code{PATH} in their @file{~/.bashrc} file.  As a consequence, when @code{guix environment} launches it, Bash may "
-"read @file{~/.bashrc}, thereby introducing ``impurities'' in these environment variables.  It is an error to define such environment "
-"variables in @file{.bashrc}; instead, they should be defined in @file{.bash_profile}, which is sourced only by log-in shells.  "
-"@xref{Bash Startup Files,,, bash, The GNU Bash Reference Manual}, for details on Bash start-up files.}."
+"If the needed dependencies are not built yet, @command{guix environment} "
+"automatically builds them.  The environment of the new shell is an augmented "
+"version of the environment that @command{guix environment} was run in.  It "
+"contains the necessary search paths for building the given package added to "
+"the existing environment variables.  To create a ``pure'' environment, in "
+"which the original environment variables have been unset, use the @code{--"
+"pure} option@footnote{Users sometimes wrongfully augment environment "
+"variables such as @code{PATH} in their @file{~/.bashrc} file.  As a "
+"consequence, when @code{guix environment} launches it, Bash may read "
+"@file{~/.bashrc}, thereby introducing ``impurities'' in these environment "
+"variables.  It is an error to define such environment variables in @file{."
+"bashrc}; instead, they should be defined in @file{.bash_profile}, which is "
+"sourced only by log-in shells.  @xref{Bash Startup Files,,, bash, The GNU "
+"Bash Reference Manual}, for details on Bash start-up files.}."
 msgstr ""
 
 #. type: vindex
-#: doc/guix.texi:7147
+#: doc/guix.texi:7151
 #, no-wrap
 msgid "GUIX_ENVIRONMENT"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7153
+#: doc/guix.texi:7157
 msgid ""
-"@command{guix environment} defines the @code{GUIX_ENVIRONMENT} variable in the shell it spawns; its value is the file name of the "
-"profile of this environment.  This allows users to, say, define a specific prompt for development environments in their @file{."
-"bashrc} (@pxref{Bash Startup Files,,, bash, The GNU Bash Reference Manual}):"
+"@command{guix environment} defines the @code{GUIX_ENVIRONMENT} variable in "
+"the shell it spawns; its value is the file name of the profile of this "
+"environment.  This allows users to, say, define a specific prompt for "
+"development environments in their @file{.bashrc} (@pxref{Bash Startup "
+"Files,,, bash, The GNU Bash Reference Manual}):"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:7159
+#: doc/guix.texi:7163
 #, no-wrap
 msgid ""
 "if [ -n \"$GUIX_ENVIRONMENT\" ]\n"
@@ -13827,387 +16594,433 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7163
+#: doc/guix.texi:7167
 msgid "... or to browse the profile:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:7166
+#: doc/guix.texi:7170
 #, no-wrap
 msgid "$ ls \"$GUIX_ENVIRONMENT/bin\"\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7172
+#: doc/guix.texi:7176
 msgid ""
-"Additionally, more than one package may be specified, in which case the union of the inputs for the given packages are used.  For "
-"example, the command below spawns a shell where all of the dependencies of both Guile and Emacs are available:"
+"Additionally, more than one package may be specified, in which case the "
+"union of the inputs for the given packages are used.  For example, the "
+"command below spawns a shell where all of the dependencies of both Guile and "
+"Emacs are available:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:7175
+#: doc/guix.texi:7179
 #, no-wrap
 msgid "guix environment guile emacs\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7180
+#: doc/guix.texi:7184
 msgid ""
-"Sometimes an interactive shell session is not desired.  An arbitrary command may be invoked by placing the @code{--} token to "
-"separate the command from the rest of the arguments:"
+"Sometimes an interactive shell session is not desired.  An arbitrary command "
+"may be invoked by placing the @code{--} token to separate the command from "
+"the rest of the arguments:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:7183
+#: doc/guix.texi:7187
 #, no-wrap
 msgid "guix environment guile -- make -j4\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7189
+#: doc/guix.texi:7193
 msgid ""
-"In other situations, it is more convenient to specify the list of packages needed in the environment.  For example, the following "
-"command runs @command{python} from an environment containing Python@tie{}2.7 and NumPy:"
+"In other situations, it is more convenient to specify the list of packages "
+"needed in the environment.  For example, the following command runs "
+"@command{python} from an environment containing Python@tie{}2.7 and NumPy:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:7192
+#: doc/guix.texi:7196
 #, no-wrap
 msgid "guix environment --ad-hoc python2-numpy python-2.7 -- python\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7203
+#: doc/guix.texi:7207
 msgid ""
-"Furthermore, one might want the dependencies of a package and also some additional packages that are not build-time or runtime "
-"dependencies, but are useful when developing nonetheless.  Because of this, the @code{--ad-hoc} flag is positional.  Packages "
-"appearing before @code{--ad-hoc} are interpreted as packages whose dependencies will be added to the environment.  Packages "
-"appearing after are interpreted as packages that will be added to the environment directly.  For example, the following command "
-"creates a Guix development environment that additionally includes Git and strace:"
+"Furthermore, one might want the dependencies of a package and also some "
+"additional packages that are not build-time or runtime dependencies, but are "
+"useful when developing nonetheless.  Because of this, the @code{--ad-hoc} "
+"flag is positional.  Packages appearing before @code{--ad-hoc} are "
+"interpreted as packages whose dependencies will be added to the "
+"environment.  Packages appearing after are interpreted as packages that will "
+"be added to the environment directly.  For example, the following command "
+"creates a Guix development environment that additionally includes Git and "
+"strace:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:7206
+#: doc/guix.texi:7210
 #, no-wrap
 msgid "guix environment guix --ad-hoc git strace\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7215
+#: doc/guix.texi:7219
 msgid ""
-"Sometimes it is desirable to isolate the environment as much as possible, for maximal purity and reproducibility.  In particular, "
-"when using Guix on a host distro that is not GuixSD, it is desirable to prevent access to @file{/usr/bin} and other system-wide "
-"resources from the development environment.  For example, the following command spawns a Guile REPL in a ``container'' where only "
-"the store and the current working directory are mounted:"
+"Sometimes it is desirable to isolate the environment as much as possible, "
+"for maximal purity and reproducibility.  In particular, when using Guix on a "
+"host distro that is not GuixSD, it is desirable to prevent access to @file{/"
+"usr/bin} and other system-wide resources from the development environment.  "
+"For example, the following command spawns a Guile REPL in a ``container'' "
+"where only the store and the current working directory are mounted:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:7218
+#: doc/guix.texi:7222
 #, no-wrap
 msgid "guix environment --ad-hoc --container guile -- guile\n"
 msgstr ""
 
 #. type: quotation
-#: doc/guix.texi:7222
+#: doc/guix.texi:7226
 msgid "The @code{--container} option requires Linux-libre 3.19 or newer."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7225
+#: doc/guix.texi:7229
 msgid "The available options are summarized below."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:7229
+#: doc/guix.texi:7233
 #, no-wrap
 msgid "persistent environment"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:7230
+#: doc/guix.texi:7234
 #, no-wrap
 msgid "garbage collector root, for environments"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7233
-msgid "Make @var{file} a symlink to the profile for this environment, and register it as a garbage collector root."
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:7236
-msgid "This is useful if you want to protect your environment from garbage collection, to make it ``persistent''."
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:7242
+#: doc/guix.texi:7237
 msgid ""
-"When this option is omitted, the environment is protected from garbage collection only for the duration of the @command{guix "
-"environment} session.  This means that next time you recreate the same environment, you could have to rebuild or re-download "
-"packages.  @xref{Invoking guix gc}, for more on GC roots."
+"Make @var{file} a symlink to the profile for this environment, and register "
+"it as a garbage collector root."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7247
-msgid "Create an environment for the package or list of packages that @var{expr} evaluates to."
+#: doc/guix.texi:7240
+msgid ""
+"This is useful if you want to protect your environment from garbage "
+"collection, to make it ``persistent''."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7249
+#: doc/guix.texi:7246
+msgid ""
+"When this option is omitted, the environment is protected from garbage "
+"collection only for the duration of the @command{guix environment} session.  "
+"This means that next time you recreate the same environment, you could have "
+"to rebuild or re-download packages.  @xref{Invoking guix gc}, for more on GC "
+"roots."
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:7251
+msgid ""
+"Create an environment for the package or list of packages that @var{expr} "
+"evaluates to."
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:7253
 msgid "For example, running:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:7252
+#: doc/guix.texi:7256
 #, no-wrap
 msgid "guix environment -e '(@@ (gnu packages maths) petsc-openmpi)'\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7256
-msgid "starts a shell with the environment for this specific variant of the PETSc package."
+#: doc/guix.texi:7260
+msgid ""
+"starts a shell with the environment for this specific variant of the PETSc "
+"package."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7258
+#: doc/guix.texi:7262
 msgid "Running:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:7261
+#: doc/guix.texi:7265
 #, no-wrap
 msgid "guix environment --ad-hoc -e '(@@ (gnu) %base-packages)'\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7264
+#: doc/guix.texi:7268
 msgid "starts a shell with all the GuixSD base packages available."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7267
+#: doc/guix.texi:7271
 msgid ""
-"The above commands only use the default output of the given packages.  To select other outputs, two element tuples can be specified:"
+"The above commands only use the default output of the given packages.  To "
+"select other outputs, two element tuples can be specified:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:7270
+#: doc/guix.texi:7274
 #, no-wrap
 msgid "guix environment --ad-hoc -e '(list (@@ (gnu packages bash) bash) \"include\")'\n"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:7272
+#: doc/guix.texi:7276
 #, no-wrap
 msgid "--load=@var{file}"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:7273
+#: doc/guix.texi:7277
 #, no-wrap
 msgid "-l @var{file}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7276
-msgid "Create an environment for the package or list of packages that the code within @var{file} evaluates to."
+#: doc/guix.texi:7280
+msgid ""
+"Create an environment for the package or list of packages that the code "
+"within @var{file} evaluates to."
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:7282
+#: doc/guix.texi:7286
 #, no-wrap
 msgid "@verbatiminclude environment-gdb.scm\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7288
-msgid "Create an environment for the packages contained in the manifest object returned by the Scheme code in @var{file}."
+#: doc/guix.texi:7292
+msgid ""
+"Create an environment for the packages contained in the manifest object "
+"returned by the Scheme code in @var{file}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7292
+#: doc/guix.texi:7296
 msgid ""
-"This is similar to the same-named option in @command{guix package} (@pxref{profile-manifest, @option{--manifest}}) and uses the same "
-"manifest files."
+"This is similar to the same-named option in @command{guix package} "
+"(@pxref{profile-manifest, @option{--manifest}}) and uses the same manifest "
+"files."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:7293
+#: doc/guix.texi:7297
 #, no-wrap
 msgid "--ad-hoc"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7298
+#: doc/guix.texi:7302
 msgid ""
-"Include all specified packages in the resulting environment, as if an @i{ad hoc} package were defined with them as inputs.  This "
-"option is useful for quickly creating an environment without having to write a package expression to contain the desired inputs."
+"Include all specified packages in the resulting environment, as if an @i{ad "
+"hoc} package were defined with them as inputs.  This option is useful for "
+"quickly creating an environment without having to write a package expression "
+"to contain the desired inputs."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7300
+#: doc/guix.texi:7304
 msgid "For instance, the command:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:7303
+#: doc/guix.texi:7307
 #, no-wrap
 msgid "guix environment --ad-hoc guile guile-sdl -- guile\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7307
-msgid "runs @command{guile} in an environment where Guile and Guile-SDL are available."
+#: doc/guix.texi:7311
+msgid ""
+"runs @command{guile} in an environment where Guile and Guile-SDL are "
+"available."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7312
+#: doc/guix.texi:7316
 msgid ""
-"Note that this example implicitly asks for the default output of @code{guile} and @code{guile-sdl}, but it is possible to ask for a "
-"specific output---e.g., @code{glib:bin} asks for the @code{bin} output of @code{glib} (@pxref{Packages with Multiple Outputs})."
+"Note that this example implicitly asks for the default output of "
+"@code{guile} and @code{guile-sdl}, but it is possible to ask for a specific "
+"output---e.g., @code{glib:bin} asks for the @code{bin} output of @code{glib} "
+"(@pxref{Packages with Multiple Outputs})."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7318
+#: doc/guix.texi:7322
 msgid ""
-"This option may be composed with the default behavior of @command{guix environment}.  Packages appearing before @code{--ad-hoc} are "
-"interpreted as packages whose dependencies will be added to the environment, the default behavior.  Packages appearing after are "
-"interpreted as packages that will be added to the environment directly."
+"This option may be composed with the default behavior of @command{guix "
+"environment}.  Packages appearing before @code{--ad-hoc} are interpreted as "
+"packages whose dependencies will be added to the environment, the default "
+"behavior.  Packages appearing after are interpreted as packages that will be "
+"added to the environment directly."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:7319
+#: doc/guix.texi:7323
 #, no-wrap
 msgid "--pure"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7323
+#: doc/guix.texi:7327
 msgid ""
-"Unset existing environment variables when building the new environment.  This has the effect of creating an environment in which "
-"search paths only contain package inputs."
+"Unset existing environment variables when building the new environment.  "
+"This has the effect of creating an environment in which search paths only "
+"contain package inputs."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:7324
+#: doc/guix.texi:7328
 #, no-wrap
 msgid "--search-paths"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7327
-msgid "Display the environment variable definitions that make up the environment."
+#: doc/guix.texi:7331
+msgid ""
+"Display the environment variable definitions that make up the environment."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7331
+#: doc/guix.texi:7335
 msgid "Attempt to build for @var{system}---e.g., @code{i686-linux}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:7332
+#: doc/guix.texi:7336
 #, no-wrap
 msgid "--container"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:7333
+#: doc/guix.texi:7337
 #, no-wrap
 msgid "-C"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:7334 doc/guix.texi:7845 doc/guix.texi:20490
+#: doc/guix.texi:7338 doc/guix.texi:7849 doc/guix.texi:20552
 #, no-wrap
 msgid "container"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7342
+#: doc/guix.texi:7346
 msgid ""
-"Run @var{command} within an isolated container.  The current working directory outside the container is mapped inside the "
-"container.  Additionally, unless overridden with @code{--user}, a dummy home directory is created that matches the current user's "
-"home directory, and @file{/etc/passwd} is configured accordingly.  The spawned process runs as the current user outside the "
-"container, but has root privileges in the context of the container."
+"Run @var{command} within an isolated container.  The current working "
+"directory outside the container is mapped inside the container.  "
+"Additionally, unless overridden with @code{--user}, a dummy home directory "
+"is created that matches the current user's home directory, and @file{/etc/"
+"passwd} is configured accordingly.  The spawned process runs as the current "
+"user outside the container, but has root privileges in the context of the "
+"container."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:7343
+#: doc/guix.texi:7347
 #, no-wrap
 msgid "--network"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:7344
+#: doc/guix.texi:7348
 #, no-wrap
 msgid "-N"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7348
+#: doc/guix.texi:7352
 msgid ""
-"For containers, share the network namespace with the host system.  Containers created without this flag only have access to the "
-"loopback device."
+"For containers, share the network namespace with the host system.  "
+"Containers created without this flag only have access to the loopback device."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:7349
+#: doc/guix.texi:7353
 #, no-wrap
 msgid "--link-profile"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:7350
+#: doc/guix.texi:7354
 #, no-wrap
 msgid "-P"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7357
+#: doc/guix.texi:7361
 msgid ""
-"For containers, link the environment profile to @file{~/.guix-profile} within the container.  This is equivalent to running the "
-"command @command{ln -s $GUIX_ENVIRONMENT ~/.guix-profile} within the container.  Linking will fail and abort the environment if the "
-"directory already exists, which will certainly be the case if @command{guix environment} was invoked in the user's home directory."
+"For containers, link the environment profile to @file{~/.guix-profile} "
+"within the container.  This is equivalent to running the command @command{ln "
+"-s $GUIX_ENVIRONMENT ~/.guix-profile} within the container.  Linking will "
+"fail and abort the environment if the directory already exists, which will "
+"certainly be the case if @command{guix environment} was invoked in the "
+"user's home directory."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7364
+#: doc/guix.texi:7368
 msgid ""
-"Certain packages are configured to look in @code{~/.guix-profile} for configuration files and data;@footnote{For example, the "
-"@code{fontconfig} package inspects @file{~/.guix-profile/share/fonts} for additional fonts.} @code{--link-profile} allows these "
-"programs to behave as expected within the environment."
+"Certain packages are configured to look in @code{~/.guix-profile} for "
+"configuration files and data;@footnote{For example, the @code{fontconfig} "
+"package inspects @file{~/.guix-profile/share/fonts} for additional fonts.} "
+"@code{--link-profile} allows these programs to behave as expected within the "
+"environment."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:7365 doc/guix.texi:7517
+#: doc/guix.texi:7369 doc/guix.texi:7521
 #, no-wrap
 msgid "--user=@var{user}"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:7366 doc/guix.texi:7518
+#: doc/guix.texi:7370 doc/guix.texi:7522
 #, no-wrap
 msgid "-u @var{user}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7372
+#: doc/guix.texi:7376
 msgid ""
-"For containers, use the username @var{user} in place of the current user.  The generated @file{/etc/passwd} entry within the "
-"container will contain the name @var{user}; the home directory will be @file{/home/USER}; and no user GECOS data will be copied.  "
-"@var{user} need not exist on the system."
+"For containers, use the username @var{user} in place of the current user.  "
+"The generated @file{/etc/passwd} entry within the container will contain the "
+"name @var{user}; the home directory will be @file{/home/USER}; and no user "
+"GECOS data will be copied.  @var{user} need not exist on the system."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7377
+#: doc/guix.texi:7381
 msgid ""
-"Additionally, any shared or exposed path (see @code{--share} and @code{--expose} respectively) whose target is within the current "
-"user's home directory will be remapped relative to @file{/home/USER}; this includes the automatic mapping of the current working "
-"directory."
+"Additionally, any shared or exposed path (see @code{--share} and @code{--"
+"expose} respectively) whose target is within the current user's home "
+"directory will be remapped relative to @file{/home/USER}; this includes the "
+"automatic mapping of the current working directory."
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:7384
+#: doc/guix.texi:7388
 #, no-wrap
 msgid ""
 "# will expose paths as /home/foo/wd, /home/foo/test, and /home/foo/target\n"
@@ -14218,429 +17031,495 @@ msgid ""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7389
+#: doc/guix.texi:7393
 msgid ""
-"While this will limit the leaking of user identity through home paths and each of the user fields, this is only one useful component "
-"of a broader privacy/anonymity solution---not one in and of itself."
+"While this will limit the leaking of user identity through home paths and "
+"each of the user fields, this is only one useful component of a broader "
+"privacy/anonymity solution---not one in and of itself."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:7390
+#: doc/guix.texi:7394
 #, no-wrap
 msgid "--expose=@var{source}[=@var{target}]"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7395
+#: doc/guix.texi:7399
 msgid ""
-"For containers, expose the file system @var{source} from the host system as the read-only file system @var{target} within the "
-"container.  If @var{target} is not specified, @var{source} is used as the target mount point in the container."
+"For containers, expose the file system @var{source} from the host system as "
+"the read-only file system @var{target} within the container.  If "
+"@var{target} is not specified, @var{source} is used as the target mount "
+"point in the container."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7399
+#: doc/guix.texi:7403
 msgid ""
-"The example below spawns a Guile REPL in a container in which the user's home directory is accessible read-only via the @file{/"
-"exchange} directory:"
+"The example below spawns a Guile REPL in a container in which the user's "
+"home directory is accessible read-only via the @file{/exchange} directory:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:7402
+#: doc/guix.texi:7406
 #, no-wrap
 msgid "guix environment --container --expose=$HOME=/exchange --ad-hoc guile -- guile\n"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:7404
+#: doc/guix.texi:7408
 #, no-wrap
 msgid "--share=@var{source}[=@var{target}]"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7409
+#: doc/guix.texi:7413
 msgid ""
-"For containers, share the file system @var{source} from the host system as the writable file system @var{target} within the "
-"container.  If @var{target} is not specified, @var{source} is used as the target mount point in the container."
+"For containers, share the file system @var{source} from the host system as "
+"the writable file system @var{target} within the container.  If @var{target} "
+"is not specified, @var{source} is used as the target mount point in the "
+"container."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7413
+#: doc/guix.texi:7417
 msgid ""
-"The example below spawns a Guile REPL in a container in which the user's home directory is accessible for both reading and writing "
-"via the @file{/exchange} directory:"
+"The example below spawns a Guile REPL in a container in which the user's "
+"home directory is accessible for both reading and writing via the @file{/"
+"exchange} directory:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:7416
+#: doc/guix.texi:7420
 #, no-wrap
 msgid "guix environment --container --share=$HOME=/exchange --ad-hoc guile -- guile\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7422
+#: doc/guix.texi:7426
 msgid ""
-"@command{guix environment} also supports all of the common build options that @command{guix build} supports (@pxref{Common Build "
-"Options})."
+"@command{guix environment} also supports all of the common build options "
+"that @command{guix build} supports (@pxref{Common Build Options})."
 msgstr ""
 
 #. type: section
-#: doc/guix.texi:7425
+#: doc/guix.texi:7429
 #, no-wrap
 msgid "Invoking @command{guix publish}"
 msgstr ""
 
 #. type: command{#1}
-#: doc/guix.texi:7427
+#: doc/guix.texi:7431
 #, no-wrap
 msgid "guix publish"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7431
+#: doc/guix.texi:7435
 msgid ""
-"The purpose of @command{guix publish} is to enable users to easily share their store with others, who can then use it as a "
-"substitute server (@pxref{Substitutes})."
+"The purpose of @command{guix publish} is to enable users to easily share "
+"their store with others, who can then use it as a substitute server "
+"(@pxref{Substitutes})."
 msgstr ""
-"Le but de @command{guix publish} est de vous permettre de partager facilement votre dépôt avec d'autres personnes qui peuvent "
-"ensuite l'utiliser comme serveur de substituts (@pxref{Substituts})."
+"Le but de @command{guix publish} est de vous permettre de partager "
+"facilement votre dépôt avec d'autres personnes qui peuvent ensuite "
+"l'utiliser comme serveur de substituts (@pxref{Substituts})."
 
 #. type: Plain text
-#: doc/guix.texi:7437
+#: doc/guix.texi:7441
 msgid ""
-"When @command{guix publish} runs, it spawns an HTTP server which allows anyone with network access to obtain substitutes from it.  "
-"This means that any machine running Guix can also act as if it were a build farm, since the HTTP interface is compatible with Hydra, "
-"the software behind the @code{hydra.gnu.org} build farm."
+"When @command{guix publish} runs, it spawns an HTTP server which allows "
+"anyone with network access to obtain substitutes from it.  This means that "
+"any machine running Guix can also act as if it were a build farm, since the "
+"HTTP interface is compatible with Hydra, the software behind the @code{hydra."
+"gnu.org} build farm."
 msgstr ""
 
-#. type: Plain text
-#: doc/guix.texi:7443
-msgid ""
-"For security, each substitute is signed, allowing recipients to check their authenticity and integrity (@pxref{Substitutes}).  "
-"Because @command{guix publish} uses the signing key of the system, which is only readable by the system administrator, it must be "
-"started as root; the @code{--user} option makes it drop root privileges early on."
-msgstr ""
-"Pour des raisons de sécurité, chaque substitut est signé, ce qui permet aux destinataires de vérifier leur authenticité et leur "
-"intégrité (@pxref{Substituts}). Comme @command{guix publish} utilise la clef de signature du système, qui n'est lisible que par "
-"l'administrateur système, il doit être lancé en root ; l'option @code{--user} lui fait baisser ses privilèges le plus tôt possible."
-
 #. type: Plain text
 #: doc/guix.texi:7447
 msgid ""
-"The signing key pair must be generated before @command{guix publish} is launched, using @command{guix archive --generate-key} "
-"(@pxref{Invoking guix archive})."
+"For security, each substitute is signed, allowing recipients to check their "
+"authenticity and integrity (@pxref{Substitutes}).  Because @command{guix "
+"publish} uses the signing key of the system, which is only readable by the "
+"system administrator, it must be started as root; the @code{--user} option "
+"makes it drop root privileges early on."
+msgstr ""
+"Pour des raisons de sécurité, chaque substitut est signé, ce qui permet aux "
+"destinataires de vérifier leur authenticité et leur intégrité "
+"(@pxref{Substituts}). Comme @command{guix publish} utilise la clef de "
+"signature du système, qui n'est lisible que par l'administrateur système, il "
+"doit être lancé en root ; l'option @code{--user} lui fait baisser ses "
+"privilèges le plus tôt possible."
+
+#. type: Plain text
+#: doc/guix.texi:7451
+msgid ""
+"The signing key pair must be generated before @command{guix publish} is "
+"launched, using @command{guix archive --generate-key} (@pxref{Invoking guix "
+"archive})."
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:7452
+#: doc/guix.texi:7456
 #, no-wrap
 msgid "guix publish @var{options}@dots{}\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7456
-msgid "Running @command{guix publish} without any additional arguments will spawn an HTTP server on port 8080:"
+#: doc/guix.texi:7460
+msgid ""
+"Running @command{guix publish} without any additional arguments will spawn "
+"an HTTP server on port 8080:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:7459
+#: doc/guix.texi:7463
 #, no-wrap
 msgid "guix publish\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7463
-msgid "Once a publishing server has been authorized (@pxref{Invoking guix archive}), the daemon may download substitutes from it:"
+#: doc/guix.texi:7467
+msgid ""
+"Once a publishing server has been authorized (@pxref{Invoking guix "
+"archive}), the daemon may download substitutes from it:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:7466
+#: doc/guix.texi:7470
 #, no-wrap
 msgid "guix-daemon --substitute-urls=http://example.org:8080\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7475
+#: doc/guix.texi:7479
 msgid ""
-"By default, @command{guix publish} compresses archives on the fly as it serves them.  This ``on-the-fly'' mode is convenient in that "
-"it requires no setup and is immediately available.  However, when serving lots of clients, we recommend using the @option{--cache} "
-"option, which enables caching of the archives before they are sent to clients---see below for details.  The @command{guix weather} "
-"command provides a handy way to check what a server provides (@pxref{Invoking guix weather})."
+"By default, @command{guix publish} compresses archives on the fly as it "
+"serves them.  This ``on-the-fly'' mode is convenient in that it requires no "
+"setup and is immediately available.  However, when serving lots of clients, "
+"we recommend using the @option{--cache} option, which enables caching of the "
+"archives before they are sent to clients---see below for details.  The "
+"@command{guix weather} command provides a handy way to check what a server "
+"provides (@pxref{Invoking guix weather})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7482
+#: doc/guix.texi:7486
 msgid ""
-"As a bonus, @command{guix publish} also serves as a content-addressed mirror for source files referenced in @code{origin} records "
-"(@pxref{origin Reference}).  For instance, assuming @command{guix publish} is running on @code{example.org}, the following URL "
-"returns the raw @file{hello-2.10.tar.gz} file with the given SHA256 hash (represented in @code{nix-base32} format, @pxref{Invoking "
-"guix hash}):"
+"As a bonus, @command{guix publish} also serves as a content-addressed mirror "
+"for source files referenced in @code{origin} records (@pxref{origin "
+"Reference}).  For instance, assuming @command{guix publish} is running on "
+"@code{example.org}, the following URL returns the raw @file{hello-2.10.tar."
+"gz} file with the given SHA256 hash (represented in @code{nix-base32} "
+"format, @pxref{Invoking guix hash}):"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:7485
+#: doc/guix.texi:7489
 #, no-wrap
 msgid "http://example.org/file/hello-2.10.tar.gz/sha256/0ssi1@dots{}ndq1i\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7489
-msgid "Obviously, these URLs only work for files that are in the store; in other cases, they return 404 (``Not Found'')."
+#: doc/guix.texi:7493
+msgid ""
+"Obviously, these URLs only work for files that are in the store; in other "
+"cases, they return 404 (``Not Found'')."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:7490
+#: doc/guix.texi:7494
 #, no-wrap
 msgid "build logs, publication"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7492
+#: doc/guix.texi:7496
 msgid "Build logs are available from @code{/log} URLs like:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:7495
+#: doc/guix.texi:7499
 #, no-wrap
 msgid "http://example.org/log/gwspk@dots{}-guile-2.2.3\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7505
+#: doc/guix.texi:7509
 msgid ""
-"When @command{guix-daemon} is configured to save compressed build logs, as is the case by default (@pxref{Invoking guix-daemon}), "
-"@code{/log} URLs return the compressed log as-is, with an appropriate @code{Content-Type} and/or @code{Content-Encoding} header.  We "
-"recommend running @command{guix-daemon} with @code{--log-compression=gzip} since Web browsers can automatically decompress it, which "
-"is not the case with bzip2 compression."
+"When @command{guix-daemon} is configured to save compressed build logs, as "
+"is the case by default (@pxref{Invoking guix-daemon}), @code{/log} URLs "
+"return the compressed log as-is, with an appropriate @code{Content-Type} and/"
+"or @code{Content-Encoding} header.  We recommend running @command{guix-"
+"daemon} with @code{--log-compression=gzip} since Web browsers can "
+"automatically decompress it, which is not the case with bzip2 compression."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:7509
+#: doc/guix.texi:7513
 #, no-wrap
 msgid "--port=@var{port}"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:7510
+#: doc/guix.texi:7514
 #, no-wrap
 msgid "-p @var{port}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7512
+#: doc/guix.texi:7516
 msgid "Listen for HTTP requests on @var{port}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:7513 doc/guix.texi:16983
+#: doc/guix.texi:7517 doc/guix.texi:17032
 #, no-wrap
 msgid "--listen=@var{host}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7516
-msgid "Listen on the network interface for @var{host}.  The default is to accept connections from any interface."
+#: doc/guix.texi:7520
+msgid ""
+"Listen on the network interface for @var{host}.  The default is to accept "
+"connections from any interface."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7521
-msgid "Change privileges to @var{user} as soon as possible---i.e., once the server socket is open and the signing key has been read."
+#: doc/guix.texi:7525
+msgid ""
+"Change privileges to @var{user} as soon as possible---i.e., once the server "
+"socket is open and the signing key has been read."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:7522
+#: doc/guix.texi:7526
 #, no-wrap
 msgid "--compression[=@var{level}]"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:7523
+#: doc/guix.texi:7527
 #, no-wrap
 msgid "-C [@var{level}]"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7528
+#: doc/guix.texi:7532
 msgid ""
-"Compress data using the given @var{level}.  When @var{level} is zero, disable compression.  The range 1 to 9 corresponds to "
-"different gzip compression levels: 1 is the fastest, and 9 is the best (CPU-intensive).  The default is 3."
+"Compress data using the given @var{level}.  When @var{level} is zero, "
+"disable compression.  The range 1 to 9 corresponds to different gzip "
+"compression levels: 1 is the fastest, and 9 is the best (CPU-intensive).  "
+"The default is 3."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7537
+#: doc/guix.texi:7541
 msgid ""
-"Unless @option{--cache} is used, compression occurs on the fly and the compressed streams are not cached.  Thus, to reduce load on "
-"the machine that runs @command{guix publish}, it may be a good idea to choose a low compression level, to run @command{guix publish} "
-"behind a caching proxy, or to use @option{--cache}.  Using @option{--cache} has the advantage that it allows @command{guix publish} "
-"to add @code{Content-Length} HTTP header to its responses."
+"Unless @option{--cache} is used, compression occurs on the fly and the "
+"compressed streams are not cached.  Thus, to reduce load on the machine that "
+"runs @command{guix publish}, it may be a good idea to choose a low "
+"compression level, to run @command{guix publish} behind a caching proxy, or "
+"to use @option{--cache}.  Using @option{--cache} has the advantage that it "
+"allows @command{guix publish} to add @code{Content-Length} HTTP header to "
+"its responses."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:7538
+#: doc/guix.texi:7542
 #, no-wrap
 msgid "--cache=@var{directory}"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:7539
+#: doc/guix.texi:7543
 #, no-wrap
 msgid "-c @var{directory}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7542
-msgid "Cache archives and meta-data (@code{.narinfo} URLs) to @var{directory} and only serve archives that are in cache."
+#: doc/guix.texi:7546
+msgid ""
+"Cache archives and meta-data (@code{.narinfo} URLs) to @var{directory} and "
+"only serve archives that are in cache."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7550
+#: doc/guix.texi:7554
 msgid ""
-"When this option is omitted, archives and meta-data are created on-the-fly.  This can reduce the available bandwidth, especially "
-"when compression is enabled, since this may become CPU-bound.  Another drawback of the default mode is that the length of archives "
-"is not known in advance, so @command{guix publish} does not add a @code{Content-Length} HTTP header to its responses, which in turn "
-"prevents clients from knowing the amount of data being downloaded."
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:7558
-msgid ""
-"Conversely, when @option{--cache} is used, the first request for a store item (@i{via} a @code{.narinfo} URL) returns 404 and "
-"triggers a background process to @dfn{bake} the archive---computing its @code{.narinfo} and compressing the archive, if needed.  "
-"Once the archive is cached in @var{directory}, subsequent requests succeed and are served directly from the cache, which guarantees "
-"that clients get the best possible bandwidth."
+"When this option is omitted, archives and meta-data are created on-the-fly.  "
+"This can reduce the available bandwidth, especially when compression is "
+"enabled, since this may become CPU-bound.  Another drawback of the default "
+"mode is that the length of archives is not known in advance, so "
+"@command{guix publish} does not add a @code{Content-Length} HTTP header to "
+"its responses, which in turn prevents clients from knowing the amount of "
+"data being downloaded."
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:7562
 msgid ""
-"The ``baking'' process is performed by worker threads.  By default, one thread per CPU core is created, but this can be customized.  "
-"See @option{--workers} below."
+"Conversely, when @option{--cache} is used, the first request for a store "
+"item (@i{via} a @code{.narinfo} URL) returns 404 and triggers a background "
+"process to @dfn{bake} the archive---computing its @code{.narinfo} and "
+"compressing the archive, if needed.  Once the archive is cached in "
+"@var{directory}, subsequent requests succeed and are served directly from "
+"the cache, which guarantees that clients get the best possible bandwidth."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7565
-msgid "When @option{--ttl} is used, cached entries are automatically deleted when they have expired."
-msgstr ""
-
-#. type: item
 #: doc/guix.texi:7566
-#, no-wrap
-msgid "--workers=@var{N}"
+msgid ""
+"The ``baking'' process is performed by worker threads.  By default, one "
+"thread per CPU core is created, but this can be customized.  See @option{--"
+"workers} below."
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:7569
-msgid "When @option{--cache} is used, request the allocation of @var{N} worker threads to ``bake'' archives."
+msgid ""
+"When @option{--ttl} is used, cached entries are automatically deleted when "
+"they have expired."
 msgstr ""
 
 #. type: item
 #: doc/guix.texi:7570
 #, no-wrap
+msgid "--workers=@var{N}"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:7573
+msgid ""
+"When @option{--cache} is used, request the allocation of @var{N} worker "
+"threads to ``bake'' archives."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:7574
+#, no-wrap
 msgid "--ttl=@var{ttl}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7574
+#: doc/guix.texi:7578
 msgid ""
-"Produce @code{Cache-Control} HTTP headers that advertise a time-to-live (TTL) of @var{ttl}.  @var{ttl} must denote a duration: "
-"@code{5d} means 5 days, @code{1m} means 1 month, and so on."
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:7579
-msgid ""
-"This allows the user's Guix to keep substitute information in cache for @var{ttl}.  However, note that @code{guix publish} does not "
-"itself guarantee that the store items it provides will indeed remain available for as long as @var{ttl}."
+"Produce @code{Cache-Control} HTTP headers that advertise a time-to-live "
+"(TTL) of @var{ttl}.  @var{ttl} must denote a duration: @code{5d} means 5 "
+"days, @code{1m} means 1 month, and so on."
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:7583
 msgid ""
-"Additionally, when @option{--cache} is used, cached entries that have not been accessed for @var{ttl} and that no longer have a "
-"corresponding item in the store, may be deleted."
+"This allows the user's Guix to keep substitute information in cache for "
+"@var{ttl}.  However, note that @code{guix publish} does not itself guarantee "
+"that the store items it provides will indeed remain available for as long as "
+"@var{ttl}."
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:7587
+msgid ""
+"Additionally, when @option{--cache} is used, cached entries that have not "
+"been accessed for @var{ttl} and that no longer have a corresponding item in "
+"the store, may be deleted."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:7584
+#: doc/guix.texi:7588
 #, no-wrap
 msgid "--nar-path=@var{path}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7587
-msgid "Use @var{path} as the prefix for the URLs of ``nar'' files (@pxref{Invoking guix archive, normalized archives})."
+#: doc/guix.texi:7591
+msgid ""
+"Use @var{path} as the prefix for the URLs of ``nar'' files (@pxref{Invoking "
+"guix archive, normalized archives})."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7591
+#: doc/guix.texi:7595
 msgid ""
-"By default, nars are served at a URL such as @code{/nar/gzip/@dots{}-coreutils-8.25}.  This option allows you to change the @code{/"
-"nar} part to @var{path}."
+"By default, nars are served at a URL such as @code{/nar/gzip/@dots{}-"
+"coreutils-8.25}.  This option allows you to change the @code{/nar} part to "
+"@var{path}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:7592
+#: doc/guix.texi:7596
 #, no-wrap
 msgid "--public-key=@var{file}"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:7593
+#: doc/guix.texi:7597
 #, no-wrap
 msgid "--private-key=@var{file}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7596
-msgid "Use the specific @var{file}s as the public/private key pair used to sign the store items being published."
+#: doc/guix.texi:7600
+msgid ""
+"Use the specific @var{file}s as the public/private key pair used to sign the "
+"store items being published."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7603
+#: doc/guix.texi:7607
 msgid ""
-"The files must correspond to the same key pair (the private key is used for signing and the public key is merely advertised in the "
-"signature metadata).  They must contain keys in the canonical s-expression format as produced by @command{guix archive --generate-"
-"key} (@pxref{Invoking guix archive}).  By default, @file{/etc/guix/signing-key.pub} and @file{/etc/guix/signing-key.sec} are used."
+"The files must correspond to the same key pair (the private key is used for "
+"signing and the public key is merely advertised in the signature metadata).  "
+"They must contain keys in the canonical s-expression format as produced by "
+"@command{guix archive --generate-key} (@pxref{Invoking guix archive}).  By "
+"default, @file{/etc/guix/signing-key.pub} and @file{/etc/guix/signing-key."
+"sec} are used."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:7604
+#: doc/guix.texi:7608
 #, no-wrap
 msgid "--repl[=@var{port}]"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:7605
+#: doc/guix.texi:7609
 #, no-wrap
 msgid "-r [@var{port}]"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7609
+#: doc/guix.texi:7613
 msgid ""
-"Spawn a Guile REPL server (@pxref{REPL Servers,,, guile, GNU Guile Reference Manual}) on @var{port} (37146 by default).  This is "
-"used primarily for debugging a running @command{guix publish} server."
+"Spawn a Guile REPL server (@pxref{REPL Servers,,, guile, GNU Guile Reference "
+"Manual}) on @var{port} (37146 by default).  This is used primarily for "
+"debugging a running @command{guix publish} server."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7615
+#: doc/guix.texi:7619
 msgid ""
-"Enabling @command{guix publish} on a GuixSD system is a one-liner: just instantiate a @code{guix-publish-service-type} service in "
-"the @code{services} field of the @code{operating-system} declaration (@pxref{guix-publish-service-type, @code{guix-publish-service-"
-"type}})."
+"Enabling @command{guix publish} on a GuixSD system is a one-liner: just "
+"instantiate a @code{guix-publish-service-type} service in the "
+"@code{services} field of the @code{operating-system} declaration "
+"(@pxref{guix-publish-service-type, @code{guix-publish-service-type}})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7618
-msgid "If you are instead running Guix on a ``foreign distro'', follow these instructions:”"
+#: doc/guix.texi:7622
+msgid ""
+"If you are instead running Guix on a ``foreign distro'', follow these "
+"instructions:”"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:7622
+#: doc/guix.texi:7626
 msgid "If your host distro uses the systemd init system:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:7627
+#: doc/guix.texi:7631
 #, no-wrap
 msgid ""
 "# ln -s ~root/.guix-profile/lib/systemd/system/guix-publish.service \\\n"
@@ -14649,7 +17528,7 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:7635
+#: doc/guix.texi:7639
 #, no-wrap
 msgid ""
 "# ln -s ~root/.guix-profile/lib/upstart/system/guix-publish.conf /etc/init/\n"
@@ -14657,70 +17536,80 @@ msgid ""
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:7639
+#: doc/guix.texi:7643
 msgid "Otherwise, proceed similarly with your distro's init system."
 msgstr ""
 
 #. type: section
-#: doc/guix.texi:7642
+#: doc/guix.texi:7646
 #, no-wrap
 msgid "Invoking @command{guix challenge}"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:7645
+#: doc/guix.texi:7649
 #, no-wrap
 msgid "verifiable builds"
 msgstr ""
 
 #. type: command{#1}
-#: doc/guix.texi:7646
+#: doc/guix.texi:7650
 #, no-wrap
 msgid "guix challenge"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:7647
+#: doc/guix.texi:7651
 #, no-wrap
 msgid "challenge"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7652
+#: doc/guix.texi:7656
 msgid ""
-"Do the binaries provided by this server really correspond to the source code it claims to build? Is a package build process "
-"deterministic? These are the questions the @command{guix challenge} command attempts to answer."
+"Do the binaries provided by this server really correspond to the source code "
+"it claims to build? Is a package build process deterministic? These are the "
+"questions the @command{guix challenge} command attempts to answer."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7660
+#: doc/guix.texi:7664
 msgid ""
-"The former is obviously an important question: Before using a substitute server (@pxref{Substitutes}), one had better @emph{verify} "
-"that it provides the right binaries, and thus @emph{challenge} it.  The latter is what enables the former: If package builds are "
-"deterministic, then independent builds of the package should yield the exact same result, bit for bit; if a server provides a binary "
-"different from the one obtained locally, it may be either corrupt or malicious."
+"The former is obviously an important question: Before using a substitute "
+"server (@pxref{Substitutes}), one had better @emph{verify} that it provides "
+"the right binaries, and thus @emph{challenge} it.  The latter is what "
+"enables the former: If package builds are deterministic, then independent "
+"builds of the package should yield the exact same result, bit for bit; if a "
+"server provides a binary different from the one obtained locally, it may be "
+"either corrupt or malicious."
 msgstr ""
-"La première question est évidemment importante : avant d'utiliser un serveur de substituts (@pxref{Substituts}), il vaut mieux "
-"@emph{vérifier} qu'il fournit les bons binaires et donc le @emph{défier}. La deuxième est ce qui permet la première : si les "
-"constructions des paquets sont déterministes alors des constructions indépendantes du paquet devraient donner le même résultat, bit "
-"à bit ; si un serveur fournit un binaire différent de celui obtenu localement, il peut être soit corrompu, soit malveillant."
+"La première question est évidemment importante : avant d'utiliser un serveur "
+"de substituts (@pxref{Substituts}), il vaut mieux @emph{vérifier} qu'il "
+"fournit les bons binaires et donc le @emph{défier}. La deuxième est ce qui "
+"permet la première : si les constructions des paquets sont déterministes "
+"alors des constructions indépendantes du paquet devraient donner le même "
+"résultat, bit à bit ; si un serveur fournit un binaire différent de celui "
+"obtenu localement, il peut être soit corrompu, soit malveillant."
 
 #. type: Plain text
-#: doc/guix.texi:7669
+#: doc/guix.texi:7673
 msgid ""
-"We know that the hash that shows up in @file{/gnu/store} file names is the hash of all the inputs of the process that built the file "
-"or directory---compilers, libraries, build scripts, etc. (@pxref{Introduction}).  Assuming deterministic build processes, one store "
-"file name should map to exactly one build output.  @command{guix challenge} checks whether there is, indeed, a single mapping by "
-"comparing the build outputs of several independent builds of any given store item."
+"We know that the hash that shows up in @file{/gnu/store} file names is the "
+"hash of all the inputs of the process that built the file or directory---"
+"compilers, libraries, build scripts, etc. (@pxref{Introduction}).  Assuming "
+"deterministic build processes, one store file name should map to exactly one "
+"build output.  @command{guix challenge} checks whether there is, indeed, a "
+"single mapping by comparing the build outputs of several independent builds "
+"of any given store item."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7671
+#: doc/guix.texi:7675
 msgid "The command output looks like this:"
 msgstr ""
 
 #. type: smallexample
-#: doc/guix.texi:7688
+#: doc/guix.texi:7692
 #, no-wrap
 msgid ""
 "$ guix challenge --substitute-urls=\"https://hydra.gnu.org https://guix.example.org\"\n"
@@ -14742,7 +17631,7 @@ msgid ""
 msgstr ""
 
 #. type: smallexample
-#: doc/guix.texi:7690
+#: doc/guix.texi:7694
 #, no-wrap
 msgid ""
 "@dots{}\n"
@@ -14750,7 +17639,7 @@ msgid ""
 msgstr ""
 
 #. type: smallexample
-#: doc/guix.texi:7695
+#: doc/guix.texi:7699
 #, no-wrap
 msgid ""
 "6,406 store items were analyzed:\n"
@@ -14760,37 +17649,44 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7703
+#: doc/guix.texi:7707
 msgid ""
-"In this example, @command{guix challenge} first scans the store to determine the set of locally-built derivations---as opposed to "
-"store items that were downloaded from a substitute server---and then queries all the substitute servers.  It then reports those "
-"store items for which the servers obtained a result different from the local build."
+"In this example, @command{guix challenge} first scans the store to determine "
+"the set of locally-built derivations---as opposed to store items that were "
+"downloaded from a substitute server---and then queries all the substitute "
+"servers.  It then reports those store items for which the servers obtained a "
+"result different from the local build."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:7704
+#: doc/guix.texi:7708
 #, no-wrap
 msgid "non-determinism, in package builds"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7715
+#: doc/guix.texi:7719
 msgid ""
-"As an example, @code{guix.example.org} always gets a different answer.  Conversely, @code{hydra.gnu.org} agrees with local builds, "
-"except in the case of Git.  This might indicate that the build process of Git is non-deterministic, meaning that its output varies "
-"as a function of various things that Guix does not fully control, in spite of building packages in isolated environments "
-"(@pxref{Features}).  Most common sources of non-determinism include the addition of timestamps in build results, the inclusion of "
-"random numbers, and directory listings sorted by inode number.  See @uref{https://reproducible-builds.org/docs/}, for more "
-"information."
+"As an example, @code{guix.example.org} always gets a different answer.  "
+"Conversely, @code{hydra.gnu.org} agrees with local builds, except in the "
+"case of Git.  This might indicate that the build process of Git is non-"
+"deterministic, meaning that its output varies as a function of various "
+"things that Guix does not fully control, in spite of building packages in "
+"isolated environments (@pxref{Features}).  Most common sources of non-"
+"determinism include the addition of timestamps in build results, the "
+"inclusion of random numbers, and directory listings sorted by inode number.  "
+"See @uref{https://reproducible-builds.org/docs/}, for more information."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7718
-msgid "To find out what is wrong with this Git binary, we can do something along these lines (@pxref{Invoking guix archive}):"
+#: doc/guix.texi:7722
+msgid ""
+"To find out what is wrong with this Git binary, we can do something along "
+"these lines (@pxref{Invoking guix archive}):"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:7723
+#: doc/guix.texi:7727
 #, no-wrap
 msgid ""
 "$ wget -q -O - https://hydra.gnu.org/nar/@dots{}-git-2.5.0 \\\n"
@@ -14799,117 +17695,131 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7732
+#: doc/guix.texi:7736
 msgid ""
-"This command shows the difference between the files resulting from the local build, and the files resulting from the build on "
-"@code{hydra.gnu.org} (@pxref{Overview, Comparing and Merging Files,, diffutils, Comparing and Merging Files}).  The @command{diff} "
-"command works great for text files.  When binary files differ, a better option is @uref{https://diffoscope.org/, Diffoscope}, a tool "
-"that helps visualize differences for all kinds of files."
-msgstr ""
-
-#. type: Plain text
-#: doc/guix.texi:7740
-msgid ""
-"Once you have done that work, you can tell whether the differences are due to a non-deterministic build process or to a malicious "
-"server.  We try hard to remove sources of non-determinism in packages to make it easier to verify substitutes, but of course, this "
-"is a process that involves not just Guix, but a large part of the free software community.  In the meantime, @command{guix "
-"challenge} is one tool to help address the problem."
+"This command shows the difference between the files resulting from the local "
+"build, and the files resulting from the build on @code{hydra.gnu.org} "
+"(@pxref{Overview, Comparing and Merging Files,, diffutils, Comparing and "
+"Merging Files}).  The @command{diff} command works great for text files.  "
+"When binary files differ, a better option is @uref{https://diffoscope.org/, "
+"Diffoscope}, a tool that helps visualize differences for all kinds of files."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:7744
 msgid ""
-"If you are writing packages for Guix, you are encouraged to check whether @code{hydra.gnu.org} and other substitute servers obtain "
-"the same build result as you did with:"
+"Once you have done that work, you can tell whether the differences are due "
+"to a non-deterministic build process or to a malicious server.  We try hard "
+"to remove sources of non-determinism in packages to make it easier to verify "
+"substitutes, but of course, this is a process that involves not just Guix, "
+"but a large part of the free software community.  In the meantime, "
+"@command{guix challenge} is one tool to help address the problem."
+msgstr ""
+
+#. type: Plain text
+#: doc/guix.texi:7748
+msgid ""
+"If you are writing packages for Guix, you are encouraged to check whether "
+"@code{hydra.gnu.org} and other substitute servers obtain the same build "
+"result as you did with:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:7747
+#: doc/guix.texi:7751
 #, no-wrap
 msgid "$ guix challenge @var{package}\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7752
-msgid "where @var{package} is a package specification such as @code{guile@@2.0} or @code{glibc:debug}."
+#: doc/guix.texi:7756
+msgid ""
+"where @var{package} is a package specification such as @code{guile@@2.0} or "
+"@code{glibc:debug}."
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:7757
+#: doc/guix.texi:7761
 #, no-wrap
 msgid "guix challenge @var{options} [@var{packages}@dots{}]\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7764
+#: doc/guix.texi:7768
 msgid ""
-"When a difference is found between the hash of a locally-built item and that of a server-provided substitute, or among substitutes "
-"provided by different servers, the command displays it as in the example above and its exit code is 2 (other non-zero exit codes "
-"denote other kinds of errors.)"
+"When a difference is found between the hash of a locally-built item and that "
+"of a server-provided substitute, or among substitutes provided by different "
+"servers, the command displays it as in the example above and its exit code "
+"is 2 (other non-zero exit codes denote other kinds of errors.)"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7766
+#: doc/guix.texi:7770
 msgid "The one option that matters is:"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7772
-msgid "Consider @var{urls} the whitespace-separated list of substitute source URLs to compare to."
+#: doc/guix.texi:7776
+msgid ""
+"Consider @var{urls} the whitespace-separated list of substitute source URLs "
+"to compare to."
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:7774
+#: doc/guix.texi:7778
 #, no-wrap
 msgid "-v"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7777
-msgid "Show details about matches (identical contents) in addition to information about mismatches."
+#: doc/guix.texi:7781
+msgid ""
+"Show details about matches (identical contents) in addition to information "
+"about mismatches."
 msgstr ""
 
 #. type: section
-#: doc/guix.texi:7781
+#: doc/guix.texi:7785
 #, no-wrap
 msgid "Invoking @command{guix copy}"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:7783
+#: doc/guix.texi:7787
 #, no-wrap
 msgid "copy, of store items, over SSH"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:7784
+#: doc/guix.texi:7788
 #, no-wrap
 msgid "SSH, copy of store items"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:7785
+#: doc/guix.texi:7789
 #, no-wrap
 msgid "sharing store items across machines"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:7786
+#: doc/guix.texi:7790
 #, no-wrap
 msgid "transferring store items across machines"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7793
+#: doc/guix.texi:7797
 msgid ""
-"The @command{guix copy} command copies items from the store of one machine to that of another machine over a secure shell (SSH)  "
-"connection@footnote{This command is available only when Guile-SSH was found.  @xref{Requirements}, for details.}.  For example, the "
-"following command copies the @code{coreutils} package, the user's profile, and all their dependencies over to @var{host}, logged in "
-"as @var{user}:"
+"The @command{guix copy} command copies items from the store of one machine "
+"to that of another machine over a secure shell (SSH)  "
+"connection@footnote{This command is available only when Guile-SSH was "
+"found.  @xref{Requirements}, for details.}.  For example, the following "
+"command copies the @code{coreutils} package, the user's profile, and all "
+"their dependencies over to @var{host}, logged in as @var{user}:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:7797
+#: doc/guix.texi:7801
 #, no-wrap
 msgid ""
 "guix copy --to=@var{user}@@@var{host} \\\n"
@@ -14917,221 +17827,243 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7801
-msgid "If some of the items to be copied are already present on @var{host}, they are not actually sent."
+#: doc/guix.texi:7805
+msgid ""
+"If some of the items to be copied are already present on @var{host}, they "
+"are not actually sent."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7804
-msgid "The command below retrieves @code{libreoffice} and @code{gimp} from @var{host}, assuming they are available there:"
+#: doc/guix.texi:7808
+msgid ""
+"The command below retrieves @code{libreoffice} and @code{gimp} from "
+"@var{host}, assuming they are available there:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:7807
+#: doc/guix.texi:7811
 #, no-wrap
 msgid "guix copy --from=@var{host} libreoffice gimp\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7812
+#: doc/guix.texi:7816
 msgid ""
-"The SSH connection is established using the Guile-SSH client, which is compatible with OpenSSH: it honors @file{~/.ssh/known_hosts} "
-"and @file{~/.ssh/config}, and uses the SSH agent for authentication."
+"The SSH connection is established using the Guile-SSH client, which is "
+"compatible with OpenSSH: it honors @file{~/.ssh/known_hosts} and @file{~/."
+"ssh/config}, and uses the SSH agent for authentication."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7818
+#: doc/guix.texi:7822
 msgid ""
-"The key used to sign items that are sent must be accepted by the remote machine.  Likewise, the key used by the remote machine to "
-"sign items you are retrieving must be in @file{/etc/guix/acl} so it is accepted by your own daemon.  @xref{Invoking guix archive}, "
-"for more information about store item authentication."
+"The key used to sign items that are sent must be accepted by the remote "
+"machine.  Likewise, the key used by the remote machine to sign items you are "
+"retrieving must be in @file{/etc/guix/acl} so it is accepted by your own "
+"daemon.  @xref{Invoking guix archive}, for more information about store item "
+"authentication."
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:7823
+#: doc/guix.texi:7827
 #, no-wrap
 msgid "guix copy [--to=@var{spec}|--from=@var{spec}] @var{items}@dots{}\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7826
+#: doc/guix.texi:7830
 msgid "You must always specify one of the following options:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:7828
+#: doc/guix.texi:7832
 #, no-wrap
 msgid "--to=@var{spec}"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:7829
+#: doc/guix.texi:7833
 #, no-wrap
 msgid "--from=@var{spec}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7833
-msgid ""
-"Specify the host to send to or receive from.  @var{spec} must be an SSH spec such as @code{example.org}, @code{charlie@@example."
-"org}, or @code{charlie@@example.org:2222}."
-msgstr ""
-
-#. type: Plain text
 #: doc/guix.texi:7837
 msgid ""
-"The @var{items} can be either package names, such as @code{gimp}, or store items, such as @file{/gnu/store/@dots{}-idutils-4.6}."
+"Specify the host to send to or receive from.  @var{spec} must be an SSH spec "
+"such as @code{example.org}, @code{charlie@@example.org}, or "
+"@code{charlie@@example.org:2222}."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:7841
 msgid ""
-"When specifying the name of a package to send, it is first built if needed, unless @option{--dry-run} was specified.  Common build "
-"options are supported (@pxref{Common Build Options})."
+"The @var{items} can be either package names, such as @code{gimp}, or store "
+"items, such as @file{/gnu/store/@dots{}-idutils-4.6}."
+msgstr ""
+
+#. type: Plain text
+#: doc/guix.texi:7845
+msgid ""
+"When specifying the name of a package to send, it is first built if needed, "
+"unless @option{--dry-run} was specified.  Common build options are supported "
+"(@pxref{Common Build Options})."
 msgstr ""
 
 #. type: section
-#: doc/guix.texi:7844
+#: doc/guix.texi:7848
 #, no-wrap
 msgid "Invoking @command{guix container}"
 msgstr ""
 
 #. type: command{#1}
-#: doc/guix.texi:7846
+#: doc/guix.texi:7850
 #, no-wrap
 msgid "guix container"
 msgstr ""
 
 #. type: quotation
-#: doc/guix.texi:7850
-msgid "As of version @value{VERSION}, this tool is experimental.  The interface is subject to radical change in the future."
+#: doc/guix.texi:7854
+msgid ""
+"As of version @value{VERSION}, this tool is experimental.  The interface is "
+"subject to radical change in the future."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7857
+#: doc/guix.texi:7861
 msgid ""
-"The purpose of @command{guix container} is to manipulate processes running within an isolated environment, commonly known as a "
-"``container'', typically created by the @command{guix environment} (@pxref{Invoking guix environment}) and @command{guix system "
-"container} (@pxref{Invoking guix system}) commands."
+"The purpose of @command{guix container} is to manipulate processes running "
+"within an isolated environment, commonly known as a ``container'', typically "
+"created by the @command{guix environment} (@pxref{Invoking guix "
+"environment}) and @command{guix system container} (@pxref{Invoking guix "
+"system}) commands."
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:7862
+#: doc/guix.texi:7866
 #, no-wrap
 msgid "guix container @var{action} @var{options}@dots{}\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7866
+#: doc/guix.texi:7870
 msgid ""
-"@var{action} specifies the operation to perform with a container, and @var{options} specifies the context-specific arguments for the "
-"action."
+"@var{action} specifies the operation to perform with a container, and "
+"@var{options} specifies the context-specific arguments for the action."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7868
+#: doc/guix.texi:7872
 msgid "The following actions are available:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:7870
+#: doc/guix.texi:7874
 #, no-wrap
 msgid "exec"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7872
+#: doc/guix.texi:7876
 msgid "Execute a command within the context of a running container."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7874
+#: doc/guix.texi:7878
 msgid "The syntax is:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:7877
+#: doc/guix.texi:7881
 #, no-wrap
 msgid "guix container exec @var{pid} @var{program} @var{arguments}@dots{}\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7883
+#: doc/guix.texi:7887
 msgid ""
-"@var{pid} specifies the process ID of the running container.  @var{program} specifies an executable file name within the root file "
-"system of the container.  @var{arguments} are the additional options that will be passed to @var{program}."
+"@var{pid} specifies the process ID of the running container.  @var{program} "
+"specifies an executable file name within the root file system of the "
+"container.  @var{arguments} are the additional options that will be passed "
+"to @var{program}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7887
+#: doc/guix.texi:7891
 msgid ""
-"The following command launches an interactive login shell inside a GuixSD container, started by @command{guix system container}, and "
-"whose process ID is 9001:"
+"The following command launches an interactive login shell inside a GuixSD "
+"container, started by @command{guix system container}, and whose process ID "
+"is 9001:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:7890
+#: doc/guix.texi:7894
 #, no-wrap
 msgid "guix container exec 9001 /run/current-system/profile/bin/bash --login\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7894
+#: doc/guix.texi:7898
 msgid ""
-"Note that the @var{pid} cannot be the parent process of a container.  It must be PID 1 of the container or one of its child "
-"processes."
+"Note that the @var{pid} cannot be the parent process of a container.  It "
+"must be PID 1 of the container or one of its child processes."
 msgstr ""
 
 #. type: section
-#: doc/guix.texi:7898
+#: doc/guix.texi:7902
 #, no-wrap
 msgid "Invoking @command{guix weather}"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7907
+#: doc/guix.texi:7911
 msgid ""
-"Occasionally you're grumpy because substitutes are lacking and you end up building packages by yourself (@pxref{Substitutes}).  The "
-"@command{guix weather} command reports on substitute availability on the specified servers so you can have an idea of whether you'll "
-"be grumpy today.  It can sometimes be useful info as a user, but it is primarily useful to people running @command{guix publish} "
-"(@pxref{Invoking guix publish})."
+"Occasionally you're grumpy because substitutes are lacking and you end up "
+"building packages by yourself (@pxref{Substitutes}).  The @command{guix "
+"weather} command reports on substitute availability on the specified servers "
+"so you can have an idea of whether you'll be grumpy today.  It can sometimes "
+"be useful info as a user, but it is primarily useful to people running "
+"@command{guix publish} (@pxref{Invoking guix publish})."
 msgstr ""
-"Vous pouvez parfois grogner lorsque les substituts ne sont pas disponibles et que vous devez construire les paquets vous-même "
-"(@pxref{Substituts}). La commande @command{guix weather} rapporte la disponibilité des substituts sur les serveurs spécifiés pour "
-"que vous sachiez si vous allez raller aujourd'hui. Cela peut parfois être une information utile pour les utilisateurs, mais elle est "
-"surtout utile pour les personnes qui font tourner @command{guix publish} (@pxref{Invoking guix publish})."
+"Vous pouvez parfois grogner lorsque les substituts ne sont pas disponibles "
+"et que vous devez construire les paquets vous-même (@pxref{Substituts}). La "
+"commande @command{guix weather} rapporte la disponibilité des substituts sur "
+"les serveurs spécifiés pour que vous sachiez si vous allez raller "
+"aujourd'hui. Cela peut parfois être une information utile pour les "
+"utilisateurs, mais elle est surtout utile pour les personnes qui font "
+"tourner @command{guix publish} (@pxref{Invoking guix publish})."
 
 #. type: cindex
-#: doc/guix.texi:7908
+#: doc/guix.texi:7912
 #, no-wrap
 msgid "statistics, for substitutes"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:7909
+#: doc/guix.texi:7913
 #, no-wrap
 msgid "availability of substitutes"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:7910
+#: doc/guix.texi:7914
 #, no-wrap
 msgid "substitute availability"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:7911
+#: doc/guix.texi:7915
 #, no-wrap
 msgid "weather, substitute availability"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7913
+#: doc/guix.texi:7917
 msgid "Here's a sample run:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:7925
+#: doc/guix.texi:7929
 #, no-wrap
 msgid ""
 "$ guix weather --substitute-urls=https://guix.example.org\n"
@@ -15148,7 +18080,7 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:7935
+#: doc/guix.texi:7939
 #, no-wrap
 msgid ""
 "  9.8% (342 out of 3,470) of the missing items are queued\n"
@@ -15163,322 +18095,374 @@ msgid ""
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:7937
+#: doc/guix.texi:7941
 #, no-wrap
 msgid "continuous integration, statistics"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7946
+#: doc/guix.texi:7950
 msgid ""
-"As you can see, it reports the fraction of all the packages for which substitutes are available on the server---regardless of "
-"whether substitutes are enabled, and regardless of whether this server's signing key is authorized.  It also reports the size of the "
-"compressed archives (``nars'') provided by the server, the size the corresponding store items occupy in the store (assuming "
-"deduplication is turned off), and the server's throughput.  The second part gives continuous integration (CI) statistics, if the "
-"server supports it."
+"As you can see, it reports the fraction of all the packages for which "
+"substitutes are available on the server---regardless of whether substitutes "
+"are enabled, and regardless of whether this server's signing key is "
+"authorized.  It also reports the size of the compressed archives (``nars'') "
+"provided by the server, the size the corresponding store items occupy in the "
+"store (assuming deduplication is turned off), and the server's throughput.  "
+"The second part gives continuous integration (CI) statistics, if the server "
+"supports it."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7952
+#: doc/guix.texi:7956
 msgid ""
-"To achieve that, @command{guix weather} queries over HTTP(S) meta-data (@dfn{narinfos}) for all the relevant store items.  Like "
-"@command{guix challenge}, it ignores signatures on those substitutes, which is innocuous since the command only gathers statistics "
-"and cannot install those substitutes."
+"To achieve that, @command{guix weather} queries over HTTP(S) meta-data "
+"(@dfn{narinfos}) for all the relevant store items.  Like @command{guix "
+"challenge}, it ignores signatures on those substitutes, which is innocuous "
+"since the command only gathers statistics and cannot install those "
+"substitutes."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7955
+#: doc/guix.texi:7959
 msgid ""
-"Among other things, it is possible to query specific system types and specific package sets.  The available options are listed below."
+"Among other things, it is possible to query specific system types and "
+"specific package sets.  The available options are listed below."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7961
+#: doc/guix.texi:7965
 msgid ""
-"@var{urls} is the space-separated list of substitute server URLs to query.  When this option is omitted, the default set of "
-"substitute servers is queried."
+"@var{urls} is the space-separated list of substitute server URLs to query.  "
+"When this option is omitted, the default set of substitute servers is "
+"queried."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7967
+#: doc/guix.texi:7971
 msgid ""
-"Query substitutes for @var{system}---e.g., @code{aarch64-linux}.  This option can be repeated, in which case @command{guix weather} "
-"will query substitutes for several system types."
+"Query substitutes for @var{system}---e.g., @code{aarch64-linux}.  This "
+"option can be repeated, in which case @command{guix weather} will query "
+"substitutes for several system types."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7973
+#: doc/guix.texi:7977
 msgid ""
-"Instead of querying substitutes for all the packages, only ask for those specified in @var{file}.  @var{file} must contain a "
-"@dfn{manifest}, as with the @code{-m} option of @command{guix package} (@pxref{Invoking guix package})."
+"Instead of querying substitutes for all the packages, only ask for those "
+"specified in @var{file}.  @var{file} must contain a @dfn{manifest}, as with "
+"the @code{-m} option of @command{guix package} (@pxref{Invoking guix "
+"package})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7991
+#: doc/guix.texi:7995
 msgid ""
-"Guix comes with a distribution of the GNU system consisting entirely of free software@footnote{The term ``free'' here refers to the "
-"@url{http://www.gnu.org/philosophy/free-sw.html,freedom provided to users of that software}.}.  The distribution can be installed on "
-"its own (@pxref{System Installation}), but it is also possible to install Guix as a package manager on top of an installed GNU/Linux "
-"system (@pxref{Installation}).  To distinguish between the two, we refer to the standalone distribution as the Guix System "
+"Guix comes with a distribution of the GNU system consisting entirely of free "
+"software@footnote{The term ``free'' here refers to the @url{http://www.gnu."
+"org/philosophy/free-sw.html,freedom provided to users of that software}.}.  "
+"The distribution can be installed on its own (@pxref{System Installation}), "
+"but it is also possible to install Guix as a package manager on top of an "
+"installed GNU/Linux system (@pxref{Installation}).  To distinguish between "
+"the two, we refer to the standalone distribution as the Guix System "
 "Distribution, or GuixSD."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7997
+#: doc/guix.texi:8001
 msgid ""
-"The distribution provides core GNU packages such as GNU libc, GCC, and Binutils, as well as many GNU and non-GNU applications.  The "
-"complete list of available packages can be browsed @url{http://www.gnu.org/software/guix/packages,on-line} or by running "
-"@command{guix package} (@pxref{Invoking guix package}):"
+"The distribution provides core GNU packages such as GNU libc, GCC, and "
+"Binutils, as well as many GNU and non-GNU applications.  The complete list "
+"of available packages can be browsed @url{http://www.gnu.org/software/guix/"
+"packages,on-line} or by running @command{guix package} (@pxref{Invoking guix "
+"package}):"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:8000
+#: doc/guix.texi:8004
 #, no-wrap
 msgid "guix package --list-available\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8006
+#: doc/guix.texi:8010
 msgid ""
-"Our goal is to provide a practical 100% free software distribution of Linux-based and other variants of GNU, with a focus on the "
-"promotion and tight integration of GNU components, and an emphasis on programs and tools that help users exert that freedom."
+"Our goal is to provide a practical 100% free software distribution of Linux-"
+"based and other variants of GNU, with a focus on the promotion and tight "
+"integration of GNU components, and an emphasis on programs and tools that "
+"help users exert that freedom."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8008
+#: doc/guix.texi:8012
 msgid "Packages are currently available on the following platforms:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:8011 doc/guix.texi:8176
+#: doc/guix.texi:8015 doc/guix.texi:8180
 #, no-wrap
 msgid "x86_64-linux"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8013
+#: doc/guix.texi:8017
 msgid "Intel/AMD @code{x86_64} architecture, Linux-Libre kernel;"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:8014 doc/guix.texi:8179
+#: doc/guix.texi:8018 doc/guix.texi:8183
 #, no-wrap
 msgid "i686-linux"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8016
+#: doc/guix.texi:8020
 msgid "Intel 32-bit architecture (IA32), Linux-Libre kernel;"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:8017
+#: doc/guix.texi:8021
 #, no-wrap
 msgid "armhf-linux"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8021
+#: doc/guix.texi:8025
 msgid ""
-"ARMv7-A architecture with hard float, Thumb-2 and NEON, using the EABI hard-float application binary interface (ABI), and Linux-"
-"Libre kernel."
+"ARMv7-A architecture with hard float, Thumb-2 and NEON, using the EABI hard-"
+"float application binary interface (ABI), and Linux-Libre kernel."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:8022
+#: doc/guix.texi:8026
 #, no-wrap
 msgid "aarch64-linux"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8026
+#: doc/guix.texi:8030
 msgid ""
-"little-endian 64-bit ARMv8-A processors, Linux-Libre kernel.  This is currently in an experimental stage, with limited support.  "
+"little-endian 64-bit ARMv8-A processors, Linux-Libre kernel.  This is "
+"currently in an experimental stage, with limited support.  "
 "@xref{Contributing}, for how to help!"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:8027
+#: doc/guix.texi:8031
 #, no-wrap
 msgid "mips64el-linux"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8030
-msgid "little-endian 64-bit MIPS processors, specifically the Loongson series, n32 ABI, and Linux-Libre kernel."
-msgstr ""
-
-#. type: Plain text
 #: doc/guix.texi:8034
-msgid "GuixSD itself is currently only available on @code{i686} and @code{x86_64}."
+msgid ""
+"little-endian 64-bit MIPS processors, specifically the Loongson series, n32 "
+"ABI, and Linux-Libre kernel."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:8038
-msgid "For information on porting to other architectures or kernels, @pxref{Porting}."
+msgid ""
+"GuixSD itself is currently only available on @code{i686} and @code{x86_64}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8053
+#: doc/guix.texi:8042
 msgid ""
-"Building this distribution is a cooperative effort, and you are invited to join! @xref{Contributing}, for information about how you "
-"can help."
+"For information on porting to other architectures or kernels, "
+"@pxref{Porting}."
+msgstr ""
+
+#. type: Plain text
+#: doc/guix.texi:8057
+msgid ""
+"Building this distribution is a cooperative effort, and you are invited to "
+"join! @xref{Contributing}, for information about how you can help."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:8057
+#: doc/guix.texi:8061
 #, no-wrap
 msgid "installing GuixSD"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8063
+#: doc/guix.texi:8067
 msgid ""
-"This section explains how to install the Guix System Distribution (GuixSD)  on a machine.  The Guix package manager can also be "
-"installed on top of a running GNU/Linux system, @pxref{Installation}."
+"This section explains how to install the Guix System Distribution (GuixSD)  "
+"on a machine.  The Guix package manager can also be installed on top of a "
+"running GNU/Linux system, @pxref{Installation}."
 msgstr ""
 
 #. type: quotation
-#: doc/guix.texi:8072
+#: doc/guix.texi:8076
 msgid ""
-"You are reading this documentation with an Info reader.  For details on how to use it, hit the @key{RET} key (``return'' or "
-"``enter'') on the link that follows: @pxref{Top, Info reader,, info-stnd, Stand-alone GNU Info}.  Hit @kbd{l} afterwards to come "
-"back here."
+"You are reading this documentation with an Info reader.  For details on how "
+"to use it, hit the @key{RET} key (``return'' or ``enter'') on the link that "
+"follows: @pxref{Top, Info reader,, info-stnd, Stand-alone GNU Info}.  Hit "
+"@kbd{l} afterwards to come back here."
 msgstr ""
 
 #. type: quotation
-#: doc/guix.texi:8075
-msgid "Alternately, run @command{info info} in another tty to keep the manual available."
+#: doc/guix.texi:8079
+msgid ""
+"Alternately, run @command{info info} in another tty to keep the manual "
+"available."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8100
+#: doc/guix.texi:8104
 msgid ""
-"As of version @value{VERSION}, the Guix System Distribution (GuixSD) is not production-ready.  It may contain bugs and lack "
-"important features.  Thus, if you are looking for a stable production system that respects your freedom as a computer user, a good "
-"solution at this point is to consider @url{http://www.gnu.org/distros/free-distros.html, one of the more established GNU/Linux "
-"distributions}.  We hope you can soon switch to the GuixSD without fear, of course.  In the meantime, you can also keep using your "
-"distribution and try out the package manager on top of it (@pxref{Installation})."
+"As of version @value{VERSION}, the Guix System Distribution (GuixSD) is not "
+"production-ready.  It may contain bugs and lack important features.  Thus, "
+"if you are looking for a stable production system that respects your freedom "
+"as a computer user, a good solution at this point is to consider @url{http://"
+"www.gnu.org/distros/free-distros.html, one of the more established GNU/Linux "
+"distributions}.  We hope you can soon switch to the GuixSD without fear, of "
+"course.  In the meantime, you can also keep using your distribution and try "
+"out the package manager on top of it (@pxref{Installation})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8103
+#: doc/guix.texi:8107
 msgid ""
-"Before you proceed with the installation, be aware of the following noteworthy limitations applicable to version @value{VERSION}:"
+"Before you proceed with the installation, be aware of the following "
+"noteworthy limitations applicable to version @value{VERSION}:"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:8109
+#: doc/guix.texi:8113
 msgid ""
-"The installation process does not include a graphical user interface and requires familiarity with GNU/Linux (see the following "
-"subsections to get a feel of what that means.)"
-msgstr ""
-
-#. type: itemize
-#: doc/guix.texi:8112
-msgid "Support for the Logical Volume Manager (LVM) is missing."
+"The installation process does not include a graphical user interface and "
+"requires familiarity with GNU/Linux (see the following subsections to get a "
+"feel of what that means.)"
 msgstr ""
 
 #. type: itemize
 #: doc/guix.texi:8116
-msgid "More and more system services are provided (@pxref{Services}), but some may be missing."
+msgid "Support for the Logical Volume Manager (LVM) is missing."
 msgstr ""
 
 #. type: itemize
 #: doc/guix.texi:8120
-msgid "More than 6,500 packages are available, but you might occasionally find that a useful package is missing."
+msgid ""
+"More and more system services are provided (@pxref{Services}), but some may "
+"be missing."
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:8125
+#: doc/guix.texi:8124
 msgid ""
-"GNOME, Xfce, LXDE, and Enlightenment are available (@pxref{Desktop Services}), as well as a number of X11 window managers.  However, "
-"some graphical applications may be missing, as well as KDE."
+"More than 6,500 packages are available, but you might occasionally find that "
+"a useful package is missing."
+msgstr ""
+
+#. type: itemize
+#: doc/guix.texi:8129
+msgid ""
+"GNOME, Xfce, LXDE, and Enlightenment are available (@pxref{Desktop "
+"Services}), as well as a number of X11 window managers.  However, some "
+"graphical applications may be missing, as well as KDE."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8130
+#: doc/guix.texi:8134
 msgid ""
-"You have been warned! But more than a disclaimer, this is an invitation to report issues (and success stories!), and to join us in "
-"improving it.  @xref{Contributing}, for more info."
+"You have been warned! But more than a disclaimer, this is an invitation to "
+"report issues (and success stories!), and to join us in improving it.  "
+"@xref{Contributing}, for more info."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:8135
+#: doc/guix.texi:8139
 #, no-wrap
 msgid "hardware support on GuixSD"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8144
+#: doc/guix.texi:8148
 msgid ""
-"GNU@tie{}GuixSD focuses on respecting the user's computing freedom.  It builds around the kernel Linux-libre, which means that only "
-"hardware for which free software drivers and firmware exist is supported.  Nowadays, a wide range of off-the-shelf hardware is "
-"supported on GNU/Linux-libre---from keyboards to graphics cards to scanners and Ethernet controllers.  Unfortunately, there are "
-"still areas where hardware vendors deny users control over their own computing, and such hardware is not supported on GuixSD."
+"GNU@tie{}GuixSD focuses on respecting the user's computing freedom.  It "
+"builds around the kernel Linux-libre, which means that only hardware for "
+"which free software drivers and firmware exist is supported.  Nowadays, a "
+"wide range of off-the-shelf hardware is supported on GNU/Linux-libre---from "
+"keyboards to graphics cards to scanners and Ethernet controllers.  "
+"Unfortunately, there are still areas where hardware vendors deny users "
+"control over their own computing, and such hardware is not supported on "
+"GuixSD."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:8145
+#: doc/guix.texi:8149
 #, no-wrap
 msgid "WiFi, hardware support"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8154
+#: doc/guix.texi:8158
 msgid ""
-"One of the main areas where free drivers or firmware are lacking is WiFi devices.  WiFi devices known to work include those using "
-"Atheros chips (AR9271 and AR7010), which corresponds to the @code{ath9k} Linux-libre driver, and those using Broadcom/AirForce chips "
-"(BCM43xx with Wireless-Core Revision 5), which corresponds to the @code{b43-open} Linux-libre driver.  Free firmware exists for both "
-"and is available out-of-the-box on GuixSD, as part of @var{%base-firmware} (@pxref{operating-system Reference, @code{firmware}})."
+"One of the main areas where free drivers or firmware are lacking is WiFi "
+"devices.  WiFi devices known to work include those using Atheros chips "
+"(AR9271 and AR7010), which corresponds to the @code{ath9k} Linux-libre "
+"driver, and those using Broadcom/AirForce chips (BCM43xx with Wireless-Core "
+"Revision 5), which corresponds to the @code{b43-open} Linux-libre driver.  "
+"Free firmware exists for both and is available out-of-the-box on GuixSD, as "
+"part of @var{%base-firmware} (@pxref{operating-system Reference, "
+"@code{firmware}})."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:8155
+#: doc/guix.texi:8159
 #, no-wrap
 msgid "RYF, Respects Your Freedom"
 msgstr ""
 
-#. type: Plain text
-#: doc/guix.texi:8161
-msgid ""
-"The @uref{https://www.fsf.org/, Free Software Foundation} runs @uref{https://www.fsf.org/ryf, @dfn{Respects Your Freedom}} (RYF), a "
-"certification program for hardware products that respect your freedom and your privacy and ensure that you have control over your "
-"device.  We encourage you to check the list of RYF-certified devices."
-msgstr ""
-
 #. type: Plain text
 #: doc/guix.texi:8165
 msgid ""
-"Another useful resource is the @uref{https://www.h-node.org/, H-Node} web site.  It contains a catalog of hardware devices with "
-"information about their support in GNU/Linux."
+"The @uref{https://www.fsf.org/, Free Software Foundation} runs @uref{https://"
+"www.fsf.org/ryf, @dfn{Respects Your Freedom}} (RYF), a certification program "
+"for hardware products that respect your freedom and your privacy and ensure "
+"that you have control over your device.  We encourage you to check the list "
+"of RYF-certified devices."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8174
+#: doc/guix.texi:8169
 msgid ""
-"An ISO-9660 installation image that can be written to a USB stick or burnt to a DVD can be downloaded from @indicateurl{ftp://alpha."
-"gnu.org/gnu/guix/guixsd-install-@value{VERSION}.@var{system}.iso.xz}, where @var{system} is one of:"
+"Another useful resource is the @uref{https://www.h-node.org/, H-Node} web "
+"site.  It contains a catalog of hardware devices with information about "
+"their support in GNU/Linux."
+msgstr ""
+
+#. type: Plain text
+#: doc/guix.texi:8178
+msgid ""
+"An ISO-9660 installation image that can be written to a USB stick or burnt "
+"to a DVD can be downloaded from @indicateurl{ftp://alpha.gnu.org/gnu/guix/"
+"guixsd-install-@value{VERSION}.@var{system}.iso.xz}, where @var{system} is "
+"one of:"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8178
+#: doc/guix.texi:8182
 msgid "for a GNU/Linux system on Intel/AMD-compatible 64-bit CPUs;"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8181
+#: doc/guix.texi:8185
 msgid "for a 32-bit GNU/Linux system on Intel-compatible CPUs."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8186
+#: doc/guix.texi:8190
 msgid ""
-"Make sure to download the associated @file{.sig} file and to verify the authenticity of the image against it, along these lines:"
+"Make sure to download the associated @file{.sig} file and to verify the "
+"authenticity of the image against it, along these lines:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:8190
+#: doc/guix.texi:8194
 #, no-wrap
 msgid ""
 "$ wget ftp://alpha.gnu.org/gnu/guix/guixsd-install-@value{VERSION}.@var{system}.iso.xz.sig\n"
@@ -15486,43 +18470,44 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8205
+#: doc/guix.texi:8209
 msgid ""
-"This image contains the tools necessary for an installation.  It is meant to be copied @emph{as is} to a large-enough USB stick or "
-"DVD."
+"This image contains the tools necessary for an installation.  It is meant to "
+"be copied @emph{as is} to a large-enough USB stick or DVD."
 msgstr ""
 
 #. type: unnumberedsubsubsec
-#: doc/guix.texi:8206
+#: doc/guix.texi:8210
 #, no-wrap
 msgid "Copying to a USB Stick"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8209
+#: doc/guix.texi:8213
 msgid "To copy the image to a USB stick, follow these steps:"
 msgstr ""
 
 #. type: enumerate
-#: doc/guix.texi:8213 doc/guix.texi:8238
+#: doc/guix.texi:8217 doc/guix.texi:8242
 msgid "Decompress the image using the @command{xz} command:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:8216 doc/guix.texi:8241
+#: doc/guix.texi:8220 doc/guix.texi:8245
 #, no-wrap
 msgid "xz -d guixsd-install-@value{VERSION}.@var{system}.iso.xz\n"
 msgstr ""
 
 #. type: enumerate
-#: doc/guix.texi:8222
+#: doc/guix.texi:8226
 msgid ""
-"Insert a USB stick of 1@tie{}GiB or more into your machine, and determine its device name.  Assuming that the USB stick is known as "
-"@file{/dev/sdX}, copy the image with:"
+"Insert a USB stick of 1@tie{}GiB or more into your machine, and determine "
+"its device name.  Assuming that the USB stick is known as @file{/dev/sdX}, "
+"copy the image with:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:8226
+#: doc/guix.texi:8230
 #, no-wrap
 msgid ""
 "dd if=guixsd-install-@value{VERSION}.x86_64-linux.iso of=/dev/sdX\n"
@@ -15530,206 +18515,221 @@ msgid ""
 msgstr ""
 
 #. type: enumerate
-#: doc/guix.texi:8229
+#: doc/guix.texi:8233
 msgid "Access to @file{/dev/sdX} usually requires root privileges."
 msgstr ""
 
 #. type: unnumberedsubsubsec
-#: doc/guix.texi:8231
+#: doc/guix.texi:8235
 #, no-wrap
 msgid "Burning on a DVD"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8234
+#: doc/guix.texi:8238
 msgid "To copy the image to a DVD, follow these steps:"
 msgstr ""
 
 #. type: enumerate
-#: doc/guix.texi:8247
+#: doc/guix.texi:8251
 msgid ""
-"Insert a blank DVD into your machine, and determine its device name.  Assuming that the DVD drive is known as @file{/dev/srX}, copy "
-"the image with:"
+"Insert a blank DVD into your machine, and determine its device name.  "
+"Assuming that the DVD drive is known as @file{/dev/srX}, copy the image with:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:8250
+#: doc/guix.texi:8254
 #, no-wrap
 msgid "growisofs -dvd-compat -Z /dev/srX=guixsd-install-@value{VERSION}.x86_64.iso\n"
 msgstr ""
 
 #. type: enumerate
-#: doc/guix.texi:8253
+#: doc/guix.texi:8257
 msgid "Access to @file{/dev/srX} usually requires root privileges."
 msgstr ""
 
 #. type: unnumberedsubsubsec
-#: doc/guix.texi:8255
+#: doc/guix.texi:8259
 #, no-wrap
 msgid "Booting"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8260
+#: doc/guix.texi:8264
 msgid ""
-"Once this is done, you should be able to reboot the system and boot from the USB stick or DVD.  The latter usually requires you to "
-"get in the BIOS or UEFI boot menu, where you can choose to boot from the USB stick."
+"Once this is done, you should be able to reboot the system and boot from the "
+"USB stick or DVD.  The latter usually requires you to get in the BIOS or "
+"UEFI boot menu, where you can choose to boot from the USB stick."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8263
-msgid "@xref{Installing GuixSD in a VM}, if, instead, you would like to install GuixSD in a virtual machine (VM)."
+#: doc/guix.texi:8267
+msgid ""
+"@xref{Installing GuixSD in a VM}, if, instead, you would like to install "
+"GuixSD in a virtual machine (VM)."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8275
+#: doc/guix.texi:8279
 msgid ""
-"Once you have successfully booted your computer using the installation medium, you should end up with a root prompt.  Several "
-"console TTYs are configured and can be used to run commands as root.  TTY2 shows this documentation, browsable using the Info reader "
-"commands (@pxref{Top,,, info-stnd, Stand-alone GNU Info}).  The installation system runs the GPM mouse daemon, which allows you to "
-"select text with the left mouse button and to paste it with the middle button."
+"Once you have successfully booted your computer using the installation "
+"medium, you should end up with a root prompt.  Several console TTYs are "
+"configured and can be used to run commands as root.  TTY2 shows this "
+"documentation, browsable using the Info reader commands (@pxref{Top,,, info-"
+"stnd, Stand-alone GNU Info}).  The installation system runs the GPM mouse "
+"daemon, which allows you to select text with the left mouse button and to "
+"paste it with the middle button."
 msgstr ""
 
 #. type: quotation
-#: doc/guix.texi:8280
+#: doc/guix.texi:8284
 msgid ""
-"Installation requires access to the Internet so that any missing dependencies of your system configuration can be downloaded.  See "
-"the ``Networking'' section below."
+"Installation requires access to the Internet so that any missing "
+"dependencies of your system configuration can be downloaded.  See the "
+"``Networking'' section below."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8286
+#: doc/guix.texi:8290
 msgid ""
-"The installation system includes many common tools needed for this task.  But it is also a full-blown GuixSD system, which means "
-"that you can install additional packages, should you need it, using @command{guix package} (@pxref{Invoking guix package})."
+"The installation system includes many common tools needed for this task.  "
+"But it is also a full-blown GuixSD system, which means that you can install "
+"additional packages, should you need it, using @command{guix package} "
+"(@pxref{Invoking guix package})."
 msgstr ""
 
 #. type: subsubsection
-#: doc/guix.texi:8287
+#: doc/guix.texi:8291
 #, no-wrap
 msgid "Keyboard Layout"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:8289 doc/guix.texi:10360
+#: doc/guix.texi:8293 doc/guix.texi:10364
 #, no-wrap
 msgid "keyboard layout"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8293
+#: doc/guix.texi:8297
 msgid ""
-"The installation image uses the US qwerty keyboard layout.  If you want to change it, you can use the @command{loadkeys} command.  "
-"For example, the following command selects the Dvorak keyboard layout:"
+"The installation image uses the US qwerty keyboard layout.  If you want to "
+"change it, you can use the @command{loadkeys} command.  For example, the "
+"following command selects the Dvorak keyboard layout:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:8296
+#: doc/guix.texi:8300
 #, no-wrap
 msgid "loadkeys dvorak\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8301
+#: doc/guix.texi:8305
 msgid ""
-"See the files under @file{/run/current-system/profile/share/keymaps} for a list of available keyboard layouts.  Run @command{man "
-"loadkeys} for more information."
+"See the files under @file{/run/current-system/profile/share/keymaps} for a "
+"list of available keyboard layouts.  Run @command{man loadkeys} for more "
+"information."
 msgstr ""
 
 #. type: subsubsection
-#: doc/guix.texi:8302
+#: doc/guix.texi:8306
 #, no-wrap
 msgid "Networking"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8305
+#: doc/guix.texi:8309
 msgid "Run the following command see what your network interfaces are called:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:8308
+#: doc/guix.texi:8312
 #, no-wrap
 msgid "ifconfig -a\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8312
+#: doc/guix.texi:8316
 msgid "@dots{} or, using the GNU/Linux-specific @command{ip} command:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:8315
+#: doc/guix.texi:8319
 #, no-wrap
 msgid "ip a\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8322
+#: doc/guix.texi:8326
 msgid ""
-"Wired interfaces have a name starting with @samp{e}; for example, the interface corresponding to the first on-board Ethernet "
-"controller is called @samp{eno1}.  Wireless interfaces have a name starting with @samp{w}, like @samp{w1p2s0}."
+"Wired interfaces have a name starting with @samp{e}; for example, the "
+"interface corresponding to the first on-board Ethernet controller is called "
+"@samp{eno1}.  Wireless interfaces have a name starting with @samp{w}, like "
+"@samp{w1p2s0}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:8324
+#: doc/guix.texi:8328
 #, no-wrap
 msgid "Wired connection"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8327
+#: doc/guix.texi:8331
 msgid ""
-"To configure a wired network run the following command, substituting @var{interface} with the name of the wired interface you want "
-"to use."
+"To configure a wired network run the following command, substituting "
+"@var{interface} with the name of the wired interface you want to use."
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:8330
+#: doc/guix.texi:8334
 #, no-wrap
 msgid "ifconfig @var{interface} up\n"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:8332
+#: doc/guix.texi:8336
 #, no-wrap
 msgid "Wireless connection"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:8333 doc/guix.texi:10714
+#: doc/guix.texi:8337 doc/guix.texi:10763
 #, no-wrap
 msgid "wireless"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:8334 doc/guix.texi:10715
+#: doc/guix.texi:8338 doc/guix.texi:10764
 #, no-wrap
 msgid "WiFi"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8339
+#: doc/guix.texi:8343
 msgid ""
-"To configure wireless networking, you can create a configuration file for the @command{wpa_supplicant} configuration tool (its "
-"location is not important) using one of the available text editors such as @command{nano}:"
+"To configure wireless networking, you can create a configuration file for "
+"the @command{wpa_supplicant} configuration tool (its location is not "
+"important) using one of the available text editors such as @command{nano}:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:8342
+#: doc/guix.texi:8346
 #, no-wrap
 msgid "nano wpa_supplicant.conf\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8347
+#: doc/guix.texi:8351
 msgid ""
-"As an example, the following stanza can go to this file and will work for many wireless networks, provided you give the actual SSID "
-"and passphrase for the network you are connecting to:"
+"As an example, the following stanza can go to this file and will work for "
+"many wireless networks, provided you give the actual SSID and passphrase for "
+"the network you are connecting to:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:8354
+#: doc/guix.texi:8358
 #, no-wrap
 msgid ""
 "network=@{\n"
@@ -15740,188 +18740,206 @@ msgid ""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8359
+#: doc/guix.texi:8363
 msgid ""
-"Start the wireless service and run it in the background with the following command (substitute @var{interface} with the name of the "
-"network interface you want to use):"
+"Start the wireless service and run it in the background with the following "
+"command (substitute @var{interface} with the name of the network interface "
+"you want to use):"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:8362
+#: doc/guix.texi:8366
 #, no-wrap
 msgid "wpa_supplicant -c wpa_supplicant.conf -i @var{interface} -B\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8365
+#: doc/guix.texi:8369
 msgid "Run @command{man wpa_supplicant} for more information."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:8367
+#: doc/guix.texi:8371
 #, no-wrap
 msgid "DHCP"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8370
+#: doc/guix.texi:8374
 msgid ""
-"At this point, you need to acquire an IP address.  On a network where IP addresses are automatically assigned @i{via} DHCP, you can "
-"run:"
+"At this point, you need to acquire an IP address.  On a network where IP "
+"addresses are automatically assigned @i{via} DHCP, you can run:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:8373
+#: doc/guix.texi:8377
 #, no-wrap
 msgid "dhclient -v @var{interface}\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8376
+#: doc/guix.texi:8380
 msgid "Try to ping a server to see if networking is up and running:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:8379
+#: doc/guix.texi:8383
 #, no-wrap
 msgid "ping -c 3 gnu.org\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8383
+#: doc/guix.texi:8387
 msgid ""
-"Setting up network access is almost always a requirement because the image does not contain all the software and tools that may be "
-"needed."
+"Setting up network access is almost always a requirement because the image "
+"does not contain all the software and tools that may be needed."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:8384
+#: doc/guix.texi:8388
 #, no-wrap
 msgid "installing over SSH"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8387
-msgid "If you want to, you can continue the installation remotely by starting an SSH server:"
+#: doc/guix.texi:8391
+msgid ""
+"If you want to, you can continue the installation remotely by starting an "
+"SSH server:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:8390
+#: doc/guix.texi:8394
 #, no-wrap
 msgid "herd start ssh-daemon\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8394
-msgid "Make sure to either set a password with @command{passwd}, or configure OpenSSH public key authentication before logging in."
+#: doc/guix.texi:8398
+msgid ""
+"Make sure to either set a password with @command{passwd}, or configure "
+"OpenSSH public key authentication before logging in."
 msgstr ""
 
 #. type: subsubsection
-#: doc/guix.texi:8395
+#: doc/guix.texi:8399
 #, no-wrap
 msgid "Disk Partitioning"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8399
-msgid "Unless this has already been done, the next step is to partition, and then format the target partition(s)."
+#: doc/guix.texi:8403
+msgid ""
+"Unless this has already been done, the next step is to partition, and then "
+"format the target partition(s)."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8404
+#: doc/guix.texi:8408
 msgid ""
-"The installation image includes several partitioning tools, including Parted (@pxref{Overview,,, parted, GNU Parted User Manual}), "
-"@command{fdisk}, and @command{cfdisk}.  Run it and set up your disk with the partition layout you want:"
+"The installation image includes several partitioning tools, including Parted "
+"(@pxref{Overview,,, parted, GNU Parted User Manual}), @command{fdisk}, and "
+"@command{cfdisk}.  Run it and set up your disk with the partition layout you "
+"want:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:8407
+#: doc/guix.texi:8411
 #, no-wrap
 msgid "cfdisk\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8413
+#: doc/guix.texi:8417
 msgid ""
-"If your disk uses the GUID Partition Table (GPT) format and you plan to install BIOS-based GRUB (which is the default), make sure a "
-"BIOS Boot Partition is available (@pxref{BIOS installation,,, grub, GNU GRUB manual})."
+"If your disk uses the GUID Partition Table (GPT) format and you plan to "
+"install BIOS-based GRUB (which is the default), make sure a BIOS Boot "
+"Partition is available (@pxref{BIOS installation,,, grub, GNU GRUB manual})."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:8414
+#: doc/guix.texi:8418
 #, no-wrap
 msgid "EFI, installation"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:8415
+#: doc/guix.texi:8419
 #, no-wrap
 msgid "UEFI, installation"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:8416
+#: doc/guix.texi:8420
 #, no-wrap
 msgid "ESP, EFI system partition"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8420
+#: doc/guix.texi:8424
 msgid ""
-"If you instead wish to use EFI-based GRUB, a FAT32 @dfn{EFI System Partition} (ESP) is required.  This partition should be mounted "
-"at @file{/boot/efi} and must have the @code{esp} flag set.  E.g., for @command{parted}:"
+"If you instead wish to use EFI-based GRUB, a FAT32 @dfn{EFI System "
+"Partition} (ESP) is required.  This partition should be mounted at @file{/"
+"boot/efi} and must have the @code{esp} flag set.  E.g., for @command{parted}:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:8423
+#: doc/guix.texi:8427
 #, no-wrap
 msgid "parted /dev/sda set 1 esp on\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8431
+#: doc/guix.texi:8435
 msgid ""
-"Once you are done partitioning the target hard disk drive, you have to create a file system on the relevant "
-"partition(s)@footnote{Currently GuixSD only supports ext4 and btrfs file systems.  In particular, code that reads file system UUIDs "
-"and labels only works for these file system types.}.  For the ESP, if you have one and assuming it is @file{/dev/sda2}, run:"
+"Once you are done partitioning the target hard disk drive, you have to "
+"create a file system on the relevant partition(s)@footnote{Currently GuixSD "
+"only supports ext4 and btrfs file systems.  In particular, code that reads "
+"file system UUIDs and labels only works for these file system types.}.  For "
+"the ESP, if you have one and assuming it is @file{/dev/sda2}, run:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:8434
+#: doc/guix.texi:8438
 #, no-wrap
 msgid "mkfs.fat -F32 /dev/sda2\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8442
+#: doc/guix.texi:8446
 msgid ""
-"Preferably, assign file systems a label so that you can easily and reliably refer to them in @code{file-system} declarations "
-"(@pxref{File Systems}).  This is typically done using the @code{-L} option of @command{mkfs.ext4} and related commands.  So, "
-"assuming the target root partition lives at @file{/dev/sda1}, a file system with the label @code{my-root} can be created with:"
+"Preferably, assign file systems a label so that you can easily and reliably "
+"refer to them in @code{file-system} declarations (@pxref{File Systems}).  "
+"This is typically done using the @code{-L} option of @command{mkfs.ext4} and "
+"related commands.  So, assuming the target root partition lives at @file{/"
+"dev/sda1}, a file system with the label @code{my-root} can be created with:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:8445
+#: doc/guix.texi:8449
 #, no-wrap
 msgid "mkfs.ext4 -L my-root /dev/sda1\n"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:8447 doc/guix.texi:8836
+#: doc/guix.texi:8451 doc/guix.texi:8840
 #, no-wrap
 msgid "encrypted disk"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8454
+#: doc/guix.texi:8458
 msgid ""
-"If you are instead planning to encrypt the root partition, you can use the Cryptsetup/LUKS utilities to do that (see "
-"@inlinefmtifelse{html, @uref{https://linux.die.net/man/8/cryptsetup, @code{man cryptsetup}}, @code{man cryptsetup}} for more "
-"information.)  Assuming you want to store the root partition on @file{/dev/sda1}, the command sequence would be along these lines:"
+"If you are instead planning to encrypt the root partition, you can use the "
+"Cryptsetup/LUKS utilities to do that (see @inlinefmtifelse{html, "
+"@uref{https://linux.die.net/man/8/cryptsetup, @code{man cryptsetup}}, "
+"@code{man cryptsetup}} for more information.)  Assuming you want to store "
+"the root partition on @file{/dev/sda1}, the command sequence would be along "
+"these lines:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:8459
+#: doc/guix.texi:8463
 #, no-wrap
 msgid ""
 "cryptsetup luksFormat /dev/sda1\n"
@@ -15930,35 +18948,39 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8464
+#: doc/guix.texi:8468
 msgid ""
-"Once that is done, mount the target file system under @file{/mnt} with a command like (again, assuming @code{my-root} is the label "
-"of the root file system):"
+"Once that is done, mount the target file system under @file{/mnt} with a "
+"command like (again, assuming @code{my-root} is the label of the root file "
+"system):"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:8467
+#: doc/guix.texi:8471
 #, no-wrap
 msgid "mount LABEL=my-root /mnt\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8473
+#: doc/guix.texi:8477
 msgid ""
-"Also mount any other file systems you would like to use on the target system relative to this path.  If you have @file{/boot} on a "
-"separate partition for example, mount it at @file{/mnt/boot} now so it is found by @code{guix system init} afterwards."
+"Also mount any other file systems you would like to use on the target system "
+"relative to this path.  If you have @file{/boot} on a separate partition for "
+"example, mount it at @file{/mnt/boot} now so it is found by @code{guix "
+"system init} afterwards."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8478
+#: doc/guix.texi:8482
 msgid ""
-"Finally, if you plan to use one or more swap partitions (@pxref{Memory Concepts, swap space,, libc, The GNU C Library Reference "
-"Manual}), make sure to initialize them with @command{mkswap}.  Assuming you have one swap partition on @file{/dev/sda2}, you would "
-"run:"
+"Finally, if you plan to use one or more swap partitions (@pxref{Memory "
+"Concepts, swap space,, libc, The GNU C Library Reference Manual}), make sure "
+"to initialize them with @command{mkswap}.  Assuming you have one swap "
+"partition on @file{/dev/sda2}, you would run:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:8482
+#: doc/guix.texi:8486
 #, no-wrap
 msgid ""
 "mkswap /dev/sda2\n"
@@ -15966,16 +18988,18 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8490
+#: doc/guix.texi:8494
 msgid ""
-"Alternatively, you may use a swap file.  For example, assuming that in the new system you want to use the file @file{/swapfile} as a "
-"swap file, you would run@footnote{This example will work for many types of file systems (e.g., ext4).  However, for copy-on-write "
-"file systems (e.g., btrfs), the required steps may be different.  For details, see the manual pages for @command{mkswap} and "
-"@command{swapon}.}:"
+"Alternatively, you may use a swap file.  For example, assuming that in the "
+"new system you want to use the file @file{/swapfile} as a swap file, you "
+"would run@footnote{This example will work for many types of file systems (e."
+"g., ext4).  However, for copy-on-write file systems (e.g., btrfs), the "
+"required steps may be different.  For details, see the manual pages for "
+"@command{mkswap} and @command{swapon}.}:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:8498
+#: doc/guix.texi:8502
 #, no-wrap
 msgid ""
 "# This is 10 GiB of swap space.  Adjust \"count\" to change the size.\n"
@@ -15987,51 +19011,62 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8503
+#: doc/guix.texi:8507
 msgid ""
-"Note that if you have encrypted the root partition and created a swap file in its file system as described above, then the "
-"encryption also protects the swap file, just like any other file in that file system."
+"Note that if you have encrypted the root partition and created a swap file "
+"in its file system as described above, then the encryption also protects the "
+"swap file, just like any other file in that file system."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8509
-msgid "With the target partitions ready and the target root mounted on @file{/mnt}, we're ready to go.  First, run:"
+#: doc/guix.texi:8513
+msgid ""
+"With the target partitions ready and the target root mounted on @file{/mnt}, "
+"we're ready to go.  First, run:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:8512
+#: doc/guix.texi:8516
 #, no-wrap
 msgid "herd start cow-store /mnt\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8519
+#: doc/guix.texi:8523
 msgid ""
-"This makes @file{/gnu/store} copy-on-write, such that packages added to it during the installation phase are written to the target "
-"disk on @file{/mnt} rather than kept in memory.  This is necessary because the first phase of the @command{guix system init} command "
-"(see below) entails downloads or builds to @file{/gnu/store} which, initially, is an in-memory file system."
+"This makes @file{/gnu/store} copy-on-write, such that packages added to it "
+"during the installation phase are written to the target disk on @file{/mnt} "
+"rather than kept in memory.  This is necessary because the first phase of "
+"the @command{guix system init} command (see below) entails downloads or "
+"builds to @file{/gnu/store} which, initially, is an in-memory file system."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8530
+#: doc/guix.texi:8534
 msgid ""
-"Next, you have to edit a file and provide the declaration of the operating system to be installed.  To that end, the installation "
-"system comes with three text editors.  We recommend GNU nano (@pxref{Top,,, nano, GNU nano Manual}), which supports syntax "
-"highlighting and parentheses matching; other editors include GNU Zile (an Emacs clone), and nvi (a clone of the original BSD "
-"@command{vi} editor).  We strongly recommend storing that file on the target root file system, say, as @file{/mnt/etc/config.scm}.  "
-"Failing to do that, you will have lost your configuration file once you have rebooted into the newly-installed system."
+"Next, you have to edit a file and provide the declaration of the operating "
+"system to be installed.  To that end, the installation system comes with "
+"three text editors.  We recommend GNU nano (@pxref{Top,,, nano, GNU nano "
+"Manual}), which supports syntax highlighting and parentheses matching; other "
+"editors include GNU Zile (an Emacs clone), and nvi (a clone of the original "
+"BSD @command{vi} editor).  We strongly recommend storing that file on the "
+"target root file system, say, as @file{/mnt/etc/config.scm}.  Failing to do "
+"that, you will have lost your configuration file once you have rebooted into "
+"the newly-installed system."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8537
+#: doc/guix.texi:8541
 msgid ""
-"@xref{Using the Configuration System}, for an overview of the configuration file.  The example configurations discussed in that "
-"section are available under @file{/etc/configuration} in the installation image.  Thus, to get started with a system configuration "
-"providing a graphical display server (a ``desktop'' system), you can run something along these lines:"
+"@xref{Using the Configuration System}, for an overview of the configuration "
+"file.  The example configurations discussed in that section are available "
+"under @file{/etc/configuration} in the installation image.  Thus, to get "
+"started with a system configuration providing a graphical display server (a "
+"``desktop'' system), you can run something along these lines:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:8542
+#: doc/guix.texi:8546
 #, no-wrap
 msgid ""
 "# mkdir /mnt/etc\n"
@@ -16040,150 +19075,171 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8546
-msgid "You should pay attention to what your configuration file contains, and in particular:"
+#: doc/guix.texi:8550
+msgid ""
+"You should pay attention to what your configuration file contains, and in "
+"particular:"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:8556
+#: doc/guix.texi:8560
 msgid ""
-"Make sure the @code{bootloader-configuration} form refers to the target you want to install GRUB on.  It should mention @code{grub-"
-"bootloader} if you are installing GRUB in the legacy way, or @code{grub-efi-bootloader} for newer UEFI systems.  For legacy systems, "
-"the @code{target} field names a device, like @code{/dev/sda}; for UEFI systems it names a path to a mounted EFI partition, like "
-"@code{/boot/efi}, and do make sure the path is actually mounted."
-msgstr ""
-
-#. type: itemize
-#: doc/guix.texi:8562
-msgid ""
-"Be sure that your file system labels match the value of their respective @code{device} fields in your @code{file-system} "
-"configuration, assuming your @code{file-system} configuration sets the value of @code{title} to @code{'label}."
+"Make sure the @code{bootloader-configuration} form refers to the target you "
+"want to install GRUB on.  It should mention @code{grub-bootloader} if you "
+"are installing GRUB in the legacy way, or @code{grub-efi-bootloader} for "
+"newer UEFI systems.  For legacy systems, the @code{target} field names a "
+"device, like @code{/dev/sda}; for UEFI systems it names a path to a mounted "
+"EFI partition, like @code{/boot/efi}, and do make sure the path is actually "
+"mounted."
 msgstr ""
 
 #. type: itemize
 #: doc/guix.texi:8566
 msgid ""
-"If there are encrypted or RAID partitions, make sure to add a @code{mapped-devices} field to describe them (@pxref{Mapped Devices})."
+"Be sure that your file system labels match the value of their respective "
+"@code{device} fields in your @code{file-system} configuration, assuming your "
+"@code{file-system} configuration sets the value of @code{title} to "
+"@code{'label}."
+msgstr ""
+
+#. type: itemize
+#: doc/guix.texi:8570
+msgid ""
+"If there are encrypted or RAID partitions, make sure to add a @code{mapped-"
+"devices} field to describe them (@pxref{Mapped Devices})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8571
+#: doc/guix.texi:8575
 msgid ""
-"Once you are done preparing the configuration file, the new system must be initialized (remember that the target root file system is "
-"mounted under @file{/mnt}):"
+"Once you are done preparing the configuration file, the new system must be "
+"initialized (remember that the target root file system is mounted under "
+"@file{/mnt}):"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:8574
+#: doc/guix.texi:8578
 #, no-wrap
 msgid "guix system init /mnt/etc/config.scm /mnt\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8581
+#: doc/guix.texi:8585
 msgid ""
-"This copies all the necessary files and installs GRUB on @file{/dev/sdX}, unless you pass the @option{--no-bootloader} option.  For "
-"more information, @pxref{Invoking guix system}.  This command may trigger downloads or builds of missing packages, which can take "
-"some time."
+"This copies all the necessary files and installs GRUB on @file{/dev/sdX}, "
+"unless you pass the @option{--no-bootloader} option.  For more information, "
+"@pxref{Invoking guix system}.  This command may trigger downloads or builds "
+"of missing packages, which can take some time."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8588
+#: doc/guix.texi:8592
 msgid ""
-"Once that command has completed---and hopefully succeeded!---you can run @command{reboot} and boot into the new system.  The "
-"@code{root} password in the new system is initially empty; other users' passwords need to be initialized by running the "
-"@command{passwd} command as @code{root}, unless your configuration specifies otherwise (@pxref{user-account-password, user account "
-"passwords})."
+"Once that command has completed---and hopefully succeeded!---you can run "
+"@command{reboot} and boot into the new system.  The @code{root} password in "
+"the new system is initially empty; other users' passwords need to be "
+"initialized by running the @command{passwd} command as @code{root}, unless "
+"your configuration specifies otherwise (@pxref{user-account-password, user "
+"account passwords})."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:8589
+#: doc/guix.texi:8593
 #, no-wrap
 msgid "upgrading GuixSD"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8596
+#: doc/guix.texi:8600
 msgid ""
-"From then on, you can update GuixSD whenever you want by running @command{guix pull} as @code{root} (@pxref{Invoking guix pull}), "
-"and then running @command{guix system reconfigure} to build a new system generation with the latest packages and services "
-"(@pxref{Invoking guix system}).  We recommend doing that regularly so that your system includes the latest security updates "
-"(@pxref{Security Updates})."
+"From then on, you can update GuixSD whenever you want by running "
+"@command{guix pull} as @code{root} (@pxref{Invoking guix pull}), and then "
+"running @command{guix system reconfigure} to build a new system generation "
+"with the latest packages and services (@pxref{Invoking guix system}).  We "
+"recommend doing that regularly so that your system includes the latest "
+"security updates (@pxref{Security Updates})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8600
+#: doc/guix.texi:8604
 msgid ""
-"Join us on @code{#guix} on the Freenode IRC network or on @file{guix-devel@@gnu.org} to share your experience---good or not so good."
+"Join us on @code{#guix} on the Freenode IRC network or on @file{guix-"
+"devel@@gnu.org} to share your experience---good or not so good."
 msgstr ""
 
 #. type: subsection
-#: doc/guix.texi:8602
+#: doc/guix.texi:8606
 #, no-wrap
 msgid "Installing GuixSD in a Virtual Machine"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:8604
+#: doc/guix.texi:8608
 #, no-wrap
 msgid "virtual machine, GuixSD installation"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:8605
+#: doc/guix.texi:8609
 #, no-wrap
 msgid "virtual private server (VPS)"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:8606
+#: doc/guix.texi:8610
 #, no-wrap
 msgid "VPS (virtual private server)"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8610
+#: doc/guix.texi:8614
 msgid ""
-"If you'd like to install GuixSD in a virtual machine (VM) or on a virtual private server (VPS) rather than on your beloved machine, "
-"this section is for you."
+"If you'd like to install GuixSD in a virtual machine (VM) or on a virtual "
+"private server (VPS) rather than on your beloved machine, this section is "
+"for you."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8613
-msgid "To boot a @uref{http://qemu.org/,QEMU} VM for installing GuixSD in a disk image, follow these steps:"
-msgstr ""
-
-#. type: enumerate
-#: doc/guix.texi:8618
-msgid "First, retrieve and decompress the GuixSD installation image as described previously (@pxref{USB Stick and DVD Installation})."
+#: doc/guix.texi:8617
+msgid ""
+"To boot a @uref{http://qemu.org/,QEMU} VM for installing GuixSD in a disk "
+"image, follow these steps:"
 msgstr ""
 
 #. type: enumerate
 #: doc/guix.texi:8622
 msgid ""
-"Create a disk image that will hold the installed system.  To make a qcow2-formatted disk image, use the @command{qemu-img} command:"
+"First, retrieve and decompress the GuixSD installation image as described "
+"previously (@pxref{USB Stick and DVD Installation})."
+msgstr ""
+
+#. type: enumerate
+#: doc/guix.texi:8626
+msgid ""
+"Create a disk image that will hold the installed system.  To make a qcow2-"
+"formatted disk image, use the @command{qemu-img} command:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:8625
+#: doc/guix.texi:8629
 #, no-wrap
 msgid "qemu-img create -f qcow2 guixsd.img 50G\n"
 msgstr ""
 
 #. type: enumerate
-#: doc/guix.texi:8629
+#: doc/guix.texi:8633
 msgid ""
-"The resulting file will be much smaller than 50 GB (typically less than 1 MB), but it will grow as the virtualized storage device is "
-"filled up."
+"The resulting file will be much smaller than 50 GB (typically less than 1 "
+"MB), but it will grow as the virtualized storage device is filled up."
 msgstr ""
 
 #. type: enumerate
-#: doc/guix.texi:8632
+#: doc/guix.texi:8636
 msgid "Boot the USB installation image in an VM:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:8638
+#: doc/guix.texi:8642
 #, no-wrap
 msgid ""
 "qemu-system-x86_64 -m 1024 -smp 1 \\\n"
@@ -16192,145 +19248,167 @@ msgid ""
 "  -drive file=guixsd.img\n"
 msgstr ""
 
-#. type: enumerate
-#: doc/guix.texi:8641
-msgid "The ordering of the drives matters."
-msgstr ""
-
 #. type: enumerate
 #: doc/guix.texi:8645
-msgid ""
-"In the VM console, quickly press the @kbd{F12} key to enter the boot menu.  Then press the @kbd{2} key and the @kbd{RET} key to "
-"validate your selection."
+msgid "The ordering of the drives matters."
 msgstr ""
 
 #. type: enumerate
 #: doc/guix.texi:8649
 msgid ""
-"You're now root in the VM, proceed with the installation process.  @xref{Preparing for Installation}, and follow the instructions."
+"In the VM console, quickly press the @kbd{F12} key to enter the boot menu.  "
+"Then press the @kbd{2} key and the @kbd{RET} key to validate your selection."
+msgstr ""
+
+#. type: enumerate
+#: doc/guix.texi:8653
+msgid ""
+"You're now root in the VM, proceed with the installation process.  "
+"@xref{Preparing for Installation}, and follow the instructions."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8654
+#: doc/guix.texi:8658
 msgid ""
-"Once installation is complete, you can boot the system that's on your @file{guixsd.img} image.  @xref{Running GuixSD in a VM}, for "
-"how to do that."
+"Once installation is complete, you can boot the system that's on your "
+"@file{guixsd.img} image.  @xref{Running GuixSD in a VM}, for how to do that."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:8658
+#: doc/guix.texi:8662
 #, no-wrap
 msgid "installation image"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8661
-msgid "The installation image described above was built using the @command{guix system} command, specifically:"
+#: doc/guix.texi:8665
+msgid ""
+"The installation image described above was built using the @command{guix "
+"system} command, specifically:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:8664
+#: doc/guix.texi:8668
 #, no-wrap
 msgid "guix system disk-image gnu/system/install.scm\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8669
+#: doc/guix.texi:8673
 msgid ""
-"Have a look at @file{gnu/system/install.scm} in the source tree, and see also @ref{Invoking guix system} for more information about "
-"the installation image."
+"Have a look at @file{gnu/system/install.scm} in the source tree, and see "
+"also @ref{Invoking guix system} for more information about the installation "
+"image."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:8673
+#: doc/guix.texi:8677
 #, no-wrap
 msgid "system configuration"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8679
+#: doc/guix.texi:8683
 msgid ""
-"The Guix System Distribution supports a consistent whole-system configuration mechanism.  By that we mean that all aspects of the "
-"global system configuration---such as the available system services, timezone and locale settings, user accounts---are declared in a "
-"single place.  Such a @dfn{system configuration} can be @dfn{instantiated}---i.e., effected."
+"The Guix System Distribution supports a consistent whole-system "
+"configuration mechanism.  By that we mean that all aspects of the global "
+"system configuration---such as the available system services, timezone and "
+"locale settings, user accounts---are declared in a single place.  Such a "
+"@dfn{system configuration} can be @dfn{instantiated}---i.e., effected."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8689
+#: doc/guix.texi:8693
 msgid ""
-"One of the advantages of putting all the system configuration under the control of Guix is that it supports transactional system "
-"upgrades, and makes it possible to roll back to a previous system instantiation, should something go wrong with the new one "
-"(@pxref{Features}).  Another advantage is that it makes it easy to replicate the exact same configuration across different machines, "
-"or at different points in time, without having to resort to additional administration tools layered on top of the own tools of the "
+"One of the advantages of putting all the system configuration under the "
+"control of Guix is that it supports transactional system upgrades, and makes "
+"it possible to roll back to a previous system instantiation, should "
+"something go wrong with the new one (@pxref{Features}).  Another advantage "
+"is that it makes it easy to replicate the exact same configuration across "
+"different machines, or at different points in time, without having to resort "
+"to additional administration tools layered on top of the own tools of the "
 "system."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8694
+#: doc/guix.texi:8698
 msgid ""
-"This section describes this mechanism.  First we focus on the system administrator's viewpoint---explaining how the system is "
-"configured and instantiated.  Then we show how this mechanism can be extended, for instance to support new system services."
+"This section describes this mechanism.  First we focus on the system "
+"administrator's viewpoint---explaining how the system is configured and "
+"instantiated.  Then we show how this mechanism can be extended, for instance "
+"to support new system services."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8721
+#: doc/guix.texi:8725
 msgid ""
-"The operating system is configured by providing an @code{operating-system} declaration in a file that can then be passed to the "
-"@command{guix system} command (@pxref{Invoking guix system}).  A simple setup, with the default system services, the default Linux-"
-"Libre kernel, initial RAM disk, and boot loader looks like this:"
+"The operating system is configured by providing an @code{operating-system} "
+"declaration in a file that can then be passed to the @command{guix system} "
+"command (@pxref{Invoking guix system}).  A simple setup, with the default "
+"system services, the default Linux-Libre kernel, initial RAM disk, and boot "
+"loader looks like this:"
 msgstr ""
 
 #. type: findex
-#: doc/guix.texi:8722
+#: doc/guix.texi:8726
 #, no-wrap
 msgid "operating-system"
 msgstr ""
 
 #. type: include
-#: doc/guix.texi:8724
+#: doc/guix.texi:8728
 #, no-wrap
 msgid "os-config-bare-bones.texi"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8731
+#: doc/guix.texi:8735
 msgid ""
-"This example should be self-describing.  Some of the fields defined above, such as @code{host-name} and @code{bootloader}, are "
-"mandatory.  Others, such as @code{packages} and @code{services}, can be omitted, in which case they get a default value."
+"This example should be self-describing.  Some of the fields defined above, "
+"such as @code{host-name} and @code{bootloader}, are mandatory.  Others, such "
+"as @code{packages} and @code{services}, can be omitted, in which case they "
+"get a default value."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8736
+#: doc/guix.texi:8740
 msgid ""
-"Below we discuss the effect of some of the most important fields (@pxref{operating-system Reference}, for details about all the "
-"available fields), and how to @dfn{instantiate} the operating system using @command{guix system}."
+"Below we discuss the effect of some of the most important fields "
+"(@pxref{operating-system Reference}, for details about all the available "
+"fields), and how to @dfn{instantiate} the operating system using "
+"@command{guix system}."
 msgstr ""
 
 #. type: unnumberedsubsubsec
-#: doc/guix.texi:8737
+#: doc/guix.texi:8741
 #, no-wrap
 msgid "Globally-Visible Packages"
 msgstr ""
 
 #. type: vindex
-#: doc/guix.texi:8739
+#: doc/guix.texi:8743
 #, no-wrap
 msgid "%base-packages"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8752
+#: doc/guix.texi:8756
 msgid ""
-"The @code{packages} field lists packages that will be globally visible on the system, for all user accounts---i.e., in every user's "
-"@code{PATH} environment variable---in addition to the per-user profiles (@pxref{Invoking guix package}).  The @var{%base-packages} "
-"variable provides all the tools one would expect for basic user and administrator tasks---including the GNU Core Utilities, the GNU "
-"Networking Utilities, the GNU Zile lightweight text editor, @command{find}, @command{grep}, etc.  The example above adds GNU@tie{}"
-"Screen and OpenSSH to those, taken from the @code{(gnu packages screen)} and @code{(gnu packages ssh)} modules (@pxref{Package "
-"Modules}).  The @code{(list package output)} syntax can be used to add a specific output of a package:"
+"The @code{packages} field lists packages that will be globally visible on "
+"the system, for all user accounts---i.e., in every user's @code{PATH} "
+"environment variable---in addition to the per-user profiles (@pxref{Invoking "
+"guix package}).  The @var{%base-packages} variable provides all the tools "
+"one would expect for basic user and administrator tasks---including the GNU "
+"Core Utilities, the GNU Networking Utilities, the GNU Zile lightweight text "
+"editor, @command{find}, @command{grep}, etc.  The example above adds "
+"GNU@tie{}Screen and OpenSSH to those, taken from the @code{(gnu packages "
+"screen)} and @code{(gnu packages ssh)} modules (@pxref{Package Modules}).  "
+"The @code{(list package output)} syntax can be used to add a specific output "
+"of a package:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:8756
+#: doc/guix.texi:8760
 #, no-wrap
 msgid ""
 "(use-modules (gnu packages))\n"
@@ -16339,7 +19417,7 @@ msgid ""
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:8761
+#: doc/guix.texi:8765
 #, no-wrap
 msgid ""
 "(operating-system\n"
@@ -16349,22 +19427,25 @@ msgid ""
 msgstr ""
 
 #. type: findex
-#: doc/guix.texi:8763
+#: doc/guix.texi:8767
 #, no-wrap
 msgid "specification->package"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8772
+#: doc/guix.texi:8776
 msgid ""
-"Referring to packages by variable name, like @code{bind} above, has the advantage of being unambiguous; it also allows typos and "
-"such to be diagnosed right away as ``unbound variables''.  The downside is that one needs to know which module defines which "
-"package, and to augment the @code{use-package-modules} line accordingly.  To avoid that, one can use the @code{specification-"
-">package} procedure of the @code{(gnu packages)} module, which returns the best package for a given name or name and version:"
+"Referring to packages by variable name, like @code{bind} above, has the "
+"advantage of being unambiguous; it also allows typos and such to be "
+"diagnosed right away as ``unbound variables''.  The downside is that one "
+"needs to know which module defines which package, and to augment the "
+"@code{use-package-modules} line accordingly.  To avoid that, one can use the "
+"@code{specification->package} procedure of the @code{(gnu packages)} module, "
+"which returns the best package for a given name or name and version:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:8775
+#: doc/guix.texi:8779
 #, no-wrap
 msgid ""
 "(use-modules (gnu packages))\n"
@@ -16372,7 +19453,7 @@ msgid ""
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:8781
+#: doc/guix.texi:8785
 #, no-wrap
 msgid ""
 "(operating-system\n"
@@ -16383,61 +19464,67 @@ msgid ""
 msgstr ""
 
 #. type: unnumberedsubsubsec
-#: doc/guix.texi:8783
+#: doc/guix.texi:8787
 #, no-wrap
 msgid "System Services"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:8785 doc/guix.texi:19871 doc/guix.texi:20789
+#: doc/guix.texi:8789 doc/guix.texi:19933 doc/guix.texi:20851
 #, no-wrap
 msgid "services"
 msgstr ""
 
 #. type: vindex
-#: doc/guix.texi:8786
+#: doc/guix.texi:8790
 #, no-wrap
 msgid "%base-services"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8796
+#: doc/guix.texi:8800
 msgid ""
-"The @code{services} field lists @dfn{system services} to be made available when the system starts (@pxref{Services}).  The "
-"@code{operating-system} declaration above specifies that, in addition to the basic services, we want the @command{lshd} secure shell "
-"daemon listening on port 2222 (@pxref{Networking Services, @code{lsh-service}}).  Under the hood, @code{lsh-service} arranges so "
-"that @code{lshd} is started with the right command-line options, possibly with supporting configuration files generated as needed "
-"(@pxref{Defining Services})."
+"The @code{services} field lists @dfn{system services} to be made available "
+"when the system starts (@pxref{Services}).  The @code{operating-system} "
+"declaration above specifies that, in addition to the basic services, we want "
+"the @command{lshd} secure shell daemon listening on port 2222 "
+"(@pxref{Networking Services, @code{lsh-service}}).  Under the hood, "
+"@code{lsh-service} arranges so that @code{lshd} is started with the right "
+"command-line options, possibly with supporting configuration files generated "
+"as needed (@pxref{Defining Services})."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:8797
+#: doc/guix.texi:8801
 #, no-wrap
 msgid "customization, of services"
 msgstr ""
 
 #. type: findex
-#: doc/guix.texi:8798
+#: doc/guix.texi:8802
 #, no-wrap
 msgid "modify-services"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8802
+#: doc/guix.texi:8806
 msgid ""
-"Occasionally, instead of using the base services as is, you will want to customize them.  To do this, use @code{modify-services} "
-"(@pxref{Service Reference, @code{modify-services}}) to modify the list."
+"Occasionally, instead of using the base services as is, you will want to "
+"customize them.  To do this, use @code{modify-services} (@pxref{Service "
+"Reference, @code{modify-services}}) to modify the list."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8807
+#: doc/guix.texi:8811
 msgid ""
-"For example, suppose you want to modify @code{guix-daemon} and Mingetty (the console log-in) in the @var{%base-services} list "
-"(@pxref{Base Services, @code{%base-services}}).  To do that, you can write the following in your operating system declaration:"
+"For example, suppose you want to modify @code{guix-daemon} and Mingetty (the "
+"console log-in) in the @var{%base-services} list (@pxref{Base Services, "
+"@code{%base-services}}).  To do that, you can write the following in your "
+"operating system declaration:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:8820
+#: doc/guix.texi:8824
 #, no-wrap
 msgid ""
 "(define %my-services\n"
@@ -16455,7 +19542,7 @@ msgid ""
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:8824
+#: doc/guix.texi:8828
 #, no-wrap
 msgid ""
 "(operating-system\n"
@@ -16464,71 +19551,83 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8835
+#: doc/guix.texi:8839
 msgid ""
-"This changes the configuration---i.e., the service parameters---of the @code{guix-service-type} instance, and that of all the "
-"@code{mingetty-service-type} instances in the @var{%base-services} list.  Observe how this is accomplished: first, we arrange for "
-"the original configuration to be bound to the identifier @code{config} in the @var{body}, and then we write the @var{body} so that "
-"it evaluates to the desired configuration.  In particular, notice how we use @code{inherit} to create a new configuration which has "
-"the same values as the old configuration, but with a few modifications."
+"This changes the configuration---i.e., the service parameters---of the "
+"@code{guix-service-type} instance, and that of all the @code{mingetty-"
+"service-type} instances in the @var{%base-services} list.  Observe how this "
+"is accomplished: first, we arrange for the original configuration to be "
+"bound to the identifier @code{config} in the @var{body}, and then we write "
+"the @var{body} so that it evaluates to the desired configuration.  In "
+"particular, notice how we use @code{inherit} to create a new configuration "
+"which has the same values as the old configuration, but with a few "
+"modifications."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8842
+#: doc/guix.texi:8846
 msgid ""
-"The configuration for a typical ``desktop'' usage, with an encrypted root partition, the X11 display server, GNOME and Xfce (users "
-"can choose which of these desktop environments to use at the log-in screen by pressing @kbd{F1}), network management, power "
-"management, and more, would look like this:"
+"The configuration for a typical ``desktop'' usage, with an encrypted root "
+"partition, the X11 display server, GNOME and Xfce (users can choose which of "
+"these desktop environments to use at the log-in screen by pressing "
+"@kbd{F1}), network management, power management, and more, would look like "
+"this:"
 msgstr ""
 
 #. type: include
-#: doc/guix.texi:8844
+#: doc/guix.texi:8848
 #, no-wrap
 msgid "os-config-desktop.texi"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:8847
+#: doc/guix.texi:8851
 #, no-wrap
 msgid "UEFI"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8850
+#: doc/guix.texi:8854
 msgid ""
-"A graphical UEFI system with a choice of lightweight window managers instead of full-blown desktop environments would look like this:"
+"A graphical UEFI system with a choice of lightweight window managers instead "
+"of full-blown desktop environments would look like this:"
 msgstr ""
 
 #. type: include
-#: doc/guix.texi:8852
+#: doc/guix.texi:8856
 #, no-wrap
 msgid "os-config-lightweight-desktop.texi"
 msgstr ""
 
-#. type: Plain text
-#: doc/guix.texi:8858
-msgid ""
-"This example refers to the @file{/boot/efi} file system by its UUID, @code{1234-ABCD}.  Replace this UUID with the right UUID on "
-"your system, as returned by the @command{blkid} command."
-msgstr ""
-
 #. type: Plain text
 #: doc/guix.texi:8862
 msgid ""
-"@xref{Desktop Services}, for the exact list of services provided by @var{%desktop-services}.  @xref{X.509 Certificates}, for "
-"background information about the @code{nss-certs} package that is used here."
+"This example refers to the @file{/boot/efi} file system by its UUID, "
+"@code{1234-ABCD}.  Replace this UUID with the right UUID on your system, as "
+"returned by the @command{blkid} command."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8869
+#: doc/guix.texi:8866
 msgid ""
-"Again, @var{%desktop-services} is just a list of service objects.  If you want to remove services from there, you can do so using "
-"the procedures for list filtering (@pxref{SRFI-1 Filtering and Partitioning,,, guile, GNU Guile Reference Manual}).  For instance, "
-"the following expression returns a list that contains all the services in @var{%desktop-services} minus the Avahi service:"
+"@xref{Desktop Services}, for the exact list of services provided by "
+"@var{%desktop-services}.  @xref{X.509 Certificates}, for background "
+"information about the @code{nss-certs} package that is used here."
+msgstr ""
+
+#. type: Plain text
+#: doc/guix.texi:8873
+msgid ""
+"Again, @var{%desktop-services} is just a list of service objects.  If you "
+"want to remove services from there, you can do so using the procedures for "
+"list filtering (@pxref{SRFI-1 Filtering and Partitioning,,, guile, GNU Guile "
+"Reference Manual}).  For instance, the following expression returns a list "
+"that contains all the services in @var{%desktop-services} minus the Avahi "
+"service:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:8874
+#: doc/guix.texi:8878
 #, no-wrap
 msgid ""
 "(remove (lambda (service)\n"
@@ -16537,327 +19636,356 @@ msgid ""
 msgstr ""
 
 #. type: unnumberedsubsubsec
-#: doc/guix.texi:8876
+#: doc/guix.texi:8880
 #, no-wrap
 msgid "Instantiating the System"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8883
+#: doc/guix.texi:8887
 msgid ""
-"Assuming the @code{operating-system} declaration is stored in the @file{my-system-config.scm} file, the @command{guix system "
-"reconfigure my-system-config.scm} command instantiates that configuration, and makes it the default GRUB boot entry (@pxref{Invoking "
-"guix system})."
+"Assuming the @code{operating-system} declaration is stored in the @file{my-"
+"system-config.scm} file, the @command{guix system reconfigure my-system-"
+"config.scm} command instantiates that configuration, and makes it the "
+"default GRUB boot entry (@pxref{Invoking guix system})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8891
+#: doc/guix.texi:8895
 msgid ""
-"The normal way to change the system configuration is by updating this file and re-running @command{guix system reconfigure}.  One "
-"should never have to touch files in @file{/etc} or to run commands that modify the system state such as @command{useradd} or "
-"@command{grub-install}.  In fact, you must avoid that since that would not only void your warranty but also prevent you from rolling "
-"back to previous versions of your system, should you ever need to."
+"The normal way to change the system configuration is by updating this file "
+"and re-running @command{guix system reconfigure}.  One should never have to "
+"touch files in @file{/etc} or to run commands that modify the system state "
+"such as @command{useradd} or @command{grub-install}.  In fact, you must "
+"avoid that since that would not only void your warranty but also prevent you "
+"from rolling back to previous versions of your system, should you ever need "
+"to."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:8892
+#: doc/guix.texi:8896
 #, no-wrap
 msgid "roll-back, of the operating system"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8902
+#: doc/guix.texi:8906
 msgid ""
-"Speaking of roll-back, each time you run @command{guix system reconfigure}, a new @dfn{generation} of the system is created---"
-"without modifying or deleting previous generations.  Old system generations get an entry in the bootloader boot menu, allowing you "
-"to boot them in case something went wrong with the latest generation.  Reassuring, no? The @command{guix system list-generations} "
-"command lists the system generations available on disk.  It is also possible to roll back the system via the commands @command{guix "
-"system roll-back} and @command{guix system switch-generation}."
+"Speaking of roll-back, each time you run @command{guix system reconfigure}, "
+"a new @dfn{generation} of the system is created---without modifying or "
+"deleting previous generations.  Old system generations get an entry in the "
+"bootloader boot menu, allowing you to boot them in case something went wrong "
+"with the latest generation.  Reassuring, no? The @command{guix system list-"
+"generations} command lists the system generations available on disk.  It is "
+"also possible to roll back the system via the commands @command{guix system "
+"roll-back} and @command{guix system switch-generation}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8908
+#: doc/guix.texi:8912
 msgid ""
-"Although the command @command{guix system reconfigure} will not modify previous generations, must take care when the current "
-"generation is not the latest (e.g., after invoking @command{guix system roll-back}), since the operation might overwrite a later "
-"generation (@pxref{Invoking guix system})."
+"Although the command @command{guix system reconfigure} will not modify "
+"previous generations, must take care when the current generation is not the "
+"latest (e.g., after invoking @command{guix system roll-back}), since the "
+"operation might overwrite a later generation (@pxref{Invoking guix system})."
 msgstr ""
 
 #. type: unnumberedsubsubsec
-#: doc/guix.texi:8909
+#: doc/guix.texi:8913
 #, no-wrap
 msgid "The Programming Interface"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8914
+#: doc/guix.texi:8918
 msgid ""
-"At the Scheme level, the bulk of an @code{operating-system} declaration is instantiated with the following monadic procedure "
-"(@pxref{The Store Monad}):"
+"At the Scheme level, the bulk of an @code{operating-system} declaration is "
+"instantiated with the following monadic procedure (@pxref{The Store Monad}):"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:8915
+#: doc/guix.texi:8919
 #, no-wrap
 msgid "{Monadic Procedure} operating-system-derivation os"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:8918
-msgid "Return a derivation that builds @var{os}, an @code{operating-system} object (@pxref{Derivations})."
+#: doc/guix.texi:8922
+msgid ""
+"Return a derivation that builds @var{os}, an @code{operating-system} object "
+"(@pxref{Derivations})."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:8922
+#: doc/guix.texi:8926
 msgid ""
-"The output of the derivation is a single directory that refers to all the packages, configuration files, and other supporting files "
-"needed to instantiate @var{os}."
+"The output of the derivation is a single directory that refers to all the "
+"packages, configuration files, and other supporting files needed to "
+"instantiate @var{os}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8927
+#: doc/guix.texi:8931
 msgid ""
-"This procedure is provided by the @code{(gnu system)} module.  Along with @code{(gnu services)} (@pxref{Services}), this module "
-"contains the guts of GuixSD.  Make sure to visit it!"
+"This procedure is provided by the @code{(gnu system)} module.  Along with "
+"@code{(gnu services)} (@pxref{Services}), this module contains the guts of "
+"GuixSD.  Make sure to visit it!"
 msgstr ""
 
 #. type: subsection
-#: doc/guix.texi:8930
+#: doc/guix.texi:8934
 #, no-wrap
 msgid "@code{operating-system} Reference"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8935
+#: doc/guix.texi:8939
 msgid ""
-"This section summarizes all the options available in @code{operating-system} declarations (@pxref{Using the Configuration System})."
+"This section summarizes all the options available in @code{operating-system} "
+"declarations (@pxref{Using the Configuration System})."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:8936
+#: doc/guix.texi:8940
 #, no-wrap
 msgid "{Data Type} operating-system"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:8940
+#: doc/guix.texi:8944
 msgid ""
-"This is the data type representing an operating system configuration.  By that, we mean all the global system configuration, not per-"
-"user configuration (@pxref{Using the Configuration System})."
+"This is the data type representing an operating system configuration.  By "
+"that, we mean all the global system configuration, not per-user "
+"configuration (@pxref{Using the Configuration System})."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:8942
+#: doc/guix.texi:8946
 #, no-wrap
 msgid "@code{kernel} (default: @var{linux-libre})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8946
+#: doc/guix.texi:8950
 msgid ""
-"The package object of the operating system kernel to use@footnote{Currently only the Linux-libre kernel is supported.  In the "
-"future, it will be possible to use the GNU@tie{}Hurd.}."
+"The package object of the operating system kernel to use@footnote{Currently "
+"only the Linux-libre kernel is supported.  In the future, it will be "
+"possible to use the GNU@tie{}Hurd.}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:8947
+#: doc/guix.texi:8951
 #, no-wrap
 msgid "@code{kernel-arguments} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8950
+#: doc/guix.texi:8954
 msgid ""
-"List of strings or gexps representing additional arguments to pass on the command-line of the kernel---e.g., "
-"@code{(\"console=ttyS0\")}."
+"List of strings or gexps representing additional arguments to pass on the "
+"command-line of the kernel---e.g., @code{(\"console=ttyS0\")}."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:8951 doc/guix.texi:20068 doc/guix.texi:20087
+#: doc/guix.texi:8955 doc/guix.texi:20130 doc/guix.texi:20149
 #, no-wrap
 msgid "bootloader"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8953
-msgid "The system bootloader configuration object.  @xref{Bootloader Configuration}."
+#: doc/guix.texi:8957
+msgid ""
+"The system bootloader configuration object.  @xref{Bootloader Configuration}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:8954
+#: doc/guix.texi:8958
 #, no-wrap
 msgid "@code{initrd-modules} (default: @code{%base-initrd-modules})"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:8955 doc/guix.texi:19908 doc/guix.texi:20011 doc/guix.texi:20206
+#: doc/guix.texi:8959 doc/guix.texi:19970 doc/guix.texi:20073
+#: doc/guix.texi:20268
 #, no-wrap
 msgid "initrd"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:8956 doc/guix.texi:19909 doc/guix.texi:20012
+#: doc/guix.texi:8960 doc/guix.texi:19971 doc/guix.texi:20074
 #, no-wrap
 msgid "initial RAM disk"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8959
-msgid "The list of Linux kernel modules that need to be available in the initial RAM disk.  @xref{Initial RAM Disk}."
+#: doc/guix.texi:8963
+msgid ""
+"The list of Linux kernel modules that need to be available in the initial "
+"RAM disk.  @xref{Initial RAM Disk}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:8960
+#: doc/guix.texi:8964
 #, no-wrap
 msgid "@code{initrd} (default: @code{base-initrd})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8964
+#: doc/guix.texi:8968
 msgid ""
-"A monadic procedure that returns an initial RAM disk for the Linux kernel.  This field is provided to support low-level "
-"customization and should rarely be needed for casual use.  @xref{Initial RAM Disk}."
+"A monadic procedure that returns an initial RAM disk for the Linux kernel.  "
+"This field is provided to support low-level customization and should rarely "
+"be needed for casual use.  @xref{Initial RAM Disk}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:8965
+#: doc/guix.texi:8969
 #, no-wrap
 msgid "@code{firmware} (default: @var{%base-firmware})"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:8966
+#: doc/guix.texi:8970
 #, no-wrap
 msgid "firmware"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8968
+#: doc/guix.texi:8972
 msgid "List of firmware packages loadable by the operating system kernel."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8973
+#: doc/guix.texi:8977
 msgid ""
-"The default includes firmware needed for Atheros- and Broadcom-based WiFi devices (Linux-libre modules @code{ath9k} and @code{b43-"
-"open}, respectively).  @xref{Hardware Considerations}, for more info on supported hardware."
+"The default includes firmware needed for Atheros- and Broadcom-based WiFi "
+"devices (Linux-libre modules @code{ath9k} and @code{b43-open}, "
+"respectively).  @xref{Hardware Considerations}, for more info on supported "
+"hardware."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:8974
+#: doc/guix.texi:8978
 #, no-wrap
 msgid "host-name"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8976
+#: doc/guix.texi:8980
 msgid "The host name."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:8977
+#: doc/guix.texi:8981
 #, no-wrap
 msgid "hosts-file"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:8978
+#: doc/guix.texi:8982
 #, no-wrap
 msgid "hosts file"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8983
+#: doc/guix.texi:8987
 msgid ""
-"A file-like object (@pxref{G-Expressions, file-like objects}) for use as @file{/etc/hosts} (@pxref{Host Names,,, libc, The GNU C "
-"Library Reference Manual}).  The default is a file with entries for @code{localhost} and @var{host-name}."
+"A file-like object (@pxref{G-Expressions, file-like objects}) for use as "
+"@file{/etc/hosts} (@pxref{Host Names,,, libc, The GNU C Library Reference "
+"Manual}).  The default is a file with entries for @code{localhost} and "
+"@var{host-name}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:8984
+#: doc/guix.texi:8988
 #, no-wrap
 msgid "@code{mapped-devices} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8986
+#: doc/guix.texi:8990
 msgid "A list of mapped devices.  @xref{Mapped Devices}."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:8987
+#: doc/guix.texi:8991
 #, no-wrap
 msgid "file-systems"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8989
+#: doc/guix.texi:8993
 msgid "A list of file systems.  @xref{File Systems}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:8990
+#: doc/guix.texi:8994
 #, no-wrap
 msgid "@code{swap-devices} (default: @code{'()})"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:8991
+#: doc/guix.texi:8995
 #, no-wrap
 msgid "swap devices"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8998
+#: doc/guix.texi:9002
 msgid ""
-"A list of strings identifying devices or files to be used for ``swap space'' (@pxref{Memory Concepts,,, libc, The GNU C Library "
-"Reference Manual}).  For example, @code{'(\"/dev/sda3\")} or @code{'(\"/swapfile\")}.  It is possible to specify a swap file in a "
-"file system on a mapped device, provided that the necessary device mapping and file system are also specified.  @xref{Mapped "
-"Devices} and @ref{File Systems}."
+"A list of strings identifying devices or files to be used for ``swap "
+"space'' (@pxref{Memory Concepts,,, libc, The GNU C Library Reference "
+"Manual}).  For example, @code{'(\"/dev/sda3\")} or @code{'(\"/swapfile\")}.  "
+"It is possible to specify a swap file in a file system on a mapped device, "
+"provided that the necessary device mapping and file system are also "
+"specified.  @xref{Mapped Devices} and @ref{File Systems}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:8999
+#: doc/guix.texi:9003
 #, no-wrap
 msgid "@code{users} (default: @code{%base-user-accounts})"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:9000
+#: doc/guix.texi:9004
 #, no-wrap
 msgid "@code{groups} (default: @var{%base-groups})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9002
+#: doc/guix.texi:9006
 msgid "List of user accounts and groups.  @xref{User Accounts}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9005
-msgid "If the @code{users} list lacks a user account with UID@tie{}0, a ``root'' account with UID@tie{}0 is automatically added."
+#: doc/guix.texi:9009
+msgid ""
+"If the @code{users} list lacks a user account with UID@tie{}0, a ``root'' "
+"account with UID@tie{}0 is automatically added."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9006
+#: doc/guix.texi:9010
 #, no-wrap
 msgid "@code{skeletons} (default: @code{(default-skeletons)})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9010
+#: doc/guix.texi:9014
 msgid ""
-"A list target file name/file-like object tuples (@pxref{G-Expressions, file-like objects}).  These are the skeleton files that will "
-"be added to the home directory of newly-created user accounts."
+"A list target file name/file-like object tuples (@pxref{G-Expressions, file-"
+"like objects}).  These are the skeleton files that will be added to the home "
+"directory of newly-created user accounts."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9012
+#: doc/guix.texi:9016
 msgid "For instance, a valid value may look like this:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:9018
+#: doc/guix.texi:9022
 #, no-wrap
 msgid ""
 "`((\".bashrc\" ,(plain-file \"bashrc\" \"echo Hello\\n\"))\n"
@@ -16867,181 +19995,196 @@ msgid ""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9020
+#: doc/guix.texi:9024
 #, no-wrap
 msgid "@code{issue} (default: @var{%default-issue})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9023
-msgid "A string denoting the contents of the @file{/etc/issue} file, which is displayed when users log in on a text console."
+#: doc/guix.texi:9027
+msgid ""
+"A string denoting the contents of the @file{/etc/issue} file, which is "
+"displayed when users log in on a text console."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9024
+#: doc/guix.texi:9028
 #, no-wrap
 msgid "@code{packages} (default: @var{%base-packages})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9027
-msgid "The set of packages installed in the global profile, which is accessible at @file{/run/current-system/profile}."
+#: doc/guix.texi:9031
+msgid ""
+"The set of packages installed in the global profile, which is accessible at "
+"@file{/run/current-system/profile}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9031
+#: doc/guix.texi:9035
 msgid ""
-"The default set includes core utilities and it is good practice to install non-core utilities in user profiles (@pxref{Invoking guix "
-"package})."
+"The default set includes core utilities and it is good practice to install "
+"non-core utilities in user profiles (@pxref{Invoking guix package})."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:9032
+#: doc/guix.texi:9036
 #, no-wrap
 msgid "timezone"
 msgstr ""
 
-#. type: table
-#: doc/guix.texi:9034
-msgid "A timezone identifying string---e.g., @code{\"Europe/Paris\"}."
-msgstr ""
-
 #. type: table
 #: doc/guix.texi:9038
-msgid ""
-"You can run the @command{tzselect} command to find out which timezone string corresponds to your region.  Choosing an invalid "
-"timezone name causes @command{guix system} to fail."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:9039
-#, no-wrap
-msgid "@code{locale} (default: @code{\"en_US.utf8\"})"
+msgid "A timezone identifying string---e.g., @code{\"Europe/Paris\"}."
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:9042
 msgid ""
-"The name of the default locale (@pxref{Locale Names,,, libc, The GNU C Library Reference Manual}).  @xref{Locales}, for more "
-"information."
+"You can run the @command{tzselect} command to find out which timezone string "
+"corresponds to your region.  Choosing an invalid timezone name causes "
+"@command{guix system} to fail."
 msgstr ""
 
 #. type: item
 #: doc/guix.texi:9043
 #, no-wrap
-msgid "@code{locale-definitions} (default: @var{%default-locale-definitions})"
+msgid "@code{locale} (default: @code{\"en_US.utf8\"})"
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:9046
-msgid "The list of locale definitions to be compiled and that may be used at run time.  @xref{Locales}."
+msgid ""
+"The name of the default locale (@pxref{Locale Names,,, libc, The GNU C "
+"Library Reference Manual}).  @xref{Locales}, for more information."
 msgstr ""
 
 #. type: item
 #: doc/guix.texi:9047
 #, no-wrap
+msgid "@code{locale-definitions} (default: @var{%default-locale-definitions})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:9050
+msgid ""
+"The list of locale definitions to be compiled and that may be used at run "
+"time.  @xref{Locales}."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:9051
+#, no-wrap
 msgid "@code{locale-libcs} (default: @code{(list @var{glibc})})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9051
+#: doc/guix.texi:9055
 msgid ""
-"The list of GNU@tie{}libc packages whose locale data and tools are used to build the locale definitions.  @xref{Locales}, for "
-"compatibility considerations that justify this option."
+"The list of GNU@tie{}libc packages whose locale data and tools are used to "
+"build the locale definitions.  @xref{Locales}, for compatibility "
+"considerations that justify this option."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9052
+#: doc/guix.texi:9056
 #, no-wrap
 msgid "@code{name-service-switch} (default: @var{%default-nss})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9056
+#: doc/guix.texi:9060
 msgid ""
-"Configuration of the libc name service switch (NSS)---a @code{<name-service-switch>} object.  @xref{Name Service Switch}, for "
-"details."
+"Configuration of the libc name service switch (NSS)---a @code{<name-service-"
+"switch>} object.  @xref{Name Service Switch}, for details."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9057
+#: doc/guix.texi:9061
 #, no-wrap
 msgid "@code{services} (default: @var{%base-services})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9059
+#: doc/guix.texi:9063
 msgid "A list of service objects denoting system services.  @xref{Services}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9060
+#: doc/guix.texi:9064
 #, no-wrap
 msgid "@code{pam-services} (default: @code{(base-pam-services)})"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:9061
+#: doc/guix.texi:9065
 #, no-wrap
 msgid "PAM"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:9062
+#: doc/guix.texi:9066
 #, no-wrap
 msgid "pluggable authentication modules"
 msgstr ""
 
-#. type: table
-#: doc/guix.texi:9065
-msgid "Linux @dfn{pluggable authentication module} (PAM) services."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:9066
-#, no-wrap
-msgid "@code{setuid-programs} (default: @var{%setuid-programs})"
-msgstr ""
-
 #. type: table
 #: doc/guix.texi:9069
-msgid "List of string-valued G-expressions denoting setuid programs.  @xref{Setuid Programs}."
+msgid "Linux @dfn{pluggable authentication module} (PAM) services."
 msgstr ""
 
 #. type: item
 #: doc/guix.texi:9070
 #, no-wrap
+msgid "@code{setuid-programs} (default: @var{%setuid-programs})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:9073
+msgid ""
+"List of string-valued G-expressions denoting setuid programs.  @xref{Setuid "
+"Programs}."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:9074
+#, no-wrap
 msgid "@code{sudoers-file} (default: @var{%sudoers-specification})"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:9071
+#: doc/guix.texi:9075
 #, no-wrap
 msgid "sudoers file"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9074
+#: doc/guix.texi:9078
 msgid ""
-"The contents of the @file{/etc/sudoers} file as a file-like object (@pxref{G-Expressions, @code{local-file} and @code{plain-file}})."
+"The contents of the @file{/etc/sudoers} file as a file-like object (@pxref{G-"
+"Expressions, @code{local-file} and @code{plain-file}})."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9079
+#: doc/guix.texi:9083
 msgid ""
-"This file specifies which users can use the @command{sudo} command, what they are allowed to do, and what privileges they may gain.  "
-"The default is that only @code{root} and members of the @code{wheel} group may use @code{sudo}."
+"This file specifies which users can use the @command{sudo} command, what "
+"they are allowed to do, and what privileges they may gain.  The default is "
+"that only @code{root} and members of the @code{wheel} group may use "
+"@code{sudo}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9090
+#: doc/guix.texi:9094
 msgid ""
-"The list of file systems to be mounted is specified in the @code{file-systems} field of the operating system declaration "
-"(@pxref{Using the Configuration System}).  Each file system is declared using the @code{file-system} form, like this:"
+"The list of file systems to be mounted is specified in the @code{file-"
+"systems} field of the operating system declaration (@pxref{Using the "
+"Configuration System}).  Each file system is declared using the @code{file-"
+"system} form, like this:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:9096
+#: doc/guix.texi:9100
 #, no-wrap
 msgid ""
 "(file-system\n"
@@ -17051,88 +20194,98 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9100
+#: doc/guix.texi:9104
 msgid ""
-"As usual, some of the fields are mandatory---those shown in the example above---while others can be omitted.  These are described "
-"below."
+"As usual, some of the fields are mandatory---those shown in the example "
+"above---while others can be omitted.  These are described below."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:9101
+#: doc/guix.texi:9105
 #, no-wrap
 msgid "{Data Type} file-system"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:9104
-msgid "Objects of this type represent file systems to be mounted.  They contain the following members:"
+#: doc/guix.texi:9108
+msgid ""
+"Objects of this type represent file systems to be mounted.  They contain the "
+"following members:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9106 doc/guix.texi:9290
+#: doc/guix.texi:9110 doc/guix.texi:9294
 #, no-wrap
 msgid "type"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9109
-msgid "This is a string specifying the type of the file system---e.g., @code{\"ext4\"}."
+#: doc/guix.texi:9113
+msgid ""
+"This is a string specifying the type of the file system---e.g., "
+"@code{\"ext4\"}."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:9110
+#: doc/guix.texi:9114
 #, no-wrap
 msgid "mount-point"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9112
+#: doc/guix.texi:9116
 msgid "This designates the place where the file system is to be mounted."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:9113
+#: doc/guix.texi:9117
 #, no-wrap
 msgid "device"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9117
+#: doc/guix.texi:9121
 msgid ""
-"This names the ``source'' of the file system.  By default it is the name of a node under @file{/dev}, but its meaning depends on the "
-"@code{title} field described below."
+"This names the ``source'' of the file system.  By default it is the name of "
+"a node under @file{/dev}, but its meaning depends on the @code{title} field "
+"described below."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9118
+#: doc/guix.texi:9122
 #, no-wrap
 msgid "@code{title} (default: @code{'device})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9121
-msgid "This is a symbol that specifies how the @code{device} field is to be interpreted."
+#: doc/guix.texi:9125
+msgid ""
+"This is a symbol that specifies how the @code{device} field is to be "
+"interpreted."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9126
+#: doc/guix.texi:9130
 msgid ""
-"When it is the symbol @code{device}, then the @code{device} field is interpreted as a file name; when it is @code{label}, then "
-"@code{device} is interpreted as a file system label name; when it is @code{uuid}, @code{device} is interpreted as a file system "
-"unique identifier (UUID)."
+"When it is the symbol @code{device}, then the @code{device} field is "
+"interpreted as a file name; when it is @code{label}, then @code{device} is "
+"interpreted as a file system label name; when it is @code{uuid}, "
+"@code{device} is interpreted as a file system unique identifier (UUID)."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9134
+#: doc/guix.texi:9138
 msgid ""
-"UUIDs may be converted from their string representation (as shown by the @command{tune2fs -l} command) using the @code{uuid} "
-"form@footnote{The @code{uuid} form expects 16-byte UUIDs as defined in @uref{https://tools.ietf.org/html/rfc4122, RFC@tie{}4122}.  "
-"This is the form of UUID used by the ext2 family of file systems and others, but it is different from ``UUIDs'' found in FAT file "
-"systems, for instance.}, like this:"
+"UUIDs may be converted from their string representation (as shown by the "
+"@command{tune2fs -l} command) using the @code{uuid} form@footnote{The "
+"@code{uuid} form expects 16-byte UUIDs as defined in @uref{https://tools."
+"ietf.org/html/rfc4122, RFC@tie{}4122}.  This is the form of UUID used by the "
+"ext2 family of file systems and others, but it is different from ``UUIDs'' "
+"found in FAT file systems, for instance.}, like this:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:9141
+#: doc/guix.texi:9145
 #, no-wrap
 msgid ""
 "(file-system\n"
@@ -17143,327 +20296,371 @@ msgid ""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9150
+#: doc/guix.texi:9154
 msgid ""
-"The @code{label} and @code{uuid} options offer a way to refer to file systems without having to hard-code their actual device "
-"name@footnote{Note that, while it is tempting to use @file{/dev/disk/by-uuid} and similar device names to achieve the same result, "
-"this is not recommended: These special device nodes are created by the udev daemon and may be unavailable at the time the device is "
-"mounted.}."
+"The @code{label} and @code{uuid} options offer a way to refer to file "
+"systems without having to hard-code their actual device name@footnote{Note "
+"that, while it is tempting to use @file{/dev/disk/by-uuid} and similar "
+"device names to achieve the same result, this is not recommended: These "
+"special device nodes are created by the udev daemon and may be unavailable "
+"at the time the device is mounted.}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9157
+#: doc/guix.texi:9161
 msgid ""
-"However, when the source of a file system is a mapped device (@pxref{Mapped Devices}), its @code{device} field @emph{must} refer to "
-"the mapped device name---e.g., @file{/dev/mapper/root-partition}---and consequently @code{title} must be set to @code{'device}.  "
-"This is required so that the system knows that mounting the file system depends on having the corresponding device mapping "
-"established."
+"However, when the source of a file system is a mapped device (@pxref{Mapped "
+"Devices}), its @code{device} field @emph{must} refer to the mapped device "
+"name---e.g., @file{/dev/mapper/root-partition}---and consequently "
+"@code{title} must be set to @code{'device}.  This is required so that the "
+"system knows that mounting the file system depends on having the "
+"corresponding device mapping established."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9158
+#: doc/guix.texi:9162
 #, no-wrap
 msgid "@code{flags} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9163
+#: doc/guix.texi:9167
 msgid ""
-"This is a list of symbols denoting mount flags.  Recognized flags include @code{read-only}, @code{bind-mount}, @code{no-dev} "
-"(disallow access to special files), @code{no-suid} (ignore setuid and setgid bits), and @code{no-exec} (disallow program execution.)"
+"This is a list of symbols denoting mount flags.  Recognized flags include "
+"@code{read-only}, @code{bind-mount}, @code{no-dev} (disallow access to "
+"special files), @code{no-suid} (ignore setuid and setgid bits), and @code{no-"
+"exec} (disallow program execution.)"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9164
+#: doc/guix.texi:9168
 #, no-wrap
 msgid "@code{options} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9166
+#: doc/guix.texi:9170
 msgid "This is either @code{#f}, or a string denoting mount options."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9167
+#: doc/guix.texi:9171
 #, no-wrap
 msgid "@code{mount?} (default: @code{#t})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9172
+#: doc/guix.texi:9176
 msgid ""
-"This value indicates whether to automatically mount the file system when the system is brought up.  When set to @code{#f}, the file "
-"system gets an entry in @file{/etc/fstab} (read by the @command{mount} command) but is not automatically mounted."
+"This value indicates whether to automatically mount the file system when the "
+"system is brought up.  When set to @code{#f}, the file system gets an entry "
+"in @file{/etc/fstab} (read by the @command{mount} command) but is not "
+"automatically mounted."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9173
+#: doc/guix.texi:9177
 #, no-wrap
 msgid "@code{needed-for-boot?} (default: @code{#f})"
 msgstr ""
 
-#. type: table
-#: doc/guix.texi:9178
-msgid ""
-"This Boolean value indicates whether the file system is needed when booting.  If that is true, then the file system is mounted when "
-"the initial RAM disk (initrd) is loaded.  This is always the case, for instance, for the root file system."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:9179
-#, no-wrap
-msgid "@code{check?} (default: @code{#t})"
-msgstr ""
-
 #. type: table
 #: doc/guix.texi:9182
-msgid "This Boolean indicates whether the file system needs to be checked for errors before being mounted."
+msgid ""
+"This Boolean value indicates whether the file system is needed when "
+"booting.  If that is true, then the file system is mounted when the initial "
+"RAM disk (initrd) is loaded.  This is always the case, for instance, for the "
+"root file system."
 msgstr ""
 
 #. type: item
 #: doc/guix.texi:9183
 #, no-wrap
+msgid "@code{check?} (default: @code{#t})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:9186
+msgid ""
+"This Boolean indicates whether the file system needs to be checked for "
+"errors before being mounted."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:9187
+#, no-wrap
 msgid "@code{create-mount-point?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9185
+#: doc/guix.texi:9189
 msgid "When true, the mount point is created if it does not exist yet."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9186
+#: doc/guix.texi:9190
 #, no-wrap
 msgid "@code{dependencies} (default: @code{'()})"
 msgstr ""
 
-#. type: table
-#: doc/guix.texi:9190
-msgid ""
-"This is a list of @code{<file-system>} or @code{<mapped-device>} objects representing file systems that must be mounted or mapped "
-"devices that must be opened before (and unmounted or closed after) this one."
-msgstr ""
-
 #. type: table
 #: doc/guix.texi:9194
 msgid ""
-"As an example, consider a hierarchy of mounts: @file{/sys/fs/cgroup} is a dependency of @file{/sys/fs/cgroup/cpu} and @file{/sys/fs/"
-"cgroup/memory}."
+"This is a list of @code{<file-system>} or @code{<mapped-device>} objects "
+"representing file systems that must be mounted or mapped devices that must "
+"be opened before (and unmounted or closed after) this one."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9197
+#: doc/guix.texi:9198
 msgid ""
-"Another example is a file system that depends on a mapped device, for example for an encrypted partition (@pxref{Mapped Devices})."
+"As an example, consider a hierarchy of mounts: @file{/sys/fs/cgroup} is a "
+"dependency of @file{/sys/fs/cgroup/cpu} and @file{/sys/fs/cgroup/memory}."
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:9201
+msgid ""
+"Another example is a file system that depends on a mapped device, for "
+"example for an encrypted partition (@pxref{Mapped Devices})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9202
-msgid "The @code{(gnu system file-systems)} exports the following useful variables."
+#: doc/guix.texi:9206
+msgid ""
+"The @code{(gnu system file-systems)} exports the following useful variables."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:9203
+#: doc/guix.texi:9207
 #, no-wrap
 msgid "{Scheme Variable} %base-file-systems"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:9208
+#: doc/guix.texi:9212
 msgid ""
-"These are essential file systems that are required on normal systems, such as @var{%pseudo-terminal-file-system} and @var{%immutable-"
-"store} (see below.)  Operating system declarations should always contain at least these."
+"These are essential file systems that are required on normal systems, such "
+"as @var{%pseudo-terminal-file-system} and @var{%immutable-store} (see "
+"below.)  Operating system declarations should always contain at least these."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:9210
+#: doc/guix.texi:9214
 #, no-wrap
 msgid "{Scheme Variable} %pseudo-terminal-file-system"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:9216
+#: doc/guix.texi:9220
 msgid ""
-"This is the file system to be mounted as @file{/dev/pts}.  It supports @dfn{pseudo-terminals} created @i{via} @code{openpty} and "
-"similar functions (@pxref{Pseudo-Terminals,,, libc, The GNU C Library Reference Manual}).  Pseudo-terminals are used by terminal "
-"emulators such as @command{xterm}."
+"This is the file system to be mounted as @file{/dev/pts}.  It supports "
+"@dfn{pseudo-terminals} created @i{via} @code{openpty} and similar functions "
+"(@pxref{Pseudo-Terminals,,, libc, The GNU C Library Reference Manual}).  "
+"Pseudo-terminals are used by terminal emulators such as @command{xterm}."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:9218
+#: doc/guix.texi:9222
 #, no-wrap
 msgid "{Scheme Variable} %shared-memory-file-system"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:9222
+#: doc/guix.texi:9226
 msgid ""
-"This file system is mounted as @file{/dev/shm} and is used to support memory sharing across processes (@pxref{Memory-mapped I/O, "
-"@code{shm_open},, libc, The GNU C Library Reference Manual})."
+"This file system is mounted as @file{/dev/shm} and is used to support memory "
+"sharing across processes (@pxref{Memory-mapped I/O, @code{shm_open},, libc, "
+"The GNU C Library Reference Manual})."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:9224
+#: doc/guix.texi:9228
 #, no-wrap
 msgid "{Scheme Variable} %immutable-store"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:9229
+#: doc/guix.texi:9233
 msgid ""
-"This file system performs a read-only ``bind mount'' of @file{/gnu/store}, making it read-only for all the users including "
-"@code{root}.  This prevents against accidental modification by software running as @code{root} or by system administrators."
+"This file system performs a read-only ``bind mount'' of @file{/gnu/store}, "
+"making it read-only for all the users including @code{root}.  This prevents "
+"against accidental modification by software running as @code{root} or by "
+"system administrators."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:9232
-msgid "The daemon itself is still able to write to the store: it remounts it read-write in its own ``name space.''"
+#: doc/guix.texi:9236
+msgid ""
+"The daemon itself is still able to write to the store: it remounts it read-"
+"write in its own ``name space.''"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:9234
+#: doc/guix.texi:9238
 #, no-wrap
 msgid "{Scheme Variable} %binary-format-file-system"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:9238
+#: doc/guix.texi:9242
 msgid ""
-"The @code{binfmt_misc} file system, which allows handling of arbitrary executable file types to be delegated to user space.  This "
-"requires the @code{binfmt.ko} kernel module to be loaded."
+"The @code{binfmt_misc} file system, which allows handling of arbitrary "
+"executable file types to be delegated to user space.  This requires the "
+"@code{binfmt.ko} kernel module to be loaded."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:9240
+#: doc/guix.texi:9244
 #, no-wrap
 msgid "{Scheme Variable} %fuse-control-file-system"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:9244
+#: doc/guix.texi:9248
 msgid ""
-"The @code{fusectl} file system, which allows unprivileged users to mount and unmount user-space FUSE file systems.  This requires "
-"the @code{fuse.ko} kernel module to be loaded."
+"The @code{fusectl} file system, which allows unprivileged users to mount and "
+"unmount user-space FUSE file systems.  This requires the @code{fuse.ko} "
+"kernel module to be loaded."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:9249
+#: doc/guix.texi:9253
 #, no-wrap
 msgid "device mapping"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:9250
+#: doc/guix.texi:9254
 #, no-wrap
 msgid "mapped devices"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9268
+#: doc/guix.texi:9272
 msgid ""
-"The Linux kernel has a notion of @dfn{device mapping}: a block device, such as a hard disk partition, can be @dfn{mapped} into "
-"another device, usually in @code{/dev/mapper/}, with additional processing over the data that flows through it@footnote{Note that "
-"the GNU@tie{}Hurd makes no difference between the concept of a ``mapped device'' and that of a file system: both boil down to "
-"@emph{translating} input/output operations made on a file to operations on its backing store.  Thus, the Hurd implements mapped "
-"devices, like file systems, using the generic @dfn{translator} mechanism (@pxref{Translators,,, hurd, The GNU Hurd Reference "
-"Manual}).}.  A typical example is encryption device mapping: all writes to the mapped device are encrypted, and all reads are "
-"deciphered, transparently.  Guix extends this notion by considering any device or set of devices that are @dfn{transformed} in some "
-"way to create a new device; for instance, RAID devices are obtained by @dfn{assembling} several other devices, such as hard disks or "
-"partitions, into a new one that behaves as one partition.  Other examples, not yet implemented, are LVM logical volumes."
+"The Linux kernel has a notion of @dfn{device mapping}: a block device, such "
+"as a hard disk partition, can be @dfn{mapped} into another device, usually "
+"in @code{/dev/mapper/}, with additional processing over the data that flows "
+"through it@footnote{Note that the GNU@tie{}Hurd makes no difference between "
+"the concept of a ``mapped device'' and that of a file system: both boil down "
+"to @emph{translating} input/output operations made on a file to operations "
+"on its backing store.  Thus, the Hurd implements mapped devices, like file "
+"systems, using the generic @dfn{translator} mechanism (@pxref{Translators,,, "
+"hurd, The GNU Hurd Reference Manual}).}.  A typical example is encryption "
+"device mapping: all writes to the mapped device are encrypted, and all reads "
+"are deciphered, transparently.  Guix extends this notion by considering any "
+"device or set of devices that are @dfn{transformed} in some way to create a "
+"new device; for instance, RAID devices are obtained by @dfn{assembling} "
+"several other devices, such as hard disks or partitions, into a new one that "
+"behaves as one partition.  Other examples, not yet implemented, are LVM "
+"logical volumes."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9271
-msgid "Mapped devices are declared using the @code{mapped-device} form, defined as follows; for examples, see below."
+#: doc/guix.texi:9275
+msgid ""
+"Mapped devices are declared using the @code{mapped-device} form, defined as "
+"follows; for examples, see below."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:9272
+#: doc/guix.texi:9276
 #, no-wrap
 msgid "{Data Type} mapped-device"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:9275
-msgid "Objects of this type represent device mappings that will be made when the system boots up."
+#: doc/guix.texi:9279
+msgid ""
+"Objects of this type represent device mappings that will be made when the "
+"system boots up."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9281
+#: doc/guix.texi:9285
 msgid ""
-"This is either a string specifying the name of the block device to be mapped, such as @code{\"/dev/sda3\"}, or a list of such "
-"strings when several devices need to be assembled for creating a new one."
+"This is either a string specifying the name of the block device to be "
+"mapped, such as @code{\"/dev/sda3\"}, or a list of such strings when several "
+"devices need to be assembled for creating a new one."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:9282 doc/guix.texi:20100
+#: doc/guix.texi:9286 doc/guix.texi:20162
 #, no-wrap
 msgid "target"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9289
+#: doc/guix.texi:9293
 msgid ""
-"This string specifies the name of the resulting mapped device.  For kernel mappers such as encrypted devices of type @code{luks-"
-"device-mapping}, specifying @code{\"my-partition\"} leads to the creation of the @code{\"/dev/mapper/my-partition\"} device.  For "
-"RAID devices of type @code{raid-device-mapping}, the full device name such as @code{\"/dev/md0\"} needs to be given."
+"This string specifies the name of the resulting mapped device.  For kernel "
+"mappers such as encrypted devices of type @code{luks-device-mapping}, "
+"specifying @code{\"my-partition\"} leads to the creation of the @code{\"/dev/"
+"mapper/my-partition\"} device.  For RAID devices of type @code{raid-device-"
+"mapping}, the full device name such as @code{\"/dev/md0\"} needs to be given."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9293
-msgid "This must be a @code{mapped-device-kind} object, which specifies how @var{source} is mapped to @var{target}."
+#: doc/guix.texi:9297
+msgid ""
+"This must be a @code{mapped-device-kind} object, which specifies how "
+"@var{source} is mapped to @var{target}."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:9296
+#: doc/guix.texi:9300
 #, no-wrap
 msgid "{Scheme Variable} luks-device-mapping"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:9300
+#: doc/guix.texi:9304
 msgid ""
-"This defines LUKS block device encryption using the @command{cryptsetup} command from the package with the same name.  It relies on "
-"the @code{dm-crypt} Linux kernel module."
+"This defines LUKS block device encryption using the @command{cryptsetup} "
+"command from the package with the same name.  It relies on the @code{dm-"
+"crypt} Linux kernel module."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:9302
+#: doc/guix.texi:9306
 #, no-wrap
 msgid "{Scheme Variable} raid-device-mapping"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:9307
+#: doc/guix.texi:9311
 msgid ""
-"This defines a RAID device, which is assembled using the @code{mdadm} command from the package with the same name.  It requires a "
-"Linux kernel module for the appropriate RAID level to be loaded, such as @code{raid456} for RAID-4, RAID-5 or RAID-6, or "
-"@code{raid10} for RAID-10."
+"This defines a RAID device, which is assembled using the @code{mdadm} "
+"command from the package with the same name.  It requires a Linux kernel "
+"module for the appropriate RAID level to be loaded, such as @code{raid456} "
+"for RAID-4, RAID-5 or RAID-6, or @code{raid10} for RAID-10."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:9309
+#: doc/guix.texi:9313
 #, no-wrap
 msgid "disk encryption"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:9310
+#: doc/guix.texi:9314
 #, no-wrap
 msgid "LUKS"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9318
+#: doc/guix.texi:9322
 msgid ""
-"The following example specifies a mapping from @file{/dev/sda3} to @file{/dev/mapper/home} using LUKS---the @url{https://gitlab.com/"
-"cryptsetup/cryptsetup,Linux Unified Key Setup}, a standard mechanism for disk encryption.  The @file{/dev/mapper/home} device can "
-"then be used as the @code{device} of a @code{file-system} declaration (@pxref{File Systems})."
+"The following example specifies a mapping from @file{/dev/sda3} to @file{/"
+"dev/mapper/home} using LUKS---the @url{https://gitlab.com/cryptsetup/"
+"cryptsetup,Linux Unified Key Setup}, a standard mechanism for disk "
+"encryption.  The @file{/dev/mapper/home} device can then be used as the "
+"@code{device} of a @code{file-system} declaration (@pxref{File Systems})."
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:9324
+#: doc/guix.texi:9328
 #, no-wrap
 msgid ""
 "(mapped-device\n"
@@ -17473,25 +20670,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9329
+#: doc/guix.texi:9333
 msgid ""
-"Alternatively, to become independent of device numbering, one may obtain the LUKS UUID (@dfn{unique identifier}) of the source "
-"device by a command like:"
+"Alternatively, to become independent of device numbering, one may obtain the "
+"LUKS UUID (@dfn{unique identifier}) of the source device by a command like:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:9332
+#: doc/guix.texi:9336
 #, no-wrap
 msgid "cryptsetup luksUUID /dev/sda3\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9335
+#: doc/guix.texi:9339
 msgid "and use it as follows:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:9341
+#: doc/guix.texi:9345
 #, no-wrap
 msgid ""
 "(mapped-device\n"
@@ -17501,26 +20698,30 @@ msgid ""
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:9343
+#: doc/guix.texi:9347
 #, no-wrap
 msgid "swap encryption"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9349
+#: doc/guix.texi:9353
 msgid ""
-"It is also desirable to encrypt swap space, since swap space may contain sensitive data.  One way to accomplish that is to use a "
-"swap file in a file system on a device mapped via LUKS encryption.  In this way, the swap file is encrypted because the entire "
-"device is encrypted.  @xref{Preparing for Installation,,Disk Partitioning}, for an example."
+"It is also desirable to encrypt swap space, since swap space may contain "
+"sensitive data.  One way to accomplish that is to use a swap file in a file "
+"system on a device mapped via LUKS encryption.  In this way, the swap file "
+"is encrypted because the entire device is encrypted.  @xref{Preparing for "
+"Installation,,Disk Partitioning}, for an example."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9352
-msgid "A RAID device formed of the partitions @file{/dev/sda1} and @file{/dev/sdb1} may be declared as follows:"
+#: doc/guix.texi:9356
+msgid ""
+"A RAID device formed of the partitions @file{/dev/sda1} and @file{/dev/sdb1} "
+"may be declared as follows:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:9358
+#: doc/guix.texi:9362
 #, no-wrap
 msgid ""
 "(mapped-device\n"
@@ -17530,40 +20731,42 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9365
+#: doc/guix.texi:9369
 msgid ""
-"The @file{/dev/md0} device can then be used as the @code{device} of a @code{file-system} declaration (@pxref{File Systems}).  Note "
-"that the RAID level need not be given; it is chosen during the initial creation and formatting of the RAID device and is determined "
-"automatically later."
+"The @file{/dev/md0} device can then be used as the @code{device} of a "
+"@code{file-system} declaration (@pxref{File Systems}).  Note that the RAID "
+"level need not be given; it is chosen during the initial creation and "
+"formatting of the RAID device and is determined automatically later."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:9370
+#: doc/guix.texi:9374
 #, no-wrap
 msgid "users"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:9371
+#: doc/guix.texi:9375
 #, no-wrap
 msgid "accounts"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:9372
+#: doc/guix.texi:9376
 #, no-wrap
 msgid "user accounts"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9376
+#: doc/guix.texi:9380
 msgid ""
-"User accounts and groups are entirely managed through the @code{operating-system} declaration.  They are specified with the "
-"@code{user-account} and @code{user-group} forms:"
+"User accounts and groups are entirely managed through the @code{operating-"
+"system} declaration.  They are specified with the @code{user-account} and "
+"@code{user-group} forms:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:9387
+#: doc/guix.texi:9391
 #, no-wrap
 msgid ""
 "(user-account\n"
@@ -17578,285 +20781,321 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9396
+#: doc/guix.texi:9400
 msgid ""
-"When booting or upon completion of @command{guix system reconfigure}, the system ensures that only the user accounts and groups "
-"specified in the @code{operating-system} declaration exist, and with the specified properties.  Thus, account or group creations or "
-"modifications made by directly invoking commands such as @command{useradd} are lost upon reconfiguration or reboot.  This ensures "
-"that the system remains exactly as declared."
+"When booting or upon completion of @command{guix system reconfigure}, the "
+"system ensures that only the user accounts and groups specified in the "
+"@code{operating-system} declaration exist, and with the specified "
+"properties.  Thus, account or group creations or modifications made by "
+"directly invoking commands such as @command{useradd} are lost upon "
+"reconfiguration or reboot.  This ensures that the system remains exactly as "
+"declared."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:9397
+#: doc/guix.texi:9401
 #, no-wrap
 msgid "{Data Type} user-account"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:9400
-msgid "Objects of this type represent user accounts.  The following members may be specified:"
+#: doc/guix.texi:9404
+msgid ""
+"Objects of this type represent user accounts.  The following members may be "
+"specified:"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9404
+#: doc/guix.texi:9408
 msgid "The name of the user account."
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:9405 doc/guix.texi:19862
+#: doc/guix.texi:9409 doc/guix.texi:19924
 #, no-wrap
 msgid "group"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:9406 doc/guix.texi:9455
+#: doc/guix.texi:9410 doc/guix.texi:9459
 #, no-wrap
 msgid "groups"
 msgstr ""
 
-#. type: table
-#: doc/guix.texi:9409
-msgid "This is the name (a string) or identifier (a number) of the user group this account belongs to."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:9410
-#, no-wrap
-msgid "@code{supplementary-groups} (default: @code{'()})"
-msgstr ""
-
 #. type: table
 #: doc/guix.texi:9413
-msgid "Optionally, this can be defined as a list of group names that this account belongs to."
+msgid ""
+"This is the name (a string) or identifier (a number) of the user group this "
+"account belongs to."
 msgstr ""
 
 #. type: item
 #: doc/guix.texi:9414
 #, no-wrap
+msgid "@code{supplementary-groups} (default: @code{'()})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:9417
+msgid ""
+"Optionally, this can be defined as a list of group names that this account "
+"belongs to."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:9418
+#, no-wrap
 msgid "@code{uid} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9418
+#: doc/guix.texi:9422
 msgid ""
-"This is the user ID for this account (a number), or @code{#f}.  In the latter case, a number is automatically chosen by the system "
-"when the account is created."
+"This is the user ID for this account (a number), or @code{#f}.  In the "
+"latter case, a number is automatically chosen by the system when the account "
+"is created."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9419
+#: doc/guix.texi:9423
 #, no-wrap
 msgid "@code{comment} (default: @code{\"\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9421
+#: doc/guix.texi:9425
 msgid "A comment about the account, such as the account owner's full name."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:9422
+#: doc/guix.texi:9426
 #, no-wrap
 msgid "home-directory"
 msgstr ""
 
-#. type: table
-#: doc/guix.texi:9424
-msgid "This is the name of the home directory for the account."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:9425
-#, no-wrap
-msgid "@code{create-home-directory?} (default: @code{#t})"
-msgstr ""
-
 #. type: table
 #: doc/guix.texi:9428
-msgid "Indicates whether the home directory of this account should be created if it does not exist yet."
+msgid "This is the name of the home directory for the account."
 msgstr ""
 
 #. type: item
 #: doc/guix.texi:9429
 #, no-wrap
-msgid "@code{shell} (default: Bash)"
+msgid "@code{create-home-directory?} (default: @code{#t})"
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:9432
-msgid "This is a G-expression denoting the file name of a program to be used as the shell (@pxref{G-Expressions})."
+msgid ""
+"Indicates whether the home directory of this account should be created if it "
+"does not exist yet."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9433 doc/guix.texi:9473
+#: doc/guix.texi:9433
+#, no-wrap
+msgid "@code{shell} (default: Bash)"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:9436
+msgid ""
+"This is a G-expression denoting the file name of a program to be used as the "
+"shell (@pxref{G-Expressions})."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:9437 doc/guix.texi:9477
 #, no-wrap
 msgid "@code{system?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9437
+#: doc/guix.texi:9441
 msgid ""
-"This Boolean value indicates whether the account is a ``system'' account.  System accounts are sometimes treated specially; for "
-"instance, graphical login managers do not list them."
+"This Boolean value indicates whether the account is a ``system'' account.  "
+"System accounts are sometimes treated specially; for instance, graphical "
+"login managers do not list them."
 msgstr ""
 
 #. type: anchor{#1}
-#: doc/guix.texi:9439
+#: doc/guix.texi:9443
 msgid "user-account-password"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9439 doc/guix.texi:9477
+#: doc/guix.texi:9443 doc/guix.texi:9481
 #, no-wrap
 msgid "@code{password} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9445
+#: doc/guix.texi:9449
 msgid ""
-"You would normally leave this field to @code{#f}, initialize user passwords as @code{root} with the @command{passwd} command, and "
-"then let users change it with @command{passwd}.  Passwords set with @command{passwd} are of course preserved across reboot and "
-"reconfiguration."
+"You would normally leave this field to @code{#f}, initialize user passwords "
+"as @code{root} with the @command{passwd} command, and then let users change "
+"it with @command{passwd}.  Passwords set with @command{passwd} are of course "
+"preserved across reboot and reconfiguration."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9451
+#: doc/guix.texi:9455
 msgid ""
-"If you @emph{do} want to have a preset password for an account, then this field must contain the encrypted password, as a string.  "
-"@xref{crypt,,, libc, The GNU C Library Reference Manual}, for more information on password encryption, and @ref{Encryption,,, guile, "
-"GNU Guile Reference Manual}, for information on Guile's @code{crypt} procedure."
+"If you @emph{do} want to have a preset password for an account, then this "
+"field must contain the encrypted password, as a string.  @xref{crypt,,, "
+"libc, The GNU C Library Reference Manual}, for more information on password "
+"encryption, and @ref{Encryption,,, guile, GNU Guile Reference Manual}, for "
+"information on Guile's @code{crypt} procedure."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9457
+#: doc/guix.texi:9461
 msgid "User group declarations are even simpler:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:9460
+#: doc/guix.texi:9464
 #, no-wrap
 msgid "(user-group (name \"students\"))\n"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:9462
+#: doc/guix.texi:9466
 #, no-wrap
 msgid "{Data Type} user-group"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:9464
+#: doc/guix.texi:9468
 msgid "This type is for, well, user groups.  There are just a few fields:"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9468
+#: doc/guix.texi:9472
 msgid "The name of the group."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9469
+#: doc/guix.texi:9473
 #, no-wrap
 msgid "@code{id} (default: @code{#f})"
 msgstr ""
 
-#. type: table
-#: doc/guix.texi:9472
-msgid "The group identifier (a number).  If @code{#f}, a new number is automatically allocated when the group is created."
-msgstr ""
-
 #. type: table
 #: doc/guix.texi:9476
-msgid "This Boolean value indicates whether the group is a ``system'' group.  System groups have low numerical IDs."
+msgid ""
+"The group identifier (a number).  If @code{#f}, a new number is "
+"automatically allocated when the group is created."
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:9480
-msgid "What, user groups can have a password? Well, apparently yes.  Unless @code{#f}, this field specifies the password of the group."
+msgid ""
+"This Boolean value indicates whether the group is a ``system'' group.  "
+"System groups have low numerical IDs."
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:9484
+msgid ""
+"What, user groups can have a password? Well, apparently yes.  Unless "
+"@code{#f}, this field specifies the password of the group."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9486
-msgid "For convenience, a variable lists all the basic user groups one may expect:"
+#: doc/guix.texi:9490
+msgid ""
+"For convenience, a variable lists all the basic user groups one may expect:"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:9487
+#: doc/guix.texi:9491
 #, no-wrap
 msgid "{Scheme Variable} %base-groups"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:9492
+#: doc/guix.texi:9496
 msgid ""
-"This is the list of basic user groups that users and/or packages expect to be present on the system.  This includes groups such as "
-"``root'', ``wheel'', and ``users'', as well as groups used to control access to specific devices such as ``audio'', ``disk'', and "
-"``cdrom''."
+"This is the list of basic user groups that users and/or packages expect to "
+"be present on the system.  This includes groups such as ``root'', ``wheel'', "
+"and ``users'', as well as groups used to control access to specific devices "
+"such as ``audio'', ``disk'', and ``cdrom''."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:9494
+#: doc/guix.texi:9498
 #, no-wrap
 msgid "{Scheme Variable} %base-user-accounts"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:9497
+#: doc/guix.texi:9501
 msgid ""
-"This is the list of basic system accounts that programs may expect to find on a GNU/Linux system, such as the ``nobody'' account."
+"This is the list of basic system accounts that programs may expect to find "
+"on a GNU/Linux system, such as the ``nobody'' account."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:9500
+#: doc/guix.texi:9504
 msgid ""
-"Note that the ``root'' account is not included here.  It is a special-case and is automatically added whether or not it is specified."
+"Note that the ``root'' account is not included here.  It is a special-case "
+"and is automatically added whether or not it is specified."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:9505
+#: doc/guix.texi:9509
 #, no-wrap
 msgid "locale"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9512
+#: doc/guix.texi:9516
 msgid ""
-"A @dfn{locale} defines cultural conventions for a particular language and region of the world (@pxref{Locales,,, libc, The GNU C "
-"Library Reference Manual}).  Each locale has a name that typically has the form @code{@var{language}_@var{territory}."
-"@var{codeset}}---e.g., @code{fr_LU.utf8} designates the locale for the French language, with cultural conventions from Luxembourg, "
-"and using the UTF-8 encoding."
+"A @dfn{locale} defines cultural conventions for a particular language and "
+"region of the world (@pxref{Locales,,, libc, The GNU C Library Reference "
+"Manual}).  Each locale has a name that typically has the form "
+"@code{@var{language}_@var{territory}.@var{codeset}}---e.g., @code{fr_LU."
+"utf8} designates the locale for the French language, with cultural "
+"conventions from Luxembourg, and using the UTF-8 encoding."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:9513
+#: doc/guix.texi:9517
 #, no-wrap
 msgid "locale definition"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9517
+#: doc/guix.texi:9521
 msgid ""
-"Usually, you will want to specify the default locale for the machine using the @code{locale} field of the @code{operating-system} "
-"declaration (@pxref{operating-system Reference, @code{locale}})."
+"Usually, you will want to specify the default locale for the machine using "
+"the @code{locale} field of the @code{operating-system} declaration "
+"(@pxref{operating-system Reference, @code{locale}})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9526
+#: doc/guix.texi:9530
 msgid ""
-"The selected locale is automatically added to the @dfn{locale definitions} known to the system if needed, with its codeset inferred "
-"from its name---e.g., @code{bo_CN.utf8} will be assumed to use the @code{UTF-8} codeset.  Additional locale definitions can be "
-"specified in the @code{locale-definitions} slot of @code{operating-system}---this is useful, for instance, if the codeset could not "
-"be inferred from the locale name.  The default set of locale definitions includes some widely used locales, but not all the "
+"The selected locale is automatically added to the @dfn{locale definitions} "
+"known to the system if needed, with its codeset inferred from its name---e."
+"g., @code{bo_CN.utf8} will be assumed to use the @code{UTF-8} codeset.  "
+"Additional locale definitions can be specified in the @code{locale-"
+"definitions} slot of @code{operating-system}---this is useful, for instance, "
+"if the codeset could not be inferred from the locale name.  The default set "
+"of locale definitions includes some widely used locales, but not all the "
 "available locales, in order to save space."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9529
-msgid "For instance, to add the North Frisian locale for Germany, the value of that field may be:"
+#: doc/guix.texi:9533
+msgid ""
+"For instance, to add the North Frisian locale for Germany, the value of that "
+"field may be:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:9534
+#: doc/guix.texi:9538
 #, no-wrap
 msgid ""
 "(cons (locale-definition\n"
@@ -17865,12 +21104,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9538
-msgid "Likewise, to save space, one might want @code{locale-definitions} to list only the locales that are actually used, as in:"
+#: doc/guix.texi:9542
+msgid ""
+"Likewise, to save space, one might want @code{locale-definitions} to list "
+"only the locales that are actually used, as in:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:9543
+#: doc/guix.texi:9547
 #, no-wrap
 msgid ""
 "(list (locale-definition\n"
@@ -17879,139 +21120,158 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9552
+#: doc/guix.texi:9556
 msgid ""
-"The compiled locale definitions are available at @file{/run/current-system/locale/X.Y}, where @code{X.Y} is the libc version, which "
-"is the default location where the GNU@tie{}libc provided by Guix looks for locale data.  This can be overridden using the "
-"@code{LOCPATH} environment variable (@pxref{locales-and-locpath, @code{LOCPATH} and locale packages})."
+"The compiled locale definitions are available at @file{/run/current-system/"
+"locale/X.Y}, where @code{X.Y} is the libc version, which is the default "
+"location where the GNU@tie{}libc provided by Guix looks for locale data.  "
+"This can be overridden using the @code{LOCPATH} environment variable "
+"(@pxref{locales-and-locpath, @code{LOCPATH} and locale packages})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9555
-msgid "The @code{locale-definition} form is provided by the @code{(gnu system locale)} module.  Details are given below."
+#: doc/guix.texi:9559
+msgid ""
+"The @code{locale-definition} form is provided by the @code{(gnu system "
+"locale)} module.  Details are given below."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:9556
+#: doc/guix.texi:9560
 #, no-wrap
 msgid "{Data Type} locale-definition"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:9558
+#: doc/guix.texi:9562
 msgid "This is the data type of a locale definition."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9564
-msgid "The name of the locale.  @xref{Locale Names,,, libc, The GNU C Library Reference Manual}, for more information on locale names."
+#: doc/guix.texi:9568
+msgid ""
+"The name of the locale.  @xref{Locale Names,,, libc, The GNU C Library "
+"Reference Manual}, for more information on locale names."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9568
-msgid "The name of the source for that locale.  This is typically the @code{@var{language}_@var{territory}} part of the locale name."
+#: doc/guix.texi:9572
+msgid ""
+"The name of the source for that locale.  This is typically the "
+"@code{@var{language}_@var{territory}} part of the locale name."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9569
+#: doc/guix.texi:9573
 #, no-wrap
 msgid "@code{charset} (default: @code{\"UTF-8\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9573
+#: doc/guix.texi:9577
 msgid ""
-"The ``character set'' or ``code set'' for that locale, @uref{http://www.iana.org/assignments/character-sets, as defined by IANA}."
+"The ``character set'' or ``code set'' for that locale, @uref{http://www.iana."
+"org/assignments/character-sets, as defined by IANA}."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:9577
+#: doc/guix.texi:9581
 #, no-wrap
 msgid "{Scheme Variable} %default-locale-definitions"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:9581
+#: doc/guix.texi:9585
 msgid ""
-"A list of commonly used UTF-8 locales, used as the default value of the @code{locale-definitions} field of @code{operating-system} "
-"declarations."
+"A list of commonly used UTF-8 locales, used as the default value of the "
+"@code{locale-definitions} field of @code{operating-system} declarations."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:9582
+#: doc/guix.texi:9586
 #, no-wrap
 msgid "locale name"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:9583
+#: doc/guix.texi:9587
 #, no-wrap
 msgid "normalized codeset in locale names"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:9589
+#: doc/guix.texi:9593
 msgid ""
-"These locale definitions use the @dfn{normalized codeset} for the part that follows the dot in the name (@pxref{Using gettextized "
-"software, normalized codeset,, libc, The GNU C Library Reference Manual}).  So for instance it has @code{uk_UA.utf8} but @emph{not}, "
-"say, @code{uk_UA.UTF-8}."
+"These locale definitions use the @dfn{normalized codeset} for the part that "
+"follows the dot in the name (@pxref{Using gettextized software, normalized "
+"codeset,, libc, The GNU C Library Reference Manual}).  So for instance it "
+"has @code{uk_UA.utf8} but @emph{not}, say, @code{uk_UA.UTF-8}."
 msgstr ""
 
 #. type: subsubsection
-#: doc/guix.texi:9591
+#: doc/guix.texi:9595
 #, no-wrap
 msgid "Locale Data Compatibility Considerations"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:9593
+#: doc/guix.texi:9597
 #, no-wrap
 msgid "incompatibility, of locale data"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9600
+#: doc/guix.texi:9604
 msgid ""
-"@code{operating-system} declarations provide a @code{locale-libcs} field to specify the GNU@tie{}libc packages that are used to "
-"compile locale declarations (@pxref{operating-system Reference}).  ``Why would I care?'', you may ask.  Well, it turns out that the "
-"binary format of locale data is occasionally incompatible from one libc version to another."
+"@code{operating-system} declarations provide a @code{locale-libcs} field to "
+"specify the GNU@tie{}libc packages that are used to compile locale "
+"declarations (@pxref{operating-system Reference}).  ``Why would I care?'', "
+"you may ask.  Well, it turns out that the binary format of locale data is "
+"occasionally incompatible from one libc version to another."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9612
+#: doc/guix.texi:9616
 msgid ""
-"For instance, a program linked against libc version 2.21 is unable to read locale data produced with libc 2.22; worse, that program "
-"@emph{aborts} instead of simply ignoring the incompatible locale data@footnote{Versions 2.23 and later of GNU@tie{}libc will simply "
-"skip the incompatible locale data, which is already an improvement.}.  Similarly, a program linked against libc 2.22 can read most, "
-"but not all, of the locale data from libc 2.21 (specifically, @code{LC_COLLATE} data is incompatible); thus calls to "
+"For instance, a program linked against libc version 2.21 is unable to read "
+"locale data produced with libc 2.22; worse, that program @emph{aborts} "
+"instead of simply ignoring the incompatible locale data@footnote{Versions "
+"2.23 and later of GNU@tie{}libc will simply skip the incompatible locale "
+"data, which is already an improvement.}.  Similarly, a program linked "
+"against libc 2.22 can read most, but not all, of the locale data from libc "
+"2.21 (specifically, @code{LC_COLLATE} data is incompatible); thus calls to "
 "@code{setlocale} may fail, but programs will not abort."
 msgstr ""
 
-#. type: Plain text
-#: doc/guix.texi:9617
-msgid ""
-"The ``problem'' in GuixSD is that users have a lot of freedom: They can choose whether and when to upgrade software in their "
-"profiles, and might be using a libc version different from the one the system administrator used to build the system-wide locale "
-"data."
-msgstr ""
-
 #. type: Plain text
 #: doc/guix.texi:9621
 msgid ""
-"Fortunately, unprivileged users can also install their own locale data and define @var{GUIX_LOCPATH} accordingly (@pxref{locales-and-"
-"locpath, @code{GUIX_LOCPATH} and locale packages})."
+"The ``problem'' in GuixSD is that users have a lot of freedom: They can "
+"choose whether and when to upgrade software in their profiles, and might be "
+"using a libc version different from the one the system administrator used to "
+"build the system-wide locale data."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9628
+#: doc/guix.texi:9625
 msgid ""
-"Still, it is best if the system-wide locale data at @file{/run/current-system/locale} is built for all the libc versions actually in "
-"use on the system, so that all the programs can access it---this is especially crucial on a multi-user system.  To do that, the "
-"administrator can specify several libc packages in the @code{locale-libcs} field of @code{operating-system}:"
+"Fortunately, unprivileged users can also install their own locale data and "
+"define @var{GUIX_LOCPATH} accordingly (@pxref{locales-and-locpath, "
+"@code{GUIX_LOCPATH} and locale packages})."
+msgstr ""
+
+#. type: Plain text
+#: doc/guix.texi:9632
+msgid ""
+"Still, it is best if the system-wide locale data at @file{/run/current-"
+"system/locale} is built for all the libc versions actually in use on the "
+"system, so that all the programs can access it---this is especially crucial "
+"on a multi-user system.  To do that, the administrator can specify several "
+"libc packages in the @code{locale-libcs} field of @code{operating-system}:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:9631
+#: doc/guix.texi:9635
 #, no-wrap
 msgid ""
 "(use-package-modules base)\n"
@@ -18019,7 +21279,7 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:9635
+#: doc/guix.texi:9639
 #, no-wrap
 msgid ""
 "(operating-system\n"
@@ -18028,49 +21288,56 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9640
+#: doc/guix.texi:9644
 msgid ""
-"This example would lead to a system containing locale definitions for both libc 2.21 and the current version of libc in @file{/run/"
-"current-system/locale}."
+"This example would lead to a system containing locale definitions for both "
+"libc 2.21 and the current version of libc in @file{/run/current-system/"
+"locale}."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:9645
+#: doc/guix.texi:9649
 #, no-wrap
 msgid "system services"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9651
+#: doc/guix.texi:9655
 msgid ""
-"An important part of preparing an @code{operating-system} declaration is listing @dfn{system services} and their configuration "
-"(@pxref{Using the Configuration System}).  System services are typically daemons launched when the system boots, or other actions "
-"needed at that time---e.g., configuring network access."
+"An important part of preparing an @code{operating-system} declaration is "
+"listing @dfn{system services} and their configuration (@pxref{Using the "
+"Configuration System}).  System services are typically daemons launched when "
+"the system boots, or other actions needed at that time---e.g., configuring "
+"network access."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9658
+#: doc/guix.texi:9662
 msgid ""
-"GuixSD has a broad definition of ``service'' (@pxref{Service Composition}), but many services are managed by the GNU@tie{}Shepherd "
-"(@pxref{Shepherd Services}).  On a running system, the @command{herd} command allows you to list the available services, show their "
-"status, start and stop them, or do other specific operations (@pxref{Jump Start,,, shepherd, The GNU Shepherd Manual}).  For example:"
+"GuixSD has a broad definition of ``service'' (@pxref{Service Composition}), "
+"but many services are managed by the GNU@tie{}Shepherd (@pxref{Shepherd "
+"Services}).  On a running system, the @command{herd} command allows you to "
+"list the available services, show their status, start and stop them, or do "
+"other specific operations (@pxref{Jump Start,,, shepherd, The GNU Shepherd "
+"Manual}).  For example:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:9661
+#: doc/guix.texi:9665
 #, no-wrap
 msgid "# herd status\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9666
+#: doc/guix.texi:9670
 msgid ""
-"The above command, run as @code{root}, lists the currently defined services.  The @command{herd doc} command shows a synopsis of the "
-"given service:"
+"The above command, run as @code{root}, lists the currently defined "
+"services.  The @command{herd doc} command shows a synopsis of the given "
+"service:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:9670
+#: doc/guix.texi:9674
 #, no-wrap
 msgid ""
 "# herd doc nscd\n"
@@ -18078,14 +21345,15 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9675
+#: doc/guix.texi:9679
 msgid ""
-"The @command{start}, @command{stop}, and @command{restart} sub-commands have the effect you would expect.  For instance, the "
-"commands below stop the nscd service and restart the Xorg display server:"
+"The @command{start}, @command{stop}, and @command{restart} sub-commands have "
+"the effect you would expect.  For instance, the commands below stop the nscd "
+"service and restart the Xorg display server:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:9682
+#: doc/guix.texi:9686
 #, no-wrap
 msgid ""
 "# herd stop nscd\n"
@@ -18096,101 +21364,109 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9687
+#: doc/guix.texi:9691
 msgid ""
-"The following sections document the available services, starting with the core services, that may be used in an @code{operating-"
-"system} declaration."
+"The following sections document the available services, starting with the "
+"core services, that may be used in an @code{operating-system} declaration."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9722
+#: doc/guix.texi:9726
 msgid ""
-"The @code{(gnu services base)} module provides definitions for the basic services that one expects from the system.  The services "
-"exported by this module are listed below."
+"The @code{(gnu services base)} module provides definitions for the basic "
+"services that one expects from the system.  The services exported by this "
+"module are listed below."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:9723
+#: doc/guix.texi:9727
 #, no-wrap
 msgid "{Scheme Variable} %base-services"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:9729
+#: doc/guix.texi:9733
 msgid ""
-"This variable contains a list of basic services (@pxref{Service Types and Services}, for more information on service objects) one "
-"would expect from the system: a login service (mingetty) on each tty, syslogd, the libc name service cache daemon (nscd), the udev "
-"device manager, and more."
+"This variable contains a list of basic services (@pxref{Service Types and "
+"Services}, for more information on service objects) one would expect from "
+"the system: a login service (mingetty) on each tty, syslogd, the libc name "
+"service cache daemon (nscd), the udev device manager, and more."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:9734
+#: doc/guix.texi:9738
 msgid ""
-"This is the default value of the @code{services} field of @code{operating-system} declarations.  Usually, when customizing a system, "
-"you will want to append services to @var{%base-services}, like this:"
+"This is the default value of the @code{services} field of @code{operating-"
+"system} declarations.  Usually, when customizing a system, you will want to "
+"append services to @var{%base-services}, like this:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:9737
+#: doc/guix.texi:9741
 #, no-wrap
 msgid "(cons* (avahi-service) (lsh-service) %base-services)\n"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:9740
+#: doc/guix.texi:9744
 #, no-wrap
 msgid "{Scheme Variable} special-files-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:9743
-msgid "This is the service that sets up ``special files'' such as @file{/bin/sh}; an instance of it is part of @code{%base-services}."
+#: doc/guix.texi:9747
+msgid ""
+"This is the service that sets up ``special files'' such as @file{/bin/sh}; "
+"an instance of it is part of @code{%base-services}."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:9747
+#: doc/guix.texi:9751
 msgid ""
-"The value associated with @code{special-files-service-type} services must be a list of tuples where the first element is the "
-"``special file'' and the second element is its target.  By default it is:"
+"The value associated with @code{special-files-service-type} services must be "
+"a list of tuples where the first element is the ``special file'' and the "
+"second element is its target.  By default it is:"
 msgstr ""
 
 #. type: file{#1}
-#: doc/guix.texi:9748
+#: doc/guix.texi:9752
 #, no-wrap
 msgid "/bin/sh"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:9749
+#: doc/guix.texi:9753
 #, no-wrap
 msgid "@file{sh}, in @file{/bin}"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:9752
+#: doc/guix.texi:9756
 #, no-wrap
 msgid "`((\"/bin/sh\" ,(file-append @var{bash} \"/bin/sh\")))\n"
 msgstr ""
 
 #. type: file{#1}
-#: doc/guix.texi:9754
+#: doc/guix.texi:9758
 #, no-wrap
 msgid "/usr/bin/env"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:9755
+#: doc/guix.texi:9759
 #, no-wrap
 msgid "@file{env}, in @file{/usr/bin}"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:9758
-msgid "If you want to add, say, @code{/usr/bin/env} to your system, you can change it to:"
+#: doc/guix.texi:9762
+msgid ""
+"If you want to add, say, @code{/usr/bin/env} to your system, you can change "
+"it to:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:9762
+#: doc/guix.texi:9766
 #, no-wrap
 msgid ""
 "`((\"/bin/sh\" ,(file-append @var{bash} \"/bin/sh\"))\n"
@@ -18198,33 +21474,34 @@ msgid ""
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:9769
+#: doc/guix.texi:9773
 msgid ""
-"Since this is part of @code{%base-services}, you can use @code{modify-services} to customize the set of special files "
-"(@pxref{Service Reference, @code{modify-services}}).  But the simple way to add a special file is @i{via} the @code{extra-special-"
-"file} procedure (see below.)"
+"Since this is part of @code{%base-services}, you can use @code{modify-"
+"services} to customize the set of special files (@pxref{Service Reference, "
+"@code{modify-services}}).  But the simple way to add a special file is "
+"@i{via} the @code{extra-special-file} procedure (see below.)"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:9771
+#: doc/guix.texi:9775
 #, no-wrap
 msgid "{Scheme Procedure} extra-special-file @var{file} @var{target}"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:9773
+#: doc/guix.texi:9777
 msgid "Use @var{target} as the ``special file'' @var{file}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:9777
+#: doc/guix.texi:9781
 msgid ""
-"For example, adding the following lines to the @code{services} field of your operating system declaration leads to a @file{/usr/bin/"
-"env} symlink:"
+"For example, adding the following lines to the @code{services} field of your "
+"operating system declaration leads to a @file{/usr/bin/env} symlink:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:9781
+#: doc/guix.texi:9785
 #, no-wrap
 msgid ""
 "(extra-special-file \"/usr/bin/env\"\n"
@@ -18232,1180 +21509,1278 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:9784
+#: doc/guix.texi:9788
 #, no-wrap
 msgid "{Scheme Procedure} host-name-service @var{name}"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:9786
+#: doc/guix.texi:9790
 msgid "Return a service that sets the host name to @var{name}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:9788
+#: doc/guix.texi:9792
 #, no-wrap
 msgid "{Scheme Procedure} login-service @var{config}"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:9792
+#: doc/guix.texi:9796
 msgid ""
-"Return a service to run login according to @var{config}, a @code{<login-configuration>} object, which specifies the message of the "
-"day, among other things."
+"Return a service to run login according to @var{config}, a @code{<login-"
+"configuration>} object, which specifies the message of the day, among other "
+"things."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:9794
+#: doc/guix.texi:9798
 #, no-wrap
 msgid "{Data Type} login-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:9796
+#: doc/guix.texi:9800
 msgid "This is the data type representing the configuration of login."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:9799
+#: doc/guix.texi:9803
 #, no-wrap
 msgid "motd"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:9800
+#: doc/guix.texi:9804
 #, no-wrap
 msgid "message of the day"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9802
+#: doc/guix.texi:9806
 msgid "A file-like object containing the ``message of the day''."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9803 doc/guix.texi:11420
+#: doc/guix.texi:9807 doc/guix.texi:11469
 #, no-wrap
 msgid "@code{allow-empty-passwords?} (default: @code{#t})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9806
-msgid "Allow empty passwords by default so that first-time users can log in when the 'root' account has just been created."
+#: doc/guix.texi:9810
+msgid ""
+"Allow empty passwords by default so that first-time users can log in when "
+"the 'root' account has just been created."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:9810
+#: doc/guix.texi:9814
 #, no-wrap
 msgid "{Scheme Procedure} mingetty-service @var{config}"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:9814
+#: doc/guix.texi:9818
 msgid ""
-"Return a service to run mingetty according to @var{config}, a @code{<mingetty-configuration>} object, which specifies the tty to "
-"run, among other things."
+"Return a service to run mingetty according to @var{config}, a "
+"@code{<mingetty-configuration>} object, which specifies the tty to run, "
+"among other things."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:9816
+#: doc/guix.texi:9820
 #, no-wrap
 msgid "{Data Type} mingetty-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:9819
+#: doc/guix.texi:9823
 msgid ""
-"This is the data type representing the configuration of Mingetty, which provides the default implementation of virtual console log-"
-"in."
+"This is the data type representing the configuration of Mingetty, which "
+"provides the default implementation of virtual console log-in."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:9822 doc/guix.texi:9858
+#: doc/guix.texi:9826 doc/guix.texi:9862
 #, no-wrap
 msgid "tty"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9824
+#: doc/guix.texi:9828
 msgid "The name of the console this Mingetty runs on---e.g., @code{\"tty1\"}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9825 doc/guix.texi:9887
+#: doc/guix.texi:9829 doc/guix.texi:9891
 #, no-wrap
 msgid "@code{auto-login} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9829
+#: doc/guix.texi:9833
 msgid ""
-"When true, this field must be a string denoting the user name under which the system automatically logs in.  When it is @code{#f}, a "
-"user name and password must be entered to log in."
+"When true, this field must be a string denoting the user name under which "
+"the system automatically logs in.  When it is @code{#f}, a user name and "
+"password must be entered to log in."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9830
+#: doc/guix.texi:9834
 #, no-wrap
 msgid "@code{login-program} (default: @code{#f})"
 msgstr ""
 
-#. type: table
-#: doc/guix.texi:9834
-msgid ""
-"This must be either @code{#f}, in which case the default log-in program is used (@command{login} from the Shadow tool suite), or a "
-"gexp denoting the name of the log-in program."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:9835
-#, no-wrap
-msgid "@code{login-pause?} (default: @code{#f})"
-msgstr ""
-
 #. type: table
 #: doc/guix.texi:9838
 msgid ""
-"When set to @code{#t} in conjunction with @var{auto-login}, the user will have to press a key before the log-in shell is launched."
+"This must be either @code{#f}, in which case the default log-in program is "
+"used (@command{login} from the Shadow tool suite), or a gexp denoting the "
+"name of the log-in program."
 msgstr ""
 
 #. type: item
 #: doc/guix.texi:9839
 #, no-wrap
+msgid "@code{login-pause?} (default: @code{#f})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:9842
+msgid ""
+"When set to @code{#t} in conjunction with @var{auto-login}, the user will "
+"have to press a key before the log-in shell is launched."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:9843
+#, no-wrap
 msgid "@code{mingetty} (default: @var{mingetty})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9841
+#: doc/guix.texi:9845
 msgid "The Mingetty package to use."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:9845
+#: doc/guix.texi:9849
 #, no-wrap
 msgid "{Scheme Procedure} agetty-service @var{config}"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:9849
+#: doc/guix.texi:9853
 msgid ""
-"Return a service to run agetty according to @var{config}, an @code{<agetty-configuration>} object, which specifies the tty to run, "
-"among other things."
+"Return a service to run agetty according to @var{config}, an @code{<agetty-"
+"configuration>} object, which specifies the tty to run, among other things."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:9851
+#: doc/guix.texi:9855
 #, no-wrap
 msgid "{Data Type} agetty-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:9855
+#: doc/guix.texi:9859
 msgid ""
-"This is the data type representing the configuration of agetty, which implements virtual and serial console log-in.  See the "
-"@code{agetty(8)} man page for more information."
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:9862
-msgid ""
-"The name of the console this agetty runs on, as a string---e.g., @code{\"ttyS0\"}. This argument is optional, it will default to a "
-"reasonable default serial port used by the kernel Linux."
+"This is the data type representing the configuration of agetty, which "
+"implements virtual and serial console log-in.  See the @code{agetty(8)} man "
+"page for more information."
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:9866
 msgid ""
-"For this, if there is a value for an option @code{agetty.tty} in the kernel command line, agetty will extract the device name of the "
-"serial port from it and use that."
+"The name of the console this agetty runs on, as a string---e.g., "
+"@code{\"ttyS0\"}. This argument is optional, it will default to a reasonable "
+"default serial port used by the kernel Linux."
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:9870
 msgid ""
-"If not and if there is a value for an option @code{console} with a tty in the Linux command line, agetty will extract the device "
-"name of the serial port from it and use that."
+"For this, if there is a value for an option @code{agetty.tty} in the kernel "
+"command line, agetty will extract the device name of the serial port from it "
+"and use that."
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:9874
 msgid ""
-"In both cases, agetty will leave the other serial device settings (baud rate etc.) alone---in the hope that Linux pinned them to the "
-"correct values."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:9875
-#, no-wrap
-msgid "@code{baud-rate} (default: @code{#f})"
+"If not and if there is a value for an option @code{console} with a tty in "
+"the Linux command line, agetty will extract the device name of the serial "
+"port from it and use that."
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:9878
-msgid "A string containing a comma-separated list of one or more baud rates, in descending order."
+msgid ""
+"In both cases, agetty will leave the other serial device settings (baud rate "
+"etc.) alone---in the hope that Linux pinned them to the correct values."
 msgstr ""
 
 #. type: item
 #: doc/guix.texi:9879
 #, no-wrap
-msgid "@code{term} (default: @code{#f})"
+msgid "@code{baud-rate} (default: @code{#f})"
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:9882
-msgid "A string containing the value used for the @code{TERM} environment variable."
+msgid ""
+"A string containing a comma-separated list of one or more baud rates, in "
+"descending order."
 msgstr ""
 
 #. type: item
 #: doc/guix.texi:9883
 #, no-wrap
-msgid "@code{eight-bits?} (default: @code{#f})"
+msgid "@code{term} (default: @code{#f})"
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:9886
-msgid "When @code{#t}, the tty is assumed to be 8-bit clean, and parity detection is disabled."
+msgid ""
+"A string containing the value used for the @code{TERM} environment variable."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:9887
+#, no-wrap
+msgid "@code{eight-bits?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:9890
 msgid ""
-"When passed a login name, as a string, the specified user will be logged in automatically without prompting for their login name or "
-"password."
+"When @code{#t}, the tty is assumed to be 8-bit clean, and parity detection "
+"is disabled."
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:9894
+msgid ""
+"When passed a login name, as a string, the specified user will be logged in "
+"automatically without prompting for their login name or password."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9891
+#: doc/guix.texi:9895
 #, no-wrap
 msgid "@code{no-reset?} (default: @code{#f})"
 msgstr ""
 
-#. type: table
-#: doc/guix.texi:9893
-msgid "When @code{#t}, don't reset terminal cflags (control modes)."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:9894
-#, no-wrap
-msgid "@code{host} (default: @code{#f})"
-msgstr ""
-
 #. type: table
 #: doc/guix.texi:9897
-msgid "This accepts a string containing the \"login_host\", which will be written into the @file{/var/run/utmpx} file."
+msgid "When @code{#t}, don't reset terminal cflags (control modes)."
 msgstr ""
 
 #. type: item
 #: doc/guix.texi:9898
 #, no-wrap
+msgid "@code{host} (default: @code{#f})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:9901
+msgid ""
+"This accepts a string containing the \"login_host\", which will be written "
+"into the @file{/var/run/utmpx} file."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:9902
+#, no-wrap
 msgid "@code{remote?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9902
+#: doc/guix.texi:9906
 msgid ""
-"When set to @code{#t} in conjunction with @var{host}, this will add an @code{-r} fakehost option to the command line of the login "
-"program specified in @var{login-program}."
+"When set to @code{#t} in conjunction with @var{host}, this will add an "
+"@code{-r} fakehost option to the command line of the login program specified "
+"in @var{login-program}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9903
+#: doc/guix.texi:9907
 #, no-wrap
 msgid "@code{flow-control?} (default: @code{#f})"
 msgstr ""
 
-#. type: table
-#: doc/guix.texi:9905
-msgid "When set to @code{#t}, enable hardware (RTS/CTS) flow control."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:9906
-#, no-wrap
-msgid "@code{no-issue?} (default: @code{#f})"
-msgstr ""
-
 #. type: table
 #: doc/guix.texi:9909
-msgid "When set to @code{#t}, the contents of the @file{/etc/issue} file will not be displayed before presenting the login prompt."
+msgid "When set to @code{#t}, enable hardware (RTS/CTS) flow control."
 msgstr ""
 
 #. type: item
 #: doc/guix.texi:9910
 #, no-wrap
-msgid "@code{init-string} (default: @code{#f})"
+msgid "@code{no-issue?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:9913
 msgid ""
-"This accepts a string that will be sent to the tty or modem before sending anything else.  It can be used to initialize a modem."
+"When set to @code{#t}, the contents of the @file{/etc/issue} file will not "
+"be displayed before presenting the login prompt."
 msgstr ""
 
 #. type: item
 #: doc/guix.texi:9914
 #, no-wrap
-msgid "@code{no-clear?} (default: @code{#f})"
+msgid "@code{init-string} (default: @code{#f})"
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:9917
-msgid "When set to @code{#t}, agetty will not clear the screen before showing the login prompt."
+msgid ""
+"This accepts a string that will be sent to the tty or modem before sending "
+"anything else.  It can be used to initialize a modem."
 msgstr ""
 
 #. type: item
 #: doc/guix.texi:9918
 #, no-wrap
+msgid "@code{no-clear?} (default: @code{#f})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:9921
+msgid ""
+"When set to @code{#t}, agetty will not clear the screen before showing the "
+"login prompt."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:9922
+#, no-wrap
 msgid "@code{login-program} (default: (file-append shadow \"/bin/login\"))"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9922
+#: doc/guix.texi:9926
 msgid ""
-"This must be either a gexp denoting the name of a log-in program, or unset, in which case the default value is the @command{login} "
-"from the Shadow tool suite."
+"This must be either a gexp denoting the name of a log-in program, or unset, "
+"in which case the default value is the @command{login} from the Shadow tool "
+"suite."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9923
+#: doc/guix.texi:9927
 #, no-wrap
 msgid "@code{local-line} (default: @code{#f})"
 msgstr ""
 
-#. type: table
-#: doc/guix.texi:9927
-msgid ""
-"Control the CLOCAL line flag.  This accepts one of three symbols as arguments, @code{'auto}, @code{'always}, or @code{'never}. If "
-"@code{#f}, the default value chosen by agetty is @code{'auto}."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:9928
-#, no-wrap
-msgid "@code{extract-baud?} (default: @code{#f})"
-msgstr ""
-
 #. type: table
 #: doc/guix.texi:9931
 msgid ""
-"When set to @code{#t}, instruct agetty to try to extract the baud rate from the status messages produced by certain types of modems."
+"Control the CLOCAL line flag.  This accepts one of three symbols as "
+"arguments, @code{'auto}, @code{'always}, or @code{'never}. If @code{#f}, the "
+"default value chosen by agetty is @code{'auto}."
 msgstr ""
 
 #. type: item
 #: doc/guix.texi:9932
 #, no-wrap
+msgid "@code{extract-baud?} (default: @code{#f})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:9935
+msgid ""
+"When set to @code{#t}, instruct agetty to try to extract the baud rate from "
+"the status messages produced by certain types of modems."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:9936
+#, no-wrap
 msgid "@code{skip-login?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9936
+#: doc/guix.texi:9940
 msgid ""
-"When set to @code{#t}, do not prompt the user for a login name.  This can be used with @var{login-program} field to use non-standard "
-"login systems."
+"When set to @code{#t}, do not prompt the user for a login name.  This can be "
+"used with @var{login-program} field to use non-standard login systems."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9937
+#: doc/guix.texi:9941
 #, no-wrap
 msgid "@code{no-newline?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9940
-msgid "When set to @code{#t}, do not print a newline before printing the @file{/etc/issue} file."
+#: doc/guix.texi:9944
+msgid ""
+"When set to @code{#t}, do not print a newline before printing the @file{/etc/"
+"issue} file."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9942
+#: doc/guix.texi:9946
 #, no-wrap
 msgid "@code{login-options} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9947
+#: doc/guix.texi:9951
 msgid ""
-"This option accepts a string containing options that are passed to the login program.  When used with the @var{login-program}, be "
-"aware that a malicious user could try to enter a login name containing embedded options that could be parsed by the login program."
+"This option accepts a string containing options that are passed to the login "
+"program.  When used with the @var{login-program}, be aware that a malicious "
+"user could try to enter a login name containing embedded options that could "
+"be parsed by the login program."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9948
+#: doc/guix.texi:9952
 #, no-wrap
 msgid "@code{login-pause} (default: @code{#f})"
 msgstr ""
 
-#. type: table
-#: doc/guix.texi:9952
-msgid ""
-"When set to @code{#t}, wait for any key before showing the login prompt.  This can be used in conjunction with @var{auto-login} to "
-"save memory by lazily spawning shells."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:9953
-#, no-wrap
-msgid "@code{chroot} (default: @code{#f})"
-msgstr ""
-
 #. type: table
 #: doc/guix.texi:9956
-msgid "Change root to the specified directory.  This option accepts a directory path as a string."
+msgid ""
+"When set to @code{#t}, wait for any key before showing the login prompt.  "
+"This can be used in conjunction with @var{auto-login} to save memory by "
+"lazily spawning shells."
 msgstr ""
 
 #. type: item
 #: doc/guix.texi:9957
 #, no-wrap
-msgid "@code{hangup?} (default: @code{#f})"
+msgid "@code{chroot} (default: @code{#f})"
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:9960
-msgid "Use the Linux system call @code{vhangup} to do a virtual hangup of the specified terminal."
+msgid ""
+"Change root to the specified directory.  This option accepts a directory "
+"path as a string."
 msgstr ""
 
 #. type: item
 #: doc/guix.texi:9961
 #, no-wrap
+msgid "@code{hangup?} (default: @code{#f})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:9964
+msgid ""
+"Use the Linux system call @code{vhangup} to do a virtual hangup of the "
+"specified terminal."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:9965
+#, no-wrap
 msgid "@code{keep-baud?} (default: @code{#f})"
 msgstr ""
 
-#. type: table
-#: doc/guix.texi:9965
-msgid ""
-"When set to @code{#t}, try to keep the existing baud rate.  The baud rates from @var{baud-rate} are used when agetty receives a "
-"@key{BREAK} character."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:9966
-#, no-wrap
-msgid "@code{timeout} (default: @code{#f})"
-msgstr ""
-
 #. type: table
 #: doc/guix.texi:9969
-msgid "When set to an integer value, terminate if no user name could be read within @var{timeout} seconds."
+msgid ""
+"When set to @code{#t}, try to keep the existing baud rate.  The baud rates "
+"from @var{baud-rate} are used when agetty receives a @key{BREAK} character."
 msgstr ""
 
 #. type: item
 #: doc/guix.texi:9970
 #, no-wrap
+msgid "@code{timeout} (default: @code{#f})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:9973
+msgid ""
+"When set to an integer value, terminate if no user name could be read within "
+"@var{timeout} seconds."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:9974
+#, no-wrap
 msgid "@code{detect-case?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9976
+#: doc/guix.texi:9980
 msgid ""
-"When set to @code{#t}, turn on support for detecting an uppercase-only terminal.  This setting will detect a login name containing "
-"only uppercase letters as indicating an uppercase-only terminal and turn on some upper-to-lower case conversions.  Note that this "
-"will not support Unicode characters."
+"When set to @code{#t}, turn on support for detecting an uppercase-only "
+"terminal.  This setting will detect a login name containing only uppercase "
+"letters as indicating an uppercase-only terminal and turn on some upper-to-"
+"lower case conversions.  Note that this will not support Unicode characters."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9977
+#: doc/guix.texi:9981
 #, no-wrap
 msgid "@code{wait-cr?} (default: @code{#f})"
 msgstr ""
 
-#. type: table
-#: doc/guix.texi:9982
-msgid ""
-"When set to @code{#t}, wait for the user or modem to send a carriage-return or linefeed character before displaying @file{/etc/"
-"issue} or login prompt.  This is typically used with the @var{init-string} option."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:9983
-#, no-wrap
-msgid "@code{no-hints?} (default: @code{#f})"
-msgstr ""
-
 #. type: table
 #: doc/guix.texi:9986
-msgid "When set to @code{#t}, do not print hints about Num, Caps, and Scroll locks."
+msgid ""
+"When set to @code{#t}, wait for the user or modem to send a carriage-return "
+"or linefeed character before displaying @file{/etc/issue} or login prompt.  "
+"This is typically used with the @var{init-string} option."
 msgstr ""
 
 #. type: item
 #: doc/guix.texi:9987
 #, no-wrap
-msgid "@code{no-hostname?} (default: @code{#f})"
+msgid "@code{no-hints?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:9990
-msgid "By default, the hostname is printed.  When this option is set to @code{#t}, no hostname will be shown at all."
+msgid ""
+"When set to @code{#t}, do not print hints about Num, Caps, and Scroll locks."
 msgstr ""
 
 #. type: item
 #: doc/guix.texi:9991
 #, no-wrap
-msgid "@code{long-hostname?} (default: @code{#f})"
+msgid "@code{no-hostname?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9995
+#: doc/guix.texi:9994
 msgid ""
-"By default, the hostname is only printed until the first dot.  When this option is set to @code{#t}, the fully qualified hostname by "
-"@code{gethostname} or @code{getaddrinfo} is shown."
+"By default, the hostname is printed.  When this option is set to @code{#t}, "
+"no hostname will be shown at all."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9996
+#: doc/guix.texi:9995
 #, no-wrap
-msgid "@code{erase-characters} (default: @code{#f})"
+msgid "@code{long-hostname?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:9999
 msgid ""
-"This option accepts a string of additional characters that should be interpreted as backspace when the user types their login name."
+"By default, the hostname is only printed until the first dot.  When this "
+"option is set to @code{#t}, the fully qualified hostname by "
+"@code{gethostname} or @code{getaddrinfo} is shown."
 msgstr ""
 
 #. type: item
 #: doc/guix.texi:10000
 #, no-wrap
+msgid "@code{erase-characters} (default: @code{#f})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:10003
+msgid ""
+"This option accepts a string of additional characters that should be "
+"interpreted as backspace when the user types their login name."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:10004
+#, no-wrap
 msgid "@code{kill-characters} (default: @code{#f})"
 msgstr ""
 
-#. type: table
-#: doc/guix.texi:10004
-msgid ""
-"This option accepts a string that should be interpreted to mean \"ignore all previous characters\" (also called a \"kill\" "
-"character) when the types their login name."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:10005
-#, no-wrap
-msgid "@code{chdir} (default: @code{#f})"
-msgstr ""
-
 #. type: table
 #: doc/guix.texi:10008
-msgid "This option accepts, as a string, a directory path that will be changed to before login."
+msgid ""
+"This option accepts a string that should be interpreted to mean \"ignore all "
+"previous characters\" (also called a \"kill\" character) when the types "
+"their login name."
 msgstr ""
 
 #. type: item
 #: doc/guix.texi:10009
 #, no-wrap
-msgid "@code{delay} (default: @code{#f})"
+msgid "@code{chdir} (default: @code{#f})"
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:10012
-msgid "This options accepts, as an integer, the number of seconds to sleep before opening the tty and displaying the login prompt."
+msgid ""
+"This option accepts, as a string, a directory path that will be changed to "
+"before login."
 msgstr ""
 
 #. type: item
 #: doc/guix.texi:10013
 #, no-wrap
-msgid "@code{nice} (default: @code{#f})"
+msgid "@code{delay} (default: @code{#f})"
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:10016
-msgid "This option accepts, as an integer, the nice value with which to run the @command{login} program."
+msgid ""
+"This options accepts, as an integer, the number of seconds to sleep before "
+"opening the tty and displaying the login prompt."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10017 doc/guix.texi:10217
+#: doc/guix.texi:10017
 #, no-wrap
-msgid "@code{extra-options} (default: @code{'()})"
+msgid "@code{nice} (default: @code{#f})"
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:10020
 msgid ""
-"This option provides an \"escape hatch\" for the user to provide arbitrary command-line arguments to @command{agetty} as a list of "
-"strings."
+"This option accepts, as an integer, the nice value with which to run the "
+"@command{login} program."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:10021 doc/guix.texi:10221
+#, no-wrap
+msgid "@code{extra-options} (default: @code{'()})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:10024
+msgid ""
+"This option provides an \"escape hatch\" for the user to provide arbitrary "
+"command-line arguments to @command{agetty} as a list of strings."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:10024
+#: doc/guix.texi:10028
 #, no-wrap
 msgid "{Scheme Procedure} kmscon-service-type @var{config}"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:10028
+#: doc/guix.texi:10032
 msgid ""
-"Return a service to run @uref{https://www.freedesktop.org/wiki/Software/kmscon,kmscon} according to @var{config}, a @code{<kmscon-"
-"configuration>} object, which specifies the tty to run, among other things."
+"Return a service to run @uref{https://www.freedesktop.org/wiki/Software/"
+"kmscon,kmscon} according to @var{config}, a @code{<kmscon-configuration>} "
+"object, which specifies the tty to run, among other things."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:10030
+#: doc/guix.texi:10034
 #, no-wrap
 msgid "{Data Type} kmscon-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:10033
-msgid "This is the data type representing the configuration of Kmscon, which implements virtual console log-in."
+#: doc/guix.texi:10037
+msgid ""
+"This is the data type representing the configuration of Kmscon, which "
+"implements virtual console log-in."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:10036
+#: doc/guix.texi:10040
 #, no-wrap
 msgid "virtual-terminal"
 msgstr ""
 
-#. type: table
-#: doc/guix.texi:10038
-msgid "The name of the console this Kmscon runs on---e.g., @code{\"tty1\"}."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:10039
-#, no-wrap
-msgid "@code{login-program} (default: @code{#~(string-append #$shadow \"/bin/login\")})"
-msgstr ""
-
 #. type: table
 #: doc/guix.texi:10042
-msgid "A gexp denoting the name of the log-in program. The default log-in program is @command{login} from the Shadow tool suite."
+msgid "The name of the console this Kmscon runs on---e.g., @code{\"tty1\"}."
 msgstr ""
 
 #. type: item
 #: doc/guix.texi:10043
 #, no-wrap
+msgid "@code{login-program} (default: @code{#~(string-append #$shadow \"/bin/login\")})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:10046
+msgid ""
+"A gexp denoting the name of the log-in program. The default log-in program "
+"is @command{login} from the Shadow tool suite."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:10047
+#, no-wrap
 msgid "@code{login-arguments} (default: @code{'(\"-p\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10045
+#: doc/guix.texi:10049
 msgid "A list of arguments to pass to @command{login}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10046
+#: doc/guix.texi:10050
 #, no-wrap
 msgid "@code{hardware-acceleration?} (default: #f)"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10048
+#: doc/guix.texi:10052
 msgid "Whether to use hardware acceleration."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10049
+#: doc/guix.texi:10053
 #, no-wrap
 msgid "@code{kmscon} (default: @var{kmscon})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10051
+#: doc/guix.texi:10055
 msgid "The Kmscon package to use."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:10055
+#: doc/guix.texi:10059
 #, no-wrap
 msgid "name service cache daemon"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:10056
+#: doc/guix.texi:10060
 #, no-wrap
 msgid "nscd"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:10057
+#: doc/guix.texi:10061
 #, no-wrap
 msgid "{Scheme Procedure} nscd-service [@var{config}] [#:glibc glibc] @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:10062
+#: doc/guix.texi:10066
 msgid ""
-"[#:name-services '()] Return a service that runs the libc name service cache daemon (nscd) with the given @var{config}---an "
-"@code{<nscd-configuration>} object.  @xref{Name Service Switch}, for an example."
+"[#:name-services '()] Return a service that runs the libc name service cache "
+"daemon (nscd) with the given @var{config}---an @code{<nscd-configuration>} "
+"object.  @xref{Name Service Switch}, for an example."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:10064
+#: doc/guix.texi:10068
 #, no-wrap
 msgid "{Scheme Variable} %nscd-default-configuration"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:10068
+#: doc/guix.texi:10072
 msgid ""
-"This is the default @code{<nscd-configuration>} value (see below) used by @code{nscd-service}.  It uses the caches defined by "
-"@var{%nscd-default-caches}; see below."
+"This is the default @code{<nscd-configuration>} value (see below) used by "
+"@code{nscd-service}.  It uses the caches defined by @var{%nscd-default-"
+"caches}; see below."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:10070
+#: doc/guix.texi:10074
 #, no-wrap
 msgid "{Data Type} nscd-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:10073
-msgid "This is the data type representing the name service cache daemon (nscd)  configuration."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:10076
-#, no-wrap
-msgid "@code{name-services} (default: @code{'()})"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:10079
-msgid "List of packages denoting @dfn{name services} that must be visible to the nscd---e.g., @code{(list @var{nss-mdns})}."
+#: doc/guix.texi:10077
+msgid ""
+"This is the data type representing the name service cache daemon (nscd)  "
+"configuration."
 msgstr ""
 
 #. type: item
 #: doc/guix.texi:10080
 #, no-wrap
-msgid "@code{glibc} (default: @var{glibc})"
+msgid "@code{name-services} (default: @code{'()})"
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:10083
-msgid "Package object denoting the GNU C Library providing the @command{nscd} command."
+msgid ""
+"List of packages denoting @dfn{name services} that must be visible to the "
+"nscd---e.g., @code{(list @var{nss-mdns})}."
 msgstr ""
 
 #. type: item
 #: doc/guix.texi:10084
 #, no-wrap
-msgid "@code{log-file} (default: @code{\"/var/log/nscd.log\"})"
+msgid "@code{glibc} (default: @var{glibc})"
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:10087
-msgid "Name of the nscd log file.  This is where debugging output goes when @code{debug-level} is strictly positive."
+msgid ""
+"Package object denoting the GNU C Library providing the @command{nscd} "
+"command."
 msgstr ""
 
 #. type: item
 #: doc/guix.texi:10088
 #, no-wrap
-msgid "@code{debug-level} (default: @code{0})"
+msgid "@code{log-file} (default: @code{\"/var/log/nscd.log\"})"
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:10091
-msgid "Integer denoting the debugging levels.  Higher numbers mean that more debugging output is logged."
+msgid ""
+"Name of the nscd log file.  This is where debugging output goes when "
+"@code{debug-level} is strictly positive."
 msgstr ""
 
 #. type: item
 #: doc/guix.texi:10092
 #, no-wrap
-msgid "@code{caches} (default: @var{%nscd-default-caches})"
+msgid "@code{debug-level} (default: @code{0})"
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:10095
-msgid "List of @code{<nscd-cache>} objects denoting things to be cached; see below."
+msgid ""
+"Integer denoting the debugging levels.  Higher numbers mean that more "
+"debugging output is logged."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:10096
+#, no-wrap
+msgid "@code{caches} (default: @var{%nscd-default-caches})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:10099
+msgid ""
+"List of @code{<nscd-cache>} objects denoting things to be cached; see below."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:10099
+#: doc/guix.texi:10103
 #, no-wrap
 msgid "{Data Type} nscd-cache"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:10101
+#: doc/guix.texi:10105
 msgid "Data type representing a cache database of nscd and its parameters."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:10104 doc/guix.texi:12761
+#: doc/guix.texi:10108 doc/guix.texi:12810
 #, no-wrap
 msgid "database"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10109
+#: doc/guix.texi:10113
 msgid ""
-"This is a symbol representing the name of the database to be cached.  Valid values are @code{passwd}, @code{group}, @code{hosts}, "
-"and @code{services}, which designate the corresponding NSS database (@pxref{NSS Basics,,, libc, The GNU C Library Reference Manual})."
+"This is a symbol representing the name of the database to be cached.  Valid "
+"values are @code{passwd}, @code{group}, @code{hosts}, and @code{services}, "
+"which designate the corresponding NSS database (@pxref{NSS Basics,,, libc, "
+"The GNU C Library Reference Manual})."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:10110
+#: doc/guix.texi:10114
 #, no-wrap
 msgid "positive-time-to-live"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:10111
+#: doc/guix.texi:10115
 #, no-wrap
 msgid "@code{negative-time-to-live} (default: @code{20})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10114
-msgid "A number representing the number of seconds during which a positive or negative lookup result remains in cache."
+#: doc/guix.texi:10118
+msgid ""
+"A number representing the number of seconds during which a positive or "
+"negative lookup result remains in cache."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10115
+#: doc/guix.texi:10119
 #, no-wrap
 msgid "@code{check-files?} (default: @code{#t})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10118
-msgid "Whether to check for updates of the files corresponding to @var{database}."
+#: doc/guix.texi:10122
+msgid ""
+"Whether to check for updates of the files corresponding to @var{database}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10122
+#: doc/guix.texi:10126
 msgid ""
-"For instance, when @var{database} is @code{hosts}, setting this flag instructs nscd to check for updates in @file{/etc/hosts} and to "
-"take them into account."
+"For instance, when @var{database} is @code{hosts}, setting this flag "
+"instructs nscd to check for updates in @file{/etc/hosts} and to take them "
+"into account."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10123
+#: doc/guix.texi:10127
 #, no-wrap
 msgid "@code{persistent?} (default: @code{#t})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10125
+#: doc/guix.texi:10129
 msgid "Whether the cache should be stored persistently on disk."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10126
+#: doc/guix.texi:10130
 #, no-wrap
 msgid "@code{shared?} (default: @code{#t})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10128
+#: doc/guix.texi:10132
 msgid "Whether the cache should be shared among users."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10129
+#: doc/guix.texi:10133
 #, no-wrap
 msgid "@code{max-database-size} (default: 32@tie{}MiB)"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10131
+#: doc/guix.texi:10135
 msgid "Maximum size in bytes of the database cache."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:10138
+#: doc/guix.texi:10142
 #, no-wrap
 msgid "{Scheme Variable} %nscd-default-caches"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:10141
-msgid "List of @code{<nscd-cache>} objects used by default by @code{nscd-configuration} (see above)."
+#: doc/guix.texi:10145
+msgid ""
+"List of @code{<nscd-cache>} objects used by default by @code{nscd-"
+"configuration} (see above)."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:10147
+#: doc/guix.texi:10151
 msgid ""
-"It enables persistent and aggressive caching of service and host name lookups.  The latter provides better host name lookup "
-"performance, resilience in the face of unreliable name servers, and also better privacy---often the result of host name lookups is "
-"in local cache, so external name servers do not even need to be queried."
+"It enables persistent and aggressive caching of service and host name "
+"lookups.  The latter provides better host name lookup performance, "
+"resilience in the face of unreliable name servers, and also better privacy---"
+"often the result of host name lookups is in local cache, so external name "
+"servers do not even need to be queried."
 msgstr ""
 
 #. type: anchor{#1}
-#: doc/guix.texi:10150
+#: doc/guix.texi:10154
 msgid "syslog-configuration-type"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:10150 doc/guix.texi:10166
+#: doc/guix.texi:10154 doc/guix.texi:10170
 #, no-wrap
 msgid "syslog"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:10151 doc/guix.texi:10584
+#: doc/guix.texi:10155 doc/guix.texi:10588
 #, no-wrap
 msgid "logging"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:10152
+#: doc/guix.texi:10156
 #, no-wrap
 msgid "{Data Type} syslog-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:10154
+#: doc/guix.texi:10158
 msgid "This data type represents the configuration of the syslog daemon."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10156
+#: doc/guix.texi:10160
 #, no-wrap
 msgid "@code{syslogd} (default: @code{#~(string-append #$inetutils \"/libexec/syslogd\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10158
+#: doc/guix.texi:10162
 msgid "The syslog daemon to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10159
+#: doc/guix.texi:10163
 #, no-wrap
 msgid "@code{config-file} (default: @code{%default-syslog.conf})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10161
+#: doc/guix.texi:10165
 msgid "The syslog configuration file to use."
 msgstr ""
 
 #. type: anchor{#1}
-#: doc/guix.texi:10166
+#: doc/guix.texi:10170
 msgid "syslog-service"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:10167
+#: doc/guix.texi:10171
 #, no-wrap
 msgid "{Scheme Procedure} syslog-service @var{config}"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:10169
+#: doc/guix.texi:10173
 msgid "Return a service that runs a syslog daemon according to @var{config}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:10172
-msgid "@xref{syslogd invocation,,, inetutils, GNU Inetutils}, for more information on the configuration file syntax."
+#: doc/guix.texi:10176
+msgid ""
+"@xref{syslogd invocation,,, inetutils, GNU Inetutils}, for more information "
+"on the configuration file syntax."
 msgstr ""
 
 #. type: anchor{#1}
-#: doc/guix.texi:10175
+#: doc/guix.texi:10179
 msgid "guix-configuration-type"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:10175
+#: doc/guix.texi:10179
 #, no-wrap
 msgid "{Data Type} guix-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:10178
-msgid "This data type represents the configuration of the Guix build daemon.  @xref{Invoking guix-daemon}, for more information."
+#: doc/guix.texi:10182
+msgid ""
+"This data type represents the configuration of the Guix build daemon.  "
+"@xref{Invoking guix-daemon}, for more information."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10180
+#: doc/guix.texi:10184
 #, no-wrap
 msgid "@code{guix} (default: @var{guix})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10182 doc/guix.texi:10410
+#: doc/guix.texi:10186 doc/guix.texi:10414
 msgid "The Guix package to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10183
+#: doc/guix.texi:10187
 #, no-wrap
 msgid "@code{build-group} (default: @code{\"guixbuild\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10185
+#: doc/guix.texi:10189
 msgid "Name of the group for build user accounts."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10186
+#: doc/guix.texi:10190
 #, no-wrap
 msgid "@code{build-accounts} (default: @code{10})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10188
+#: doc/guix.texi:10192
 msgid "Number of build user accounts to create."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10189
+#: doc/guix.texi:10193
 #, no-wrap
 msgid "@code{authorize-key?} (default: @code{#t})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10194
+#: doc/guix.texi:10198
 msgid ""
-"Whether to authorize the substitute keys listed in @code{authorized-keys}---by default that of @code{hydra.gnu.org} "
-"(@pxref{Substitutes})."
+"Whether to authorize the substitute keys listed in @code{authorized-keys}---"
+"by default that of @code{hydra.gnu.org} (@pxref{Substitutes})."
 msgstr ""
-"Autoriser ou non les clefs de substituts listées dans @code{authorize-keys} — par défaut celle de @code{hydra.gny.org} "
-"(@pxref{Substituts})."
+"Autoriser ou non les clefs de substituts listées dans @code{authorize-keys} "
+"— par défaut celle de @code{hydra.gny.org} (@pxref{Substituts})."
 
 #. type: vindex
-#: doc/guix.texi:10195
+#: doc/guix.texi:10199
 #, no-wrap
 msgid "%default-authorized-guix-keys"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10196
+#: doc/guix.texi:10200
 #, no-wrap
 msgid "@code{authorized-keys} (default: @var{%default-authorized-guix-keys})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10200
+#: doc/guix.texi:10204
 msgid ""
-"The list of authorized key files for archive imports, as a list of string-valued gexps (@pxref{Invoking guix archive}).  By default, "
-"it contains that of @code{hydra.gnu.org} (@pxref{Substitutes})."
+"The list of authorized key files for archive imports, as a list of string-"
+"valued gexps (@pxref{Invoking guix archive}).  By default, it contains that "
+"of @code{hydra.gnu.org} (@pxref{Substitutes})."
 msgstr ""
-"La liste des fichiers de clefs autorisées pour les imports d'archives, en tant que liste de gexps sous forme de chaînes "
-"(@pxref{Invoking guix archive}). Par défaut, elle contient celle de @code{hydra.gnu.org} (@pxref{Substituts})."
+"La liste des fichiers de clefs autorisées pour les imports d'archives, en "
+"tant que liste de gexps sous forme de chaînes (@pxref{Invoking guix "
+"archive}). Par défaut, elle contient celle de @code{hydra.gnu.org} "
+"(@pxref{Substituts})."
 
 #. type: item
-#: doc/guix.texi:10201
+#: doc/guix.texi:10205
 #, no-wrap
 msgid "@code{use-substitutes?} (default: @code{#t})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10203
+#: doc/guix.texi:10207
 msgid "Whether to use substitutes."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10204
+#: doc/guix.texi:10208
 #, no-wrap
 msgid "@code{substitute-urls} (default: @var{%default-substitute-urls})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10206
+#: doc/guix.texi:10210
 msgid "The list of URLs where to look for substitutes by default."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10207
+#: doc/guix.texi:10211
 #, no-wrap
 msgid "@code{max-silent-time} (default: @code{0})"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:10208
+#: doc/guix.texi:10212
 #, no-wrap
 msgid "@code{timeout} (default: @code{0})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10212
+#: doc/guix.texi:10216
 msgid ""
-"The number of seconds of silence and the number of seconds of activity, respectively, after which a build process times out.  A "
-"value of zero disables the timeout."
+"The number of seconds of silence and the number of seconds of activity, "
+"respectively, after which a build process times out.  A value of zero "
+"disables the timeout."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10213
+#: doc/guix.texi:10217
 #, no-wrap
 msgid "@code{log-compression} (default: @code{'bzip2})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10216
-msgid "The type of compression used for build logs---one of @code{gzip}, @code{bzip2}, or @code{none}."
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:10219
-msgid "List of extra command-line options for @command{guix-daemon}."
-msgstr ""
-
-#. type: item
 #: doc/guix.texi:10220
-#, no-wrap
-msgid "@code{log-file} (default: @code{\"/var/log/guix-daemon.log\"})"
+msgid ""
+"The type of compression used for build logs---one of @code{gzip}, "
+"@code{bzip2}, or @code{none}."
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:10223
-msgid "File where @command{guix-daemon}'s standard output and standard error are written."
+msgid "List of extra command-line options for @command{guix-daemon}."
 msgstr ""
 
 #. type: item
 #: doc/guix.texi:10224
 #, no-wrap
-msgid "@code{http-proxy} (default: @code{#f})"
+msgid "@code{log-file} (default: @code{\"/var/log/guix-daemon.log\"})"
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:10227
-msgid "The HTTP proxy used for downloading fixed-output derivations and substitutes."
+msgid ""
+"File where @command{guix-daemon}'s standard output and standard error are "
+"written."
 msgstr ""
 
 #. type: item
 #: doc/guix.texi:10228
 #, no-wrap
+msgid "@code{http-proxy} (default: @code{#f})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:10231
+msgid ""
+"The HTTP proxy used for downloading fixed-output derivations and substitutes."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:10232
+#, no-wrap
 msgid "@code{tmpdir} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10230
+#: doc/guix.texi:10234
 msgid "A directory path where the @command{guix-daemon} will perform builds."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:10234
+#: doc/guix.texi:10238
 #, no-wrap
 msgid "{Scheme Procedure} guix-service @var{config}"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:10237
-msgid "Return a service that runs the Guix build daemon according to @var{config}."
+#: doc/guix.texi:10241
+msgid ""
+"Return a service that runs the Guix build daemon according to @var{config}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:10239
+#: doc/guix.texi:10243
 #, no-wrap
 msgid "{Scheme Procedure} udev-service [#:udev @var{eudev} #:rules @code{'()}]"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:10244
+#: doc/guix.texi:10248
 msgid ""
-"Run @var{udev}, which populates the @file{/dev} directory dynamically.  udev rules can be provided as a list of files through the "
-"@var{rules} variable.  The procedures @var{udev-rule} and @var{file->udev-rule} from @code{(gnu services base)} simplify the "
-"creation of such rule files."
+"Run @var{udev}, which populates the @file{/dev} directory dynamically.  udev "
+"rules can be provided as a list of files through the @var{rules} variable.  "
+"The procedures @var{udev-rule} and @var{file->udev-rule} from @code{(gnu "
+"services base)} simplify the creation of such rule files."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:10245
+#: doc/guix.texi:10249
 #, no-wrap
 msgid "{Scheme Procedure} udev-rule [@var{file-name} @var{contents}]"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:10248
-msgid "Return a udev-rule file named @var{file-name} containing the rules defined by the @var{contents} literal."
+#: doc/guix.texi:10252
+msgid ""
+"Return a udev-rule file named @var{file-name} containing the rules defined "
+"by the @var{contents} literal."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:10252
+#: doc/guix.texi:10256
 msgid ""
-"In the following example, a rule for a USB device is defined to be stored in the file @file{90-usb-thing.rules}.  The rule runs a "
-"script upon detecting a USB device with a given product identifier."
+"In the following example, a rule for a USB device is defined to be stored in "
+"the file @file{90-usb-thing.rules}.  The rule runs a script upon detecting a "
+"USB device with a given product identifier."
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:10260
+#: doc/guix.texi:10264
 #, no-wrap
 msgid ""
 "(define %example-udev-rule\n"
@@ -19417,12 +22792,13 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:10264
-msgid "Here we show how the default @var{udev-service} can be extended with it."
+#: doc/guix.texi:10268
+msgid ""
+"Here we show how the default @var{udev-service} can be extended with it."
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:10274
+#: doc/guix.texi:10278
 #, no-wrap
 msgid ""
 "(operating-system\n"
@@ -19436,23 +22812,25 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:10276
+#: doc/guix.texi:10280
 #, no-wrap
 msgid "{Scheme Procedure} file->udev-rule [@var{file-name} @var{file}]"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:10279
-msgid "Return a udev file named @var{file-name} containing the rules defined within @var{file}, a file-like object."
+#: doc/guix.texi:10283
+msgid ""
+"Return a udev file named @var{file-name} containing the rules defined within "
+"@var{file}, a file-like object."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:10281
+#: doc/guix.texi:10285
 msgid "The following example showcases how we can use an existing rule file."
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:10286
+#: doc/guix.texi:10290
 #, no-wrap
 msgid ""
 "(use-modules (guix download)     ;for url-fetch\n"
@@ -19462,7 +22840,7 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:10297
+#: doc/guix.texi:10301
 #, no-wrap
 msgid ""
 "(define %android-udev-rules\n"
@@ -19478,25 +22856,30 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:10306
+#: doc/guix.texi:10310
 msgid ""
-"Additionally, Guix package definitions can be included in @var{rules} in order to extend the udev rules with the definitions found "
-"under their @file{lib/udev/rules.d} sub-directory.  In lieu of the previous @var{file->udev-rule} example, we could have used the "
-"@var{android-udev-rules} package which exists in Guix in the @code{(gnu packages android)} module."
+"Additionally, Guix package definitions can be included in @var{rules} in "
+"order to extend the udev rules with the definitions found under their "
+"@file{lib/udev/rules.d} sub-directory.  In lieu of the previous @var{file-"
+">udev-rule} example, we could have used the @var{android-udev-rules} package "
+"which exists in Guix in the @code{(gnu packages android)} module."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:10315
+#: doc/guix.texi:10319
 msgid ""
-"The following example shows how to use the @var{android-udev-rules} package so that the Android tool @command{adb} can detect "
-"devices without root privileges.  It also details how to create the @code{adbusers} group, which is required for the proper "
-"functioning of the rules defined within the @var{android-udev-rules} package.  To create such a group, we must define it both as "
-"part of the @var{supplementary-groups} of our @var{user-account} declaration, as well as in the @var{groups} field of the "
-"@var{operating-system} record."
+"The following example shows how to use the @var{android-udev-rules} package "
+"so that the Android tool @command{adb} can detect devices without root "
+"privileges.  It also details how to create the @code{adbusers} group, which "
+"is required for the proper functioning of the rules defined within the "
+"@var{android-udev-rules} package.  To create such a group, we must define it "
+"both as part of the @var{supplementary-groups} of our @var{user-account} "
+"declaration, as well as in the @var{groups} field of the @var{operating-"
+"system} record."
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:10320
+#: doc/guix.texi:10324
 #, no-wrap
 msgid ""
 "(use-modules (gnu packages android)  ;for android-udev-rules\n"
@@ -19506,7 +22889,7 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:10329
+#: doc/guix.texi:10333
 #, no-wrap
 msgid ""
 "(operating-system\n"
@@ -19521,7 +22904,7 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:10332
+#: doc/guix.texi:10336
 #, no-wrap
 msgid ""
 "  (groups (cons (user-group (system? #t) (name \"adbusers\"))\n"
@@ -19530,7 +22913,7 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:10334
+#: doc/guix.texi:10338
 #, no-wrap
 msgid ""
 "  ;; @dots{}\n"
@@ -19538,7 +22921,7 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:10341
+#: doc/guix.texi:10345
 #, no-wrap
 msgid ""
 "  (services\n"
@@ -19550,305 +22933,331 @@ msgid ""
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:10344
+#: doc/guix.texi:10348
 #, no-wrap
 msgid "{Scheme Variable} urandom-seed-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:10349
+#: doc/guix.texi:10353
 msgid ""
-"Save some entropy in @var{%random-seed-file} to seed @file{/dev/urandom} when rebooting.  It also tries to seed @file{/dev/urandom} "
-"from @file{/dev/hwrng} while booting, if @file{/dev/hwrng} exists and is readable."
+"Save some entropy in @var{%random-seed-file} to seed @file{/dev/urandom} "
+"when rebooting.  It also tries to seed @file{/dev/urandom} from @file{/dev/"
+"hwrng} while booting, if @file{/dev/hwrng} exists and is readable."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:10351
+#: doc/guix.texi:10355
 #, no-wrap
 msgid "{Scheme Variable} %random-seed-file"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:10355
+#: doc/guix.texi:10359
 msgid ""
-"This is the name of the file where some random bytes are saved by @var{urandom-seed-service} to seed @file{/dev/urandom} when "
-"rebooting.  It defaults to @file{/var/lib/random-seed}."
+"This is the name of the file where some random bytes are saved by "
+"@var{urandom-seed-service} to seed @file{/dev/urandom} when rebooting.  It "
+"defaults to @file{/var/lib/random-seed}."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:10357
+#: doc/guix.texi:10361
 #, no-wrap
 msgid "keymap"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:10358
+#: doc/guix.texi:10362
 #, no-wrap
 msgid "keyboard"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:10359
+#: doc/guix.texi:10363
 #, no-wrap
 msgid "{Scheme Procedure} console-keymap-service @var{files} ..."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:10364
+#: doc/guix.texi:10368
 msgid ""
-"Return a service to load console keymaps from @var{files} using @command{loadkeys} command.  Most likely, you want to load some "
-"default keymap, which can be done like this:"
+"Return a service to load console keymaps from @var{files} using "
+"@command{loadkeys} command.  Most likely, you want to load some default "
+"keymap, which can be done like this:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:10367
+#: doc/guix.texi:10371
 #, no-wrap
 msgid "(console-keymap-service \"dvorak\")\n"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:10371
-msgid "Or, for example, for a Swedish keyboard, you may need to combine the following keymaps:"
+#: doc/guix.texi:10375
+msgid ""
+"Or, for example, for a Swedish keyboard, you may need to combine the "
+"following keymaps:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:10373
+#: doc/guix.texi:10377
 #, no-wrap
 msgid "(console-keymap-service \"se-lat6\" \"se-fi-lat6\")\n"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:10377
-msgid "Also you can specify a full file name (or file names) of your keymap(s).  See @code{man loadkeys} for details."
+#: doc/guix.texi:10381
+msgid ""
+"Also you can specify a full file name (or file names) of your keymap(s).  "
+"See @code{man loadkeys} for details."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:10380
+#: doc/guix.texi:10384
 #, no-wrap
 msgid "mouse"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:10381
+#: doc/guix.texi:10385
 #, no-wrap
 msgid "gpm"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:10382
+#: doc/guix.texi:10386
 #, no-wrap
 msgid "{Scheme Procedure} gpm-service [#:gpm @var{gpm}] @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:10388
+#: doc/guix.texi:10392
 msgid ""
-"[#:options] Run @var{gpm}, the general-purpose mouse daemon, with the given command-line @var{options}.  GPM allows users to use the "
-"mouse in the console, notably to select, copy, and paste text.  The default value of @var{options} uses the @code{ps2} protocol, "
-"which works for both USB and PS/2 mice."
+"[#:options] Run @var{gpm}, the general-purpose mouse daemon, with the given "
+"command-line @var{options}.  GPM allows users to use the mouse in the "
+"console, notably to select, copy, and paste text.  The default value of "
+"@var{options} uses the @code{ps2} protocol, which works for both USB and "
+"PS/2 mice."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:10390
+#: doc/guix.texi:10394
 msgid "This service is not part of @var{%base-services}."
 msgstr ""
 
 #. type: anchor{#1}
-#: doc/guix.texi:10393
+#: doc/guix.texi:10397
 msgid "guix-publish-service-type"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:10393
+#: doc/guix.texi:10397
 #, no-wrap
 msgid "{Scheme Variable} guix-publish-service-type"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:10397
+#: doc/guix.texi:10401
 msgid ""
-"This is the service type for @command{guix publish} (@pxref{Invoking guix publish}).  Its value must be a @code{guix-configuration} "
-"object, as described below."
+"This is the service type for @command{guix publish} (@pxref{Invoking guix "
+"publish}).  Its value must be a @code{guix-configuration} object, as "
+"described below."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:10401
+#: doc/guix.texi:10405
 msgid ""
-"This assumes that @file{/etc/guix} already contains a signing key pair as created by @command{guix archive --generate-key} "
-"(@pxref{Invoking guix archive}).  If that is not the case, the service will fail to start."
+"This assumes that @file{/etc/guix} already contains a signing key pair as "
+"created by @command{guix archive --generate-key} (@pxref{Invoking guix "
+"archive}).  If that is not the case, the service will fail to start."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:10403
+#: doc/guix.texi:10407
 #, no-wrap
 msgid "{Data Type} guix-publish-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:10406
-msgid "Data type representing the configuration of the @code{guix publish} service."
+#: doc/guix.texi:10410
+msgid ""
+"Data type representing the configuration of the @code{guix publish} service."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10408
+#: doc/guix.texi:10412
 #, no-wrap
 msgid "@code{guix} (default: @code{guix})"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10411
+#: doc/guix.texi:10415
 #, no-wrap
 msgid "@code{port} (default: @code{80})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10413
+#: doc/guix.texi:10417
 msgid "The TCP port to listen for connections."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10414
+#: doc/guix.texi:10418
 #, no-wrap
 msgid "@code{host} (default: @code{\"localhost\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10417
-msgid "The host (and thus, network interface) to listen to.  Use @code{\"0.0.0.0\"} to listen on all the network interfaces."
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:10422
+#: doc/guix.texi:10421
 msgid ""
-"The gzip compression level at which substitutes are compressed.  Use @code{0} to disable compression altogether, and @code{9} to get "
-"the best compression ratio at the expense of increased CPU usage."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:10423
-#, no-wrap
-msgid "@code{nar-path} (default: @code{\"nar\"})"
+"The host (and thus, network interface) to listen to.  Use @code{\"0.0.0.0\"} "
+"to listen on all the network interfaces."
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:10426
-msgid "The URL path at which ``nars'' can be fetched.  @xref{Invoking guix publish, @code{--nar-path}}, for details."
+msgid ""
+"The gzip compression level at which substitutes are compressed.  Use "
+"@code{0} to disable compression altogether, and @code{9} to get the best "
+"compression ratio at the expense of increased CPU usage."
 msgstr ""
 
 #. type: item
 #: doc/guix.texi:10427
 #, no-wrap
+msgid "@code{nar-path} (default: @code{\"nar\"})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:10430
+msgid ""
+"The URL path at which ``nars'' can be fetched.  @xref{Invoking guix publish, "
+"@code{--nar-path}}, for details."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:10431
+#, no-wrap
 msgid "@code{cache} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10433
+#: doc/guix.texi:10437
 msgid ""
-"When it is @code{#f}, disable caching and instead generate archives on demand.  Otherwise, this should be the name of a directory---"
-"e.g., @code{\"/var/cache/guix/publish\"}---where @command{guix publish} caches archives and meta-data ready to be sent.  "
-"@xref{Invoking guix publish, @option{--cache}}, for more information on the tradeoffs involved."
+"When it is @code{#f}, disable caching and instead generate archives on "
+"demand.  Otherwise, this should be the name of a directory---e.g., @code{\"/"
+"var/cache/guix/publish\"}---where @command{guix publish} caches archives and "
+"meta-data ready to be sent.  @xref{Invoking guix publish, @option{--cache}}, "
+"for more information on the tradeoffs involved."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10434
+#: doc/guix.texi:10438
 #, no-wrap
 msgid "@code{workers} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10438
+#: doc/guix.texi:10442
 msgid ""
-"When it is an integer, this is the number of worker threads used for caching; when @code{#f}, the number of processors is used.  "
-"@xref{Invoking guix publish, @option{--workers}}, for more information."
+"When it is an integer, this is the number of worker threads used for "
+"caching; when @code{#f}, the number of processors is used.  @xref{Invoking "
+"guix publish, @option{--workers}}, for more information."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10439
+#: doc/guix.texi:10443
 #, no-wrap
 msgid "@code{ttl} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10443
+#: doc/guix.texi:10447
 msgid ""
-"When it is an integer, this denotes the @dfn{time-to-live} in seconds of the published archives.  @xref{Invoking guix publish, "
-"@option{--ttl}}, for more information."
+"When it is an integer, this denotes the @dfn{time-to-live} in seconds of the "
+"published archives.  @xref{Invoking guix publish, @option{--ttl}}, for more "
+"information."
 msgstr ""
 
 #. type: anchor{#1}
-#: doc/guix.texi:10447
+#: doc/guix.texi:10451
 msgid "rngd-service"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:10447
+#: doc/guix.texi:10451
 #, no-wrap
 msgid "{Scheme Procedure} rngd-service [#:rng-tools @var{rng-tools}] @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:10452
+#: doc/guix.texi:10456
 msgid ""
-"[#:device \"/dev/hwrng\"] Return a service that runs the @command{rngd} program from @var{rng-tools} to add @var{device} to the "
-"kernel's entropy pool.  The service will fail if @var{device} does not exist."
+"[#:device \"/dev/hwrng\"] Return a service that runs the @command{rngd} "
+"program from @var{rng-tools} to add @var{device} to the kernel's entropy "
+"pool.  The service will fail if @var{device} does not exist."
 msgstr ""
 
 #. type: anchor{#1}
-#: doc/guix.texi:10455
+#: doc/guix.texi:10459
 msgid "pam-limits-service"
 msgstr ""
 
-#. type: cindex
-#: doc/guix.texi:10455
-#, no-wrap
-msgid "session limits"
-msgstr ""
-
-#. type: cindex
-#: doc/guix.texi:10456
-#, no-wrap
-msgid "ulimit"
-msgstr ""
-
-#. type: cindex
-#: doc/guix.texi:10457
-#, no-wrap
-msgid "priority"
-msgstr ""
-
-#. type: cindex
-#: doc/guix.texi:10458
-#, no-wrap
-msgid "realtime"
-msgstr ""
-
 #. type: cindex
 #: doc/guix.texi:10459
 #, no-wrap
+msgid "session limits"
+msgstr ""
+
+#. type: cindex
+#: doc/guix.texi:10460
+#, no-wrap
+msgid "ulimit"
+msgstr ""
+
+#. type: cindex
+#: doc/guix.texi:10461
+#, no-wrap
+msgid "priority"
+msgstr ""
+
+#. type: cindex
+#: doc/guix.texi:10462
+#, no-wrap
+msgid "realtime"
+msgstr ""
+
+#. type: cindex
+#: doc/guix.texi:10463
+#, no-wrap
 msgid "jackd"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:10460
+#: doc/guix.texi:10464
 #, no-wrap
 msgid "{Scheme Procedure} pam-limits-service [#:limits @code{'()}]"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:10467
+#: doc/guix.texi:10471
 msgid ""
-"Return a service that installs a configuration file for the @uref{http://linux-pam.org/Linux-PAM-html/sag-pam_limits.html, "
-"@code{pam_limits} module}.  The procedure optionally takes a list of @code{pam-limits-entry} values, which can be used to specify "
-"@code{ulimit} limits and nice priority limits to user sessions."
+"Return a service that installs a configuration file for the @uref{http://"
+"linux-pam.org/Linux-PAM-html/sag-pam_limits.html, @code{pam_limits} "
+"module}.  The procedure optionally takes a list of @code{pam-limits-entry} "
+"values, which can be used to specify @code{ulimit} limits and nice priority "
+"limits to user sessions."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:10470
-msgid "The following limits definition sets two hard and soft limits for all login sessions of users in the @code{realtime} group:"
+#: doc/guix.texi:10474
+msgid ""
+"The following limits definition sets two hard and soft limits for all login "
+"sessions of users in the @code{realtime} group:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:10476
+#: doc/guix.texi:10480
 #, no-wrap
 msgid ""
 "(pam-limits-service\n"
@@ -19858,50 +23267,56 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:10482
+#: doc/guix.texi:10486
 msgid ""
-"The first entry increases the maximum realtime priority for non-privileged processes; the second entry lifts any restriction of the "
-"maximum address space that can be locked in memory.  These settings are commonly used for real-time audio systems."
+"The first entry increases the maximum realtime priority for non-privileged "
+"processes; the second entry lifts any restriction of the maximum address "
+"space that can be locked in memory.  These settings are commonly used for "
+"real-time audio systems."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:10487
+#: doc/guix.texi:10491
 #, no-wrap
 msgid "cron"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:10488
+#: doc/guix.texi:10492
 #, no-wrap
 msgid "mcron"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:10489
+#: doc/guix.texi:10493
 #, no-wrap
 msgid "scheduling jobs"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10496
+#: doc/guix.texi:10500
 msgid ""
-"The @code{(gnu services mcron)} module provides an interface to GNU@tie{}mcron, a daemon to run jobs at scheduled times "
-"(@pxref{Top,,, mcron, GNU@tie{}mcron}).  GNU@tie{}mcron is similar to the traditional Unix @command{cron} daemon; the main "
-"difference is that it is implemented in Guile Scheme, which provides a lot of flexibility when specifying the scheduling of jobs and "
-"their actions."
+"The @code{(gnu services mcron)} module provides an interface to GNU@tie{}"
+"mcron, a daemon to run jobs at scheduled times (@pxref{Top,,, mcron, "
+"GNU@tie{}mcron}).  GNU@tie{}mcron is similar to the traditional Unix "
+"@command{cron} daemon; the main difference is that it is implemented in "
+"Guile Scheme, which provides a lot of flexibility when specifying the "
+"scheduling of jobs and their actions."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10504
+#: doc/guix.texi:10508
 msgid ""
-"The example below defines an operating system that runs the @command{updatedb} (@pxref{Invoking updatedb,,, find, Finding Files})  "
-"and the @command{guix gc} commands (@pxref{Invoking guix gc}) daily, as well as the @command{mkid} command on behalf of an "
-"unprivileged user (@pxref{mkid invocation,,, idutils, ID Database Utilities}).  It uses gexps to introduce job definitions that are "
-"passed to mcron (@pxref{G-Expressions})."
+"The example below defines an operating system that runs the "
+"@command{updatedb} (@pxref{Invoking updatedb,,, find, Finding Files})  and "
+"the @command{guix gc} commands (@pxref{Invoking guix gc}) daily, as well as "
+"the @command{mkid} command on behalf of an unprivileged user (@pxref{mkid "
+"invocation,,, idutils, ID Database Utilities}).  It uses gexps to introduce "
+"job definitions that are passed to mcron (@pxref{G-Expressions})."
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:10508
+#: doc/guix.texi:10512
 #, no-wrap
 msgid ""
 "(use-modules (guix) (gnu) (gnu services mcron))\n"
@@ -19910,7 +23325,7 @@ msgid ""
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:10517
+#: doc/guix.texi:10521
 #, no-wrap
 msgid ""
 "(define updatedb-job\n"
@@ -19925,7 +23340,7 @@ msgid ""
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:10523
+#: doc/guix.texi:10527
 #, no-wrap
 msgid ""
 "(define garbage-collector-job\n"
@@ -19937,7 +23352,7 @@ msgid ""
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:10530
+#: doc/guix.texi:10534
 #, no-wrap
 msgid ""
 "(define idutils-job\n"
@@ -19950,7 +23365,7 @@ msgid ""
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:10537
+#: doc/guix.texi:10541
 #, no-wrap
 msgid ""
 "(operating-system\n"
@@ -19962,30 +23377,33 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10542
+#: doc/guix.texi:10546
 msgid ""
-"@xref{Guile Syntax, mcron job specifications,, mcron, GNU@tie{}mcron}, for more information on mcron job specifications.  Below is "
-"the reference of the mcron service."
+"@xref{Guile Syntax, mcron job specifications,, mcron, GNU@tie{}mcron}, for "
+"more information on mcron job specifications.  Below is the reference of the "
+"mcron service."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:10543
+#: doc/guix.texi:10547
 #, no-wrap
 msgid "{Scheme Procedure} mcron-service @var{jobs} [#:mcron @var{mcron}]"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:10546
-msgid "Return an mcron service running @var{mcron} that schedules @var{jobs}, a list of gexps denoting mcron job specifications."
+#: doc/guix.texi:10550
+msgid ""
+"Return an mcron service running @var{mcron} that schedules @var{jobs}, a "
+"list of gexps denoting mcron job specifications."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:10548
+#: doc/guix.texi:10552
 msgid "This is a shorthand for:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:10551
+#: doc/guix.texi:10555
 #, no-wrap
 msgid ""
 "(service mcron-service-type\n"
@@ -19993,87 +23411,94 @@ msgid ""
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:10554
+#: doc/guix.texi:10558
 #, no-wrap
 msgid "{Scheme Variable} mcron-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:10557
-msgid "This is the type of the @code{mcron} service, whose value is an @code{mcron-configuration} object."
+#: doc/guix.texi:10561
+msgid ""
+"This is the type of the @code{mcron} service, whose value is an @code{mcron-"
+"configuration} object."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:10562
+#: doc/guix.texi:10566
 msgid ""
-"This service type can be the target of a service extension that provides it additional job specifications (@pxref{Service "
-"Composition}).  In other words, it is possible to define services that provide additional mcron jobs to run."
+"This service type can be the target of a service extension that provides it "
+"additional job specifications (@pxref{Service Composition}).  In other "
+"words, it is possible to define services that provide additional mcron jobs "
+"to run."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:10564
+#: doc/guix.texi:10568
 #, no-wrap
 msgid "{Data Type} mcron-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:10566
+#: doc/guix.texi:10570
 msgid "Data type representing the configuration of mcron."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10568
+#: doc/guix.texi:10572
 #, no-wrap
 msgid "@code{mcron} (default: @var{mcron})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10570
+#: doc/guix.texi:10574
 msgid "The mcron package to use."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:10571 doc/guix.texi:10630
+#: doc/guix.texi:10575 doc/guix.texi:10634
 #, no-wrap
 msgid "jobs"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10575
+#: doc/guix.texi:10579
 msgid ""
-"This is a list of gexps (@pxref{G-Expressions}), where each gexp corresponds to an mcron job specification (@pxref{Syntax, mcron job "
-"specifications,, mcron, GNU@tie{}mcron})."
+"This is a list of gexps (@pxref{G-Expressions}), where each gexp corresponds "
+"to an mcron job specification (@pxref{Syntax, mcron job specifications,, "
+"mcron, GNU@tie{}mcron})."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:10582
+#: doc/guix.texi:10586
 #, no-wrap
 msgid "rottlog"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:10583
+#: doc/guix.texi:10587
 #, no-wrap
 msgid "log rotation"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10590
+#: doc/guix.texi:10594
 msgid ""
-"Log files such as those found in @file{/var/log} tend to grow endlessly, so it's a good idea to @dfn{rotate} them once in a while---"
-"i.e., archive their contents in separate files, possibly compressed.  The @code{(gnu services admin)} module provides an interface "
-"to GNU@tie{}Rot[t]log, a log rotation tool (@pxref{Top,,, rottlog, GNU Rot[t]log Manual})."
+"Log files such as those found in @file{/var/log} tend to grow endlessly, so "
+"it's a good idea to @dfn{rotate} them once in a while---i.e., archive their "
+"contents in separate files, possibly compressed.  The @code{(gnu services "
+"admin)} module provides an interface to GNU@tie{}Rot[t]log, a log rotation "
+"tool (@pxref{Top,,, rottlog, GNU Rot[t]log Manual})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10593
+#: doc/guix.texi:10597
 msgid ""
-"The example below defines an operating system that provides log rotation with the default settings, for commonly encountered log "
-"files."
+"The example below defines an operating system that provides log rotation "
+"with the default settings, for commonly encountered log files."
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:10598
+#: doc/guix.texi:10602
 #, no-wrap
 msgid ""
 "(use-modules (guix) (gnu))\n"
@@ -20083,7 +23508,7 @@ msgid ""
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:10603
+#: doc/guix.texi:10607
 #, no-wrap
 msgid ""
 "(operating-system\n"
@@ -20093,97 +23518,106 @@ msgid ""
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:10605
+#: doc/guix.texi:10609
 #, no-wrap
 msgid "{Scheme Variable} rottlog-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:10608
-msgid "This is the type of the Rottlog service, whose value is a @code{rottlog-configuration} object."
-msgstr ""
-
-#. type: defvr
-#: doc/guix.texi:10611
+#: doc/guix.texi:10612
 msgid ""
-"Other services can extend this one with new @code{log-rotation} objects (see below), thereby augmenting the set of files to be "
-"rotated."
+"This is the type of the Rottlog service, whose value is a @code{rottlog-"
+"configuration} object."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:10614
-msgid "This service type can define mcron jobs (@pxref{Scheduled Job Execution}) to run the rottlog service."
+#: doc/guix.texi:10615
+msgid ""
+"Other services can extend this one with new @code{log-rotation} objects (see "
+"below), thereby augmenting the set of files to be rotated."
+msgstr ""
+
+#. type: defvr
+#: doc/guix.texi:10618
+msgid ""
+"This service type can define mcron jobs (@pxref{Scheduled Job Execution}) to "
+"run the rottlog service."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:10616
+#: doc/guix.texi:10620
 #, no-wrap
 msgid "{Data Type} rottlog-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:10618
+#: doc/guix.texi:10622
 msgid "Data type representing the configuration of rottlog."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10620
+#: doc/guix.texi:10624
 #, no-wrap
 msgid "@code{rottlog} (default: @code{rottlog})"
 msgstr ""
 
-#. type: table
-#: doc/guix.texi:10622
-msgid "The Rottlog package to use."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:10623
-#, no-wrap
-msgid "@code{rc-file} (default: @code{(file-append rottlog \"/etc/rc\")})"
-msgstr ""
-
 #. type: table
 #: doc/guix.texi:10626
-msgid "The Rottlog configuration file to use (@pxref{Mandatory RC Variables,,, rottlog, GNU Rot[t]log Manual})."
+msgid "The Rottlog package to use."
 msgstr ""
 
 #. type: item
 #: doc/guix.texi:10627
 #, no-wrap
+msgid "@code{rc-file} (default: @code{(file-append rottlog \"/etc/rc\")})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:10630
+msgid ""
+"The Rottlog configuration file to use (@pxref{Mandatory RC Variables,,, "
+"rottlog, GNU Rot[t]log Manual})."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:10631
+#, no-wrap
 msgid "@code{rotations} (default: @code{%default-rotations})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10629
+#: doc/guix.texi:10633
 msgid "A list of @code{log-rotation} objects as defined below."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10633
-msgid "This is a list of gexps where each gexp corresponds to an mcron job specification (@pxref{Scheduled Job Execution})."
+#: doc/guix.texi:10637
+msgid ""
+"This is a list of gexps where each gexp corresponds to an mcron job "
+"specification (@pxref{Scheduled Job Execution})."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:10636
+#: doc/guix.texi:10640
 #, no-wrap
 msgid "{Data Type} log-rotation"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:10638
+#: doc/guix.texi:10642
 msgid "Data type representing the rotation of a group of log files."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:10642
+#: doc/guix.texi:10646
 msgid ""
-"Taking an example from the Rottlog manual (@pxref{Period Related File Examples,,, rottlog, GNU Rot[t]log Manual}), a log rotation "
-"might be defined like this:"
+"Taking an example from the Rottlog manual (@pxref{Period Related File "
+"Examples,,, rottlog, GNU Rot[t]log Manual}), a log rotation might be defined "
+"like this:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:10651
+#: doc/guix.texi:10655
 #, no-wrap
 msgid ""
 "(log-rotation\n"
@@ -20196,294 +23630,433 @@ msgid ""
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:10654
+#: doc/guix.texi:10658
 msgid "The list of fields is as follows:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10656
+#: doc/guix.texi:10660
 #, no-wrap
 msgid "@code{frequency} (default: @code{'weekly})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10658
+#: doc/guix.texi:10662
 msgid "The log rotation frequency, a symbol."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:10659
+#: doc/guix.texi:10663
 #, no-wrap
 msgid "files"
 msgstr ""
 
-#. type: table
-#: doc/guix.texi:10661
-msgid "The list of files or file glob patterns to rotate."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:10662
-#, no-wrap
-msgid "@code{options} (default: @code{'()})"
-msgstr ""
-
 #. type: table
 #: doc/guix.texi:10665
-msgid "The list of rottlog options for this rotation (@pxref{Configuration parameters,,, rottlog, GNU Rot[t]lg Manual})."
+msgid "The list of files or file glob patterns to rotate."
 msgstr ""
 
 #. type: item
 #: doc/guix.texi:10666
 #, no-wrap
+msgid "@code{options} (default: @code{'()})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:10669
+msgid ""
+"The list of rottlog options for this rotation (@pxref{Configuration "
+"parameters,,, rottlog, GNU Rot[t]lg Manual})."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:10670
+#, no-wrap
 msgid "@code{post-rotate} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10668
+#: doc/guix.texi:10672
 msgid "Either @code{#f} or a gexp to execute once the rotation has completed."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:10671
+#: doc/guix.texi:10675
 #, no-wrap
 msgid "{Scheme Variable} %default-rotations"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:10674
-msgid "Specifies weekly rotation of @var{%rotated-files} and a couple of other files."
+#: doc/guix.texi:10678
+msgid ""
+"Specifies weekly rotation of @var{%rotated-files} and a couple of other "
+"files."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:10676
+#: doc/guix.texi:10680
 #, no-wrap
 msgid "{Scheme Variable} %rotated-files"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:10679
-msgid "The list of syslog-controlled files to be rotated.  By default it is: @code{'(\"/var/log/messages\" \"/var/log/secure\")}."
+#: doc/guix.texi:10683
+msgid ""
+"The list of syslog-controlled files to be rotated.  By default it is: "
+"@code{'(\"/var/log/messages\" \"/var/log/secure\")}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10686
-msgid "The @code{(gnu services networking)} module provides services to configure the network interface."
+#: doc/guix.texi:10690
+msgid ""
+"The @code{(gnu services networking)} module provides services to configure "
+"the network interface."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:10687
+#: doc/guix.texi:10691
 #, no-wrap
 msgid "DHCP, networking service"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:10688
+#: doc/guix.texi:10692
 #, no-wrap
 msgid "{Scheme Procedure} dhcp-client-service [#:dhcp @var{isc-dhcp}]"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:10691
+#: doc/guix.texi:10695
 msgid ""
-"Return a service that runs @var{dhcp}, a Dynamic Host Configuration Protocol (DHCP) client, on all the non-loopback network "
-"interfaces."
+"Return a service that runs @var{dhcp}, a Dynamic Host Configuration Protocol "
+"(DHCP) client, on all the non-loopback network interfaces."
+msgstr ""
+
+#. type: deffn
+#: doc/guix.texi:10697
+#, no-wrap
+msgid "{Scheme Procedure} dhcpd-service-type"
+msgstr ""
+
+#. type: deffn
+#: doc/guix.texi:10701
+msgid ""
+"This type defines a service that runs a DHCP daemon.  To create a service of "
+"this type, you must supply a @code{<dhcpd-configuration>}.  For example:"
+msgstr ""
+
+#. type: example
+#: doc/guix.texi:10707
+#, no-wrap
+msgid ""
+"(service dhcpd-service-type\n"
+"         (dhcpd-configuration\n"
+"          (config-file (local-file \"my-dhcpd.conf\"))\n"
+"          (interfaces '(\"enp0s25\"))))\n"
+msgstr ""
+
+#. type: deftp
+#: doc/guix.texi:10710
+#, no-wrap
+msgid "{Data Type} dhcpd-configuration"
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:10712
+#, no-wrap
+msgid "@code{package} (default: @code{isc-dhcp})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:10717
+msgid ""
+"The package that provides the DHCP daemon.  This package is expected to "
+"provide the daemon at @file{sbin/dhcpd} relative to its output directory.  "
+"The default package is the @uref{http://www.isc.org/products/DHCP, ISC's "
+"DHCP server}."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:10717 doc/guix.texi:14345
+#, no-wrap
+msgid "@code{config-file} (default: @code{#f})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:10722
+msgid ""
+"The configuration file to use.  This is required.  It will be passed to "
+"@code{dhcpd} via its @code{-cf} option.  This may be any ``file-like'' "
+"object (@pxref{G-Expressions, file-like objects}).  See @code{man dhcpd."
+"conf} for details on the configuration file syntax."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:10722
+#, no-wrap
+msgid "@code{version} (default: @code{\"4\"})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:10727
+msgid ""
+"The DHCP version to use.  The ISC DHCP server supports the values ``4'', "
+"``6'', and ``4o6''.  These correspond to the @code{dhcpd} program options "
+"@code{-4}, @code{-6}, and @code{-4o6}.  See @code{man dhcpd} for details."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:10727
+#, no-wrap
+msgid "@code{run-directory} (default: @code{\"/run/dhcpd\"})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:10730
+msgid ""
+"The run directory to use.  At service activation time, this directory will "
+"be created if it does not exist."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:10730
+#, no-wrap
+msgid "@code{pid-file} (default: @code{\"/run/dhcpd/dhcpd.pid\"})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:10733
+msgid ""
+"The PID file to use.  This corresponds to the @code{-pf} option of "
+"@code{dhcpd}.  See @code{man dhcpd} for details."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:10733
+#, no-wrap
+msgid "@code{interfaces} (default: @code{'()})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:10739
+msgid ""
+"The names of the network interfaces on which dhcpd should listen for "
+"broadcasts.  If this list is not empty, then its elements (which must be "
+"strings) will be appended to the @code{dhcpd} invocation when starting the "
+"daemon.  It may not be necessary to explicitly specify any interfaces here; "
+"see @code{man dhcpd} for details."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:10693
+#: doc/guix.texi:10742
 #, no-wrap
 msgid "{Scheme Variable} static-networking-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:10696
+#: doc/guix.texi:10745
 msgid "This is the type for statically-configured network interfaces."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:10698
+#: doc/guix.texi:10747
 #, no-wrap
 msgid "{Scheme Procedure} static-networking-service @var{interface} @var{ip} @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:10706
+#: doc/guix.texi:10755
 msgid ""
-"[#:netmask #f] [#:gateway #f] [#:name-servers @code{'()}] [#:requirement @code{'(udev)}] Return a service that starts "
-"@var{interface} with address @var{ip}.  If @var{netmask} is true, use it as the network mask.  If @var{gateway} is true, it must be "
-"a string specifying the default network gateway.  @var{requirement} can be used to declare a dependency on another service before "
-"configuring the interface."
+"[#:netmask #f] [#:gateway #f] [#:name-servers @code{'()}] [#:requirement "
+"@code{'(udev)}] Return a service that starts @var{interface} with address "
+"@var{ip}.  If @var{netmask} is true, use it as the network mask.  If "
+"@var{gateway} is true, it must be a string specifying the default network "
+"gateway.  @var{requirement} can be used to declare a dependency on another "
+"service before configuring the interface."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:10711
+#: doc/guix.texi:10760
 msgid ""
-"This procedure can be called several times, one for each network interface of interest.  Behind the scenes what it does is extend "
-"@code{static-networking-service-type} with additional network interfaces to handle."
+"This procedure can be called several times, one for each network interface "
+"of interest.  Behind the scenes what it does is extend @code{static-"
+"networking-service-type} with additional network interfaces to handle."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:10713
+#: doc/guix.texi:10762
 #, no-wrap
 msgid "wicd"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:10716
+#: doc/guix.texi:10765
 #, no-wrap
 msgid "network management"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:10717
+#: doc/guix.texi:10766
 #, no-wrap
 msgid "{Scheme Procedure} wicd-service [#:wicd @var{wicd}]"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:10720
+#: doc/guix.texi:10769
 msgid ""
-"Return a service that runs @url{https://launchpad.net/wicd,Wicd}, a network management daemon that aims to simplify wired and "
-"wireless networking."
+"Return a service that runs @url{https://launchpad.net/wicd,Wicd}, a network "
+"management daemon that aims to simplify wired and wireless networking."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:10725
+#: doc/guix.texi:10774
 msgid ""
-"This service adds the @var{wicd} package to the global profile, providing several commands to interact with the daemon and configure "
-"networking: @command{wicd-client}, a graphical user interface, and the @command{wicd-cli} and @command{wicd-curses} user interfaces."
+"This service adds the @var{wicd} package to the global profile, providing "
+"several commands to interact with the daemon and configure networking: "
+"@command{wicd-client}, a graphical user interface, and the @command{wicd-"
+"cli} and @command{wicd-curses} user interfaces."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:10727
+#: doc/guix.texi:10776
 #, no-wrap
 msgid "NetworkManager"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:10729
+#: doc/guix.texi:10778
 #, no-wrap
 msgid "{Scheme Variable} network-manager-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:10734
+#: doc/guix.texi:10783
 msgid ""
-"This is the service type for the @uref{https://wiki.gnome.org/Projects/NetworkManager, NetworkManager} service. The value for this "
-"service type is a @code{network-manager-configuration} record."
+"This is the service type for the @uref{https://wiki.gnome.org/Projects/"
+"NetworkManager, NetworkManager} service. The value for this service type is "
+"a @code{network-manager-configuration} record."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:10737
-msgid "This service is part of @code{%desktop-services} (@pxref{Desktop Services})."
+#: doc/guix.texi:10786
+msgid ""
+"This service is part of @code{%desktop-services} (@pxref{Desktop Services})."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:10739
+#: doc/guix.texi:10788
 #, no-wrap
 msgid "{Data Type} network-manager-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:10741
+#: doc/guix.texi:10790
 msgid "Data type representing the configuration of NetworkManager."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10743
+#: doc/guix.texi:10792
 #, no-wrap
 msgid "@code{network-manager} (default: @code{network-manager})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10745
+#: doc/guix.texi:10794
 msgid "The NetworkManager package to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10746
+#: doc/guix.texi:10795
 #, no-wrap
 msgid "@code{dns} (default: @code{\"default\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10749
-msgid "Processing mode for DNS, which affects how NetworkManager uses the @code{resolv.conf} configuration file."
+#: doc/guix.texi:10798
+msgid ""
+"Processing mode for DNS, which affects how NetworkManager uses the "
+"@code{resolv.conf} configuration file."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10751
+#: doc/guix.texi:10800
 #, no-wrap
 msgid "default"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10754
-msgid "NetworkManager will update @code{resolv.conf} to reflect the nameservers provided by currently active connections."
+#: doc/guix.texi:10803
+msgid ""
+"NetworkManager will update @code{resolv.conf} to reflect the nameservers "
+"provided by currently active connections."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10755
+#: doc/guix.texi:10804
 #, no-wrap
 msgid "dnsmasq"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10759
+#: doc/guix.texi:10808
 msgid ""
-"NetworkManager will run @code{dnsmasq} as a local caching nameserver, using a \"split DNS\" configuration if you are connected to a "
-"VPN, and then update @code{resolv.conf} to point to the local nameserver."
+"NetworkManager will run @code{dnsmasq} as a local caching nameserver, using "
+"a \"split DNS\" configuration if you are connected to a VPN, and then update "
+"@code{resolv.conf} to point to the local nameserver."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10760 doc/guix.texi:11746
+#: doc/guix.texi:10809 doc/guix.texi:11795
 #, no-wrap
 msgid "none"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10762
+#: doc/guix.texi:10811
 msgid "NetworkManager will not modify @code{resolv.conf}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10764
+#: doc/guix.texi:10813
 #, no-wrap
 msgid "@code{vpn-plugins} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10768
+#: doc/guix.texi:10817
 msgid ""
-"This is the list of available plugins for virtual private networks (VPNs).  An example of this is the @code{network-manager-openvpn} "
-"package, which allows NetworkManager to manage VPNs @i{via} OpenVPN."
+"This is the list of available plugins for virtual private networks (VPNs).  "
+"An example of this is the @code{network-manager-openvpn} package, which "
+"allows NetworkManager to manage VPNs @i{via} OpenVPN."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:10772
+#: doc/guix.texi:10821
 #, no-wrap
 msgid "Connman"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:10773
+#: doc/guix.texi:10822
 #, no-wrap
 msgid "{Scheme Variable} connman-service-type"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:10776
-msgid "This is the service type to run @url{https://01.org/connman,Connman}, a network connection manager."
+#: doc/guix.texi:10825
+msgid ""
+"This is the service type to run @url{https://01.org/connman,Connman}, a "
+"network connection manager."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:10779
-msgid "Its value must be an @code{connman-configuration} record as in this example:"
+#: doc/guix.texi:10828
+msgid ""
+"Its value must be an @code{connman-configuration} record as in this example:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:10784
+#: doc/guix.texi:10833
 #, no-wrap
 msgid ""
 "(service connman-service-type\n"
@@ -20492,69 +24065,73 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:10787
+#: doc/guix.texi:10836
 msgid "See below for details about @code{connman-configuration}."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:10789
+#: doc/guix.texi:10838
 #, no-wrap
 msgid "{Data Type} connman-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:10791
+#: doc/guix.texi:10840
 msgid "Data Type representing the configuration of connman."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10793
+#: doc/guix.texi:10842
 #, no-wrap
 msgid "@code{connman} (default: @var{connman})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10795
+#: doc/guix.texi:10844
 msgid "The connman package to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10796
+#: doc/guix.texi:10845
 #, no-wrap
 msgid "@code{disable-vpn?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10798
+#: doc/guix.texi:10847
 msgid "When true, enable connman's vpn plugin."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:10801
+#: doc/guix.texi:10850
 #, no-wrap
 msgid "WPA Supplicant"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:10802
+#: doc/guix.texi:10851
 #, no-wrap
 msgid "{Scheme Variable} wpa-supplicant-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:10807
+#: doc/guix.texi:10856
 msgid ""
-"This is the service type to run @url{https://w1.fi/wpa_supplicant/,WPA supplicant}, an authentication daemon required to "
-"authenticate against encrypted WiFi or ethernet networks.  It is configured to listen for requests on D-Bus."
+"This is the service type to run @url{https://w1.fi/wpa_supplicant/,WPA "
+"supplicant}, an authentication daemon required to authenticate against "
+"encrypted WiFi or ethernet networks.  It is configured to listen for "
+"requests on D-Bus."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:10810
-msgid "The value of this service is the @code{wpa-supplicant} package to use.  Thus, it can be instantiated like this:"
+#: doc/guix.texi:10859
+msgid ""
+"The value of this service is the @code{wpa-supplicant} package to use.  "
+"Thus, it can be instantiated like this:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:10813
+#: doc/guix.texi:10862
 #, no-wrap
 msgid ""
 "(use-modules (gnu services networking))\n"
@@ -20562,70 +24139,73 @@ msgid ""
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:10815
+#: doc/guix.texi:10864
 #, no-wrap
 msgid "(service wpa-supplicant-service-type)\n"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:10818
+#: doc/guix.texi:10867
 #, no-wrap
 msgid "NTP"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:10819
+#: doc/guix.texi:10868
 #, no-wrap
 msgid "real time clock"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:10820
+#: doc/guix.texi:10869
 #, no-wrap
 msgid "{Scheme Procedure} ntp-service [#:ntp @var{ntp}] @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:10828
+#: doc/guix.texi:10877
 msgid ""
-"[#:servers @var{%ntp-servers}] @ [#:allow-large-adjustment? #f] Return a service that runs the daemon from @var{ntp}, the "
-"@uref{http://www.ntp.org, Network Time Protocol package}.  The daemon will keep the system clock synchronized with that of "
-"@var{servers}.  @var{allow-large-adjustment?} determines whether @command{ntpd} is allowed to make an initial adjustment of more "
-"than 1,000 seconds."
+"[#:servers @var{%ntp-servers}] @ [#:allow-large-adjustment? #f] Return a "
+"service that runs the daemon from @var{ntp}, the @uref{http://www.ntp.org, "
+"Network Time Protocol package}.  The daemon will keep the system clock "
+"synchronized with that of @var{servers}.  @var{allow-large-adjustment?} "
+"determines whether @command{ntpd} is allowed to make an initial adjustment "
+"of more than 1,000 seconds."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:10830
+#: doc/guix.texi:10879
 #, no-wrap
 msgid "{Scheme Variable} %ntp-servers"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:10832
+#: doc/guix.texi:10881
 msgid "List of host names used as the default NTP servers."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:10834
+#: doc/guix.texi:10883
 #, no-wrap
 msgid "OpenNTPD"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:10835
+#: doc/guix.texi:10884
 #, no-wrap
 msgid "{Scheme Procedure} openntpd-service-type"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:10839
+#: doc/guix.texi:10888
 msgid ""
-"Run the @command{ntpd}, the Network Time Protocol (NTP) daemon, as implemented by @uref{http://www.openntpd.org, OpenNTPD}.  The "
-"daemon will keep the system clock synchronized with that of the given servers."
+"Run the @command{ntpd}, the Network Time Protocol (NTP) daemon, as "
+"implemented by @uref{http://www.openntpd.org, OpenNTPD}.  The daemon will "
+"keep the system clock synchronized with that of the given servers."
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:10849
+#: doc/guix.texi:10898
 #, no-wrap
 msgid ""
 "(service\n"
@@ -20640,146 +24220,162 @@ msgid ""
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:10853
+#: doc/guix.texi:10902
 #, no-wrap
 msgid "{Data Type} openntpd-configuration"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10855
+#: doc/guix.texi:10904
 #, no-wrap
 msgid "@code{openntpd} (default: @code{(file-append openntpd \"/sbin/ntpd\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10857
+#: doc/guix.texi:10906
 msgid "The openntpd executable to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10857
+#: doc/guix.texi:10906
 #, no-wrap
 msgid "@code{listen-on} (default: @code{'(\"127.0.0.1\" \"::1\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10859
-msgid "A list of local IP addresses or hostnames the ntpd daemon should listen on."
+#: doc/guix.texi:10908
+msgid ""
+"A list of local IP addresses or hostnames the ntpd daemon should listen on."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10859
+#: doc/guix.texi:10908
 #, no-wrap
 msgid "@code{query-from} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10861
-msgid "A list of local IP address the ntpd daemon should use for outgoing queries."
+#: doc/guix.texi:10910
+msgid ""
+"A list of local IP address the ntpd daemon should use for outgoing queries."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10861
+#: doc/guix.texi:10910
 #, no-wrap
 msgid "@code{sensor} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10866
+#: doc/guix.texi:10915
 msgid ""
-"Specify a list of timedelta sensor devices ntpd should use.  @code{ntpd} will listen to each sensor that acutally exists and ignore "
-"non-existant ones.  See @uref{https://man.openbsd.org/ntpd.conf, upstream documentation} for more information."
+"Specify a list of timedelta sensor devices ntpd should use.  @code{ntpd} "
+"will listen to each sensor that acutally exists and ignore non-existant "
+"ones.  See @uref{https://man.openbsd.org/ntpd.conf, upstream documentation} "
+"for more information."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10866
+#: doc/guix.texi:10915
 #, no-wrap
 msgid "@code{server} (default: @var{%ntp-servers})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10868
-msgid "Specify a list of IP addresses or hostnames of NTP servers to synchronize to."
+#: doc/guix.texi:10917
+msgid ""
+"Specify a list of IP addresses or hostnames of NTP servers to synchronize to."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10868
+#: doc/guix.texi:10917
 #, no-wrap
 msgid "@code{servers} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10870
-msgid "Specify a list of IP addresses or hostnames of NTP pools to synchronize to."
+#: doc/guix.texi:10919
+msgid ""
+"Specify a list of IP addresses or hostnames of NTP pools to synchronize to."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10870
+#: doc/guix.texi:10919
 #, no-wrap
 msgid "@code{constraint-from} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10877
+#: doc/guix.texi:10926
 msgid ""
-"@code{ntpd} can be configured to query the ‘Date’ from trusted HTTPS servers via TLS.  This time information is not used for "
-"precision but acts as an authenticated constraint, thereby reducing the impact of unauthenticated NTP man-in-the-middle attacks.  "
-"Specify a list of URLs, IP addresses or hostnames of HTTPS servers to provide a constraint."
+"@code{ntpd} can be configured to query the ‘Date’ from trusted HTTPS servers "
+"via TLS.  This time information is not used for precision but acts as an "
+"authenticated constraint, thereby reducing the impact of unauthenticated NTP "
+"man-in-the-middle attacks.  Specify a list of URLs, IP addresses or "
+"hostnames of HTTPS servers to provide a constraint."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10877
+#: doc/guix.texi:10926
 #, no-wrap
 msgid "@code{constraints-from} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10881
+#: doc/guix.texi:10930
 msgid ""
-"As with constraint from, specify a list of URLs, IP addresses or hostnames of HTTPS servers to provide a constraint.  Should the "
-"hostname resolve to multiple IP addresses, @code{ntpd} will calculate a median constraint from all of them."
+"As with constraint from, specify a list of URLs, IP addresses or hostnames "
+"of HTTPS servers to provide a constraint.  Should the hostname resolve to "
+"multiple IP addresses, @code{ntpd} will calculate a median constraint from "
+"all of them."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10881
+#: doc/guix.texi:10930
 #, no-wrap
 msgid "@code{allow-large-adjustment?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10884
-msgid "Determines if @code{ntpd} is allowed to make an initial adjustment of more than 180 seconds."
+#: doc/guix.texi:10933
+msgid ""
+"Determines if @code{ntpd} is allowed to make an initial adjustment of more "
+"than 180 seconds."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:10887
+#: doc/guix.texi:10936
 #, no-wrap
 msgid "inetd"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:10888
+#: doc/guix.texi:10937
 #, no-wrap
 msgid "{Scheme variable} inetd-service-type"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:10893
+#: doc/guix.texi:10942
 msgid ""
-"This service runs the @command{inetd} (@pxref{inetd invocation,,, inetutils, GNU Inetutils}) daemon.  @command{inetd} listens for "
-"connections on internet sockets, and lazily starts the specified server program when a connection is made on one of these sockets."
+"This service runs the @command{inetd} (@pxref{inetd invocation,,, inetutils, "
+"GNU Inetutils}) daemon.  @command{inetd} listens for connections on internet "
+"sockets, and lazily starts the specified server program when a connection is "
+"made on one of these sockets."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:10899
+#: doc/guix.texi:10948
 msgid ""
-"The value of this service is an @code{inetd-configuration} object.  The following example configures the @command{inetd} daemon to "
-"provide the built-in @command{echo} service, as well as an smtp service which forwards smtp traffic over ssh to a server @code{smtp-"
-"server} behind a gateway @code{hostname}:"
+"The value of this service is an @code{inetd-configuration} object.  The "
+"following example configures the @command{inetd} daemon to provide the built-"
+"in @command{echo} service, as well as an smtp service which forwards smtp "
+"traffic over ssh to a server @code{smtp-server} behind a gateway "
+"@code{hostname}:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:10922
+#: doc/guix.texi:10971
 #, no-wrap
 msgid ""
 "(service\n"
@@ -20806,183 +24402,201 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:10925
+#: doc/guix.texi:10974
 msgid "See below for more details about @code{inetd-configuration}."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:10927
+#: doc/guix.texi:10976
 #, no-wrap
 msgid "{Data Type} inetd-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:10929
+#: doc/guix.texi:10978
 msgid "Data type representing the configuration of @command{inetd}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10931
+#: doc/guix.texi:10980
 #, no-wrap
 msgid "@code{program} (default: @code{(file-append inetutils \"/libexec/inetd\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10933
+#: doc/guix.texi:10982
 msgid "The @command{inetd} executable to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10934 doc/guix.texi:16191
+#: doc/guix.texi:10983 doc/guix.texi:16240
 #, no-wrap
 msgid "@code{entries} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10937
-msgid "A list of @command{inetd} service entries.  Each entry should be created by the @code{inetd-entry} constructor."
+#: doc/guix.texi:10986
+msgid ""
+"A list of @command{inetd} service entries.  Each entry should be created by "
+"the @code{inetd-entry} constructor."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:10940
+#: doc/guix.texi:10989
 #, no-wrap
 msgid "{Data Type} inetd-entry"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:10944
+#: doc/guix.texi:10993
 msgid ""
-"Data type representing an entry in the @command{inetd} configuration.  Each entry corresponds to a socket where @command{inetd} will "
-"listen for requests."
+"Data type representing an entry in the @command{inetd} configuration.  Each "
+"entry corresponds to a socket where @command{inetd} will listen for requests."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10946
+#: doc/guix.texi:10995
 #, no-wrap
 msgid "@code{node} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10951
+#: doc/guix.texi:11000
 msgid ""
-"Optional string, a comma-separated list of local addresses @command{inetd} should use when listening for this service.  "
-"@xref{Configuration file,,, inetutils, GNU Inetutils} for a complete description of all options."
+"Optional string, a comma-separated list of local addresses @command{inetd} "
+"should use when listening for this service.  @xref{Configuration file,,, "
+"inetutils, GNU Inetutils} for a complete description of all options."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10953
+#: doc/guix.texi:11002
 msgid "A string, the name must correspond to an entry in @code{/etc/services}."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:10953
+#: doc/guix.texi:11002
 #, no-wrap
 msgid "socket-type"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10956
-msgid "One of @code{'stream}, @code{'dgram}, @code{'raw}, @code{'rdm} or @code{'seqpacket}."
+#: doc/guix.texi:11005
+msgid ""
+"One of @code{'stream}, @code{'dgram}, @code{'raw}, @code{'rdm} or "
+"@code{'seqpacket}."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:10956
+#: doc/guix.texi:11005
 #, no-wrap
 msgid "protocol"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10958
+#: doc/guix.texi:11007
 msgid "A string, must correspond to an entry in @code{/etc/protocols}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10958
+#: doc/guix.texi:11007
 #, no-wrap
 msgid "@code{wait?} (default: @code{#t})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10961
-msgid "Whether @command{inetd} should wait for the server to exit before listening to new service requests."
+#: doc/guix.texi:11010
+msgid ""
+"Whether @command{inetd} should wait for the server to exit before listening "
+"to new service requests."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10966
+#: doc/guix.texi:11015
 msgid ""
-"A string containing the user (and, optionally, group) name of the user as whom the server should run.  The group name can be "
-"specified in a suffix, separated by a colon or period, i.e. @code{\"user\"}, @code{\"user:group\"} or @code{\"user.group\"}."
+"A string containing the user (and, optionally, group) name of the user as "
+"whom the server should run.  The group name can be specified in a suffix, "
+"separated by a colon or period, i.e. @code{\"user\"}, @code{\"user:group\"} "
+"or @code{\"user.group\"}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10966
+#: doc/guix.texi:11015
 #, no-wrap
 msgid "@code{program} (default: @code{\"internal\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10969
-msgid "The server program which will serve the requests, or @code{\"internal\"} if @command{inetd} should use a built-in service."
+#: doc/guix.texi:11018
+msgid ""
+"The server program which will serve the requests, or @code{\"internal\"} if "
+"@command{inetd} should use a built-in service."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10974
+#: doc/guix.texi:11023
 msgid ""
-"A list strings or file-like objects, which are the server program's arguments, starting with the zeroth argument, i.e. the name of "
-"the program itself.  For @command{inetd}'s internal services, this entry must be @code{'()} or @code{'(\"internal\")}."
+"A list strings or file-like objects, which are the server program's "
+"arguments, starting with the zeroth argument, i.e. the name of the program "
+"itself.  For @command{inetd}'s internal services, this entry must be "
+"@code{'()} or @code{'(\"internal\")}."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:10978
-msgid "@xref{Configuration file,,, inetutils, GNU Inetutils} for a more detailed discussion of each configuration field."
+#: doc/guix.texi:11027
+msgid ""
+"@xref{Configuration file,,, inetutils, GNU Inetutils} for a more detailed "
+"discussion of each configuration field."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:10980
+#: doc/guix.texi:11029
 #, no-wrap
 msgid "Tor"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:10981
+#: doc/guix.texi:11030
 #, no-wrap
 msgid "{Scheme Procedure} tor-service [@var{config-file}] [#:tor @var{tor}]"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:10984
-msgid "Return a service to run the @uref{https://torproject.org, Tor} anonymous networking daemon."
+#: doc/guix.texi:11033
+msgid ""
+"Return a service to run the @uref{https://torproject.org, Tor} anonymous "
+"networking daemon."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:10989
+#: doc/guix.texi:11038
 msgid ""
-"The daemon runs as the @code{tor} unprivileged user.  It is passed @var{config-file}, a file-like object, with an additional "
-"@code{User tor} line and lines for hidden services added via @code{tor-hidden-service}.  Run @command{man tor} for information about "
-"the configuration file."
+"The daemon runs as the @code{tor} unprivileged user.  It is passed "
+"@var{config-file}, a file-like object, with an additional @code{User tor} "
+"line and lines for hidden services added via @code{tor-hidden-service}.  Run "
+"@command{man tor} for information about the configuration file."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:10991
+#: doc/guix.texi:11040
 #, no-wrap
 msgid "hidden service"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:10992
+#: doc/guix.texi:11041
 #, no-wrap
 msgid "{Scheme Procedure} tor-hidden-service @var{name} @var{mapping}"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:10995
+#: doc/guix.texi:11044
 msgid ""
-"Define a new Tor @dfn{hidden service} called @var{name} and implementing @var{mapping}.  @var{mapping} is a list of port/host "
-"tuples, such as:"
+"Define a new Tor @dfn{hidden service} called @var{name} and implementing "
+"@var{mapping}.  @var{mapping} is a list of port/host tuples, such as:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:10999
+#: doc/guix.texi:11048
 #, no-wrap
 msgid ""
 " '((22 \"127.0.0.1:22\")\n"
@@ -20990,312 +24604,330 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11003
-msgid "In this example, port 22 of the hidden service is mapped to local port 22, and port 80 is mapped to local port 8080."
-msgstr ""
-
-#. type: deffn
-#: doc/guix.texi:11007
+#: doc/guix.texi:11052
 msgid ""
-"This creates a @file{/var/lib/tor/hidden-services/@var{name}} directory, where the @file{hostname} file contains the @code{.onion} "
-"host name for the hidden service."
+"In this example, port 22 of the hidden service is mapped to local port 22, "
+"and port 80 is mapped to local port 8080."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11010
-msgid "See @uref{https://www.torproject.org/docs/tor-hidden-service.html.en, the Tor project's documentation} for more information."
+#: doc/guix.texi:11056
+msgid ""
+"This creates a @file{/var/lib/tor/hidden-services/@var{name}} directory, "
+"where the @file{hostname} file contains the @code{.onion} host name for the "
+"hidden service."
+msgstr ""
+
+#. type: deffn
+#: doc/guix.texi:11059
+msgid ""
+"See @uref{https://www.torproject.org/docs/tor-hidden-service.html.en, the "
+"Tor project's documentation} for more information."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:11013
+#: doc/guix.texi:11062
 msgid "The @code{(gnu services rsync)} module provides the following services:"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:11017
+#: doc/guix.texi:11066
 msgid ""
-"You might want an rsync daemon if you have files that you want available so anyone (or just yourself) can download existing files or "
-"upload new files."
+"You might want an rsync daemon if you have files that you want available so "
+"anyone (or just yourself) can download existing files or upload new files."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11018
+#: doc/guix.texi:11067
 #, no-wrap
 msgid "{Scheme Variable} rsync-service-type"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11021
+#: doc/guix.texi:11070
 msgid ""
-"This is the type for the @uref{https://rsync.samba.org, rsync} rsync daemon, @command{rsync-configuration} record as in this example:"
+"This is the type for the @uref{https://rsync.samba.org, rsync} rsync daemon, "
+"@command{rsync-configuration} record as in this example:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:11024
+#: doc/guix.texi:11073
 #, no-wrap
 msgid "(service rsync-service-type)\n"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11027
+#: doc/guix.texi:11076
 msgid "See below for details about @code{rsync-configuration}."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:11029
+#: doc/guix.texi:11078
 #, no-wrap
 msgid "{Data Type} rsync-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:11031
+#: doc/guix.texi:11080
 msgid "Data type representing the configuration for @code{rsync-service}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11033
+#: doc/guix.texi:11082
 #, no-wrap
 msgid "@code{package} (default: @var{rsync})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11035
+#: doc/guix.texi:11084
 msgid "@code{rsync} package to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11036
+#: doc/guix.texi:11085
 #, no-wrap
 msgid "@code{port-number} (default: @code{873})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11040
+#: doc/guix.texi:11089
 msgid ""
-"TCP port on which @command{rsync} listens for incoming connections.  If port is less than @code{1024} @command{rsync} needs to be "
-"started as the @code{root} user and group."
+"TCP port on which @command{rsync} listens for incoming connections.  If port "
+"is less than @code{1024} @command{rsync} needs to be started as the "
+"@code{root} user and group."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11041
+#: doc/guix.texi:11090
 #, no-wrap
 msgid "@code{pid-file} (default: @code{\"/var/run/rsyncd/rsyncd.pid\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11043
+#: doc/guix.texi:11092
 msgid "Name of the file where @command{rsync} writes its PID."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11044
+#: doc/guix.texi:11093
 #, no-wrap
 msgid "@code{lock-file} (default: @code{\"/var/run/rsyncd/rsyncd.lock\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11046
+#: doc/guix.texi:11095
 msgid "Name of the file where @command{rsync} writes its lock file."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11047
+#: doc/guix.texi:11096
 #, no-wrap
 msgid "@code{log-file} (default: @code{\"/var/log/rsyncd.log\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11049
+#: doc/guix.texi:11098
 msgid "Name of the file where @command{rsync} writes its log file."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11050
+#: doc/guix.texi:11099
 #, no-wrap
 msgid "@code{use-chroot?} (default: @var{#t})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11052
+#: doc/guix.texi:11101
 msgid "Whether to use chroot for @command{rsync} shared directory."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11053
+#: doc/guix.texi:11102
 #, no-wrap
 msgid "@code{share-path} (default: @file{/srv/rsync})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11055
+#: doc/guix.texi:11104
 msgid "Location of the @command{rsync} shared directory."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11056
+#: doc/guix.texi:11105
 #, no-wrap
 msgid "@code{share-comment} (default: @code{\"Rsync share\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11058
+#: doc/guix.texi:11107
 msgid "Comment of the @command{rsync} shared directory."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11059
+#: doc/guix.texi:11108
 #, no-wrap
 msgid "@code{read-only?} (default: @var{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11061
+#: doc/guix.texi:11110
 msgid "Read-write permissions to shared directory."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11062
+#: doc/guix.texi:11111
 #, no-wrap
 msgid "@code{timeout} (default: @code{300})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11064
+#: doc/guix.texi:11113
 msgid "I/O timeout in seconds."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11065
+#: doc/guix.texi:11114
 #, no-wrap
 msgid "@code{user} (default: @var{\"root\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11067
+#: doc/guix.texi:11116
 msgid "Owner of the @code{rsync} process."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11068
+#: doc/guix.texi:11117
 #, no-wrap
 msgid "@code{group} (default: @var{\"root\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11070
+#: doc/guix.texi:11119
 msgid "Group of the @code{rsync} process."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11071
+#: doc/guix.texi:11120
 #, no-wrap
 msgid "@code{uid} (default: @var{\"rsyncd\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11074
-msgid "User name or user ID that file transfers to and from that module should take place as when the daemon was run as @code{root}."
+#: doc/guix.texi:11123
+msgid ""
+"User name or user ID that file transfers to and from that module should take "
+"place as when the daemon was run as @code{root}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11075
+#: doc/guix.texi:11124
 #, no-wrap
 msgid "@code{gid} (default: @var{\"rsyncd\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11077
+#: doc/guix.texi:11126
 msgid "Group name or group ID that will be used when accessing the module."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:11082
+#: doc/guix.texi:11131
 msgid "Furthermore, @code{(gnu services ssh)} provides the following services."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:11082 doc/guix.texi:11121 doc/guix.texi:20729
+#: doc/guix.texi:11131 doc/guix.texi:11170 doc/guix.texi:20791
 #, no-wrap
 msgid "SSH"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:11083 doc/guix.texi:11122 doc/guix.texi:20730
+#: doc/guix.texi:11132 doc/guix.texi:11171 doc/guix.texi:20792
 #, no-wrap
 msgid "SSH server"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11085
+#: doc/guix.texi:11134
 #, no-wrap
 msgid "{Scheme Procedure} lsh-service [#:host-key \"/etc/lsh/host-key\"] @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11094
+#: doc/guix.texi:11143
 msgid ""
-"[#:daemonic? #t] [#:interfaces '()] [#:port-number 22] @ [#:allow-empty-passwords? #f] [#:root-login? #f] @ [#:syslog-output? #t] [#:"
-"x11-forwarding? #t] @ [#:tcp/ip-forwarding? #t] [#:password-authentication? #t] @ [#:public-key-authentication? #t] [#:initialize? "
-"#t] Run the @command{lshd} program from @var{lsh} to listen on port @var{port-number}.  @var{host-key} must designate a file "
-"containing the host key, and readable only by root."
+"[#:daemonic? #t] [#:interfaces '()] [#:port-number 22] @ [#:allow-empty-"
+"passwords? #f] [#:root-login? #f] @ [#:syslog-output? #t] [#:x11-forwarding? "
+"#t] @ [#:tcp/ip-forwarding? #t] [#:password-authentication? #t] @ [#:public-"
+"key-authentication? #t] [#:initialize? #t] Run the @command{lshd} program "
+"from @var{lsh} to listen on port @var{port-number}.  @var{host-key} must "
+"designate a file containing the host key, and readable only by root."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11100
+#: doc/guix.texi:11149
 msgid ""
-"When @var{daemonic?} is true, @command{lshd} will detach from the controlling terminal and log its output to syslogd, unless one "
-"sets @var{syslog-output?} to false.  Obviously, it also makes lsh-service depend on existence of syslogd service.  When @var{pid-"
-"file?} is true, @command{lshd} writes its PID to the file called @var{pid-file}."
+"When @var{daemonic?} is true, @command{lshd} will detach from the "
+"controlling terminal and log its output to syslogd, unless one sets "
+"@var{syslog-output?} to false.  Obviously, it also makes lsh-service depend "
+"on existence of syslogd service.  When @var{pid-file?} is true, "
+"@command{lshd} writes its PID to the file called @var{pid-file}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11104
+#: doc/guix.texi:11153
 msgid ""
-"When @var{initialize?} is true, automatically create the seed and host key upon service activation if they do not exist yet.  This "
-"may take long and require interaction."
+"When @var{initialize?} is true, automatically create the seed and host key "
+"upon service activation if they do not exist yet.  This may take long and "
+"require interaction."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11109
+#: doc/guix.texi:11158
 msgid ""
-"When @var{initialize?} is false, it is up to the user to initialize the randomness generator (@pxref{lsh-make-seed,,, lsh, LSH "
-"Manual}), and to create a key pair with the private key stored in file @var{host-key} (@pxref{lshd basics,,, lsh, LSH Manual})."
+"When @var{initialize?} is false, it is up to the user to initialize the "
+"randomness generator (@pxref{lsh-make-seed,,, lsh, LSH Manual}), and to "
+"create a key pair with the private key stored in file @var{host-key} "
+"(@pxref{lshd basics,,, lsh, LSH Manual})."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11113
+#: doc/guix.texi:11162
 msgid ""
-"When @var{interfaces} is empty, lshd listens for connections on all the network interfaces; otherwise, @var{interfaces} must be a "
-"list of host names or addresses."
+"When @var{interfaces} is empty, lshd listens for connections on all the "
+"network interfaces; otherwise, @var{interfaces} must be a list of host names "
+"or addresses."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11117
+#: doc/guix.texi:11166
 msgid ""
-"@var{allow-empty-passwords?} specifies whether to accept log-ins with empty passwords, and @var{root-login?} specifies whether to "
-"accept log-ins as root."
+"@var{allow-empty-passwords?} specifies whether to accept log-ins with empty "
+"passwords, and @var{root-login?} specifies whether to accept log-ins as root."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11119
+#: doc/guix.texi:11168
 msgid "The other options should be self-descriptive."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11123
+#: doc/guix.texi:11172
 #, no-wrap
 msgid "{Scheme Variable} openssh-service-type"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11127
+#: doc/guix.texi:11176
 msgid ""
-"This is the type for the @uref{http://www.openssh.org, OpenSSH} secure shell daemon, @command{sshd}.  Its value must be an "
-"@code{openssh-configuration} record as in this example:"
+"This is the type for the @uref{http://www.openssh.org, OpenSSH} secure shell "
+"daemon, @command{sshd}.  Its value must be an @code{openssh-configuration} "
+"record as in this example:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:11136
+#: doc/guix.texi:11185
 #, no-wrap
 msgid ""
 "(service openssh-service-type\n"
@@ -21308,17 +24940,18 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11139
+#: doc/guix.texi:11188
 msgid "See below for details about @code{openssh-configuration}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11142
-msgid "This service can be extended with extra authorized keys, as in this example:"
+#: doc/guix.texi:11191
+msgid ""
+"This service can be extended with extra authorized keys, as in this example:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:11147
+#: doc/guix.texi:11196
 #, no-wrap
 msgid ""
 "(service-extension openssh-service-type\n"
@@ -21327,172 +24960,188 @@ msgid ""
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:11150
+#: doc/guix.texi:11199
 #, no-wrap
 msgid "{Data Type} openssh-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:11152
+#: doc/guix.texi:11201
 msgid "This is the configuration record for OpenSSH's @command{sshd}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11154
+#: doc/guix.texi:11203
 #, no-wrap
 msgid "@code{pid-file} (default: @code{\"/var/run/sshd.pid\"})"
 msgstr ""
 
-#. type: table
-#: doc/guix.texi:11156
-msgid "Name of the file where @command{sshd} writes its PID."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:11157
-#, no-wrap
-msgid "@code{port-number} (default: @code{22})"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:11159
-msgid "TCP port on which @command{sshd} listens for incoming connections."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:11160
-#, no-wrap
-msgid "@code{permit-root-login} (default: @code{#f})"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:11165
-msgid ""
-"This field determines whether and when to allow logins as root.  If @code{#f}, root logins are disallowed; if @code{#t}, they are "
-"allowed.  If it's the symbol @code{'without-password}, then root logins are permitted but not with password-based authentication."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:11166 doc/guix.texi:11299
-#, no-wrap
-msgid "@code{allow-empty-passwords?} (default: @code{#f})"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:11169
-msgid "When true, users with empty passwords may log in.  When false, they may not."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:11170 doc/guix.texi:11302
-#, no-wrap
-msgid "@code{password-authentication?} (default: @code{#t})"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:11173
-msgid "When true, users may log in with their password.  When false, they have other authentication methods."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:11174
-#, no-wrap
-msgid "@code{public-key-authentication?} (default: @code{#t})"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:11177
-msgid "When true, users may log in using public key authentication.  When false, users have to use other authentication method."
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:11180
-msgid "Authorized public keys are stored in @file{~/.ssh/authorized_keys}.  This is used only by protocol version 2."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:11181
-#, no-wrap
-msgid "@code{x11-forwarding?} (default: @code{#f})"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:11185
-msgid ""
-"When true, forwarding of X11 graphical client connections is enabled---in other words, @command{ssh} options @option{-X} and "
-"@option{-Y} will work."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:11186
-#, no-wrap
-msgid "@code{challenge-response-authentication?} (default: @code{#f})"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:11189
-msgid "Specifies whether challenge response authentication is allowed (e.g. via PAM)."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:11190
-#, no-wrap
-msgid "@code{use-pam?} (default: @code{#t})"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:11196
-msgid ""
-"Enables the Pluggable Authentication Module interface.  If set to @code{#t}, this will enable PAM authentication using "
-"@code{challenge-response-authentication?} and @code{password-authentication?}, in addition to PAM account and session module "
-"processing for all authentication types."
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:11201
-msgid ""
-"Because PAM challenge response authentication usually serves an equivalent role to password authentication, you should disable "
-"either @code{challenge-response-authentication?} or @code{password-authentication?}."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:11202
-#, no-wrap
-msgid "@code{print-last-log?} (default: @code{#t})"
-msgstr ""
-
 #. type: table
 #: doc/guix.texi:11205
-msgid "Specifies whether @command{sshd} should print the date and time of the last user login when a user logs in interactively."
+msgid "Name of the file where @command{sshd} writes its PID."
 msgstr ""
 
 #. type: item
 #: doc/guix.texi:11206
 #, no-wrap
-msgid "@code{subsystems} (default: @code{'((\"sftp\" \"internal-sftp\"))})"
+msgid "@code{port-number} (default: @code{22})"
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:11208
+msgid "TCP port on which @command{sshd} listens for incoming connections."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:11209
+#, no-wrap
+msgid "@code{permit-root-login} (default: @code{#f})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:11214
+msgid ""
+"This field determines whether and when to allow logins as root.  If "
+"@code{#f}, root logins are disallowed; if @code{#t}, they are allowed.  If "
+"it's the symbol @code{'without-password}, then root logins are permitted but "
+"not with password-based authentication."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:11215 doc/guix.texi:11348
+#, no-wrap
+msgid "@code{allow-empty-passwords?} (default: @code{#f})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:11218
+msgid ""
+"When true, users with empty passwords may log in.  When false, they may not."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:11219 doc/guix.texi:11351
+#, no-wrap
+msgid "@code{password-authentication?} (default: @code{#t})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:11222
+msgid ""
+"When true, users may log in with their password.  When false, they have "
+"other authentication methods."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:11223
+#, no-wrap
+msgid "@code{public-key-authentication?} (default: @code{#t})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:11226
+msgid ""
+"When true, users may log in using public key authentication.  When false, "
+"users have to use other authentication method."
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:11229
+msgid ""
+"Authorized public keys are stored in @file{~/.ssh/authorized_keys}.  This is "
+"used only by protocol version 2."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:11230
+#, no-wrap
+msgid "@code{x11-forwarding?} (default: @code{#f})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:11234
+msgid ""
+"When true, forwarding of X11 graphical client connections is enabled---in "
+"other words, @command{ssh} options @option{-X} and @option{-Y} will work."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:11235
+#, no-wrap
+msgid "@code{challenge-response-authentication?} (default: @code{#f})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:11238
+msgid ""
+"Specifies whether challenge response authentication is allowed (e.g. via "
+"PAM)."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:11239
+#, no-wrap
+msgid "@code{use-pam?} (default: @code{#t})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:11245
+msgid ""
+"Enables the Pluggable Authentication Module interface.  If set to @code{#t}, "
+"this will enable PAM authentication using @code{challenge-response-"
+"authentication?} and @code{password-authentication?}, in addition to PAM "
+"account and session module processing for all authentication types."
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:11250
+msgid ""
+"Because PAM challenge response authentication usually serves an equivalent "
+"role to password authentication, you should disable either @code{challenge-"
+"response-authentication?} or @code{password-authentication?}."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:11251
+#, no-wrap
+msgid "@code{print-last-log?} (default: @code{#t})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:11254
+msgid ""
+"Specifies whether @command{sshd} should print the date and time of the last "
+"user login when a user logs in interactively."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:11255
+#, no-wrap
+msgid "@code{subsystems} (default: @code{'((\"sftp\" \"internal-sftp\"))})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:11257
 msgid "Configures external subsystems (e.g. file transfer daemon)."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11212
+#: doc/guix.texi:11261
 msgid ""
-"This is a list of two-element lists, each of which containing the subsystem name and a command (with optional arguments) to execute "
-"upon subsystem request."
+"This is a list of two-element lists, each of which containing the subsystem "
+"name and a command (with optional arguments) to execute upon subsystem "
+"request."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11215
+#: doc/guix.texi:11264
 msgid ""
-"The command @command{internal-sftp} implements an in-process SFTP server.  Alternately, one can specify the @command{sftp-server} "
-"command:"
+"The command @command{internal-sftp} implements an in-process SFTP server.  "
+"Alternately, one can specify the @command{sftp-server} command:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:11220
+#: doc/guix.texi:11269
 #, no-wrap
 msgid ""
 "(service openssh-service-type\n"
@@ -21502,30 +25151,34 @@ msgid ""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11222
+#: doc/guix.texi:11271
 #, no-wrap
 msgid "@code{accepted-environment} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11224
+#: doc/guix.texi:11273
 msgid "List of strings describing which environment variables may be exported."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11227
-msgid "Each string gets on its own line.  See the @code{AcceptEnv} option in @code{man sshd_config}."
+#: doc/guix.texi:11276
+msgid ""
+"Each string gets on its own line.  See the @code{AcceptEnv} option in "
+"@code{man sshd_config}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11232
+#: doc/guix.texi:11281
 msgid ""
-"This example allows ssh-clients to export the @code{COLORTERM} variable.  It is set by terminal emulators, which support colors.  "
-"You can use it in your shell's ressource file to enable colors for the prompt and commands if this variable is set."
+"This example allows ssh-clients to export the @code{COLORTERM} variable.  It "
+"is set by terminal emulators, which support colors.  You can use it in your "
+"shell's ressource file to enable colors for the prompt and commands if this "
+"variable is set."
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:11237
+#: doc/guix.texi:11286
 #, no-wrap
 msgid ""
 "(service openssh-service-type\n"
@@ -21534,32 +25187,33 @@ msgid ""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11239
+#: doc/guix.texi:11288
 #, no-wrap
 msgid "@code{authorized-keys} (default: @code{'()})"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:11240
+#: doc/guix.texi:11289
 #, no-wrap
 msgid "authorized keys, SSH"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:11241
+#: doc/guix.texi:11290
 #, no-wrap
 msgid "SSH authorized keys"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11245
+#: doc/guix.texi:11294
 msgid ""
-"This is the list of authorized keys.  Each element of the list is a user name followed by one or more file-like objects that "
-"represent SSH public keys.  For example:"
+"This is the list of authorized keys.  Each element of the list is a user "
+"name followed by one or more file-like objects that represent SSH public "
+"keys.  For example:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:11252
+#: doc/guix.texi:11301
 #, no-wrap
 msgid ""
 "(openssh-configuration\n"
@@ -21570,41 +25224,48 @@ msgid ""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11257
-msgid "registers the specified public keys for user accounts @code{rekado}, @code{chris}, and @code{root}."
+#: doc/guix.texi:11306
+msgid ""
+"registers the specified public keys for user accounts @code{rekado}, "
+"@code{chris}, and @code{root}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11260
-msgid "Additional authorized keys can be specified @i{via} @code{service-extension}."
+#: doc/guix.texi:11309
+msgid ""
+"Additional authorized keys can be specified @i{via} @code{service-extension}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11263
-msgid "Note that this does @emph{not} interfere with the use of @file{~/.ssh/authorized_keys}."
+#: doc/guix.texi:11312
+msgid ""
+"Note that this does @emph{not} interfere with the use of @file{~/.ssh/"
+"authorized_keys}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11266
+#: doc/guix.texi:11315
 #, no-wrap
 msgid "{Scheme Procedure} dropbear-service [@var{config}]"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11270
+#: doc/guix.texi:11319
 msgid ""
-"Run the @uref{https://matt.ucc.asn.au/dropbear/dropbear.html,Dropbear SSH daemon} with the given @var{config}, a @code{<dropbear-"
-"configuration>} object."
+"Run the @uref{https://matt.ucc.asn.au/dropbear/dropbear.html,Dropbear SSH "
+"daemon} with the given @var{config}, a @code{<dropbear-configuration>} "
+"object."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11273
+#: doc/guix.texi:11322
 msgid ""
-"For example, to specify a Dropbear service listening on port 1234, add this call to the operating system's @code{services} field:"
+"For example, to specify a Dropbear service listening on port 1234, add this "
+"call to the operating system's @code{services} field:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:11277
+#: doc/guix.texi:11326
 #, no-wrap
 msgid ""
 "(dropbear-service (dropbear-configuration\n"
@@ -21612,104 +25273,107 @@ msgid ""
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:11280
+#: doc/guix.texi:11329
 #, no-wrap
 msgid "{Data Type} dropbear-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:11282
+#: doc/guix.texi:11331
 msgid "This data type represents the configuration of a Dropbear SSH daemon."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11284
+#: doc/guix.texi:11333
 #, no-wrap
 msgid "@code{dropbear} (default: @var{dropbear})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11286
+#: doc/guix.texi:11335
 msgid "The Dropbear package to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11287
+#: doc/guix.texi:11336
 #, no-wrap
 msgid "@code{port-number} (default: 22)"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11289
+#: doc/guix.texi:11338
 msgid "The TCP port where the daemon waits for incoming connections."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11290
+#: doc/guix.texi:11339
 #, no-wrap
 msgid "@code{syslog-output?} (default: @code{#t})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11292
+#: doc/guix.texi:11341
 msgid "Whether to enable syslog output."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11293
+#: doc/guix.texi:11342
 #, no-wrap
 msgid "@code{pid-file} (default: @code{\"/var/run/dropbear.pid\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11295
+#: doc/guix.texi:11344
 msgid "File name of the daemon's PID file."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11296
+#: doc/guix.texi:11345
 #, no-wrap
 msgid "@code{root-login?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11298
+#: doc/guix.texi:11347
 msgid "Whether to allow @code{root} logins."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11301
+#: doc/guix.texi:11350
 msgid "Whether to allow empty passwords."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11304
+#: doc/guix.texi:11353
 msgid "Whether to enable password-based authentication."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:11307
+#: doc/guix.texi:11356
 #, no-wrap
 msgid "{Scheme Variable} %facebook-host-aliases"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:11313
+#: doc/guix.texi:11362
 msgid ""
-"This variable contains a string for use in @file{/etc/hosts} (@pxref{Host Names,,, libc, The GNU C Library Reference Manual}).  Each "
-"line contains a entry that maps a known server name of the Facebook on-line service---e.g., @code{www.facebook.com}---to the local "
-"host---@code{127.0.0.1} or its IPv6 equivalent, @code{::1}."
+"This variable contains a string for use in @file{/etc/hosts} (@pxref{Host "
+"Names,,, libc, The GNU C Library Reference Manual}).  Each line contains a "
+"entry that maps a known server name of the Facebook on-line service---e.g., "
+"@code{www.facebook.com}---to the local host---@code{127.0.0.1} or its IPv6 "
+"equivalent, @code{::1}."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:11317
+#: doc/guix.texi:11366
 msgid ""
-"This variable is typically used in the @code{hosts-file} field of an @code{operating-system} declaration (@pxref{operating-system "
-"Reference, @file{/etc/hosts}}):"
+"This variable is typically used in the @code{hosts-file} field of an "
+"@code{operating-system} declaration (@pxref{operating-system Reference, "
+"@file{/etc/hosts}}):"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:11320
+#: doc/guix.texi:11369
 #, no-wrap
 msgid ""
 "(use-modules (gnu) (guix))\n"
@@ -21717,7 +25381,7 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:11330
+#: doc/guix.texi:11379
 #, no-wrap
 msgid ""
 "(operating-system\n"
@@ -21732,662 +25396,688 @@ msgid ""
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:11334
-msgid "This mechanism can prevent programs running locally, such as Web browsers, from accessing Facebook."
+#: doc/guix.texi:11383
+msgid ""
+"This mechanism can prevent programs running locally, such as Web browsers, "
+"from accessing Facebook."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:11337
+#: doc/guix.texi:11386
 msgid "The @code{(gnu services avahi)} provides the following definition."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11338
+#: doc/guix.texi:11387
 #, no-wrap
 msgid "{Scheme Procedure} avahi-service [#:avahi @var{avahi}] @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11350
+#: doc/guix.texi:11399
 msgid ""
-"[#:host-name #f] [#:publish? #t] [#:ipv4? #t] @ [#:ipv6? #t] [#:wide-area? #f] @ [#:domains-to-browse '()] [#:debug? #f] Return a "
-"service that runs @command{avahi-daemon}, a system-wide mDNS/DNS-SD responder that allows for service discovery and \"zero-"
-"configuration\" host name lookups (see @uref{http://avahi.org/}), and extends the name service cache daemon (nscd) so that it can "
-"resolve @code{.local} host names using @uref{http://0pointer.de/lennart/projects/nss-mdns/, nss-mdns}.  Additionally, add the "
-"@var{avahi} package to the system profile so that commands such as @command{avahi-browse} are directly usable."
+"[#:host-name #f] [#:publish? #t] [#:ipv4? #t] @ [#:ipv6? #t] [#:wide-area? "
+"#f] @ [#:domains-to-browse '()] [#:debug? #f] Return a service that runs "
+"@command{avahi-daemon}, a system-wide mDNS/DNS-SD responder that allows for "
+"service discovery and \"zero-configuration\" host name lookups (see "
+"@uref{http://avahi.org/}), and extends the name service cache daemon (nscd) "
+"so that it can resolve @code{.local} host names using @uref{http://0pointer."
+"de/lennart/projects/nss-mdns/, nss-mdns}.  Additionally, add the @var{avahi} "
+"package to the system profile so that commands such as @command{avahi-"
+"browse} are directly usable."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11353
+#: doc/guix.texi:11402
 msgid ""
-"If @var{host-name} is different from @code{#f}, use that as the host name to publish for this machine; otherwise, use the machine's "
-"actual host name."
+"If @var{host-name} is different from @code{#f}, use that as the host name to "
+"publish for this machine; otherwise, use the machine's actual host name."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11357
+#: doc/guix.texi:11406
 msgid ""
-"When @var{publish?} is true, publishing of host names and services is allowed; in particular, avahi-daemon will publish the "
-"machine's host name and IP address via mDNS on the local network."
+"When @var{publish?} is true, publishing of host names and services is "
+"allowed; in particular, avahi-daemon will publish the machine's host name "
+"and IP address via mDNS on the local network."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11359
+#: doc/guix.texi:11408
 msgid "When @var{wide-area?} is true, DNS-SD over unicast DNS is enabled."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11362
-msgid "Boolean values @var{ipv4?} and @var{ipv6?} determine whether to use IPv4/IPv6 sockets."
+#: doc/guix.texi:11411
+msgid ""
+"Boolean values @var{ipv4?} and @var{ipv6?} determine whether to use IPv4/"
+"IPv6 sockets."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11364
+#: doc/guix.texi:11413
 #, no-wrap
 msgid "{Scheme Variable} openvswitch-service-type"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11368
+#: doc/guix.texi:11417
 msgid ""
-"This is the type of the @uref{http://www.openvswitch.org, Open vSwitch} service, whose value should be an @code{openvswitch-"
-"configuration} object."
+"This is the type of the @uref{http://www.openvswitch.org, Open vSwitch} "
+"service, whose value should be an @code{openvswitch-configuration} object."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:11370
+#: doc/guix.texi:11419
 #, no-wrap
 msgid "{Data Type} openvswitch-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:11374
+#: doc/guix.texi:11423
 msgid ""
-"Data type representing the configuration of Open vSwitch, a multilayer virtual switch which is designed to enable massive network "
-"automation through programmatic extension."
+"Data type representing the configuration of Open vSwitch, a multilayer "
+"virtual switch which is designed to enable massive network automation "
+"through programmatic extension."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11376
+#: doc/guix.texi:11425
 #, no-wrap
 msgid "@code{package} (default: @var{openvswitch})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11378
+#: doc/guix.texi:11427
 msgid "Package object of the Open vSwitch."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:11385
+#: doc/guix.texi:11434
 #, no-wrap
 msgid "X11"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:11386
+#: doc/guix.texi:11435
 #, no-wrap
 msgid "X Window System"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:11387 doc/guix.texi:11564
+#: doc/guix.texi:11436 doc/guix.texi:11613
 #, no-wrap
 msgid "login manager"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:11392
+#: doc/guix.texi:11441
 msgid ""
-"Support for the X Window graphical display system---specifically Xorg---is provided by the @code{(gnu services xorg)} module.  Note "
-"that there is no @code{xorg-service} procedure.  Instead, the X server is started by the @dfn{login manager}, by default SLiM."
+"Support for the X Window graphical display system---specifically Xorg---is "
+"provided by the @code{(gnu services xorg)} module.  Note that there is no "
+"@code{xorg-service} procedure.  Instead, the X server is started by the "
+"@dfn{login manager}, by default SLiM."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:11393
+#: doc/guix.texi:11442
 #, no-wrap
 msgid "window manager"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:11398
+#: doc/guix.texi:11447
 msgid ""
-"To use X11, you must install at least one @dfn{window manager}---for example the @code{windowmaker} or @code{openbox} packages---"
-"preferably by adding it to the @code{packages} field of your operating system definition (@pxref{operating-system Reference, system-"
-"wide packages})."
+"To use X11, you must install at least one @dfn{window manager}---for example "
+"the @code{windowmaker} or @code{openbox} packages---preferably by adding it "
+"to the @code{packages} field of your operating system definition "
+"(@pxref{operating-system Reference, system-wide packages})."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:11399
+#: doc/guix.texi:11448
 #, no-wrap
 msgid "{Scheme Variable} slim-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:11401
+#: doc/guix.texi:11450
 msgid "This is the type for the SLiM graphical login manager for X11."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:11402
+#: doc/guix.texi:11451
 #, no-wrap
 msgid "session types (X11)"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:11403
+#: doc/guix.texi:11452
 #, no-wrap
 msgid "X11 session types"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:11410
+#: doc/guix.texi:11459
 msgid ""
-"SLiM looks for @dfn{session types} described by the @file{.desktop} files in @file{/run/current-system/profile/share/xsessions} and "
-"allows users to choose a session from the log-in screen using @kbd{F1}.  Packages such as @code{xfce}, @code{sawfish}, and "
-"@code{ratpoison} provide @file{.desktop} files; adding them to the system-wide set of packages automatically makes them available at "
-"the log-in screen."
+"SLiM looks for @dfn{session types} described by the @file{.desktop} files in "
+"@file{/run/current-system/profile/share/xsessions} and allows users to "
+"choose a session from the log-in screen using @kbd{F1}.  Packages such as "
+"@code{xfce}, @code{sawfish}, and @code{ratpoison} provide @file{.desktop} "
+"files; adding them to the system-wide set of packages automatically makes "
+"them available at the log-in screen."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:11414
+#: doc/guix.texi:11463
 msgid ""
-"In addition, @file{~/.xsession} files are honored.  When available, @file{~/.xsession} must be an executable that starts a window "
-"manager and/or other X clients."
+"In addition, @file{~/.xsession} files are honored.  When available, @file{~/."
+"xsession} must be an executable that starts a window manager and/or other X "
+"clients."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:11416
+#: doc/guix.texi:11465
 #, no-wrap
 msgid "{Data Type} slim-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:11418
+#: doc/guix.texi:11467
 msgid "Data type representing the configuration of @code{slim-service-type}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11422
+#: doc/guix.texi:11471
 msgid "Whether to allow logins with empty passwords."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11423
+#: doc/guix.texi:11472
 #, no-wrap
 msgid "@code{auto-login?} (default: @code{#f})"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:11424
+#: doc/guix.texi:11473
 #, no-wrap
 msgid "@code{default-user} (default: @code{\"\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11426
+#: doc/guix.texi:11475
 msgid "When @code{auto-login?} is false, SLiM presents a log-in screen."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11429
-msgid "When @code{auto-login?} is true, SLiM logs in directly as @code{default-user}."
+#: doc/guix.texi:11478
+msgid ""
+"When @code{auto-login?} is true, SLiM logs in directly as @code{default-"
+"user}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11430
+#: doc/guix.texi:11479
 #, no-wrap
 msgid "@code{theme} (default: @code{%default-slim-theme})"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:11431
+#: doc/guix.texi:11480
 #, no-wrap
 msgid "@code{theme-name} (default: @code{%default-slim-theme-name})"
 msgstr ""
 
-#. type: table
-#: doc/guix.texi:11433
-msgid "The graphical theme to use and its name."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:11434
-#, no-wrap
-msgid "@code{auto-login-session} (default: @code{#f})"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:11437
-msgid ""
-"If true, this must be the name of the executable to start as the default session---e.g., @code{(file-append windowmaker \"/bin/"
-"windowmaker\")}."
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:11441
-msgid ""
-"If false, a session described by one of the available @file{.desktop} files in @code{/run/current-system/profile} and @code{~/.guix-"
-"profile} will be used."
-msgstr ""
-
-#. type: quotation
-#: doc/guix.texi:11446
-msgid ""
-"You must install at least one window manager in the system profile or in your user profile.  Failing to do that, if @code{auto-login-"
-"session} is false, you will be unable to log in."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:11448
-#, no-wrap
-msgid "@code{startx} (default: @code{(xorg-start-command)})"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:11450
-msgid "The command used to start the X11 graphical server."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:11451
-#, no-wrap
-msgid "@code{xauth} (default: @code{xauth})"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:11453
-msgid "The XAuth package to use."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:11454
-#, no-wrap
-msgid "@code{shepherd} (default: @code{shepherd})"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:11457
-msgid "The Shepherd package used when invoking @command{halt} and @command{reboot}."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:11458
-#, no-wrap
-msgid "@code{sessreg} (default: @code{sessreg})"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:11460
-msgid "The sessreg package used in order to register the session."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:11461
-#, no-wrap
-msgid "@code{slim} (default: @code{slim})"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:11463
-msgid "The SLiM package to use."
-msgstr ""
-
-#. type: defvr
-#: doc/guix.texi:11466 doc/guix.texi:20226
-#, no-wrap
-msgid "{Scheme Variable} %default-theme"
-msgstr ""
-
-#. type: defvrx
-#: doc/guix.texi:11467
-#, no-wrap
-msgid "{Scheme Variable} %default-theme-name"
-msgstr ""
-
-#. type: defvr
-#: doc/guix.texi:11469
-msgid "The default SLiM theme and its name."
-msgstr ""
-
-#. type: deftp
-#: doc/guix.texi:11472
-#, no-wrap
-msgid "{Data Type} sddm-configuration"
-msgstr ""
-
-#. type: deftp
-#: doc/guix.texi:11474
-msgid "This is the data type representing the sddm service configuration."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:11476
-#, no-wrap
-msgid "@code{display-server} (default: \"x11\")"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:11479
-msgid "Select display server to use for the greeter. Valid values are \"x11\" or \"wayland\"."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:11480
-#, no-wrap
-msgid "@code{numlock} (default: \"on\")"
-msgstr ""
-
 #. type: table
 #: doc/guix.texi:11482
-msgid "Valid values are \"on\", \"off\" or \"none\"."
+msgid "The graphical theme to use and its name."
 msgstr ""
 
 #. type: item
 #: doc/guix.texi:11483
 #, no-wrap
-msgid "@code{halt-command} (default @code{#~(string-apppend #$shepherd \"/sbin/halt\")})"
+msgid "@code{auto-login-session} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11485
-msgid "Command to run when halting."
-msgstr ""
-
-#. type: item
 #: doc/guix.texi:11486
-#, no-wrap
-msgid "@code{reboot-command} (default @code{#~(string-append #$shepherd \"/sbin/reboot\")})"
+msgid ""
+"If true, this must be the name of the executable to start as the default "
+"session---e.g., @code{(file-append windowmaker \"/bin/windowmaker\")}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11488
-msgid "Command to run when rebooting."
+#: doc/guix.texi:11490
+msgid ""
+"If false, a session described by one of the available @file{.desktop} files "
+"in @code{/run/current-system/profile} and @code{~/.guix-profile} will be "
+"used."
 msgstr ""
 
-#. type: item
-#: doc/guix.texi:11489
-#, no-wrap
-msgid "@code{theme} (default \"maldives\")"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:11491
-msgid "Theme to use. Default themes provided by SDDM are \"elarun\" or \"maldives\"."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:11492
-#, no-wrap
-msgid "@code{themes-directory} (default \"/run/current-system/profile/share/sddm/themes\")"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:11494
-msgid "Directory to look for themes."
-msgstr ""
-
-#. type: item
+#. type: quotation
 #: doc/guix.texi:11495
-#, no-wrap
-msgid "@code{faces-directory} (default \"/run/current-system/profile/share/sddm/faces\")"
+msgid ""
+"You must install at least one window manager in the system profile or in "
+"your user profile.  Failing to do that, if @code{auto-login-session} is "
+"false, you will be unable to log in."
 msgstr ""
 
-#. type: table
+#. type: item
 #: doc/guix.texi:11497
-msgid "Directory to look for faces."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:11498
 #, no-wrap
-msgid "@code{default-path} (default \"/run/current-system/profile/bin\")"
+msgid "@code{startx} (default: @code{(xorg-start-command)})"
 msgstr ""
 
 #. type: table
+#: doc/guix.texi:11499
+msgid "The command used to start the X11 graphical server."
+msgstr ""
+
+#. type: item
 #: doc/guix.texi:11500
-msgid "Default PATH to use."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:11501
 #, no-wrap
-msgid "@code{minimum-uid} (default 1000)"
+msgid "@code{xauth} (default: @code{xauth})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11503
-msgid "Minimum UID to display in SDDM."
+#: doc/guix.texi:11502
+msgid "The XAuth package to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11504
+#: doc/guix.texi:11503
 #, no-wrap
-msgid "@code{maximum-uid} (default 2000)"
+msgid "@code{shepherd} (default: @code{shepherd})"
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:11506
-msgid "Maximum UID to display in SDDM"
+msgid ""
+"The Shepherd package used when invoking @command{halt} and @command{reboot}."
 msgstr ""
 
 #. type: item
 #: doc/guix.texi:11507
 #, no-wrap
-msgid "@code{remember-last-user?} (default #t)"
+msgid "@code{sessreg} (default: @code{sessreg})"
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:11509
-msgid "Remember last user."
+msgid "The sessreg package used in order to register the session."
 msgstr ""
 
 #. type: item
 #: doc/guix.texi:11510
 #, no-wrap
-msgid "@code{remember-last-session?} (default #t)"
+msgid "@code{slim} (default: @code{slim})"
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:11512
-msgid "Remember last session."
+msgid "The SLiM package to use."
 msgstr ""
 
-#. type: item
-#: doc/guix.texi:11513
+#. type: defvr
+#: doc/guix.texi:11515 doc/guix.texi:20288
 #, no-wrap
-msgid "@code{hide-users} (default \"\")"
+msgid "{Scheme Variable} %default-theme"
 msgstr ""
 
-#. type: table
-#: doc/guix.texi:11515
-msgid "Usernames to hide from SDDM greeter."
-msgstr ""
-
-#. type: item
+#. type: defvrx
 #: doc/guix.texi:11516
 #, no-wrap
-msgid "@code{hide-shells} (default @code{#~(string-append #$shadow \"/sbin/nologin\")})"
+msgid "{Scheme Variable} %default-theme-name"
 msgstr ""
 
-#. type: table
+#. type: defvr
 #: doc/guix.texi:11518
-msgid "Users with shells listed will be hidden from the SDDM greeter."
+msgid "The default SLiM theme and its name."
 msgstr ""
 
-#. type: item
-#: doc/guix.texi:11519
-#, no-wrap
-msgid "@code{session-command} (default @code{#~(string-append #$sddm \"/share/sddm/scripts/wayland-session\")})"
-msgstr ""
-
-#. type: table
+#. type: deftp
 #: doc/guix.texi:11521
-msgid "Script to run before starting a wayland session."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:11522
 #, no-wrap
-msgid "@code{sessions-directory} (default \"/run/current-system/profile/share/wayland-sessions\")"
+msgid "{Data Type} sddm-configuration"
 msgstr ""
 
-#. type: table
-#: doc/guix.texi:11524
-msgid "Directory to look for desktop files starting wayland sessions."
+#. type: deftp
+#: doc/guix.texi:11523
+msgid "This is the data type representing the sddm service configuration."
 msgstr ""
 
 #. type: item
 #: doc/guix.texi:11525
 #, no-wrap
+msgid "@code{display-server} (default: \"x11\")"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:11528
+msgid ""
+"Select display server to use for the greeter. Valid values are \"x11\" or "
+"\"wayland\"."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:11529
+#, no-wrap
+msgid "@code{numlock} (default: \"on\")"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:11531
+msgid "Valid values are \"on\", \"off\" or \"none\"."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:11532
+#, no-wrap
+msgid "@code{halt-command} (default @code{#~(string-apppend #$shepherd \"/sbin/halt\")})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:11534
+msgid "Command to run when halting."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:11535
+#, no-wrap
+msgid "@code{reboot-command} (default @code{#~(string-append #$shepherd \"/sbin/reboot\")})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:11537
+msgid "Command to run when rebooting."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:11538
+#, no-wrap
+msgid "@code{theme} (default \"maldives\")"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:11540
+msgid ""
+"Theme to use. Default themes provided by SDDM are \"elarun\" or \"maldives\"."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:11541
+#, no-wrap
+msgid "@code{themes-directory} (default \"/run/current-system/profile/share/sddm/themes\")"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:11543
+msgid "Directory to look for themes."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:11544
+#, no-wrap
+msgid "@code{faces-directory} (default \"/run/current-system/profile/share/sddm/faces\")"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:11546
+msgid "Directory to look for faces."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:11547
+#, no-wrap
+msgid "@code{default-path} (default \"/run/current-system/profile/bin\")"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:11549
+msgid "Default PATH to use."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:11550
+#, no-wrap
+msgid "@code{minimum-uid} (default 1000)"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:11552
+msgid "Minimum UID to display in SDDM."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:11553
+#, no-wrap
+msgid "@code{maximum-uid} (default 2000)"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:11555
+msgid "Maximum UID to display in SDDM"
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:11556
+#, no-wrap
+msgid "@code{remember-last-user?} (default #t)"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:11558
+msgid "Remember last user."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:11559
+#, no-wrap
+msgid "@code{remember-last-session?} (default #t)"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:11561
+msgid "Remember last session."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:11562
+#, no-wrap
+msgid "@code{hide-users} (default \"\")"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:11564
+msgid "Usernames to hide from SDDM greeter."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:11565
+#, no-wrap
+msgid "@code{hide-shells} (default @code{#~(string-append #$shadow \"/sbin/nologin\")})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:11567
+msgid "Users with shells listed will be hidden from the SDDM greeter."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:11568
+#, no-wrap
+msgid "@code{session-command} (default @code{#~(string-append #$sddm \"/share/sddm/scripts/wayland-session\")})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:11570
+msgid "Script to run before starting a wayland session."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:11571
+#, no-wrap
+msgid "@code{sessions-directory} (default \"/run/current-system/profile/share/wayland-sessions\")"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:11573
+msgid "Directory to look for desktop files starting wayland sessions."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:11574
+#, no-wrap
 msgid "@code{xorg-server-path} (default @code{xorg-start-command})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11527
+#: doc/guix.texi:11576
 msgid "Path to xorg-server."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11528
+#: doc/guix.texi:11577
 #, no-wrap
 msgid "@code{xauth-path} (default @code{#~(string-append #$xauth \"/bin/xauth\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11530
+#: doc/guix.texi:11579
 msgid "Path to xauth."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11531
+#: doc/guix.texi:11580
 #, no-wrap
 msgid "@code{xephyr-path} (default @code{#~(string-append #$xorg-server \"/bin/Xephyr\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11533
+#: doc/guix.texi:11582
 msgid "Path to Xephyr."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11534
+#: doc/guix.texi:11583
 #, no-wrap
 msgid "@code{xdisplay-start} (default @code{#~(string-append #$sddm \"/share/sddm/scripts/Xsetup\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11536
+#: doc/guix.texi:11585
 msgid "Script to run after starting xorg-server."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11537
+#: doc/guix.texi:11586
 #, no-wrap
 msgid "@code{xdisplay-stop} (default @code{#~(string-append #$sddm \"/share/sddm/scripts/Xstop\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11539
+#: doc/guix.texi:11588
 msgid "Script to run before stopping xorg-server."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11540
+#: doc/guix.texi:11589
 #, no-wrap
 msgid "@code{xsession-command} (default: @code{xinitr })"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11542
+#: doc/guix.texi:11591
 msgid "Script to run before starting a X session."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11543
+#: doc/guix.texi:11592
 #, no-wrap
 msgid "@code{xsessions-directory} (default: \"/run/current-system/profile/share/xsessions\")"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11545
+#: doc/guix.texi:11594
 msgid "Directory to look for desktop files starting X sessions."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11546
+#: doc/guix.texi:11595
 #, no-wrap
 msgid "@code{minimum-vt} (default: 7)"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11548
+#: doc/guix.texi:11597
 msgid "Minimum VT to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11549
+#: doc/guix.texi:11598
 #, no-wrap
 msgid "@code{xserver-arguments} (default \"-nolisten tcp\")"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11551
+#: doc/guix.texi:11600
 msgid "Arguments to pass to xorg-server."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11552
+#: doc/guix.texi:11601
 #, no-wrap
 msgid "@code{auto-login-user} (default \"\")"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11554
+#: doc/guix.texi:11603
 msgid "User to use for auto-login."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11555
+#: doc/guix.texi:11604
 #, no-wrap
 msgid "@code{auto-login-session} (default \"\")"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11557
+#: doc/guix.texi:11606
 msgid "Desktop file to use for auto-login."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11558
+#: doc/guix.texi:11607
 #, no-wrap
 msgid "@code{relogin?} (default #f)"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11560
+#: doc/guix.texi:11609
 msgid "Relogin after logout."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:11565
+#: doc/guix.texi:11614
 #, no-wrap
 msgid "X11 login"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11566
+#: doc/guix.texi:11615
 #, no-wrap
 msgid "{Scheme Procedure} sddm-service config"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11569
-msgid "Return a service that spawns the SDDM graphical login manager for config of type @code{<sddm-configuration>}."
+#: doc/guix.texi:11618
+msgid ""
+"Return a service that spawns the SDDM graphical login manager for config of "
+"type @code{<sddm-configuration>}."
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:11574
+#: doc/guix.texi:11623
 #, no-wrap
 msgid ""
 "  (sddm-service (sddm-configuration\n"
@@ -22396,141 +26086,155 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11577
+#: doc/guix.texi:11626
 #, no-wrap
 msgid "{Scheme Procedure} xorg-start-command [#:guile] @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11586
+#: doc/guix.texi:11635
 msgid ""
-"[#:modules %default-xorg-modules] @ [#:fonts %default-xorg-fonts] @ [#:configuration-file (xorg-configuration-file @dots{})] @ [#:"
-"xorg-server @var{xorg-server}] Return a @code{startx} script in which @var{modules}, a list of X module packages, and @var{fonts}, a "
-"list of X font directories, are available.  See @code{xorg-wrapper} for more details on the arguments.  The result should be used in "
-"place of @code{startx}."
+"[#:modules %default-xorg-modules] @ [#:fonts %default-xorg-fonts] @ [#:"
+"configuration-file (xorg-configuration-file @dots{})] @ [#:xorg-server "
+"@var{xorg-server}] Return a @code{startx} script in which @var{modules}, a "
+"list of X module packages, and @var{fonts}, a list of X font directories, "
+"are available.  See @code{xorg-wrapper} for more details on the arguments.  "
+"The result should be used in place of @code{startx}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11588
+#: doc/guix.texi:11637
 msgid "Usually the X server is started by a login manager."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11590
+#: doc/guix.texi:11639
 #, no-wrap
 msgid "{Scheme Procedure} xorg-configuration-file @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11596
+#: doc/guix.texi:11645
 msgid ""
-"[#:modules %default-xorg-modules] @ [#:fonts %default-xorg-fonts] @ [#:drivers '()] [#:resolutions '()] [#:extra-config '()] Return "
-"a configuration file for the Xorg server containing search paths for all the common drivers."
+"[#:modules %default-xorg-modules] @ [#:fonts %default-xorg-fonts] @ [#:"
+"drivers '()] [#:resolutions '()] [#:extra-config '()] Return a configuration "
+"file for the Xorg server containing search paths for all the common drivers."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11601
+#: doc/guix.texi:11650
 msgid ""
-"@var{modules} must be a list of @dfn{module packages} loaded by the Xorg server---e.g., @code{xf86-video-vesa}, @code{xf86-input-"
-"keyboard}, and so on.  @var{fonts} must be a list of font directories to add to the server's @dfn{font path}."
+"@var{modules} must be a list of @dfn{module packages} loaded by the Xorg "
+"server---e.g., @code{xf86-video-vesa}, @code{xf86-input-keyboard}, and so "
+"on.  @var{fonts} must be a list of font directories to add to the server's "
+"@dfn{font path}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11605
+#: doc/guix.texi:11654
 msgid ""
-"@var{drivers} must be either the empty list, in which case Xorg chooses a graphics driver automatically, or a list of driver names "
-"that will be tried in this order---e.g., @code{(\"modesetting\" \"vesa\")}."
+"@var{drivers} must be either the empty list, in which case Xorg chooses a "
+"graphics driver automatically, or a list of driver names that will be tried "
+"in this order---e.g., @code{(\"modesetting\" \"vesa\")}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11609
+#: doc/guix.texi:11658
 msgid ""
-"Likewise, when @var{resolutions} is the empty list, Xorg chooses an appropriate screen resolution; otherwise, it must be a list of "
-"resolutions---e.g., @code{((1024 768) (640 480))}."
+"Likewise, when @var{resolutions} is the empty list, Xorg chooses an "
+"appropriate screen resolution; otherwise, it must be a list of resolutions---"
+"e.g., @code{((1024 768) (640 480))}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11613
+#: doc/guix.texi:11662
 msgid ""
-"Last, @var{extra-config} is a list of strings or objects appended to the configuration file.  It is used to pass extra text to be "
-"added verbatim to the configuration file."
+"Last, @var{extra-config} is a list of strings or objects appended to the "
+"configuration file.  It is used to pass extra text to be added verbatim to "
+"the configuration file."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11615
+#: doc/guix.texi:11664
 #, no-wrap
 msgid "{Scheme Procedure} screen-locker-service @var{package} [@var{program}]"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11619
+#: doc/guix.texi:11668
 msgid ""
-"Add @var{package}, a package for a screen locker or screen saver whose command is @var{program}, to the set of setuid programs and "
-"add a PAM entry for it.  For example:"
+"Add @var{package}, a package for a screen locker or screen saver whose "
+"command is @var{program}, to the set of setuid programs and add a PAM entry "
+"for it.  For example:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:11622
+#: doc/guix.texi:11671
 #, no-wrap
 msgid "(screen-locker-service xlockmore \"xlock\")\n"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11625
+#: doc/guix.texi:11674
 msgid "makes the good ol' XlockMore usable."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:11631
+#: doc/guix.texi:11680
 #, no-wrap
 msgid "printer support with CUPS"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:11635
+#: doc/guix.texi:11684
 msgid ""
-"The @code{(gnu services cups)} module provides a Guix service definition for the CUPS printing service.  To add printer support to a "
-"GuixSD system, add a @code{cups-service} to the operating system definition:"
+"The @code{(gnu services cups)} module provides a Guix service definition for "
+"the CUPS printing service.  To add printer support to a GuixSD system, add a "
+"@code{cups-service} to the operating system definition:"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11636
+#: doc/guix.texi:11685
 #, no-wrap
 msgid "{Scheme Variable} cups-service-type"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11640
+#: doc/guix.texi:11689
 msgid ""
-"The service type for the CUPS print server.  Its value should be a valid CUPS configuration (see below).  To use the default "
-"settings, simply write:"
+"The service type for the CUPS print server.  Its value should be a valid "
+"CUPS configuration (see below).  To use the default settings, simply write:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:11642
+#: doc/guix.texi:11691
 #, no-wrap
 msgid "(service cups-service-type)\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:11652
+#: doc/guix.texi:11701
 msgid ""
-"The CUPS configuration controls the basic things about your CUPS installation: what interfaces it listens on, what to do if a print "
-"job fails, how much logging to do, and so on.  To actually add a printer, you have to visit the @url{http://localhost:631} URL, or "
-"use a tool such as GNOME's printer configuration services.  By default, configuring a CUPS service will generate a self-signed "
-"certificate if needed, for secure connections to the print server."
+"The CUPS configuration controls the basic things about your CUPS "
+"installation: what interfaces it listens on, what to do if a print job "
+"fails, how much logging to do, and so on.  To actually add a printer, you "
+"have to visit the @url{http://localhost:631} URL, or use a tool such as "
+"GNOME's printer configuration services.  By default, configuring a CUPS "
+"service will generate a self-signed certificate if needed, for secure "
+"connections to the print server."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:11657
+#: doc/guix.texi:11706
 msgid ""
-"Suppose you want to enable the Web interface of CUPS and also add support for Epson printers @i{via} the @code{escpr} package and "
-"for HP printers @i{via} the @code{hplip} package.  You can do that directly, like this (you need to use the @code{(gnu packages "
-"cups)} module):"
+"Suppose you want to enable the Web interface of CUPS and also add support "
+"for Epson printers @i{via} the @code{escpr} package and for HP printers "
+"@i{via} the @code{hplip} package.  You can do that directly, like this (you "
+"need to use the @code{(gnu packages cups)} module):"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:11664
+#: doc/guix.texi:11713
 #, no-wrap
 msgid ""
 "(service cups-service-type\n"
@@ -22541,1603 +26245,1758 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:11672
+#: doc/guix.texi:11721
 msgid ""
-"The available configuration parameters follow.  Each parameter definition is preceded by its type; for example, @samp{string-list "
-"foo} indicates that the @code{foo} parameter should be specified as a list of strings.  There is also a way to specify the "
-"configuration as a string, if you have an old @code{cupsd.conf} file that you want to port over from some other system; see the end "
-"for more details."
+"The available configuration parameters follow.  Each parameter definition is "
+"preceded by its type; for example, @samp{string-list foo} indicates that the "
+"@code{foo} parameter should be specified as a list of strings.  There is "
+"also a way to specify the configuration as a string, if you have an old "
+"@code{cupsd.conf} file that you want to port over from some other system; "
+"see the end for more details."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:11683
+#: doc/guix.texi:11732
 msgid "Available @code{cups-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11684
+#: doc/guix.texi:11733
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} package cups"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11686 doc/guix.texi:12443
+#: doc/guix.texi:11735 doc/guix.texi:12492
 msgid "The CUPS package."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11688
+#: doc/guix.texi:11737
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} package-list extensions"
 msgstr ""
 
-#. type: deftypevr
-#: doc/guix.texi:11690
-msgid "Drivers and other extensions to the CUPS package."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:11692
-#, no-wrap
-msgid "{@code{cups-configuration} parameter} files-configuration files-configuration"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:11695
-msgid ""
-"Configuration of where to write logs, what directories to use for print spools, and related privileged configuration parameters."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:11697
-msgid "Available @code{files-configuration} fields are:"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:11698
-#, no-wrap
-msgid "{@code{files-configuration} parameter} log-location access-log"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:11706
-msgid ""
-"Defines the access log filename.  Specifying a blank filename disables access log generation.  The value @code{stderr} causes log "
-"entries to be sent to the standard error file when the scheduler is running in the foreground, or to the system log daemon when run "
-"in the background.  The value @code{syslog} causes log entries to be sent to the system log daemon.  The server name may be included "
-"in filenames using the string @code{%s}, as in @code{/var/log/cups/%s-access_log}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:11708
-msgid "Defaults to @samp{\"/var/log/cups/access_log\"}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:11710
-#, no-wrap
-msgid "{@code{files-configuration} parameter} file-name cache-dir"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:11712
-msgid "Where CUPS should cache data."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:11714
-msgid "Defaults to @samp{\"/var/cache/cups\"}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:11716
-#, no-wrap
-msgid "{@code{files-configuration} parameter} string config-file-perm"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:11719
-msgid "Specifies the permissions for all configuration files that the scheduler writes."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:11725
-msgid ""
-"Note that the permissions for the printers.conf file are currently masked to only allow access from the scheduler user (typically "
-"root).  This is done because printer device URIs sometimes contain sensitive authentication information that should not be generally "
-"known on the system.  There is no way to disable this security feature."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:11727
-msgid "Defaults to @samp{\"0640\"}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:11729
-#, no-wrap
-msgid "{@code{files-configuration} parameter} log-location error-log"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:11737
-msgid ""
-"Defines the error log filename.  Specifying a blank filename disables access log generation.  The value @code{stderr} causes log "
-"entries to be sent to the standard error file when the scheduler is running in the foreground, or to the system log daemon when run "
-"in the background.  The value @code{syslog} causes log entries to be sent to the system log daemon.  The server name may be included "
-"in filenames using the string @code{%s}, as in @code{/var/log/cups/%s-error_log}."
-msgstr ""
-
 #. type: deftypevr
 #: doc/guix.texi:11739
-msgid "Defaults to @samp{\"/var/log/cups/error_log\"}."
+msgid "Drivers and other extensions to the CUPS package."
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:11741
 #, no-wrap
-msgid "{@code{files-configuration} parameter} string fatal-errors"
+msgid "{@code{cups-configuration} parameter} files-configuration files-configuration"
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:11744
-msgid "Specifies which errors are fatal, causing the scheduler to exit.  The kind strings are:"
+msgid ""
+"Configuration of where to write logs, what directories to use for print "
+"spools, and related privileged configuration parameters."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:11746
+msgid "Available @code{files-configuration} fields are:"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:11747
+#, no-wrap
+msgid "{@code{files-configuration} parameter} log-location access-log"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:11755
+msgid ""
+"Defines the access log filename.  Specifying a blank filename disables "
+"access log generation.  The value @code{stderr} causes log entries to be "
+"sent to the standard error file when the scheduler is running in the "
+"foreground, or to the system log daemon when run in the background.  The "
+"value @code{syslog} causes log entries to be sent to the system log daemon.  "
+"The server name may be included in filenames using the string @code{%s}, as "
+"in @code{/var/log/cups/%s-access_log}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:11757
+msgid "Defaults to @samp{\"/var/log/cups/access_log\"}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:11759
+#, no-wrap
+msgid "{@code{files-configuration} parameter} file-name cache-dir"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:11761
+msgid "Where CUPS should cache data."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:11763
+msgid "Defaults to @samp{\"/var/cache/cups\"}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:11765
+#, no-wrap
+msgid "{@code{files-configuration} parameter} string config-file-perm"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:11768
+msgid ""
+"Specifies the permissions for all configuration files that the scheduler "
+"writes."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:11774
+msgid ""
+"Note that the permissions for the printers.conf file are currently masked to "
+"only allow access from the scheduler user (typically root).  This is done "
+"because printer device URIs sometimes contain sensitive authentication "
+"information that should not be generally known on the system.  There is no "
+"way to disable this security feature."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:11776
+msgid "Defaults to @samp{\"0640\"}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:11778
+#, no-wrap
+msgid "{@code{files-configuration} parameter} log-location error-log"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:11786
+msgid ""
+"Defines the error log filename.  Specifying a blank filename disables access "
+"log generation.  The value @code{stderr} causes log entries to be sent to "
+"the standard error file when the scheduler is running in the foreground, or "
+"to the system log daemon when run in the background.  The value "
+"@code{syslog} causes log entries to be sent to the system log daemon.  The "
+"server name may be included in filenames using the string @code{%s}, as in "
+"@code{/var/log/cups/%s-error_log}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:11788
+msgid "Defaults to @samp{\"/var/log/cups/error_log\"}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:11790
+#, no-wrap
+msgid "{@code{files-configuration} parameter} string fatal-errors"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:11793
+msgid ""
+"Specifies which errors are fatal, causing the scheduler to exit.  The kind "
+"strings are:"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11748
+#: doc/guix.texi:11797
 msgid "No errors are fatal."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11751
+#: doc/guix.texi:11800
 msgid "All of the errors below are fatal."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11752
+#: doc/guix.texi:11801
 #, no-wrap
 msgid "browse"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11755
-msgid "Browsing initialization errors are fatal, for example failed connections to the DNS-SD daemon."
+#: doc/guix.texi:11804
+msgid ""
+"Browsing initialization errors are fatal, for example failed connections to "
+"the DNS-SD daemon."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11756
+#: doc/guix.texi:11805
 #, no-wrap
 msgid "config"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11758
+#: doc/guix.texi:11807
 msgid "Configuration file syntax errors are fatal."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11759
+#: doc/guix.texi:11808
 #, no-wrap
 msgid "listen"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11762
-msgid "Listen or Port errors are fatal, except for IPv6 failures on the loopback or @code{any} addresses."
+#: doc/guix.texi:11811
+msgid ""
+"Listen or Port errors are fatal, except for IPv6 failures on the loopback or "
+"@code{any} addresses."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11763
+#: doc/guix.texi:11812
 #, no-wrap
 msgid "log"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11765
+#: doc/guix.texi:11814
 msgid "Log file creation or write errors are fatal."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11766
+#: doc/guix.texi:11815
 #, no-wrap
 msgid "permissions"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11769
-msgid "Bad startup file permissions are fatal, for example shared TLS certificate and key files with world-read permissions."
+#: doc/guix.texi:11818
+msgid ""
+"Bad startup file permissions are fatal, for example shared TLS certificate "
+"and key files with world-read permissions."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11772
+#: doc/guix.texi:11821
 msgid "Defaults to @samp{\"all -browse\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11774
+#: doc/guix.texi:11823
 #, no-wrap
 msgid "{@code{files-configuration} parameter} boolean file-device?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11777
+#: doc/guix.texi:11826
 msgid ""
-"Specifies whether the file pseudo-device can be used for new printer queues.  The URI @uref{file:///dev/null} is always allowed."
+"Specifies whether the file pseudo-device can be used for new printer "
+"queues.  The URI @uref{file:///dev/null} is always allowed."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11779 doc/guix.texi:11849 doc/guix.texi:11885 doc/guix.texi:11897 doc/guix.texi:11903 doc/guix.texi:11919
-#: doc/guix.texi:12007 doc/guix.texi:12101 doc/guix.texi:12417 doc/guix.texi:12430 doc/guix.texi:16557 doc/guix.texi:16571
-#: doc/guix.texi:16693 doc/guix.texi:16714 doc/guix.texi:16735 doc/guix.texi:16742 doc/guix.texi:16787 doc/guix.texi:16794
-#: doc/guix.texi:17197 doc/guix.texi:17211 doc/guix.texi:17383 doc/guix.texi:17428 doc/guix.texi:17515 doc/guix.texi:17644
-#: doc/guix.texi:17677 doc/guix.texi:17817 doc/guix.texi:17828 doc/guix.texi:18078 doc/guix.texi:18717 doc/guix.texi:18726
-#: doc/guix.texi:18734 doc/guix.texi:18742 doc/guix.texi:18758 doc/guix.texi:18774 doc/guix.texi:18782 doc/guix.texi:18790
-#: doc/guix.texi:18799 doc/guix.texi:18808 doc/guix.texi:18824 doc/guix.texi:18888 doc/guix.texi:18994 doc/guix.texi:19002
-#: doc/guix.texi:19010 doc/guix.texi:19026 doc/guix.texi:19080 doc/guix.texi:19128 doc/guix.texi:19281 doc/guix.texi:19289
-#: doc/guix.texi:19297 doc/guix.texi:19305 doc/guix.texi:19313 doc/guix.texi:19321 doc/guix.texi:19329 doc/guix.texi:19336
+#: doc/guix.texi:11828 doc/guix.texi:11898 doc/guix.texi:11934
+#: doc/guix.texi:11946 doc/guix.texi:11952 doc/guix.texi:11968
+#: doc/guix.texi:12056 doc/guix.texi:12150 doc/guix.texi:12466
+#: doc/guix.texi:12479 doc/guix.texi:16606 doc/guix.texi:16620
+#: doc/guix.texi:16742 doc/guix.texi:16763 doc/guix.texi:16784
+#: doc/guix.texi:16791 doc/guix.texi:16836 doc/guix.texi:16843
+#: doc/guix.texi:17246 doc/guix.texi:17260 doc/guix.texi:17432
+#: doc/guix.texi:17477 doc/guix.texi:17564 doc/guix.texi:17693
+#: doc/guix.texi:17726 doc/guix.texi:17866 doc/guix.texi:17877
+#: doc/guix.texi:18127 doc/guix.texi:18769 doc/guix.texi:18778
+#: doc/guix.texi:18786 doc/guix.texi:18794 doc/guix.texi:18810
+#: doc/guix.texi:18826 doc/guix.texi:18834 doc/guix.texi:18842
+#: doc/guix.texi:18851 doc/guix.texi:18860 doc/guix.texi:18876
+#: doc/guix.texi:18940 doc/guix.texi:19046 doc/guix.texi:19054
+#: doc/guix.texi:19062 doc/guix.texi:19087 doc/guix.texi:19141
+#: doc/guix.texi:19189 doc/guix.texi:19342 doc/guix.texi:19350
+#: doc/guix.texi:19358 doc/guix.texi:19366 doc/guix.texi:19374
+#: doc/guix.texi:19382 doc/guix.texi:19390 doc/guix.texi:19397
 msgid "Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11781
+#: doc/guix.texi:11830
 #, no-wrap
 msgid "{@code{files-configuration} parameter} string group"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11784
-msgid "Specifies the group name or ID that will be used when executing external programs."
+#: doc/guix.texi:11833
+msgid ""
+"Specifies the group name or ID that will be used when executing external "
+"programs."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11786 doc/guix.texi:11866
+#: doc/guix.texi:11835 doc/guix.texi:11915
 msgid "Defaults to @samp{\"lp\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11788
+#: doc/guix.texi:11837
 #, no-wrap
 msgid "{@code{files-configuration} parameter} string log-file-perm"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11790
+#: doc/guix.texi:11839
 msgid "Specifies the permissions for all log files that the scheduler writes."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11792
+#: doc/guix.texi:11841
 msgid "Defaults to @samp{\"0644\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11794
+#: doc/guix.texi:11843
 #, no-wrap
 msgid "{@code{files-configuration} parameter} log-location page-log"
 msgstr ""
 
-#. type: deftypevr
-#: doc/guix.texi:11802
-msgid ""
-"Defines the page log filename.  Specifying a blank filename disables access log generation.  The value @code{stderr} causes log "
-"entries to be sent to the standard error file when the scheduler is running in the foreground, or to the system log daemon when run "
-"in the background.  The value @code{syslog} causes log entries to be sent to the system log daemon.  The server name may be included "
-"in filenames using the string @code{%s}, as in @code{/var/log/cups/%s-page_log}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:11804
-msgid "Defaults to @samp{\"/var/log/cups/page_log\"}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:11806
-#, no-wrap
-msgid "{@code{files-configuration} parameter} string remote-root"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:11809
-msgid ""
-"Specifies the username that is associated with unauthenticated accesses by clients claiming to be the root user.  The default is "
-"@code{remroot}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:11811
-msgid "Defaults to @samp{\"remroot\"}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:11813
-#, no-wrap
-msgid "{@code{files-configuration} parameter} file-name request-root"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:11816
-msgid "Specifies the directory that contains print jobs and other HTTP request data."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:11818
-msgid "Defaults to @samp{\"/var/spool/cups\"}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:11820
-#, no-wrap
-msgid "{@code{files-configuration} parameter} sandboxing sandboxing"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:11825
-msgid ""
-"Specifies the level of security sandboxing that is applied to print filters, backends, and other child processes of the scheduler; "
-"either @code{relaxed} or @code{strict}.  This directive is currently only used/supported on macOS."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:11827
-msgid "Defaults to @samp{strict}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:11829
-#, no-wrap
-msgid "{@code{files-configuration} parameter} file-name server-keychain"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:11834
-msgid ""
-"Specifies the location of TLS certificates and private keys.  CUPS will look for public and private keys in this directory: a @code{."
-"crt} files for PEM-encoded certificates and corresponding @code{.key} files for PEM-encoded private keys."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:11836
-msgid "Defaults to @samp{\"/etc/cups/ssl\"}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:11838
-#, no-wrap
-msgid "{@code{files-configuration} parameter} file-name server-root"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:11840
-msgid "Specifies the directory containing the server configuration files."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:11842
-msgid "Defaults to @samp{\"/etc/cups\"}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:11844
-#, no-wrap
-msgid "{@code{files-configuration} parameter} boolean sync-on-close?"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:11847
-msgid "Specifies whether the scheduler calls fsync(2) after writing configuration or state files."
-msgstr ""
-
 #. type: deftypevr
 #: doc/guix.texi:11851
-#, no-wrap
-msgid "{@code{files-configuration} parameter} space-separated-string-list system-group"
+msgid ""
+"Defines the page log filename.  Specifying a blank filename disables access "
+"log generation.  The value @code{stderr} causes log entries to be sent to "
+"the standard error file when the scheduler is running in the foreground, or "
+"to the system log daemon when run in the background.  The value "
+"@code{syslog} causes log entries to be sent to the system log daemon.  The "
+"server name may be included in filenames using the string @code{%s}, as in "
+"@code{/var/log/cups/%s-page_log}."
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:11853
-msgid "Specifies the group(s) to use for @code{@@SYSTEM} group authentication."
+msgid "Defaults to @samp{\"/var/log/cups/page_log\"}."
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:11855
 #, no-wrap
-msgid "{@code{files-configuration} parameter} file-name temp-dir"
+msgid "{@code{files-configuration} parameter} string remote-root"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11857
-msgid "Specifies the directory where temporary files are stored."
+#: doc/guix.texi:11858
+msgid ""
+"Specifies the username that is associated with unauthenticated accesses by "
+"clients claiming to be the root user.  The default is @code{remroot}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11859
-msgid "Defaults to @samp{\"/var/spool/cups/tmp\"}."
+#: doc/guix.texi:11860
+msgid "Defaults to @samp{\"remroot\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11861
+#: doc/guix.texi:11862
 #, no-wrap
-msgid "{@code{files-configuration} parameter} string user"
+msgid "{@code{files-configuration} parameter} file-name request-root"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11864
-msgid "Specifies the user name or ID that is used when running external programs."
+#: doc/guix.texi:11865
+msgid ""
+"Specifies the directory that contains print jobs and other HTTP request data."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:11867
+msgid "Defaults to @samp{\"/var/spool/cups\"}."
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:11869
 #, no-wrap
-msgid "{@code{cups-configuration} parameter} access-log-level access-log-level"
+msgid "{@code{files-configuration} parameter} sandboxing sandboxing"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:11874
+msgid ""
+"Specifies the level of security sandboxing that is applied to print filters, "
+"backends, and other child processes of the scheduler; either @code{relaxed} "
+"or @code{strict}.  This directive is currently only used/supported on macOS."
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:11876
-msgid ""
-"Specifies the logging level for the AccessLog file.  The @code{config} level logs when printers and classes are added, deleted, or "
-"modified and when configuration files are accessed or updated.  The @code{actions} level logs when print jobs are submitted, held, "
-"released, modified, or canceled, and any of the conditions for @code{config}.  The @code{all} level logs all requests."
+msgid "Defaults to @samp{strict}."
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:11878
-msgid "Defaults to @samp{actions}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:11880
 #, no-wrap
-msgid "{@code{cups-configuration} parameter} boolean auto-purge-jobs?"
+msgid "{@code{files-configuration} parameter} file-name server-keychain"
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:11883
-msgid "Specifies whether to purge job history data automatically when it is no longer required for quotas."
+msgid ""
+"Specifies the location of TLS certificates and private keys.  CUPS will look "
+"for public and private keys in this directory: a @code{.crt} files for PEM-"
+"encoded certificates and corresponding @code{.key} files for PEM-encoded "
+"private keys."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:11885
+msgid "Defaults to @samp{\"/etc/cups/ssl\"}."
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:11887
 #, no-wrap
-msgid "{@code{cups-configuration} parameter} browse-local-protocols browse-local-protocols"
+msgid "{@code{files-configuration} parameter} file-name server-root"
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:11889
-msgid "Specifies which protocols to use for local printer sharing."
+msgid "Specifies the directory containing the server configuration files."
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:11891
-msgid "Defaults to @samp{dnssd}."
+msgid "Defaults to @samp{\"/etc/cups\"}."
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:11893
 #, no-wrap
-msgid "{@code{cups-configuration} parameter} boolean browse-web-if?"
+msgid "{@code{files-configuration} parameter} boolean sync-on-close?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11895
-msgid "Specifies whether the CUPS web interface is advertised."
+#: doc/guix.texi:11896
+msgid ""
+"Specifies whether the scheduler calls fsync(2) after writing configuration "
+"or state files."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11899
+#: doc/guix.texi:11900
 #, no-wrap
-msgid "{@code{cups-configuration} parameter} boolean browsing?"
+msgid "{@code{files-configuration} parameter} space-separated-string-list system-group"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11901
-msgid "Specifies whether shared printers are advertised."
+#: doc/guix.texi:11902
+msgid "Specifies the group(s) to use for @code{@@SYSTEM} group authentication."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11905
+#: doc/guix.texi:11904
 #, no-wrap
-msgid "{@code{cups-configuration} parameter} string classification"
+msgid "{@code{files-configuration} parameter} file-name temp-dir"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:11906
+msgid "Specifies the directory where temporary files are stored."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:11908
+msgid "Defaults to @samp{\"/var/spool/cups/tmp\"}."
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:11910
-msgid ""
-"Specifies the security classification of the server.  Any valid banner name can be used, including \"classified\", \"confidential\", "
-"\"secret\", \"topsecret\", and \"unclassified\", or the banner can be omitted to disable secure printing functions."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:11912 doc/guix.texi:12249 doc/guix.texi:13608 doc/guix.texi:13620 doc/guix.texi:17783 doc/guix.texi:17791
-#: doc/guix.texi:17799 doc/guix.texi:17807 doc/guix.texi:18085 doc/guix.texi:18560 doc/guix.texi:18568 doc/guix.texi:18576
-#: doc/guix.texi:18684 doc/guix.texi:18709 doc/guix.texi:18840 doc/guix.texi:18848 doc/guix.texi:18856 doc/guix.texi:18864
-#: doc/guix.texi:18872 doc/guix.texi:18880 doc/guix.texi:18903 doc/guix.texi:18911 doc/guix.texi:18963 doc/guix.texi:18979
-#: doc/guix.texi:18987 doc/guix.texi:19017 doc/guix.texi:19040 doc/guix.texi:19062 doc/guix.texi:19069 doc/guix.texi:19104
-#: doc/guix.texi:19112 doc/guix.texi:19136 doc/guix.texi:19168 doc/guix.texi:19197 doc/guix.texi:19204 doc/guix.texi:19211
-#: doc/guix.texi:19219 doc/guix.texi:19233 doc/guix.texi:19242 doc/guix.texi:19252 doc/guix.texi:19259 doc/guix.texi:19266
-#: doc/guix.texi:19273 doc/guix.texi:19344 doc/guix.texi:19351 doc/guix.texi:19358 doc/guix.texi:19367 doc/guix.texi:19383
-#: doc/guix.texi:19390 doc/guix.texi:19397 doc/guix.texi:19404 doc/guix.texi:19412 doc/guix.texi:19420
-msgid "Defaults to @samp{\"\"}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:11914
 #, no-wrap
-msgid "{@code{cups-configuration} parameter} boolean classify-override?"
+msgid "{@code{files-configuration} parameter} string user"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11917
+#: doc/guix.texi:11913
 msgid ""
-"Specifies whether users may override the classification (cover page) of individual print jobs using the @code{job-sheets} option."
+"Specifies the user name or ID that is used when running external programs."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11921
+#: doc/guix.texi:11918
 #, no-wrap
-msgid "{@code{cups-configuration} parameter} default-auth-type default-auth-type"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:11923
-msgid "Specifies the default type of authentication to use."
+msgid "{@code{cups-configuration} parameter} access-log-level access-log-level"
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:11925
-msgid "Defaults to @samp{Basic}."
+msgid ""
+"Specifies the logging level for the AccessLog file.  The @code{config} level "
+"logs when printers and classes are added, deleted, or modified and when "
+"configuration files are accessed or updated.  The @code{actions} level logs "
+"when print jobs are submitted, held, released, modified, or canceled, and "
+"any of the conditions for @code{config}.  The @code{all} level logs all "
+"requests."
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:11927
-#, no-wrap
-msgid "{@code{cups-configuration} parameter} default-encryption default-encryption"
+msgid "Defaults to @samp{actions}."
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:11929
-msgid "Specifies whether encryption will be used for authenticated requests."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:11931
-msgid "Defaults to @samp{Required}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:11933
 #, no-wrap
-msgid "{@code{cups-configuration} parameter} string default-language"
+msgid "{@code{cups-configuration} parameter} boolean auto-purge-jobs?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11935
-msgid "Specifies the default language to use for text and web content."
+#: doc/guix.texi:11932
+msgid ""
+"Specifies whether to purge job history data automatically when it is no "
+"longer required for quotas."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11937
-msgid "Defaults to @samp{\"en\"}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:11939
+#: doc/guix.texi:11936
 #, no-wrap
-msgid "{@code{cups-configuration} parameter} string default-paper-size"
+msgid "{@code{cups-configuration} parameter} browse-local-protocols browse-local-protocols"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:11938
+msgid "Specifies which protocols to use for local printer sharing."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:11940
+msgid "Defaults to @samp{dnssd}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:11942
+#, no-wrap
+msgid "{@code{cups-configuration} parameter} boolean browse-web-if?"
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:11944
-msgid ""
-"Specifies the default paper size for new print queues.  @samp{\"Auto\"} uses a locale-specific default, while @samp{\"None\"} "
-"specifies there is no default paper size.  Specific size names are typically @samp{\"Letter\"} or @samp{\"A4\"}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:11946
-msgid "Defaults to @samp{\"Auto\"}."
+msgid "Specifies whether the CUPS web interface is advertised."
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:11948
 #, no-wrap
-msgid "{@code{cups-configuration} parameter} string default-policy"
+msgid "{@code{cups-configuration} parameter} boolean browsing?"
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:11950
-msgid "Specifies the default access policy to use."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:11952
-msgid "Defaults to @samp{\"default\"}."
+msgid "Specifies whether shared printers are advertised."
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:11954
 #, no-wrap
-msgid "{@code{cups-configuration} parameter} boolean default-shared?"
+msgid "{@code{cups-configuration} parameter} string classification"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11956
-msgid "Specifies whether local printers are shared by default."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:11958 doc/guix.texi:12038 doc/guix.texi:12334 doc/guix.texi:16527 doc/guix.texi:16534 doc/guix.texi:16542
-#: doc/guix.texi:16564 doc/guix.texi:16578 doc/guix.texi:16663 doc/guix.texi:16670 doc/guix.texi:16678 doc/guix.texi:17064
-#: doc/guix.texi:17204 doc/guix.texi:17390 doc/guix.texi:17397 doc/guix.texi:17419 doc/guix.texi:17458 doc/guix.texi:17478
-#: doc/guix.texi:17492 doc/guix.texi:17632 doc/guix.texi:18662 doc/guix.texi:18750 doc/guix.texi:18766 doc/guix.texi:18816
-msgid "Defaults to @samp{#t}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:11960
-#, no-wrap
-msgid "{@code{cups-configuration} parameter} non-negative-integer dirty-clean-interval"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:11964
+#: doc/guix.texi:11959
 msgid ""
-"Specifies the delay for updating of configuration and state files, in seconds.  A value of 0 causes the update to happen as soon as "
-"possible, typically within a few milliseconds."
+"Specifies the security classification of the server.  Any valid banner name "
+"can be used, including \"classified\", \"confidential\", \"secret\", "
+"\"topsecret\", and \"unclassified\", or the banner can be omitted to disable "
+"secure printing functions."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11966 doc/guix.texi:12014 doc/guix.texi:12023 doc/guix.texi:12044 doc/guix.texi:12341
-msgid "Defaults to @samp{30}."
+#: doc/guix.texi:11961 doc/guix.texi:12298 doc/guix.texi:13657
+#: doc/guix.texi:13669 doc/guix.texi:17832 doc/guix.texi:17840
+#: doc/guix.texi:17848 doc/guix.texi:17856 doc/guix.texi:18134
+#: doc/guix.texi:18612 doc/guix.texi:18620 doc/guix.texi:18628
+#: doc/guix.texi:18736 doc/guix.texi:18761 doc/guix.texi:18892
+#: doc/guix.texi:18900 doc/guix.texi:18908 doc/guix.texi:18916
+#: doc/guix.texi:18924 doc/guix.texi:18932 doc/guix.texi:18955
+#: doc/guix.texi:18963 doc/guix.texi:19015 doc/guix.texi:19031
+#: doc/guix.texi:19039 doc/guix.texi:19078 doc/guix.texi:19101
+#: doc/guix.texi:19123 doc/guix.texi:19130 doc/guix.texi:19165
+#: doc/guix.texi:19173 doc/guix.texi:19197 doc/guix.texi:19229
+#: doc/guix.texi:19258 doc/guix.texi:19265 doc/guix.texi:19272
+#: doc/guix.texi:19280 doc/guix.texi:19294 doc/guix.texi:19303
+#: doc/guix.texi:19313 doc/guix.texi:19320 doc/guix.texi:19327
+#: doc/guix.texi:19334 doc/guix.texi:19405 doc/guix.texi:19412
+#: doc/guix.texi:19419 doc/guix.texi:19428 doc/guix.texi:19444
+#: doc/guix.texi:19451 doc/guix.texi:19458 doc/guix.texi:19465
+#: doc/guix.texi:19473 doc/guix.texi:19481
+msgid "Defaults to @samp{\"\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11968
+#: doc/guix.texi:11963
 #, no-wrap
-msgid "{@code{cups-configuration} parameter} error-policy error-policy"
+msgid "{@code{cups-configuration} parameter} boolean classify-override?"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:11966
+msgid ""
+"Specifies whether users may override the classification (cover page) of "
+"individual print jobs using the @code{job-sheets} option."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:11970
+#, no-wrap
+msgid "{@code{cups-configuration} parameter} default-auth-type default-auth-type"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:11972
+msgid "Specifies the default type of authentication to use."
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:11974
-msgid ""
-"Specifies what to do when an error occurs.  Possible values are @code{abort-job}, which will discard the failed print job; "
-"@code{retry-job}, which will retry the job at a later time; @code{retry-this-job}, which retries the failed job immediately; and "
-"@code{stop-printer}, which stops the printer."
+msgid "Defaults to @samp{Basic}."
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:11976
-msgid "Defaults to @samp{stop-printer}."
+#, no-wrap
+msgid "{@code{cups-configuration} parameter} default-encryption default-encryption"
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:11978
+msgid "Specifies whether encryption will be used for authenticated requests."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:11980
+msgid "Defaults to @samp{Required}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:11982
 #, no-wrap
-msgid "{@code{cups-configuration} parameter} non-negative-integer filter-limit"
+msgid "{@code{cups-configuration} parameter} string default-language"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:11984
+msgid "Specifies the default language to use for text and web content."
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:11986
-msgid ""
-"Specifies the maximum cost of filters that are run concurrently, which can be used to minimize disk, memory, and CPU resource "
-"problems.  A limit of 0 disables filter limiting.  An average print to a non-PostScript printer needs a filter limit of about 200.  "
-"A PostScript printer needs about half that (100).  Setting the limit below these thresholds will effectively limit the scheduler to "
-"printing a single job at any time."
+msgid "Defaults to @samp{\"en\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11988 doc/guix.texi:11996 doc/guix.texi:12051 doc/guix.texi:12167 doc/guix.texi:12181 doc/guix.texi:12188
-#: doc/guix.texi:13712 doc/guix.texi:13724 doc/guix.texi:17080 doc/guix.texi:17405 doc/guix.texi:18655 doc/guix.texi:18955
-#: doc/guix.texi:19120
-msgid "Defaults to @samp{0}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:11990
+#: doc/guix.texi:11988
 #, no-wrap
-msgid "{@code{cups-configuration} parameter} non-negative-integer filter-nice"
+msgid "{@code{cups-configuration} parameter} string default-paper-size"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11994
+#: doc/guix.texi:11993
 msgid ""
-"Specifies the scheduling priority of filters that are run to print a job.  The nice value ranges from 0, the highest priority, to "
-"19, the lowest priority."
+"Specifies the default paper size for new print queues.  @samp{\"Auto\"} uses "
+"a locale-specific default, while @samp{\"None\"} specifies there is no "
+"default paper size.  Specific size names are typically @samp{\"Letter\"} or "
+"@samp{\"A4\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11998
+#: doc/guix.texi:11995
+msgid "Defaults to @samp{\"Auto\"}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:11997
 #, no-wrap
-msgid "{@code{cups-configuration} parameter} host-name-lookups host-name-lookups"
+msgid "{@code{cups-configuration} parameter} string default-policy"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:11999
+msgid "Specifies the default access policy to use."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:12001
+msgid "Defaults to @samp{\"default\"}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:12003
+#, no-wrap
+msgid "{@code{cups-configuration} parameter} boolean default-shared?"
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:12005
-msgid ""
-"Specifies whether to do reverse lookups on connecting clients.  The @code{double} setting causes @code{cupsd} to verify that the "
-"hostname resolved from the address matches one of the addresses returned for that hostname.  Double lookups also prevent clients "
-"with unregistered addresses from connecting to your server.  Only set this option to @code{#t} or @code{double} if absolutely "
-"required."
+msgid "Specifies whether local printers are shared by default."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:12007 doc/guix.texi:12087 doc/guix.texi:12383
+#: doc/guix.texi:16576 doc/guix.texi:16583 doc/guix.texi:16591
+#: doc/guix.texi:16613 doc/guix.texi:16627 doc/guix.texi:16712
+#: doc/guix.texi:16719 doc/guix.texi:16727 doc/guix.texi:17113
+#: doc/guix.texi:17253 doc/guix.texi:17439 doc/guix.texi:17446
+#: doc/guix.texi:17468 doc/guix.texi:17507 doc/guix.texi:17527
+#: doc/guix.texi:17541 doc/guix.texi:17681 doc/guix.texi:18714
+#: doc/guix.texi:18802 doc/guix.texi:18818 doc/guix.texi:18868
+msgid "Defaults to @samp{#t}."
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:12009
 #, no-wrap
+msgid "{@code{cups-configuration} parameter} non-negative-integer dirty-clean-interval"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:12013
+msgid ""
+"Specifies the delay for updating of configuration and state files, in "
+"seconds.  A value of 0 causes the update to happen as soon as possible, "
+"typically within a few milliseconds."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:12015 doc/guix.texi:12063 doc/guix.texi:12072
+#: doc/guix.texi:12093 doc/guix.texi:12390
+msgid "Defaults to @samp{30}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:12017
+#, no-wrap
+msgid "{@code{cups-configuration} parameter} error-policy error-policy"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:12023
+msgid ""
+"Specifies what to do when an error occurs.  Possible values are @code{abort-"
+"job}, which will discard the failed print job; @code{retry-job}, which will "
+"retry the job at a later time; @code{retry-this-job}, which retries the "
+"failed job immediately; and @code{stop-printer}, which stops the printer."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:12025
+msgid "Defaults to @samp{stop-printer}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:12027
+#, no-wrap
+msgid "{@code{cups-configuration} parameter} non-negative-integer filter-limit"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:12035
+msgid ""
+"Specifies the maximum cost of filters that are run concurrently, which can "
+"be used to minimize disk, memory, and CPU resource problems.  A limit of 0 "
+"disables filter limiting.  An average print to a non-PostScript printer "
+"needs a filter limit of about 200.  A PostScript printer needs about half "
+"that (100).  Setting the limit below these thresholds will effectively limit "
+"the scheduler to printing a single job at any time."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:12037 doc/guix.texi:12045 doc/guix.texi:12100
+#: doc/guix.texi:12216 doc/guix.texi:12230 doc/guix.texi:12237
+#: doc/guix.texi:13761 doc/guix.texi:13773 doc/guix.texi:17129
+#: doc/guix.texi:17454 doc/guix.texi:18707 doc/guix.texi:19007
+#: doc/guix.texi:19181
+msgid "Defaults to @samp{0}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:12039
+#, no-wrap
+msgid "{@code{cups-configuration} parameter} non-negative-integer filter-nice"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:12043
+msgid ""
+"Specifies the scheduling priority of filters that are run to print a job.  "
+"The nice value ranges from 0, the highest priority, to 19, the lowest "
+"priority."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:12047
+#, no-wrap
+msgid "{@code{cups-configuration} parameter} host-name-lookups host-name-lookups"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:12054
+msgid ""
+"Specifies whether to do reverse lookups on connecting clients.  The "
+"@code{double} setting causes @code{cupsd} to verify that the hostname "
+"resolved from the address matches one of the addresses returned for that "
+"hostname.  Double lookups also prevent clients with unregistered addresses "
+"from connecting to your server.  Only set this option to @code{#t} or "
+"@code{double} if absolutely required."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:12058
+#, no-wrap
 msgid "{@code{cups-configuration} parameter} non-negative-integer job-kill-delay"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12012
-msgid "Specifies the number of seconds to wait before killing the filters and backend associated with a canceled or held job."
+#: doc/guix.texi:12061
+msgid ""
+"Specifies the number of seconds to wait before killing the filters and "
+"backend associated with a canceled or held job."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12016
+#: doc/guix.texi:12065
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} non-negative-integer job-retry-interval"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12021
+#: doc/guix.texi:12070
 msgid ""
-"Specifies the interval between retries of jobs in seconds.  This is typically used for fax queues but can also be used with normal "
-"print queues whose error policy is @code{retry-job} or @code{retry-current-job}."
+"Specifies the interval between retries of jobs in seconds.  This is "
+"typically used for fax queues but can also be used with normal print queues "
+"whose error policy is @code{retry-job} or @code{retry-current-job}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12025
+#: doc/guix.texi:12074
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} non-negative-integer job-retry-limit"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12030
+#: doc/guix.texi:12079
 msgid ""
-"Specifies the number of retries that are done for jobs.  This is typically used for fax queues but can also be used with normal "
-"print queues whose error policy is @code{retry-job} or @code{retry-current-job}."
+"Specifies the number of retries that are done for jobs.  This is typically "
+"used for fax queues but can also be used with normal print queues whose "
+"error policy is @code{retry-job} or @code{retry-current-job}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12032 doc/guix.texi:17884 doc/guix.texi:17904 doc/guix.texi:17920 doc/guix.texi:17934 doc/guix.texi:17941
-#: doc/guix.texi:17948 doc/guix.texi:17955 doc/guix.texi:18114 doc/guix.texi:18130 doc/guix.texi:18137 doc/guix.texi:18144
-#: doc/guix.texi:18155 doc/guix.texi:18607 doc/guix.texi:18615 doc/guix.texi:18623 doc/guix.texi:18647
+#: doc/guix.texi:12081 doc/guix.texi:17933 doc/guix.texi:17953
+#: doc/guix.texi:17969 doc/guix.texi:17983 doc/guix.texi:17990
+#: doc/guix.texi:17997 doc/guix.texi:18004 doc/guix.texi:18163
+#: doc/guix.texi:18179 doc/guix.texi:18186 doc/guix.texi:18193
+#: doc/guix.texi:18204 doc/guix.texi:18659 doc/guix.texi:18667
+#: doc/guix.texi:18675 doc/guix.texi:18699
 msgid "Defaults to @samp{5}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12034
+#: doc/guix.texi:12083
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} boolean keep-alive?"
 msgstr ""
 
-#. type: deftypevr
-#: doc/guix.texi:12036
-msgid "Specifies whether to support HTTP keep-alive connections."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:12040
-#, no-wrap
-msgid "{@code{cups-configuration} parameter} non-negative-integer keep-alive-timeout"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:12042
-msgid "Specifies how long an idle client connection remains open, in seconds."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:12046
-#, no-wrap
-msgid "{@code{cups-configuration} parameter} non-negative-integer limit-request-body"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:12049
-msgid "Specifies the maximum size of print files, IPP requests, and HTML form data.  A limit of 0 disables the limit check."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:12053
-#, no-wrap
-msgid "{@code{cups-configuration} parameter} multiline-string-list listen"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:12060
-msgid ""
-"Listens on the specified interfaces for connections.  Valid values are of the form @var{address}:@var{port}, where @var{address} is "
-"either an IPv6 address enclosed in brackets, an IPv4 address, or @code{*} to indicate all addresses.  Values can also be file names "
-"of local UNIX domain sockets.  The Listen directive is similar to the Port directive but allows you to restrict access to specific "
-"interfaces or networks."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:12062
-#, no-wrap
-msgid "{@code{cups-configuration} parameter} non-negative-integer listen-back-log"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:12069
-msgid ""
-"Specifies the number of pending connections that will be allowed.  This normally only affects very busy servers that have reached "
-"the MaxClients limit, but can also be triggered by large numbers of simultaneous connections.  When the limit is reached, the "
-"operating system will refuse additional connections until the scheduler can accept the pending ones."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:12071
-msgid "Defaults to @samp{128}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:12073
-#, no-wrap
-msgid "{@code{cups-configuration} parameter} location-access-control-list location-access-controls"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:12075
-msgid "Specifies a set of additional access controls."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:12077
-msgid "Available @code{location-access-controls} fields are:"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:12078
-#, no-wrap
-msgid "{@code{location-access-controls} parameter} file-name path"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:12080
-msgid "Specifies the URI path to which the access control applies."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:12082
-#, no-wrap
-msgid "{@code{location-access-controls} parameter} access-control-list access-controls"
-msgstr ""
-
 #. type: deftypevr
 #: doc/guix.texi:12085
-msgid ""
-"Access controls for all access to this path, in the same format as the @code{access-controls} of @code{operation-access-control}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:12087 doc/guix.texi:12093 doc/guix.texi:12107 doc/guix.texi:12114 doc/guix.texi:12256 doc/guix.texi:12315
-#: doc/guix.texi:12399 doc/guix.texi:12410 doc/guix.texi:14198 doc/guix.texi:16585 doc/guix.texi:16773 doc/guix.texi:17775
-#: doc/guix.texi:17835 doc/guix.texi:17843 doc/guix.texi:18670 doc/guix.texi:18677 doc/guix.texi:19088 doc/guix.texi:19182
-#: doc/guix.texi:19190 doc/guix.texi:19226 doc/guix.texi:19376 doc/guix.texi:19427 doc/guix.texi:19436
-msgid "Defaults to @samp{()}."
+msgid "Specifies whether to support HTTP keep-alive connections."
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:12089
 #, no-wrap
-msgid "{@code{location-access-controls} parameter} method-access-control-list method-access-controls"
+msgid "{@code{cups-configuration} parameter} non-negative-integer keep-alive-timeout"
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:12091
-msgid "Access controls for method-specific access to this path."
+msgid "Specifies how long an idle client connection remains open, in seconds."
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:12095
+#, no-wrap
+msgid "{@code{cups-configuration} parameter} non-negative-integer limit-request-body"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:12098
+msgid ""
+"Specifies the maximum size of print files, IPP requests, and HTML form "
+"data.  A limit of 0 disables the limit check."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:12102
+#, no-wrap
+msgid "{@code{cups-configuration} parameter} multiline-string-list listen"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:12109
+msgid ""
+"Listens on the specified interfaces for connections.  Valid values are of "
+"the form @var{address}:@var{port}, where @var{address} is either an IPv6 "
+"address enclosed in brackets, an IPv4 address, or @code{*} to indicate all "
+"addresses.  Values can also be file names of local UNIX domain sockets.  The "
+"Listen directive is similar to the Port directive but allows you to restrict "
+"access to specific interfaces or networks."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:12111
+#, no-wrap
+msgid "{@code{cups-configuration} parameter} non-negative-integer listen-back-log"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:12118
+msgid ""
+"Specifies the number of pending connections that will be allowed.  This "
+"normally only affects very busy servers that have reached the MaxClients "
+"limit, but can also be triggered by large numbers of simultaneous "
+"connections.  When the limit is reached, the operating system will refuse "
+"additional connections until the scheduler can accept the pending ones."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:12120
+msgid "Defaults to @samp{128}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:12122
+#, no-wrap
+msgid "{@code{cups-configuration} parameter} location-access-control-list location-access-controls"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:12124
+msgid "Specifies a set of additional access controls."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:12126
+msgid "Available @code{location-access-controls} fields are:"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:12127
+#, no-wrap
+msgid "{@code{location-access-controls} parameter} file-name path"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:12129
+msgid "Specifies the URI path to which the access control applies."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:12131
+#, no-wrap
+msgid "{@code{location-access-controls} parameter} access-control-list access-controls"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:12134
+msgid ""
+"Access controls for all access to this path, in the same format as the "
+"@code{access-controls} of @code{operation-access-control}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:12136 doc/guix.texi:12142 doc/guix.texi:12156
+#: doc/guix.texi:12163 doc/guix.texi:12305 doc/guix.texi:12364
+#: doc/guix.texi:12448 doc/guix.texi:12459 doc/guix.texi:14247
+#: doc/guix.texi:16634 doc/guix.texi:16822 doc/guix.texi:17824
+#: doc/guix.texi:17884 doc/guix.texi:17892 doc/guix.texi:18722
+#: doc/guix.texi:18729 doc/guix.texi:19071 doc/guix.texi:19149
+#: doc/guix.texi:19243 doc/guix.texi:19251 doc/guix.texi:19287
+#: doc/guix.texi:19437 doc/guix.texi:19488 doc/guix.texi:19497
+msgid "Defaults to @samp{()}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:12138
+#, no-wrap
+msgid "{@code{location-access-controls} parameter} method-access-control-list method-access-controls"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:12140
+msgid "Access controls for method-specific access to this path."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:12144
 msgid "Available @code{method-access-controls} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12096
+#: doc/guix.texi:12145
 #, no-wrap
 msgid "{@code{method-access-controls} parameter} boolean reverse?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12099
-msgid "If @code{#t}, apply access controls to all methods except the listed methods.  Otherwise apply to only the listed methods."
+#: doc/guix.texi:12148
+msgid ""
+"If @code{#t}, apply access controls to all methods except the listed "
+"methods.  Otherwise apply to only the listed methods."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12103
+#: doc/guix.texi:12152
 #, no-wrap
 msgid "{@code{method-access-controls} parameter} method-list methods"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12105
+#: doc/guix.texi:12154
 msgid "Methods to which this access control applies."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12109
+#: doc/guix.texi:12158
 #, no-wrap
 msgid "{@code{method-access-controls} parameter} access-control-list access-controls"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12112
-msgid "Access control directives, as a list of strings.  Each string should be one directive, such as \"Order allow,deny\"."
+#: doc/guix.texi:12161
+msgid ""
+"Access control directives, as a list of strings.  Each string should be one "
+"directive, such as \"Order allow,deny\"."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12118
+#: doc/guix.texi:12167
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} non-negative-integer log-debug-history"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12122
+#: doc/guix.texi:12171
 msgid ""
-"Specifies the number of debugging messages that are retained for logging if an error occurs in a print job.  Debug messages are "
-"logged regardless of the LogLevel setting."
+"Specifies the number of debugging messages that are retained for logging if "
+"an error occurs in a print job.  Debug messages are logged regardless of the "
+"LogLevel setting."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12124 doc/guix.texi:12145 doc/guix.texi:12152 doc/guix.texi:13958 doc/guix.texi:16758
+#: doc/guix.texi:12173 doc/guix.texi:12194 doc/guix.texi:12201
+#: doc/guix.texi:14007 doc/guix.texi:16807
 msgid "Defaults to @samp{100}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12126
+#: doc/guix.texi:12175
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} log-level log-level"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12129
+#: doc/guix.texi:12178
 msgid ""
-"Specifies the level of logging for the ErrorLog file.  The value @code{none} stops all logging while @code{debug2} logs everything."
+"Specifies the level of logging for the ErrorLog file.  The value @code{none} "
+"stops all logging while @code{debug2} logs everything."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12131
+#: doc/guix.texi:12180
 msgid "Defaults to @samp{info}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12133
+#: doc/guix.texi:12182
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} log-time-format log-time-format"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12136
+#: doc/guix.texi:12185
 msgid ""
-"Specifies the format of the date and time in the log files.  The value @code{standard} logs whole seconds while @code{usecs} logs "
-"microseconds."
+"Specifies the format of the date and time in the log files.  The value "
+"@code{standard} logs whole seconds while @code{usecs} logs microseconds."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12138
+#: doc/guix.texi:12187
 msgid "Defaults to @samp{standard}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12140
+#: doc/guix.texi:12189
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} non-negative-integer max-clients"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12143
-msgid "Specifies the maximum number of simultaneous clients that are allowed by the scheduler."
+#: doc/guix.texi:12192
+msgid ""
+"Specifies the maximum number of simultaneous clients that are allowed by the "
+"scheduler."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12147
+#: doc/guix.texi:12196
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} non-negative-integer max-clients-per-host"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12150
-msgid "Specifies the maximum number of simultaneous clients that are allowed from a single address."
+#: doc/guix.texi:12199
+msgid ""
+"Specifies the maximum number of simultaneous clients that are allowed from a "
+"single address."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12154
+#: doc/guix.texi:12203
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} non-negative-integer max-copies"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12157
-msgid "Specifies the maximum number of copies that a user can print of each job."
+#: doc/guix.texi:12206
+msgid ""
+"Specifies the maximum number of copies that a user can print of each job."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12159
+#: doc/guix.texi:12208
 msgid "Defaults to @samp{9999}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12161
+#: doc/guix.texi:12210
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} non-negative-integer max-hold-time"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12165
+#: doc/guix.texi:12214
 msgid ""
-"Specifies the maximum time a job may remain in the @code{indefinite} hold state before it is canceled.  A value of 0 disables "
-"cancellation of held jobs."
+"Specifies the maximum time a job may remain in the @code{indefinite} hold "
+"state before it is canceled.  A value of 0 disables cancellation of held "
+"jobs."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12169
+#: doc/guix.texi:12218
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} non-negative-integer max-jobs"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12172
-msgid "Specifies the maximum number of simultaneous jobs that are allowed.  Set to 0 to allow an unlimited number of jobs."
+#: doc/guix.texi:12221
+msgid ""
+"Specifies the maximum number of simultaneous jobs that are allowed.  Set to "
+"0 to allow an unlimited number of jobs."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12174
+#: doc/guix.texi:12223
 msgid "Defaults to @samp{500}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12176
+#: doc/guix.texi:12225
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} non-negative-integer max-jobs-per-printer"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12179
+#: doc/guix.texi:12228
 msgid ""
-"Specifies the maximum number of simultaneous jobs that are allowed per printer.  A value of 0 allows up to MaxJobs jobs per printer."
+"Specifies the maximum number of simultaneous jobs that are allowed per "
+"printer.  A value of 0 allows up to MaxJobs jobs per printer."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12183
+#: doc/guix.texi:12232
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} non-negative-integer max-jobs-per-user"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12186
-msgid "Specifies the maximum number of simultaneous jobs that are allowed per user.  A value of 0 allows up to MaxJobs jobs per user."
+#: doc/guix.texi:12235
+msgid ""
+"Specifies the maximum number of simultaneous jobs that are allowed per "
+"user.  A value of 0 allows up to MaxJobs jobs per user."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12190
+#: doc/guix.texi:12239
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} non-negative-integer max-job-time"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12193
+#: doc/guix.texi:12242
 msgid ""
-"Specifies the maximum time a job may take to print before it is canceled, in seconds.  Set to 0 to disable cancellation of \"stuck\" "
-"jobs."
+"Specifies the maximum time a job may take to print before it is canceled, in "
+"seconds.  Set to 0 to disable cancellation of \"stuck\" jobs."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12195
+#: doc/guix.texi:12244
 msgid "Defaults to @samp{10800}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12197
+#: doc/guix.texi:12246
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} non-negative-integer max-log-size"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12200
-msgid "Specifies the maximum size of the log files before they are rotated, in bytes.  The value 0 disables log rotation."
+#: doc/guix.texi:12249
+msgid ""
+"Specifies the maximum size of the log files before they are rotated, in "
+"bytes.  The value 0 disables log rotation."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12202
+#: doc/guix.texi:12251
 msgid "Defaults to @samp{1048576}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12204
+#: doc/guix.texi:12253
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} non-negative-integer multiple-operation-timeout"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12207
-msgid "Specifies the maximum amount of time to allow between files in a multiple file print job, in seconds."
+#: doc/guix.texi:12256
+msgid ""
+"Specifies the maximum amount of time to allow between files in a multiple "
+"file print job, in seconds."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12209 doc/guix.texi:12423
+#: doc/guix.texi:12258 doc/guix.texi:12472
 msgid "Defaults to @samp{300}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12211
+#: doc/guix.texi:12260
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} string page-log-format"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12216
+#: doc/guix.texi:12265
 msgid ""
-"Specifies the format of PageLog lines.  Sequences beginning with percent (@samp{%}) characters are replaced with the corresponding "
-"information, while all other characters are copied literally.  The following percent sequences are recognized:"
+"Specifies the format of PageLog lines.  Sequences beginning with percent "
+"(@samp{%}) characters are replaced with the corresponding information, while "
+"all other characters are copied literally.  The following percent sequences "
+"are recognized:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12218
+#: doc/guix.texi:12267
 #, no-wrap
 msgid "%%"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12220
+#: doc/guix.texi:12269
 msgid "insert a single percent character"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12221
+#: doc/guix.texi:12270
 #, no-wrap
 msgid "%@{name@}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12223
+#: doc/guix.texi:12272
 msgid "insert the value of the specified IPP attribute"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12224
+#: doc/guix.texi:12273
 #, no-wrap
 msgid "%C"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12226
+#: doc/guix.texi:12275
 msgid "insert the number of copies for the current page"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12227
+#: doc/guix.texi:12276
 #, no-wrap
 msgid "%P"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12229
+#: doc/guix.texi:12278
 msgid "insert the current page number"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12230
+#: doc/guix.texi:12279
 #, no-wrap
 msgid "%T"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12232
+#: doc/guix.texi:12281
 msgid "insert the current date and time in common log format"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12233
+#: doc/guix.texi:12282
 #, no-wrap
 msgid "%j"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12235
+#: doc/guix.texi:12284
 msgid "insert the job ID"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12236 doc/guix.texi:13568
+#: doc/guix.texi:12285 doc/guix.texi:13617
 #, no-wrap
 msgid "%p"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12238
+#: doc/guix.texi:12287
 msgid "insert the printer name"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12239 doc/guix.texi:13591
+#: doc/guix.texi:12288 doc/guix.texi:13640
 #, no-wrap
 msgid "%u"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12241
+#: doc/guix.texi:12290
 msgid "insert the username"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12247
+#: doc/guix.texi:12296
 msgid ""
-"A value of the empty string disables page logging.  The string @code{%p %u %j %T %P %C %@{job-billing@} %@{job-originating-host-"
-"name@} %@{job-name@} %@{media@} %@{sides@}} creates a page log with the standard items."
+"A value of the empty string disables page logging.  The string @code{%p %u "
+"%j %T %P %C %@{job-billing@} %@{job-originating-host-name@} %@{job-name@} "
+"%@{media@} %@{sides@}} creates a page log with the standard items."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12251
+#: doc/guix.texi:12300
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} environment-variables environment-variables"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12254
-msgid "Passes the specified environment variable(s) to child processes; a list of strings."
+#: doc/guix.texi:12303
+msgid ""
+"Passes the specified environment variable(s) to child processes; a list of "
+"strings."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12258
+#: doc/guix.texi:12307
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} policy-configuration-list policies"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12260
+#: doc/guix.texi:12309
 msgid "Specifies named access control policies."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12262
+#: doc/guix.texi:12311
 msgid "Available @code{policy-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12263
+#: doc/guix.texi:12312
 #, no-wrap
 msgid "{@code{policy-configuration} parameter} string name"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12265
+#: doc/guix.texi:12314
 msgid "Name of the policy."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12267
+#: doc/guix.texi:12316
 #, no-wrap
 msgid "{@code{policy-configuration} parameter} string job-private-access"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12277
+#: doc/guix.texi:12326
 msgid ""
-"Specifies an access list for a job's private values.  @code{@@ACL} maps to the printer's requesting-user-name-allowed or requesting-"
-"user-name-denied values.  @code{@@OWNER} maps to the job's owner.  @code{@@SYSTEM} maps to the groups listed for the @code{system-"
-"group} field of the @code{files-config} configuration, which is reified into the @code{cups-files.conf(5)} file.  Other possible "
-"elements of the access list include specific user names, and @code{@@@var{group}} to indicate members of a specific group.  The "
-"access list may also be simply @code{all} or @code{default}."
+"Specifies an access list for a job's private values.  @code{@@ACL} maps to "
+"the printer's requesting-user-name-allowed or requesting-user-name-denied "
+"values.  @code{@@OWNER} maps to the job's owner.  @code{@@SYSTEM} maps to "
+"the groups listed for the @code{system-group} field of the @code{files-"
+"config} configuration, which is reified into the @code{cups-files.conf(5)} "
+"file.  Other possible elements of the access list include specific user "
+"names, and @code{@@@var{group}} to indicate members of a specific group.  "
+"The access list may also be simply @code{all} or @code{default}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12279 doc/guix.texi:12301
+#: doc/guix.texi:12328 doc/guix.texi:12350
 msgid "Defaults to @samp{\"@@OWNER @@SYSTEM\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12281
+#: doc/guix.texi:12330
 #, no-wrap
 msgid "{@code{policy-configuration} parameter} string job-private-values"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12284 doc/guix.texi:12306
-msgid "Specifies the list of job values to make private, or @code{all}, @code{default}, or @code{none}."
+#: doc/guix.texi:12333 doc/guix.texi:12355
+msgid ""
+"Specifies the list of job values to make private, or @code{all}, "
+"@code{default}, or @code{none}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12287
-msgid "Defaults to @samp{\"job-name job-originating-host-name job-originating-user-name phone\"}."
+#: doc/guix.texi:12336
+msgid ""
+"Defaults to @samp{\"job-name job-originating-host-name job-originating-user-"
+"name phone\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12289
+#: doc/guix.texi:12338
 #, no-wrap
 msgid "{@code{policy-configuration} parameter} string subscription-private-access"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12299
+#: doc/guix.texi:12348
 msgid ""
-"Specifies an access list for a subscription's private values.  @code{@@ACL} maps to the printer's requesting-user-name-allowed or "
-"requesting-user-name-denied values.  @code{@@OWNER} maps to the job's owner.  @code{@@SYSTEM} maps to the groups listed for the "
-"@code{system-group} field of the @code{files-config} configuration, which is reified into the @code{cups-files.conf(5)} file.  Other "
-"possible elements of the access list include specific user names, and @code{@@@var{group}} to indicate members of a specific group.  "
-"The access list may also be simply @code{all} or @code{default}."
+"Specifies an access list for a subscription's private values.  @code{@@ACL} "
+"maps to the printer's requesting-user-name-allowed or requesting-user-name-"
+"denied values.  @code{@@OWNER} maps to the job's owner.  @code{@@SYSTEM} "
+"maps to the groups listed for the @code{system-group} field of the "
+"@code{files-config} configuration, which is reified into the @code{cups-"
+"files.conf(5)} file.  Other possible elements of the access list include "
+"specific user names, and @code{@@@var{group}} to indicate members of a "
+"specific group.  The access list may also be simply @code{all} or "
+"@code{default}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12303
+#: doc/guix.texi:12352
 #, no-wrap
 msgid "{@code{policy-configuration} parameter} string subscription-private-values"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12309
-msgid "Defaults to @samp{\"notify-events notify-pull-method notify-recipient-uri notify-subscriber-user-name notify-user-data\"}."
+#: doc/guix.texi:12358
+msgid ""
+"Defaults to @samp{\"notify-events notify-pull-method notify-recipient-uri "
+"notify-subscriber-user-name notify-user-data\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12311
+#: doc/guix.texi:12360
 #, no-wrap
 msgid "{@code{policy-configuration} parameter} operation-access-control-list access-controls"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12313
+#: doc/guix.texi:12362
 msgid "Access control by IPP operation."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12318
+#: doc/guix.texi:12367
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} boolean-or-non-negative-integer preserve-job-files"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12323
+#: doc/guix.texi:12372
 msgid ""
-"Specifies whether job files (documents) are preserved after a job is printed.  If a numeric value is specified, job files are "
-"preserved for the indicated number of seconds after printing.  Otherwise a boolean value applies indefinitely."
+"Specifies whether job files (documents) are preserved after a job is "
+"printed.  If a numeric value is specified, job files are preserved for the "
+"indicated number of seconds after printing.  Otherwise a boolean value "
+"applies indefinitely."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12325
+#: doc/guix.texi:12374
 msgid "Defaults to @samp{86400}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12327
+#: doc/guix.texi:12376
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} boolean-or-non-negative-integer preserve-job-history"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12332
+#: doc/guix.texi:12381
 msgid ""
-"Specifies whether the job history is preserved after a job is printed.  If a numeric value is specified, the job history is "
-"preserved for the indicated number of seconds after printing.  If @code{#t}, the job history is preserved until the MaxJobs limit is "
-"reached."
+"Specifies whether the job history is preserved after a job is printed.  If a "
+"numeric value is specified, the job history is preserved for the indicated "
+"number of seconds after printing.  If @code{#t}, the job history is "
+"preserved until the MaxJobs limit is reached."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12336
+#: doc/guix.texi:12385
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} non-negative-integer reload-timeout"
 msgstr ""
 
-#. type: deftypevr
-#: doc/guix.texi:12339
-msgid "Specifies the amount of time to wait for job completion before restarting the scheduler."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:12343
-#, no-wrap
-msgid "{@code{cups-configuration} parameter} string rip-cache"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:12346
-msgid "Specifies the maximum amount of memory to use when converting documents into bitmaps for a printer."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:12348
-msgid "Defaults to @samp{\"128m\"}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:12350
-#, no-wrap
-msgid "{@code{cups-configuration} parameter} string server-admin"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:12352
-msgid "Specifies the email address of the server administrator."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:12354
-msgid "Defaults to @samp{\"root@@localhost.localdomain\"}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:12356
-#, no-wrap
-msgid "{@code{cups-configuration} parameter} host-name-list-or-* server-alias"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:12364
-msgid ""
-"The ServerAlias directive is used for HTTP Host header validation when clients connect to the scheduler from external interfaces.  "
-"Using the special name @code{*} can expose your system to known browser-based DNS rebinding attacks, even when accessing sites "
-"through a firewall.  If the auto-discovery of alternate names does not work, we recommend listing each alternate name with a "
-"ServerAlias directive instead of using @code{*}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:12366
-msgid "Defaults to @samp{*}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:12368
-#, no-wrap
-msgid "{@code{cups-configuration} parameter} string server-name"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:12370
-msgid "Specifies the fully-qualified host name of the server."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:12372
-msgid "Defaults to @samp{\"localhost\"}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:12374
-#, no-wrap
-msgid "{@code{cups-configuration} parameter} server-tokens server-tokens"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:12382
-msgid ""
-"Specifies what information is included in the Server header of HTTP responses.  @code{None} disables the Server header.  "
-"@code{ProductOnly} reports @code{CUPS}.  @code{Major} reports @code{CUPS 2}.  @code{Minor} reports @code{CUPS 2.0}.  @code{Minimal} "
-"reports @code{CUPS 2.0.0}.  @code{OS} reports @code{CUPS 2.0.0 (@var{uname})} where @var{uname} is the output of the @code{uname} "
-"command.  @code{Full} reports @code{CUPS 2.0.0 (@var{uname}) IPP/2.0}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:12384
-msgid "Defaults to @samp{Minimal}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:12386
-#, no-wrap
-msgid "{@code{cups-configuration} parameter} string set-env"
-msgstr ""
-
 #. type: deftypevr
 #: doc/guix.texi:12388
-msgid "Set the specified environment variable to be passed to child processes."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:12390
-msgid "Defaults to @samp{\"variable value\"}."
+msgid ""
+"Specifies the amount of time to wait for job completion before restarting "
+"the scheduler."
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:12392
 #, no-wrap
-msgid "{@code{cups-configuration} parameter} multiline-string-list ssl-listen"
+msgid "{@code{cups-configuration} parameter} string rip-cache"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:12395
+msgid ""
+"Specifies the maximum amount of memory to use when converting documents into "
+"bitmaps for a printer."
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:12397
-msgid ""
-"Listens on the specified interfaces for encrypted connections.  Valid values are of the form @var{address}:@var{port}, where "
-"@var{address} is either an IPv6 address enclosed in brackets, an IPv4 address, or @code{*} to indicate all addresses."
+msgid "Defaults to @samp{\"128m\"}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:12399
+#, no-wrap
+msgid "{@code{cups-configuration} parameter} string server-admin"
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:12401
-#, no-wrap
-msgid "{@code{cups-configuration} parameter} ssl-options ssl-options"
+msgid "Specifies the email address of the server administrator."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12408
+#: doc/guix.texi:12403
+msgid "Defaults to @samp{\"root@@localhost.localdomain\"}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:12405
+#, no-wrap
+msgid "{@code{cups-configuration} parameter} host-name-list-or-* server-alias"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:12413
 msgid ""
-"Sets encryption options.  By default, CUPS only supports encryption using TLS v1.0 or higher using known secure cipher suites.  The "
-"@code{AllowRC4} option enables the 128-bit RC4 cipher suites, which are required for some older clients that do not implement newer "
-"ones.  The @code{AllowSSL3} option enables SSL v3.0, which is required for some older clients that do not support TLS v1.0."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:12412
-#, no-wrap
-msgid "{@code{cups-configuration} parameter} boolean strict-conformance?"
+"The ServerAlias directive is used for HTTP Host header validation when "
+"clients connect to the scheduler from external interfaces.  Using the "
+"special name @code{*} can expose your system to known browser-based DNS "
+"rebinding attacks, even when accessing sites through a firewall.  If the "
+"auto-discovery of alternate names does not work, we recommend listing each "
+"alternate name with a ServerAlias directive instead of using @code{*}."
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:12415
-msgid "Specifies whether the scheduler requires clients to strictly adhere to the IPP specifications."
+msgid "Defaults to @samp{*}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:12417
+#, no-wrap
+msgid "{@code{cups-configuration} parameter} string server-name"
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:12419
-#, no-wrap
-msgid "{@code{cups-configuration} parameter} non-negative-integer timeout"
+msgid "Specifies the fully-qualified host name of the server."
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:12421
-msgid "Specifies the HTTP request timeout, in seconds."
+msgid "Defaults to @samp{\"localhost\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12426
+#: doc/guix.texi:12423
 #, no-wrap
-msgid "{@code{cups-configuration} parameter} boolean web-interface?"
+msgid "{@code{cups-configuration} parameter} server-tokens server-tokens"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12428
-msgid "Specifies whether the web interface is enabled."
-msgstr ""
-
-#. type: Plain text
-#: doc/guix.texi:12438
+#: doc/guix.texi:12431
 msgid ""
-"At this point you're probably thinking ``oh dear, Guix manual, I like you but you can stop already with the configuration "
-"options''.  Indeed.  However, one more point: it could be that you have an existing @code{cupsd.conf} that you want to use.  In that "
-"case, you can pass an @code{opaque-cups-configuration} as the configuration of a @code{cups-service-type}."
+"Specifies what information is included in the Server header of HTTP "
+"responses.  @code{None} disables the Server header.  @code{ProductOnly} "
+"reports @code{CUPS}.  @code{Major} reports @code{CUPS 2}.  @code{Minor} "
+"reports @code{CUPS 2.0}.  @code{Minimal} reports @code{CUPS 2.0.0}.  "
+"@code{OS} reports @code{CUPS 2.0.0 (@var{uname})} where @var{uname} is the "
+"output of the @code{uname} command.  @code{Full} reports @code{CUPS 2.0.0 "
+"(@var{uname}) IPP/2.0}."
 msgstr ""
 
-#. type: Plain text
-#: doc/guix.texi:12440
-msgid "Available @code{opaque-cups-configuration} fields are:"
+#. type: deftypevr
+#: doc/guix.texi:12433
+msgid "Defaults to @samp{Minimal}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:12435
+#, no-wrap
+msgid "{@code{cups-configuration} parameter} string set-env"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:12437
+msgid "Set the specified environment variable to be passed to child processes."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:12439
+msgid "Defaults to @samp{\"variable value\"}."
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:12441
 #, no-wrap
+msgid "{@code{cups-configuration} parameter} multiline-string-list ssl-listen"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:12446
+msgid ""
+"Listens on the specified interfaces for encrypted connections.  Valid values "
+"are of the form @var{address}:@var{port}, where @var{address} is either an "
+"IPv6 address enclosed in brackets, an IPv4 address, or @code{*} to indicate "
+"all addresses."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:12450
+#, no-wrap
+msgid "{@code{cups-configuration} parameter} ssl-options ssl-options"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:12457
+msgid ""
+"Sets encryption options.  By default, CUPS only supports encryption using "
+"TLS v1.0 or higher using known secure cipher suites.  The @code{AllowRC4} "
+"option enables the 128-bit RC4 cipher suites, which are required for some "
+"older clients that do not implement newer ones.  The @code{AllowSSL3} option "
+"enables SSL v3.0, which is required for some older clients that do not "
+"support TLS v1.0."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:12461
+#, no-wrap
+msgid "{@code{cups-configuration} parameter} boolean strict-conformance?"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:12464
+msgid ""
+"Specifies whether the scheduler requires clients to strictly adhere to the "
+"IPP specifications."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:12468
+#, no-wrap
+msgid "{@code{cups-configuration} parameter} non-negative-integer timeout"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:12470
+msgid "Specifies the HTTP request timeout, in seconds."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:12475
+#, no-wrap
+msgid "{@code{cups-configuration} parameter} boolean web-interface?"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:12477
+msgid "Specifies whether the web interface is enabled."
+msgstr ""
+
+#. type: Plain text
+#: doc/guix.texi:12487
+msgid ""
+"At this point you're probably thinking ``oh dear, Guix manual, I like you "
+"but you can stop already with the configuration options''.  Indeed.  "
+"However, one more point: it could be that you have an existing @code{cupsd."
+"conf} that you want to use.  In that case, you can pass an @code{opaque-cups-"
+"configuration} as the configuration of a @code{cups-service-type}."
+msgstr ""
+
+#. type: Plain text
+#: doc/guix.texi:12489
+msgid "Available @code{opaque-cups-configuration} fields are:"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:12490
+#, no-wrap
 msgid "{@code{opaque-cups-configuration} parameter} package cups"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12445
+#: doc/guix.texi:12494
 #, no-wrap
 msgid "{@code{opaque-cups-configuration} parameter} string cupsd.conf"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12447
+#: doc/guix.texi:12496
 msgid "The contents of the @code{cupsd.conf}, as a string."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12449
+#: doc/guix.texi:12498
 #, no-wrap
 msgid "{@code{opaque-cups-configuration} parameter} string cups-files.conf"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12451
+#: doc/guix.texi:12500
 msgid "The contents of the @code{cups-files.conf} file, as a string."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:12456
+#: doc/guix.texi:12505
 msgid ""
-"For example, if your @code{cupsd.conf} and @code{cups-files.conf} are in strings of the same name, you could instantiate a CUPS "
-"service like this:"
+"For example, if your @code{cupsd.conf} and @code{cups-files.conf} are in "
+"strings of the same name, you could instantiate a CUPS service like this:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:12462
+#: doc/guix.texi:12511
 #, no-wrap
 msgid ""
 "(service cups-service-type\n"
@@ -24147,122 +28006,145 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:12473
+#: doc/guix.texi:12522
 msgid ""
-"The @code{(gnu services desktop)} module provides services that are usually useful in the context of a ``desktop'' setup---that is, "
-"on a machine running a graphical display server, possibly with graphical user interfaces, etc.  It also defines services that "
-"provide specific desktop environments like GNOME, XFCE or MATE."
+"The @code{(gnu services desktop)} module provides services that are usually "
+"useful in the context of a ``desktop'' setup---that is, on a machine running "
+"a graphical display server, possibly with graphical user interfaces, etc.  "
+"It also defines services that provide specific desktop environments like "
+"GNOME, XFCE or MATE."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:12477
+#: doc/guix.texi:12526
 msgid ""
-"To simplify things, the module defines a variable containing the set of services that users typically expect on a machine with a "
-"graphical environment and networking:"
+"To simplify things, the module defines a variable containing the set of "
+"services that users typically expect on a machine with a graphical "
+"environment and networking:"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:12478
+#: doc/guix.texi:12527
 #, no-wrap
 msgid "{Scheme Variable} %desktop-services"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:12481
-msgid "This is a list of services that builds upon @var{%base-services} and adds or adjusts services for a typical ``desktop'' setup."
+#: doc/guix.texi:12530
+msgid ""
+"This is a list of services that builds upon @var{%base-services} and adds or "
+"adjusts services for a typical ``desktop'' setup."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:12491
+#: doc/guix.texi:12540
 msgid ""
-"In particular, it adds a graphical login manager (@pxref{X Window, @code{slim-service}}), screen lockers, a network management tool "
-"(@pxref{Networking Services, @code{network-manager-service-type}}), energy and color management services, the @code{elogind} login "
-"and seat manager, the Polkit privilege service, the GeoClue location service, the AccountsService daemon that allows authorized "
-"users change system passwords, an NTP client (@pxref{Networking Services}), the Avahi daemon, and has the name service switch "
-"service configured to be able to use @code{nss-mdns} (@pxref{Name Service Switch, mDNS})."
+"In particular, it adds a graphical login manager (@pxref{X Window, "
+"@code{slim-service}}), screen lockers, a network management tool "
+"(@pxref{Networking Services, @code{network-manager-service-type}}), energy "
+"and color management services, the @code{elogind} login and seat manager, "
+"the Polkit privilege service, the GeoClue location service, the "
+"AccountsService daemon that allows authorized users change system passwords, "
+"an NTP client (@pxref{Networking Services}), the Avahi daemon, and has the "
+"name service switch service configured to be able to use @code{nss-mdns} "
+"(@pxref{Name Service Switch, mDNS})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:12496
+#: doc/guix.texi:12545
 msgid ""
-"The @var{%desktop-services} variable can be used as the @code{services} field of an @code{operating-system} declaration "
-"(@pxref{operating-system Reference, @code{services}})."
+"The @var{%desktop-services} variable can be used as the @code{services} "
+"field of an @code{operating-system} declaration (@pxref{operating-system "
+"Reference, @code{services}})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:12516
+#: doc/guix.texi:12565
 msgid ""
-"Additionally, the @code{gnome-desktop-service}, @code{xfce-desktop-service} and @code{mate-desktop-service} procedures can add "
-"GNOME, XFCE and/or MATE to a system.  To ``add GNOME'' means that system-level services like the backlight adjustment helpers and "
-"the power management utilities are added to the system, extending @code{polkit} and @code{dbus} appropriately, allowing GNOME to "
-"operate with elevated privileges on a limited number of special-purpose system interfaces.  Additionally, adding a service made by "
-"@code{gnome-desktop-service} adds the GNOME metapackage to the system profile.  Likewise, adding the XFCE service not only adds the "
-"@code{xfce} metapackage to the system profile, but it also gives the Thunar file manager the ability to open a ``root-mode'' file "
-"management window, if the user authenticates using the administrator's password via the standard polkit graphical interface.  To "
-"``add MATE'' means that @code{polkit} and @code{dbus} are extended appropriately, allowing MATE to operate with elevated privileges "
-"on a limited number of special-purpose system interfaces.  Additionally, adding a service made by @code{mate-desktop-service} adds "
-"the MATE metapackage to the system profile."
+"Additionally, the @code{gnome-desktop-service}, @code{xfce-desktop-service} "
+"and @code{mate-desktop-service} procedures can add GNOME, XFCE and/or MATE "
+"to a system.  To ``add GNOME'' means that system-level services like the "
+"backlight adjustment helpers and the power management utilities are added to "
+"the system, extending @code{polkit} and @code{dbus} appropriately, allowing "
+"GNOME to operate with elevated privileges on a limited number of special-"
+"purpose system interfaces.  Additionally, adding a service made by "
+"@code{gnome-desktop-service} adds the GNOME metapackage to the system "
+"profile.  Likewise, adding the XFCE service not only adds the @code{xfce} "
+"metapackage to the system profile, but it also gives the Thunar file manager "
+"the ability to open a ``root-mode'' file management window, if the user "
+"authenticates using the administrator's password via the standard polkit "
+"graphical interface.  To ``add MATE'' means that @code{polkit} and "
+"@code{dbus} are extended appropriately, allowing MATE to operate with "
+"elevated privileges on a limited number of special-purpose system "
+"interfaces.  Additionally, adding a service made by @code{mate-desktop-"
+"service} adds the MATE metapackage to the system profile."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:12525
+#: doc/guix.texi:12574
 msgid ""
-"The desktop environments in Guix use the Xorg display server by default.  If you'd like to use the newer display server protocol "
-"called Wayland, you need to use the @code{sddm-service} instead of the @code{slim-service} for the graphical login manager.  You "
-"should then select the ``GNOME (Wayland)'' session in SDDM.  Alternatively you can also try starting GNOME on Wayland manually from "
-"a TTY with the command ``XDG_SESSION_TYPE=wayland exec dbus-run-session gnome-session``.  Currently only GNOME has support for "
-"Wayland."
+"The desktop environments in Guix use the Xorg display server by default.  If "
+"you'd like to use the newer display server protocol called Wayland, you need "
+"to use the @code{sddm-service} instead of the @code{slim-service} for the "
+"graphical login manager.  You should then select the ``GNOME (Wayland)'' "
+"session in SDDM.  Alternatively you can also try starting GNOME on Wayland "
+"manually from a TTY with the command ``XDG_SESSION_TYPE=wayland exec dbus-"
+"run-session gnome-session``.  Currently only GNOME has support for Wayland."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12526
+#: doc/guix.texi:12575
 #, no-wrap
 msgid "{Scheme Procedure} gnome-desktop-service"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12530
+#: doc/guix.texi:12579
 msgid ""
-"Return a service that adds the @code{gnome} package to the system profile, and extends polkit with the actions from @code{gnome-"
-"settings-daemon}."
+"Return a service that adds the @code{gnome} package to the system profile, "
+"and extends polkit with the actions from @code{gnome-settings-daemon}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12532
+#: doc/guix.texi:12581
 #, no-wrap
 msgid "{Scheme Procedure} xfce-desktop-service"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12537
+#: doc/guix.texi:12586
 msgid ""
-"Return a service that adds the @code{xfce} package to the system profile, and extends polkit with the ability for @code{thunar} to "
-"manipulate the file system as root from within a user session, after the user has authenticated with the administrator's password."
+"Return a service that adds the @code{xfce} package to the system profile, "
+"and extends polkit with the ability for @code{thunar} to manipulate the file "
+"system as root from within a user session, after the user has authenticated "
+"with the administrator's password."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12539
+#: doc/guix.texi:12588
 #, no-wrap
 msgid "{Scheme Procedure} mate-desktop-service"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12543
+#: doc/guix.texi:12592
 msgid ""
-"Return a service that adds the @code{mate} package to the system profile, and extends polkit with the actions from @code{mate-"
-"settings-daemon}."
+"Return a service that adds the @code{mate} package to the system profile, "
+"and extends polkit with the actions from @code{mate-settings-daemon}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:12550
+#: doc/guix.texi:12599
 msgid ""
-"Because the GNOME, XFCE and MATE desktop services pull in so many packages, the default @code{%desktop-services} variable doesn't "
-"include either of them by default.  To add GNOME, XFCE or MATE, just @code{cons} them onto @code{%desktop-services} in the "
-"@code{services} field of your @code{operating-system}:"
+"Because the GNOME, XFCE and MATE desktop services pull in so many packages, "
+"the default @code{%desktop-services} variable doesn't include either of them "
+"by default.  To add GNOME, XFCE or MATE, just @code{cons} them onto "
+"@code{%desktop-services} in the @code{services} field of your "
+"@code{operating-system}:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:12561
+#: doc/guix.texi:12610
 #, no-wrap
 msgid ""
 "(use-modules (gnu))\n"
@@ -24277,801 +28159,862 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:12565
-msgid "These desktop environments will then be available as options in the graphical login window."
+#: doc/guix.texi:12614
+msgid ""
+"These desktop environments will then be available as options in the "
+"graphical login window."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:12569
+#: doc/guix.texi:12618
 msgid ""
-"The actual service definitions included in @code{%desktop-services} and provided by @code{(gnu services dbus)} and @code{(gnu "
-"services desktop)} are described below."
+"The actual service definitions included in @code{%desktop-services} and "
+"provided by @code{(gnu services dbus)} and @code{(gnu services desktop)} are "
+"described below."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12570
+#: doc/guix.texi:12619
 #, no-wrap
 msgid "{Scheme Procedure} dbus-service [#:dbus @var{dbus}] [#:services '()]"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12573
-msgid "Return a service that runs the ``system bus'', using @var{dbus}, with support for @var{services}."
-msgstr ""
-
-#. type: deffn
-#: doc/guix.texi:12577
+#: doc/guix.texi:12622
 msgid ""
-"@uref{http://dbus.freedesktop.org/, D-Bus} is an inter-process communication facility.  Its system bus is used to allow system "
-"services to communicate and to be notified of system-wide events."
+"Return a service that runs the ``system bus'', using @var{dbus}, with "
+"support for @var{services}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12582
+#: doc/guix.texi:12626
 msgid ""
-"@var{services} must be a list of packages that provide an @file{etc/dbus-1/system.d} directory containing additional D-Bus "
-"configuration and policy files.  For example, to allow avahi-daemon to use the system bus, @var{services} must be equal to "
-"@code{(list avahi)}."
+"@uref{http://dbus.freedesktop.org/, D-Bus} is an inter-process communication "
+"facility.  Its system bus is used to allow system services to communicate "
+"and to be notified of system-wide events."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12584
+#: doc/guix.texi:12631
+msgid ""
+"@var{services} must be a list of packages that provide an @file{etc/dbus-1/"
+"system.d} directory containing additional D-Bus configuration and policy "
+"files.  For example, to allow avahi-daemon to use the system bus, "
+"@var{services} must be equal to @code{(list avahi)}."
+msgstr ""
+
+#. type: deffn
+#: doc/guix.texi:12633
 #, no-wrap
 msgid "{Scheme Procedure} elogind-service [#:config @var{config}]"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12590
+#: doc/guix.texi:12639
 msgid ""
-"Return a service that runs the @code{elogind} login and seat management daemon.  @uref{https://github.com/elogind/elogind, Elogind} "
-"exposes a D-Bus interface that can be used to know which users are logged in, know what kind of sessions they have open, suspend the "
-"system, inhibit system suspend, reboot the system, and other tasks."
+"Return a service that runs the @code{elogind} login and seat management "
+"daemon.  @uref{https://github.com/elogind/elogind, Elogind} exposes a D-Bus "
+"interface that can be used to know which users are logged in, know what kind "
+"of sessions they have open, suspend the system, inhibit system suspend, "
+"reboot the system, and other tasks."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12594
+#: doc/guix.texi:12643
 msgid ""
-"Elogind handles most system-level power events for a computer, for example suspending the system when a lid is closed, or shutting "
-"it down when the power button is pressed."
+"Elogind handles most system-level power events for a computer, for example "
+"suspending the system when a lid is closed, or shutting it down when the "
+"power button is pressed."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12599
+#: doc/guix.texi:12648
 msgid ""
-"The @var{config} keyword argument specifies the configuration for elogind, and should be the result of an @code{(elogind-"
-"configuration (@var{parameter} @var{value})...)} invocation.  Available parameters and their default values are:"
+"The @var{config} keyword argument specifies the configuration for elogind, "
+"and should be the result of an @code{(elogind-configuration (@var{parameter} "
+"@var{value})...)} invocation.  Available parameters and their default values "
+"are:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12601
+#: doc/guix.texi:12650
 #, no-wrap
 msgid "kill-user-processes?"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:12603 doc/guix.texi:12621 doc/guix.texi:12623 doc/guix.texi:12625 doc/guix.texi:12637
+#: doc/guix.texi:12652 doc/guix.texi:12670 doc/guix.texi:12672
+#: doc/guix.texi:12674 doc/guix.texi:12686
 msgid "#f"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12603
+#: doc/guix.texi:12652
 #, no-wrap
 msgid "kill-only-users"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:12605 doc/guix.texi:12643
+#: doc/guix.texi:12654 doc/guix.texi:12692
 msgid "()"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12605
+#: doc/guix.texi:12654
 #, no-wrap
 msgid "kill-exclude-users"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:12607
+#: doc/guix.texi:12656
 msgid "(\"root\")"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12607
+#: doc/guix.texi:12656
 #, no-wrap
 msgid "inhibit-delay-max-seconds"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:12609
+#: doc/guix.texi:12658
 msgid "5"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12609
+#: doc/guix.texi:12658
 #, no-wrap
 msgid "handle-power-key"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:12611
+#: doc/guix.texi:12660
 msgid "poweroff"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12611
+#: doc/guix.texi:12660
 #, no-wrap
 msgid "handle-suspend-key"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:12613 doc/guix.texi:12617
+#: doc/guix.texi:12662 doc/guix.texi:12666
 msgid "suspend"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12613
+#: doc/guix.texi:12662
 #, no-wrap
 msgid "handle-hibernate-key"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:12615
+#: doc/guix.texi:12664
 msgid "hibernate"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12615
+#: doc/guix.texi:12664
 #, no-wrap
 msgid "handle-lid-switch"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12617
+#: doc/guix.texi:12666
 #, no-wrap
 msgid "handle-lid-switch-docked"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:12619 doc/guix.texi:12631
+#: doc/guix.texi:12668 doc/guix.texi:12680
 msgid "ignore"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12619
+#: doc/guix.texi:12668
 #, no-wrap
 msgid "power-key-ignore-inhibited?"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12621
+#: doc/guix.texi:12670
 #, no-wrap
 msgid "suspend-key-ignore-inhibited?"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12623
+#: doc/guix.texi:12672
 #, no-wrap
 msgid "hibernate-key-ignore-inhibited?"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12625
+#: doc/guix.texi:12674
 #, no-wrap
 msgid "lid-switch-ignore-inhibited?"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:12627 doc/guix.texi:12639
+#: doc/guix.texi:12676 doc/guix.texi:12688
 msgid "#t"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12627
+#: doc/guix.texi:12676
 #, no-wrap
 msgid "holdoff-timeout-seconds"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:12629
+#: doc/guix.texi:12678
 msgid "30"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12629
+#: doc/guix.texi:12678
 #, no-wrap
 msgid "idle-action"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12631
+#: doc/guix.texi:12680
 #, no-wrap
 msgid "idle-action-seconds"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:12633
+#: doc/guix.texi:12682
 msgid "(* 30 60)"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12633
+#: doc/guix.texi:12682
 #, no-wrap
 msgid "runtime-directory-size-percent"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:12635
+#: doc/guix.texi:12684
 msgid "10"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12635
+#: doc/guix.texi:12684
 #, no-wrap
 msgid "runtime-directory-size"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12637
+#: doc/guix.texi:12686
 #, no-wrap
 msgid "remove-ipc?"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12639
+#: doc/guix.texi:12688
 #, no-wrap
 msgid "suspend-state"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:12641
+#: doc/guix.texi:12690
 msgid "(\"mem\" \"standby\" \"freeze\")"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12641
+#: doc/guix.texi:12690
 #, no-wrap
 msgid "suspend-mode"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12643
+#: doc/guix.texi:12692
 #, no-wrap
 msgid "hibernate-state"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:12645 doc/guix.texi:12649
+#: doc/guix.texi:12694 doc/guix.texi:12698
 msgid "(\"disk\")"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12645
+#: doc/guix.texi:12694
 #, no-wrap
 msgid "hibernate-mode"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:12647
+#: doc/guix.texi:12696
 msgid "(\"platform\" \"shutdown\")"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12647
+#: doc/guix.texi:12696
 #, no-wrap
 msgid "hybrid-sleep-state"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12649
+#: doc/guix.texi:12698
 #, no-wrap
 msgid "hybrid-sleep-mode"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:12651
+#: doc/guix.texi:12700
 msgid "(\"suspend\" \"platform\" \"shutdown\")"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12654
+#: doc/guix.texi:12703
 #, no-wrap
 msgid "{Scheme Procedure} accountsservice-service @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12662
+#: doc/guix.texi:12711
 msgid ""
-"[#:accountsservice @var{accountsservice}] Return a service that runs AccountsService, a system service that can list available "
-"accounts, change their passwords, and so on.  AccountsService integrates with PolicyKit to enable unprivileged users to acquire the "
-"capability to modify their system configuration.  @uref{https://www.freedesktop.org/wiki/Software/AccountsService/, the "
-"accountsservice web site} for more information."
+"[#:accountsservice @var{accountsservice}] Return a service that runs "
+"AccountsService, a system service that can list available accounts, change "
+"their passwords, and so on.  AccountsService integrates with PolicyKit to "
+"enable unprivileged users to acquire the capability to modify their system "
+"configuration.  @uref{https://www.freedesktop.org/wiki/Software/"
+"AccountsService/, the accountsservice web site} for more information."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12665
-msgid "The @var{accountsservice} keyword argument is the @code{accountsservice} package to expose as a service."
+#: doc/guix.texi:12714
+msgid ""
+"The @var{accountsservice} keyword argument is the @code{accountsservice} "
+"package to expose as a service."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12667
+#: doc/guix.texi:12716
 #, no-wrap
 msgid "{Scheme Procedure} polkit-service @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12676
+#: doc/guix.texi:12725
 msgid ""
-"[#:polkit @var{polkit}] Return a service that runs the @uref{http://www.freedesktop.org/wiki/Software/polkit/, Polkit privilege "
-"management service}, which allows system administrators to grant access to privileged operations in a structured way.  By querying "
-"the Polkit service, a privileged system component can know when it should grant additional capabilities to ordinary users.  For "
-"example, an ordinary user can be granted the capability to suspend the system if the user is logged in locally."
+"[#:polkit @var{polkit}] Return a service that runs the @uref{http://www."
+"freedesktop.org/wiki/Software/polkit/, Polkit privilege management service}, "
+"which allows system administrators to grant access to privileged operations "
+"in a structured way.  By querying the Polkit service, a privileged system "
+"component can know when it should grant additional capabilities to ordinary "
+"users.  For example, an ordinary user can be granted the capability to "
+"suspend the system if the user is logged in locally."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12678
+#: doc/guix.texi:12727
 #, no-wrap
 msgid "{Scheme Procedure} upower-service [#:upower @var{upower}] @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12695
+#: doc/guix.texi:12744
 msgid ""
-"[#:watts-up-pro? #f] @ [#:poll-batteries? #t] @ [#:ignore-lid? #f] @ [#:use-percentage-for-policy? #f] @ [#:percentage-low 10] @ [#:"
-"percentage-critical 3] @ [#:percentage-action 2] @ [#:time-low 1200] @ [#:time-critical 300] @ [#:time-action 120] @ [#:critical-"
-"power-action 'hybrid-sleep] Return a service that runs @uref{http://upower.freedesktop.org/, @command{upowerd}}, a system-wide "
-"monitor for power consumption and battery levels, with the given configuration settings.  It implements the @code{org.freedesktop."
+"[#:watts-up-pro? #f] @ [#:poll-batteries? #t] @ [#:ignore-lid? #f] @ [#:use-"
+"percentage-for-policy? #f] @ [#:percentage-low 10] @ [#:percentage-critical "
+"3] @ [#:percentage-action 2] @ [#:time-low 1200] @ [#:time-critical 300] @ "
+"[#:time-action 120] @ [#:critical-power-action 'hybrid-sleep] Return a "
+"service that runs @uref{http://upower.freedesktop.org/, @command{upowerd}}, "
+"a system-wide monitor for power consumption and battery levels, with the "
+"given configuration settings.  It implements the @code{org.freedesktop."
 "UPower} D-Bus interface, and is notably used by GNOME."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12697
+#: doc/guix.texi:12746
 #, no-wrap
 msgid "{Scheme Procedure} udisks-service [#:udisks @var{udisks}]"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12702
+#: doc/guix.texi:12751
 msgid ""
-"Return a service for @uref{http://udisks.freedesktop.org/docs/latest/, UDisks}, a @dfn{disk management} daemon that provides user "
-"interfaces with notifications and ways to mount/unmount disks.  Programs that talk to UDisks include the @command{udisksctl} "
-"command, part of UDisks, and GNOME Disks."
+"Return a service for @uref{http://udisks.freedesktop.org/docs/latest/, "
+"UDisks}, a @dfn{disk management} daemon that provides user interfaces with "
+"notifications and ways to mount/unmount disks.  Programs that talk to UDisks "
+"include the @command{udisksctl} command, part of UDisks, and GNOME Disks."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12704
+#: doc/guix.texi:12753
 #, no-wrap
 msgid "{Scheme Procedure} colord-service [#:colord @var{colord}]"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12710
+#: doc/guix.texi:12759
 msgid ""
-"Return a service that runs @command{colord}, a system service with a D-Bus interface to manage the color profiles of input and "
-"output devices such as screens and scanners.  It is notably used by the GNOME Color Manager graphical tool.  See @uref{http://www."
-"freedesktop.org/software/colord/, the colord web site} for more information."
+"Return a service that runs @command{colord}, a system service with a D-Bus "
+"interface to manage the color profiles of input and output devices such as "
+"screens and scanners.  It is notably used by the GNOME Color Manager "
+"graphical tool.  See @uref{http://www.freedesktop.org/software/colord/, the "
+"colord web site} for more information."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12712
+#: doc/guix.texi:12761
 #, no-wrap
 msgid "{Scheme Procedure} geoclue-application name [#:allowed? #t] [#:system? #f] [#:users '()]"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12721
+#: doc/guix.texi:12770
 msgid ""
-"Return a configuration allowing an application to access GeoClue location data.  @var{name} is the Desktop ID of the application, "
-"without the @code{.desktop} part.  If @var{allowed?} is true, the application will have access to location information by default.  "
-"The boolean @var{system?} value indicates whether an application is a system component or not.  Finally @var{users} is a list of "
-"UIDs of all users for which this application is allowed location info access.  An empty users list means that all users are allowed."
+"Return a configuration allowing an application to access GeoClue location "
+"data.  @var{name} is the Desktop ID of the application, without the @code{."
+"desktop} part.  If @var{allowed?} is true, the application will have access "
+"to location information by default.  The boolean @var{system?} value "
+"indicates whether an application is a system component or not.  Finally "
+"@var{users} is a list of UIDs of all users for which this application is "
+"allowed location info access.  An empty users list means that all users are "
+"allowed."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:12723
+#: doc/guix.texi:12772
 #, no-wrap
 msgid "{Scheme Variable} %standard-geoclue-applications"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:12730
+#: doc/guix.texi:12779
 msgid ""
-"The standard list of well-known GeoClue application configurations, granting authority to the GNOME date-and-time utility to ask for "
-"the current location in order to set the time zone, and allowing the IceCat and Epiphany web browsers to request location "
-"information.  IceCat and Epiphany both query the user before allowing a web page to know the user's location."
+"The standard list of well-known GeoClue application configurations, granting "
+"authority to the GNOME date-and-time utility to ask for the current location "
+"in order to set the time zone, and allowing the IceCat and Epiphany web "
+"browsers to request location information.  IceCat and Epiphany both query "
+"the user before allowing a web page to know the user's location."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12732
+#: doc/guix.texi:12781
 #, no-wrap
 msgid "{Scheme Procedure} geoclue-service [#:colord @var{colord}] @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12745
+#: doc/guix.texi:12794
 msgid ""
-"[#:whitelist '()] @ [#:wifi-geolocation-url \"https://location.services.mozilla.com/v1/geolocate?key=geoclue\"] @ [#:submit-data? "
-"#f] [#:wifi-submission-url \"https://location.services.mozilla.com/v1/submit?key=geoclue\"] @ [#:submission-nick \"geoclue\"] @ [#:"
-"applications %standard-geoclue-applications] Return a service that runs the GeoClue location service.  This service provides a D-Bus "
-"interface to allow applications to request access to a user's physical location, and optionally to add information to online "
-"location databases.  See @uref{https://wiki.freedesktop.org/www/Software/GeoClue/, the GeoClue web site} for more information."
+"[#:whitelist '()] @ [#:wifi-geolocation-url \"https://location.services."
+"mozilla.com/v1/geolocate?key=geoclue\"] @ [#:submit-data? #f] [#:wifi-"
+"submission-url \"https://location.services.mozilla.com/v1/submit?key=geoclue"
+"\"] @ [#:submission-nick \"geoclue\"] @ [#:applications %standard-geoclue-"
+"applications] Return a service that runs the GeoClue location service.  This "
+"service provides a D-Bus interface to allow applications to request access "
+"to a user's physical location, and optionally to add information to online "
+"location databases.  See @uref{https://wiki.freedesktop.org/www/Software/"
+"GeoClue/, the GeoClue web site} for more information."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12747
+#: doc/guix.texi:12796
 #, no-wrap
 msgid "{Scheme Procedure} bluetooth-service [#:bluez @var{bluez}] @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12754
+#: doc/guix.texi:12803
 msgid ""
-"[@w{#:auto-enable? #f}] Return a service that runs the @command{bluetoothd} daemon, which manages all the Bluetooth devices and "
-"provides a number of D-Bus interfaces.  When AUTO-ENABLE? is true, the bluetooth controller is powered automatically at boot, which "
-"can be useful when using a bluetooth keyboard or mouse."
+"[@w{#:auto-enable? #f}] Return a service that runs the @command{bluetoothd} "
+"daemon, which manages all the Bluetooth devices and provides a number of D-"
+"Bus interfaces.  When AUTO-ENABLE? is true, the bluetooth controller is "
+"powered automatically at boot, which can be useful when using a bluetooth "
+"keyboard or mouse."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12756
+#: doc/guix.texi:12805
 msgid "Users need to be in the @code{lp} group to access the D-Bus service."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:12762
+#: doc/guix.texi:12811
 #, no-wrap
 msgid "SQL"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:12764
-msgid "The @code{(gnu services databases)} module provides the following services."
+#: doc/guix.texi:12813
+msgid ""
+"The @code{(gnu services databases)} module provides the following services."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12765
+#: doc/guix.texi:12814
 #, no-wrap
 msgid "{Scheme Procedure} postgresql-service [#:postgresql postgresql] @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12770
+#: doc/guix.texi:12819
 msgid ""
-"[#:config-file] [#:data-directory ``/var/lib/postgresql/data''] @ [#:port 5432] [#:locale ``en_US.utf8''] Return a service that runs "
-"@var{postgresql}, the PostgreSQL database server."
+"[#:config-file] [#:data-directory ``/var/lib/postgresql/data''] @ [#:port "
+"5432] [#:locale ``en_US.utf8''] Return a service that runs @var{postgresql}, "
+"the PostgreSQL database server."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12774
+#: doc/guix.texi:12823
 msgid ""
-"The PostgreSQL daemon loads its runtime configuration from @var{config-file}, creates a database cluster with @var{locale} as the "
-"default locale, stored in @var{data-directory}.  It then listens on @var{port}."
+"The PostgreSQL daemon loads its runtime configuration from @var{config-"
+"file}, creates a database cluster with @var{locale} as the default locale, "
+"stored in @var{data-directory}.  It then listens on @var{port}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12776
+#: doc/guix.texi:12825
 #, no-wrap
 msgid "{Scheme Procedure} mysql-service [#:config (mysql-configuration)]"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12779
-msgid "Return a service that runs @command{mysqld}, the MySQL or MariaDB database server."
+#: doc/guix.texi:12828
+msgid ""
+"Return a service that runs @command{mysqld}, the MySQL or MariaDB database "
+"server."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12782
+#: doc/guix.texi:12831
 msgid ""
-"The optional @var{config} argument specifies the configuration for @command{mysqld}, which should be a @code{<mysql-configuration>} "
-"object."
+"The optional @var{config} argument specifies the configuration for "
+"@command{mysqld}, which should be a @code{<mysql-configuration>} object."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:12784
+#: doc/guix.texi:12833
 #, no-wrap
 msgid "{Data Type} mysql-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:12786
+#: doc/guix.texi:12835
 msgid "Data type representing the configuration of @var{mysql-service}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12788
+#: doc/guix.texi:12837
 #, no-wrap
 msgid "@code{mysql} (default: @var{mariadb})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12791
-msgid "Package object of the MySQL database server, can be either @var{mariadb} or @var{mysql}."
+#: doc/guix.texi:12840
+msgid ""
+"Package object of the MySQL database server, can be either @var{mariadb} or "
+"@var{mysql}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12794
-msgid "For MySQL, a temporary root password will be displayed at activation time.  For MariaDB, the root password is empty."
+#: doc/guix.texi:12843
+msgid ""
+"For MySQL, a temporary root password will be displayed at activation time.  "
+"For MariaDB, the root password is empty."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12795
+#: doc/guix.texi:12844
 #, no-wrap
 msgid "@code{port} (default: @code{3306})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12797
+#: doc/guix.texi:12846
 msgid "TCP port on which the database server listens for incoming connections."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:12800
+#: doc/guix.texi:12849
 #, no-wrap
 msgid "{Scheme Variable} memcached-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:12804
+#: doc/guix.texi:12853
 msgid ""
-"This is the service type for the @uref{https://memcached.org/, Memcached} service, which provides a distributed in memory cache.  "
-"The value for the service type is a @code{memcached-configuration} object."
+"This is the service type for the @uref{https://memcached.org/, Memcached} "
+"service, which provides a distributed in memory cache.  The value for the "
+"service type is a @code{memcached-configuration} object."
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:12808
+#: doc/guix.texi:12857
 #, no-wrap
 msgid "(service memcached-service-type)\n"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:12810
+#: doc/guix.texi:12859
 #, no-wrap
 msgid "{Data Type} memcached-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:12812
+#: doc/guix.texi:12861
 msgid "Data type representing the configuration of memcached."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12814
+#: doc/guix.texi:12863
 #, no-wrap
 msgid "@code{memcached} (default: @code{memcached})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12816
+#: doc/guix.texi:12865
 msgid "The Memcached package to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12817
+#: doc/guix.texi:12866
 #, no-wrap
 msgid "@code{interfaces} (default: @code{'(\"0.0.0.0\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12819
+#: doc/guix.texi:12868
 msgid "Network interfaces on which to listen."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12820
+#: doc/guix.texi:12869
 #, no-wrap
 msgid "@code{tcp-port} (default: @code{11211})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12822
+#: doc/guix.texi:12871
 msgid "Port on which to accept connections on,"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12823
+#: doc/guix.texi:12872
 #, no-wrap
 msgid "@code{udp-port} (default: @code{11211})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12826
-msgid "Port on which to accept UDP connections on, a value of 0 will disable listening on a UDP socket."
+#: doc/guix.texi:12875
+msgid ""
+"Port on which to accept UDP connections on, a value of 0 will disable "
+"listening on a UDP socket."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12827
+#: doc/guix.texi:12876
 #, no-wrap
 msgid "@code{additional-options} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12829
+#: doc/guix.texi:12878
 msgid "Additional command line options to pass to @code{memcached}."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:12832
+#: doc/guix.texi:12881
 #, no-wrap
 msgid "{Scheme Variable} mongodb-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:12835
+#: doc/guix.texi:12884
 msgid ""
-"This is the service type for @uref{https://www.mongodb.com/, MongoDB}.  The value for the service type is a @code{mongodb-"
-"configuration} object."
+"This is the service type for @uref{https://www.mongodb.com/, MongoDB}.  The "
+"value for the service type is a @code{mongodb-configuration} object."
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:12839
+#: doc/guix.texi:12888
 #, no-wrap
 msgid "(service mongodb-service-type)\n"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:12841
+#: doc/guix.texi:12890
 #, no-wrap
 msgid "{Data Type} mongodb-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:12843
+#: doc/guix.texi:12892
 msgid "Data type representing the configuration of mongodb."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12845
+#: doc/guix.texi:12894
 #, no-wrap
 msgid "@code{mongodb} (default: @code{mongodb})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12847
+#: doc/guix.texi:12896
 msgid "The MongoDB package to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12848
+#: doc/guix.texi:12897
 #, no-wrap
 msgid "@code{config-file} (default: @code{%default-mongodb-configuration-file})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12850
+#: doc/guix.texi:12899
 msgid "The configuration file for MongoDB."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12851
+#: doc/guix.texi:12900
 #, no-wrap
 msgid "@code{data-directory} (default: @code{\"/var/lib/mongodb\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12855
+#: doc/guix.texi:12904
 msgid ""
-"This value is used to create the directory, so that it exists and is owned by the mongodb user.  It should match the data-directory "
-"which MongoDB is configured to use through the configuration file."
+"This value is used to create the directory, so that it exists and is owned "
+"by the mongodb user.  It should match the data-directory which MongoDB is "
+"configured to use through the configuration file."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:12858
+#: doc/guix.texi:12907
 #, no-wrap
 msgid "{Scheme Variable} redis-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:12861
+#: doc/guix.texi:12910
 msgid ""
-"This is the service type for the @uref{https://redis.io/, Redis} key/value store, whose value is a @code{redis-configuration} object."
+"This is the service type for the @uref{https://redis.io/, Redis} key/value "
+"store, whose value is a @code{redis-configuration} object."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:12863
+#: doc/guix.texi:12912
 #, no-wrap
 msgid "{Data Type} redis-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:12865
+#: doc/guix.texi:12914
 msgid "Data type representing the configuration of redis."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12867
+#: doc/guix.texi:12916
 #, no-wrap
 msgid "@code{redis} (default: @code{redis})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12869
+#: doc/guix.texi:12918
 msgid "The Redis package to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12870
+#: doc/guix.texi:12919
 #, no-wrap
 msgid "@code{bind} (default: @code{\"127.0.0.1\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12872
+#: doc/guix.texi:12921
 msgid "Network interface on which to listen."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12873
+#: doc/guix.texi:12922
 #, no-wrap
 msgid "@code{port} (default: @code{6379})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12876
-msgid "Port on which to accept connections on, a value of 0 will disable listening on a TCP socket."
+#: doc/guix.texi:12925
+msgid ""
+"Port on which to accept connections on, a value of 0 will disable listening "
+"on a TCP socket."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12877
+#: doc/guix.texi:12926
 #, no-wrap
 msgid "@code{working-directory} (default: @code{\"/var/lib/redis\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12879
+#: doc/guix.texi:12928
 msgid "Directory in which to store the database and related files."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:12885
+#: doc/guix.texi:12934
 #, no-wrap
 msgid "mail"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:12886 doc/guix.texi:15981
+#: doc/guix.texi:12935 doc/guix.texi:16030
 #, no-wrap
 msgid "email"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:12891
+#: doc/guix.texi:12940
 msgid ""
-"The @code{(gnu services mail)} module provides Guix service definitions for email services: IMAP, POP3, and LMTP servers, as well as "
-"mail transport agents (MTAs).  Lots of acronyms! These services are detailed in the subsections below."
+"The @code{(gnu services mail)} module provides Guix service definitions for "
+"email services: IMAP, POP3, and LMTP servers, as well as mail transport "
+"agents (MTAs).  Lots of acronyms! These services are detailed in the "
+"subsections below."
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:12892
+#: doc/guix.texi:12941
 #, no-wrap
 msgid "Dovecot Service"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12894
+#: doc/guix.texi:12943
 #, no-wrap
 msgid "{Scheme Procedure} dovecot-service [#:config (dovecot-configuration)]"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12896
+#: doc/guix.texi:12945
 msgid "Return a service that runs the Dovecot IMAP/POP3/LMTP mail server."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:12906
+#: doc/guix.texi:12955
 msgid ""
-"By default, Dovecot does not need much configuration; the default configuration object created by @code{(dovecot-configuration)} "
-"will suffice if your mail is delivered to @code{~/Maildir}.  A self-signed certificate will be generated for TLS-protected "
-"connections, though Dovecot will also listen on cleartext ports by default.  There are a number of options, though, which mail "
-"administrators might need to change, and as is the case with other services, Guix allows the system administrator to specify these "
+"By default, Dovecot does not need much configuration; the default "
+"configuration object created by @code{(dovecot-configuration)} will suffice "
+"if your mail is delivered to @code{~/Maildir}.  A self-signed certificate "
+"will be generated for TLS-protected connections, though Dovecot will also "
+"listen on cleartext ports by default.  There are a number of options, "
+"though, which mail administrators might need to change, and as is the case "
+"with other services, Guix allows the system administrator to specify these "
 "parameters via a uniform Scheme interface."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:12909
-msgid "For example, to specify that mail is located at @code{maildir~/.mail}, one would instantiate the Dovecot service like this:"
+#: doc/guix.texi:12958
+msgid ""
+"For example, to specify that mail is located at @code{maildir~/.mail}, one "
+"would instantiate the Dovecot service like this:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:12914
+#: doc/guix.texi:12963
 #, no-wrap
 msgid ""
 "(dovecot-service #:config\n"
@@ -25080,2599 +29023,2840 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:12922
+#: doc/guix.texi:12971
 msgid ""
-"The available configuration parameters follow.  Each parameter definition is preceded by its type; for example, @samp{string-list "
-"foo} indicates that the @code{foo} parameter should be specified as a list of strings.  There is also a way to specify the "
-"configuration as a string, if you have an old @code{dovecot.conf} file that you want to port over from some other system; see the "
-"end for more details."
+"The available configuration parameters follow.  Each parameter definition is "
+"preceded by its type; for example, @samp{string-list foo} indicates that the "
+"@code{foo} parameter should be specified as a list of strings.  There is "
+"also a way to specify the configuration as a string, if you have an old "
+"@code{dovecot.conf} file that you want to port over from some other system; "
+"see the end for more details."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:12932
+#: doc/guix.texi:12981
 msgid "Available @code{dovecot-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12933
+#: doc/guix.texi:12982
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} package dovecot"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12935 doc/guix.texi:14222
+#: doc/guix.texi:12984 doc/guix.texi:14271
 msgid "The dovecot package."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12937
+#: doc/guix.texi:12986
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} comma-separated-string-list listen"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12943
+#: doc/guix.texi:12992
 msgid ""
-"A list of IPs or hosts where to listen for connections.  @samp{*} listens on all IPv4 interfaces, @samp{::} listens on all IPv6 "
-"interfaces.  If you want to specify non-default ports or anything more complex, customize the address and port fields of the "
-"@samp{inet-listener} of the specific services you are interested in."
+"A list of IPs or hosts where to listen for connections.  @samp{*} listens on "
+"all IPv4 interfaces, @samp{::} listens on all IPv6 interfaces.  If you want "
+"to specify non-default ports or anything more complex, customize the address "
+"and port fields of the @samp{inet-listener} of the specific services you are "
+"interested in."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12945
+#: doc/guix.texi:12994
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} protocol-configuration-list protocols"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12948
-msgid "List of protocols we want to serve.  Available protocols include @samp{imap}, @samp{pop3}, and @samp{lmtp}."
+#: doc/guix.texi:12997
+msgid ""
+"List of protocols we want to serve.  Available protocols include "
+"@samp{imap}, @samp{pop3}, and @samp{lmtp}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12950
+#: doc/guix.texi:12999
 msgid "Available @code{protocol-configuration} fields are:"
 msgstr ""
 
-#. type: deftypevr
-#: doc/guix.texi:12951
-#, no-wrap
-msgid "{@code{protocol-configuration} parameter} string name"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:12953
-msgid "The name of the protocol."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:12955
-#, no-wrap
-msgid "{@code{protocol-configuration} parameter} string auth-socket-path"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:12959
-msgid ""
-"UNIX socket path to the master authentication server to find users.  This is used by imap (for shared users) and lda.  It defaults "
-"to @samp{\"/var/run/dovecot/auth-userdb\"}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:12961
-#, no-wrap
-msgid "{@code{protocol-configuration} parameter} space-separated-string-list mail-plugins"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:12963
-msgid "Space separated list of plugins to load."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:12965
-#, no-wrap
-msgid "{@code{protocol-configuration} parameter} non-negative-integer mail-max-userip-connections"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:12969
-msgid ""
-"Maximum number of IMAP connections allowed for a user from each IP address.  NOTE: The username is compared case-sensitively.  "
-"Defaults to @samp{10}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:12973
-#, no-wrap
-msgid "{@code{dovecot-configuration} parameter} service-configuration-list services"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:12977
-msgid ""
-"List of services to enable.  Available services include @samp{imap}, @samp{imap-login}, @samp{pop3}, @samp{pop3-login}, @samp{auth}, "
-"and @samp{lmtp}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:12979
-msgid "Available @code{service-configuration} fields are:"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:12980
-#, no-wrap
-msgid "{@code{service-configuration} parameter} string kind"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:12985
-msgid ""
-"The service kind.  Valid values include @code{director}, @code{imap-login}, @code{pop3-login}, @code{lmtp}, @code{imap}, "
-"@code{pop3}, @code{auth}, @code{auth-worker}, @code{dict}, @code{tcpwrap}, @code{quota-warning}, or anything else."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:12987
-#, no-wrap
-msgid "{@code{service-configuration} parameter} listener-configuration-list listeners"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:12992
-msgid ""
-"Listeners for the service.  A listener is either a @code{unix-listener-configuration}, a @code{fifo-listener-configuration}, or an "
-"@code{inet-listener-configuration}.  Defaults to @samp{()}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:12994
-msgid "Available @code{unix-listener-configuration} fields are:"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:12995
-#, no-wrap
-msgid "{@code{unix-listener-configuration} parameter} string path"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:12998 doc/guix.texi:13021
-msgid "Path to the file, relative to @code{base-dir} field.  This is also used as the section name."
-msgstr ""
-
 #. type: deftypevr
 #: doc/guix.texi:13000
 #, no-wrap
-msgid "{@code{unix-listener-configuration} parameter} string mode"
+msgid "{@code{protocol-configuration} parameter} string name"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13003 doc/guix.texi:13026
-msgid "The access mode for the socket.  Defaults to @samp{\"0600\"}."
+#: doc/guix.texi:13002
+msgid "The name of the protocol."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13005
+#: doc/guix.texi:13004
 #, no-wrap
-msgid "{@code{unix-listener-configuration} parameter} string user"
+msgid "{@code{protocol-configuration} parameter} string auth-socket-path"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13008 doc/guix.texi:13031
-msgid "The user to own the socket.  Defaults to @samp{\"\"}."
+#: doc/guix.texi:13008
+msgid ""
+"UNIX socket path to the master authentication server to find users.  This is "
+"used by imap (for shared users) and lda.  It defaults to @samp{\"/var/run/"
+"dovecot/auth-userdb\"}."
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:13010
 #, no-wrap
-msgid "{@code{unix-listener-configuration} parameter} string group"
+msgid "{@code{protocol-configuration} parameter} space-separated-string-list mail-plugins"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13013 doc/guix.texi:13036
-msgid "The group to own the socket.  Defaults to @samp{\"\"}."
+#: doc/guix.texi:13012
+msgid "Space separated list of plugins to load."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13017
-msgid "Available @code{fifo-listener-configuration} fields are:"
+#: doc/guix.texi:13014
+#, no-wrap
+msgid "{@code{protocol-configuration} parameter} non-negative-integer mail-max-userip-connections"
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:13018
-#, no-wrap
-msgid "{@code{fifo-listener-configuration} parameter} string path"
+msgid ""
+"Maximum number of IMAP connections allowed for a user from each IP address.  "
+"NOTE: The username is compared case-sensitively.  Defaults to @samp{10}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13023
+#: doc/guix.texi:13022
 #, no-wrap
-msgid "{@code{fifo-listener-configuration} parameter} string mode"
+msgid "{@code{dovecot-configuration} parameter} service-configuration-list services"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:13026
+msgid ""
+"List of services to enable.  Available services include @samp{imap}, "
+"@samp{imap-login}, @samp{pop3}, @samp{pop3-login}, @samp{auth}, and "
+"@samp{lmtp}."
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:13028
-#, no-wrap
-msgid "{@code{fifo-listener-configuration} parameter} string user"
+msgid "Available @code{service-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13033
+#: doc/guix.texi:13029
 #, no-wrap
-msgid "{@code{fifo-listener-configuration} parameter} string group"
+msgid "{@code{service-configuration} parameter} string kind"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13040
-msgid "Available @code{inet-listener-configuration} fields are:"
+#: doc/guix.texi:13034
+msgid ""
+"The service kind.  Valid values include @code{director}, @code{imap-login}, "
+"@code{pop3-login}, @code{lmtp}, @code{imap}, @code{pop3}, @code{auth}, "
+"@code{auth-worker}, @code{dict}, @code{tcpwrap}, @code{quota-warning}, or "
+"anything else."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:13036
+#, no-wrap
+msgid "{@code{service-configuration} parameter} listener-configuration-list listeners"
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:13041
-#, no-wrap
-msgid "{@code{inet-listener-configuration} parameter} string protocol"
+msgid ""
+"Listeners for the service.  A listener is either a @code{unix-listener-"
+"configuration}, a @code{fifo-listener-configuration}, or an @code{inet-"
+"listener-configuration}.  Defaults to @samp{()}."
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:13043
-msgid "The protocol to listen for."
+msgid "Available @code{unix-listener-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13045
+#: doc/guix.texi:13044
 #, no-wrap
-msgid "{@code{inet-listener-configuration} parameter} string address"
+msgid "{@code{unix-listener-configuration} parameter} string path"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13048
-msgid "The address on which to listen, or empty for all addresses.  Defaults to @samp{\"\"}."
+#: doc/guix.texi:13047 doc/guix.texi:13070
+msgid ""
+"Path to the file, relative to @code{base-dir} field.  This is also used as "
+"the section name."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13050
+#: doc/guix.texi:13049
 #, no-wrap
-msgid "{@code{inet-listener-configuration} parameter} non-negative-integer port"
+msgid "{@code{unix-listener-configuration} parameter} string mode"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13052
-msgid "The port on which to listen."
+#: doc/guix.texi:13052 doc/guix.texi:13075
+msgid "The access mode for the socket.  Defaults to @samp{\"0600\"}."
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:13054
 #, no-wrap
-msgid "{@code{inet-listener-configuration} parameter} boolean ssl?"
+msgid "{@code{unix-listener-configuration} parameter} string user"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13058
-msgid "Whether to use SSL for this service; @samp{yes}, @samp{no}, or @samp{required}.  Defaults to @samp{#t}."
+#: doc/guix.texi:13057 doc/guix.texi:13080
+msgid "The user to own the socket.  Defaults to @samp{\"\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13062
+#: doc/guix.texi:13059
 #, no-wrap
-msgid "{@code{service-configuration} parameter} non-negative-integer service-count"
+msgid "{@code{unix-listener-configuration} parameter} string group"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:13062 doc/guix.texi:13085
+msgid "The group to own the socket.  Defaults to @samp{\"\"}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:13066
+msgid "Available @code{fifo-listener-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:13067
-msgid ""
-"Number of connections to handle before starting a new process.  Typically the only useful values are 0 (unlimited) or 1.  1 is more "
-"secure, but 0 is faster.  <doc/wiki/LoginProcess.txt>.  Defaults to @samp{1}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:13069
 #, no-wrap
-msgid "{@code{service-configuration} parameter} non-negative-integer process-min-avail"
+msgid "{@code{fifo-listener-configuration} parameter} string path"
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:13072
-msgid "Number of processes to always keep waiting for more connections.  Defaults to @samp{0}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:13074
 #, no-wrap
-msgid "{@code{service-configuration} parameter} non-negative-integer vsz-limit"
+msgid "{@code{fifo-listener-configuration} parameter} string mode"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13078
-msgid "If you set @samp{service-count 0}, you probably need to grow this.  Defaults to @samp{256000000}."
+#: doc/guix.texi:13077
+#, no-wrap
+msgid "{@code{fifo-listener-configuration} parameter} string user"
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:13082
 #, no-wrap
+msgid "{@code{fifo-listener-configuration} parameter} string group"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:13089
+msgid "Available @code{inet-listener-configuration} fields are:"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:13090
+#, no-wrap
+msgid "{@code{inet-listener-configuration} parameter} string protocol"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:13092
+msgid "The protocol to listen for."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:13094
+#, no-wrap
+msgid "{@code{inet-listener-configuration} parameter} string address"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:13097
+msgid ""
+"The address on which to listen, or empty for all addresses.  Defaults to "
+"@samp{\"\"}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:13099
+#, no-wrap
+msgid "{@code{inet-listener-configuration} parameter} non-negative-integer port"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:13101
+msgid "The port on which to listen."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:13103
+#, no-wrap
+msgid "{@code{inet-listener-configuration} parameter} boolean ssl?"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:13107
+msgid ""
+"Whether to use SSL for this service; @samp{yes}, @samp{no}, or "
+"@samp{required}.  Defaults to @samp{#t}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:13111
+#, no-wrap
+msgid "{@code{service-configuration} parameter} non-negative-integer service-count"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:13116
+msgid ""
+"Number of connections to handle before starting a new process.  Typically "
+"the only useful values are 0 (unlimited) or 1.  1 is more secure, but 0 is "
+"faster.  <doc/wiki/LoginProcess.txt>.  Defaults to @samp{1}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:13118
+#, no-wrap
+msgid "{@code{service-configuration} parameter} non-negative-integer process-min-avail"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:13121
+msgid ""
+"Number of processes to always keep waiting for more connections.  Defaults "
+"to @samp{0}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:13123
+#, no-wrap
+msgid "{@code{service-configuration} parameter} non-negative-integer vsz-limit"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:13127
+msgid ""
+"If you set @samp{service-count 0}, you probably need to grow this.  Defaults "
+"to @samp{256000000}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:13131
+#, no-wrap
 msgid "{@code{dovecot-configuration} parameter} dict-configuration dict"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13085
-msgid "Dict configuration, as created by the @code{dict-configuration} constructor."
+#: doc/guix.texi:13134
+msgid ""
+"Dict configuration, as created by the @code{dict-configuration} constructor."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13087
+#: doc/guix.texi:13136
 msgid "Available @code{dict-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13088
+#: doc/guix.texi:13137
 #, no-wrap
 msgid "{@code{dict-configuration} parameter} free-form-fields entries"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13091
-msgid "A list of key-value pairs that this dict should hold.  Defaults to @samp{()}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:13095
-#, no-wrap
-msgid "{@code{dovecot-configuration} parameter} passdb-configuration-list passdbs"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:13098
-msgid "A list of passdb configurations, each one created by the @code{passdb-configuration} constructor."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:13100
-msgid "Available @code{passdb-configuration} fields are:"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:13101
-#, no-wrap
-msgid "{@code{passdb-configuration} parameter} string driver"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:13106
+#: doc/guix.texi:13140
 msgid ""
-"The driver that the passdb should use.  Valid values include @samp{pam}, @samp{passwd}, @samp{shadow}, @samp{bsdauth}, and "
-"@samp{static}.  Defaults to @samp{\"pam\"}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:13108
-#, no-wrap
-msgid "{@code{passdb-configuration} parameter} space-separated-string-list args"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:13111
-msgid "Space separated list of arguments to the passdb driver.  Defaults to @samp{\"\"}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:13115
-#, no-wrap
-msgid "{@code{dovecot-configuration} parameter} userdb-configuration-list userdbs"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:13118
-msgid "List of userdb configurations, each one created by the @code{userdb-configuration} constructor."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:13120
-msgid "Available @code{userdb-configuration} fields are:"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:13121
-#, no-wrap
-msgid "{@code{userdb-configuration} parameter} string driver"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:13125
-msgid "The driver that the userdb should use.  Valid values include @samp{passwd} and @samp{static}.  Defaults to @samp{\"passwd\"}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:13127
-#, no-wrap
-msgid "{@code{userdb-configuration} parameter} space-separated-string-list args"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:13130
-msgid "Space separated list of arguments to the userdb driver.  Defaults to @samp{\"\"}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:13132
-#, no-wrap
-msgid "{@code{userdb-configuration} parameter} free-form-args override-fields"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:13135
-msgid "Override fields from passwd.  Defaults to @samp{()}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:13139
-#, no-wrap
-msgid "{@code{dovecot-configuration} parameter} plugin-configuration plugin-configuration"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:13142
-msgid "Plug-in configuration, created by the @code{plugin-configuration} constructor."
+"A list of key-value pairs that this dict should hold.  Defaults to @samp{()}."
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:13144
 #, no-wrap
-msgid "{@code{dovecot-configuration} parameter} list-of-namespace-configuration namespaces"
+msgid "{@code{dovecot-configuration} parameter} passdb-configuration-list passdbs"
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:13147
-msgid "List of namespaces.  Each item in the list is created by the @code{namespace-configuration} constructor."
+msgid ""
+"A list of passdb configurations, each one created by the @code{passdb-"
+"configuration} constructor."
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:13149
-msgid "Available @code{namespace-configuration} fields are:"
+msgid "Available @code{passdb-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:13150
 #, no-wrap
-msgid "{@code{namespace-configuration} parameter} string name"
+msgid "{@code{passdb-configuration} parameter} string driver"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13152
-msgid "Name for this namespace."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:13154
-#, no-wrap
-msgid "{@code{namespace-configuration} parameter} string type"
+#: doc/guix.texi:13155
+msgid ""
+"The driver that the passdb should use.  Valid values include @samp{pam}, "
+"@samp{passwd}, @samp{shadow}, @samp{bsdauth}, and @samp{static}.  Defaults "
+"to @samp{\"pam\"}."
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:13157
-msgid "Namespace type: @samp{private}, @samp{shared} or @samp{public}.  Defaults to @samp{\"private\"}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:13159
 #, no-wrap
-msgid "{@code{namespace-configuration} parameter} string separator"
+msgid "{@code{passdb-configuration} parameter} space-separated-string-list args"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13165
+#: doc/guix.texi:13160
 msgid ""
-"Hierarchy separator to use. You should use the same separator for all namespaces or some clients get confused.  @samp{/} is usually "
-"a good one.  The default however depends on the underlying mail storage format.  Defaults to @samp{\"\"}."
+"Space separated list of arguments to the passdb driver.  Defaults to "
+"@samp{\"\"}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:13164
+#, no-wrap
+msgid "{@code{dovecot-configuration} parameter} userdb-configuration-list userdbs"
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:13167
-#, no-wrap
-msgid "{@code{namespace-configuration} parameter} string prefix"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:13171
 msgid ""
-"Prefix required to access this namespace.  This needs to be different for all namespaces. For example @samp{Public/}.  Defaults to "
-"@samp{\"\"}."
+"List of userdb configurations, each one created by the @code{userdb-"
+"configuration} constructor."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13173
+#: doc/guix.texi:13169
+msgid "Available @code{userdb-configuration} fields are:"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:13170
 #, no-wrap
-msgid "{@code{namespace-configuration} parameter} string location"
+msgid "{@code{userdb-configuration} parameter} string driver"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13177
+#: doc/guix.texi:13174
 msgid ""
-"Physical location of the mailbox. This is in the same format as mail_location, which is also the default for it.  Defaults to "
-"@samp{\"\"}."
+"The driver that the userdb should use.  Valid values include @samp{passwd} "
+"and @samp{static}.  Defaults to @samp{\"passwd\"}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:13176
+#, no-wrap
+msgid "{@code{userdb-configuration} parameter} space-separated-string-list args"
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:13179
-#, no-wrap
-msgid "{@code{namespace-configuration} parameter} boolean inbox?"
+msgid ""
+"Space separated list of arguments to the userdb driver.  Defaults to "
+"@samp{\"\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13183
-msgid "There can be only one INBOX, and this setting defines which namespace has it.  Defaults to @samp{#f}."
+#: doc/guix.texi:13181
+#, no-wrap
+msgid "{@code{userdb-configuration} parameter} free-form-args override-fields"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13185
+#: doc/guix.texi:13184
+msgid "Override fields from passwd.  Defaults to @samp{()}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:13188
 #, no-wrap
-msgid "{@code{namespace-configuration} parameter} boolean hidden?"
+msgid "{@code{dovecot-configuration} parameter} plugin-configuration plugin-configuration"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:13191
+msgid ""
+"Plug-in configuration, created by the @code{plugin-configuration} "
+"constructor."
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:13193
-msgid ""
-"If namespace is hidden, it's not advertised to clients via NAMESPACE extension. You'll most likely also want to set @samp{list? "
-"#f}.  This is mostly useful when converting from another server with different namespaces which you want to deprecate but still keep "
-"working.  For example you can create hidden namespaces with prefixes @samp{~/mail/}, @samp{~%u/mail/} and @samp{mail/}.  Defaults to "
-"@samp{#f}."
+#, no-wrap
+msgid "{@code{dovecot-configuration} parameter} list-of-namespace-configuration namespaces"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13195
+#: doc/guix.texi:13196
+msgid ""
+"List of namespaces.  Each item in the list is created by the @code{namespace-"
+"configuration} constructor."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:13198
+msgid "Available @code{namespace-configuration} fields are:"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:13199
 #, no-wrap
-msgid "{@code{namespace-configuration} parameter} boolean list?"
+msgid "{@code{namespace-configuration} parameter} string name"
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:13201
-msgid ""
-"Show the mailboxes under this namespace with the LIST command. This makes the namespace visible for clients that do not support the "
-"NAMESPACE extension.  The special @code{children} value lists child mailboxes, but hides the namespace prefix.  Defaults to "
-"@samp{#t}."
+msgid "Name for this namespace."
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:13203
 #, no-wrap
-msgid "{@code{namespace-configuration} parameter} boolean subscriptions?"
+msgid "{@code{namespace-configuration} parameter} string type"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:13206
+msgid ""
+"Namespace type: @samp{private}, @samp{shared} or @samp{public}.  Defaults to "
+"@samp{\"private\"}."
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:13208
-msgid ""
-"Namespace handles its own subscriptions.  If set to @code{#f}, the parent namespace handles them.  The empty prefix should always "
-"have this as @code{#t}).  Defaults to @samp{#t}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:13210
 #, no-wrap
-msgid "{@code{namespace-configuration} parameter} mailbox-configuration-list mailboxes"
+msgid "{@code{namespace-configuration} parameter} string separator"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13213
-msgid "List of predefined mailboxes in this namespace.  Defaults to @samp{()}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:13215
-msgid "Available @code{mailbox-configuration} fields are:"
+#: doc/guix.texi:13214
+msgid ""
+"Hierarchy separator to use. You should use the same separator for all "
+"namespaces or some clients get confused.  @samp{/} is usually a good one.  "
+"The default however depends on the underlying mail storage format.  Defaults "
+"to @samp{\"\"}."
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:13216
 #, no-wrap
-msgid "{@code{mailbox-configuration} parameter} string name"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:13218
-msgid "Name for this mailbox."
+msgid "{@code{namespace-configuration} parameter} string prefix"
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:13220
-#, no-wrap
-msgid "{@code{mailbox-configuration} parameter} string auto"
+msgid ""
+"Prefix required to access this namespace.  This needs to be different for "
+"all namespaces. For example @samp{Public/}.  Defaults to @samp{\"\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13224
-msgid ""
-"@samp{create} will automatically create this mailbox.  @samp{subscribe} will both create and subscribe to the mailbox.  Defaults to "
-"@samp{\"no\"}."
+#: doc/guix.texi:13222
+#, no-wrap
+msgid "{@code{namespace-configuration} parameter} string location"
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:13226
-#, no-wrap
-msgid "{@code{mailbox-configuration} parameter} space-separated-string-list special-use"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:13231
 msgid ""
-"List of IMAP @code{SPECIAL-USE} attributes as specified by RFC 6154.  Valid values are @code{\\All}, @code{\\Archive}, "
-"@code{\\Drafts}, @code{\\Flagged}, @code{\\Junk}, @code{\\Sent}, and @code{\\Trash}.  Defaults to @samp{()}."
+"Physical location of the mailbox. This is in the same format as "
+"mail_location, which is also the default for it.  Defaults to @samp{\"\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13237
+#: doc/guix.texi:13228
 #, no-wrap
-msgid "{@code{dovecot-configuration} parameter} file-name base-dir"
+msgid "{@code{namespace-configuration} parameter} boolean inbox?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13240
-msgid "Base directory where to store runtime data.  Defaults to @samp{\"/var/run/dovecot/\"}."
+#: doc/guix.texi:13232
+msgid ""
+"There can be only one INBOX, and this setting defines which namespace has "
+"it.  Defaults to @samp{#f}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:13234
+#, no-wrap
+msgid "{@code{namespace-configuration} parameter} boolean hidden?"
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:13242
-#, no-wrap
-msgid "{@code{dovecot-configuration} parameter} string login-greeting"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:13245
-msgid "Greeting message for clients.  Defaults to @samp{\"Dovecot ready.\"}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:13247
-#, no-wrap
-msgid "{@code{dovecot-configuration} parameter} space-separated-string-list login-trusted-networks"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:13254
 msgid ""
-"List of trusted network ranges.  Connections from these IPs are allowed to override their IP addresses and ports (for logging and "
-"for authentication checks).  @samp{disable-plaintext-auth} is also ignored for these networks.  Typically you would specify your "
-"IMAP proxy servers here.  Defaults to @samp{()}."
+"If namespace is hidden, it's not advertised to clients via NAMESPACE "
+"extension. You'll most likely also want to set @samp{list? #f}.  This is "
+"mostly useful when converting from another server with different namespaces "
+"which you want to deprecate but still keep working.  For example you can "
+"create hidden namespaces with prefixes @samp{~/mail/}, @samp{~%u/mail/} and "
+"@samp{mail/}.  Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13256
+#: doc/guix.texi:13244
 #, no-wrap
-msgid "{@code{dovecot-configuration} parameter} space-separated-string-list login-access-sockets"
+msgid "{@code{namespace-configuration} parameter} boolean list?"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:13250
+msgid ""
+"Show the mailboxes under this namespace with the LIST command. This makes "
+"the namespace visible for clients that do not support the NAMESPACE "
+"extension.  The special @code{children} value lists child mailboxes, but "
+"hides the namespace prefix.  Defaults to @samp{#t}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:13252
+#, no-wrap
+msgid "{@code{namespace-configuration} parameter} boolean subscriptions?"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:13257
+msgid ""
+"Namespace handles its own subscriptions.  If set to @code{#f}, the parent "
+"namespace handles them.  The empty prefix should always have this as "
+"@code{#t}).  Defaults to @samp{#t}."
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:13259
-msgid "List of login access check sockets (e.g. tcpwrap).  Defaults to @samp{()}."
+#, no-wrap
+msgid "{@code{namespace-configuration} parameter} mailbox-configuration-list mailboxes"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13261
+#: doc/guix.texi:13262
+msgid "List of predefined mailboxes in this namespace.  Defaults to @samp{()}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:13264
+msgid "Available @code{mailbox-configuration} fields are:"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:13265
 #, no-wrap
-msgid "{@code{dovecot-configuration} parameter} boolean verbose-proctitle?"
+msgid "{@code{mailbox-configuration} parameter} string name"
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:13267
-msgid ""
-"Show more verbose process titles (in ps).  Currently shows user name and IP address.  Useful for seeing who is actually using the "
-"IMAP processes (e.g. shared mailboxes or if the same uid is used for multiple accounts).  Defaults to @samp{#f}."
+msgid "Name for this mailbox."
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:13269
 #, no-wrap
-msgid "{@code{dovecot-configuration} parameter} boolean shutdown-clients?"
+msgid "{@code{mailbox-configuration} parameter} string auto"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:13273
+msgid ""
+"@samp{create} will automatically create this mailbox.  @samp{subscribe} will "
+"both create and subscribe to the mailbox.  Defaults to @samp{\"no\"}."
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:13275
-msgid ""
-"Should all processes be killed when Dovecot master process shuts down.  Setting this to @code{#f} means that Dovecot can be upgraded "
-"without forcing existing client connections to close (although that could also be a problem if the upgrade is e.g. due to a security "
-"fix).  Defaults to @samp{#t}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:13277
 #, no-wrap
-msgid "{@code{dovecot-configuration} parameter} non-negative-integer doveadm-worker-count"
+msgid "{@code{mailbox-configuration} parameter} space-separated-string-list special-use"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13281
+#: doc/guix.texi:13280
 msgid ""
-"If non-zero, run mail commands via this many connections to doveadm server, instead of running them directly in the same process.  "
-"Defaults to @samp{0}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:13283
-#, no-wrap
-msgid "{@code{dovecot-configuration} parameter} string doveadm-socket-path"
+"List of IMAP @code{SPECIAL-USE} attributes as specified by RFC 6154.  Valid "
+"values are @code{\\All}, @code{\\Archive}, @code{\\Drafts}, "
+"@code{\\Flagged}, @code{\\Junk}, @code{\\Sent}, and @code{\\Trash}.  "
+"Defaults to @samp{()}."
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:13286
-msgid "UNIX socket or host:port used for connecting to doveadm server.  Defaults to @samp{\"doveadm-server\"}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:13288
 #, no-wrap
-msgid "{@code{dovecot-configuration} parameter} space-separated-string-list import-environment"
+msgid "{@code{dovecot-configuration} parameter} file-name base-dir"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13292
+#: doc/guix.texi:13289
 msgid ""
-"List of environment variables that are preserved on Dovecot startup and passed down to all of its child processes.  You can also "
-"give key=value pairs to always set specific settings."
+"Base directory where to store runtime data.  Defaults to @samp{\"/var/run/"
+"dovecot/\"}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:13291
+#, no-wrap
+msgid "{@code{dovecot-configuration} parameter} string login-greeting"
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:13294
-#, no-wrap
-msgid "{@code{dovecot-configuration} parameter} boolean disable-plaintext-auth?"
+msgid "Greeting message for clients.  Defaults to @samp{\"Dovecot ready.\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13301
-msgid ""
-"Disable LOGIN command and all other plaintext authentications unless SSL/TLS is used (LOGINDISABLED capability).  Note that if the "
-"remote IP matches the local IP (i.e. you're connecting from the same computer), the connection is considered secure and plaintext "
-"authentication is allowed.  See also ssl=required setting.  Defaults to @samp{#t}."
+#: doc/guix.texi:13296
+#, no-wrap
+msgid "{@code{dovecot-configuration} parameter} space-separated-string-list login-trusted-networks"
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:13303
+msgid ""
+"List of trusted network ranges.  Connections from these IPs are allowed to "
+"override their IP addresses and ports (for logging and for authentication "
+"checks).  @samp{disable-plaintext-auth} is also ignored for these networks.  "
+"Typically you would specify your IMAP proxy servers here.  Defaults to "
+"@samp{()}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:13305
 #, no-wrap
-msgid "{@code{dovecot-configuration} parameter} non-negative-integer auth-cache-size"
+msgid "{@code{dovecot-configuration} parameter} space-separated-string-list login-access-sockets"
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:13308
 msgid ""
-"Authentication cache size (e.g. @samp{#e10e6}).  0 means it's disabled.  Note that bsdauth, PAM and vpopmail require @samp{cache-"
-"key} to be set for caching to be used.  Defaults to @samp{0}."
+"List of login access check sockets (e.g. tcpwrap).  Defaults to @samp{()}."
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:13310
 #, no-wrap
-msgid "{@code{dovecot-configuration} parameter} string auth-cache-ttl"
+msgid "{@code{dovecot-configuration} parameter} boolean verbose-proctitle?"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:13316
+msgid ""
+"Show more verbose process titles (in ps).  Currently shows user name and IP "
+"address.  Useful for seeing who is actually using the IMAP processes (e.g. "
+"shared mailboxes or if the same uid is used for multiple accounts).  "
+"Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:13318
-msgid ""
-"Time to live for cached data.  After TTL expires the cached record is no longer used, *except* if the main database lookup returns "
-"internal failure.  We also try to handle password changes automatically: If user's previous authentication was successful, but this "
-"one wasn't, the cache isn't used.  For now this works only with plaintext authentication.  Defaults to @samp{\"1 hour\"}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:13320
 #, no-wrap
-msgid "{@code{dovecot-configuration} parameter} string auth-cache-negative-ttl"
+msgid "{@code{dovecot-configuration} parameter} boolean shutdown-clients?"
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:13324
-msgid "TTL for negative hits (user not found, password mismatch).  0 disables caching them completely.  Defaults to @samp{\"1 hour\"}."
+msgid ""
+"Should all processes be killed when Dovecot master process shuts down.  "
+"Setting this to @code{#f} means that Dovecot can be upgraded without forcing "
+"existing client connections to close (although that could also be a problem "
+"if the upgrade is e.g. due to a security fix).  Defaults to @samp{#t}."
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:13326
 #, no-wrap
-msgid "{@code{dovecot-configuration} parameter} space-separated-string-list auth-realms"
+msgid "{@code{dovecot-configuration} parameter} non-negative-integer doveadm-worker-count"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:13330
+msgid ""
+"If non-zero, run mail commands via this many connections to doveadm server, "
+"instead of running them directly in the same process.  Defaults to @samp{0}."
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:13332
-msgid ""
-"List of realms for SASL authentication mechanisms that need them.  You can leave it empty if you don't want to support multiple "
-"realms.  Many clients simply use the first one listed here, so keep the default realm first.  Defaults to @samp{()}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:13334
 #, no-wrap
-msgid "{@code{dovecot-configuration} parameter} string auth-default-realm"
+msgid "{@code{dovecot-configuration} parameter} string doveadm-socket-path"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13339
+#: doc/guix.texi:13335
 msgid ""
-"Default realm/domain to use if none was specified.  This is used for both SASL realms and appending @@domain to username in "
-"plaintext logins.  Defaults to @samp{\"\"}."
+"UNIX socket or host:port used for connecting to doveadm server.  Defaults to "
+"@samp{\"doveadm-server\"}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:13337
+#, no-wrap
+msgid "{@code{dovecot-configuration} parameter} space-separated-string-list import-environment"
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:13341
-#, no-wrap
-msgid "{@code{dovecot-configuration} parameter} string auth-username-chars"
+msgid ""
+"List of environment variables that are preserved on Dovecot startup and "
+"passed down to all of its child processes.  You can also give key=value "
+"pairs to always set specific settings."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13348
-msgid ""
-"List of allowed characters in username.  If the user-given username contains a character not listed in here, the login automatically "
-"fails.  This is just an extra check to make sure user can't exploit any potential quote escaping vulnerabilities with SQL/LDAP "
-"databases.  If you want to allow all characters, set this value to empty.  Defaults to "
-"@samp{\"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ01234567890.-_@@\"}."
+#: doc/guix.texi:13343
+#, no-wrap
+msgid "{@code{dovecot-configuration} parameter} boolean disable-plaintext-auth?"
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:13350
-#, no-wrap
-msgid "{@code{dovecot-configuration} parameter} string auth-username-translation"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:13356
 msgid ""
-"Username character translations before it's looked up from databases.  The value contains series of from -> to characters.  For "
-"example @samp{#@@/@@} means that @samp{#} and @samp{/} characters are translated to @samp{@@}.  Defaults to @samp{\"\"}."
+"Disable LOGIN command and all other plaintext authentications unless SSL/TLS "
+"is used (LOGINDISABLED capability).  Note that if the remote IP matches the "
+"local IP (i.e. you're connecting from the same computer), the connection is "
+"considered secure and plaintext authentication is allowed.  See also "
+"ssl=required setting.  Defaults to @samp{#t}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13358
+#: doc/guix.texi:13352
 #, no-wrap
-msgid "{@code{dovecot-configuration} parameter} string auth-username-format"
+msgid "{@code{dovecot-configuration} parameter} non-negative-integer auth-cache-size"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13365
+#: doc/guix.texi:13357
 msgid ""
-"Username formatting before it's looked up from databases.  You can use the standard variables here, e.g. %Lu would lowercase the "
-"username, %n would drop away the domain if it was given, or @samp{%n-AT-%d} would change the @samp{@@} into @samp{-AT-}.  This "
-"translation is done after @samp{auth-username-translation} changes.  Defaults to @samp{\"%Lu\"}."
+"Authentication cache size (e.g. @samp{#e10e6}).  0 means it's disabled.  "
+"Note that bsdauth, PAM and vpopmail require @samp{cache-key} to be set for "
+"caching to be used.  Defaults to @samp{0}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:13359
+#, no-wrap
+msgid "{@code{dovecot-configuration} parameter} string auth-cache-ttl"
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:13367
+msgid ""
+"Time to live for cached data.  After TTL expires the cached record is no "
+"longer used, *except* if the main database lookup returns internal failure.  "
+"We also try to handle password changes automatically: If user's previous "
+"authentication was successful, but this one wasn't, the cache isn't used.  "
+"For now this works only with plaintext authentication.  Defaults to "
+"@samp{\"1 hour\"}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:13369
 #, no-wrap
-msgid "{@code{dovecot-configuration} parameter} string auth-master-user-separator"
+msgid "{@code{dovecot-configuration} parameter} string auth-cache-negative-ttl"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:13373
+msgid ""
+"TTL for negative hits (user not found, password mismatch).  0 disables "
+"caching them completely.  Defaults to @samp{\"1 hour\"}."
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:13375
-msgid ""
-"If you want to allow master users to log in by specifying the master username within the normal username string (i.e. not using SASL "
-"mechanism's support for it), you can specify the separator character here.  The format is then <username><separator><master "
-"username>.  UW-IMAP uses @samp{*} as the separator, so that could be a good choice.  Defaults to @samp{\"\"}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:13377
 #, no-wrap
-msgid "{@code{dovecot-configuration} parameter} string auth-anonymous-username"
+msgid "{@code{dovecot-configuration} parameter} space-separated-string-list auth-realms"
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:13381
-msgid "Username to use for users logging in with ANONYMOUS SASL mechanism.  Defaults to @samp{\"anonymous\"}."
+msgid ""
+"List of realms for SASL authentication mechanisms that need them.  You can "
+"leave it empty if you don't want to support multiple realms.  Many clients "
+"simply use the first one listed here, so keep the default realm first.  "
+"Defaults to @samp{()}."
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:13383
 #, no-wrap
-msgid "{@code{dovecot-configuration} parameter} non-negative-integer auth-worker-max-count"
+msgid "{@code{dovecot-configuration} parameter} string auth-default-realm"
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:13388
 msgid ""
-"Maximum number of dovecot-auth worker processes.  They're used to execute blocking passdb and userdb queries (e.g. MySQL and PAM).  "
-"They're automatically created and destroyed as needed.  Defaults to @samp{30}."
+"Default realm/domain to use if none was specified.  This is used for both "
+"SASL realms and appending @@domain to username in plaintext logins.  "
+"Defaults to @samp{\"\"}."
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:13390
 #, no-wrap
-msgid "{@code{dovecot-configuration} parameter} string auth-gssapi-hostname"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:13395
-msgid ""
-"Host name to use in GSSAPI principal names.  The default is to use the name returned by gethostname().  Use @samp{$ALL} (with "
-"quotes) to allow all keytab entries.  Defaults to @samp{\"\"}."
+msgid "{@code{dovecot-configuration} parameter} string auth-username-chars"
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:13397
+msgid ""
+"List of allowed characters in username.  If the user-given username contains "
+"a character not listed in here, the login automatically fails.  This is just "
+"an extra check to make sure user can't exploit any potential quote escaping "
+"vulnerabilities with SQL/LDAP databases.  If you want to allow all "
+"characters, set this value to empty.  Defaults to "
+"@samp{\"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ01234567890.-_@@"
+"\"}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:13399
+#, no-wrap
+msgid "{@code{dovecot-configuration} parameter} string auth-username-translation"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:13405
+msgid ""
+"Username character translations before it's looked up from databases.  The "
+"value contains series of from -> to characters.  For example @samp{#@@/@@} "
+"means that @samp{#} and @samp{/} characters are translated to @samp{@@}.  "
+"Defaults to @samp{\"\"}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:13407
+#, no-wrap
+msgid "{@code{dovecot-configuration} parameter} string auth-username-format"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:13414
+msgid ""
+"Username formatting before it's looked up from databases.  You can use the "
+"standard variables here, e.g. %Lu would lowercase the username, %n would "
+"drop away the domain if it was given, or @samp{%n-AT-%d} would change the "
+"@samp{@@} into @samp{-AT-}.  This translation is done after @samp{auth-"
+"username-translation} changes.  Defaults to @samp{\"%Lu\"}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:13416
+#, no-wrap
+msgid "{@code{dovecot-configuration} parameter} string auth-master-user-separator"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:13424
+msgid ""
+"If you want to allow master users to log in by specifying the master "
+"username within the normal username string (i.e. not using SASL mechanism's "
+"support for it), you can specify the separator character here.  The format "
+"is then <username><separator><master username>.  UW-IMAP uses @samp{*} as "
+"the separator, so that could be a good choice.  Defaults to @samp{\"\"}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:13426
+#, no-wrap
+msgid "{@code{dovecot-configuration} parameter} string auth-anonymous-username"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:13430
+msgid ""
+"Username to use for users logging in with ANONYMOUS SASL mechanism.  "
+"Defaults to @samp{\"anonymous\"}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:13432
+#, no-wrap
+msgid "{@code{dovecot-configuration} parameter} non-negative-integer auth-worker-max-count"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:13437
+msgid ""
+"Maximum number of dovecot-auth worker processes.  They're used to execute "
+"blocking passdb and userdb queries (e.g. MySQL and PAM).  They're "
+"automatically created and destroyed as needed.  Defaults to @samp{30}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:13439
+#, no-wrap
+msgid "{@code{dovecot-configuration} parameter} string auth-gssapi-hostname"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:13444
+msgid ""
+"Host name to use in GSSAPI principal names.  The default is to use the name "
+"returned by gethostname().  Use @samp{$ALL} (with quotes) to allow all "
+"keytab entries.  Defaults to @samp{\"\"}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:13446
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string auth-krb5-keytab"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13403
+#: doc/guix.texi:13452
 msgid ""
-"Kerberos keytab to use for the GSSAPI mechanism.  Will use the system default (usually @file{/etc/krb5.keytab}) if not specified.  "
-"You may need to change the auth service to run as root to be able to read this file.  Defaults to @samp{\"\"}."
+"Kerberos keytab to use for the GSSAPI mechanism.  Will use the system "
+"default (usually @file{/etc/krb5.keytab}) if not specified.  You may need to "
+"change the auth service to run as root to be able to read this file.  "
+"Defaults to @samp{\"\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13405
+#: doc/guix.texi:13454
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean auth-use-winbind?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13410
+#: doc/guix.texi:13459
 msgid ""
-"Do NTLM and GSS-SPNEGO authentication using Samba's winbind daemon and @samp{ntlm-auth} helper.  <doc/wiki/Authentication/Mechanisms/"
-"Winbind.txt>.  Defaults to @samp{#f}."
+"Do NTLM and GSS-SPNEGO authentication using Samba's winbind daemon and "
+"@samp{ntlm-auth} helper.  <doc/wiki/Authentication/Mechanisms/Winbind.txt>.  "
+"Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13412
+#: doc/guix.texi:13461
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} file-name auth-winbind-helper-path"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13415
-msgid "Path for Samba's @samp{ntlm-auth} helper binary.  Defaults to @samp{\"/usr/bin/ntlm_auth\"}."
+#: doc/guix.texi:13464
+msgid ""
+"Path for Samba's @samp{ntlm-auth} helper binary.  Defaults to @samp{\"/usr/"
+"bin/ntlm_auth\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13417
+#: doc/guix.texi:13466
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string auth-failure-delay"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13420
-msgid "Time to delay before replying to failed authentications.  Defaults to @samp{\"2 secs\"}."
+#: doc/guix.texi:13469
+msgid ""
+"Time to delay before replying to failed authentications.  Defaults to "
+"@samp{\"2 secs\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13422
+#: doc/guix.texi:13471
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean auth-ssl-require-client-cert?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13426
-msgid "Require a valid SSL client certificate or the authentication fails.  Defaults to @samp{#f}."
+#: doc/guix.texi:13475
+msgid ""
+"Require a valid SSL client certificate or the authentication fails.  "
+"Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13428
+#: doc/guix.texi:13477
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean auth-ssl-username-from-cert?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13433
+#: doc/guix.texi:13482
 msgid ""
-"Take the username from client's SSL certificate, using @code{X509_NAME_get_text_by_NID()} which returns the subject's DN's "
+"Take the username from client's SSL certificate, using "
+"@code{X509_NAME_get_text_by_NID()} which returns the subject's DN's "
 "CommonName.  Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13435
+#: doc/guix.texi:13484
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} space-separated-string-list auth-mechanisms"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13441
+#: doc/guix.texi:13490
 msgid ""
-"List of wanted authentication mechanisms.  Supported mechanisms are: @samp{plain}, @samp{login}, @samp{digest-md5}, @samp{cram-md5}, "
-"@samp{ntlm}, @samp{rpa}, @samp{apop}, @samp{anonymous}, @samp{gssapi}, @samp{otp}, @samp{skey}, and @samp{gss-spnego}.  NOTE: See "
-"also @samp{disable-plaintext-auth} setting."
+"List of wanted authentication mechanisms.  Supported mechanisms are: "
+"@samp{plain}, @samp{login}, @samp{digest-md5}, @samp{cram-md5}, @samp{ntlm}, "
+"@samp{rpa}, @samp{apop}, @samp{anonymous}, @samp{gssapi}, @samp{otp}, "
+"@samp{skey}, and @samp{gss-spnego}.  NOTE: See also @samp{disable-plaintext-"
+"auth} setting."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13443
+#: doc/guix.texi:13492
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} space-separated-string-list director-servers"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13448
+#: doc/guix.texi:13497
 msgid ""
-"List of IPs or hostnames to all director servers, including ourself.  Ports can be specified as ip:port.  The default port is the "
-"same as what director service's @samp{inet-listener} is using.  Defaults to @samp{()}."
+"List of IPs or hostnames to all director servers, including ourself.  Ports "
+"can be specified as ip:port.  The default port is the same as what director "
+"service's @samp{inet-listener} is using.  Defaults to @samp{()}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13450
+#: doc/guix.texi:13499
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} space-separated-string-list director-mail-servers"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13454
+#: doc/guix.texi:13503
 msgid ""
-"List of IPs or hostnames to all backend mail servers.  Ranges are allowed too, like 10.0.0.10-10.0.0.30.  Defaults to @samp{()}."
+"List of IPs or hostnames to all backend mail servers.  Ranges are allowed "
+"too, like 10.0.0.10-10.0.0.30.  Defaults to @samp{()}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13456
+#: doc/guix.texi:13505
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string director-user-expire"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13460
-msgid "How long to redirect users to a specific server after it no longer has any connections.  Defaults to @samp{\"15 min\"}."
+#: doc/guix.texi:13509
+msgid ""
+"How long to redirect users to a specific server after it no longer has any "
+"connections.  Defaults to @samp{\"15 min\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13462
+#: doc/guix.texi:13511
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string director-username-hash"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13467
+#: doc/guix.texi:13516
 msgid ""
-"How the username is translated before being hashed.  Useful values include %Ln if user can log in with or without @@domain, %Ld if "
-"mailboxes are shared within domain.  Defaults to @samp{\"%Lu\"}."
+"How the username is translated before being hashed.  Useful values include "
+"%Ln if user can log in with or without @@domain, %Ld if mailboxes are shared "
+"within domain.  Defaults to @samp{\"%Lu\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13469
+#: doc/guix.texi:13518
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string log-path"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13473
+#: doc/guix.texi:13522
 msgid ""
-"Log file to use for error messages.  @samp{syslog} logs to syslog, @samp{/dev/stderr} logs to stderr.  Defaults to @samp{\"syslog\"}."
+"Log file to use for error messages.  @samp{syslog} logs to syslog, @samp{/"
+"dev/stderr} logs to stderr.  Defaults to @samp{\"syslog\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13475
+#: doc/guix.texi:13524
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string info-log-path"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13479
-msgid "Log file to use for informational messages.  Defaults to @samp{log-path}.  Defaults to @samp{\"\"}."
+#: doc/guix.texi:13528
+msgid ""
+"Log file to use for informational messages.  Defaults to @samp{log-path}.  "
+"Defaults to @samp{\"\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13481
+#: doc/guix.texi:13530
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string debug-log-path"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13485
-msgid "Log file to use for debug messages.  Defaults to @samp{info-log-path}.  Defaults to @samp{\"\"}."
+#: doc/guix.texi:13534
+msgid ""
+"Log file to use for debug messages.  Defaults to @samp{info-log-path}.  "
+"Defaults to @samp{\"\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13487
+#: doc/guix.texi:13536
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string syslog-facility"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13492
+#: doc/guix.texi:13541
 msgid ""
-"Syslog facility to use if you're logging to syslog.  Usually if you don't want to use @samp{mail}, you'll use local0..local7.  Also "
-"other standard facilities are supported.  Defaults to @samp{\"mail\"}."
+"Syslog facility to use if you're logging to syslog.  Usually if you don't "
+"want to use @samp{mail}, you'll use local0..local7.  Also other standard "
+"facilities are supported.  Defaults to @samp{\"mail\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13494
+#: doc/guix.texi:13543
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean auth-verbose?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13498
-msgid "Log unsuccessful authentication attempts and the reasons why they failed.  Defaults to @samp{#f}."
+#: doc/guix.texi:13547
+msgid ""
+"Log unsuccessful authentication attempts and the reasons why they failed.  "
+"Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13500
+#: doc/guix.texi:13549
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean auth-verbose-passwords?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13507
+#: doc/guix.texi:13556
 msgid ""
-"In case of password mismatches, log the attempted password.  Valid values are no, plain and sha1.  sha1 can be useful for detecting "
-"brute force password attempts vs.  user simply trying the same password over and over again.  You can also truncate the value to n "
-"chars by appending \":n\" (e.g. sha1:6).  Defaults to @samp{#f}."
+"In case of password mismatches, log the attempted password.  Valid values "
+"are no, plain and sha1.  sha1 can be useful for detecting brute force "
+"password attempts vs.  user simply trying the same password over and over "
+"again.  You can also truncate the value to n chars by appending \":n\" (e.g. "
+"sha1:6).  Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13509
+#: doc/guix.texi:13558
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean auth-debug?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13513
-msgid "Even more verbose logging for debugging purposes.  Shows for example SQL queries.  Defaults to @samp{#f}."
+#: doc/guix.texi:13562
+msgid ""
+"Even more verbose logging for debugging purposes.  Shows for example SQL "
+"queries.  Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13515
+#: doc/guix.texi:13564
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean auth-debug-passwords?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13520
+#: doc/guix.texi:13569
 msgid ""
-"In case of password mismatches, log the passwords and used scheme so the problem can be debugged.  Enabling this also enables "
-"@samp{auth-debug}.  Defaults to @samp{#f}."
+"In case of password mismatches, log the passwords and used scheme so the "
+"problem can be debugged.  Enabling this also enables @samp{auth-debug}.  "
+"Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13522
+#: doc/guix.texi:13571
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean mail-debug?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13526
-msgid "Enable mail process debugging.  This can help you figure out why Dovecot isn't finding your mails.  Defaults to @samp{#f}."
+#: doc/guix.texi:13575
+msgid ""
+"Enable mail process debugging.  This can help you figure out why Dovecot "
+"isn't finding your mails.  Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13528
+#: doc/guix.texi:13577
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean verbose-ssl?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13531
+#: doc/guix.texi:13580
 msgid "Show protocol level SSL errors.  Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13533
+#: doc/guix.texi:13582
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string log-timestamp"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13537
-msgid "Prefix for each line written to log file.  % codes are in strftime(3) format.  Defaults to @samp{\"\\\"%b %d %H:%M:%S \\\"\"}."
+#: doc/guix.texi:13586
+msgid ""
+"Prefix for each line written to log file.  % codes are in strftime(3) "
+"format.  Defaults to @samp{\"\\\"%b %d %H:%M:%S \\\"\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13539
+#: doc/guix.texi:13588
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} space-separated-string-list login-log-format-elements"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13543
+#: doc/guix.texi:13592
 msgid ""
-"List of elements we want to log.  The elements which have a non-empty variable value are joined together to form a comma-separated "
-"string."
+"List of elements we want to log.  The elements which have a non-empty "
+"variable value are joined together to form a comma-separated string."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13545
+#: doc/guix.texi:13594
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string login-log-format"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13549
+#: doc/guix.texi:13598
 msgid ""
-"Login log format.  %s contains @samp{login-log-format-elements} string, %$ contains the data we want to log.  Defaults to @samp{\"%"
-"$: %s\"}."
+"Login log format.  %s contains @samp{login-log-format-elements} string, %$ "
+"contains the data we want to log.  Defaults to @samp{\"%$: %s\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13551
+#: doc/guix.texi:13600
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string mail-log-prefix"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13555
+#: doc/guix.texi:13604
 msgid ""
-"Log prefix for mail processes.  See doc/wiki/Variables.txt for list of possible variables you can use.  Defaults to @samp{\"\\"
-"\"%s(%u)<%@{pid@}><%@{session@}>: \\\"\"}."
+"Log prefix for mail processes.  See doc/wiki/Variables.txt for list of "
+"possible variables you can use.  Defaults to @samp{\"\\\"%s(%u)<%@{pid@}><"
+"%@{session@}>: \\\"\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13557
+#: doc/guix.texi:13606
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string deliver-log-format"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13559
+#: doc/guix.texi:13608
 msgid "Format to use for logging mail deliveries.  You can use variables:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13560
+#: doc/guix.texi:13609
 #, no-wrap
 msgid "%$"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13562
+#: doc/guix.texi:13611
 msgid "Delivery status message (e.g. @samp{saved to INBOX})"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13562
+#: doc/guix.texi:13611
 #, no-wrap
 msgid "%m"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13564
+#: doc/guix.texi:13613
 msgid "Message-ID"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13564 doc/guix.texi:14096
+#: doc/guix.texi:13613 doc/guix.texi:14145
 #, no-wrap
 msgid "%s"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13566
+#: doc/guix.texi:13615
 msgid "Subject"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13566
+#: doc/guix.texi:13615
 #, no-wrap
 msgid "%f"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13568
+#: doc/guix.texi:13617
 msgid "From address"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13570
+#: doc/guix.texi:13619
 msgid "Physical size"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13570
+#: doc/guix.texi:13619
 #, no-wrap
 msgid "%w"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13572
+#: doc/guix.texi:13621
 msgid "Virtual size."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13574
+#: doc/guix.texi:13623
 msgid "Defaults to @samp{\"msgid=%m: %$\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13576
+#: doc/guix.texi:13625
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string mail-location"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13581
+#: doc/guix.texi:13630
 msgid ""
-"Location for users' mailboxes.  The default is empty, which means that Dovecot tries to find the mailboxes automatically.  This "
-"won't work if the user doesn't yet have any mail, so you should explicitly tell Dovecot the full location."
+"Location for users' mailboxes.  The default is empty, which means that "
+"Dovecot tries to find the mailboxes automatically.  This won't work if the "
+"user doesn't yet have any mail, so you should explicitly tell Dovecot the "
+"full location."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13587
+#: doc/guix.texi:13636
 msgid ""
-"If you're using mbox, giving a path to the INBOX file (e.g. /var/mail/%u) isn't enough.  You'll also need to tell Dovecot where the "
-"other mailboxes are kept.  This is called the \"root mail directory\", and it must be the first path given in the @samp{mail-"
-"location} setting."
+"If you're using mbox, giving a path to the INBOX file (e.g. /var/mail/%u) "
+"isn't enough.  You'll also need to tell Dovecot where the other mailboxes "
+"are kept.  This is called the \"root mail directory\", and it must be the "
+"first path given in the @samp{mail-location} setting."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13589
+#: doc/guix.texi:13638
 msgid "There are a few special variables you can use, eg.:"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13593
+#: doc/guix.texi:13642
 msgid "username"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13593 doc/guix.texi:14092
+#: doc/guix.texi:13642 doc/guix.texi:14141
 #, no-wrap
 msgid "%n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13595
+#: doc/guix.texi:13644
 msgid "user part in user@@domain, same as %u if there's no domain"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13595
+#: doc/guix.texi:13644
 #, no-wrap
 msgid "%d"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13597
+#: doc/guix.texi:13646
 msgid "domain part in user@@domain, empty if there's no domain"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13597
+#: doc/guix.texi:13646
 #, no-wrap
 msgid "%h"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13599
+#: doc/guix.texi:13648
 msgid "home director"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13602
+#: doc/guix.texi:13651
 msgid "See doc/wiki/Variables.txt for full list.  Some examples:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13603
+#: doc/guix.texi:13652
 #, no-wrap
 msgid "maildir:~/Maildir"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13604
+#: doc/guix.texi:13653
 #, no-wrap
 msgid "mbox:~/mail:INBOX=/var/mail/%u"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13605
+#: doc/guix.texi:13654
 #, no-wrap
 msgid "mbox:/var/mail/%d/%1n/%n:INDEX=/var/indexes/%d/%1n/%"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13610
+#: doc/guix.texi:13659
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string mail-uid"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13615
+#: doc/guix.texi:13664
 msgid ""
-"System user and group used to access mails.  If you use multiple, userdb can override these by returning uid or gid fields.  You can "
-"use either numbers or names.  <doc/wiki/UserIds.txt>.  Defaults to @samp{\"\"}."
+"System user and group used to access mails.  If you use multiple, userdb can "
+"override these by returning uid or gid fields.  You can use either numbers "
+"or names.  <doc/wiki/UserIds.txt>.  Defaults to @samp{\"\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13617
+#: doc/guix.texi:13666
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string mail-gid"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13622
+#: doc/guix.texi:13671
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string mail-privileged-group"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13628
+#: doc/guix.texi:13677
 msgid ""
-"Group to enable temporarily for privileged operations.  Currently this is used only with INBOX when either its initial creation or "
-"dotlocking fails.  Typically this is set to \"mail\" to give access to /var/mail.  Defaults to @samp{\"\"}."
+"Group to enable temporarily for privileged operations.  Currently this is "
+"used only with INBOX when either its initial creation or dotlocking fails.  "
+"Typically this is set to \"mail\" to give access to /var/mail.  Defaults to "
+"@samp{\"\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13630
+#: doc/guix.texi:13679
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string mail-access-groups"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13638
+#: doc/guix.texi:13687
 msgid ""
-"Grant access to these supplementary groups for mail processes.  Typically these are used to set up access to shared mailboxes.  Note "
-"that it may be dangerous to set these if users can create symlinks (e.g. if \"mail\" group is set here, ln -s /var/mail ~/mail/var "
-"could allow a user to delete others' mailboxes, or ln -s /secret/shared/box ~/mail/mybox would allow reading it).  Defaults to "
-"@samp{\"\"}."
+"Grant access to these supplementary groups for mail processes.  Typically "
+"these are used to set up access to shared mailboxes.  Note that it may be "
+"dangerous to set these if users can create symlinks (e.g. if \"mail\" group "
+"is set here, ln -s /var/mail ~/mail/var could allow a user to delete others' "
+"mailboxes, or ln -s /secret/shared/box ~/mail/mybox would allow reading "
+"it).  Defaults to @samp{\"\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13640
+#: doc/guix.texi:13689
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean mail-full-filesystem-access?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13646
+#: doc/guix.texi:13695
 msgid ""
-"Allow full file system access to clients.  There's no access checks other than what the operating system does for the active UID/"
-"GID.  It works with both maildir and mboxes, allowing you to prefix mailboxes names with e.g. /path/ or ~user/.  Defaults to "
-"@samp{#f}."
+"Allow full file system access to clients.  There's no access checks other "
+"than what the operating system does for the active UID/GID.  It works with "
+"both maildir and mboxes, allowing you to prefix mailboxes names with e.g. /"
+"path/ or ~user/.  Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13648
+#: doc/guix.texi:13697
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean mmap-disable?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13652
+#: doc/guix.texi:13701
 msgid ""
-"Don't use mmap() at all.  This is required if you store indexes to shared file systems (NFS or clustered file system).  Defaults to "
-"@samp{#f}."
+"Don't use mmap() at all.  This is required if you store indexes to shared "
+"file systems (NFS or clustered file system).  Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13654
+#: doc/guix.texi:13703
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean dotlock-use-excl?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13659
+#: doc/guix.texi:13708
 msgid ""
-"Rely on @samp{O_EXCL} to work when creating dotlock files.  NFS supports @samp{O_EXCL} since version 3, so this should be safe to "
-"use nowadays by default.  Defaults to @samp{#t}."
+"Rely on @samp{O_EXCL} to work when creating dotlock files.  NFS supports "
+"@samp{O_EXCL} since version 3, so this should be safe to use nowadays by "
+"default.  Defaults to @samp{#t}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13661
+#: doc/guix.texi:13710
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string mail-fsync"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13663
+#: doc/guix.texi:13712
 msgid "When to use fsync() or fdatasync() calls:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13664
+#: doc/guix.texi:13713
 #, no-wrap
 msgid "optimized"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13666
+#: doc/guix.texi:13715
 msgid "Whenever necessary to avoid losing important data"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13668
+#: doc/guix.texi:13717
 msgid "Useful with e.g. NFS when write()s are delayed"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13670
+#: doc/guix.texi:13719
 msgid "Never use it (best performance, but crashes can lose data)."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13672
+#: doc/guix.texi:13721
 msgid "Defaults to @samp{\"optimized\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13674
+#: doc/guix.texi:13723
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean mail-nfs-storage?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13679
+#: doc/guix.texi:13728
 msgid ""
-"Mail storage exists in NFS.  Set this to yes to make Dovecot flush NFS caches whenever needed.  If you're using only a single mail "
-"server this isn't needed.  Defaults to @samp{#f}."
+"Mail storage exists in NFS.  Set this to yes to make Dovecot flush NFS "
+"caches whenever needed.  If you're using only a single mail server this "
+"isn't needed.  Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13681
+#: doc/guix.texi:13730
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean mail-nfs-index?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13685
+#: doc/guix.texi:13734
 msgid ""
-"Mail index files also exist in NFS.  Setting this to yes requires @samp{mmap-disable? #t} and @samp{fsync-disable? #f}.  Defaults to "
-"@samp{#f}."
+"Mail index files also exist in NFS.  Setting this to yes requires @samp{mmap-"
+"disable? #t} and @samp{fsync-disable? #f}.  Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13687
+#: doc/guix.texi:13736
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string lock-method"
 msgstr ""
 
-#. type: deftypevr
-#: doc/guix.texi:13693
-msgid ""
-"Locking method for index files.  Alternatives are fcntl, flock and dotlock.  Dotlocking uses some tricks which may create more disk "
-"I/O than other locking methods.  NFS users: flock doesn't work, remember to change @samp{mmap-disable}.  Defaults to @samp{\"fcntl"
-"\"}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:13695
-#, no-wrap
-msgid "{@code{dovecot-configuration} parameter} file-name mail-temp-dir"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:13699
-msgid "Directory in which LDA/LMTP temporarily stores incoming mails >128 kB.  Defaults to @samp{\"/tmp\"}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:13701
-#, no-wrap
-msgid "{@code{dovecot-configuration} parameter} non-negative-integer first-valid-uid"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:13707
-msgid ""
-"Valid UID range for users.  This is mostly to make sure that users can't log in as daemons or other system users.  Note that denying "
-"root logins is hardcoded to dovecot binary and can't be done even if @samp{first-valid-uid} is set to 0.  Defaults to @samp{500}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:13709
-#, no-wrap
-msgid "{@code{dovecot-configuration} parameter} non-negative-integer last-valid-uid"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:13714
-#, no-wrap
-msgid "{@code{dovecot-configuration} parameter} non-negative-integer first-valid-gid"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:13719
-msgid ""
-"Valid GID range for users.  Users having non-valid GID as primary group ID aren't allowed to log in.  If user belongs to "
-"supplementary groups with non-valid GIDs, those groups are not set.  Defaults to @samp{1}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:13721
-#, no-wrap
-msgid "{@code{dovecot-configuration} parameter} non-negative-integer last-valid-gid"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:13726
-#, no-wrap
-msgid "{@code{dovecot-configuration} parameter} non-negative-integer mail-max-keyword-length"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:13730
-msgid "Maximum allowed length for mail keyword name.  It's only forced when trying to create new keywords.  Defaults to @samp{50}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:13732
-#, no-wrap
-msgid "{@code{dovecot-configuration} parameter} colon-separated-file-name-list valid-chroot-dirs"
-msgstr ""
-
 #. type: deftypevr
 #: doc/guix.texi:13742
 msgid ""
-"List of directories under which chrooting is allowed for mail processes (i.e. /var/mail will allow chrooting to /var/mail/foo/bar "
-"too).  This setting doesn't affect @samp{login-chroot} @samp{mail-chroot} or auth chroot settings.  If this setting is empty, \"/./"
-"\" in home dirs are ignored.  WARNING: Never add directories here which local users can modify, that may lead to root exploit.  "
-"Usually this should be done only if you don't allow shell access for users.  <doc/wiki/Chrooting.txt>.  Defaults to @samp{()}."
+"Locking method for index files.  Alternatives are fcntl, flock and dotlock.  "
+"Dotlocking uses some tricks which may create more disk I/O than other "
+"locking methods.  NFS users: flock doesn't work, remember to change "
+"@samp{mmap-disable}.  Defaults to @samp{\"fcntl\"}."
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:13744
 #, no-wrap
+msgid "{@code{dovecot-configuration} parameter} file-name mail-temp-dir"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:13748
+msgid ""
+"Directory in which LDA/LMTP temporarily stores incoming mails >128 kB.  "
+"Defaults to @samp{\"/tmp\"}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:13750
+#, no-wrap
+msgid "{@code{dovecot-configuration} parameter} non-negative-integer first-valid-uid"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:13756
+msgid ""
+"Valid UID range for users.  This is mostly to make sure that users can't log "
+"in as daemons or other system users.  Note that denying root logins is "
+"hardcoded to dovecot binary and can't be done even if @samp{first-valid-uid} "
+"is set to 0.  Defaults to @samp{500}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:13758
+#, no-wrap
+msgid "{@code{dovecot-configuration} parameter} non-negative-integer last-valid-uid"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:13763
+#, no-wrap
+msgid "{@code{dovecot-configuration} parameter} non-negative-integer first-valid-gid"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:13768
+msgid ""
+"Valid GID range for users.  Users having non-valid GID as primary group ID "
+"aren't allowed to log in.  If user belongs to supplementary groups with non-"
+"valid GIDs, those groups are not set.  Defaults to @samp{1}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:13770
+#, no-wrap
+msgid "{@code{dovecot-configuration} parameter} non-negative-integer last-valid-gid"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:13775
+#, no-wrap
+msgid "{@code{dovecot-configuration} parameter} non-negative-integer mail-max-keyword-length"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:13779
+msgid ""
+"Maximum allowed length for mail keyword name.  It's only forced when trying "
+"to create new keywords.  Defaults to @samp{50}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:13781
+#, no-wrap
+msgid "{@code{dovecot-configuration} parameter} colon-separated-file-name-list valid-chroot-dirs"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:13791
+msgid ""
+"List of directories under which chrooting is allowed for mail processes (i."
+"e. /var/mail will allow chrooting to /var/mail/foo/bar too).  This setting "
+"doesn't affect @samp{login-chroot} @samp{mail-chroot} or auth chroot "
+"settings.  If this setting is empty, \"/./\" in home dirs are ignored.  "
+"WARNING: Never add directories here which local users can modify, that may "
+"lead to root exploit.  Usually this should be done only if you don't allow "
+"shell access for users.  <doc/wiki/Chrooting.txt>.  Defaults to @samp{()}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:13793
+#, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string mail-chroot"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13753
+#: doc/guix.texi:13802
 msgid ""
-"Default chroot directory for mail processes.  This can be overridden for specific users in user database by giving /./ in user's "
-"home directory (e.g. /home/./user chroots into /home).  Note that usually there is no real need to do chrooting, Dovecot doesn't "
-"allow users to access files outside their mail directory anyway.  If your home directories are prefixed with the chroot directory, "
-"append \"/.\" to @samp{mail-chroot}.  <doc/wiki/Chrooting.txt>.  Defaults to @samp{\"\"}."
+"Default chroot directory for mail processes.  This can be overridden for "
+"specific users in user database by giving /./ in user's home directory (e."
+"g. /home/./user chroots into /home).  Note that usually there is no real "
+"need to do chrooting, Dovecot doesn't allow users to access files outside "
+"their mail directory anyway.  If your home directories are prefixed with the "
+"chroot directory, append \"/.\" to @samp{mail-chroot}.  <doc/wiki/Chrooting."
+"txt>.  Defaults to @samp{\"\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13755
+#: doc/guix.texi:13804
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} file-name auth-socket-path"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13759
+#: doc/guix.texi:13808
 msgid ""
-"UNIX socket path to master authentication server to find users.  This is used by imap (for shared users) and lda.  Defaults to "
-"@samp{\"/var/run/dovecot/auth-userdb\"}."
+"UNIX socket path to master authentication server to find users.  This is "
+"used by imap (for shared users) and lda.  Defaults to @samp{\"/var/run/"
+"dovecot/auth-userdb\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13761
+#: doc/guix.texi:13810
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} file-name mail-plugin-dir"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13764
-msgid "Directory where to look up mail plugins.  Defaults to @samp{\"/usr/lib/dovecot\"}."
+#: doc/guix.texi:13813
+msgid ""
+"Directory where to look up mail plugins.  Defaults to @samp{\"/usr/lib/"
+"dovecot\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13766
+#: doc/guix.texi:13815
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} space-separated-string-list mail-plugins"
 msgstr ""
 
-#. type: deftypevr
-#: doc/guix.texi:13770
-msgid ""
-"List of plugins to load for all services.  Plugins specific to IMAP, LDA, etc. are added to this list in their own .conf files.  "
-"Defaults to @samp{()}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:13772
-#, no-wrap
-msgid "{@code{dovecot-configuration} parameter} non-negative-integer mail-cache-min-mail-count"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:13777
-msgid ""
-"The minimum number of mails in a mailbox before updates are done to cache file.  This allows optimizing Dovecot's behavior to do "
-"less disk writes at the cost of more disk reads.  Defaults to @samp{0}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:13779
-#, no-wrap
-msgid "{@code{dovecot-configuration} parameter} string mailbox-idle-check-interval"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:13786
-msgid ""
-"When IDLE command is running, mailbox is checked once in a while to see if there are any new mails or other changes.  This setting "
-"defines the minimum time to wait between those checks.  Dovecot can also use dnotify, inotify and kqueue to find out immediately "
-"when changes occur.  Defaults to @samp{\"30 secs\"}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:13788
-#, no-wrap
-msgid "{@code{dovecot-configuration} parameter} boolean mail-save-crlf?"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:13795
-msgid ""
-"Save mails with CR+LF instead of plain LF.  This makes sending those mails take less CPU, especially with sendfile() syscall with "
-"Linux and FreeBSD.  But it also creates a bit more disk I/O which may just make it slower.  Also note that if other software reads "
-"the mboxes/maildirs, they may handle the extra CRs wrong and cause problems.  Defaults to @samp{#f}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:13797
-#, no-wrap
-msgid "{@code{dovecot-configuration} parameter} boolean maildir-stat-dirs?"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:13805
-msgid ""
-"By default LIST command returns all entries in maildir beginning with a dot.  Enabling this option makes Dovecot return only entries "
-"which are directories.  This is done by stat()ing each entry, so it causes more disk I/O.  (For systems setting struct @samp{dirent-"
-">d_type} this check is free and it's done always regardless of this setting).  Defaults to @samp{#f}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:13807
-#, no-wrap
-msgid "{@code{dovecot-configuration} parameter} boolean maildir-copy-with-hardlinks?"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:13812
-msgid ""
-"When copying a message, do it with hard links whenever possible.  This makes the performance much better, and it's unlikely to have "
-"any side effects.  Defaults to @samp{#t}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:13814
-#, no-wrap
-msgid "{@code{dovecot-configuration} parameter} boolean maildir-very-dirty-syncs?"
-msgstr ""
-
 #. type: deftypevr
 #: doc/guix.texi:13819
 msgid ""
-"Assume Dovecot is the only MUA accessing Maildir: Scan cur/ directory only when its mtime changes unexpectedly or when we can't find "
-"the mail otherwise.  Defaults to @samp{#f}."
+"List of plugins to load for all services.  Plugins specific to IMAP, LDA, "
+"etc. are added to this list in their own .conf files.  Defaults to @samp{()}."
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:13821
 #, no-wrap
-msgid "{@code{dovecot-configuration} parameter} space-separated-string-list mbox-read-locks"
+msgid "{@code{dovecot-configuration} parameter} non-negative-integer mail-cache-min-mail-count"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13824
-msgid "Which locking methods to use for locking mbox.  There are four available:"
-msgstr ""
-
-#. type: item
 #: doc/guix.texi:13826
-#, no-wrap
-msgid "dotlock"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:13830
 msgid ""
-"Create <mailbox>.lock file.  This is the oldest and most NFS-safe solution.  If you want to use /var/mail/ like directory, the users "
-"will need write access to that directory."
+"The minimum number of mails in a mailbox before updates are done to cache "
+"file.  This allows optimizing Dovecot's behavior to do less disk writes at "
+"the cost of more disk reads.  Defaults to @samp{0}."
 msgstr ""
 
-#. type: item
-#: doc/guix.texi:13830
+#. type: deftypevr
+#: doc/guix.texi:13828
 #, no-wrap
-msgid "dotlock-try"
+msgid "{@code{dovecot-configuration} parameter} string mailbox-idle-check-interval"
 msgstr ""
 
-#. type: table
-#: doc/guix.texi:13833
-msgid "Same as dotlock, but if it fails because of permissions or because there isn't enough disk space, just skip it."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:13833
-#, no-wrap
-msgid "fcntl"
-msgstr ""
-
-#. type: table
+#. type: deftypevr
 #: doc/guix.texi:13835
-msgid "Use this if possible.  Works with NFS too if lockd is used."
+msgid ""
+"When IDLE command is running, mailbox is checked once in a while to see if "
+"there are any new mails or other changes.  This setting defines the minimum "
+"time to wait between those checks.  Dovecot can also use dnotify, inotify "
+"and kqueue to find out immediately when changes occur.  Defaults to "
+"@samp{\"30 secs\"}."
 msgstr ""
 
-#. type: item
-#: doc/guix.texi:13835
-#, no-wrap
-msgid "flock"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:13837 doc/guix.texi:13839
-msgid "May not exist in all systems.  Doesn't work with NFS."
-msgstr ""
-
-#. type: item
+#. type: deftypevr
 #: doc/guix.texi:13837
 #, no-wrap
-msgid "lockf"
+msgid "{@code{dovecot-configuration} parameter} boolean mail-save-crlf?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13845
+#: doc/guix.texi:13844
 msgid ""
-"You can use multiple locking methods; if you do the order they're declared in is important to avoid deadlocks if other MTAs/MUAs are "
-"using multiple locking methods as well.  Some operating systems don't allow using some of them simultaneously."
+"Save mails with CR+LF instead of plain LF.  This makes sending those mails "
+"take less CPU, especially with sendfile() syscall with Linux and FreeBSD.  "
+"But it also creates a bit more disk I/O which may just make it slower.  Also "
+"note that if other software reads the mboxes/maildirs, they may handle the "
+"extra CRs wrong and cause problems.  Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13847
+#: doc/guix.texi:13846
 #, no-wrap
-msgid "{@code{dovecot-configuration} parameter} space-separated-string-list mbox-write-locks"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:13851
-#, no-wrap
-msgid "{@code{dovecot-configuration} parameter} string mbox-lock-timeout"
+msgid "{@code{dovecot-configuration} parameter} boolean maildir-stat-dirs?"
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:13854
-msgid "Maximum time to wait for lock (all of them) before aborting.  Defaults to @samp{\"5 mins\"}."
+msgid ""
+"By default LIST command returns all entries in maildir beginning with a "
+"dot.  Enabling this option makes Dovecot return only entries which are "
+"directories.  This is done by stat()ing each entry, so it causes more disk I/"
+"O.  (For systems setting struct @samp{dirent->d_type} this check is free and "
+"it's done always regardless of this setting).  Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:13856
 #, no-wrap
-msgid "{@code{dovecot-configuration} parameter} string mbox-dotlock-change-timeout"
+msgid "{@code{dovecot-configuration} parameter} boolean maildir-copy-with-hardlinks?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13860
+#: doc/guix.texi:13861
 msgid ""
-"If dotlock exists but the mailbox isn't modified in any way, override the lock file after this much time.  Defaults to @samp{\"2 mins"
-"\"}."
+"When copying a message, do it with hard links whenever possible.  This makes "
+"the performance much better, and it's unlikely to have any side effects.  "
+"Defaults to @samp{#t}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13862
+#: doc/guix.texi:13863
 #, no-wrap
-msgid "{@code{dovecot-configuration} parameter} boolean mbox-dirty-syncs?"
+msgid "{@code{dovecot-configuration} parameter} boolean maildir-very-dirty-syncs?"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:13868
+msgid ""
+"Assume Dovecot is the only MUA accessing Maildir: Scan cur/ directory only "
+"when its mtime changes unexpectedly or when we can't find the mail "
+"otherwise.  Defaults to @samp{#f}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:13870
+#, no-wrap
+msgid "{@code{dovecot-configuration} parameter} space-separated-string-list mbox-read-locks"
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:13873
 msgid ""
-"When mbox changes unexpectedly we have to fully read it to find out what changed.  If the mbox is large this can take a long time.  "
-"Since the change is usually just a newly appended mail, it'd be faster to simply read the new mails.  If this setting is enabled, "
-"Dovecot does this but still safely fallbacks to re-reading the whole mbox file whenever something in mbox isn't how it's expected to "
-"be.  The only real downside to this setting is that if some other MUA changes message flags, Dovecot doesn't notice it immediately.  "
-"Note that a full sync is done with SELECT, EXAMINE, EXPUNGE and CHECK commands.  Defaults to @samp{#t}."
+"Which locking methods to use for locking mbox.  There are four available:"
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:13875
+#, no-wrap
+msgid "dotlock"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:13879
+msgid ""
+"Create <mailbox>.lock file.  This is the oldest and most NFS-safe solution.  "
+"If you want to use /var/mail/ like directory, the users will need write "
+"access to that directory."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:13879
+#, no-wrap
+msgid "dotlock-try"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:13882
+msgid ""
+"Same as dotlock, but if it fails because of permissions or because there "
+"isn't enough disk space, just skip it."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:13882
+#, no-wrap
+msgid "fcntl"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:13884
+msgid "Use this if possible.  Works with NFS too if lockd is used."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:13884
+#, no-wrap
+msgid "flock"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:13886 doc/guix.texi:13888
+msgid "May not exist in all systems.  Doesn't work with NFS."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:13886
+#, no-wrap
+msgid "lockf"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13875
+#: doc/guix.texi:13894
+msgid ""
+"You can use multiple locking methods; if you do the order they're declared "
+"in is important to avoid deadlocks if other MTAs/MUAs are using multiple "
+"locking methods as well.  Some operating systems don't allow using some of "
+"them simultaneously."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:13896
+#, no-wrap
+msgid "{@code{dovecot-configuration} parameter} space-separated-string-list mbox-write-locks"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:13900
+#, no-wrap
+msgid "{@code{dovecot-configuration} parameter} string mbox-lock-timeout"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:13903
+msgid ""
+"Maximum time to wait for lock (all of them) before aborting.  Defaults to "
+"@samp{\"5 mins\"}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:13905
+#, no-wrap
+msgid "{@code{dovecot-configuration} parameter} string mbox-dotlock-change-timeout"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:13909
+msgid ""
+"If dotlock exists but the mailbox isn't modified in any way, override the "
+"lock file after this much time.  Defaults to @samp{\"2 mins\"}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:13911
+#, no-wrap
+msgid "{@code{dovecot-configuration} parameter} boolean mbox-dirty-syncs?"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:13922
+msgid ""
+"When mbox changes unexpectedly we have to fully read it to find out what "
+"changed.  If the mbox is large this can take a long time.  Since the change "
+"is usually just a newly appended mail, it'd be faster to simply read the new "
+"mails.  If this setting is enabled, Dovecot does this but still safely "
+"fallbacks to re-reading the whole mbox file whenever something in mbox isn't "
+"how it's expected to be.  The only real downside to this setting is that if "
+"some other MUA changes message flags, Dovecot doesn't notice it "
+"immediately.  Note that a full sync is done with SELECT, EXAMINE, EXPUNGE "
+"and CHECK commands.  Defaults to @samp{#t}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:13924
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean mbox-very-dirty-syncs?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13880
+#: doc/guix.texi:13929
 msgid ""
-"Like @samp{mbox-dirty-syncs}, but don't do full syncs even with SELECT, EXAMINE, EXPUNGE or CHECK commands.  If this is set, "
-"@samp{mbox-dirty-syncs} is ignored.  Defaults to @samp{#f}."
+"Like @samp{mbox-dirty-syncs}, but don't do full syncs even with SELECT, "
+"EXAMINE, EXPUNGE or CHECK commands.  If this is set, @samp{mbox-dirty-syncs} "
+"is ignored.  Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13882
+#: doc/guix.texi:13931
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean mbox-lazy-writes?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13888
+#: doc/guix.texi:13937
 msgid ""
-"Delay writing mbox headers until doing a full write sync (EXPUNGE and CHECK commands and when closing the mailbox).  This is "
-"especially useful for POP3 where clients often delete all mails.  The downside is that our changes aren't immediately visible to "
-"other MUAs.  Defaults to @samp{#t}."
+"Delay writing mbox headers until doing a full write sync (EXPUNGE and CHECK "
+"commands and when closing the mailbox).  This is especially useful for POP3 "
+"where clients often delete all mails.  The downside is that our changes "
+"aren't immediately visible to other MUAs.  Defaults to @samp{#t}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13890
+#: doc/guix.texi:13939
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} non-negative-integer mbox-min-index-size"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13895
+#: doc/guix.texi:13944
 msgid ""
-"If mbox size is smaller than this (e.g. 100k), don't write index files.  If an index file already exists it's still read, just not "
-"updated.  Defaults to @samp{0}."
+"If mbox size is smaller than this (e.g. 100k), don't write index files.  If "
+"an index file already exists it's still read, just not updated.  Defaults to "
+"@samp{0}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13897
+#: doc/guix.texi:13946
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} non-negative-integer mdbox-rotate-size"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13900
-msgid "Maximum dbox file size until it's rotated.  Defaults to @samp{10000000}."
+#: doc/guix.texi:13949
+msgid ""
+"Maximum dbox file size until it's rotated.  Defaults to @samp{10000000}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13902
+#: doc/guix.texi:13951
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string mdbox-rotate-interval"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13907
+#: doc/guix.texi:13956
 msgid ""
-"Maximum dbox file age until it's rotated.  Typically in days.  Day begins from midnight, so 1d = today, 2d = yesterday, etc.  0 = "
-"check disabled.  Defaults to @samp{\"1d\"}."
+"Maximum dbox file age until it's rotated.  Typically in days.  Day begins "
+"from midnight, so 1d = today, 2d = yesterday, etc.  0 = check disabled.  "
+"Defaults to @samp{\"1d\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13909
+#: doc/guix.texi:13958
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean mdbox-preallocate-space?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13914
+#: doc/guix.texi:13963
 msgid ""
-"When creating new mdbox files, immediately preallocate their size to @samp{mdbox-rotate-size}.  This setting currently works only in "
-"Linux with some file systems (ext4, xfs).  Defaults to @samp{#f}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:13916
-#, no-wrap
-msgid "{@code{dovecot-configuration} parameter} string mail-attachment-dir"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:13920
-msgid ""
-"sdbox and mdbox support saving mail attachments to external files, which also allows single instance storage for them.  Other "
-"backends don't support this for now."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:13922
-msgid "WARNING: This feature hasn't been tested much yet.  Use at your own risk."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:13925
-msgid "Directory root where to store mail attachments.  Disabled, if empty.  Defaults to @samp{\"\"}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:13927
-#, no-wrap
-msgid "{@code{dovecot-configuration} parameter} non-negative-integer mail-attachment-min-size"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:13932
-msgid ""
-"Attachments smaller than this aren't saved externally.  It's also possible to write a plugin to disable saving specific attachments "
-"externally.  Defaults to @samp{128000}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:13934
-#, no-wrap
-msgid "{@code{dovecot-configuration} parameter} string mail-attachment-fs"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:13936
-msgid "File system backend to use for saving attachments:"
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:13937
-#, no-wrap
-msgid "posix"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:13939
-msgid "No SiS done by Dovecot (but this might help FS's own deduplication)"
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:13939
-#, no-wrap
-msgid "sis posix"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:13941
-msgid "SiS with immediate byte-by-byte comparison during saving"
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:13941
-#, no-wrap
-msgid "sis-queue posix"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:13943
-msgid "SiS with delayed comparison and deduplication."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:13945
-msgid "Defaults to @samp{\"sis posix\"}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:13947
-#, no-wrap
-msgid "{@code{dovecot-configuration} parameter} string mail-attachment-hash"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:13953
-msgid ""
-"Hash format to use in attachment filenames.  You can add any text and variables: @code{%@{md4@}}, @code{%@{md5@}}, @code{%@{sha1@}}, "
-"@code{%@{sha256@}}, @code{%@{sha512@}}, @code{%@{size@}}.  Variables can be truncated, e.g. @code{%@{sha256:80@}} returns only first "
-"80 bits.  Defaults to @samp{\"%@{sha1@}\"}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:13955
-#, no-wrap
-msgid "{@code{dovecot-configuration} parameter} non-negative-integer default-process-limit"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:13960
-#, no-wrap
-msgid "{@code{dovecot-configuration} parameter} non-negative-integer default-client-limit"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:13963 doc/guix.texi:17869
-msgid "Defaults to @samp{1000}."
+"When creating new mdbox files, immediately preallocate their size to "
+"@samp{mdbox-rotate-size}.  This setting currently works only in Linux with "
+"some file systems (ext4, xfs).  Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:13965
 #, no-wrap
-msgid "{@code{dovecot-configuration} parameter} non-negative-integer default-vsz-limit"
+msgid "{@code{dovecot-configuration} parameter} string mail-attachment-dir"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13970
+#: doc/guix.texi:13969
 msgid ""
-"Default VSZ (virtual memory size) limit for service processes.  This is mainly intended to catch and kill processes that leak memory "
-"before they eat up everything.  Defaults to @samp{256000000}."
+"sdbox and mdbox support saving mail attachments to external files, which "
+"also allows single instance storage for them.  Other backends don't support "
+"this for now."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13972
+#: doc/guix.texi:13971
+msgid ""
+"WARNING: This feature hasn't been tested much yet.  Use at your own risk."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:13974
+msgid ""
+"Directory root where to store mail attachments.  Disabled, if empty.  "
+"Defaults to @samp{\"\"}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:13976
 #, no-wrap
-msgid "{@code{dovecot-configuration} parameter} string default-login-user"
+msgid "{@code{dovecot-configuration} parameter} non-negative-integer mail-attachment-min-size"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13977
+#: doc/guix.texi:13981
 msgid ""
-"Login user is internally used by login processes.  This is the most untrusted user in Dovecot system.  It shouldn't have access to "
-"anything at all.  Defaults to @samp{\"dovenull\"}."
+"Attachments smaller than this aren't saved externally.  It's also possible "
+"to write a plugin to disable saving specific attachments externally.  "
+"Defaults to @samp{128000}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13979
+#: doc/guix.texi:13983
 #, no-wrap
-msgid "{@code{dovecot-configuration} parameter} string default-internal-user"
+msgid "{@code{dovecot-configuration} parameter} string mail-attachment-fs"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13984
-msgid ""
-"Internal user is used by unprivileged processes.  It should be separate from login user, so that login processes can't disturb other "
-"processes.  Defaults to @samp{\"dovecot\"}."
+#: doc/guix.texi:13985
+msgid "File system backend to use for saving attachments:"
 msgstr ""
 
-#. type: deftypevr
+#. type: item
 #: doc/guix.texi:13986
 #, no-wrap
-msgid "{@code{dovecot-configuration} parameter} string ssl?"
+msgid "posix"
 msgstr ""
 
-#. type: deftypevr
-#: doc/guix.texi:13989
-msgid "SSL/TLS support: yes, no, required.  <doc/wiki/SSL.txt>.  Defaults to @samp{\"required\"}."
+#. type: table
+#: doc/guix.texi:13988
+msgid "No SiS done by Dovecot (but this might help FS's own deduplication)"
 msgstr ""
 
-#. type: deftypevr
-#: doc/guix.texi:13991
+#. type: item
+#: doc/guix.texi:13988
 #, no-wrap
-msgid "{@code{dovecot-configuration} parameter} string ssl-cert"
+msgid "sis posix"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:13990
+msgid "SiS with immediate byte-by-byte comparison during saving"
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:13990
+#, no-wrap
+msgid "sis-queue posix"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:13992
+msgid "SiS with delayed comparison and deduplication."
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:13994
-msgid "PEM encoded X.509 SSL/TLS certificate (public key).  Defaults to @samp{\"</etc/dovecot/default.pem\"}."
+msgid "Defaults to @samp{\"sis posix\"}."
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:13996
 #, no-wrap
-msgid "{@code{dovecot-configuration} parameter} string ssl-key"
+msgid "{@code{dovecot-configuration} parameter} string mail-attachment-hash"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14001
+#: doc/guix.texi:14002
 msgid ""
-"PEM encoded SSL/TLS private key.  The key is opened before dropping root privileges, so keep the key file unreadable by anyone but "
-"root.  Defaults to @samp{\"</etc/dovecot/private/default.pem\"}."
+"Hash format to use in attachment filenames.  You can add any text and "
+"variables: @code{%@{md4@}}, @code{%@{md5@}}, @code{%@{sha1@}}, "
+"@code{%@{sha256@}}, @code{%@{sha512@}}, @code{%@{size@}}.  Variables can be "
+"truncated, e.g. @code{%@{sha256:80@}} returns only first 80 bits.  Defaults "
+"to @samp{\"%@{sha1@}\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14003
+#: doc/guix.texi:14004
 #, no-wrap
-msgid "{@code{dovecot-configuration} parameter} string ssl-key-password"
+msgid "{@code{dovecot-configuration} parameter} non-negative-integer default-process-limit"
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:14009
-msgid ""
-"If key file is password protected, give the password here.  Alternatively give it when starting dovecot with -p parameter.  Since "
-"this file is often world-readable, you may want to place this setting instead to a different.  Defaults to @samp{\"\"}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:14011
 #, no-wrap
-msgid "{@code{dovecot-configuration} parameter} string ssl-ca"
+msgid "{@code{dovecot-configuration} parameter} non-negative-integer default-client-limit"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14017
-msgid ""
-"PEM encoded trusted certificate authority.  Set this only if you intend to use @samp{ssl-verify-client-cert? #t}.  The file should "
-"contain the CA certificate(s) followed by the matching CRL(s).  (e.g. @samp{ssl-ca </etc/ssl/certs/ca.pem}).  Defaults to "
-"@samp{\"\"}."
+#: doc/guix.texi:14012 doc/guix.texi:17918
+msgid "Defaults to @samp{1000}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:14014
+#, no-wrap
+msgid "{@code{dovecot-configuration} parameter} non-negative-integer default-vsz-limit"
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:14019
-#, no-wrap
-msgid "{@code{dovecot-configuration} parameter} boolean ssl-require-crl?"
+msgid ""
+"Default VSZ (virtual memory size) limit for service processes.  This is "
+"mainly intended to catch and kill processes that leak memory before they eat "
+"up everything.  Defaults to @samp{256000000}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14022
-msgid "Require that CRL check succeeds for client certificates.  Defaults to @samp{#t}."
+#: doc/guix.texi:14021
+#, no-wrap
+msgid "{@code{dovecot-configuration} parameter} string default-login-user"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14024
-#, no-wrap
-msgid "{@code{dovecot-configuration} parameter} boolean ssl-verify-client-cert?"
+#: doc/guix.texi:14026
+msgid ""
+"Login user is internally used by login processes.  This is the most "
+"untrusted user in Dovecot system.  It shouldn't have access to anything at "
+"all.  Defaults to @samp{\"dovenull\"}."
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:14028
-msgid ""
-"Request client to send a certificate.  If you also want to require it, set @samp{auth-ssl-require-client-cert? #t} in auth section.  "
-"Defaults to @samp{#f}."
+#, no-wrap
+msgid "{@code{dovecot-configuration} parameter} string default-internal-user"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14030
-#, no-wrap
-msgid "{@code{dovecot-configuration} parameter} string ssl-cert-username-field"
+#: doc/guix.texi:14033
+msgid ""
+"Internal user is used by unprivileged processes.  It should be separate from "
+"login user, so that login processes can't disturb other processes.  Defaults "
+"to @samp{\"dovecot\"}."
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:14035
-msgid ""
-"Which field from certificate to use for username.  commonName and x500UniqueIdentifier are the usual choices.  You'll also need to "
-"set @samp{auth-ssl-username-from-cert? #t}.  Defaults to @samp{\"commonName\"}."
+#, no-wrap
+msgid "{@code{dovecot-configuration} parameter} string ssl?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14037
-#, no-wrap
-msgid "{@code{dovecot-configuration} parameter} string ssl-min-protocol"
+#: doc/guix.texi:14038
+msgid ""
+"SSL/TLS support: yes, no, required.  <doc/wiki/SSL.txt>.  Defaults to "
+"@samp{\"required\"}."
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:14040
-msgid "Minimum SSL protocol version to accept.  Defaults to @samp{\"TLSv1\"}."
+#, no-wrap
+msgid "{@code{dovecot-configuration} parameter} string ssl-cert"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14042
-#, no-wrap
-msgid "{@code{dovecot-configuration} parameter} string ssl-cipher-list"
+#: doc/guix.texi:14043
+msgid ""
+"PEM encoded X.509 SSL/TLS certificate (public key).  Defaults to @samp{\"</"
+"etc/dovecot/default.pem\"}."
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:14045
-msgid ""
-"SSL ciphers to use.  Defaults to @samp{\"ALL:!kRSA:!SRP:!kDHd:!DSS:!aNULL:!eNULL:!EXPORT:!DES:!3DES:!MD5:!PSK:!RC4:!ADH:!"
-"LOW@@STRENGTH\"}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:14047
 #, no-wrap
-msgid "{@code{dovecot-configuration} parameter} string ssl-crypto-device"
+msgid "{@code{dovecot-configuration} parameter} string ssl-key"
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:14050
-msgid "SSL crypto device to use, for valid values run \"openssl engine\".  Defaults to @samp{\"\"}."
+msgid ""
+"PEM encoded SSL/TLS private key.  The key is opened before dropping root "
+"privileges, so keep the key file unreadable by anyone but root.  Defaults to "
+"@samp{\"</etc/dovecot/private/default.pem\"}."
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:14052
 #, no-wrap
-msgid "{@code{dovecot-configuration} parameter} string postmaster-address"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:14056
-msgid "Address to use when sending rejection mails.  %d expands to recipient domain.  Defaults to @samp{\"postmaster@@%d\"}."
+msgid "{@code{dovecot-configuration} parameter} string ssl-key-password"
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:14058
+msgid ""
+"If key file is password protected, give the password here.  Alternatively "
+"give it when starting dovecot with -p parameter.  Since this file is often "
+"world-readable, you may want to place this setting instead to a different.  "
+"Defaults to @samp{\"\"}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:14060
+#, no-wrap
+msgid "{@code{dovecot-configuration} parameter} string ssl-ca"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:14066
+msgid ""
+"PEM encoded trusted certificate authority.  Set this only if you intend to "
+"use @samp{ssl-verify-client-cert? #t}.  The file should contain the CA "
+"certificate(s) followed by the matching CRL(s).  (e.g. @samp{ssl-ca </etc/"
+"ssl/certs/ca.pem}).  Defaults to @samp{\"\"}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:14068
+#, no-wrap
+msgid "{@code{dovecot-configuration} parameter} boolean ssl-require-crl?"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:14071
+msgid ""
+"Require that CRL check succeeds for client certificates.  Defaults to "
+"@samp{#t}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:14073
+#, no-wrap
+msgid "{@code{dovecot-configuration} parameter} boolean ssl-verify-client-cert?"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:14077
+msgid ""
+"Request client to send a certificate.  If you also want to require it, set "
+"@samp{auth-ssl-require-client-cert? #t} in auth section.  Defaults to "
+"@samp{#f}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:14079
+#, no-wrap
+msgid "{@code{dovecot-configuration} parameter} string ssl-cert-username-field"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:14084
+msgid ""
+"Which field from certificate to use for username.  commonName and "
+"x500UniqueIdentifier are the usual choices.  You'll also need to set "
+"@samp{auth-ssl-username-from-cert? #t}.  Defaults to @samp{\"commonName\"}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:14086
+#, no-wrap
+msgid "{@code{dovecot-configuration} parameter} string ssl-min-protocol"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:14089
+msgid "Minimum SSL protocol version to accept.  Defaults to @samp{\"TLSv1\"}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:14091
+#, no-wrap
+msgid "{@code{dovecot-configuration} parameter} string ssl-cipher-list"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:14094
+msgid ""
+"SSL ciphers to use.  Defaults to @samp{\"ALL:!kRSA:!SRP:!kDHd:!DSS:!aNULL:!"
+"eNULL:!EXPORT:!DES:!3DES:!MD5:!PSK:!RC4:!ADH:!LOW@@STRENGTH\"}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:14096
+#, no-wrap
+msgid "{@code{dovecot-configuration} parameter} string ssl-crypto-device"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:14099
+msgid ""
+"SSL crypto device to use, for valid values run \"openssl engine\".  Defaults "
+"to @samp{\"\"}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:14101
+#, no-wrap
+msgid "{@code{dovecot-configuration} parameter} string postmaster-address"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:14105
+msgid ""
+"Address to use when sending rejection mails.  %d expands to recipient "
+"domain.  Defaults to @samp{\"postmaster@@%d\"}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:14107
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string hostname"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14062
+#: doc/guix.texi:14111
 msgid ""
-"Hostname to use in various parts of sent mails (e.g. in Message-Id)  and in LMTP replies.  Default is the system's real "
-"hostname@@domain.  Defaults to @samp{\"\"}."
+"Hostname to use in various parts of sent mails (e.g. in Message-Id)  and in "
+"LMTP replies.  Default is the system's real hostname@@domain.  Defaults to "
+"@samp{\"\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14064
+#: doc/guix.texi:14113
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean quota-full-tempfail?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14068
-msgid "If user is over quota, return with temporary failure instead of bouncing the mail.  Defaults to @samp{#f}."
+#: doc/guix.texi:14117
+msgid ""
+"If user is over quota, return with temporary failure instead of bouncing the "
+"mail.  Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14070
+#: doc/guix.texi:14119
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} file-name sendmail-path"
 msgstr ""
 
-#. type: deftypevr
-#: doc/guix.texi:14073
-msgid "Binary to use for sending mails.  Defaults to @samp{\"/usr/sbin/sendmail\"}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:14075
-#, no-wrap
-msgid "{@code{dovecot-configuration} parameter} string submission-host"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:14079
-msgid "If non-empty, send mails via this SMTP host[:port] instead of sendmail.  Defaults to @samp{\"\"}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:14081
-#, no-wrap
-msgid "{@code{dovecot-configuration} parameter} string rejection-subject"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:14085
-msgid ""
-"Subject: header to use for rejection mails.  You can use the same variables as for @samp{rejection-reason} below.  Defaults to "
-"@samp{\"Rejected: %s\"}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:14087
-#, no-wrap
-msgid "{@code{dovecot-configuration} parameter} string rejection-reason"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:14090
-msgid "Human readable error message for rejection mails.  You can use variables:"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:14094
-msgid "CRLF"
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:14094
-#, no-wrap
-msgid "%r"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:14096
-msgid "reason"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:14098
-msgid "original subject"
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:14098
-#, no-wrap
-msgid "%t"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:14100
-msgid "recipient"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:14102
-msgid "Defaults to @samp{\"Your message to <%t> was automatically rejected:%n%r\"}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:14104
-#, no-wrap
-msgid "{@code{dovecot-configuration} parameter} string recipient-delimiter"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:14108
-msgid "Delimiter character between local-part and detail in email address.  Defaults to @samp{\"+\"}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:14110
-#, no-wrap
-msgid "{@code{dovecot-configuration} parameter} string lda-original-recipient-header"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:14116
-msgid ""
-"Header where the original recipient address (SMTP's RCPT TO: address) is taken from if not available elsewhere.  With dovecot-lda -a "
-"parameter overrides this.  A commonly used header for this is X-Original-To.  Defaults to @samp{\"\"}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:14118
-#, no-wrap
-msgid "{@code{dovecot-configuration} parameter} boolean lda-mailbox-autocreate?"
-msgstr ""
-
 #. type: deftypevr
 #: doc/guix.texi:14122
-msgid "Should saving a mail to a nonexistent mailbox automatically create it?.  Defaults to @samp{#f}."
+msgid ""
+"Binary to use for sending mails.  Defaults to @samp{\"/usr/sbin/sendmail\"}."
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:14124
 #, no-wrap
-msgid "{@code{dovecot-configuration} parameter} boolean lda-mailbox-autosubscribe?"
+msgid "{@code{dovecot-configuration} parameter} string submission-host"
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:14128
-msgid "Should automatically created mailboxes be also automatically subscribed?.  Defaults to @samp{#f}."
+msgid ""
+"If non-empty, send mails via this SMTP host[:port] instead of sendmail.  "
+"Defaults to @samp{\"\"}."
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:14130
 #, no-wrap
-msgid "{@code{dovecot-configuration} parameter} non-negative-integer imap-max-line-length"
+msgid "{@code{dovecot-configuration} parameter} string rejection-subject"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:14134
+msgid ""
+"Subject: header to use for rejection mails.  You can use the same variables "
+"as for @samp{rejection-reason} below.  Defaults to @samp{\"Rejected: %s\"}."
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:14136
-msgid ""
-"Maximum IMAP command line length.  Some clients generate very long command lines with huge mailboxes, so you may need to raise this "
-"if you get \"Too long argument\" or \"IMAP command line too large\" errors often.  Defaults to @samp{64000}."
+#, no-wrap
+msgid "{@code{dovecot-configuration} parameter} string rejection-reason"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14138
+#: doc/guix.texi:14139
+msgid ""
+"Human readable error message for rejection mails.  You can use variables:"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:14143
+msgid "CRLF"
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:14143
+#, no-wrap
+msgid "%r"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:14145
+msgid "reason"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:14147
+msgid "original subject"
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:14147
+#, no-wrap
+msgid "%t"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:14149
+msgid "recipient"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:14151
+msgid ""
+"Defaults to @samp{\"Your message to <%t> was automatically rejected:%n%r\"}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:14153
+#, no-wrap
+msgid "{@code{dovecot-configuration} parameter} string recipient-delimiter"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:14157
+msgid ""
+"Delimiter character between local-part and detail in email address.  "
+"Defaults to @samp{\"+\"}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:14159
+#, no-wrap
+msgid "{@code{dovecot-configuration} parameter} string lda-original-recipient-header"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:14165
+msgid ""
+"Header where the original recipient address (SMTP's RCPT TO: address) is "
+"taken from if not available elsewhere.  With dovecot-lda -a parameter "
+"overrides this.  A commonly used header for this is X-Original-To.  Defaults "
+"to @samp{\"\"}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:14167
+#, no-wrap
+msgid "{@code{dovecot-configuration} parameter} boolean lda-mailbox-autocreate?"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:14171
+msgid ""
+"Should saving a mail to a nonexistent mailbox automatically create it?.  "
+"Defaults to @samp{#f}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:14173
+#, no-wrap
+msgid "{@code{dovecot-configuration} parameter} boolean lda-mailbox-autosubscribe?"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:14177
+msgid ""
+"Should automatically created mailboxes be also automatically subscribed?.  "
+"Defaults to @samp{#f}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:14179
+#, no-wrap
+msgid "{@code{dovecot-configuration} parameter} non-negative-integer imap-max-line-length"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:14185
+msgid ""
+"Maximum IMAP command line length.  Some clients generate very long command "
+"lines with huge mailboxes, so you may need to raise this if you get \"Too "
+"long argument\" or \"IMAP command line too large\" errors often.  Defaults "
+"to @samp{64000}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:14187
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string imap-logout-format"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14140
+#: doc/guix.texi:14189
 msgid "IMAP logout format string:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14141
+#: doc/guix.texi:14190
 #, no-wrap
 msgid "%i"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14143
+#: doc/guix.texi:14192
 msgid "total number of bytes read from client"
 msgstr ""
 
-#. type: item
-#: doc/guix.texi:14143
-#, no-wrap
-msgid "%o"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:14145
-msgid "total number of bytes sent to client."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:14148
-msgid ""
-"See @file{doc/wiki/Variables.txt} for a list of all the variables you can use.  Defaults to @samp{\"in=%i out=%o deleted="
-"%@{deleted@} expunged=%@{expunged@} trashed=%@{trashed@} hdr_count=%@{fetch_hdr_count@} hdr_bytes=%@{fetch_hdr_bytes@} body_count="
-"%@{fetch_body_count@} body_bytes=%@{fetch_body_bytes@}\"}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:14150
-#, no-wrap
-msgid "{@code{dovecot-configuration} parameter} string imap-capability"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:14154
-msgid ""
-"Override the IMAP CAPABILITY response.  If the value begins with '+', add the given capabilities on top of the defaults (e.g. +XFOO "
-"XBAR).  Defaults to @samp{\"\"}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:14156
-#, no-wrap
-msgid "{@code{dovecot-configuration} parameter} string imap-idle-notify-interval"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:14160
-msgid "How long to wait between \"OK Still here\" notifications when client is IDLEing.  Defaults to @samp{\"2 mins\"}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:14162
-#, no-wrap
-msgid "{@code{dovecot-configuration} parameter} string imap-id-send"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:14168
-msgid ""
-"ID field names and values to send to clients.  Using * as the value makes Dovecot use the default value.  The following fields have "
-"default values currently: name, version, os, os-version, support-url, support-email.  Defaults to @samp{\"\"}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:14170
-#, no-wrap
-msgid "{@code{dovecot-configuration} parameter} string imap-id-log"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:14173
-msgid "ID fields sent by client to log.  * means everything.  Defaults to @samp{\"\"}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:14175
-#, no-wrap
-msgid "{@code{dovecot-configuration} parameter} space-separated-string-list imap-client-workarounds"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:14177
-msgid "Workarounds for various client bugs:"
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:14179
-#, no-wrap
-msgid "delay-newmail"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:14186
-msgid ""
-"Send EXISTS/RECENT new mail notifications only when replying to NOOP and CHECK commands.  Some clients ignore them otherwise, for "
-"example OSX Mail (<v2.1).  Outlook Express breaks more badly though, without this it may show user \"Message no longer in server\" "
-"errors.  Note that OE6 still breaks even with this workaround if synchronization is set to \"Headers Only\"."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:14187
-#, no-wrap
-msgid "tb-extra-mailbox-sep"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:14191
-msgid ""
-"Thunderbird gets somehow confused with LAYOUT=fs (mbox and dbox) and adds extra @samp{/} suffixes to mailbox names.  This option "
-"causes Dovecot to ignore the extra @samp{/} instead of treating it as invalid mailbox name."
-msgstr ""
-
 #. type: item
 #: doc/guix.texi:14192
 #, no-wrap
-msgid "tb-lsub-flags"
+msgid "%o"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14196
-msgid ""
-"Show \\Noselect flags for LSUB replies with LAYOUT=fs (e.g. mbox).  This makes Thunderbird realize they aren't selectable and show "
-"them greyed out, instead of only later giving \"not selectable\" popup error."
+#: doc/guix.texi:14194
+msgid "total number of bytes sent to client."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14200
+#: doc/guix.texi:14197
+msgid ""
+"See @file{doc/wiki/Variables.txt} for a list of all the variables you can "
+"use.  Defaults to @samp{\"in=%i out=%o deleted=%@{deleted@} expunged="
+"%@{expunged@} trashed=%@{trashed@} hdr_count=%@{fetch_hdr_count@} hdr_bytes="
+"%@{fetch_hdr_bytes@} body_count=%@{fetch_body_count@} body_bytes="
+"%@{fetch_body_bytes@}\"}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:14199
 #, no-wrap
-msgid "{@code{dovecot-configuration} parameter} string imap-urlauth-host"
+msgid "{@code{dovecot-configuration} parameter} string imap-capability"
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:14203
-msgid "Host allowed in URLAUTH URLs sent by client.  \"*\" allows all.  Defaults to @samp{\"\"}."
-msgstr ""
-
-#. type: Plain text
-#: doc/guix.texi:14211
 msgid ""
-"Whew! Lots of configuration options.  The nice thing about it though is that GuixSD has a complete interface to Dovecot's "
-"configuration language.  This allows not only a nice way to declare configurations, but also offers reflective capabilities as well: "
-"users can write code to inspect and transform configurations from within Scheme."
-msgstr ""
-
-#. type: Plain text
-#: doc/guix.texi:14217
-msgid ""
-"However, it could be that you just want to get a @code{dovecot.conf} up and running.  In that case, you can pass an @code{opaque-"
-"dovecot-configuration} as the @code{#:config} parameter to @code{dovecot-service}.  As its name indicates, an opaque configuration "
-"does not have easy reflective capabilities."
-msgstr ""
-
-#. type: Plain text
-#: doc/guix.texi:14219
-msgid "Available @code{opaque-dovecot-configuration} fields are:"
+"Override the IMAP CAPABILITY response.  If the value begins with '+', add "
+"the given capabilities on top of the defaults (e.g. +XFOO XBAR).  Defaults "
+"to @samp{\"\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14220
+#: doc/guix.texi:14205
 #, no-wrap
-msgid "{@code{opaque-dovecot-configuration} parameter} package dovecot"
+msgid "{@code{dovecot-configuration} parameter} string imap-idle-notify-interval"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:14209
+msgid ""
+"How long to wait between \"OK Still here\" notifications when client is "
+"IDLEing.  Defaults to @samp{\"2 mins\"}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:14211
+#, no-wrap
+msgid "{@code{dovecot-configuration} parameter} string imap-id-send"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:14217
+msgid ""
+"ID field names and values to send to clients.  Using * as the value makes "
+"Dovecot use the default value.  The following fields have default values "
+"currently: name, version, os, os-version, support-url, support-email.  "
+"Defaults to @samp{\"\"}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:14219
+#, no-wrap
+msgid "{@code{dovecot-configuration} parameter} string imap-id-log"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:14222
+msgid ""
+"ID fields sent by client to log.  * means everything.  Defaults to "
+"@samp{\"\"}."
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:14224
 #, no-wrap
-msgid "{@code{opaque-dovecot-configuration} parameter} string string"
+msgid "{@code{dovecot-configuration} parameter} space-separated-string-list imap-client-workarounds"
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:14226
+msgid "Workarounds for various client bugs:"
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:14228
+#, no-wrap
+msgid "delay-newmail"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:14235
+msgid ""
+"Send EXISTS/RECENT new mail notifications only when replying to NOOP and "
+"CHECK commands.  Some clients ignore them otherwise, for example OSX Mail "
+"(<v2.1).  Outlook Express breaks more badly though, without this it may show "
+"user \"Message no longer in server\" errors.  Note that OE6 still breaks "
+"even with this workaround if synchronization is set to \"Headers Only\"."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:14236
+#, no-wrap
+msgid "tb-extra-mailbox-sep"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:14240
+msgid ""
+"Thunderbird gets somehow confused with LAYOUT=fs (mbox and dbox) and adds "
+"extra @samp{/} suffixes to mailbox names.  This option causes Dovecot to "
+"ignore the extra @samp{/} instead of treating it as invalid mailbox name."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:14241
+#, no-wrap
+msgid "tb-lsub-flags"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:14245
+msgid ""
+"Show \\Noselect flags for LSUB replies with LAYOUT=fs (e.g. mbox).  This "
+"makes Thunderbird realize they aren't selectable and show them greyed out, "
+"instead of only later giving \"not selectable\" popup error."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:14249
+#, no-wrap
+msgid "{@code{dovecot-configuration} parameter} string imap-urlauth-host"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:14252
+msgid ""
+"Host allowed in URLAUTH URLs sent by client.  \"*\" allows all.  Defaults to "
+"@samp{\"\"}."
+msgstr ""
+
+#. type: Plain text
+#: doc/guix.texi:14260
+msgid ""
+"Whew! Lots of configuration options.  The nice thing about it though is that "
+"GuixSD has a complete interface to Dovecot's configuration language.  This "
+"allows not only a nice way to declare configurations, but also offers "
+"reflective capabilities as well: users can write code to inspect and "
+"transform configurations from within Scheme."
+msgstr ""
+
+#. type: Plain text
+#: doc/guix.texi:14266
+msgid ""
+"However, it could be that you just want to get a @code{dovecot.conf} up and "
+"running.  In that case, you can pass an @code{opaque-dovecot-configuration} "
+"as the @code{#:config} parameter to @code{dovecot-service}.  As its name "
+"indicates, an opaque configuration does not have easy reflective "
+"capabilities."
+msgstr ""
+
+#. type: Plain text
+#: doc/guix.texi:14268
+msgid "Available @code{opaque-dovecot-configuration} fields are:"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:14269
+#, no-wrap
+msgid "{@code{opaque-dovecot-configuration} parameter} package dovecot"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:14273
+#, no-wrap
+msgid "{@code{opaque-dovecot-configuration} parameter} string string"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:14275
 msgid "The contents of the @code{dovecot.conf}, as a string."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:14230
-msgid "For example, if your @code{dovecot.conf} is just the empty string, you could instantiate a dovecot service like this:"
+#: doc/guix.texi:14279
+msgid ""
+"For example, if your @code{dovecot.conf} is just the empty string, you could "
+"instantiate a dovecot service like this:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:14235
+#: doc/guix.texi:14284
 #, no-wrap
 msgid ""
 "(dovecot-service #:config\n"
@@ -27681,26 +31865,27 @@ msgid ""
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:14237
+#: doc/guix.texi:14286
 #, no-wrap
 msgid "OpenSMTPD Service"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:14239
+#: doc/guix.texi:14288
 #, no-wrap
 msgid "{Scheme Variable} opensmtpd-service-type"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:14243
+#: doc/guix.texi:14292
 msgid ""
-"This is the type of the @uref{https://www.opensmtpd.org, OpenSMTPD} service, whose value should be an @code{opensmtpd-configuration} "
-"object as in this example:"
+"This is the type of the @uref{https://www.opensmtpd.org, OpenSMTPD} service, "
+"whose value should be an @code{opensmtpd-configuration} object as in this "
+"example:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:14248
+#: doc/guix.texi:14297
 #, no-wrap
 msgid ""
 "(service opensmtpd-service-type\n"
@@ -27709,80 +31894,82 @@ msgid ""
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:14251
+#: doc/guix.texi:14300
 #, no-wrap
 msgid "{Data Type} opensmtpd-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:14253
+#: doc/guix.texi:14302
 msgid "Data type representing the configuration of opensmtpd."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14255
+#: doc/guix.texi:14304
 #, no-wrap
 msgid "@code{package} (default: @var{opensmtpd})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14257
+#: doc/guix.texi:14306
 msgid "Package object of the OpenSMTPD SMTP server."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14258
+#: doc/guix.texi:14307
 #, no-wrap
 msgid "@code{config-file} (default: @var{%default-opensmtpd-file})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14263
+#: doc/guix.texi:14312
 msgid ""
-"File-like object of the OpenSMTPD configuration file to use.  By default it listens on the loopback network interface, and allows "
-"for mail from users and daemons on the local machine, as well as permitting email to remote servers.  Run @command{man smtpd.conf} "
-"for more information."
+"File-like object of the OpenSMTPD configuration file to use.  By default it "
+"listens on the loopback network interface, and allows for mail from users "
+"and daemons on the local machine, as well as permitting email to remote "
+"servers.  Run @command{man smtpd.conf} for more information."
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:14267
+#: doc/guix.texi:14316
 #, no-wrap
 msgid "Exim Service"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:14269
+#: doc/guix.texi:14318
 #, no-wrap
 msgid "mail transfer agent (MTA)"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:14270
+#: doc/guix.texi:14319
 #, no-wrap
 msgid "MTA (mail transfer agent)"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:14271
+#: doc/guix.texi:14320
 #, no-wrap
 msgid "SMTP"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:14273
+#: doc/guix.texi:14322
 #, no-wrap
 msgid "{Scheme Variable} exim-service-type"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:14277
+#: doc/guix.texi:14326
 msgid ""
-"This is the type of the @uref{https://exim.org, Exim} mail transfer agent (MTA), whose value should be an @code{exim-configuration} "
-"object as in this example:"
+"This is the type of the @uref{https://exim.org, Exim} mail transfer agent "
+"(MTA), whose value should be an @code{exim-configuration} object as in this "
+"example:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:14282
+#: doc/guix.texi:14331
 #, no-wrap
 msgid ""
 "(service exim-service-type\n"
@@ -27791,79 +31978,77 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:14288
+#: doc/guix.texi:14337
 msgid ""
-"In order to use an @code{exim-service-type} service you must also have a @code{mail-aliases-service-type} service present in your "
-"@code{operating-system} (even if it has no aliases)."
+"In order to use an @code{exim-service-type} service you must also have a "
+"@code{mail-aliases-service-type} service present in your @code{operating-"
+"system} (even if it has no aliases)."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:14289
+#: doc/guix.texi:14338
 #, no-wrap
 msgid "{Data Type} exim-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:14291
+#: doc/guix.texi:14340
 msgid "Data type representing the configuration of exim."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14293
+#: doc/guix.texi:14342
 #, no-wrap
 msgid "@code{package} (default: @var{exim})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14295
+#: doc/guix.texi:14344
 msgid "Package object of the Exim server."
 msgstr ""
 
-#. type: item
-#: doc/guix.texi:14296
-#, no-wrap
-msgid "@code{config-file} (default: @code{#f})"
-msgstr ""
-
 #. type: table
-#: doc/guix.texi:14302
+#: doc/guix.texi:14351
 msgid ""
-"File-like object of the Exim configuration file to use. If its value is @code{#f} then use the default configuration file from the "
-"package provided in @code{package}. The resulting configuration file is loaded after setting the @code{exim_user} and "
-"@code{exim_group} configuration variables."
+"File-like object of the Exim configuration file to use. If its value is "
+"@code{#f} then use the default configuration file from the package provided "
+"in @code{package}. The resulting configuration file is loaded after setting "
+"the @code{exim_user} and @code{exim_group} configuration variables."
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:14306
+#: doc/guix.texi:14355
 #, no-wrap
 msgid "Mail Aliases Service"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:14308
+#: doc/guix.texi:14357
 #, no-wrap
 msgid "email aliases"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:14309
+#: doc/guix.texi:14358
 #, no-wrap
 msgid "aliases, for email addresses"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:14311
+#: doc/guix.texi:14360
 #, no-wrap
 msgid "{Scheme Variable} mail-aliases-service-type"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:14314
-msgid "This is the type of the service which provides @code{/etc/aliases}, specifying how to deliver mail to users on this system."
+#: doc/guix.texi:14363
+msgid ""
+"This is the type of the service which provides @code{/etc/aliases}, "
+"specifying how to deliver mail to users on this system."
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:14319
+#: doc/guix.texi:14368
 #, no-wrap
 msgid ""
 "(service mail-aliases-service-type\n"
@@ -27872,67 +32057,72 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:14327
+#: doc/guix.texi:14376
 msgid ""
-"The configuration for a @code{mail-aliases-service-type} service is an association list denoting how to deliver mail that comes to "
-"this system. Each entry is of the form @code{(alias addresses ...)}, with @code{alias} specifying the local alias and "
-"@code{addresses} specifying where to deliver this user's mail."
+"The configuration for a @code{mail-aliases-service-type} service is an "
+"association list denoting how to deliver mail that comes to this system. "
+"Each entry is of the form @code{(alias addresses ...)}, with @code{alias} "
+"specifying the local alias and @code{addresses} specifying where to deliver "
+"this user's mail."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:14333
+#: doc/guix.texi:14382
 msgid ""
-"The aliases aren't required to exist as users on the local system. In the above example, there doesn't need to be a "
-"@code{postmaster} entry in the @code{operating-system}'s @code{user-accounts} in order to deliver the @code{postmaster} mail to "
-"@code{bob} (which subsequently would deliver mail to @code{bob@@example.com} and @code{bob@@example2.com})."
+"The aliases aren't required to exist as users on the local system. In the "
+"above example, there doesn't need to be a @code{postmaster} entry in the "
+"@code{operating-system}'s @code{user-accounts} in order to deliver the "
+"@code{postmaster} mail to @code{bob} (which subsequently would deliver mail "
+"to @code{bob@@example.com} and @code{bob@@example2.com})."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:14337
+#: doc/guix.texi:14386
 #, no-wrap
 msgid "messaging"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:14338
+#: doc/guix.texi:14387
 #, no-wrap
 msgid "jabber"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:14339
+#: doc/guix.texi:14388
 #, no-wrap
 msgid "XMPP"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:14342
+#: doc/guix.texi:14391
 msgid ""
-"The @code{(gnu services messaging)} module provides Guix service definitions for messaging services: currently only Prosody is "
-"supported."
+"The @code{(gnu services messaging)} module provides Guix service definitions "
+"for messaging services: currently only Prosody is supported."
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:14343
+#: doc/guix.texi:14392
 #, no-wrap
 msgid "Prosody Service"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:14345
+#: doc/guix.texi:14394
 #, no-wrap
 msgid "{Scheme Variable} prosody-service-type"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:14349
+#: doc/guix.texi:14398
 msgid ""
-"This is the type for the @uref{https://prosody.im, Prosody XMPP communication server}.  Its value must be a @code{prosody-"
-"configuration} record as in this example:"
+"This is the type for the @uref{https://prosody.im, Prosody XMPP "
+"communication server}.  Its value must be a @code{prosody-configuration} "
+"record as in this example:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:14364
+#: doc/guix.texi:14413
 #, no-wrap
 msgid ""
 "(service prosody-service-type\n"
@@ -27951,775 +32141,846 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:14367
+#: doc/guix.texi:14416
 msgid "See below for details about @code{prosody-configuration}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:14373
+#: doc/guix.texi:14422
 msgid ""
-"By default, Prosody does not need much configuration.  Only one @code{virtualhosts} field is needed: it specifies the domain you "
-"wish Prosody to serve."
+"By default, Prosody does not need much configuration.  Only one "
+"@code{virtualhosts} field is needed: it specifies the domain you wish "
+"Prosody to serve."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:14376
-msgid "You can perform various sanity checks on the generated configuration with the @code{prosodyctl check} command."
+#: doc/guix.texi:14425
+msgid ""
+"You can perform various sanity checks on the generated configuration with "
+"the @code{prosodyctl check} command."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:14380
+#: doc/guix.texi:14429
 msgid ""
-"Prosodyctl will also help you to import certificates from the @code{letsencrypt} directory so that the @code{prosody} user can "
-"access them.  See @url{https://prosody.im/doc/letsencrypt}."
+"Prosodyctl will also help you to import certificates from the "
+"@code{letsencrypt} directory so that the @code{prosody} user can access "
+"them.  See @url{https://prosody.im/doc/letsencrypt}."
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:14383
+#: doc/guix.texi:14432
 #, no-wrap
 msgid "prosodyctl --root cert import /etc/letsencrypt/live\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:14390
+#: doc/guix.texi:14439
 msgid ""
-"The available configuration parameters follow.  Each parameter definition is preceded by its type; for example, @samp{string-list "
-"foo} indicates that the @code{foo} parameter should be specified as a list of strings.  Types starting with @code{maybe-} denote "
-"parameters that won't show up in @code{prosody.cfg.lua} when their value is @code{'disabled}."
+"The available configuration parameters follow.  Each parameter definition is "
+"preceded by its type; for example, @samp{string-list foo} indicates that the "
+"@code{foo} parameter should be specified as a list of strings.  Types "
+"starting with @code{maybe-} denote parameters that won't show up in "
+"@code{prosody.cfg.lua} when their value is @code{'disabled}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:14394
+#: doc/guix.texi:14443
 msgid ""
-"There is also a way to specify the configuration as a string, if you have an old @code{prosody.cfg.lua} file that you want to port "
-"over from some other system; see the end for more details."
+"There is also a way to specify the configuration as a string, if you have an "
+"old @code{prosody.cfg.lua} file that you want to port over from some other "
+"system; see the end for more details."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:14397
-msgid "The @code{file-object} type designates either a file-like object (@pxref{G-Expressions, file-like objects}) or a file name."
+#: doc/guix.texi:14446
+msgid ""
+"The @code{file-object} type designates either a file-like object (@pxref{G-"
+"Expressions, file-like objects}) or a file name."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:14407
+#: doc/guix.texi:14456
 msgid "Available @code{prosody-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14408
+#: doc/guix.texi:14457
 #, no-wrap
 msgid "{@code{prosody-configuration} parameter} package prosody"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14410
+#: doc/guix.texi:14459
 msgid "The Prosody package."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14412
+#: doc/guix.texi:14461
 #, no-wrap
 msgid "{@code{prosody-configuration} parameter} file-name data-path"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14416
+#: doc/guix.texi:14465
 msgid ""
-"Location of the Prosody data storage directory.  See @url{https://prosody.im/doc/configure}.  Defaults to @samp{\"/var/lib/prosody"
-"\"}."
+"Location of the Prosody data storage directory.  See @url{https://prosody.im/"
+"doc/configure}.  Defaults to @samp{\"/var/lib/prosody\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14418
+#: doc/guix.texi:14467
 #, no-wrap
 msgid "{@code{prosody-configuration} parameter} file-object-list plugin-paths"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14422
+#: doc/guix.texi:14471
 msgid ""
-"Additional plugin directories.  They are searched in all the specified paths in order.  See @url{https://prosody.im/doc/"
-"plugins_directory}.  Defaults to @samp{()}."
+"Additional plugin directories.  They are searched in all the specified paths "
+"in order.  See @url{https://prosody.im/doc/plugins_directory}.  Defaults to "
+"@samp{()}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14424
+#: doc/guix.texi:14473
 #, no-wrap
 msgid "{@code{prosody-configuration} parameter} file-name certificates"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14429
+#: doc/guix.texi:14478
 msgid ""
-"Every virtual host and component needs a certificate so that clients and servers can securely verify its identity.  Prosody will "
-"automatically load certificates/keys from the directory specified here.  Defaults to @samp{\"/etc/prosody/certs\"}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:14431
-#, no-wrap
-msgid "{@code{prosody-configuration} parameter} string-list admins"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:14437
-msgid ""
-"This is a list of accounts that are admins for the server.  Note that you must create the accounts separately.  See @url{https://"
-"prosody.im/doc/admins} and @url{https://prosody.im/doc/creating_accounts}.  Example: @code{(admins '(\"user1@@example.com\" "
-"\"user2@@example.net\"))} Defaults to @samp{()}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:14439
-#, no-wrap
-msgid "{@code{prosody-configuration} parameter} boolean use-libevent?"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:14443
-msgid ""
-"Enable use of libevent for better performance under high load.  See @url{https://prosody.im/doc/libevent}.  Defaults to @samp{#f}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:14445
-#, no-wrap
-msgid "{@code{prosody-configuration} parameter} module-list modules-enabled"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:14451
-msgid ""
-"This is the list of modules Prosody will load on startup.  It looks for @code{mod_modulename.lua} in the plugins folder, so make "
-"sure that exists too.  Documentation on modules can be found at: @url{https://prosody.im/doc/modules}.  Defaults to @samp{(\"roster"
-"\" \"saslauth\" \"tls\" \"dialback\" \"disco\" \"carbons\" \"private\" \"blocklist\" \"vcard\" \"version\" \"uptime\" \"time\" \"ping"
-"\" \"pep\" \"register\" \"admin_adhoc\")}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:14453
-#, no-wrap
-msgid "{@code{prosody-configuration} parameter} string-list modules-disabled"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:14457
-msgid ""
-"@samp{\"offline\"}, @samp{\"c2s\"} and @samp{\"s2s\"} are auto-loaded, but should you want to disable them then add them to this "
-"list.  Defaults to @samp{()}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:14459
-#, no-wrap
-msgid "{@code{prosody-configuration} parameter} file-object groups-file"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:14464
-msgid ""
-"Path to a text file where the shared groups are defined.  If this path is empty then @samp{mod_groups} does nothing.  See "
-"@url{https://prosody.im/doc/modules/mod_groups}.  Defaults to @samp{\"/var/lib/prosody/sharedgroups.txt\"}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:14466
-#, no-wrap
-msgid "{@code{prosody-configuration} parameter} boolean allow-registration?"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:14470
-msgid "Disable account creation by default, for security.  See @url{https://prosody.im/doc/creating_accounts}.  Defaults to @samp{#f}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:14472
-#, no-wrap
-msgid "{@code{prosody-configuration} parameter} maybe-ssl-configuration ssl"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:14477
-msgid ""
-"These are the SSL/TLS-related settings.  Most of them are disabled so to use Prosody's defaults.  If you do not completely "
-"understand these options, do not add them to your config, it is easy to lower the security of your server using them.  See "
-"@url{https://prosody.im/doc/advanced_ssl_config}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:14479
-msgid "Available @code{ssl-configuration} fields are:"
+"Every virtual host and component needs a certificate so that clients and "
+"servers can securely verify its identity.  Prosody will automatically load "
+"certificates/keys from the directory specified here.  Defaults to @samp{\"/"
+"etc/prosody/certs\"}."
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:14480
 #, no-wrap
-msgid "{@code{ssl-configuration} parameter} maybe-string protocol"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:14482
-msgid "This determines what handshake to use."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:14484
-#, no-wrap
-msgid "{@code{ssl-configuration} parameter} maybe-file-name key"
+msgid "{@code{prosody-configuration} parameter} string-list admins"
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:14486
-msgid "Path to your private key file."
+msgid ""
+"This is a list of accounts that are admins for the server.  Note that you "
+"must create the accounts separately.  See @url{https://prosody.im/doc/"
+"admins} and @url{https://prosody.im/doc/creating_accounts}.  Example: "
+"@code{(admins '(\"user1@@example.com\" \"user2@@example.net\"))} Defaults to "
+"@samp{()}."
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:14488
 #, no-wrap
-msgid "{@code{ssl-configuration} parameter} maybe-file-name certificate"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:14490
-msgid "Path to your certificate file."
+msgid "{@code{prosody-configuration} parameter} boolean use-libevent?"
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:14492
-#, no-wrap
-msgid "{@code{ssl-configuration} parameter} file-object capath"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:14496
 msgid ""
-"Path to directory containing root certificates that you wish Prosody to trust when verifying the certificates of remote servers.  "
-"Defaults to @samp{\"/etc/ssl/certs\"}."
+"Enable use of libevent for better performance under high load.  See "
+"@url{https://prosody.im/doc/libevent}.  Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14498
+#: doc/guix.texi:14494
 #, no-wrap
-msgid "{@code{ssl-configuration} parameter} maybe-file-object cafile"
+msgid "{@code{prosody-configuration} parameter} module-list modules-enabled"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14501
+#: doc/guix.texi:14500
 msgid ""
-"Path to a file containing root certificates that you wish Prosody to trust.  Similar to @code{capath} but with all certificates "
-"concatenated together."
+"This is the list of modules Prosody will load on startup.  It looks for "
+"@code{mod_modulename.lua} in the plugins folder, so make sure that exists "
+"too.  Documentation on modules can be found at: @url{https://prosody.im/doc/"
+"modules}.  Defaults to @samp{(\"roster\" \"saslauth\" \"tls\" \"dialback\" "
+"\"disco\" \"carbons\" \"private\" \"blocklist\" \"vcard\" \"version\" "
+"\"uptime\" \"time\" \"ping\" \"pep\" \"register\" \"admin_adhoc\")}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14503
+#: doc/guix.texi:14502
 #, no-wrap
-msgid "{@code{ssl-configuration} parameter} maybe-string-list verify"
+msgid "{@code{prosody-configuration} parameter} string-list modules-disabled"
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:14506
-msgid "A list of verification options (these mostly map to OpenSSL's @code{set_verify()} flags)."
+msgid ""
+"@samp{\"offline\"}, @samp{\"c2s\"} and @samp{\"s2s\"} are auto-loaded, but "
+"should you want to disable them then add them to this list.  Defaults to "
+"@samp{()}."
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:14508
 #, no-wrap
-msgid "{@code{ssl-configuration} parameter} maybe-string-list options"
+msgid "{@code{prosody-configuration} parameter} file-object groups-file"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14512
+#: doc/guix.texi:14513
 msgid ""
-"A list of general options relating to SSL/TLS.  These map to OpenSSL's @code{set_options()}.  For a full list of options available "
-"in LuaSec, see the LuaSec source."
+"Path to a text file where the shared groups are defined.  If this path is "
+"empty then @samp{mod_groups} does nothing.  See @url{https://prosody.im/doc/"
+"modules/mod_groups}.  Defaults to @samp{\"/var/lib/prosody/sharedgroups.txt"
+"\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14514
+#: doc/guix.texi:14515
 #, no-wrap
-msgid "{@code{ssl-configuration} parameter} maybe-non-negative-integer depth"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:14517
-msgid "How long a chain of certificate authorities to check when looking for a trusted root certificate."
+msgid "{@code{prosody-configuration} parameter} boolean allow-registration?"
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:14519
-#, no-wrap
-msgid "{@code{ssl-configuration} parameter} maybe-string ciphers"
+msgid ""
+"Disable account creation by default, for security.  See @url{https://prosody."
+"im/doc/creating_accounts}.  Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14522
-msgid "An OpenSSL cipher string.  This selects what ciphers Prosody will offer to clients, and in what order."
+#: doc/guix.texi:14521
+#, no-wrap
+msgid "{@code{prosody-configuration} parameter} maybe-ssl-configuration ssl"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14524
-#, no-wrap
-msgid "{@code{ssl-configuration} parameter} maybe-file-name dhparam"
+#: doc/guix.texi:14526
+msgid ""
+"These are the SSL/TLS-related settings.  Most of them are disabled so to use "
+"Prosody's defaults.  If you do not completely understand these options, do "
+"not add them to your config, it is easy to lower the security of your server "
+"using them.  See @url{https://prosody.im/doc/advanced_ssl_config}."
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:14528
-msgid ""
-"A path to a file containing parameters for Diffie-Hellman key exchange.  You can create such a file with: @code{openssl dhparam -"
-"out /etc/prosody/certs/dh-2048.pem 2048}"
+msgid "Available @code{ssl-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14530
+#: doc/guix.texi:14529
 #, no-wrap
-msgid "{@code{ssl-configuration} parameter} maybe-string curve"
+msgid "{@code{ssl-configuration} parameter} maybe-string protocol"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:14531
+msgid "This determines what handshake to use."
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:14533
-msgid "Curve for Elliptic curve Diffie-Hellman. Prosody's default is @samp{\"secp384r1\"}."
+#, no-wrap
+msgid "{@code{ssl-configuration} parameter} maybe-file-name key"
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:14535
-#, no-wrap
-msgid "{@code{ssl-configuration} parameter} maybe-string-list verifyext"
+msgid "Path to your private key file."
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:14537
-msgid "A list of \"extra\" verification options."
+#, no-wrap
+msgid "{@code{ssl-configuration} parameter} maybe-file-name certificate"
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:14539
-#, no-wrap
-msgid "{@code{ssl-configuration} parameter} maybe-string password"
+msgid "Path to your certificate file."
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:14541
-msgid "Password for encrypted private keys."
+#, no-wrap
+msgid "{@code{ssl-configuration} parameter} file-object capath"
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:14545
-#, no-wrap
-msgid "{@code{prosody-configuration} parameter} boolean c2s-require-encryption?"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:14549
 msgid ""
-"Whether to force all client-to-server connections to be encrypted or not.  See @url{https://prosody.im/doc/modules/mod_tls}.  "
-"Defaults to @samp{#f}."
+"Path to directory containing root certificates that you wish Prosody to "
+"trust when verifying the certificates of remote servers.  Defaults to "
+"@samp{\"/etc/ssl/certs\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14551
+#: doc/guix.texi:14547
 #, no-wrap
-msgid "{@code{prosody-configuration} parameter} string-list disable-sasl-mechanisms"
+msgid "{@code{ssl-configuration} parameter} maybe-file-object cafile"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:14550
+msgid ""
+"Path to a file containing root certificates that you wish Prosody to trust.  "
+"Similar to @code{capath} but with all certificates concatenated together."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:14552
+#, no-wrap
+msgid "{@code{ssl-configuration} parameter} maybe-string-list verify"
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:14555
 msgid ""
-"Set of mechanisms that will never be offered.  See @url{https://prosody.im/doc/modules/mod_saslauth}.  Defaults to @samp{(\"DIGEST-"
-"MD5\")}."
+"A list of verification options (these mostly map to OpenSSL's "
+"@code{set_verify()} flags)."
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:14557
 #, no-wrap
-msgid "{@code{prosody-configuration} parameter} boolean s2s-require-encryption?"
+msgid "{@code{ssl-configuration} parameter} maybe-string-list options"
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:14561
 msgid ""
-"Whether to force all server-to-server connections to be encrypted or not.  See @url{https://prosody.im/doc/modules/mod_tls}.  "
-"Defaults to @samp{#f}."
+"A list of general options relating to SSL/TLS.  These map to OpenSSL's "
+"@code{set_options()}.  For a full list of options available in LuaSec, see "
+"the LuaSec source."
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:14563
 #, no-wrap
-msgid "{@code{prosody-configuration} parameter} boolean s2s-secure-auth?"
+msgid "{@code{ssl-configuration} parameter} maybe-non-negative-integer depth"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14569
+#: doc/guix.texi:14566
 msgid ""
-"Whether to require encryption and certificate authentication.  This provides ideal security, but requires servers you communicate "
-"with to support encryption AND present valid, trusted certificates.  See @url{https://prosody.im/doc/s2s#security}.  Defaults to "
-"@samp{#f}."
+"How long a chain of certificate authorities to check when looking for a "
+"trusted root certificate."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:14568
+#, no-wrap
+msgid "{@code{ssl-configuration} parameter} maybe-string ciphers"
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:14571
+msgid ""
+"An OpenSSL cipher string.  This selects what ciphers Prosody will offer to "
+"clients, and in what order."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:14573
 #, no-wrap
-msgid "{@code{prosody-configuration} parameter} string-list s2s-insecure-domains"
+msgid "{@code{ssl-configuration} parameter} maybe-file-name dhparam"
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:14577
 msgid ""
-"Many servers don't support encryption or have invalid or self-signed certificates.  You can list domains here that will not be "
-"required to authenticate using certificates.  They will be authenticated using DNS.  See @url{https://prosody.im/doc/s2s#security}.  "
-"Defaults to @samp{()}."
+"A path to a file containing parameters for Diffie-Hellman key exchange.  You "
+"can create such a file with: @code{openssl dhparam -out /etc/prosody/certs/"
+"dh-2048.pem 2048}"
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:14579
 #, no-wrap
-msgid "{@code{prosody-configuration} parameter} string-list s2s-secure-domains"
+msgid "{@code{ssl-configuration} parameter} maybe-string curve"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:14582
+msgid ""
+"Curve for Elliptic curve Diffie-Hellman. Prosody's default is "
+"@samp{\"secp384r1\"}."
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:14584
-msgid ""
-"Even if you leave @code{s2s-secure-auth?} disabled, you can still require valid certificates for some domains by specifying a list "
-"here.  See @url{https://prosody.im/doc/s2s#security}.  Defaults to @samp{()}."
+#, no-wrap
+msgid "{@code{ssl-configuration} parameter} maybe-string-list verifyext"
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:14586
+msgid "A list of \"extra\" verification options."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:14588
 #, no-wrap
-msgid "{@code{prosody-configuration} parameter} string authentication"
+msgid "{@code{ssl-configuration} parameter} maybe-string password"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:14590
+msgid "Password for encrypted private keys."
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:14594
-msgid ""
-"Select the authentication backend to use.  The default provider stores passwords in plaintext and uses Prosody's configured data "
-"storage to store the authentication data.  If you do not trust your server please see @url{https://prosody.im/doc/modules/"
-"mod_auth_internal_hashed} for information about using the hashed backend.  See also @url{https://prosody.im/doc/authentication} "
-"Defaults to @samp{\"internal_plain\"}."
+#, no-wrap
+msgid "{@code{prosody-configuration} parameter} boolean c2s-require-encryption?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14596
-#, no-wrap
-msgid "{@code{prosody-configuration} parameter} maybe-string log"
+#: doc/guix.texi:14598
+msgid ""
+"Whether to force all client-to-server connections to be encrypted or not.  "
+"See @url{https://prosody.im/doc/modules/mod_tls}.  Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:14600
-msgid ""
-"Set logging options.  Advanced logging configuration is not yet supported by the GuixSD Prosody Service.  See @url{https://prosody."
-"im/doc/logging}.  Defaults to @samp{\"*syslog\"}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:14602
 #, no-wrap
-msgid "{@code{prosody-configuration} parameter} file-name pidfile"
+msgid "{@code{prosody-configuration} parameter} string-list disable-sasl-mechanisms"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14605
+#: doc/guix.texi:14604
 msgid ""
-"File to write pid in.  See @url{https://prosody.im/doc/modules/mod_posix}.  Defaults to @samp{\"/var/run/prosody/prosody.pid\"}."
+"Set of mechanisms that will never be offered.  See @url{https://prosody.im/"
+"doc/modules/mod_saslauth}.  Defaults to @samp{(\"DIGEST-MD5\")}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14607
+#: doc/guix.texi:14606
 #, no-wrap
-msgid "{@code{prosody-configuration} parameter} maybe-non-negative-integer http-max-content-size"
+msgid "{@code{prosody-configuration} parameter} boolean s2s-require-encryption?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14609
-msgid "Maximum allowed size of the HTTP body (in bytes)."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:14611
-#, no-wrap
-msgid "{@code{prosody-configuration} parameter} maybe-string http-external-url"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:14616
+#: doc/guix.texi:14610
 msgid ""
-"Some modules expose their own URL in various ways.  This URL is built from the protocol, host and port used.  If Prosody sits behind "
-"a proxy, the public URL will be @code{http-external-url} instead.  See @url{https://prosody.im/doc/http#external_url}."
+"Whether to force all server-to-server connections to be encrypted or not.  "
+"See @url{https://prosody.im/doc/modules/mod_tls}.  Defaults to @samp{#f}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:14612
+#, no-wrap
+msgid "{@code{prosody-configuration} parameter} boolean s2s-secure-auth?"
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:14618
+msgid ""
+"Whether to require encryption and certificate authentication.  This provides "
+"ideal security, but requires servers you communicate with to support "
+"encryption AND present valid, trusted certificates.  See @url{https://"
+"prosody.im/doc/s2s#security}.  Defaults to @samp{#f}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:14620
 #, no-wrap
-msgid "{@code{prosody-configuration} parameter} virtualhost-configuration-list virtualhosts"
+msgid "{@code{prosody-configuration} parameter} string-list s2s-insecure-domains"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14623
+#: doc/guix.texi:14626
 msgid ""
-"A host in Prosody is a domain on which user accounts can be created.  For example if you want your users to have addresses like "
-"@samp{\"john.smith@@example.com\"} then you need to add a host @samp{\"example.com\"}.  All options in this list will apply only to "
-"this host."
+"Many servers don't support encryption or have invalid or self-signed "
+"certificates.  You can list domains here that will not be required to "
+"authenticate using certificates.  They will be authenticated using DNS.  See "
+"@url{https://prosody.im/doc/s2s#security}.  Defaults to @samp{()}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14629
-msgid ""
-"Note: the name \"virtual\" host is used in configuration to avoid confusion with the actual physical host that Prosody is installed "
-"on.  A single Prosody instance can serve many domains, each one defined as a VirtualHost entry in Prosody's configuration.  "
-"Conversely a server that hosts a single domain would have just one VirtualHost entry."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:14631
-msgid "See @url{https://prosody.im/doc/configure#virtual_host_settings}."
+#: doc/guix.texi:14628
+#, no-wrap
+msgid "{@code{prosody-configuration} parameter} string-list s2s-secure-domains"
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:14633
-msgid "Available @code{virtualhost-configuration} fields are:"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:14635 doc/guix.texi:14657 doc/guix.texi:14710
 msgid ""
-"all these @code{prosody-configuration} fields: @code{admins}, @code{use-libevent?}, @code{modules-enabled}, @code{modules-disabled}, "
-"@code{groups-file}, @code{allow-registration?}, @code{ssl}, @code{c2s-require-encryption?}, @code{disable-sasl-mechanisms}, "
-"@code{s2s-require-encryption?}, @code{s2s-secure-auth?}, @code{s2s-insecure-domains}, @code{s2s-secure-domains}, "
-"@code{authentication}, @code{log}, @code{http-max-content-size}, @code{http-external-url}, @code{raw-content}, plus:"
+"Even if you leave @code{s2s-secure-auth?} disabled, you can still require "
+"valid certificates for some domains by specifying a list here.  See "
+"@url{https://prosody.im/doc/s2s#security}.  Defaults to @samp{()}."
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:14635
 #, no-wrap
-msgid "{@code{virtualhost-configuration} parameter} string domain"
+msgid "{@code{prosody-configuration} parameter} string authentication"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14637
-msgid "Domain you wish Prosody to serve."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:14641
-#, no-wrap
-msgid "{@code{prosody-configuration} parameter} int-component-configuration-list int-components"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:14646
+#: doc/guix.texi:14643
 msgid ""
-"Components are extra services on a server which are available to clients, usually on a subdomain of the main server (such as "
-"@samp{\"mycomponent.example.com\"}).  Example components might be chatroom servers, user directories, or gateways to other protocols."
+"Select the authentication backend to use.  The default provider stores "
+"passwords in plaintext and uses Prosody's configured data storage to store "
+"the authentication data.  If you do not trust your server please see "
+"@url{https://prosody.im/doc/modules/mod_auth_internal_hashed} for "
+"information about using the hashed backend.  See also @url{https://prosody."
+"im/doc/authentication} Defaults to @samp{\"internal_plain\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14650
+#: doc/guix.texi:14645
+#, no-wrap
+msgid "{@code{prosody-configuration} parameter} maybe-string log"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:14649
 msgid ""
-"Internal components are implemented with Prosody-specific plugins.  To add an internal component, you simply fill the hostname "
-"field, and the plugin you wish to use for the component."
+"Set logging options.  Advanced logging configuration is not yet supported by "
+"the GuixSD Prosody Service.  See @url{https://prosody.im/doc/logging}.  "
+"Defaults to @samp{\"*syslog\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14653
-msgid "See @url{https://prosody.im/doc/components}.  Defaults to @samp{()}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:14655
-msgid "Available @code{int-component-configuration} fields are:"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:14657
+#: doc/guix.texi:14651
 #, no-wrap
-msgid "{@code{int-component-configuration} parameter} string hostname"
+msgid "{@code{prosody-configuration} parameter} file-name pidfile"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14659 doc/guix.texi:14716
-msgid "Hostname of the component."
+#: doc/guix.texi:14654
+msgid ""
+"File to write pid in.  See @url{https://prosody.im/doc/modules/mod_posix}.  "
+"Defaults to @samp{\"/var/run/prosody/prosody.pid\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14661
+#: doc/guix.texi:14656
 #, no-wrap
-msgid "{@code{int-component-configuration} parameter} string plugin"
+msgid "{@code{prosody-configuration} parameter} maybe-non-negative-integer http-max-content-size"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14663
-msgid "Plugin you wish to use for the component."
+#: doc/guix.texi:14658
+msgid "Maximum allowed size of the HTTP body (in bytes)."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:14660
+#, no-wrap
+msgid "{@code{prosody-configuration} parameter} maybe-string http-external-url"
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:14665
-#, no-wrap
-msgid "{@code{int-component-configuration} parameter} maybe-mod-muc-configuration mod-muc"
+msgid ""
+"Some modules expose their own URL in various ways.  This URL is built from "
+"the protocol, host and port used.  If Prosody sits behind a proxy, the "
+"public URL will be @code{http-external-url} instead.  See @url{https://"
+"prosody.im/doc/http#external_url}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14668
-msgid "Multi-user chat (MUC) is Prosody's module for allowing you to create hosted chatrooms/conferences for XMPP users."
+#: doc/guix.texi:14667
+#, no-wrap
+msgid "{@code{prosody-configuration} parameter} virtualhost-configuration-list virtualhosts"
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:14672
 msgid ""
-"General information on setting up and using multi-user chatrooms can be found in the \"Chatrooms\" documentation (@url{https://"
-"prosody.im/doc/chatrooms}), which you should read if you are new to XMPP chatrooms."
+"A host in Prosody is a domain on which user accounts can be created.  For "
+"example if you want your users to have addresses like @samp{\"john."
+"smith@@example.com\"} then you need to add a host @samp{\"example.com\"}.  "
+"All options in this list will apply only to this host."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14674
-msgid "See also @url{https://prosody.im/doc/modules/mod_muc}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:14676
-msgid "Available @code{mod-muc-configuration} fields are:"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:14677
-#, no-wrap
-msgid "{@code{mod-muc-configuration} parameter} string name"
+#: doc/guix.texi:14678
+msgid ""
+"Note: the name \"virtual\" host is used in configuration to avoid confusion "
+"with the actual physical host that Prosody is installed on.  A single "
+"Prosody instance can serve many domains, each one defined as a VirtualHost "
+"entry in Prosody's configuration.  Conversely a server that hosts a single "
+"domain would have just one VirtualHost entry."
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:14680
-msgid "The name to return in service discovery responses.  Defaults to @samp{\"Prosody Chatrooms\"}."
+msgid "See @url{https://prosody.im/doc/configure#virtual_host_settings}."
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:14682
-#, no-wrap
-msgid "{@code{mod-muc-configuration} parameter} string-or-boolean restrict-room-creation"
+msgid "Available @code{virtualhost-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14689
+#: doc/guix.texi:14684 doc/guix.texi:14706 doc/guix.texi:14759
 msgid ""
-"If @samp{#t}, this will only allow admins to create new chatrooms.  Otherwise anyone can create a room.  The value @samp{\"local\"} "
-"restricts room creation to users on the service's parent domain.  E.g. @samp{user@@example.com} can create rooms on @samp{rooms."
-"example.com}.  The value @samp{\"admin\"} restricts to service administrators only.  Defaults to @samp{#f}."
+"all these @code{prosody-configuration} fields: @code{admins}, @code{use-"
+"libevent?}, @code{modules-enabled}, @code{modules-disabled}, @code{groups-"
+"file}, @code{allow-registration?}, @code{ssl}, @code{c2s-require-"
+"encryption?}, @code{disable-sasl-mechanisms}, @code{s2s-require-"
+"encryption?}, @code{s2s-secure-auth?}, @code{s2s-insecure-domains}, "
+"@code{s2s-secure-domains}, @code{authentication}, @code{log}, @code{http-max-"
+"content-size}, @code{http-external-url}, @code{raw-content}, plus:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14691
+#: doc/guix.texi:14684
 #, no-wrap
-msgid "{@code{mod-muc-configuration} parameter} non-negative-integer max-history-messages"
+msgid "{@code{virtualhost-configuration} parameter} string domain"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:14686
+msgid "Domain you wish Prosody to serve."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:14690
+#, no-wrap
+msgid "{@code{prosody-configuration} parameter} int-component-configuration-list int-components"
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:14695
-msgid "Maximum number of history messages that will be sent to the member that has just joined the room.  Defaults to @samp{20}."
+msgid ""
+"Components are extra services on a server which are available to clients, "
+"usually on a subdomain of the main server (such as @samp{\"mycomponent."
+"example.com\"}).  Example components might be chatroom servers, user "
+"directories, or gateways to other protocols."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14701
-#, no-wrap
-msgid "{@code{prosody-configuration} parameter} ext-component-configuration-list ext-components"
+#: doc/guix.texi:14699
+msgid ""
+"Internal components are implemented with Prosody-specific plugins.  To add "
+"an internal component, you simply fill the hostname field, and the plugin "
+"you wish to use for the component."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:14702
+msgid "See @url{https://prosody.im/doc/components}.  Defaults to @samp{()}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:14704
+msgid "Available @code{int-component-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:14706
-msgid ""
-"External components use XEP-0114, which most standalone components support.  To add an external component, you simply fill the "
-"hostname field.  See @url{https://prosody.im/doc/components}.  Defaults to @samp{()}."
+#, no-wrap
+msgid "{@code{int-component-configuration} parameter} string hostname"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14708
-msgid "Available @code{ext-component-configuration} fields are:"
+#: doc/guix.texi:14708 doc/guix.texi:14765
+msgid "Hostname of the component."
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:14710
 #, no-wrap
-msgid "{@code{ext-component-configuration} parameter} string component-secret"
+msgid "{@code{int-component-configuration} parameter} string plugin"
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:14712
-msgid "Password which the component will use to log in."
+msgid "Plugin you wish to use for the component."
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:14714
 #, no-wrap
+msgid "{@code{int-component-configuration} parameter} maybe-mod-muc-configuration mod-muc"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:14717
+msgid ""
+"Multi-user chat (MUC) is Prosody's module for allowing you to create hosted "
+"chatrooms/conferences for XMPP users."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:14721
+msgid ""
+"General information on setting up and using multi-user chatrooms can be "
+"found in the \"Chatrooms\" documentation (@url{https://prosody.im/doc/"
+"chatrooms}), which you should read if you are new to XMPP chatrooms."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:14723
+msgid "See also @url{https://prosody.im/doc/modules/mod_muc}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:14725
+msgid "Available @code{mod-muc-configuration} fields are:"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:14726
+#, no-wrap
+msgid "{@code{mod-muc-configuration} parameter} string name"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:14729
+msgid ""
+"The name to return in service discovery responses.  Defaults to "
+"@samp{\"Prosody Chatrooms\"}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:14731
+#, no-wrap
+msgid "{@code{mod-muc-configuration} parameter} string-or-boolean restrict-room-creation"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:14738
+msgid ""
+"If @samp{#t}, this will only allow admins to create new chatrooms.  "
+"Otherwise anyone can create a room.  The value @samp{\"local\"} restricts "
+"room creation to users on the service's parent domain.  E.g. "
+"@samp{user@@example.com} can create rooms on @samp{rooms.example.com}.  The "
+"value @samp{\"admin\"} restricts to service administrators only.  Defaults "
+"to @samp{#f}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:14740
+#, no-wrap
+msgid "{@code{mod-muc-configuration} parameter} non-negative-integer max-history-messages"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:14744
+msgid ""
+"Maximum number of history messages that will be sent to the member that has "
+"just joined the room.  Defaults to @samp{20}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:14750
+#, no-wrap
+msgid "{@code{prosody-configuration} parameter} ext-component-configuration-list ext-components"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:14755
+msgid ""
+"External components use XEP-0114, which most standalone components support.  "
+"To add an external component, you simply fill the hostname field.  See "
+"@url{https://prosody.im/doc/components}.  Defaults to @samp{()}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:14757
+msgid "Available @code{ext-component-configuration} fields are:"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:14759
+#, no-wrap
+msgid "{@code{ext-component-configuration} parameter} string component-secret"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:14761
+msgid "Password which the component will use to log in."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:14763
+#, no-wrap
 msgid "{@code{ext-component-configuration} parameter} string hostname"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14720
+#: doc/guix.texi:14769
 #, no-wrap
 msgid "{@code{prosody-configuration} parameter} non-negative-integer-list component-ports"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14723
-msgid "Port(s) Prosody listens on for component connections.  Defaults to @samp{(5347)}."
+#: doc/guix.texi:14772
+msgid ""
+"Port(s) Prosody listens on for component connections.  Defaults to "
+"@samp{(5347)}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14725
+#: doc/guix.texi:14774
 #, no-wrap
 msgid "{@code{prosody-configuration} parameter} string component-interface"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14728
-msgid "Interface Prosody listens on for component connections.  Defaults to @samp{\"127.0.0.1\"}."
+#: doc/guix.texi:14777
+msgid ""
+"Interface Prosody listens on for component connections.  Defaults to "
+"@samp{\"127.0.0.1\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14730
+#: doc/guix.texi:14779
 #, no-wrap
 msgid "{@code{prosody-configuration} parameter} maybe-raw-content raw-content"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14732
+#: doc/guix.texi:14781
 msgid "Raw content that will be added to the configuration file."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:14740
+#: doc/guix.texi:14789
 msgid ""
-"It could be that you just want to get a @code{prosody.cfg.lua} up and running.  In that case, you can pass an @code{opaque-prosody-"
-"configuration} record as the value of @code{prosody-service-type}.  As its name indicates, an opaque configuration does not have "
-"easy reflective capabilities.  Available @code{opaque-prosody-configuration} fields are:"
+"It could be that you just want to get a @code{prosody.cfg.lua} up and "
+"running.  In that case, you can pass an @code{opaque-prosody-configuration} "
+"record as the value of @code{prosody-service-type}.  As its name indicates, "
+"an opaque configuration does not have easy reflective capabilities.  "
+"Available @code{opaque-prosody-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14741
+#: doc/guix.texi:14790
 #, no-wrap
 msgid "{@code{opaque-prosody-configuration} parameter} package prosody"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14743
+#: doc/guix.texi:14792
 msgid "The prosody package."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14745
+#: doc/guix.texi:14794
 #, no-wrap
 msgid "{@code{opaque-prosody-configuration} parameter} string prosody.cfg.lua"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14747
+#: doc/guix.texi:14796
 msgid "The contents of the @code{prosody.cfg.lua} to use."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:14751
-msgid "For example, if your @code{prosody.cfg.lua} is just the empty string, you could instantiate a prosody service like this:"
+#: doc/guix.texi:14800
+msgid ""
+"For example, if your @code{prosody.cfg.lua} is just the empty string, you "
+"could instantiate a prosody service like this:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:14756
+#: doc/guix.texi:14805
 #, no-wrap
 msgid ""
 "(service prosody-service-type\n"
@@ -28728,141 +32989,150 @@ msgid ""
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:14760
+#: doc/guix.texi:14809
 #, no-wrap
 msgid "BitlBee Service"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:14762
+#: doc/guix.texi:14811
 #, no-wrap
 msgid "IRC (Internet Relay Chat)"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:14763
+#: doc/guix.texi:14812
 #, no-wrap
 msgid "IRC gateway"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:14766
-msgid "@url{http://bitlbee.org,BitlBee} is a gateway that provides an IRC interface to a variety of messaging protocols such as XMPP."
+#: doc/guix.texi:14815
+msgid ""
+"@url{http://bitlbee.org,BitlBee} is a gateway that provides an IRC interface "
+"to a variety of messaging protocols such as XMPP."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:14767
+#: doc/guix.texi:14816
 #, no-wrap
 msgid "{Scheme Variable} bitlbee-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:14771
+#: doc/guix.texi:14820
 msgid ""
-"This is the service type for the @url{http://bitlbee.org,BitlBee} IRC gateway daemon.  Its value is a @code{bitlbee-configuration} "
-"(see below)."
+"This is the service type for the @url{http://bitlbee.org,BitlBee} IRC "
+"gateway daemon.  Its value is a @code{bitlbee-configuration} (see below)."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:14774
-msgid "To have BitlBee listen on port 6667 on localhost, add this line to your services:"
+#: doc/guix.texi:14823
+msgid ""
+"To have BitlBee listen on port 6667 on localhost, add this line to your "
+"services:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:14777
+#: doc/guix.texi:14826
 #, no-wrap
 msgid "(service bitlbee-service-type)\n"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:14780
+#: doc/guix.texi:14829
 #, no-wrap
 msgid "{Data Type} bitlbee-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:14782
+#: doc/guix.texi:14831
 msgid "This is the configuration for BitlBee, with the following fields:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14784
+#: doc/guix.texi:14833
 #, no-wrap
 msgid "@code{interface} (default: @code{\"127.0.0.1\"})"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:14785
+#: doc/guix.texi:14834
 #, no-wrap
 msgid "@code{port} (default: @code{6667})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14788
-msgid "Listen on the network interface corresponding to the IP address specified in @var{interface}, on @var{port}."
+#: doc/guix.texi:14837
+msgid ""
+"Listen on the network interface corresponding to the IP address specified in "
+"@var{interface}, on @var{port}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14792
+#: doc/guix.texi:14841
 msgid ""
-"When @var{interface} is @code{127.0.0.1}, only local clients can connect; when it is @code{0.0.0.0}, connections can come from any "
-"networking interface."
+"When @var{interface} is @code{127.0.0.1}, only local clients can connect; "
+"when it is @code{0.0.0.0}, connections can come from any networking "
+"interface."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14793
+#: doc/guix.texi:14842
 #, no-wrap
 msgid "@code{package} (default: @code{bitlbee})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14795
+#: doc/guix.texi:14844
 msgid "The BitlBee package to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14796
+#: doc/guix.texi:14845
 #, no-wrap
 msgid "@code{extra-settings} (default: @code{\"\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14798
+#: doc/guix.texi:14847
 msgid "Configuration snippet added as-is to the BitlBee configuration file."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:14805
+#: doc/guix.texi:14854
 #, no-wrap
 msgid "Murmur (VoIP server)"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:14806
+#: doc/guix.texi:14855
 #, no-wrap
 msgid "VoIP server"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:14810
+#: doc/guix.texi:14859
 msgid ""
-"This section describes how to set up and run a Murmur server.  Murmur is the server of the @uref{https://mumble.info, Mumble} voice-"
-"over-IP (VoIP) suite."
+"This section describes how to set up and run a Murmur server.  Murmur is the "
+"server of the @uref{https://mumble.info, Mumble} voice-over-IP (VoIP) suite."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:14811
+#: doc/guix.texi:14860
 #, no-wrap
 msgid "{Data Type} murmur-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:14814
-msgid "The service type for the Murmur server.  An example configuration can look like this:"
+#: doc/guix.texi:14863
+msgid ""
+"The service type for the Murmur server.  An example configuration can look "
+"like this:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:14823
+#: doc/guix.texi:14872
 #, no-wrap
 msgid ""
 "(service murmur-service-type\n"
@@ -28875,531 +33145,573 @@ msgid ""
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:14827
+#: doc/guix.texi:14876
 msgid ""
-"After reconfiguring your system, you can manually set the murmur @code{SuperUser} password with the command that is printed during "
-"the activation phase."
+"After reconfiguring your system, you can manually set the murmur "
+"@code{SuperUser} password with the command that is printed during the "
+"activation phase."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:14836
+#: doc/guix.texi:14885
 msgid ""
-"It is recommended to register a normal Mumble user account and grant it admin or moderator rights.  You can use the @code{mumble} "
-"client to login as new normal user, register yourself, and log out.  For the next step login with the name @code{SuperUser} use the "
-"@code{SuperUser} password that you set previously, and grant your newly registered mumble user administrator or moderator rights and "
-"create some channels."
+"It is recommended to register a normal Mumble user account and grant it "
+"admin or moderator rights.  You can use the @code{mumble} client to login as "
+"new normal user, register yourself, and log out.  For the next step login "
+"with the name @code{SuperUser} use the @code{SuperUser} password that you "
+"set previously, and grant your newly registered mumble user administrator or "
+"moderator rights and create some channels."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:14838
+#: doc/guix.texi:14887
 msgid "Available @code{murmur-configuration} fields are:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14840
+#: doc/guix.texi:14889
 #, no-wrap
 msgid "@code{package} (default: @code{mumble})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14842
+#: doc/guix.texi:14891
 msgid "Package that contains @code{bin/murmurd}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14843
+#: doc/guix.texi:14892
 #, no-wrap
 msgid "@code{user} (default: @code{\"murmur\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14845
+#: doc/guix.texi:14894
 msgid "User who will run the Murmur server."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14846
+#: doc/guix.texi:14895
 #, no-wrap
 msgid "@code{group} (default: @code{\"murmur\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14848
+#: doc/guix.texi:14897
 msgid "Group of the user who will run the murmur server."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14849
+#: doc/guix.texi:14898
 #, no-wrap
 msgid "@code{port} (default: @code{64738})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14851
+#: doc/guix.texi:14900
 msgid "Port on which the server will listen."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14852
+#: doc/guix.texi:14901
 #, no-wrap
 msgid "@code{welcome-text} (default: @code{\"\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14854
+#: doc/guix.texi:14903
 msgid "Welcome text sent to clients when they connect."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14855
+#: doc/guix.texi:14904
 #, no-wrap
 msgid "@code{server-password} (default: @code{\"\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14857
+#: doc/guix.texi:14906
 msgid "Password the clients have to enter in order to connect."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14858
+#: doc/guix.texi:14907
 #, no-wrap
 msgid "@code{max-users} (default: @code{100})"
 msgstr ""
 
-#. type: table
-#: doc/guix.texi:14860
-msgid "Maximum of users that can be connected to the server at once."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:14861
-#, no-wrap
-msgid "@code{max-user-bandwidth} (default: @code{#f})"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:14863
-msgid "Maximum voice traffic a user can send per second."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:14864
-#, no-wrap
-msgid "@code{database-file} (default: @code{\"/var/lib/murmur/db.sqlite\"})"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:14867
-msgid "File name of the sqlite database.  The service's user will become the owner of the directory."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:14868
-#, no-wrap
-msgid "@code{log-file} (default: @code{\"/var/log/murmur/murmur.log\"})"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:14871
-msgid "File name of the log file.  The service's user will become the owner of the directory."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:14872
-#, no-wrap
-msgid "@code{autoban-attempts} (default: @code{10})"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:14875
-msgid "Maximum number of logins a user can make in @code{autoban-timeframe} without getting auto banned for @code{autoban-time}."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:14876
-#, no-wrap
-msgid "@code{autoban-timeframe} (default: @code{120})"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:14878
-msgid "Timeframe for autoban in seconds."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:14879
-#, no-wrap
-msgid "@code{autoban-time} (default: @code{300})"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:14882
-msgid "Amount of time in seconds for which a client gets banned when violating the autoban limits."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:14883
-#, no-wrap
-msgid "@code{opus-threshold} (default: @code{100})"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:14886
-msgid "Percentage of clients that need to support opus before switching over to opus audio codec."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:14887
-#, no-wrap
-msgid "@code{channel-nesting-limit} (default: @code{10})"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:14889
-msgid "How deep channels can be nested at maximum."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:14890
-#, no-wrap
-msgid "@code{channelname-regex} (default: @code{#f})"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:14892
-msgid "A string in from of a Qt regular expression that channel names must conform to."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:14893
-#, no-wrap
-msgid "@code{username-regex} (default: @code{#f})"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:14895
-msgid "A string in from of a Qt regular expression that user names must conform to."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:14896
-#, no-wrap
-msgid "@code{text-message-length} (default: @code{5000})"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:14898
-msgid "Maximum size in bytes that a user can send in one text chat message."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:14899
-#, no-wrap
-msgid "@code{image-message-length} (default: @code{(* 128 1024)})"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:14901
-msgid "Maximum size in bytes that a user can send in one image message."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:14902
-#, no-wrap
-msgid "@code{cert-required?} (default: @code{#f})"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:14905
-msgid ""
-"If it is set to @code{#t} clients that use weak password authentification will not be accepted. Users must have completed the "
-"certificate wizard to join."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:14906
-#, no-wrap
-msgid "@code{remember-channel?} (defualt @code{#f})"
-msgstr ""
-
 #. type: table
 #: doc/guix.texi:14909
-msgid ""
-"Should murmur remember the last channel each user was in when they disconnected and put them into the remembered channel when they "
-"rejoin."
+msgid "Maximum of users that can be connected to the server at once."
 msgstr ""
 
 #. type: item
 #: doc/guix.texi:14910
 #, no-wrap
-msgid "@code{allow-html?} (default: @code{#f})"
+msgid "@code{max-user-bandwidth} (default: @code{#f})"
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:14912
-msgid "Should html be allowed in text messages, user comments, and channel descriptions."
+msgid "Maximum voice traffic a user can send per second."
 msgstr ""
 
 #. type: item
 #: doc/guix.texi:14913
 #, no-wrap
+msgid "@code{database-file} (default: @code{\"/var/lib/murmur/db.sqlite\"})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:14916
+msgid ""
+"File name of the sqlite database.  The service's user will become the owner "
+"of the directory."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:14917
+#, no-wrap
+msgid "@code{log-file} (default: @code{\"/var/log/murmur/murmur.log\"})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:14920
+msgid ""
+"File name of the log file.  The service's user will become the owner of the "
+"directory."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:14921
+#, no-wrap
+msgid "@code{autoban-attempts} (default: @code{10})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:14924
+msgid ""
+"Maximum number of logins a user can make in @code{autoban-timeframe} without "
+"getting auto banned for @code{autoban-time}."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:14925
+#, no-wrap
+msgid "@code{autoban-timeframe} (default: @code{120})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:14927
+msgid "Timeframe for autoban in seconds."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:14928
+#, no-wrap
+msgid "@code{autoban-time} (default: @code{300})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:14931
+msgid ""
+"Amount of time in seconds for which a client gets banned when violating the "
+"autoban limits."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:14932
+#, no-wrap
+msgid "@code{opus-threshold} (default: @code{100})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:14935
+msgid ""
+"Percentage of clients that need to support opus before switching over to "
+"opus audio codec."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:14936
+#, no-wrap
+msgid "@code{channel-nesting-limit} (default: @code{10})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:14938
+msgid "How deep channels can be nested at maximum."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:14939
+#, no-wrap
+msgid "@code{channelname-regex} (default: @code{#f})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:14941
+msgid ""
+"A string in from of a Qt regular expression that channel names must conform "
+"to."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:14942
+#, no-wrap
+msgid "@code{username-regex} (default: @code{#f})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:14944
+msgid ""
+"A string in from of a Qt regular expression that user names must conform to."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:14945
+#, no-wrap
+msgid "@code{text-message-length} (default: @code{5000})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:14947
+msgid "Maximum size in bytes that a user can send in one text chat message."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:14948
+#, no-wrap
+msgid "@code{image-message-length} (default: @code{(* 128 1024)})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:14950
+msgid "Maximum size in bytes that a user can send in one image message."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:14951
+#, no-wrap
+msgid "@code{cert-required?} (default: @code{#f})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:14954
+msgid ""
+"If it is set to @code{#t} clients that use weak password authentification "
+"will not be accepted. Users must have completed the certificate wizard to "
+"join."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:14955
+#, no-wrap
+msgid "@code{remember-channel?} (defualt @code{#f})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:14958
+msgid ""
+"Should murmur remember the last channel each user was in when they "
+"disconnected and put them into the remembered channel when they rejoin."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:14959
+#, no-wrap
+msgid "@code{allow-html?} (default: @code{#f})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:14961
+msgid ""
+"Should html be allowed in text messages, user comments, and channel "
+"descriptions."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:14962
+#, no-wrap
 msgid "@code{allow-ping?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14917
+#: doc/guix.texi:14966
 msgid ""
-"Setting to true exposes the current user count, the maximum user count, and the server's maximum bandwidth per client to "
-"unauthenticated users. In the Mumble client, this information is shown in the Connect dialog."
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:14919
-msgid "Disabling this setting will prevent public listing of the server."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:14920
-#, no-wrap
-msgid "@code{bonjour?} (default: @code{#f})"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:14922
-msgid "Should the server advertise itself in the local network through the bonjour protocol."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:14923
-#, no-wrap
-msgid "@code{send-version?} (default: @code{#f})"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:14925
-msgid "Should the murmur server version be exposed in ping requests."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:14926
-#, no-wrap
-msgid "@code{log-days} (default: @code{31})"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:14930
-msgid ""
-"Murmur also stores logs in the database, which are accessible via RPC.  The default is 31 days of months, but you can set this "
-"setting to 0 to keep logs forever, or -1 to disable logging to the database."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:14931
-#, no-wrap
-msgid "@code{obfuscate-ips?} (default @code{#t})"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:14933
-msgid "Should logged ips be obfuscated to protect the privacy of users."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:14934
-#, no-wrap
-msgid "@code{ssl-cert} (default: @code{#f})"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:14936
-msgid "File name of the SSL/TLS certificate used for encrypted connections."
-msgstr ""
-
-#. type: example
-#: doc/guix.texi:14939
-#, no-wrap
-msgid "(ssl-cert \"/etc/letsencrypt/live/example.com/fullchain.pem\")\n"
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:14940
-#, no-wrap
-msgid "@code{ssl-key} (default: @code{#f})"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:14942
-msgid "Filepath to the ssl private key used for encrypted connections."
-msgstr ""
-
-#. type: example
-#: doc/guix.texi:14944
-#, no-wrap
-msgid "(ssl-key \"/etc/letsencrypt/live/example.com/privkey.pem\")\n"
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:14946
-#, no-wrap
-msgid "@code{ssl-dh-params} (default: @code{#f})"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:14951
-msgid ""
-"File name of a PEM-encoded file with Diffie-Hellman parameters for the SSL/TLS encryption.  Alternatively you set it to "
-"@code{\"@@ffdhe2048\"}, @code{\"@@ffdhe3072\"}, @code{\"@@ffdhe4096\"}, @code{\"@@ffdhe6144\"} or @code{\"@@ffdhe8192\"} to use "
-"bundled parameters from RFC 7919."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:14952
-#, no-wrap
-msgid "@code{ssl-ciphers} (default: @code{#f})"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:14955
-msgid "The @code{ssl-ciphers} option chooses the cipher suites to make available for use in SSL/TLS."
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:14959
-msgid ""
-"This option is specified using @uref{https://www.openssl.org/docs/apps/ciphers.html#CIPHER-LIST-FORMAT, OpenSSL cipher list "
-"notation}."
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:14964
-msgid ""
-"It is recommended that you try your cipher string using 'openssl ciphers <string>' before setting it here, to get a feel for which "
-"cipher suites you will get.  After setting this option, it is recommend that you inspect your Murmur log to ensure that Murmur is "
-"using the cipher suites that you expected it to."
+"Setting to true exposes the current user count, the maximum user count, and "
+"the server's maximum bandwidth per client to unauthenticated users. In the "
+"Mumble client, this information is shown in the Connect dialog."
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:14968
-msgid ""
-"Note: Changing this option may impact the backwards compatibility of your Murmur server, and can remove the ability for older Mumble "
-"clients to be able to connect to it."
+msgid "Disabling this setting will prevent public listing of the server."
 msgstr ""
 
 #. type: item
 #: doc/guix.texi:14969
 #, no-wrap
-msgid "@code{public-registration} (default: @code{#f})"
+msgid "@code{bonjour?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:14971
-msgid "Must be a @code{<murmur-public-registration-configuration>} record or @code{#f}."
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:14976
 msgid ""
-"You can optionally register your server in the public server list that the @code{mumble} client shows on startup.  You cannot "
-"register your server if you have set a @code{server-password}, or set @code{allow-ping} to @code{#f}."
+"Should the server advertise itself in the local network through the bonjour "
+"protocol."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:14972
+#, no-wrap
+msgid "@code{send-version?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14978
+#: doc/guix.texi:14974
+msgid "Should the murmur server version be exposed in ping requests."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:14975
+#, no-wrap
+msgid "@code{log-days} (default: @code{31})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:14979
+msgid ""
+"Murmur also stores logs in the database, which are accessible via RPC.  The "
+"default is 31 days of months, but you can set this setting to 0 to keep logs "
+"forever, or -1 to disable logging to the database."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:14980
+#, no-wrap
+msgid "@code{obfuscate-ips?} (default @code{#t})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:14982
+msgid "Should logged ips be obfuscated to protect the privacy of users."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:14983
+#, no-wrap
+msgid "@code{ssl-cert} (default: @code{#f})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:14985
+msgid "File name of the SSL/TLS certificate used for encrypted connections."
+msgstr ""
+
+#. type: example
+#: doc/guix.texi:14988
+#, no-wrap
+msgid "(ssl-cert \"/etc/letsencrypt/live/example.com/fullchain.pem\")\n"
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:14989
+#, no-wrap
+msgid "@code{ssl-key} (default: @code{#f})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:14991
+msgid "Filepath to the ssl private key used for encrypted connections."
+msgstr ""
+
+#. type: example
+#: doc/guix.texi:14993
+#, no-wrap
+msgid "(ssl-key \"/etc/letsencrypt/live/example.com/privkey.pem\")\n"
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:14995
+#, no-wrap
+msgid "@code{ssl-dh-params} (default: @code{#f})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:15000
+msgid ""
+"File name of a PEM-encoded file with Diffie-Hellman parameters for the SSL/"
+"TLS encryption.  Alternatively you set it to @code{\"@@ffdhe2048\"}, "
+"@code{\"@@ffdhe3072\"}, @code{\"@@ffdhe4096\"}, @code{\"@@ffdhe6144\"} or "
+"@code{\"@@ffdhe8192\"} to use bundled parameters from RFC 7919."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:15001
+#, no-wrap
+msgid "@code{ssl-ciphers} (default: @code{#f})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:15004
+msgid ""
+"The @code{ssl-ciphers} option chooses the cipher suites to make available "
+"for use in SSL/TLS."
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:15008
+msgid ""
+"This option is specified using @uref{https://www.openssl.org/docs/apps/"
+"ciphers.html#CIPHER-LIST-FORMAT, OpenSSL cipher list notation}."
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:15013
+msgid ""
+"It is recommended that you try your cipher string using 'openssl ciphers "
+"<string>' before setting it here, to get a feel for which cipher suites you "
+"will get.  After setting this option, it is recommend that you inspect your "
+"Murmur log to ensure that Murmur is using the cipher suites that you "
+"expected it to."
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:15017
+msgid ""
+"Note: Changing this option may impact the backwards compatibility of your "
+"Murmur server, and can remove the ability for older Mumble clients to be "
+"able to connect to it."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:15018
+#, no-wrap
+msgid "@code{public-registration} (default: @code{#f})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:15020
+msgid ""
+"Must be a @code{<murmur-public-registration-configuration>} record or "
+"@code{#f}."
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:15025
+msgid ""
+"You can optionally register your server in the public server list that the "
+"@code{mumble} client shows on startup.  You cannot register your server if "
+"you have set a @code{server-password}, or set @code{allow-ping} to @code{#f}."
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:15027
 msgid "It might take a few hours until it shows up in the public list."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14979 doc/guix.texi:15550
+#: doc/guix.texi:15028 doc/guix.texi:15599
 #, no-wrap
 msgid "@code{file} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14981
+#: doc/guix.texi:15030
 msgid "Optional alternative override for this configuration."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:14984
+#: doc/guix.texi:15033
 #, no-wrap
 msgid "{Data Type} murmur-public-registration-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:14986
+#: doc/guix.texi:15035
 msgid "Configuration for public registration of a murmur service."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14990
-msgid "This is a display name for your server. Not to be confused with the hostname."
+#: doc/guix.texi:15039
+msgid ""
+"This is a display name for your server. Not to be confused with the hostname."
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:14991 doc/guix.texi:19868
+#: doc/guix.texi:15040 doc/guix.texi:19930
 #, no-wrap
 msgid "password"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14994
-msgid "A password to identify your registration.  Subsequent updates will need the same password. Don't lose your password."
+#: doc/guix.texi:15043
+msgid ""
+"A password to identify your registration.  Subsequent updates will need the "
+"same password. Don't lose your password."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:14995
+#: doc/guix.texi:15044
 #, no-wrap
 msgid "url"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14998
-msgid "This should be a @code{http://} or @code{https://} link to your web site."
+#: doc/guix.texi:15047
+msgid ""
+"This should be a @code{http://} or @code{https://} link to your web site."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14999
+#: doc/guix.texi:15048
 #, no-wrap
 msgid "@code{hostname} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15002
-msgid "By default your server will be listed by its IP address.  If it is set your server will be linked by this host name instead."
+#: doc/guix.texi:15051
+msgid ""
+"By default your server will be listed by its IP address.  If it is set your "
+"server will be linked by this host name instead."
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:15010
+#: doc/guix.texi:15059
 #, no-wrap
 msgid "Tailon Service"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:15014
-msgid "@uref{https://tailon.readthedocs.io/, Tailon} is a web application for viewing and searching log files."
+#: doc/guix.texi:15063
+msgid ""
+"@uref{https://tailon.readthedocs.io/, Tailon} is a web application for "
+"viewing and searching log files."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:15017
+#: doc/guix.texi:15066
 msgid ""
-"The following example will configure the service with default values.  By default, Tailon can be accessed on port 8080 (@code{http://"
-"localhost:8080})."
+"The following example will configure the service with default values.  By "
+"default, Tailon can be accessed on port 8080 (@code{http://localhost:8080})."
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:15020
+#: doc/guix.texi:15069
 #, no-wrap
 msgid "(service tailon-service-type)\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:15024
-msgid "The following example customises more of the Tailon configuration, adding @command{sed} to the list of allowed commands."
+#: doc/guix.texi:15073
+msgid ""
+"The following example customises more of the Tailon configuration, adding "
+"@command{sed} to the list of allowed commands."
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:15031
+#: doc/guix.texi:15080
 #, no-wrap
 msgid ""
 "(service tailon-service-type\n"
@@ -29410,36 +33722,40 @@ msgid ""
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:15034
+#: doc/guix.texi:15083
 #, no-wrap
 msgid "{Data Type} tailon-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:15037
-msgid "Data type representing the configuration of Tailon.  This type has the following parameters:"
+#: doc/guix.texi:15086
+msgid ""
+"Data type representing the configuration of Tailon.  This type has the "
+"following parameters:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15039
+#: doc/guix.texi:15088
 #, no-wrap
 msgid "@code{config-file} (default: @code{(tailon-configuration-file)})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15043
+#: doc/guix.texi:15092
 msgid ""
-"The configuration file to use for Tailon. This can be set to a @dfn{tailon-configuration-file} record value, or any gexp (@pxref{G-"
-"Expressions})."
+"The configuration file to use for Tailon. This can be set to a @dfn{tailon-"
+"configuration-file} record value, or any gexp (@pxref{G-Expressions})."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15046
-msgid "For example, to instead use a local file, the @code{local-file} function can be used:"
+#: doc/guix.texi:15095
+msgid ""
+"For example, to instead use a local file, the @code{local-file} function can "
+"be used:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:15051
+#: doc/guix.texi:15100
 #, no-wrap
 msgid ""
 "(service tailon-service-type\n"
@@ -29448,158 +33764,164 @@ msgid ""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15053
+#: doc/guix.texi:15102
 #, no-wrap
 msgid "@code{package} (default: @code{tailon})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15055
+#: doc/guix.texi:15104
 msgid "The tailon package to use."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:15059
+#: doc/guix.texi:15108
 #, no-wrap
 msgid "{Data Type} tailon-configuration-file"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:15062
-msgid "Data type representing the configuration options for Tailon.  This type has the following parameters:"
+#: doc/guix.texi:15111
+msgid ""
+"Data type representing the configuration options for Tailon.  This type has "
+"the following parameters:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15064
+#: doc/guix.texi:15113
 #, no-wrap
 msgid "@code{files} (default: @code{(list \"/var/log\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15069
+#: doc/guix.texi:15118
 msgid ""
-"List of files to display. The list can include strings for a single file or directory, or a list, where the first item is the name "
-"of a subsection, and the remaining items are the files or directories in that subsection."
+"List of files to display. The list can include strings for a single file or "
+"directory, or a list, where the first item is the name of a subsection, and "
+"the remaining items are the files or directories in that subsection."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15070
+#: doc/guix.texi:15119
 #, no-wrap
 msgid "@code{bind} (default: @code{\"localhost:8080\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15072
+#: doc/guix.texi:15121
 msgid "Address and port to which Tailon should bind on."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15073
+#: doc/guix.texi:15122
 #, no-wrap
 msgid "@code{relative-root} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15075
+#: doc/guix.texi:15124
 msgid "URL path to use for Tailon, set to @code{#f} to not use a path."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15076
+#: doc/guix.texi:15125
 #, no-wrap
 msgid "@code{allow-transfers?} (default: @code{#t})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15078
+#: doc/guix.texi:15127
 msgid "Allow downloading the log files in the web interface."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15079
+#: doc/guix.texi:15128
 #, no-wrap
 msgid "@code{follow-names?} (default: @code{#t})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15081
+#: doc/guix.texi:15130
 msgid "Allow tailing of not-yet existent files."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15082
+#: doc/guix.texi:15131
 #, no-wrap
 msgid "@code{tail-lines} (default: @code{200})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15084
+#: doc/guix.texi:15133
 msgid "Number of lines to read initially from each file."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15085
+#: doc/guix.texi:15134
 #, no-wrap
 msgid "@code{allowed-commands} (default: @code{(list \"tail\" \"grep\" \"awk\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15087
+#: doc/guix.texi:15136
 msgid "Commands to allow running. By default, @code{sed} is disabled."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15088
+#: doc/guix.texi:15137
 #, no-wrap
 msgid "@code{debug?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15090
+#: doc/guix.texi:15139
 msgid "Set @code{debug?} to @code{#t} to show debug messages."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15091
+#: doc/guix.texi:15140
 #, no-wrap
 msgid "@code{wrap-lines} (default: @code{#t})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15095
+#: doc/guix.texi:15144
 msgid ""
-"Initial line wrapping state in the web interface. Set to @code{#t} to initially wrap lines (the default), or to @code{#f} to "
-"initially not wrap lines."
+"Initial line wrapping state in the web interface. Set to @code{#t} to "
+"initially wrap lines (the default), or to @code{#f} to initially not wrap "
+"lines."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15096
+#: doc/guix.texi:15145
 #, no-wrap
 msgid "@code{http-auth} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15100
+#: doc/guix.texi:15149
 msgid ""
-"HTTP authentication type to use. Set to @code{#f} to disable authentication (the default). Supported values are @code{\"digest\"} or "
-"@code{\"basic\"}."
+"HTTP authentication type to use. Set to @code{#f} to disable authentication "
+"(the default). Supported values are @code{\"digest\"} or @code{\"basic\"}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15101
+#: doc/guix.texi:15150
 #, no-wrap
 msgid "@code{users} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15106
+#: doc/guix.texi:15155
 msgid ""
-"If HTTP authentication is enabled (see @code{http-auth}), access will be restricted to the credentials provided here. To configure "
-"users, use a list of pairs, where the first element of the pair is the username, and the 2nd element of the pair is the password."
+"If HTTP authentication is enabled (see @code{http-auth}), access will be "
+"restricted to the credentials provided here. To configure users, use a list "
+"of pairs, where the first element of the pair is the username, and the 2nd "
+"element of the pair is the password."
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:15112
+#: doc/guix.texi:15161
 #, no-wrap
 msgid ""
 "(tailon-configuration-file\n"
@@ -29609,37 +33931,40 @@ msgid ""
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:15118
+#: doc/guix.texi:15167
 #, no-wrap
 msgid "Darkstat Service"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:15119
+#: doc/guix.texi:15168
 #, no-wrap
 msgid "darkstat"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:15122
-msgid "Darkstat is a packet sniffer that captures network traffic, calculates statistics about usage, and serves reports over HTTP."
+#: doc/guix.texi:15171
+msgid ""
+"Darkstat is a packet sniffer that captures network traffic, calculates "
+"statistics about usage, and serves reports over HTTP."
 msgstr ""
 
 #. type: defvar
-#: doc/guix.texi:15123
+#: doc/guix.texi:15172
 #, no-wrap
 msgid "{Scheme Variable} darkstat-service-type"
 msgstr ""
 
 #. type: defvar
-#: doc/guix.texi:15128
+#: doc/guix.texi:15177
 msgid ""
-"This is the service type for the @uref{https://unix4lyfe.org/darkstat/, darkstat} service, its value must be a @code{darkstat-"
-"configuration} record as in this example:"
+"This is the service type for the @uref{https://unix4lyfe.org/darkstat/, "
+"darkstat} service, its value must be a @code{darkstat-configuration} record "
+"as in this example:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:15133
+#: doc/guix.texi:15182
 #, no-wrap
 msgid ""
 "(service darkstat-service-type\n"
@@ -29648,120 +33973,127 @@ msgid ""
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:15136
+#: doc/guix.texi:15185
 #, no-wrap
 msgid "{Data Type} darkstat-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:15138
+#: doc/guix.texi:15187
 msgid "Data type representing the configuration of @command{darkstat}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15140
+#: doc/guix.texi:15189
 #, no-wrap
 msgid "@code{package} (default: @code{darkstat})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15142
+#: doc/guix.texi:15191
 msgid "The darkstat package to use."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:15143
+#: doc/guix.texi:15192
 #, no-wrap
 msgid "interface"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15145
+#: doc/guix.texi:15194
 msgid "Capture traffic on the specified network interface."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15146
+#: doc/guix.texi:15195
 #, no-wrap
 msgid "@code{port} (default: @code{\"667\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15148
+#: doc/guix.texi:15197
 msgid "Bind the web interface to the specified port."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15149
+#: doc/guix.texi:15198
 #, no-wrap
 msgid "@code{bind-address} (default: @code{\"127.0.0.1\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15151
+#: doc/guix.texi:15200
 msgid "Bind the web interface to the specified address."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15152
+#: doc/guix.texi:15201
 #, no-wrap
 msgid "@code{base} (default: @code{\"/\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15155
-msgid "Specify the path of the base URL.  This can be useful if @command{darkstat} is accessed via a reverse proxy."
+#: doc/guix.texi:15204
+msgid ""
+"Specify the path of the base URL.  This can be useful if @command{darkstat} "
+"is accessed via a reverse proxy."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:15162
+#: doc/guix.texi:15211
 #, no-wrap
 msgid "Kerberos"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:15166
-msgid "The @code{(gnu services kerberos)} module provides services relating to the authentication protocol @dfn{Kerberos}."
+#: doc/guix.texi:15215
+msgid ""
+"The @code{(gnu services kerberos)} module provides services relating to the "
+"authentication protocol @dfn{Kerberos}."
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:15167
+#: doc/guix.texi:15216
 #, no-wrap
 msgid "Krb5 Service"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:15174
+#: doc/guix.texi:15223
 msgid ""
-"Programs using a Kerberos client library normally expect a configuration file in @file{/etc/krb5.conf}.  This service generates such "
-"a file from a definition provided in the operating system declaration.  It does not cause any daemon to be started."
+"Programs using a Kerberos client library normally expect a configuration "
+"file in @file{/etc/krb5.conf}.  This service generates such a file from a "
+"definition provided in the operating system declaration.  It does not cause "
+"any daemon to be started."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:15178
+#: doc/guix.texi:15227
 msgid ""
-"No ``keytab'' files are provided by this service---you must explicitly create them.  This service is known to work with the MIT "
-"client library, @code{mit-krb5}.  Other implementations have not been tested."
+"No ``keytab'' files are provided by this service---you must explicitly "
+"create them.  This service is known to work with the MIT client library, "
+"@code{mit-krb5}.  Other implementations have not been tested."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:15179
+#: doc/guix.texi:15228
 #, no-wrap
 msgid "{Scheme Variable} krb5-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:15181
+#: doc/guix.texi:15230
 msgid "A service type for Kerberos 5 clients."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:15185
+#: doc/guix.texi:15234
 msgid "Here is an example of its use:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:15199
+#: doc/guix.texi:15248
 #, no-wrap
 msgid ""
 "(service krb5-service-type\n"
@@ -29780,245 +34112,263 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:15203
+#: doc/guix.texi:15252
 msgid "This example provides a Kerberos@tie{}5 client configuration which:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15204
+#: doc/guix.texi:15253
 #, no-wrap
 msgid "Recognizes two realms, @i{viz:} ``EXAMPLE.COM'' and ``ARGRX.EDU'', both"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:15206
-msgid "of which have distinct administration servers and key distribution centers;"
+#: doc/guix.texi:15255
+msgid ""
+"of which have distinct administration servers and key distribution centers;"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15206
+#: doc/guix.texi:15255
 #, no-wrap
 msgid "Will default to the realm ``EXAMPLE.COM'' if the realm is not explicitly"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:15208
+#: doc/guix.texi:15257
 msgid "specified by clients;"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15208
+#: doc/guix.texi:15257
 #, no-wrap
 msgid "Accepts services which only support encryption types known to be weak."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:15216
+#: doc/guix.texi:15265
 msgid ""
-"The @code{krb5-realm} and @code{krb5-configuration} types have many fields.  Only the most commonly used ones are described here.  "
-"For a full list, and more detailed explanation of each, see the MIT @uref{http://web.mit.edu/kerberos/krb5-devel/doc/admin/"
-"conf_files/krb5_conf.html,,krb5.conf} documentation."
+"The @code{krb5-realm} and @code{krb5-configuration} types have many fields.  "
+"Only the most commonly used ones are described here.  For a full list, and "
+"more detailed explanation of each, see the MIT @uref{http://web.mit.edu/"
+"kerberos/krb5-devel/doc/admin/conf_files/krb5_conf.html,,krb5.conf} "
+"documentation."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:15218
+#: doc/guix.texi:15267
 #, no-wrap
 msgid "{Data Type} krb5-realm"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:15219
+#: doc/guix.texi:15268
 #, no-wrap
 msgid "realm, kerberos"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15225
+#: doc/guix.texi:15274
 msgid ""
-"This field is a string identifying the name of the realm.  A common convention is to use the fully qualified DNS name of your "
-"organization, converted to upper case."
+"This field is a string identifying the name of the realm.  A common "
+"convention is to use the fully qualified DNS name of your organization, "
+"converted to upper case."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:15226
+#: doc/guix.texi:15275
 #, no-wrap
 msgid "admin-server"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15229
-msgid "This field is a string identifying the host where the administration server is running."
+#: doc/guix.texi:15278
+msgid ""
+"This field is a string identifying the host where the administration server "
+"is running."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:15230
+#: doc/guix.texi:15279
 #, no-wrap
 msgid "kdc"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15233
-msgid "This field is a string identifying the key distribution center for the realm."
+#: doc/guix.texi:15282
+msgid ""
+"This field is a string identifying the key distribution center for the realm."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:15236
+#: doc/guix.texi:15285
 #, no-wrap
 msgid "{Data Type} krb5-configuration"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15239
+#: doc/guix.texi:15288
 #, no-wrap
 msgid "@code{allow-weak-crypto?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15242
-msgid "If this flag is @code{#t} then services which only offer encryption algorithms known to be weak will be accepted."
+#: doc/guix.texi:15291
+msgid ""
+"If this flag is @code{#t} then services which only offer encryption "
+"algorithms known to be weak will be accepted."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15243
+#: doc/guix.texi:15292
 #, no-wrap
 msgid "@code{default-realm} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15250
+#: doc/guix.texi:15299
 msgid ""
-"This field should be a string identifying the default Kerberos realm for the client.  You should set this field to the name of your "
-"Kerberos realm.  If this value is @code{#f} then a realm must be specified with every Kerberos principal when invoking programs such "
-"as @command{kinit}."
+"This field should be a string identifying the default Kerberos realm for the "
+"client.  You should set this field to the name of your Kerberos realm.  If "
+"this value is @code{#f} then a realm must be specified with every Kerberos "
+"principal when invoking programs such as @command{kinit}."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:15251
+#: doc/guix.texi:15300
 #, no-wrap
 msgid "realms"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15256
+#: doc/guix.texi:15305
 msgid ""
-"This should be a non-empty list of @code{krb5-realm} objects, which clients may access.  Normally, one of them will have a "
-"@code{name} field matching the @code{default-realm} field."
+"This should be a non-empty list of @code{krb5-realm} objects, which clients "
+"may access.  Normally, one of them will have a @code{name} field matching "
+"the @code{default-realm} field."
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:15260
+#: doc/guix.texi:15309
 #, no-wrap
 msgid "PAM krb5 Service"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:15261
+#: doc/guix.texi:15310
 #, no-wrap
 msgid "pam-krb5"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:15267
+#: doc/guix.texi:15316
 msgid ""
-"The @code{pam-krb5} service allows for login authentication and password management via Kerberos.  You will need this service if you "
-"want PAM enabled applications to authenticate users using Kerberos."
+"The @code{pam-krb5} service allows for login authentication and password "
+"management via Kerberos.  You will need this service if you want PAM enabled "
+"applications to authenticate users using Kerberos."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:15268
+#: doc/guix.texi:15317
 #, no-wrap
 msgid "{Scheme Variable} pam-krb5-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:15270
+#: doc/guix.texi:15319
 msgid "A service type for the Kerberos 5 PAM module."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:15272
+#: doc/guix.texi:15321
 #, no-wrap
 msgid "{Data Type} pam-krb5-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:15275
-msgid "Data type representing the configuration of the Kerberos 5 PAM module This type has the following parameters:"
+#: doc/guix.texi:15324
+msgid ""
+"Data type representing the configuration of the Kerberos 5 PAM module This "
+"type has the following parameters:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15276
+#: doc/guix.texi:15325
 #, no-wrap
 msgid "@code{pam-krb5} (default: @code{pam-krb5})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15278
+#: doc/guix.texi:15327
 msgid "The pam-krb5 package to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15279
+#: doc/guix.texi:15328
 #, no-wrap
 msgid "@code{minimum-uid} (default: @code{1000})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15282
+#: doc/guix.texi:15331
 msgid ""
-"The smallest user ID for which Kerberos authentications should be attempted.  Local accounts with lower values will silently fail to "
+"The smallest user ID for which Kerberos authentications should be "
+"attempted.  Local accounts with lower values will silently fail to "
 "authenticate."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:15289
+#: doc/guix.texi:15338
 #, no-wrap
 msgid "web"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:15290
+#: doc/guix.texi:15339
 #, no-wrap
 msgid "www"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:15291
+#: doc/guix.texi:15340
 #, no-wrap
 msgid "HTTP"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:15294
-msgid "The @code{(gnu services web)} module provides the Apache HTTP Server, the nginx web server, and also a fastcgi wrapper daemon."
+#: doc/guix.texi:15343
+msgid ""
+"The @code{(gnu services web)} module provides the Apache HTTP Server, the "
+"nginx web server, and also a fastcgi wrapper daemon."
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:15295
+#: doc/guix.texi:15344
 #, no-wrap
 msgid "Apache HTTP Server"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:15297
+#: doc/guix.texi:15346
 #, no-wrap
 msgid "{Scheme Variable} httpd-service-type"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:15301
+#: doc/guix.texi:15350
 msgid ""
-"Service type for the @uref{https://httpd.apache.org/,Apache HTTP} server (@dfn{httpd}).  The value for this service type is a "
-"@code{https-configuration} record."
+"Service type for the @uref{https://httpd.apache.org/,Apache HTTP} server "
+"(@dfn{httpd}).  The value for this service type is a @code{https-"
+"configuration} record."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:15303 doc/guix.texi:15454
+#: doc/guix.texi:15352 doc/guix.texi:15503
 msgid "A simple example configuration is given below."
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:15311
+#: doc/guix.texi:15360
 #, no-wrap
 msgid ""
 "(service httpd-service-type\n"
@@ -30030,12 +34380,14 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:15315
-msgid "Other services can also extend the @code{httpd-service-type} to add to the configuration."
+#: doc/guix.texi:15364
+msgid ""
+"Other services can also extend the @code{httpd-service-type} to add to the "
+"configuration."
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:15324 doc/guix.texi:15434
+#: doc/guix.texi:15373 doc/guix.texi:15483
 #, no-wrap
 msgid ""
 "(simple-service 'my-extra-server httpd-service-type\n"
@@ -30048,276 +34400,292 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:15330
+#: doc/guix.texi:15379
 msgid ""
-"The details for the @code{httpd-configuration}, @code{httpd-module}, @code{httpd-config-file} and @code{httpd-virtualhost} record "
-"types are given below."
+"The details for the @code{httpd-configuration}, @code{httpd-module}, "
+"@code{httpd-config-file} and @code{httpd-virtualhost} record types are given "
+"below."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:15331
+#: doc/guix.texi:15380
 #, no-wrap
 msgid "{Data Type} httpd-configuration"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:15333
+#: doc/guix.texi:15382
 msgid "This data type represents the configuration for the httpd service."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15335
+#: doc/guix.texi:15384
 #, no-wrap
 msgid "@code{package} (default: @code{httpd})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15337
+#: doc/guix.texi:15386
 msgid "The httpd package to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15338 doc/guix.texi:15397
+#: doc/guix.texi:15387 doc/guix.texi:15446
 #, no-wrap
 msgid "@code{pid-file} (default: @code{\"/var/run/httpd\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15340
+#: doc/guix.texi:15389
 msgid "The pid file used by the shepherd-service."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15341
+#: doc/guix.texi:15390
 #, no-wrap
 msgid "@code{config} (default: @code{(httpd-config-file)})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15346
+#: doc/guix.texi:15395
 msgid ""
-"The configuration file to use with the httpd service. The default value is a @code{httpd-config-file} record, but this can also be a "
-"different G-expression that generates a file, for example a @code{plain-file}. A file outside of the store can also be specified "
-"through a string."
+"The configuration file to use with the httpd service. The default value is a "
+"@code{httpd-config-file} record, but this can also be a different G-"
+"expression that generates a file, for example a @code{plain-file}. A file "
+"outside of the store can also be specified through a string."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:15350
+#: doc/guix.texi:15399
 #, no-wrap
 msgid "{Data Type} httpd-module"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:15352
+#: doc/guix.texi:15401
 msgid "This data type represents a module for the httpd service."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15356
+#: doc/guix.texi:15405
 msgid "The name of the module."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15362
+#: doc/guix.texi:15411
 msgid ""
-"The file for the module. This can be relative to the httpd package being used, the absolute location of a file, or a G-expression "
-"for a file within the store, for example @code{(file-append mod-wsgi \"/modules/mod_wsgi.so\")}."
+"The file for the module. This can be relative to the httpd package being "
+"used, the absolute location of a file, or a G-expression for a file within "
+"the store, for example @code{(file-append mod-wsgi \"/modules/mod_wsgi.so"
+"\")}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:15366
+#: doc/guix.texi:15415
 #, no-wrap
 msgid "{Data Type} httpd-config-file"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:15368
+#: doc/guix.texi:15417
 msgid "This data type represents a configuration file for the httpd service."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15370
+#: doc/guix.texi:15419
 #, no-wrap
 msgid "@code{modules} (default: @code{%default-httpd-modules})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15373
-msgid "The modules to load. Additional modules can be added here, or loaded by additional configuration."
+#: doc/guix.texi:15422
+msgid ""
+"The modules to load. Additional modules can be added here, or loaded by "
+"additional configuration."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15374
+#: doc/guix.texi:15423
 #, no-wrap
 msgid "@code{server-root} (default: @code{httpd})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15378
+#: doc/guix.texi:15427
 msgid ""
-"The @code{ServerRoot} in the configuration file, defaults to the httpd package. Directives including @code{Include} and "
-"@code{LoadModule} are taken as relative to the server root."
+"The @code{ServerRoot} in the configuration file, defaults to the httpd "
+"package. Directives including @code{Include} and @code{LoadModule} are taken "
+"as relative to the server root."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15379
+#: doc/guix.texi:15428
 #, no-wrap
 msgid "@code{server-name} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15383
+#: doc/guix.texi:15432
 msgid ""
-"The @code{ServerName} in the configuration file, used to specify the request scheme, hostname and port that the server uses to "
-"identify itself."
+"The @code{ServerName} in the configuration file, used to specify the request "
+"scheme, hostname and port that the server uses to identify itself."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15387
+#: doc/guix.texi:15436
 msgid ""
-"This doesn't need to be set in the server config, and can be specifyed in virtual hosts. The default is @code{#f} to not specify a "
-"@code{ServerName}."
+"This doesn't need to be set in the server config, and can be specifyed in "
+"virtual hosts. The default is @code{#f} to not specify a @code{ServerName}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15388
+#: doc/guix.texi:15437
 #, no-wrap
 msgid "@code{document-root} (default: @code{\"/srv/http\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15390
+#: doc/guix.texi:15439
 msgid "The @code{DocumentRoot} from which files will be served."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15391
+#: doc/guix.texi:15440
 #, no-wrap
 msgid "@code{listen} (default: @code{'(\"80\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15396
+#: doc/guix.texi:15445
 msgid ""
-"The list of values for the @code{Listen} directives in the config file. The value should be a list of strings, when each string can "
-"specify the port number to listen on, and optionally the IP address and protocol to use."
+"The list of values for the @code{Listen} directives in the config file. The "
+"value should be a list of strings, when each string can specify the port "
+"number to listen on, and optionally the IP address and protocol to use."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15401
+#: doc/guix.texi:15450
 msgid ""
-"The @code{PidFile} to use. This should match the @code{pid-file} set in the @code{httpd-configuration} so that the Shepherd service "
-"is configured correctly."
+"The @code{PidFile} to use. This should match the @code{pid-file} set in the "
+"@code{httpd-configuration} so that the Shepherd service is configured "
+"correctly."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15402
+#: doc/guix.texi:15451
 #, no-wrap
 msgid "@code{error-log} (default: @code{\"/var/log/httpd/error_log\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15404
+#: doc/guix.texi:15453
 msgid "The @code{ErrorLog} to which the server will log errors."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15405
+#: doc/guix.texi:15454
 #, no-wrap
 msgid "@code{user} (default: @code{\"httpd\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15407
+#: doc/guix.texi:15456
 msgid "The @code{User} which the server will answer requests as."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15408
+#: doc/guix.texi:15457
 #, no-wrap
 msgid "@code{group} (default: @code{\"httpd\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15410
+#: doc/guix.texi:15459
 msgid "The @code{Group} which the server will answer requests as."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15411
+#: doc/guix.texi:15460
 #, no-wrap
 msgid "@code{extra-config} (default: @code{(list \"TypesConfig etc/httpd/mime.types\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15414
-msgid "A flat list of strings and G-expressions which will be added to the end of the configuration file."
+#: doc/guix.texi:15463
+msgid ""
+"A flat list of strings and G-expressions which will be added to the end of "
+"the configuration file."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15417
-msgid "Any values which the service is extended with will be appended to this list."
+#: doc/guix.texi:15466
+msgid ""
+"Any values which the service is extended with will be appended to this list."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:15421
+#: doc/guix.texi:15470
 #, no-wrap
 msgid "{Data Type} httpd-virtualhost"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:15423
-msgid "This data type represents a virtualhost configuration block for the httpd service."
+#: doc/guix.texi:15472
+msgid ""
+"This data type represents a virtualhost configuration block for the httpd "
+"service."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:15425
+#: doc/guix.texi:15474
 msgid "These should be added to the extra-config for the httpd-service."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:15437
+#: doc/guix.texi:15486
 #, no-wrap
 msgid "addresses-and-ports"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15439
+#: doc/guix.texi:15488
 msgid "The addresses and ports for the @code{VirtualHost} directive."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:15440
+#: doc/guix.texi:15489
 #, no-wrap
 msgid "contents"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15443
-msgid "The contents of the @code{VirtualHost} directive, this should be a list of strings and G-expressions."
+#: doc/guix.texi:15492
+msgid ""
+"The contents of the @code{VirtualHost} directive, this should be a list of "
+"strings and G-expressions."
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:15447
+#: doc/guix.texi:15496
 #, no-wrap
 msgid "NGINX"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:15449
+#: doc/guix.texi:15498
 #, no-wrap
 msgid "{Scheme Variable} nginx-service-type"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:15452
+#: doc/guix.texi:15501
 msgid ""
-"Service type for the @uref{https://nginx.org/,NGinx} web server.  The value for this service type is a @code{<nginx-configuration>} "
-"record."
+"Service type for the @uref{https://nginx.org/,NGinx} web server.  The value "
+"for this service type is a @code{<nginx-configuration>} record."
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:15462 doc/guix.texi:15516
+#: doc/guix.texi:15511 doc/guix.texi:15565
 #, no-wrap
 msgid ""
 "(service nginx-service-type\n"
@@ -30329,14 +34697,15 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:15467
+#: doc/guix.texi:15516
 msgid ""
-"In addition to adding server blocks to the service configuration directly, this service can be extended by other services to add "
-"server blocks, as in this example:"
+"In addition to adding server blocks to the service configuration directly, "
+"this service can be extended by other services to add server blocks, as in "
+"this example:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:15473
+#: doc/guix.texi:15522
 #, no-wrap
 msgid ""
 "(simple-service 'my-extra-server nginx-service-type\n"
@@ -30346,104 +34715,112 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:15484
+#: doc/guix.texi:15533
 msgid ""
-"At startup, @command{nginx} has not yet read its configuration file, so it uses a default file to log error messages.  If it fails "
-"to load its configuration file, that is where error messages are logged.  After the configuration file is loaded, the default error "
-"log file changes as per configuration.  In our case, startup error messages can be found in @file{/var/run/nginx/logs/error.log}, "
-"and after configuration in @file{/var/log/nginx/error.log}.  The second location can be changed with the @var{log-directory} "
-"configuration option."
+"At startup, @command{nginx} has not yet read its configuration file, so it "
+"uses a default file to log error messages.  If it fails to load its "
+"configuration file, that is where error messages are logged.  After the "
+"configuration file is loaded, the default error log file changes as per "
+"configuration.  In our case, startup error messages can be found in @file{/"
+"var/run/nginx/logs/error.log}, and after configuration in @file{/var/log/"
+"nginx/error.log}.  The second location can be changed with the @var{log-"
+"directory} configuration option."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:15485
+#: doc/guix.texi:15534
 #, no-wrap
 msgid "{Data Type} nginx-configuration"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:15489
+#: doc/guix.texi:15538
 msgid ""
-"This data type represents the configuration for NGinx. Some configuration can be done through this and the other provided record "
-"types, or alternatively, a config file can be provided."
+"This data type represents the configuration for NGinx. Some configuration "
+"can be done through this and the other provided record types, or "
+"alternatively, a config file can be provided."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15491
+#: doc/guix.texi:15540
 #, no-wrap
 msgid "@code{nginx} (default: @code{nginx})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15493
+#: doc/guix.texi:15542
 msgid "The nginx package to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15494
+#: doc/guix.texi:15543
 #, no-wrap
 msgid "@code{log-directory} (default: @code{\"/var/log/nginx\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15496
+#: doc/guix.texi:15545
 msgid "The directory to which NGinx will write log files."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15497
+#: doc/guix.texi:15546
 #, no-wrap
 msgid "@code{run-directory} (default: @code{\"/var/run/nginx\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15500
-msgid "The directory in which NGinx will create a pid file, and write temporary files."
+#: doc/guix.texi:15549
+msgid ""
+"The directory in which NGinx will create a pid file, and write temporary "
+"files."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15501
+#: doc/guix.texi:15550
 #, no-wrap
 msgid "@code{server-blocks} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15505
+#: doc/guix.texi:15554
 msgid ""
-"A list of @dfn{server blocks} to create in the generated configuration file, the elements should be of type @code{<nginx-server-"
-"configuration>}."
+"A list of @dfn{server blocks} to create in the generated configuration file, "
+"the elements should be of type @code{<nginx-server-configuration>}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15509
+#: doc/guix.texi:15558
 msgid ""
-"The following example would setup NGinx to serve @code{www.example.com} from the @code{/srv/http/www.example.com} directory, without "
-"using HTTPS."
+"The following example would setup NGinx to serve @code{www.example.com} from "
+"the @code{/srv/http/www.example.com} directory, without using HTTPS."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15518
+#: doc/guix.texi:15567
 #, no-wrap
 msgid "@code{upstream-blocks} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15522
+#: doc/guix.texi:15571
 msgid ""
-"A list of @dfn{upstream blocks} to create in the generated configuration file, the elements should be of type @code{<nginx-upstream-"
-"configuration>}."
+"A list of @dfn{upstream blocks} to create in the generated configuration "
+"file, the elements should be of type @code{<nginx-upstream-configuration>}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15529
+#: doc/guix.texi:15578
 msgid ""
-"Configuring upstreams through the @code{upstream-blocks} can be useful when combined with @code{locations} in the @code{<nginx-"
-"server-configuration>} records.  The following example creates a server configuration with one location configuration, that will "
-"proxy requests to a upstream configuration, which will handle requests with two servers."
+"Configuring upstreams through the @code{upstream-blocks} can be useful when "
+"combined with @code{locations} in the @code{<nginx-server-configuration>} "
+"records.  The following example creates a server configuration with one "
+"location configuration, that will proxy requests to a upstream "
+"configuration, which will handle requests with two servers."
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:15548
+#: doc/guix.texi:15597
 #, no-wrap
 msgid ""
 "(service\n"
@@ -30465,785 +34842,831 @@ msgid ""
 "                             \"server2.example.com\")))))))\n"
 msgstr ""
 
-#. type: table
-#: doc/guix.texi:15556
-msgid ""
-"If a configuration @var{file} is provided, this will be used, rather than generating a configuration file from the provided "
-"@code{log-directory}, @code{run-directory}, @code{server-blocks} and @code{upstream-blocks}.  For proper operation, these arguments "
-"should match what is in @var{file} to ensure that the directories are created when the service is activated."
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:15560
-msgid ""
-"This can be useful if you have an existing configuration file, or it's not possible to do what is required through the other parts "
-"of the nginx-configuration record."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:15561
-#, no-wrap
-msgid "@code{server-names-hash-bucket-size} (default: @code{#f})"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:15564
-msgid "Bucket size for the server names hash tables, defaults to @code{#f} to use the size of the processors cache line."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:15565
-#, no-wrap
-msgid "@code{server-names-hash-bucket-max-size} (default: @code{#f})"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:15567
-msgid "Maximum bucket size for the server names hash tables."
-msgstr ""
-
-#. type: deftp
-#: doc/guix.texi:15571
-#, no-wrap
-msgid "{Data Type} nginx-server-configuration"
-msgstr ""
-
-#. type: deftp
-#: doc/guix.texi:15574
-msgid "Data type representing the configuration of an nginx server block.  This type has the following parameters:"
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:15576
-#, no-wrap
-msgid "@code{listen} (default: @code{'(\"80\" \"443 ssl\")})"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:15581
-msgid ""
-"Each @code{listen} directive sets the address and port for IP, or the path for a UNIX-domain socket on which the server will accept "
-"requests.  Both address and port, or only address or only port can be specified.  An address may also be a hostname, for example:"
-msgstr ""
-
-#. type: example
-#: doc/guix.texi:15584
-#, no-wrap
-msgid "'(\"127.0.0.1:8000\" \"127.0.0.1\" \"8000\" \"*:8000\" \"localhost:8000\")\n"
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:15586
-#, no-wrap
-msgid "@code{server-name} (default: @code{(list 'default)})"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:15589
-msgid ""
-"A list of server names this server represents. @code{'default} represents the default server for connections matching no other "
-"server."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:15590
-#, no-wrap
-msgid "@code{root} (default: @code{\"/srv/http\"})"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:15592
-msgid "Root of the website nginx will serve."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:15593
-#, no-wrap
-msgid "@code{locations} (default: @code{'()})"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:15597
-msgid ""
-"A list of @dfn{nginx-location-configuration} or @dfn{nginx-named-location-configuration} records to use within this server block."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:15598
-#, no-wrap
-msgid "@code{index} (default: @code{(list \"index.html\")})"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:15601
-msgid ""
-"Index files to look for when clients ask for a directory.  If it cannot be found, Nginx will send the list of files in the directory."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:15602
-#, no-wrap
-msgid "@code{try-files} (default: @code{'()})"
-msgstr ""
-
 #. type: table
 #: doc/guix.texi:15605
 msgid ""
-"A list of files whose existence is checked in the specified order.  @code{nginx} will use the first file it finds to process the "
-"request."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:15606
-#, no-wrap
-msgid "@code{ssl-certificate} (default: @code{#f})"
+"If a configuration @var{file} is provided, this will be used, rather than "
+"generating a configuration file from the provided @code{log-directory}, "
+"@code{run-directory}, @code{server-blocks} and @code{upstream-blocks}.  For "
+"proper operation, these arguments should match what is in @var{file} to "
+"ensure that the directories are created when the service is activated."
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:15609
 msgid ""
-"Where to find the certificate for secure connections.  Set it to @code{#f} if you don't have a certificate or you don't want to use "
-"HTTPS."
+"This can be useful if you have an existing configuration file, or it's not "
+"possible to do what is required through the other parts of the nginx-"
+"configuration record."
 msgstr ""
 
 #. type: item
 #: doc/guix.texi:15610
 #, no-wrap
-msgid "@code{ssl-certificate-key} (default: @code{#f})"
+msgid "@code{server-names-hash-bucket-size} (default: @code{#f})"
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:15613
 msgid ""
-"Where to find the private key for secure connections.  Set it to @code{#f} if you don't have a key or you don't want to use HTTPS."
+"Bucket size for the server names hash tables, defaults to @code{#f} to use "
+"the size of the processors cache line."
 msgstr ""
 
 #. type: item
 #: doc/guix.texi:15614
 #, no-wrap
-msgid "@code{server-tokens?} (default: @code{#f})"
+msgid "@code{server-names-hash-bucket-max-size} (default: @code{#f})"
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:15616
-msgid "Whether the server should add its configuration to response."
+msgid "Maximum bucket size for the server names hash tables."
 msgstr ""
 
-#. type: item
-#: doc/guix.texi:15617
+#. type: deftp
+#: doc/guix.texi:15620
 #, no-wrap
-msgid "@code{raw-content} (default: @code{'()})"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:15619
-msgid "A list of raw lines added to the server block."
+msgid "{Data Type} nginx-server-configuration"
 msgstr ""
 
 #. type: deftp
 #: doc/guix.texi:15623
-#, no-wrap
-msgid "{Data Type} nginx-upstream-configuration"
+msgid ""
+"Data type representing the configuration of an nginx server block.  This "
+"type has the following parameters:"
 msgstr ""
 
-#. type: deftp
-#: doc/guix.texi:15626
-msgid "Data type representing the configuration of an nginx @code{upstream} block.  This type has the following parameters:"
+#. type: item
+#: doc/guix.texi:15625
+#, no-wrap
+msgid "@code{listen} (default: @code{'(\"80\" \"443 ssl\")})"
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:15630
-msgid "Name for this group of servers."
+msgid ""
+"Each @code{listen} directive sets the address and port for IP, or the path "
+"for a UNIX-domain socket on which the server will accept requests.  Both "
+"address and port, or only address or only port can be specified.  An address "
+"may also be a hostname, for example:"
 msgstr ""
 
-#. type: code{#1}
-#: doc/guix.texi:15631
+#. type: example
+#: doc/guix.texi:15633
 #, no-wrap
-msgid "servers"
+msgid "'(\"127.0.0.1:8000\" \"127.0.0.1\" \"8000\" \"*:8000\" \"localhost:8000\")\n"
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:15635
+#, no-wrap
+msgid "@code{server-name} (default: @code{(list 'default)})"
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:15638
 msgid ""
-"Specify the addresses of the servers in the group.  The address can be specified as a IP address (e.g. @samp{127.0.0.1}), domain "
-"name (e.g. @samp{backend1.example.com}) or a path to a UNIX socket using the prefix @samp{unix:}.  For addresses using an IP address "
-"or domain name, the default port is 80, and a different port can be specified explicitly."
+"A list of server names this server represents. @code{'default} represents "
+"the default server for connections matching no other server."
 msgstr ""
 
-#. type: deftp
-#: doc/guix.texi:15642
+#. type: item
+#: doc/guix.texi:15639
 #, no-wrap
-msgid "{Data Type} nginx-location-configuration"
-msgstr ""
-
-#. type: deftp
-#: doc/guix.texi:15645
-msgid "Data type representing the configuration of an nginx @code{location} block.  This type has the following parameters:"
+msgid "@code{root} (default: @code{\"/srv/http\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15649
-msgid "URI which this location block matches."
+#: doc/guix.texi:15641
+msgid "Root of the website nginx will serve."
 msgstr ""
 
-#. type: anchor{#1}
-#: doc/guix.texi:15651
-msgid "nginx-location-configuration body"
-msgstr ""
-
-#. type: code{#1}
-#: doc/guix.texi:15651 doc/guix.texi:15672
+#. type: item
+#: doc/guix.texi:15642
 #, no-wrap
-msgid "body"
+msgid "@code{locations} (default: @code{'()})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:15646
+msgid ""
+"A list of @dfn{nginx-location-configuration} or @dfn{nginx-named-location-"
+"configuration} records to use within this server block."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:15647
+#, no-wrap
+msgid "@code{index} (default: @code{(list \"index.html\")})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:15650
+msgid ""
+"Index files to look for when clients ask for a directory.  If it cannot be "
+"found, Nginx will send the list of files in the directory."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:15651
+#, no-wrap
+msgid "@code{try-files} (default: @code{'()})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:15654
+msgid ""
+"A list of files whose existence is checked in the specified order.  "
+"@code{nginx} will use the first file it finds to process the request."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:15655
+#, no-wrap
+msgid "@code{ssl-certificate} (default: @code{#f})"
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:15658
 msgid ""
-"Body of the location block, specified as a list of strings. This can contain many configuration directives.  For example, to pass "
-"requests to a upstream server group defined using an @code{nginx-upstream-configuration} block, the following directive would be "
-"specified in the body @samp{(list \"proxy_pass http://upstream-name;\")}."
+"Where to find the certificate for secure connections.  Set it to @code{#f} "
+"if you don't have a certificate or you don't want to use HTTPS."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:15659
+#, no-wrap
+msgid "@code{ssl-certificate-key} (default: @code{#f})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:15662
+msgid ""
+"Where to find the private key for secure connections.  Set it to @code{#f} "
+"if you don't have a key or you don't want to use HTTPS."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:15663
+#, no-wrap
+msgid "@code{server-tokens?} (default: @code{#f})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:15665
+msgid "Whether the server should add its configuration to response."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:15666
+#, no-wrap
+msgid "@code{raw-content} (default: @code{'()})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:15668
+msgid "A list of raw lines added to the server block."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:15662
+#: doc/guix.texi:15672
+#, no-wrap
+msgid "{Data Type} nginx-upstream-configuration"
+msgstr ""
+
+#. type: deftp
+#: doc/guix.texi:15675
+msgid ""
+"Data type representing the configuration of an nginx @code{upstream} block.  "
+"This type has the following parameters:"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:15679
+msgid "Name for this group of servers."
+msgstr ""
+
+#. type: code{#1}
+#: doc/guix.texi:15680
+#, no-wrap
+msgid "servers"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:15687
+msgid ""
+"Specify the addresses of the servers in the group.  The address can be "
+"specified as a IP address (e.g. @samp{127.0.0.1}), domain name (e.g. "
+"@samp{backend1.example.com}) or a path to a UNIX socket using the prefix "
+"@samp{unix:}.  For addresses using an IP address or domain name, the default "
+"port is 80, and a different port can be specified explicitly."
+msgstr ""
+
+#. type: deftp
+#: doc/guix.texi:15691
+#, no-wrap
+msgid "{Data Type} nginx-location-configuration"
+msgstr ""
+
+#. type: deftp
+#: doc/guix.texi:15694
+msgid ""
+"Data type representing the configuration of an nginx @code{location} block.  "
+"This type has the following parameters:"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:15698
+msgid "URI which this location block matches."
+msgstr ""
+
+#. type: anchor{#1}
+#: doc/guix.texi:15700
+msgid "nginx-location-configuration body"
+msgstr ""
+
+#. type: code{#1}
+#: doc/guix.texi:15700 doc/guix.texi:15721
+#, no-wrap
+msgid "body"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:15707
+msgid ""
+"Body of the location block, specified as a list of strings. This can contain "
+"many configuration directives.  For example, to pass requests to a upstream "
+"server group defined using an @code{nginx-upstream-configuration} block, the "
+"following directive would be specified in the body @samp{(list \"proxy_pass "
+"http://upstream-name;\")}."
+msgstr ""
+
+#. type: deftp
+#: doc/guix.texi:15711
 #, no-wrap
 msgid "{Data Type} nginx-named-location-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:15667
+#: doc/guix.texi:15716
 msgid ""
-"Data type representing the configuration of an nginx named location block.  Named location blocks are used for request redirection, "
-"and not used for regular request processing.  This type has the following parameters:"
+"Data type representing the configuration of an nginx named location block.  "
+"Named location blocks are used for request redirection, and not used for "
+"regular request processing.  This type has the following parameters:"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15671
+#: doc/guix.texi:15720
 msgid "Name to identify this location block."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15677
+#: doc/guix.texi:15726
 msgid ""
-"@xref{nginx-location-configuration body}, as the body for named location blocks can be used in a similar way to the @code{nginx-"
-"location-configuration body}.  One restriction is that the body of a named location block cannot contain location blocks."
+"@xref{nginx-location-configuration body}, as the body for named location "
+"blocks can be used in a similar way to the @code{nginx-location-"
+"configuration body}.  One restriction is that the body of a named location "
+"block cannot contain location blocks."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:15681
+#: doc/guix.texi:15730
 #, no-wrap
 msgid "fastcgi"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:15682
+#: doc/guix.texi:15731
 #, no-wrap
 msgid "fcgiwrap"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:15689
+#: doc/guix.texi:15738
 msgid ""
-"FastCGI is an interface between the front-end and the back-end of a web service.  It is a somewhat legacy facility; new web services "
-"should generally just talk HTTP between the front-end and the back-end.  However there are a number of back-end services such as PHP "
-"or the optimized HTTP Git repository access that use FastCGI, so we have support for it in Guix."
+"FastCGI is an interface between the front-end and the back-end of a web "
+"service.  It is a somewhat legacy facility; new web services should "
+"generally just talk HTTP between the front-end and the back-end.  However "
+"there are a number of back-end services such as PHP or the optimized HTTP "
+"Git repository access that use FastCGI, so we have support for it in Guix."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:15696
+#: doc/guix.texi:15745
 msgid ""
-"To use FastCGI, you configure the front-end web server (e.g., nginx) to dispatch some subset of its requests to the fastcgi backend, "
-"which listens on a local TCP or UNIX socket.  There is an intermediary @code{fcgiwrap} program that sits between the actual backend "
-"process and the web server.  The front-end indicates which backend program to run, passing that information to the @code{fcgiwrap} "
-"process."
+"To use FastCGI, you configure the front-end web server (e.g., nginx) to "
+"dispatch some subset of its requests to the fastcgi backend, which listens "
+"on a local TCP or UNIX socket.  There is an intermediary @code{fcgiwrap} "
+"program that sits between the actual backend process and the web server.  "
+"The front-end indicates which backend program to run, passing that "
+"information to the @code{fcgiwrap} process."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:15697
+#: doc/guix.texi:15746
 #, no-wrap
 msgid "{Scheme Variable} fcgiwrap-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:15699
+#: doc/guix.texi:15748
 msgid "A service type for the @code{fcgiwrap} FastCGI proxy."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:15701
+#: doc/guix.texi:15750
 #, no-wrap
 msgid "{Data Type} fcgiwrap-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:15704
-msgid "Data type representing the configuration of the @code{fcgiwrap} serice.  This type has the following parameters:"
+#: doc/guix.texi:15753
+msgid ""
+"Data type representing the configuration of the @code{fcgiwrap} serice.  "
+"This type has the following parameters:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15705
+#: doc/guix.texi:15754
 #, no-wrap
 msgid "@code{package} (default: @code{fcgiwrap})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15707
+#: doc/guix.texi:15756
 msgid "The fcgiwrap package to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15708
+#: doc/guix.texi:15757
 #, no-wrap
 msgid "@code{socket} (default: @code{tcp:127.0.0.1:9000})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15714
+#: doc/guix.texi:15763
 msgid ""
-"The socket on which the @code{fcgiwrap} process should listen, as a string.  Valid @var{socket} values include @code{unix:@var{/path/"
-"to/unix/socket}}, @code{tcp:@var{dot.ted.qu.ad}:@var{port}} and @code{tcp6:[@var{ipv6_addr}]:port}."
+"The socket on which the @code{fcgiwrap} process should listen, as a string.  "
+"Valid @var{socket} values include @code{unix:@var{/path/to/unix/socket}}, "
+"@code{tcp:@var{dot.ted.qu.ad}:@var{port}} and @code{tcp6:[@var{ipv6_addr}]:"
+"port}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15715
+#: doc/guix.texi:15764
 #, no-wrap
 msgid "@code{user} (default: @code{fcgiwrap})"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:15716
+#: doc/guix.texi:15765
 #, no-wrap
 msgid "@code{group} (default: @code{fcgiwrap})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15721
+#: doc/guix.texi:15770
 msgid ""
-"The user and group names, as strings, under which to run the @code{fcgiwrap} process.  The @code{fastcgi} service will ensure that "
-"if the user asks for the specific user or group names @code{fcgiwrap} that the corresponding user and/or group is present on the "
-"system."
+"The user and group names, as strings, under which to run the @code{fcgiwrap} "
+"process.  The @code{fastcgi} service will ensure that if the user asks for "
+"the specific user or group names @code{fcgiwrap} that the corresponding user "
+"and/or group is present on the system."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15728
+#: doc/guix.texi:15777
 msgid ""
-"It is possible to configure a FastCGI-backed web service to pass HTTP authentication information from the front-end to the back-end, "
-"and to allow @code{fcgiwrap} to run the back-end process as a corresponding local user.  To enable this capability on the back-end., "
-"run @code{fcgiwrap} as the @code{root} user and group.  Note that this capability also has to be configured on the front-end as well."
+"It is possible to configure a FastCGI-backed web service to pass HTTP "
+"authentication information from the front-end to the back-end, and to allow "
+"@code{fcgiwrap} to run the back-end process as a corresponding local user.  "
+"To enable this capability on the back-end., run @code{fcgiwrap} as the "
+"@code{root} user and group.  Note that this capability also has to be "
+"configured on the front-end as well."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:15731
+#: doc/guix.texi:15780
 #, no-wrap
 msgid "php-fpm"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:15734
+#: doc/guix.texi:15783
 msgid ""
-"PHP-FPM (FastCGI Process Manager) is an alternative PHP FastCGI implementation with some additional features useful for sites of any "
-"size."
+"PHP-FPM (FastCGI Process Manager) is an alternative PHP FastCGI "
+"implementation with some additional features useful for sites of any size."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:15736
+#: doc/guix.texi:15785
 msgid "These features include:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15737
+#: doc/guix.texi:15786
 #, no-wrap
 msgid "Adaptive process spawning"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15738
+#: doc/guix.texi:15787
 #, no-wrap
 msgid "Basic statistics (similar to Apache's mod_status)"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15739
+#: doc/guix.texi:15788
 #, no-wrap
 msgid "Advanced process management with graceful stop/start"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15740
+#: doc/guix.texi:15789
 #, no-wrap
 msgid "Ability to start workers with different uid/gid/chroot/environment"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:15742
+#: doc/guix.texi:15791
 msgid "and different php.ini (replaces safe_mode)"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15742
+#: doc/guix.texi:15791
 #, no-wrap
 msgid "Stdout & stderr logging"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15743
+#: doc/guix.texi:15792
 #, no-wrap
 msgid "Emergency restart in case of accidental opcode cache destruction"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15744
+#: doc/guix.texi:15793
 #, no-wrap
 msgid "Accelerated upload support"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15745
+#: doc/guix.texi:15794
 #, no-wrap
 msgid "Support for a \"slowlog\""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15746
+#: doc/guix.texi:15795
 #, no-wrap
 msgid "Enhancements to FastCGI, such as fastcgi_finish_request() -"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:15749
+#: doc/guix.texi:15798
 msgid ""
-"a special function to finish request & flush all data while continuing to do something time-consuming (video converting, stats "
-"processing, etc.)"
+"a special function to finish request & flush all data while continuing to do "
+"something time-consuming (video converting, stats processing, etc.)"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:15751
+#: doc/guix.texi:15800
 msgid "... and much more."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:15752
+#: doc/guix.texi:15801
 #, no-wrap
 msgid "{Scheme Variable} php-fpm-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:15754
+#: doc/guix.texi:15803
 msgid "A Service type for @code{php-fpm}."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:15756
+#: doc/guix.texi:15805
 #, no-wrap
 msgid "{Data Type} php-fpm-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:15758
+#: doc/guix.texi:15807
 msgid "Data Type for php-fpm service configuration."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15759
+#: doc/guix.texi:15808
 #, no-wrap
 msgid "@code{php} (default: @code{php})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15761
+#: doc/guix.texi:15810
 msgid "The php package to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15761
+#: doc/guix.texi:15810
 #, no-wrap
 msgid "@code{socket} (default: @code{(string-append \"/var/run/php\" (version-major (package-version php)) \"-fpm.sock\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15763
+#: doc/guix.texi:15812
 msgid "The address on which to accept FastCGI requests.  Valid syntaxes are:"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:15764
+#: doc/guix.texi:15813
 #, no-wrap
 msgid "\"ip.add.re.ss:port\""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15766
+#: doc/guix.texi:15815
 msgid "Listen on a TCP socket to a specific address on a specific port."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:15766
+#: doc/guix.texi:15815
 #, no-wrap
 msgid "\"port\""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15768
+#: doc/guix.texi:15817
 msgid "Listen on a TCP socket to all addresses on a specific port."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:15768
+#: doc/guix.texi:15817
 #, no-wrap
 msgid "\"/path/to/unix/socket\""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15770
+#: doc/guix.texi:15819
 msgid "Listen on a unix socket."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15772
+#: doc/guix.texi:15821
 #, no-wrap
 msgid "@code{user} (default: @code{php-fpm})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15774
+#: doc/guix.texi:15823
 msgid "User who will own the php worker processes."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15774
+#: doc/guix.texi:15823
 #, no-wrap
 msgid "@code{group} (default: @code{php-fpm})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15776
+#: doc/guix.texi:15825
 msgid "Group of the worker processes."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15776
+#: doc/guix.texi:15825
 #, no-wrap
 msgid "@code{socket-user} (default: @code{php-fpm})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15778
+#: doc/guix.texi:15827
 msgid "User who can speak to the php-fpm socket."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15778
+#: doc/guix.texi:15827
 #, no-wrap
 msgid "@code{socket-group} (default: @code{php-fpm})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15780
+#: doc/guix.texi:15829
 msgid "Group that can speak to the php-fpm socket."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15780
+#: doc/guix.texi:15829
 #, no-wrap
 msgid "@code{pid-file} (default: @code{(string-append \"/var/run/php\" (version-major (package-version php)) \"-fpm.pid\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15783
-msgid "The process id of the php-fpm process is written to this file once the service has started."
+#: doc/guix.texi:15832
+msgid ""
+"The process id of the php-fpm process is written to this file once the "
+"service has started."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15783
+#: doc/guix.texi:15832
 #, no-wrap
 msgid "@code{log-file} (default: @code{(string-append \"/var/log/php\" (version-major (package-version php)) \"-fpm.log\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15785
+#: doc/guix.texi:15834
 msgid "Log for the php-fpm master process."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15785
+#: doc/guix.texi:15834
 #, no-wrap
 msgid "@code{process-manager} (default: @code{(php-fpm-dynamic-process-manager-configuration)})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15788
+#: doc/guix.texi:15837
 msgid "Detailed settings for the php-fpm process manager.  Must be either:"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:15789
+#: doc/guix.texi:15838
 #, no-wrap
 msgid "<php-fpm-dynamic-process-manager-configuration>"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:15790
+#: doc/guix.texi:15839
 #, no-wrap
 msgid "<php-fpm-static-process-manager-configuration>"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:15791
+#: doc/guix.texi:15840
 #, no-wrap
 msgid "<php-fpm-on-demand-process-manager-configuration>"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15793
+#: doc/guix.texi:15842
 #, no-wrap
 msgid "@code{display-errors} (default @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15798
+#: doc/guix.texi:15847
 msgid ""
-"Determines whether php errors and warning should be sent to clients and displayed in their browsers.  This is useful for local php "
-"development, but a security risk for public sites, as error messages can reveal passwords and personal data."
+"Determines whether php errors and warning should be sent to clients and "
+"displayed in their browsers.  This is useful for local php development, but "
+"a security risk for public sites, as error messages can reveal passwords and "
+"personal data."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15798
+#: doc/guix.texi:15847
 #, no-wrap
 msgid "@code{workers-logfile} (default @code{(string-append \"/var/log/php\" (version-major (package-version php)) \"-fpm.www.log\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15801
-msgid "This file will log the @code{stderr} outputs of php worker processes.  Can be set to @code{#f} to disable logging."
+#: doc/guix.texi:15850
+msgid ""
+"This file will log the @code{stderr} outputs of php worker processes.  Can "
+"be set to @code{#f} to disable logging."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15801
+#: doc/guix.texi:15850
 #, no-wrap
 msgid "@code{file} (default @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15804
+#: doc/guix.texi:15853
 msgid ""
-"An optional override of the whole configuration.  You can use the @code{mixed-text-file} function or an absolute filepath for it."
+"An optional override of the whole configuration.  You can use the "
+"@code{mixed-text-file} function or an absolute filepath for it."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:15807
+#: doc/guix.texi:15856
 #, no-wrap
 msgid "{Data type} php-fpm-dynamic-process-manager-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:15811
+#: doc/guix.texi:15860
 msgid ""
-"Data Type for the @code{dynamic} php-fpm process manager.  With the @code{dynamic} process manager, spare worker processes are kept "
-"around based on it's configured limits."
+"Data Type for the @code{dynamic} php-fpm process manager.  With the "
+"@code{dynamic} process manager, spare worker processes are kept around based "
+"on it's configured limits."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15812 doc/guix.texi:15828 doc/guix.texi:15838
+#: doc/guix.texi:15861 doc/guix.texi:15877 doc/guix.texi:15887
 #, no-wrap
 msgid "@code{max-children} (default: @code{5})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15814 doc/guix.texi:15830 doc/guix.texi:15840
+#: doc/guix.texi:15863 doc/guix.texi:15879 doc/guix.texi:15889
 msgid "Maximum of worker processes."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15814
+#: doc/guix.texi:15863
 #, no-wrap
 msgid "@code{start-servers} (default: @code{2})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15816
+#: doc/guix.texi:15865
 msgid "How many worker processes should be started on start-up."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15816
+#: doc/guix.texi:15865
 #, no-wrap
 msgid "@code{min-spare-servers} (default: @code{1})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15818
+#: doc/guix.texi:15867
 msgid "How many spare worker processes should be kept around at minimum."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15818
+#: doc/guix.texi:15867
 #, no-wrap
 msgid "@code{max-spare-servers} (default: @code{3})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15820
+#: doc/guix.texi:15869
 msgid "How many spare worker processes should be kept around at maximum."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:15823
+#: doc/guix.texi:15872
 #, no-wrap
 msgid "{Data type} php-fpm-static-process-manager-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:15827
+#: doc/guix.texi:15876
 msgid ""
-"Data Type for the @code{static} php-fpm process manager.  With the @code{static} process manager, an unchanging number of worker "
-"processes are created."
+"Data Type for the @code{static} php-fpm process manager.  With the "
+"@code{static} process manager, an unchanging number of worker processes are "
+"created."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:15833
+#: doc/guix.texi:15882
 #, no-wrap
 msgid "{Data type} php-fpm-on-demand-process-manager-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:15837
+#: doc/guix.texi:15886
 msgid ""
-"Data Type for the @code{on-demand} php-fpm process manager.  With the @code{on-demand} process manager, worker processes are only "
-"created as requests arrive."
+"Data Type for the @code{on-demand} php-fpm process manager.  With the "
+"@code{on-demand} process manager, worker processes are only created as "
+"requests arrive."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15840
+#: doc/guix.texi:15889
 #, no-wrap
 msgid "@code{process-idle-timeout} (default: @code{10})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15842
+#: doc/guix.texi:15891
 msgid "The time in seconds after which a process with no requests is killed."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:15846
+#: doc/guix.texi:15895
 #, no-wrap
 msgid "{Scheme Procedure} nginx-php-fpm-location @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:15852
+#: doc/guix.texi:15901
 msgid ""
-"[#:nginx-package nginx] @ [socket (string-append \"/var/run/php\" @ (version-major (package-version php)) @ \"-fpm.sock\")] A helper "
-"function to quickly add php to an @code{nginx-server-configuration}."
+"[#:nginx-package nginx] @ [socket (string-append \"/var/run/php\" @ (version-"
+"major (package-version php)) @ \"-fpm.sock\")] A helper function to quickly "
+"add php to an @code{nginx-server-configuration}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:15855
+#: doc/guix.texi:15904
 msgid "A simple services setup for nginx with php can look like this:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:15868
+#: doc/guix.texi:15917
 #, no-wrap
 msgid ""
 "(services (cons* (dhcp-client-service)\n"
@@ -31261,40 +35684,43 @@ msgid ""
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:15870
+#: doc/guix.texi:15919
 #, no-wrap
 msgid "cat-avatar-generator"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:15874
+#: doc/guix.texi:15923
 msgid ""
-"The cat avatar generator is a simple service to demonstrate the use of php-fpm in @code{Nginx}.  It is used to generate cat avatar "
-"from a seed, for instance the hash of a user's email address."
+"The cat avatar generator is a simple service to demonstrate the use of php-"
+"fpm in @code{Nginx}.  It is used to generate cat avatar from a seed, for "
+"instance the hash of a user's email address."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:15875
+#: doc/guix.texi:15924
 #, no-wrap
 msgid "{Scheme Procedure} cat-avatar-generator-serice @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:15883
+#: doc/guix.texi:15932
 msgid ""
-"[#:cache-dir \"/var/cache/cat-avatar-generator\"] @ [#:package cat-avatar-generator] @ [#:configuration (nginx-server-"
-"configuration)] Returns an nginx-server-configuration that inherits @code{configuration}.  It extends the nginx configuration to add "
-"a server block that serves @code{package}, a version of cat-avatar-generator.  During execution, cat-avatar-generator will be able "
-"to use @code{cache-dir} as its cache directory."
+"[#:cache-dir \"/var/cache/cat-avatar-generator\"] @ [#:package cat-avatar-"
+"generator] @ [#:configuration (nginx-server-configuration)] Returns an nginx-"
+"server-configuration that inherits @code{configuration}.  It extends the "
+"nginx configuration to add a server block that serves @code{package}, a "
+"version of cat-avatar-generator.  During execution, cat-avatar-generator "
+"will be able to use @code{cache-dir} as its cache directory."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:15886
+#: doc/guix.texi:15935
 msgid "A simple setup for cat-avatar-generator can look like this:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:15893
+#: doc/guix.texi:15942
 #, no-wrap
 msgid ""
 "(services (cons* (cat-avatar-generator-service\n"
@@ -31306,86 +35732,95 @@ msgid ""
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:15898
+#: doc/guix.texi:15947
 #, no-wrap
 msgid "Web"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:15899
+#: doc/guix.texi:15948
 #, no-wrap
 msgid "HTTP, HTTPS"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:15900
+#: doc/guix.texi:15949
 #, no-wrap
 msgid "Let's Encrypt"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:15901
+#: doc/guix.texi:15950
 #, no-wrap
 msgid "TLS certificates"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:15908
+#: doc/guix.texi:15957
 msgid ""
-"The @code{(gnu services certbot)} module provides a service to automatically obtain a valid TLS certificate from the Let's Encrypt "
-"certificate authority.  These certificates can then be used to serve content securely over HTTPS or other TLS-based protocols, with "
-"the knowledge that the client will be able to verify the server's authenticity."
+"The @code{(gnu services certbot)} module provides a service to automatically "
+"obtain a valid TLS certificate from the Let's Encrypt certificate "
+"authority.  These certificates can then be used to serve content securely "
+"over HTTPS or other TLS-based protocols, with the knowledge that the client "
+"will be able to verify the server's authenticity."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:15920
+#: doc/guix.texi:15969
 msgid ""
-"@url{https://letsencrypt.org/, Let's Encrypt} provides the @code{certbot} tool to automate the certification process.  This tool "
-"first securely generates a key on the server.  It then makes a request to the Let's Encrypt certificate authority (CA) to sign the "
-"key.  The CA checks that the request originates from the host in question by using a challenge-response protocol, requiring the "
-"server to provide its response over HTTP.  If that protocol completes successfully, the CA signs the key, resulting in a "
-"certificate.  That certificate is valid for a limited period of time, and therefore to continue to provide TLS services, the server "
-"needs to periodically ask the CA to renew its signature."
+"@url{https://letsencrypt.org/, Let's Encrypt} provides the @code{certbot} "
+"tool to automate the certification process.  This tool first securely "
+"generates a key on the server.  It then makes a request to the Let's Encrypt "
+"certificate authority (CA) to sign the key.  The CA checks that the request "
+"originates from the host in question by using a challenge-response protocol, "
+"requiring the server to provide its response over HTTP.  If that protocol "
+"completes successfully, the CA signs the key, resulting in a certificate.  "
+"That certificate is valid for a limited period of time, and therefore to "
+"continue to provide TLS services, the server needs to periodically ask the "
+"CA to renew its signature."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:15927
+#: doc/guix.texi:15976
 msgid ""
-"The certbot service automates this process: the initial key generation, the initial certification request to the Let's Encrypt "
-"service, the web server challenge/response integration, writing the certificate to disk, the automated periodic renewals, and the "
-"deployment tasks associated with the renewal (e.g. reloading services, copying keys with different permissions)."
+"The certbot service automates this process: the initial key generation, the "
+"initial certification request to the Let's Encrypt service, the web server "
+"challenge/response integration, writing the certificate to disk, the "
+"automated periodic renewals, and the deployment tasks associated with the "
+"renewal (e.g. reloading services, copying keys with different permissions)."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:15933
+#: doc/guix.texi:15982
 msgid ""
-"Certbot is run twice a day, at a random minute within the hour.  It won't do anything until your certificates are due for renewal or "
-"revoked, but running it regularly would give your service a chance of staying online in case a Let's Encrypt-initiated revocation "
-"happened for some reason."
+"Certbot is run twice a day, at a random minute within the hour.  It won't do "
+"anything until your certificates are due for renewal or revoked, but running "
+"it regularly would give your service a chance of staying online in case a "
+"Let's Encrypt-initiated revocation happened for some reason."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:15937
+#: doc/guix.texi:15986
 msgid ""
-"By using this service, you agree to the ACME Subscriber Agreement, which can be found there: @url{https://acme-v01.api.letsencrypt."
-"org/directory}."
+"By using this service, you agree to the ACME Subscriber Agreement, which can "
+"be found there: @url{https://acme-v01.api.letsencrypt.org/directory}."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:15938
+#: doc/guix.texi:15987
 #, no-wrap
 msgid "{Scheme Variable} certbot-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:15941
+#: doc/guix.texi:15990
 msgid ""
-"A service type for the @code{certbot} Let's Encrypt client.  Its value must be a @code{certbot-configuration} record as in this "
-"example:"
+"A service type for the @code{certbot} Let's Encrypt client.  Its value must "
+"be a @code{certbot-configuration} record as in this example:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:15948
+#: doc/guix.texi:15997
 #, no-wrap
 msgid ""
 "(define %nginx-deploy-hook\n"
@@ -31397,7 +35832,7 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:15959
+#: doc/guix.texi:16008
 #, no-wrap
 msgid ""
 "(service certbot-service-type\n"
@@ -31413,197 +35848,216 @@ msgid ""
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:15962
+#: doc/guix.texi:16011
 msgid "See below for details about @code{certbot-configuration}."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:15964
+#: doc/guix.texi:16013
 #, no-wrap
 msgid "{Data Type} certbot-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:15967
-msgid "Data type representing the configuration of the @code{certbot} service.  This type has the following parameters:"
+#: doc/guix.texi:16016
+msgid ""
+"Data type representing the configuration of the @code{certbot} service.  "
+"This type has the following parameters:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15969
+#: doc/guix.texi:16018
 #, no-wrap
 msgid "@code{package} (default: @code{certbot})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15971
+#: doc/guix.texi:16020
 msgid "The certbot package to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15972
+#: doc/guix.texi:16021
 #, no-wrap
 msgid "@code{webroot} (default: @code{/var/www})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15975
-msgid "The directory from which to serve the Let's Encrypt challenge/response files."
+#: doc/guix.texi:16024
+msgid ""
+"The directory from which to serve the Let's Encrypt challenge/response files."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15976
+#: doc/guix.texi:16025
 #, no-wrap
 msgid "@code{certificates} (default: @code{()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15980
+#: doc/guix.texi:16029
 msgid ""
-"A list of @code{certificates-configuration}s for which to generate certificates and request signatures.  Each certificate has a "
-"@code{name} and several @code{domains}."
+"A list of @code{certificates-configuration}s for which to generate "
+"certificates and request signatures.  Each certificate has a @code{name} and "
+"several @code{domains}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15984
-msgid "Mandatory email used for registration, recovery contact, and important account notifications."
+#: doc/guix.texi:16033
+msgid ""
+"Mandatory email used for registration, recovery contact, and important "
+"account notifications."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15985
+#: doc/guix.texi:16034
 #, no-wrap
 msgid "@code{rsa-key-size} (default: @code{2048})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15987
+#: doc/guix.texi:16036
 msgid "Size of the RSA key."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15988
+#: doc/guix.texi:16037
 #, no-wrap
 msgid "@code{default-location} (default: @i{see below})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15997
+#: doc/guix.texi:16046
 msgid ""
-"The default @code{nginx-location-configuration}.  Because @code{certbot} needs to be able to serve challenges and responses, it "
-"needs to be able to run a web server.  It does so by extending the @code{nginx} web service with an @code{nginx-server-"
-"configuration} listening on the @var{domains} on port 80, and which has a @code{nginx-location-configuration} for the @code{/.well-"
-"known/} URI path subspace used by Let's Encrypt.  @xref{Web Services}, for more on these nginx configuration data types."
+"The default @code{nginx-location-configuration}.  Because @code{certbot} "
+"needs to be able to serve challenges and responses, it needs to be able to "
+"run a web server.  It does so by extending the @code{nginx} web service with "
+"an @code{nginx-server-configuration} listening on the @var{domains} on port "
+"80, and which has a @code{nginx-location-configuration} for the @code{/.well-"
+"known/} URI path subspace used by Let's Encrypt.  @xref{Web Services}, for "
+"more on these nginx configuration data types."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16001
+#: doc/guix.texi:16050
 msgid ""
-"Requests to other URL paths will be matched by the @code{default-location}, which if present is added to all @code{nginx-server-"
-"configuration}s."
+"Requests to other URL paths will be matched by the @code{default-location}, "
+"which if present is added to all @code{nginx-server-configuration}s."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16005
+#: doc/guix.texi:16054
 msgid ""
-"By default, the @code{default-location} will issue a redirect from @code{http://@var{domain}/...} to @code{https://"
-"@var{domain}/...}, leaving you to define what to serve on your site via @code{https}."
+"By default, the @code{default-location} will issue a redirect from "
+"@code{http://@var{domain}/...} to @code{https://@var{domain}/...}, leaving "
+"you to define what to serve on your site via @code{https}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16007
+#: doc/guix.texi:16056
 msgid "Pass @code{#f} to not issue a default location."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:16010
+#: doc/guix.texi:16059
 #, no-wrap
 msgid "{Data Type} certificate-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:16013
-msgid "Data type representing the configuration of a certificate.  This type has the following parameters:"
+#: doc/guix.texi:16062
+msgid ""
+"Data type representing the configuration of a certificate.  This type has "
+"the following parameters:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16015
+#: doc/guix.texi:16064
 #, no-wrap
 msgid "@code{name} (default: @i{see below})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16019
+#: doc/guix.texi:16068
 msgid ""
-"This name is used by Certbot for housekeeping and in file paths; it doesn't affect the content of the certificate itself.  To see "
-"certificate names, run @code{certbot certificates}."
+"This name is used by Certbot for housekeeping and in file paths; it doesn't "
+"affect the content of the certificate itself.  To see certificate names, run "
+"@code{certbot certificates}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16021
+#: doc/guix.texi:16070
 msgid "Its default is the first provided domain."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16022
+#: doc/guix.texi:16071
 #, no-wrap
 msgid "@code{domains} (default: @code{()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16025
+#: doc/guix.texi:16074
 msgid ""
-"The first domain provided will be the subject CN of the certificate, and all domains will be Subject Alternative Names on the "
-"certificate."
+"The first domain provided will be the subject CN of the certificate, and all "
+"domains will be Subject Alternative Names on the certificate."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16026
+#: doc/guix.texi:16075
 #, no-wrap
 msgid "@code{deploy-hook} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16034
+#: doc/guix.texi:16083
 msgid ""
-"Command to be run in a shell once for each successfully issued certificate.  For this command, the shell variable "
-"@code{$RENEWED_LINEAGE} will point to the config live subdirectory (for example, @samp{\"/etc/letsencrypt/live/example.com\"}) "
-"containing the new certificates and keys; the shell variable @code{$RENEWED_DOMAINS} will contain a space-delimited list of renewed "
+"Command to be run in a shell once for each successfully issued certificate.  "
+"For this command, the shell variable @code{$RENEWED_LINEAGE} will point to "
+"the config live subdirectory (for example, @samp{\"/etc/letsencrypt/live/"
+"example.com\"}) containing the new certificates and keys; the shell variable "
+"@code{$RENEWED_DOMAINS} will contain a space-delimited list of renewed "
 "certificate domains (for example, @samp{\"example.com www.example.com\"}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:16041
+#: doc/guix.texi:16090
 msgid ""
-"For each @code{certificate-configuration}, the certificate is saved to @code{/etc/letsencrypt/live/@var{name}/fullchain.pem} and the "
-"key is saved to @code{/etc/letsencrypt/live/@var{name}/privkey.pem}."
+"For each @code{certificate-configuration}, the certificate is saved to "
+"@code{/etc/letsencrypt/live/@var{name}/fullchain.pem} and the key is saved "
+"to @code{/etc/letsencrypt/live/@var{name}/privkey.pem}."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:16043
+#: doc/guix.texi:16092
 #, no-wrap
 msgid "DNS (domain name system)"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:16044
+#: doc/guix.texi:16093
 #, no-wrap
 msgid "domain name system (DNS)"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:16050
+#: doc/guix.texi:16099
 msgid ""
-"The @code{(gnu services dns)} module provides services related to the @dfn{domain name system} (DNS).  It provides a server service "
-"for hosting an @emph{authoritative} DNS server for multiple zones, slave or master.  This service uses @uref{https://www.knot-dns."
-"cz/, Knot DNS}."
+"The @code{(gnu services dns)} module provides services related to the "
+"@dfn{domain name system} (DNS).  It provides a server service for hosting an "
+"@emph{authoritative} DNS server for multiple zones, slave or master.  This "
+"service uses @uref{https://www.knot-dns.cz/, Knot DNS}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:16053
-msgid "An example configuration of an authoritative server for two zones, one master and one slave, is:"
+#: doc/guix.texi:16102
+msgid ""
+"An example configuration of an authoritative server for two zones, one "
+"master and one slave, is:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:16060
+#: doc/guix.texi:16109
 #, no-wrap
 msgid ""
 "(define-zone-entries example.org.zone\n"
@@ -31615,7 +36069,7 @@ msgid ""
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:16067
+#: doc/guix.texi:16116
 #, no-wrap
 msgid ""
 "(define master-zone\n"
@@ -31628,7 +36082,7 @@ msgid ""
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:16073
+#: doc/guix.texi:16122
 #, no-wrap
 msgid ""
 "(define slave-zone\n"
@@ -31640,7 +36094,7 @@ msgid ""
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:16078
+#: doc/guix.texi:16127
 #, no-wrap
 msgid ""
 "(define plop-master\n"
@@ -31651,7 +36105,7 @@ msgid ""
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:16087
+#: doc/guix.texi:16136
 #, no-wrap
 msgid ""
 "(operating-system\n"
@@ -31665,1759 +36119,1879 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:16089
+#: doc/guix.texi:16138
 #, no-wrap
 msgid "{Scheme Variable} knot-service-type"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:16091
+#: doc/guix.texi:16140
 msgid "This is the type for the Knot DNS server."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:16099
+#: doc/guix.texi:16148
 msgid ""
-"Knot DNS is an authoritative DNS server, meaning that it can serve multiple zones, that is to say domain names you would buy from a "
-"registrar.  This server is not a resolver, meaning that it can only resolve names for which it is authoritative.  This server can be "
-"configured to serve zones as a master server or a slave server as a per-zone basis.  Slave zones will get their data from masters, "
-"and will serve it as an authoritative server.  From the point of view of a resolver, there is no difference between master and slave."
+"Knot DNS is an authoritative DNS server, meaning that it can serve multiple "
+"zones, that is to say domain names you would buy from a registrar.  This "
+"server is not a resolver, meaning that it can only resolve names for which "
+"it is authoritative.  This server can be configured to serve zones as a "
+"master server or a slave server as a per-zone basis.  Slave zones will get "
+"their data from masters, and will serve it as an authoritative server.  From "
+"the point of view of a resolver, there is no difference between master and "
+"slave."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:16101
+#: doc/guix.texi:16150
 msgid "The following data types are used to configure the Knot DNS server:"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:16103
+#: doc/guix.texi:16152
 #, no-wrap
 msgid "{Data Type} knot-key-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:16106
+#: doc/guix.texi:16155
 msgid "Data type representing a key.  This type has the following parameters:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16108 doc/guix.texi:16128 doc/guix.texi:16243 doc/guix.texi:16269 doc/guix.texi:16304
+#: doc/guix.texi:16157 doc/guix.texi:16177 doc/guix.texi:16292
+#: doc/guix.texi:16318 doc/guix.texi:16353
 #, no-wrap
 msgid "@code{id} (default: @code{\"\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16111
-msgid "An identifier for other configuration fields to refer to this key. IDs must be unique and must not be empty."
+#: doc/guix.texi:16160
+msgid ""
+"An identifier for other configuration fields to refer to this key. IDs must "
+"be unique and must not be empty."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16112
+#: doc/guix.texi:16161
 #, no-wrap
 msgid "@code{algorithm} (default: @code{#f})"
 msgstr ""
 
-#. type: table
-#: doc/guix.texi:16116
-msgid ""
-"The algorithm to use.  Choose between @code{#f}, @code{'hmac-md5}, @code{'hmac-sha1}, @code{'hmac-sha224}, @code{'hmac-sha256}, "
-"@code{'hmac-sha384} and @code{'hmac-sha512}."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:16117
-#, no-wrap
-msgid "@code{secret} (default: @code{\"\"})"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:16119
-msgid "The secret key itself."
-msgstr ""
-
-#. type: deftp
-#: doc/guix.texi:16123
-#, no-wrap
-msgid "{Data Type} knot-acl-configuration"
-msgstr ""
-
-#. type: deftp
-#: doc/guix.texi:16126
-msgid "Data type representing an Access Control List (ACL) configuration.  This type has the following parameters:"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:16131
-msgid "An identifier for ether configuration fields to refer to this key. IDs must be unique and must not be empty."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:16132 doc/guix.texi:16247
-#, no-wrap
-msgid "@code{address} (default: @code{'()})"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:16136
-msgid ""
-"An ordered list of IP addresses, network subnets, or network ranges represented with strings.  The query must match one of them.  "
-"Empty value means that address match is not required."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:16137
-#, no-wrap
-msgid "@code{key} (default: @code{'()})"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:16141
-msgid ""
-"An ordered list of references to keys represented with strings.  The string must match a key ID defined in a @code{knot-key-"
-"configuration}.  No key means that a key is not require to match that ACL."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:16142
-#, no-wrap
-msgid "@code{action} (default: @code{'()})"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:16146
-msgid ""
-"An ordered list of actions that are permitted or forbidden by this ACL.  Possible values are lists of zero or more elements from "
-"@code{'transfer}, @code{'notify} and @code{'update}."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:16147
-#, no-wrap
-msgid "@code{deny?} (default: @code{#f})"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:16150
-msgid "When true, the ACL defines restrictions.  Listed actions are forbidden.  When false, listed actions are allowed."
-msgstr ""
-
-#. type: deftp
-#: doc/guix.texi:16154
-#, no-wrap
-msgid "{Data Type} zone-entry"
-msgstr ""
-
-#. type: deftp
-#: doc/guix.texi:16157
-msgid "Data type represnting a record entry in a zone file.  This type has the following parameters:"
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:16159
-#, no-wrap
-msgid "@code{name} (default: @code{\"@@\"})"
-msgstr ""
-
 #. type: table
 #: doc/guix.texi:16165
 msgid ""
-"The name of the record.  @code{\"@@\"} refers to the origin of the zone.  Names are relative to the origin of the zone.  For "
-"example, in the @code{example.org} zone, @code{\"ns.example.org\"} actually refers to @code{ns.example.org.example.org}.  Names "
-"ending with a dot are absolute, which means that @code{\"ns.example.org.\"} refers to @code{ns.example.org}."
+"The algorithm to use.  Choose between @code{#f}, @code{'hmac-md5}, "
+"@code{'hmac-sha1}, @code{'hmac-sha224}, @code{'hmac-sha256}, @code{'hmac-"
+"sha384} and @code{'hmac-sha512}."
 msgstr ""
 
 #. type: item
 #: doc/guix.texi:16166
 #, no-wrap
-msgid "@code{ttl} (default: @code{\"\"})"
+msgid "@code{secret} (default: @code{\"\"})"
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:16168
-msgid "The Time-To-Live (TTL) of this record.  If not set, the default TTL is used."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:16169
-#, no-wrap
-msgid "@code{class} (default: @code{\"IN\"})"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:16172
-msgid "The class of the record.  Knot currently supports only @code{\"IN\"} and partially @code{\"CH\"}."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:16173
-#, no-wrap
-msgid "@code{type} (default: @code{\"A\"})"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:16177
-msgid ""
-"The type of the record.  Common types include A (IPv4 address), AAAA (IPv6 address), NS (Name Server) and MX (Mail eXchange).  Many "
-"other types are defined."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:16178
-#, no-wrap
-msgid "@code{data} (default: @code{\"\"})"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:16182
-msgid ""
-"The data contained in the record.  For instance an IP address associated with an A record, or a domain name associated with an NS "
-"record.  Remember that domain names are relative to the origin unless they end with a dot."
+msgid "The secret key itself."
 msgstr ""
 
 #. type: deftp
+#: doc/guix.texi:16172
+#, no-wrap
+msgid "{Data Type} knot-acl-configuration"
+msgstr ""
+
+#. type: deftp
+#: doc/guix.texi:16175
+msgid ""
+"Data type representing an Access Control List (ACL) configuration.  This "
+"type has the following parameters:"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:16180
+msgid ""
+"An identifier for ether configuration fields to refer to this key. IDs must "
+"be unique and must not be empty."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:16181 doc/guix.texi:16296
+#, no-wrap
+msgid "@code{address} (default: @code{'()})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:16185
+msgid ""
+"An ordered list of IP addresses, network subnets, or network ranges "
+"represented with strings.  The query must match one of them.  Empty value "
+"means that address match is not required."
+msgstr ""
+
+#. type: item
 #: doc/guix.texi:16186
 #, no-wrap
-msgid "{Data Type} zone-file"
+msgid "@code{key} (default: @code{'()})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:16190
+msgid ""
+"An ordered list of references to keys represented with strings.  The string "
+"must match a key ID defined in a @code{knot-key-configuration}.  No key "
+"means that a key is not require to match that ACL."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:16191
+#, no-wrap
+msgid "@code{action} (default: @code{'()})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:16195
+msgid ""
+"An ordered list of actions that are permitted or forbidden by this ACL.  "
+"Possible values are lists of zero or more elements from @code{'transfer}, "
+"@code{'notify} and @code{'update}."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:16196
+#, no-wrap
+msgid "@code{deny?} (default: @code{#f})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:16199
+msgid ""
+"When true, the ACL defines restrictions.  Listed actions are forbidden.  "
+"When false, listed actions are allowed."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:16189
-msgid "Data type representing the content of a zone file.  This type has the following parameters:"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:16198
-msgid ""
-"The list of entries.  The SOA record is taken care of, so you don't need to put it in the list of entries.  This list should "
-"probably contain an entry for your primary authoritative DNS server.  Other than using a list of entries directly, you can use "
-"@code{define-zone-entries} to define a object containing the list of entries more easily, that you can later pass to the "
-"@code{entries} field of the @code{zone-file}."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:16199
+#: doc/guix.texi:16203
 #, no-wrap
-msgid "@code{origin} (default: @code{\"\"})"
+msgid "{Data Type} zone-entry"
 msgstr ""
 
-#. type: table
-#: doc/guix.texi:16201
-msgid "The name of your zone.  This parameter cannot be empty."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:16202
-#, no-wrap
-msgid "@code{ns} (default: @code{\"ns\"})"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:16207
+#. type: deftp
+#: doc/guix.texi:16206
 msgid ""
-"The domain of your primary authoritative DNS server.  The name is relative to the origin, unless it ends with a dot.  It is "
-"mandatory that this primary DNS server corresponds to an NS record in the zone and that it is associated to an IP address in the "
-"list of entries."
+"Data type represnting a record entry in a zone file.  This type has the "
+"following parameters:"
 msgstr ""
 
 #. type: item
 #: doc/guix.texi:16208
 #, no-wrap
-msgid "@code{mail} (default: @code{\"hostmaster\"})"
+msgid "@code{name} (default: @code{\"@@\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16211
-msgid "An email address people can contact you at, as the owner of the zone.  This is translated as @code{<mail>@@<origin>}."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:16212
-#, no-wrap
-msgid "@code{serial} (default: @code{1})"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:16216
+#: doc/guix.texi:16214
 msgid ""
-"The serial number of the zone.  As this is used to keep track of changes by both slaves and resolvers, it is mandatory that it "
-"@emph{never} decreases.  Always increment it when you make a change in your zone."
+"The name of the record.  @code{\"@@\"} refers to the origin of the zone.  "
+"Names are relative to the origin of the zone.  For example, in the "
+"@code{example.org} zone, @code{\"ns.example.org\"} actually refers to "
+"@code{ns.example.org.example.org}.  Names ending with a dot are absolute, "
+"which means that @code{\"ns.example.org.\"} refers to @code{ns.example.org}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16217
+#: doc/guix.texi:16215
 #, no-wrap
-msgid "@code{refresh} (default: @code{(* 2 24 3600)})"
+msgid "@code{ttl} (default: @code{\"\"})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:16217
+msgid ""
+"The Time-To-Live (TTL) of this record.  If not set, the default TTL is used."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:16218
+#, no-wrap
+msgid "@code{class} (default: @code{\"IN\"})"
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:16221
 msgid ""
-"The frequency at which slaves will do a zone transfer.  This value is a number of seconds.  It can be computed by multiplications or "
-"with @code{(string->duration)}."
+"The class of the record.  Knot currently supports only @code{\"IN\"} and "
+"partially @code{\"CH\"}."
 msgstr ""
 
 #. type: item
 #: doc/guix.texi:16222
 #, no-wrap
-msgid "@code{retry} (default: @code{(* 15 60)})"
+msgid "@code{type} (default: @code{\"A\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16225
-msgid "The period after which a slave will retry to contact its master when it fails to do so a first time."
-msgstr ""
-
-#. type: item
 #: doc/guix.texi:16226
-#, no-wrap
-msgid "@code{expiry} (default: @code{(* 14 24 3600)})"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:16230
 msgid ""
-"Default TTL of records.  Existing records are considered correct for at most this amount of time.  After this period, resolvers will "
-"invalidate their cache and check again that it still exists."
+"The type of the record.  Common types include A (IPv4 address), AAAA (IPv6 "
+"address), NS (Name Server) and MX (Mail eXchange).  Many other types are "
+"defined."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16231
+#: doc/guix.texi:16227
 #, no-wrap
-msgid "@code{nx} (default: @code{3600})"
+msgid "@code{data} (default: @code{\"\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16234
-msgid "Default TTL of inexistant records.  This delay is usually short because you want your new domains to reach everyone quickly."
+#: doc/guix.texi:16231
+msgid ""
+"The data contained in the record.  For instance an IP address associated "
+"with an A record, or a domain name associated with an NS record.  Remember "
+"that domain names are relative to the origin unless they end with a dot."
+msgstr ""
+
+#. type: deftp
+#: doc/guix.texi:16235
+#, no-wrap
+msgid "{Data Type} zone-file"
 msgstr ""
 
 #. type: deftp
 #: doc/guix.texi:16238
-#, no-wrap
-msgid "{Data Type} knot-remote-configuration"
-msgstr ""
-
-#. type: deftp
-#: doc/guix.texi:16241
-msgid "Data type representing a remote configuration.  This type has the following parameters:"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:16246
-msgid "An identifier for other configuration fields to refer to this remote. IDs must be unique and must not be empty."
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:16251
 msgid ""
-"An ordered list of destination IP addresses.  Addresses are tried in sequence.  An optional port can be given with the @@ "
-"separator.  For instance: @code{(list \"1.2.3.4\" \"2.3.4.5@@53\")}.  Default port is 53."
+"Data type representing the content of a zone file.  This type has the "
+"following parameters:"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:16247
+msgid ""
+"The list of entries.  The SOA record is taken care of, so you don't need to "
+"put it in the list of entries.  This list should probably contain an entry "
+"for your primary authoritative DNS server.  Other than using a list of "
+"entries directly, you can use @code{define-zone-entries} to define a object "
+"containing the list of entries more easily, that you can later pass to the "
+"@code{entries} field of the @code{zone-file}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16252
+#: doc/guix.texi:16248
 #, no-wrap
-msgid "@code{via} (default: @code{'()})"
+msgid "@code{origin} (default: @code{\"\"})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:16250
+msgid "The name of your zone.  This parameter cannot be empty."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:16251
+#, no-wrap
+msgid "@code{ns} (default: @code{\"ns\"})"
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:16256
 msgid ""
-"An ordered list of source IP addresses.  An empty list will have Knot choose an appropriate source IP.  An optional port can be "
-"given with the @@ separator.  The default is to choose at random."
+"The domain of your primary authoritative DNS server.  The name is relative "
+"to the origin, unless it ends with a dot.  It is mandatory that this primary "
+"DNS server corresponds to an NS record in the zone and that it is associated "
+"to an IP address in the list of entries."
 msgstr ""
 
 #. type: item
 #: doc/guix.texi:16257
 #, no-wrap
-msgid "@code{key} (default: @code{#f})"
+msgid "@code{mail} (default: @code{\"hostmaster\"})"
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:16260
-msgid "A reference to a key, that is a string containing the identifier of a key defined in a @code{knot-key-configuration} field."
-msgstr ""
-
-#. type: deftp
-#: doc/guix.texi:16264
-#, no-wrap
-msgid "{Data Type} knot-keystore-configuration"
-msgstr ""
-
-#. type: deftp
-#: doc/guix.texi:16267
-msgid "Data type representing a keystore to hold dnssec keys.  This type has the following parameters:"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:16271
-msgid "The id of the keystore.  It must not be empty."
+msgid ""
+"An email address people can contact you at, as the owner of the zone.  This "
+"is translated as @code{<mail>@@<origin>}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16272
+#: doc/guix.texi:16261
 #, no-wrap
-msgid "@code{backend} (default: @code{'pem})"
+msgid "@code{serial} (default: @code{1})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:16265
+msgid ""
+"The serial number of the zone.  As this is used to keep track of changes by "
+"both slaves and resolvers, it is mandatory that it @emph{never} decreases.  "
+"Always increment it when you make a change in your zone."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:16266
+#, no-wrap
+msgid "@code{refresh} (default: @code{(* 2 24 3600)})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:16270
+msgid ""
+"The frequency at which slaves will do a zone transfer.  This value is a "
+"number of seconds.  It can be computed by multiplications or with "
+"@code{(string->duration)}."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:16271
+#, no-wrap
+msgid "@code{retry} (default: @code{(* 15 60)})"
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:16274
-msgid "The backend to store the keys in.  Can be @code{'pem} or @code{'pkcs11}."
+msgid ""
+"The period after which a slave will retry to contact its master when it "
+"fails to do so a first time."
 msgstr ""
 
 #. type: item
 #: doc/guix.texi:16275
 #, no-wrap
-msgid "@code{config} (default: @code{\"/var/lib/knot/keys/keys\"})"
+msgid "@code{expiry} (default: @code{(* 14 24 3600)})"
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:16279
 msgid ""
-"The configuration string of the backend.  An example for the PKCS#11 is: @code{\"pkcs11:token=knot;pin-value=1234 /gnu/store/.../lib/"
-"pkcs11/libsofthsm2.so\"}.  For the pem backend, the string reprensents a path in the file system."
+"Default TTL of records.  Existing records are considered correct for at most "
+"this amount of time.  After this period, resolvers will invalidate their "
+"cache and check again that it still exists."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:16280
+#, no-wrap
+msgid "@code{nx} (default: @code{3600})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:16283
+msgid ""
+"Default TTL of inexistant records.  This delay is usually short because you "
+"want your new domains to reach everyone quickly."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:16283
+#: doc/guix.texi:16287
+#, no-wrap
+msgid "{Data Type} knot-remote-configuration"
+msgstr ""
+
+#. type: deftp
+#: doc/guix.texi:16290
+msgid ""
+"Data type representing a remote configuration.  This type has the following "
+"parameters:"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:16295
+msgid ""
+"An identifier for other configuration fields to refer to this remote. IDs "
+"must be unique and must not be empty."
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:16300
+msgid ""
+"An ordered list of destination IP addresses.  Addresses are tried in "
+"sequence.  An optional port can be given with the @@ separator.  For "
+"instance: @code{(list \"1.2.3.4\" \"2.3.4.5@@53\")}.  Default port is 53."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:16301
+#, no-wrap
+msgid "@code{via} (default: @code{'()})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:16305
+msgid ""
+"An ordered list of source IP addresses.  An empty list will have Knot choose "
+"an appropriate source IP.  An optional port can be given with the @@ "
+"separator.  The default is to choose at random."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:16306
+#, no-wrap
+msgid "@code{key} (default: @code{#f})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:16309
+msgid ""
+"A reference to a key, that is a string containing the identifier of a key "
+"defined in a @code{knot-key-configuration} field."
+msgstr ""
+
+#. type: deftp
+#: doc/guix.texi:16313
+#, no-wrap
+msgid "{Data Type} knot-keystore-configuration"
+msgstr ""
+
+#. type: deftp
+#: doc/guix.texi:16316
+msgid ""
+"Data type representing a keystore to hold dnssec keys.  This type has the "
+"following parameters:"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:16320
+msgid "The id of the keystore.  It must not be empty."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:16321
+#, no-wrap
+msgid "@code{backend} (default: @code{'pem})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:16323
+msgid ""
+"The backend to store the keys in.  Can be @code{'pem} or @code{'pkcs11}."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:16324
+#, no-wrap
+msgid "@code{config} (default: @code{\"/var/lib/knot/keys/keys\"})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:16328
+msgid ""
+"The configuration string of the backend.  An example for the PKCS#11 is: "
+"@code{\"pkcs11:token=knot;pin-value=1234 /gnu/store/.../lib/pkcs11/"
+"libsofthsm2.so\"}.  For the pem backend, the string reprensents a path in "
+"the file system."
+msgstr ""
+
+#. type: deftp
+#: doc/guix.texi:16332
 #, no-wrap
 msgid "{Data Type} knot-policy-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:16287
+#: doc/guix.texi:16336
 msgid ""
-"Data type representing a dnssec policy.  Knot DNS is able to automatically sign your zones.  It can either generate and manage your "
-"keys automatically or use keys that you generate."
+"Data type representing a dnssec policy.  Knot DNS is able to automatically "
+"sign your zones.  It can either generate and manage your keys automatically "
+"or use keys that you generate."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:16294
+#: doc/guix.texi:16343
 msgid ""
-"Dnssec is usually implemented using two keys: a Key Signing Key (KSK) that is used to sign the second, and a Zone Signing Key (ZSK) "
-"that is used to sign the zone.  In order to be trusted, the KSK needs to be present in the parent zone (usually a top-level "
-"domain).  If your registrar supports dnssec, you will have to send them your KSK's hash so they can add a DS record in their zone.  "
-"This is not automated and need to be done each time you change your KSK."
+"Dnssec is usually implemented using two keys: a Key Signing Key (KSK) that "
+"is used to sign the second, and a Zone Signing Key (ZSK) that is used to "
+"sign the zone.  In order to be trusted, the KSK needs to be present in the "
+"parent zone (usually a top-level domain).  If your registrar supports "
+"dnssec, you will have to send them your KSK's hash so they can add a DS "
+"record in their zone.  This is not automated and need to be done each time "
+"you change your KSK."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:16300
+#: doc/guix.texi:16349
 msgid ""
-"The policy also defines the lifetime of keys.  Usually, ZSK can be changed easily and use weaker cryptographic functions (they use "
-"lower parameters) in order to sign records quickly, so they are changed often.  The KSK however requires manual interaction with the "
-"registrar, so they are changed less often and use stronger parameters because they sign only one record."
+"The policy also defines the lifetime of keys.  Usually, ZSK can be changed "
+"easily and use weaker cryptographic functions (they use lower parameters) in "
+"order to sign records quickly, so they are changed often.  The KSK however "
+"requires manual interaction with the registrar, so they are changed less "
+"often and use stronger parameters because they sign only one record."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:16302
+#: doc/guix.texi:16351
 msgid "This type has the following parameters:"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16306
+#: doc/guix.texi:16355
 msgid "The id of the policy.  It must not be empty."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16307
+#: doc/guix.texi:16356
 #, no-wrap
 msgid "@code{keystore} (default: @code{\"default\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16312
+#: doc/guix.texi:16361
 msgid ""
-"A reference to a keystore, that is a string containing the identifier of a keystore defined in a @code{knot-keystore-configuration} "
-"field.  The @code{\"default\"} identifier means the default keystore (a kasp database that was setup by this service)."
+"A reference to a keystore, that is a string containing the identifier of a "
+"keystore defined in a @code{knot-keystore-configuration} field.  The "
+"@code{\"default\"} identifier means the default keystore (a kasp database "
+"that was setup by this service)."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16313
+#: doc/guix.texi:16362
 #, no-wrap
 msgid "@code{manual?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16315
+#: doc/guix.texi:16364
 msgid "Whether the key management is manual or automatic."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16316
+#: doc/guix.texi:16365
 #, no-wrap
 msgid "@code{single-type-signing?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16318
+#: doc/guix.texi:16367
 msgid "When @code{#t}, use the Single-Type Signing Scheme."
 msgstr ""
 
-#. type: item
-#: doc/guix.texi:16319
-#, no-wrap
-msgid "@code{algorithm} (default: @code{\"ecdsap256sha256\"})"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:16321
-msgid "An algorithm of signing keys and issued signatures."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:16322
-#, no-wrap
-msgid "@code{ksk-size} (default: @code{256})"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:16325
-msgid "The length of the KSK.  Note that this value is correct for the default algorithm, but would be unsecure for other algorithms."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:16326
-#, no-wrap
-msgid "@code{zsk-size} (default: @code{256})"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:16329
-msgid "The length of the ZSK.  Note that this value is correct for the default algorithm, but would be unsecure for other algorithms."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:16330
-#, no-wrap
-msgid "@code{dnskey-ttl} (default: @code{'default})"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:16333
-msgid "The TTL value for DNSKEY records added into zone apex.  The special @code{'default} value means same as the zone SOA TTL."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:16334
-#, no-wrap
-msgid "@code{zsk-lifetime} (default: @code{(* 30 24 3600)})"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:16336
-msgid "The period between ZSK publication and the next rollover initiation."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:16337
-#, no-wrap
-msgid "@code{propagation-delay} (default: @code{(* 24 3600)})"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:16340
-msgid ""
-"An extra delay added for each key rollover step.  This value should be high enough to cover propagation of data from the master "
-"server to all slaves."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:16341
-#, no-wrap
-msgid "@code{rrsig-lifetime} (default: @code{(* 14 24 3600)})"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:16343
-msgid "A validity period of newly issued signatures."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:16344
-#, no-wrap
-msgid "@code{rrsig-refresh} (default: @code{(* 7 24 3600)})"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:16346
-msgid "A period how long before a signature expiration the signature will be refreshed."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:16347
-#, no-wrap
-msgid "@code{nsec3?} (default: @code{#f})"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:16349
-msgid "When @code{#t}, NSEC3 will be used instead of NSEC."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:16350
-#, no-wrap
-msgid "@code{nsec3-iterations} (default: @code{5})"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:16352
-msgid "The number of additional times the hashing is performed."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:16353
-#, no-wrap
-msgid "@code{nsec3-salt-length} (default: @code{8})"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:16356
-msgid "The length of a salt field in octets, which is appended to the original owner name before hashing."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:16357
-#, no-wrap
-msgid "@code{nsec3-salt-lifetime} (default: @code{(* 30 24 3600)})"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:16359
-msgid "The validity period of newly issued salt field."
-msgstr ""
-
-#. type: deftp
-#: doc/guix.texi:16363
-#, no-wrap
-msgid "{Data Type} knot-zone-configuration"
-msgstr ""
-
-#. type: deftp
-#: doc/guix.texi:16366
-msgid "Data type representing a zone served by Knot.  This type has the following parameters:"
-msgstr ""
-
 #. type: item
 #: doc/guix.texi:16368
 #, no-wrap
-msgid "@code{domain} (default: @code{\"\"})"
+msgid "@code{algorithm} (default: @code{\"ecdsap256sha256\"})"
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:16370
-msgid "The domain served by this configuration.  It must not be empty."
+msgid "An algorithm of signing keys and issued signatures."
 msgstr ""
 
 #. type: item
 #: doc/guix.texi:16371
 #, no-wrap
-msgid "@code{file} (default: @code{\"\"})"
+msgid "@code{ksk-size} (default: @code{256})"
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:16374
 msgid ""
-"The file where this zone is saved.  This parameter is ignored by master zones.  Empty means default location that depends on the "
-"domain name."
+"The length of the KSK.  Note that this value is correct for the default "
+"algorithm, but would be unsecure for other algorithms."
 msgstr ""
 
 #. type: item
 #: doc/guix.texi:16375
 #, no-wrap
-msgid "@code{zone} (default: @code{(zone-file)})"
+msgid "@code{zsk-size} (default: @code{256})"
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:16378
-msgid "The content of the zone file.  This parameter is ignored by slave zones.  It must contain a zone-file record."
+msgid ""
+"The length of the ZSK.  Note that this value is correct for the default "
+"algorithm, but would be unsecure for other algorithms."
 msgstr ""
 
 #. type: item
 #: doc/guix.texi:16379
 #, no-wrap
-msgid "@code{master} (default: @code{'()})"
+msgid "@code{dnskey-ttl} (default: @code{'default})"
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:16382
 msgid ""
-"A list of master remotes.  When empty, this zone is a master.  When set, this zone is a slave.  This is a list of remotes "
-"identifiers."
+"The TTL value for DNSKEY records added into zone apex.  The special "
+"@code{'default} value means same as the zone SOA TTL."
 msgstr ""
 
 #. type: item
 #: doc/guix.texi:16383
 #, no-wrap
-msgid "@code{ddns-master} (default: @code{#f})"
+msgid "@code{zsk-lifetime} (default: @code{(* 30 24 3600)})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16386
-msgid "The main master.  When empty, it defaults to the first master in the list of masters."
+#: doc/guix.texi:16385
+msgid "The period between ZSK publication and the next rollover initiation."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16387
+#: doc/guix.texi:16386
 #, no-wrap
-msgid "@code{notify} (default: @code{'()})"
+msgid "@code{propagation-delay} (default: @code{(* 24 3600)})"
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:16389
-msgid "A list of slave remote identifiers."
+msgid ""
+"An extra delay added for each key rollover step.  This value should be high "
+"enough to cover propagation of data from the master server to all slaves."
 msgstr ""
 
 #. type: item
 #: doc/guix.texi:16390
 #, no-wrap
-msgid "@code{acl} (default: @code{'()})"
+msgid "@code{rrsig-lifetime} (default: @code{(* 14 24 3600)})"
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:16392
-msgid "A list of acl identifiers."
+msgid "A validity period of newly issued signatures."
 msgstr ""
 
 #. type: item
 #: doc/guix.texi:16393
 #, no-wrap
-msgid "@code{semantic-checks?} (default: @code{#f})"
+msgid "@code{rrsig-refresh} (default: @code{(* 7 24 3600)})"
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:16395
-msgid "When set, this adds more semantic checks to the zone."
+msgid ""
+"A period how long before a signature expiration the signature will be "
+"refreshed."
 msgstr ""
 
 #. type: item
 #: doc/guix.texi:16396
 #, no-wrap
-msgid "@code{disable-any?} (default: @code{#f})"
+msgid "@code{nsec3?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:16398
-msgid "When set, this forbids queries of the ANY type."
+msgid "When @code{#t}, NSEC3 will be used instead of NSEC."
 msgstr ""
 
 #. type: item
 #: doc/guix.texi:16399
 #, no-wrap
-msgid "@code{zonefile-sync} (default: @code{0})"
+msgid "@code{nsec3-iterations} (default: @code{5})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16402
-msgid "The delay between a modification in memory and on disk.  0 means immediate synchronization."
+#: doc/guix.texi:16401
+msgid "The number of additional times the hashing is performed."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16403
+#: doc/guix.texi:16402
 #, no-wrap
-msgid "@code{serial-policy} (default: @code{'increment})"
+msgid "@code{nsec3-salt-length} (default: @code{8})"
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:16405
-msgid "A policy between @code{'increment} and @code{'unixtime}."
+msgid ""
+"The length of a salt field in octets, which is appended to the original "
+"owner name before hashing."
 msgstr ""
 
-#. type: deftp
-#: doc/guix.texi:16409
+#. type: item
+#: doc/guix.texi:16406
 #, no-wrap
-msgid "{Data Type} knot-configuration"
+msgid "@code{nsec3-salt-lifetime} (default: @code{(* 30 24 3600)})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:16408
+msgid "The validity period of newly issued salt field."
 msgstr ""
 
 #. type: deftp
 #: doc/guix.texi:16412
-msgid "Data type representing the Knot configuration.  This type has the following parameters:"
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:16414
 #, no-wrap
-msgid "@code{knot} (default: @code{knot})"
+msgid "{Data Type} knot-zone-configuration"
 msgstr ""
 
-#. type: table
-#: doc/guix.texi:16416
-msgid "The Knot package."
+#. type: deftp
+#: doc/guix.texi:16415
+msgid ""
+"Data type representing a zone served by Knot.  This type has the following "
+"parameters:"
 msgstr ""
 
 #. type: item
 #: doc/guix.texi:16417
 #, no-wrap
-msgid "@code{run-directory} (default: @code{\"/var/run/knot\"})"
+msgid "@code{domain} (default: @code{\"\"})"
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:16419
-msgid "The run directory.  This directory will be used for pid file and sockets."
+msgid "The domain served by this configuration.  It must not be empty."
 msgstr ""
 
 #. type: item
 #: doc/guix.texi:16420
 #, no-wrap
-msgid "@code{listen-v4} (default: @code{\"0.0.0.0\"})"
+msgid "@code{file} (default: @code{\"\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16422 doc/guix.texi:16425
-msgid "An ip address on which to listen."
-msgstr ""
-
-#. type: item
 #: doc/guix.texi:16423
-#, no-wrap
-msgid "@code{listen-v6} (default: @code{\"::\"})"
+msgid ""
+"The file where this zone is saved.  This parameter is ignored by master "
+"zones.  Empty means default location that depends on the domain name."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16426
+#: doc/guix.texi:16424
 #, no-wrap
-msgid "@code{listen-port} (default: @code{53})"
+msgid "@code{zone} (default: @code{(zone-file)})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16428
-msgid "A port on which to listen."
+#: doc/guix.texi:16427
+msgid ""
+"The content of the zone file.  This parameter is ignored by slave zones.  It "
+"must contain a zone-file record."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16429
+#: doc/guix.texi:16428
 #, no-wrap
-msgid "@code{keys} (default: @code{'()})"
+msgid "@code{master} (default: @code{'()})"
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:16431
-msgid "The list of knot-key-configuration used by this configuration."
+msgid ""
+"A list of master remotes.  When empty, this zone is a master.  When set, "
+"this zone is a slave.  This is a list of remotes identifiers."
 msgstr ""
 
 #. type: item
 #: doc/guix.texi:16432
 #, no-wrap
+msgid "@code{ddns-master} (default: @code{#f})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:16435
+msgid ""
+"The main master.  When empty, it defaults to the first master in the list of "
+"masters."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:16436
+#, no-wrap
+msgid "@code{notify} (default: @code{'()})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:16438
+msgid "A list of slave remote identifiers."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:16439
+#, no-wrap
+msgid "@code{acl} (default: @code{'()})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:16441
+msgid "A list of acl identifiers."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:16442
+#, no-wrap
+msgid "@code{semantic-checks?} (default: @code{#f})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:16444
+msgid "When set, this adds more semantic checks to the zone."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:16445
+#, no-wrap
+msgid "@code{disable-any?} (default: @code{#f})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:16447
+msgid "When set, this forbids queries of the ANY type."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:16448
+#, no-wrap
+msgid "@code{zonefile-sync} (default: @code{0})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:16451
+msgid ""
+"The delay between a modification in memory and on disk.  0 means immediate "
+"synchronization."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:16452
+#, no-wrap
+msgid "@code{serial-policy} (default: @code{'increment})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:16454
+msgid "A policy between @code{'increment} and @code{'unixtime}."
+msgstr ""
+
+#. type: deftp
+#: doc/guix.texi:16458
+#, no-wrap
+msgid "{Data Type} knot-configuration"
+msgstr ""
+
+#. type: deftp
+#: doc/guix.texi:16461
+msgid ""
+"Data type representing the Knot configuration.  This type has the following "
+"parameters:"
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:16463
+#, no-wrap
+msgid "@code{knot} (default: @code{knot})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:16465
+msgid "The Knot package."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:16466
+#, no-wrap
+msgid "@code{run-directory} (default: @code{\"/var/run/knot\"})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:16468
+msgid ""
+"The run directory.  This directory will be used for pid file and sockets."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:16469
+#, no-wrap
+msgid "@code{listen-v4} (default: @code{\"0.0.0.0\"})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:16471 doc/guix.texi:16474
+msgid "An ip address on which to listen."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:16472
+#, no-wrap
+msgid "@code{listen-v6} (default: @code{\"::\"})"
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:16475
+#, no-wrap
+msgid "@code{listen-port} (default: @code{53})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:16477
+msgid "A port on which to listen."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:16478
+#, no-wrap
+msgid "@code{keys} (default: @code{'()})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:16480
+msgid "The list of knot-key-configuration used by this configuration."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:16481
+#, no-wrap
 msgid "@code{acls} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16434
+#: doc/guix.texi:16483
 msgid "The list of knot-acl-configuration used by this configuration."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16435
+#: doc/guix.texi:16484
 #, no-wrap
 msgid "@code{remotes} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16437
+#: doc/guix.texi:16486
 msgid "The list of knot-remote-configuration used by this configuration."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16438
+#: doc/guix.texi:16487
 #, no-wrap
 msgid "@code{zones} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16440
+#: doc/guix.texi:16489
 msgid "The list of knot-zone-configuration used by this configuration."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:16447
+#: doc/guix.texi:16496
 #, no-wrap
 msgid "VPN (virtual private network)"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:16448
+#: doc/guix.texi:16497
 #, no-wrap
 msgid "virtual private network (VPN)"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:16454
+#: doc/guix.texi:16503
 msgid ""
-"The @code{(gnu services vpn)} module provides services related to @dfn{virtual private networks} (VPNs).  It provides a "
-"@emph{client} service for your machine to connect to a VPN, and a @emph{servire} service for your machine to host a VPN.  Both "
-"services use @uref{https://openvpn.net/, OpenVPN}."
+"The @code{(gnu services vpn)} module provides services related to "
+"@dfn{virtual private networks} (VPNs).  It provides a @emph{client} service "
+"for your machine to connect to a VPN, and a @emph{servire} service for your "
+"machine to host a VPN.  Both services use @uref{https://openvpn.net/, "
+"OpenVPN}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:16455
+#: doc/guix.texi:16504
 #, no-wrap
 msgid "{Scheme Procedure} openvpn-client-service @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:16457
+#: doc/guix.texi:16506
 msgid "[#:config (openvpn-client-configuration)]"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:16459
-msgid "Return a service that runs @command{openvpn}, a VPN daemon, as a client."
+#: doc/guix.texi:16508
+msgid ""
+"Return a service that runs @command{openvpn}, a VPN daemon, as a client."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:16461
+#: doc/guix.texi:16510
 #, no-wrap
 msgid "{Scheme Procedure} openvpn-server-service @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:16463
+#: doc/guix.texi:16512
 msgid "[#:config (openvpn-server-configuration)]"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:16465
-msgid "Return a service that runs @command{openvpn}, a VPN daemon, as a server."
+#: doc/guix.texi:16514
+msgid ""
+"Return a service that runs @command{openvpn}, a VPN daemon, as a server."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:16467
+#: doc/guix.texi:16516
 msgid "Both can be run simultaneously."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:16472
+#: doc/guix.texi:16521
 msgid "Available @code{openvpn-client-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16473
+#: doc/guix.texi:16522
 #, no-wrap
 msgid "{@code{openvpn-client-configuration} parameter} package openvpn"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16475 doc/guix.texi:16611
+#: doc/guix.texi:16524 doc/guix.texi:16660
 msgid "The OpenVPN package."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16478
+#: doc/guix.texi:16527
 #, no-wrap
 msgid "{@code{openvpn-client-configuration} parameter} string pid-file"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16480 doc/guix.texi:16616
+#: doc/guix.texi:16529 doc/guix.texi:16665
 msgid "The OpenVPN pid file."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16482 doc/guix.texi:16618
+#: doc/guix.texi:16531 doc/guix.texi:16667
 msgid "Defaults to @samp{\"/var/run/openvpn/openvpn.pid\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16485
+#: doc/guix.texi:16534
 #, no-wrap
 msgid "{@code{openvpn-client-configuration} parameter} proto proto"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16488 doc/guix.texi:16624
-msgid "The protocol (UDP or TCP) used to open a channel between clients and servers."
+#: doc/guix.texi:16537 doc/guix.texi:16673
+msgid ""
+"The protocol (UDP or TCP) used to open a channel between clients and servers."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16490 doc/guix.texi:16626
+#: doc/guix.texi:16539 doc/guix.texi:16675
 msgid "Defaults to @samp{udp}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16493
+#: doc/guix.texi:16542
 #, no-wrap
 msgid "{@code{openvpn-client-configuration} parameter} dev dev"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16495 doc/guix.texi:16631
+#: doc/guix.texi:16544 doc/guix.texi:16680
 msgid "The device type used to represent the VPN connection."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16497 doc/guix.texi:16633
+#: doc/guix.texi:16546 doc/guix.texi:16682
 msgid "Defaults to @samp{tun}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16500
+#: doc/guix.texi:16549
 #, no-wrap
 msgid "{@code{openvpn-client-configuration} parameter} string ca"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16502 doc/guix.texi:16638
+#: doc/guix.texi:16551 doc/guix.texi:16687
 msgid "The certificate authority to check connections against."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16504 doc/guix.texi:16640
+#: doc/guix.texi:16553 doc/guix.texi:16689
 msgid "Defaults to @samp{\"/etc/openvpn/ca.crt\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16507
+#: doc/guix.texi:16556
 #, no-wrap
 msgid "{@code{openvpn-client-configuration} parameter} string cert"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16510 doc/guix.texi:16646
-msgid "The certificate of the machine the daemon is running on.  It should be signed by the authority given in @code{ca}."
+#: doc/guix.texi:16559 doc/guix.texi:16695
+msgid ""
+"The certificate of the machine the daemon is running on.  It should be "
+"signed by the authority given in @code{ca}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16512 doc/guix.texi:16648
+#: doc/guix.texi:16561 doc/guix.texi:16697
 msgid "Defaults to @samp{\"/etc/openvpn/client.crt\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16515
+#: doc/guix.texi:16564
 #, no-wrap
 msgid "{@code{openvpn-client-configuration} parameter} string key"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16518 doc/guix.texi:16654
-msgid "The key of the machine the daemon is running on.  It must be the key whose certificate is @code{cert}."
+#: doc/guix.texi:16567 doc/guix.texi:16703
+msgid ""
+"The key of the machine the daemon is running on.  It must be the key whose "
+"certificate is @code{cert}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16520 doc/guix.texi:16656
+#: doc/guix.texi:16569 doc/guix.texi:16705
 msgid "Defaults to @samp{\"/etc/openvpn/client.key\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16523
+#: doc/guix.texi:16572
 #, no-wrap
 msgid "{@code{openvpn-client-configuration} parameter} boolean comp-lzo?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16525 doc/guix.texi:16661
+#: doc/guix.texi:16574 doc/guix.texi:16710
 msgid "Whether to use the lzo compression algorithm."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16530
+#: doc/guix.texi:16579
 #, no-wrap
 msgid "{@code{openvpn-client-configuration} parameter} boolean persist-key?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16532 doc/guix.texi:16668
+#: doc/guix.texi:16581 doc/guix.texi:16717
 msgid "Don't re-read key files across SIGUSR1 or --ping-restart."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16537
+#: doc/guix.texi:16586
 #, no-wrap
 msgid "{@code{openvpn-client-configuration} parameter} boolean persist-tun?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16540 doc/guix.texi:16676
-msgid "Don't close and reopen TUN/TAP device or run up/down scripts across SIGUSR1 or --ping-restart restarts."
+#: doc/guix.texi:16589 doc/guix.texi:16725
+msgid ""
+"Don't close and reopen TUN/TAP device or run up/down scripts across SIGUSR1 "
+"or --ping-restart restarts."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16545
+#: doc/guix.texi:16594
 #, no-wrap
 msgid "{@code{openvpn-client-configuration} parameter} number verbosity"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16547 doc/guix.texi:16683
+#: doc/guix.texi:16596 doc/guix.texi:16732
 msgid "Verbosity level."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16549 doc/guix.texi:16685 doc/guix.texi:17962 doc/guix.texi:18185
+#: doc/guix.texi:16598 doc/guix.texi:16734 doc/guix.texi:18011
+#: doc/guix.texi:18234
 msgid "Defaults to @samp{3}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16552
+#: doc/guix.texi:16601
 #, no-wrap
 msgid "{@code{openvpn-client-configuration} parameter} tls-auth-client tls-auth"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16555 doc/guix.texi:16691
-msgid "Add an additional layer of HMAC authentication on top of the TLS control channel to protect against DoS attacks."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:16560
-#, no-wrap
-msgid "{@code{openvpn-client-configuration} parameter} key-usage verify-key-usage?"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:16562
-msgid "Whether to check the server certificate has server usage extension."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:16567
-#, no-wrap
-msgid "{@code{openvpn-client-configuration} parameter} bind bind?"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:16569
-msgid "Bind to a specific local port number."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:16574
-#, no-wrap
-msgid "{@code{openvpn-client-configuration} parameter} resolv-retry resolv-retry?"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:16576
-msgid "Retry resolving server address."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:16581
-#, no-wrap
-msgid "{@code{openvpn-client-configuration} parameter} openvpn-remote-list remote"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:16583
-msgid "A list of remote servers to connect to."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:16587
-msgid "Available @code{openvpn-remote-configuration} fields are:"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:16588
-#, no-wrap
-msgid "{@code{openvpn-remote-configuration} parameter} string name"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:16590
-msgid "Server name."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:16592
-msgid "Defaults to @samp{\"my-server\"}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:16595
-#, no-wrap
-msgid "{@code{openvpn-remote-configuration} parameter} number port"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:16597
-msgid "Port number the server listens to."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:16599 doc/guix.texi:16700
-msgid "Defaults to @samp{1194}."
-msgstr ""
-
-#. type: Plain text
-#: doc/guix.texi:16608
-msgid "Available @code{openvpn-server-configuration} fields are:"
+#: doc/guix.texi:16604 doc/guix.texi:16740
+msgid ""
+"Add an additional layer of HMAC authentication on top of the TLS control "
+"channel to protect against DoS attacks."
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:16609
 #, no-wrap
+msgid "{@code{openvpn-client-configuration} parameter} key-usage verify-key-usage?"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:16611
+msgid "Whether to check the server certificate has server usage extension."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:16616
+#, no-wrap
+msgid "{@code{openvpn-client-configuration} parameter} bind bind?"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:16618
+msgid "Bind to a specific local port number."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:16623
+#, no-wrap
+msgid "{@code{openvpn-client-configuration} parameter} resolv-retry resolv-retry?"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:16625
+msgid "Retry resolving server address."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:16630
+#, no-wrap
+msgid "{@code{openvpn-client-configuration} parameter} openvpn-remote-list remote"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:16632
+msgid "A list of remote servers to connect to."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:16636
+msgid "Available @code{openvpn-remote-configuration} fields are:"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:16637
+#, no-wrap
+msgid "{@code{openvpn-remote-configuration} parameter} string name"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:16639
+msgid "Server name."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:16641
+msgid "Defaults to @samp{\"my-server\"}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:16644
+#, no-wrap
+msgid "{@code{openvpn-remote-configuration} parameter} number port"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:16646
+msgid "Port number the server listens to."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:16648 doc/guix.texi:16749
+msgid "Defaults to @samp{1194}."
+msgstr ""
+
+#. type: Plain text
+#: doc/guix.texi:16657
+msgid "Available @code{openvpn-server-configuration} fields are:"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:16658
+#, no-wrap
 msgid "{@code{openvpn-server-configuration} parameter} package openvpn"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16614
+#: doc/guix.texi:16663
 #, no-wrap
 msgid "{@code{openvpn-server-configuration} parameter} string pid-file"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16621
+#: doc/guix.texi:16670
 #, no-wrap
 msgid "{@code{openvpn-server-configuration} parameter} proto proto"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16629
+#: doc/guix.texi:16678
 #, no-wrap
 msgid "{@code{openvpn-server-configuration} parameter} dev dev"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16636
+#: doc/guix.texi:16685
 #, no-wrap
 msgid "{@code{openvpn-server-configuration} parameter} string ca"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16643
+#: doc/guix.texi:16692
 #, no-wrap
 msgid "{@code{openvpn-server-configuration} parameter} string cert"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16651
+#: doc/guix.texi:16700
 #, no-wrap
 msgid "{@code{openvpn-server-configuration} parameter} string key"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16659
+#: doc/guix.texi:16708
 #, no-wrap
 msgid "{@code{openvpn-server-configuration} parameter} boolean comp-lzo?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16666
+#: doc/guix.texi:16715
 #, no-wrap
 msgid "{@code{openvpn-server-configuration} parameter} boolean persist-key?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16673
+#: doc/guix.texi:16722
 #, no-wrap
 msgid "{@code{openvpn-server-configuration} parameter} boolean persist-tun?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16681
+#: doc/guix.texi:16730
 #, no-wrap
 msgid "{@code{openvpn-server-configuration} parameter} number verbosity"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16688
+#: doc/guix.texi:16737
 #, no-wrap
 msgid "{@code{openvpn-server-configuration} parameter} tls-auth-server tls-auth"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16696
+#: doc/guix.texi:16745
 #, no-wrap
 msgid "{@code{openvpn-server-configuration} parameter} number port"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16698
+#: doc/guix.texi:16747
 msgid "Specifies the port number on which the server listens."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16703
+#: doc/guix.texi:16752
 #, no-wrap
 msgid "{@code{openvpn-server-configuration} parameter} ip-mask server"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16705
+#: doc/guix.texi:16754
 msgid "An ip and mask specifying the subnet inside the virtual network."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16707
+#: doc/guix.texi:16756
 msgid "Defaults to @samp{\"10.8.0.0 255.255.255.0\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16710
+#: doc/guix.texi:16759
 #, no-wrap
 msgid "{@code{openvpn-server-configuration} parameter} cidr6 server-ipv6"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16712
+#: doc/guix.texi:16761
 msgid "A CIDR notation specifying the IPv6 subnet inside the virtual network."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16717
+#: doc/guix.texi:16766
 #, no-wrap
 msgid "{@code{openvpn-server-configuration} parameter} string dh"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16719
+#: doc/guix.texi:16768
 msgid "The Diffie-Hellman parameters file."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16721
+#: doc/guix.texi:16770
 msgid "Defaults to @samp{\"/etc/openvpn/dh2048.pem\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16724
+#: doc/guix.texi:16773
 #, no-wrap
 msgid "{@code{openvpn-server-configuration} parameter} string ifconfig-pool-persist"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16726
+#: doc/guix.texi:16775
 msgid "The file that records client IPs."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16728
+#: doc/guix.texi:16777
 msgid "Defaults to @samp{\"/etc/openvpn/ipp.txt\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16731
+#: doc/guix.texi:16780
 #, no-wrap
 msgid "{@code{openvpn-server-configuration} parameter} gateway redirect-gateway?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16733
+#: doc/guix.texi:16782
 msgid "When true, the server will act as a gateway for its clients."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16738
+#: doc/guix.texi:16787
 #, no-wrap
 msgid "{@code{openvpn-server-configuration} parameter} boolean client-to-client?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16740
+#: doc/guix.texi:16789
 msgid "When true, clients are allowed to talk to each other inside the VPN."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16745
+#: doc/guix.texi:16794
 #, no-wrap
 msgid "{@code{openvpn-server-configuration} parameter} keepalive keepalive"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16751
+#: doc/guix.texi:16800
 msgid ""
-"Causes ping-like messages to be sent back and forth over the link so that each side knows when the other side has gone down.  "
-"@code{keepalive} requires a pair.  The first element is the period of the ping sending, and the second element is the timeout before "
-"considering the other side down."
+"Causes ping-like messages to be sent back and forth over the link so that "
+"each side knows when the other side has gone down.  @code{keepalive} "
+"requires a pair.  The first element is the period of the ping sending, and "
+"the second element is the timeout before considering the other side down."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16754
+#: doc/guix.texi:16803
 #, no-wrap
 msgid "{@code{openvpn-server-configuration} parameter} number max-clients"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16756
+#: doc/guix.texi:16805
 msgid "The maximum number of clients."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16761
+#: doc/guix.texi:16810
 #, no-wrap
 msgid "{@code{openvpn-server-configuration} parameter} string status"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16764
-msgid "The status file.  This file shows a small report on current connection.  It is truncated and rewritten every minute."
+#: doc/guix.texi:16813
+msgid ""
+"The status file.  This file shows a small report on current connection.  It "
+"is truncated and rewritten every minute."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16766
+#: doc/guix.texi:16815
 msgid "Defaults to @samp{\"/var/run/openvpn/status\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16769
+#: doc/guix.texi:16818
 #, no-wrap
 msgid "{@code{openvpn-server-configuration} parameter} openvpn-ccd-list client-config-dir"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16771
+#: doc/guix.texi:16820
 msgid "The list of configuration for some clients."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16775
+#: doc/guix.texi:16824
 msgid "Available @code{openvpn-ccd-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16776
+#: doc/guix.texi:16825
 #, no-wrap
 msgid "{@code{openvpn-ccd-configuration} parameter} string name"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16778
+#: doc/guix.texi:16827
 msgid "Client name."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16780
+#: doc/guix.texi:16829
 msgid "Defaults to @samp{\"client\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16783
+#: doc/guix.texi:16832
 #, no-wrap
 msgid "{@code{openvpn-ccd-configuration} parameter} ip-mask iroute"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16785
+#: doc/guix.texi:16834
 msgid "Client own network"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16790
+#: doc/guix.texi:16839
 #, no-wrap
 msgid "{@code{openvpn-ccd-configuration} parameter} ip-mask ifconfig-push"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16792
+#: doc/guix.texi:16841
 msgid "Client VPN IP."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:16805
+#: doc/guix.texi:16854
 #, no-wrap
 msgid "NFS"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:16810
+#: doc/guix.texi:16859
 msgid ""
-"The @code{(gnu services nfs)} module provides the following services, which are most commonly used in relation to mounting or "
-"exporting directory trees as @dfn{network file systems} (NFS)."
-msgstr ""
-
-#. type: subsubheading
-#: doc/guix.texi:16811
-#, no-wrap
-msgid "RPC Bind Service"
-msgstr ""
-
-#. type: cindex
-#: doc/guix.texi:16812
-#, no-wrap
-msgid "rpcbind"
-msgstr ""
-
-#. type: Plain text
-#: doc/guix.texi:16818
-msgid ""
-"The RPC Bind service provides a facility to map program numbers into universal addresses.  Many NFS related services use this "
-"facility.  Hence it is automatically started when a dependent service starts."
-msgstr ""
-
-#. type: defvr
-#: doc/guix.texi:16819
-#, no-wrap
-msgid "{Scheme Variable} rpcbind-service-type"
-msgstr ""
-
-#. type: defvr
-#: doc/guix.texi:16821
-msgid "A service type for the RPC portmapper daemon."
-msgstr ""
-
-#. type: deftp
-#: doc/guix.texi:16824
-#, no-wrap
-msgid "{Data Type} rpcbind-configuration"
-msgstr ""
-
-#. type: deftp
-#: doc/guix.texi:16827
-msgid "Data type representing the configuration of the RPC Bind Service.  This type has the following parameters:"
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:16828
-#, no-wrap
-msgid "@code{rpcbind} (default: @code{rpcbind})"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:16830
-msgid "The rpcbind package to use."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:16831
-#, no-wrap
-msgid "@code{warm-start?} (default: @code{#t})"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:16835
-msgid ""
-"If this parameter is @code{#t}, then the daemon will read a state file on startup thus reloading state information saved by a "
-"previous instance."
-msgstr ""
-
-#. type: subsubheading
-#: doc/guix.texi:16839
-#, no-wrap
-msgid "Pipefs Pseudo File System"
-msgstr ""
-
-#. type: cindex
-#: doc/guix.texi:16840
-#, no-wrap
-msgid "pipefs"
-msgstr ""
-
-#. type: cindex
-#: doc/guix.texi:16841
-#, no-wrap
-msgid "rpc_pipefs"
-msgstr ""
-
-#. type: Plain text
-#: doc/guix.texi:16845
-msgid "The pipefs file system is used to transfer NFS related data between the kernel and user space programs."
-msgstr ""
-
-#. type: defvr
-#: doc/guix.texi:16846
-#, no-wrap
-msgid "{Scheme Variable} pipefs-service-type"
-msgstr ""
-
-#. type: defvr
-#: doc/guix.texi:16848
-msgid "A service type for the pipefs pseudo file system."
-msgstr ""
-
-#. type: deftp
-#: doc/guix.texi:16850
-#, no-wrap
-msgid "{Data Type} pipefs-configuration"
-msgstr ""
-
-#. type: deftp
-#: doc/guix.texi:16853
-msgid "Data type representing the configuration of the pipefs pseudo file system service.  This type has the following parameters:"
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:16854
-#, no-wrap
-msgid "@code{mount-point} (default: @code{\"/var/lib/nfs/rpc_pipefs\"})"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:16856
-msgid "The directory to which the file system is to be attached."
+"The @code{(gnu services nfs)} module provides the following services, which "
+"are most commonly used in relation to mounting or exporting directory trees "
+"as @dfn{network file systems} (NFS)."
 msgstr ""
 
 #. type: subsubheading
 #: doc/guix.texi:16860
 #, no-wrap
-msgid "GSS Daemon Service"
+msgid "RPC Bind Service"
 msgstr ""
 
 #. type: cindex
 #: doc/guix.texi:16861
 #, no-wrap
-msgid "GSSD"
-msgstr ""
-
-#. type: cindex
-#: doc/guix.texi:16862
-#, no-wrap
-msgid "GSS"
-msgstr ""
-
-#. type: cindex
-#: doc/guix.texi:16863
-#, no-wrap
-msgid "global security system"
+msgid "rpcbind"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:16870
+#: doc/guix.texi:16867
 msgid ""
-"The @dfn{global security system} (GSS) daemon provides strong security for RPC based protocols.  Before exchanging RPC requests an "
-"RPC client must establish a security context.  Typically this is done using the Kerberos command @command{kinit} or automatically at "
-"login time using PAM services (@pxref{Kerberos Services})."
+"The RPC Bind service provides a facility to map program numbers into "
+"universal addresses.  Many NFS related services use this facility.  Hence it "
+"is automatically started when a dependent service starts."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:16871
+#: doc/guix.texi:16868
 #, no-wrap
-msgid "{Scheme Variable} gss-service-type"
+msgid "{Scheme Variable} rpcbind-service-type"
 msgstr ""
 
 #. type: defvr
+#: doc/guix.texi:16870
+msgid "A service type for the RPC portmapper daemon."
+msgstr ""
+
+#. type: deftp
 #: doc/guix.texi:16873
-msgid "A service type for the Global Security System (GSS) daemon."
+#, no-wrap
+msgid "{Data Type} rpcbind-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:16875
-#, no-wrap
-msgid "{Data Type} gss-configuration"
-msgstr ""
-
-#. type: deftp
-#: doc/guix.texi:16878
-msgid "Data type representing the configuration of the GSS daemon service.  This type has the following parameters:"
+#: doc/guix.texi:16876
+msgid ""
+"Data type representing the configuration of the RPC Bind Service.  This type "
+"has the following parameters:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16879 doc/guix.texi:16904
+#: doc/guix.texi:16877
 #, no-wrap
-msgid "@code{nfs-utils} (default: @code{nfs-utils})"
+msgid "@code{rpcbind} (default: @code{rpcbind})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16881
-msgid "The package in which the @command{rpc.gssd} command is to be found."
+#: doc/guix.texi:16879
+msgid "The rpcbind package to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16882 doc/guix.texi:16907
+#: doc/guix.texi:16880
 #, no-wrap
-msgid "@code{pipefs-directory} (default: @code{\"/var/lib/nfs/rpc_pipefs\"})"
+msgid "@code{warm-start?} (default: @code{#t})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16884 doc/guix.texi:16909
-msgid "The directory where the pipefs file system is mounted."
+#: doc/guix.texi:16884
+msgid ""
+"If this parameter is @code{#t}, then the daemon will read a state file on "
+"startup thus reloading state information saved by a previous instance."
 msgstr ""
 
 #. type: subsubheading
+#: doc/guix.texi:16888
+#, no-wrap
+msgid "Pipefs Pseudo File System"
+msgstr ""
+
+#. type: cindex
 #: doc/guix.texi:16889
 #, no-wrap
-msgid "IDMAP Daemon Service"
+msgid "pipefs"
 msgstr ""
 
 #. type: cindex
 #: doc/guix.texi:16890
 #, no-wrap
+msgid "rpc_pipefs"
+msgstr ""
+
+#. type: Plain text
+#: doc/guix.texi:16894
+msgid ""
+"The pipefs file system is used to transfer NFS related data between the "
+"kernel and user space programs."
+msgstr ""
+
+#. type: defvr
+#: doc/guix.texi:16895
+#, no-wrap
+msgid "{Scheme Variable} pipefs-service-type"
+msgstr ""
+
+#. type: defvr
+#: doc/guix.texi:16897
+msgid "A service type for the pipefs pseudo file system."
+msgstr ""
+
+#. type: deftp
+#: doc/guix.texi:16899
+#, no-wrap
+msgid "{Data Type} pipefs-configuration"
+msgstr ""
+
+#. type: deftp
+#: doc/guix.texi:16902
+msgid ""
+"Data type representing the configuration of the pipefs pseudo file system "
+"service.  This type has the following parameters:"
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:16903
+#, no-wrap
+msgid "@code{mount-point} (default: @code{\"/var/lib/nfs/rpc_pipefs\"})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:16905
+msgid "The directory to which the file system is to be attached."
+msgstr ""
+
+#. type: subsubheading
+#: doc/guix.texi:16909
+#, no-wrap
+msgid "GSS Daemon Service"
+msgstr ""
+
+#. type: cindex
+#: doc/guix.texi:16910
+#, no-wrap
+msgid "GSSD"
+msgstr ""
+
+#. type: cindex
+#: doc/guix.texi:16911
+#, no-wrap
+msgid "GSS"
+msgstr ""
+
+#. type: cindex
+#: doc/guix.texi:16912
+#, no-wrap
+msgid "global security system"
+msgstr ""
+
+#. type: Plain text
+#: doc/guix.texi:16919
+msgid ""
+"The @dfn{global security system} (GSS) daemon provides strong security for "
+"RPC based protocols.  Before exchanging RPC requests an RPC client must "
+"establish a security context.  Typically this is done using the Kerberos "
+"command @command{kinit} or automatically at login time using PAM services "
+"(@pxref{Kerberos Services})."
+msgstr ""
+
+#. type: defvr
+#: doc/guix.texi:16920
+#, no-wrap
+msgid "{Scheme Variable} gss-service-type"
+msgstr ""
+
+#. type: defvr
+#: doc/guix.texi:16922
+msgid "A service type for the Global Security System (GSS) daemon."
+msgstr ""
+
+#. type: deftp
+#: doc/guix.texi:16924
+#, no-wrap
+msgid "{Data Type} gss-configuration"
+msgstr ""
+
+#. type: deftp
+#: doc/guix.texi:16927
+msgid ""
+"Data type representing the configuration of the GSS daemon service.  This "
+"type has the following parameters:"
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:16928 doc/guix.texi:16953
+#, no-wrap
+msgid "@code{nfs-utils} (default: @code{nfs-utils})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:16930
+msgid "The package in which the @command{rpc.gssd} command is to be found."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:16931 doc/guix.texi:16956
+#, no-wrap
+msgid "@code{pipefs-directory} (default: @code{\"/var/lib/nfs/rpc_pipefs\"})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:16933 doc/guix.texi:16958
+msgid "The directory where the pipefs file system is mounted."
+msgstr ""
+
+#. type: subsubheading
+#: doc/guix.texi:16938
+#, no-wrap
+msgid "IDMAP Daemon Service"
+msgstr ""
+
+#. type: cindex
+#: doc/guix.texi:16939
+#, no-wrap
 msgid "idmapd"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:16891
+#: doc/guix.texi:16940
 #, no-wrap
 msgid "name mapper"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:16895
+#: doc/guix.texi:16944
 msgid ""
-"The idmap daemon service provides mapping between user IDs and user names.  Typically it is required in order to access file systems "
-"mounted via NFSv4."
+"The idmap daemon service provides mapping between user IDs and user names.  "
+"Typically it is required in order to access file systems mounted via NFSv4."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:16896
+#: doc/guix.texi:16945
 #, no-wrap
 msgid "{Scheme Variable} idmap-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:16898
+#: doc/guix.texi:16947
 msgid "A service type for the Identity Mapper (IDMAP) daemon."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:16900
+#: doc/guix.texi:16949
 #, no-wrap
 msgid "{Data Type} idmap-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:16903
-msgid "Data type representing the configuration of the IDMAP daemon service.  This type has the following parameters:"
+#: doc/guix.texi:16952
+msgid ""
+"Data type representing the configuration of the IDMAP daemon service.  This "
+"type has the following parameters:"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16906
+#: doc/guix.texi:16955
 msgid "The package in which the @command{rpc.idmapd} command is to be found."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16910
+#: doc/guix.texi:16959
 #, no-wrap
 msgid "@code{domain} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16914
+#: doc/guix.texi:16963
 msgid ""
-"The local NFSv4 domain name.  This must be a string or @code{#f}.  If it is @code{#f} then the daemon will use the host's fully "
-"qualified domain name."
+"The local NFSv4 domain name.  This must be a string or @code{#f}.  If it is "
+"@code{#f} then the daemon will use the host's fully qualified domain name."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:16921
+#: doc/guix.texi:16970
 #, no-wrap
 msgid "continuous integration"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:16925
+#: doc/guix.texi:16974
 msgid ""
-"@uref{https://notabug.org/mthl/cuirass, Cuirass} is a continuous integration tool for Guix.  It can be used both for development and "
-"for providing substitutes to others (@pxref{Substitutes})."
+"@uref{https://notabug.org/mthl/cuirass, Cuirass} is a continuous integration "
+"tool for Guix.  It can be used both for development and for providing "
+"substitutes to others (@pxref{Substitutes})."
 msgstr ""
-"@uref{https://notabug.org/mthl/cuirass, Cuirass} est un outil d'intégration continue pour Guix. On peut l'utiliser aussi bien pour "
-"le développement que pour fournir des substituts à d'autres (@pxref{Substituts})."
+"@uref{https://notabug.org/mthl/cuirass, Cuirass} est un outil d'intégration "
+"continue pour Guix. On peut l'utiliser aussi bien pour le développement que "
+"pour fournir des substituts à d'autres (@pxref{Substituts})."
 
 #. type: Plain text
-#: doc/guix.texi:16927
-msgid "The @code{(gnu services cuirass)} module provides the following service."
+#: doc/guix.texi:16976
+msgid ""
+"The @code{(gnu services cuirass)} module provides the following service."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:16928
+#: doc/guix.texi:16977
 #, no-wrap
 msgid "{Scheme Procedure} cuirass-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:16931
-msgid "The type of the Cuirass service.  Its value must be a @code{cuirass-configuration} object, as described below."
+#: doc/guix.texi:16980
+msgid ""
+"The type of the Cuirass service.  Its value must be a @code{cuirass-"
+"configuration} object, as described below."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:16938
+#: doc/guix.texi:16987
 msgid ""
-"To add build jobs, you have to set the @code{specifications} field of the configuration.  Here is an example of a service defining a "
-"build job based on a specification that can be found in Cuirass source tree.  This service polls the Guix repository and builds a "
-"subset of the Guix packages, as prescribed in the @file{gnu-system.scm} example spec:"
+"To add build jobs, you have to set the @code{specifications} field of the "
+"configuration.  Here is an example of a service defining a build job based "
+"on a specification that can be found in Cuirass source tree.  This service "
+"polls the Guix repository and builds a subset of the Guix packages, as "
+"prescribed in the @file{gnu-system.scm} example spec:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:16950
+#: doc/guix.texi:16999
 #, no-wrap
 msgid ""
 "(let ((spec #~((#:name . \"guix\")\n"
@@ -33433,1114 +38007,1179 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:16955
+#: doc/guix.texi:17004
 msgid ""
-"While information related to build jobs is located directly in the specifications, global settings for the @command{cuirass} process "
-"are accessible in other @code{cuirass-configuration} fields."
+"While information related to build jobs is located directly in the "
+"specifications, global settings for the @command{cuirass} process are "
+"accessible in other @code{cuirass-configuration} fields."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:16956
+#: doc/guix.texi:17005
 #, no-wrap
 msgid "{Data Type} cuirass-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:16958
+#: doc/guix.texi:17007
 msgid "Data type representing the configuration of Cuirass."
 msgstr ""
 
-#. type: item
-#: doc/guix.texi:16960
-#, no-wrap
-msgid "@code{log-file} (default: @code{\"/var/log/cuirass.log\"})"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:16962
-msgid "Location of the log file."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:16963
-#, no-wrap
-msgid "@code{cache-directory} (default: @code{\"/var/cache/cuirass\"})"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:16965
-msgid "Location of the repository cache."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:16966
-#, no-wrap
-msgid "@code{user} (default: @code{\"cuirass\"})"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:16968
-msgid "Owner of the @code{cuirass} process."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:16969
-#, no-wrap
-msgid "@code{group} (default: @code{\"cuirass\"})"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:16971
-msgid "Owner's group of the @code{cuirass} process."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:16972
-#, no-wrap
-msgid "@code{interval} (default: @code{60})"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:16975
-msgid "Number of seconds between the poll of the repositories followed by the Cuirass jobs."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:16976
-#, no-wrap
-msgid "@code{database} (default: @code{\"/var/run/cuirass/cuirass.db\"})"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:16979
-msgid "Location of sqlite database which contains the build results and previously added specifications."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:16980
-#, no-wrap
-msgid "@code{port} (default: @code{8081})"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:16982
-msgid "Port number used by the HTTP server."
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:16986
-msgid "Listen on the network interface for @var{host}.  The default is to accept connections from localhost."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:16987
-#, no-wrap
-msgid "@code{specifications} (default: @code{#~'()})"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:16993
-msgid ""
-"A gexp (@pxref{G-Expressions}) that evaluates to a list of specifications, where a specification is an association list "
-"(@pxref{Associations Lists,,, guile, GNU Guile Reference Manual}) whose keys are keywords (@code{#:keyword-example}) as shown in the "
-"example above."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:16994
-#, no-wrap
-msgid "@code{use-substitutes?} (default: @code{#f})"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:16997
-msgid "This allows using substitutes to avoid building every dependencies of a job from source."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:16998
-#, no-wrap
-msgid "@code{one-shot?} (default: @code{#f})"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:17000
-msgid "Only evaluate specifications and build derivations once."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:17001
-#, no-wrap
-msgid "@code{fallback?} (default: @code{#f})"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:17004
-msgid "When substituting a pre-built binary fails, fall back to building packages locally."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:17005
-#, no-wrap
-msgid "@code{load-path} (default: @code{'()})"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:17008
-msgid "This allows users to define their own packages and make them visible to cuirass as in @command{guix build} command."
-msgstr ""
-
 #. type: item
 #: doc/guix.texi:17009
 #, no-wrap
-msgid "@code{cuirass} (default: @code{cuirass})"
+msgid "@code{log-file} (default: @code{\"/var/log/cuirass.log\"})"
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:17011
+msgid "Location of the log file."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:17012
+#, no-wrap
+msgid "@code{cache-directory} (default: @code{\"/var/cache/cuirass\"})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:17014
+msgid "Location of the repository cache."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:17015
+#, no-wrap
+msgid "@code{user} (default: @code{\"cuirass\"})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:17017
+msgid "Owner of the @code{cuirass} process."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:17018
+#, no-wrap
+msgid "@code{group} (default: @code{\"cuirass\"})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:17020
+msgid "Owner's group of the @code{cuirass} process."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:17021
+#, no-wrap
+msgid "@code{interval} (default: @code{60})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:17024
+msgid ""
+"Number of seconds between the poll of the repositories followed by the "
+"Cuirass jobs."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:17025
+#, no-wrap
+msgid "@code{database} (default: @code{\"/var/run/cuirass/cuirass.db\"})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:17028
+msgid ""
+"Location of sqlite database which contains the build results and previously "
+"added specifications."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:17029
+#, no-wrap
+msgid "@code{port} (default: @code{8081})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:17031
+msgid "Port number used by the HTTP server."
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:17035
+msgid ""
+"Listen on the network interface for @var{host}.  The default is to accept "
+"connections from localhost."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:17036
+#, no-wrap
+msgid "@code{specifications} (default: @code{#~'()})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:17042
+msgid ""
+"A gexp (@pxref{G-Expressions}) that evaluates to a list of specifications, "
+"where a specification is an association list (@pxref{Associations Lists,,, "
+"guile, GNU Guile Reference Manual}) whose keys are keywords (@code{#:keyword-"
+"example}) as shown in the example above."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:17043
+#, no-wrap
+msgid "@code{use-substitutes?} (default: @code{#f})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:17046
+msgid ""
+"This allows using substitutes to avoid building every dependencies of a job "
+"from source."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:17047
+#, no-wrap
+msgid "@code{one-shot?} (default: @code{#f})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:17049
+msgid "Only evaluate specifications and build derivations once."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:17050
+#, no-wrap
+msgid "@code{fallback?} (default: @code{#f})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:17053
+msgid ""
+"When substituting a pre-built binary fails, fall back to building packages "
+"locally."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:17054
+#, no-wrap
+msgid "@code{load-path} (default: @code{'()})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:17057
+msgid ""
+"This allows users to define their own packages and make them visible to "
+"cuirass as in @command{guix build} command."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:17058
+#, no-wrap
+msgid "@code{cuirass} (default: @code{cuirass})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:17060
 msgid "The Cuirass package to use."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:17017
+#: doc/guix.texi:17066
 #, no-wrap
 msgid "power management with TLP"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:17020
-msgid "The @code{(gnu services pm)} module provides a Guix service definition for the Linux power management tool TLP."
+#: doc/guix.texi:17069
+msgid ""
+"The @code{(gnu services pm)} module provides a Guix service definition for "
+"the Linux power management tool TLP."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:17026
+#: doc/guix.texi:17075
 msgid ""
-"TLP enables various powersaving modes in userspace and kernel.  Contrary to @code{upower-service}, it is not a passive, monitoring "
-"tool, as it will apply custom settings each time a new power source is detected.  More information can be found at @uref{http://"
-"linrunner.de/en/tlp/tlp.html, TLP home page}."
+"TLP enables various powersaving modes in userspace and kernel.  Contrary to "
+"@code{upower-service}, it is not a passive, monitoring tool, as it will "
+"apply custom settings each time a new power source is detected.  More "
+"information can be found at @uref{http://linrunner.de/en/tlp/tlp.html, TLP "
+"home page}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:17027
+#: doc/guix.texi:17076
 #, no-wrap
 msgid "{Scheme Variable} tlp-service-type"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:17031
+#: doc/guix.texi:17080
 msgid ""
-"The service type for the TLP tool.  Its value should be a valid TLP configuration (see below).  To use the default settings, simply "
-"write:"
+"The service type for the TLP tool.  Its value should be a valid TLP "
+"configuration (see below).  To use the default settings, simply write:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:17033
+#: doc/guix.texi:17082
 #, no-wrap
 msgid "(service tlp-service-type)\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:17038
-msgid "By default TLP does not need much configuration but most TLP parameters can be tweaked using @code{tlp-configuration}."
-msgstr ""
-
-#. type: Plain text
-#: doc/guix.texi:17044
-msgid ""
-"Each parameter definition is preceded by its type; for example, @samp{boolean foo} indicates that the @code{foo} parameter should be "
-"specified as a boolean.  Types starting with @code{maybe-} denote parameters that won't show up in TLP config file when their value "
-"is @code{'disabled}."
-msgstr ""
-
-#. type: Plain text
-#: doc/guix.texi:17054
-msgid "Available @code{tlp-configuration} fields are:"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:17055
-#, no-wrap
-msgid "{@code{tlp-configuration} parameter} package tlp"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:17057
-msgid "The TLP package."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:17060
-#, no-wrap
-msgid "{@code{tlp-configuration} parameter} boolean tlp-enable?"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:17062
-msgid "Set to true if you wish to enable TLP."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:17067
-#, no-wrap
-msgid "{@code{tlp-configuration} parameter} string tlp-default-mode"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:17070
-msgid "Default mode when no power supply can be detected.  Alternatives are AC and BAT."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:17072
-msgid "Defaults to @samp{\"AC\"}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:17075
-#, no-wrap
-msgid "{@code{tlp-configuration} parameter} non-negative-integer disk-idle-secs-on-ac"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:17078
-msgid "Number of seconds Linux kernel has to wait after the disk goes idle, before syncing on AC."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:17083
-#, no-wrap
-msgid "{@code{tlp-configuration} parameter} non-negative-integer disk-idle-secs-on-bat"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:17085
-msgid "Same as @code{disk-idle-ac} but on BAT mode."
-msgstr ""
-
-#. type: deftypevr
 #: doc/guix.texi:17087
-msgid "Defaults to @samp{2}."
+msgid ""
+"By default TLP does not need much configuration but most TLP parameters can "
+"be tweaked using @code{tlp-configuration}."
 msgstr ""
 
-#. type: deftypevr
-#: doc/guix.texi:17090
-#, no-wrap
-msgid "{@code{tlp-configuration} parameter} non-negative-integer max-lost-work-secs-on-ac"
+#. type: Plain text
+#: doc/guix.texi:17093
+msgid ""
+"Each parameter definition is preceded by its type; for example, "
+"@samp{boolean foo} indicates that the @code{foo} parameter should be "
+"specified as a boolean.  Types starting with @code{maybe-} denote parameters "
+"that won't show up in TLP config file when their value is @code{'disabled}."
 msgstr ""
 
-#. type: deftypevr
-#: doc/guix.texi:17092
-msgid "Dirty pages flushing periodicity, expressed in seconds."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:17094 doc/guix.texi:17317 doc/guix.texi:18631 doc/guix.texi:18639
-msgid "Defaults to @samp{15}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:17097
-#, no-wrap
-msgid "{@code{tlp-configuration} parameter} non-negative-integer max-lost-work-secs-on-bat"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:17099
-msgid "Same as @code{max-lost-work-secs-on-ac} but on BAT mode."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:17101
-msgid "Defaults to @samp{60}."
+#. type: Plain text
+#: doc/guix.texi:17103
+msgid "Available @code{tlp-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:17104
 #, no-wrap
+msgid "{@code{tlp-configuration} parameter} package tlp"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:17106
+msgid "The TLP package."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:17109
+#, no-wrap
+msgid "{@code{tlp-configuration} parameter} boolean tlp-enable?"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:17111
+msgid "Set to true if you wish to enable TLP."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:17116
+#, no-wrap
+msgid "{@code{tlp-configuration} parameter} string tlp-default-mode"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:17119
+msgid ""
+"Default mode when no power supply can be detected.  Alternatives are AC and "
+"BAT."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:17121
+msgid "Defaults to @samp{\"AC\"}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:17124
+#, no-wrap
+msgid "{@code{tlp-configuration} parameter} non-negative-integer disk-idle-secs-on-ac"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:17127
+msgid ""
+"Number of seconds Linux kernel has to wait after the disk goes idle, before "
+"syncing on AC."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:17132
+#, no-wrap
+msgid "{@code{tlp-configuration} parameter} non-negative-integer disk-idle-secs-on-bat"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:17134
+msgid "Same as @code{disk-idle-ac} but on BAT mode."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:17136
+msgid "Defaults to @samp{2}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:17139
+#, no-wrap
+msgid "{@code{tlp-configuration} parameter} non-negative-integer max-lost-work-secs-on-ac"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:17141
+msgid "Dirty pages flushing periodicity, expressed in seconds."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:17143 doc/guix.texi:17366 doc/guix.texi:18683
+#: doc/guix.texi:18691
+msgid "Defaults to @samp{15}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:17146
+#, no-wrap
+msgid "{@code{tlp-configuration} parameter} non-negative-integer max-lost-work-secs-on-bat"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:17148
+msgid "Same as @code{max-lost-work-secs-on-ac} but on BAT mode."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:17150
+msgid "Defaults to @samp{60}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:17153
+#, no-wrap
 msgid "{@code{tlp-configuration} parameter} maybe-space-separated-string-list cpu-scaling-governor-on-ac"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17108
+#: doc/guix.texi:17157
 msgid ""
-"CPU frequency scaling governor on AC mode.  With intel_pstate driver, alternatives are powersave and performance.  With acpi-cpufreq "
-"driver, alternatives are ondemand, powersave, performance and conservative."
+"CPU frequency scaling governor on AC mode.  With intel_pstate driver, "
+"alternatives are powersave and performance.  With acpi-cpufreq driver, "
+"alternatives are ondemand, powersave, performance and conservative."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17110 doc/guix.texi:17117 doc/guix.texi:17124 doc/guix.texi:17131 doc/guix.texi:17138 doc/guix.texi:17145
-#: doc/guix.texi:17153 doc/guix.texi:17161 doc/guix.texi:17168 doc/guix.texi:17175 doc/guix.texi:17182 doc/guix.texi:17189
-#: doc/guix.texi:17219 doc/guix.texi:17257 doc/guix.texi:17264 doc/guix.texi:17273 doc/guix.texi:17295 doc/guix.texi:17303
-#: doc/guix.texi:17310 doc/guix.texi:17465 doc/guix.texi:17485 doc/guix.texi:17500 doc/guix.texi:17507
+#: doc/guix.texi:17159 doc/guix.texi:17166 doc/guix.texi:17173
+#: doc/guix.texi:17180 doc/guix.texi:17187 doc/guix.texi:17194
+#: doc/guix.texi:17202 doc/guix.texi:17210 doc/guix.texi:17217
+#: doc/guix.texi:17224 doc/guix.texi:17231 doc/guix.texi:17238
+#: doc/guix.texi:17268 doc/guix.texi:17306 doc/guix.texi:17313
+#: doc/guix.texi:17322 doc/guix.texi:17344 doc/guix.texi:17352
+#: doc/guix.texi:17359 doc/guix.texi:17514 doc/guix.texi:17534
+#: doc/guix.texi:17549 doc/guix.texi:17556
 msgid "Defaults to @samp{disabled}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17113
+#: doc/guix.texi:17162
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} maybe-space-separated-string-list cpu-scaling-governor-on-bat"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17115
+#: doc/guix.texi:17164
 msgid "Same as @code{cpu-scaling-governor-on-ac} but on BAT mode."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17120
+#: doc/guix.texi:17169
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} maybe-non-negative-integer cpu-scaling-min-freq-on-ac"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17122
+#: doc/guix.texi:17171
 msgid "Set the min available frequency for the scaling governor on AC."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17127
+#: doc/guix.texi:17176
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} maybe-non-negative-integer cpu-scaling-max-freq-on-ac"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17129
+#: doc/guix.texi:17178
 msgid "Set the max available frequency for the scaling governor on AC."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17134
+#: doc/guix.texi:17183
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} maybe-non-negative-integer cpu-scaling-min-freq-on-bat"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17136
+#: doc/guix.texi:17185
 msgid "Set the min available frequency for the scaling governor on BAT."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17141
+#: doc/guix.texi:17190
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} maybe-non-negative-integer cpu-scaling-max-freq-on-bat"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17143
+#: doc/guix.texi:17192
 msgid "Set the max available frequency for the scaling governor on BAT."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17148
+#: doc/guix.texi:17197
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} maybe-non-negative-integer cpu-min-perf-on-ac"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17151
+#: doc/guix.texi:17200
 msgid ""
-"Limit the min P-state to control the power dissipation of the CPU, in AC mode.  Values are stated as a percentage of the available "
-"performance."
+"Limit the min P-state to control the power dissipation of the CPU, in AC "
+"mode.  Values are stated as a percentage of the available performance."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17156
+#: doc/guix.texi:17205
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} maybe-non-negative-integer cpu-max-perf-on-ac"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17159
+#: doc/guix.texi:17208
 msgid ""
-"Limit the max P-state to control the power dissipation of the CPU, in AC mode.  Values are stated as a percentage of the available "
-"performance."
+"Limit the max P-state to control the power dissipation of the CPU, in AC "
+"mode.  Values are stated as a percentage of the available performance."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17164
+#: doc/guix.texi:17213
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} maybe-non-negative-integer cpu-min-perf-on-bat"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17166
+#: doc/guix.texi:17215
 msgid "Same as @code{cpu-min-perf-on-ac} on BAT mode."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17171
+#: doc/guix.texi:17220
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} maybe-non-negative-integer cpu-max-perf-on-bat"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17173
+#: doc/guix.texi:17222
 msgid "Same as @code{cpu-max-perf-on-ac} on BAT mode."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17178
+#: doc/guix.texi:17227
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} maybe-boolean cpu-boost-on-ac?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17180
+#: doc/guix.texi:17229
 msgid "Enable CPU turbo boost feature on AC mode."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17185
+#: doc/guix.texi:17234
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} maybe-boolean cpu-boost-on-bat?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17187
+#: doc/guix.texi:17236
 msgid "Same as @code{cpu-boost-on-ac?} on BAT mode."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17192
+#: doc/guix.texi:17241
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} boolean sched-powersave-on-ac?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17195
-msgid "Allow Linux kernel to minimize the number of CPU cores/hyper-threads used under light load conditions."
+#: doc/guix.texi:17244
+msgid ""
+"Allow Linux kernel to minimize the number of CPU cores/hyper-threads used "
+"under light load conditions."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17200
+#: doc/guix.texi:17249
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} boolean sched-powersave-on-bat?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17202
+#: doc/guix.texi:17251
 msgid "Same as @code{sched-powersave-on-ac?} but on BAT mode."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17207
+#: doc/guix.texi:17256
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} boolean nmi-watchdog?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17209
+#: doc/guix.texi:17258
 msgid "Enable Linux kernel NMI watchdog."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17214
+#: doc/guix.texi:17263
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} maybe-string phc-controls"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17217
-msgid "For Linux kernels with PHC patch applied, change CPU voltages.  An example value would be @samp{\"F:V F:V F:V F:V\"}."
+#: doc/guix.texi:17266
+msgid ""
+"For Linux kernels with PHC patch applied, change CPU voltages.  An example "
+"value would be @samp{\"F:V F:V F:V F:V\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17222
+#: doc/guix.texi:17271
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} string energy-perf-policy-on-ac"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17225
-msgid "Set CPU performance versus energy saving policy on AC.  Alternatives are performance, normal, powersave."
+#: doc/guix.texi:17274
+msgid ""
+"Set CPU performance versus energy saving policy on AC.  Alternatives are "
+"performance, normal, powersave."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17227 doc/guix.texi:17325 doc/guix.texi:17355
+#: doc/guix.texi:17276 doc/guix.texi:17374 doc/guix.texi:17404
 msgid "Defaults to @samp{\"performance\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17230
+#: doc/guix.texi:17279
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} string energy-perf-policy-on-bat"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17232
+#: doc/guix.texi:17281
 msgid "Same as @code{energy-perf-policy-ac} but on BAT mode."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17234 doc/guix.texi:17332
+#: doc/guix.texi:17283 doc/guix.texi:17381
 msgid "Defaults to @samp{\"powersave\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17237
+#: doc/guix.texi:17286
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} space-separated-string-list disks-devices"
 msgstr ""
 
-#. type: deftypevr
-#: doc/guix.texi:17239
-msgid "Hard disk devices."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:17242
-#, no-wrap
-msgid "{@code{tlp-configuration} parameter} space-separated-string-list disk-apm-level-on-ac"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:17244
-msgid "Hard disk advanced power management level."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:17247
-#, no-wrap
-msgid "{@code{tlp-configuration} parameter} space-separated-string-list disk-apm-level-on-bat"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:17249
-msgid "Same as @code{disk-apm-bat} but on BAT mode."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:17252
-#, no-wrap
-msgid "{@code{tlp-configuration} parameter} maybe-space-separated-string-list disk-spindown-timeout-on-ac"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:17255
-msgid "Hard disk spin down timeout.  One value has to be specified for each declared hard disk."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:17260
-#, no-wrap
-msgid "{@code{tlp-configuration} parameter} maybe-space-separated-string-list disk-spindown-timeout-on-bat"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:17262
-msgid "Same as @code{disk-spindown-timeout-on-ac} but on BAT mode."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:17267
-#, no-wrap
-msgid "{@code{tlp-configuration} parameter} maybe-space-separated-string-list disk-iosched"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:17271
-msgid ""
-"Select IO scheduler for disk devices.  One value has to be specified for each declared hard disk.  Example alternatives are cfq, "
-"deadline and noop."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:17276
-#, no-wrap
-msgid "{@code{tlp-configuration} parameter} string sata-linkpwr-on-ac"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:17279
-msgid "SATA aggressive link power management (ALPM) level.  Alternatives are min_power, medium_power, max_performance."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:17281
-msgid "Defaults to @samp{\"max_performance\"}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:17284
-#, no-wrap
-msgid "{@code{tlp-configuration} parameter} string sata-linkpwr-on-bat"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:17286
-msgid "Same as @code{sata-linkpwr-ac} but on BAT mode."
-msgstr ""
-
 #. type: deftypevr
 #: doc/guix.texi:17288
-msgid "Defaults to @samp{\"min_power\"}."
+msgid "Hard disk devices."
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:17291
 #, no-wrap
-msgid "{@code{tlp-configuration} parameter} maybe-string sata-linkpwr-blacklist"
+msgid "{@code{tlp-configuration} parameter} space-separated-string-list disk-apm-level-on-ac"
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:17293
-msgid "Exclude specified SATA host devices for link power management."
+msgid "Hard disk advanced power management level."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:17296
+#, no-wrap
+msgid "{@code{tlp-configuration} parameter} space-separated-string-list disk-apm-level-on-bat"
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:17298
+msgid "Same as @code{disk-apm-bat} but on BAT mode."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:17301
+#, no-wrap
+msgid "{@code{tlp-configuration} parameter} maybe-space-separated-string-list disk-spindown-timeout-on-ac"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:17304
+msgid ""
+"Hard disk spin down timeout.  One value has to be specified for each "
+"declared hard disk."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:17309
+#, no-wrap
+msgid "{@code{tlp-configuration} parameter} maybe-space-separated-string-list disk-spindown-timeout-on-bat"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:17311
+msgid "Same as @code{disk-spindown-timeout-on-ac} but on BAT mode."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:17316
+#, no-wrap
+msgid "{@code{tlp-configuration} parameter} maybe-space-separated-string-list disk-iosched"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:17320
+msgid ""
+"Select IO scheduler for disk devices.  One value has to be specified for "
+"each declared hard disk.  Example alternatives are cfq, deadline and noop."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:17325
+#, no-wrap
+msgid "{@code{tlp-configuration} parameter} string sata-linkpwr-on-ac"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:17328
+msgid ""
+"SATA aggressive link power management (ALPM) level.  Alternatives are "
+"min_power, medium_power, max_performance."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:17330
+msgid "Defaults to @samp{\"max_performance\"}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:17333
+#, no-wrap
+msgid "{@code{tlp-configuration} parameter} string sata-linkpwr-on-bat"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:17335
+msgid "Same as @code{sata-linkpwr-ac} but on BAT mode."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:17337
+msgid "Defaults to @samp{\"min_power\"}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:17340
+#, no-wrap
+msgid "{@code{tlp-configuration} parameter} maybe-string sata-linkpwr-blacklist"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:17342
+msgid "Exclude specified SATA host devices for link power management."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:17347
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} maybe-on-off-boolean ahci-runtime-pm-on-ac?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17301
-msgid "Enable Runtime Power Management for AHCI controller and disks on AC mode."
+#: doc/guix.texi:17350
+msgid ""
+"Enable Runtime Power Management for AHCI controller and disks on AC mode."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17306
+#: doc/guix.texi:17355
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} maybe-on-off-boolean ahci-runtime-pm-on-bat?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17308
+#: doc/guix.texi:17357
 msgid "Same as @code{ahci-runtime-pm-on-ac} on BAT mode."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17313
+#: doc/guix.texi:17362
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} non-negative-integer ahci-runtime-pm-timeout"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17315
+#: doc/guix.texi:17364
 msgid "Seconds of inactivity before disk is suspended."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17320
+#: doc/guix.texi:17369
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} string pcie-aspm-on-ac"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17323
-msgid "PCI Express Active State Power Management level.  Alternatives are default, performance, powersave."
+#: doc/guix.texi:17372
+msgid ""
+"PCI Express Active State Power Management level.  Alternatives are default, "
+"performance, powersave."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17328
+#: doc/guix.texi:17377
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} string pcie-aspm-on-bat"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17330
+#: doc/guix.texi:17379
 msgid "Same as @code{pcie-aspm-ac} but on BAT mode."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17335
+#: doc/guix.texi:17384
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} string radeon-power-profile-on-ac"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17338
-msgid "Radeon graphics clock speed level.  Alternatives are low, mid, high, auto, default."
+#: doc/guix.texi:17387
+msgid ""
+"Radeon graphics clock speed level.  Alternatives are low, mid, high, auto, "
+"default."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17340
+#: doc/guix.texi:17389
 msgid "Defaults to @samp{\"high\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17343
+#: doc/guix.texi:17392
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} string radeon-power-profile-on-bat"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17345
+#: doc/guix.texi:17394
 msgid "Same as @code{radeon-power-ac} but on BAT mode."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17347
+#: doc/guix.texi:17396
 msgid "Defaults to @samp{\"low\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17350
+#: doc/guix.texi:17399
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} string radeon-dpm-state-on-ac"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17353
-msgid "Radeon dynamic power management method (DPM).  Alternatives are battery, performance."
+#: doc/guix.texi:17402
+msgid ""
+"Radeon dynamic power management method (DPM).  Alternatives are battery, "
+"performance."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17358
+#: doc/guix.texi:17407
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} string radeon-dpm-state-on-bat"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17360
+#: doc/guix.texi:17409
 msgid "Same as @code{radeon-dpm-state-ac} but on BAT mode."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17362
+#: doc/guix.texi:17411
 msgid "Defaults to @samp{\"battery\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17365
+#: doc/guix.texi:17414
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} string radeon-dpm-perf-level-on-ac"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17367
+#: doc/guix.texi:17416
 msgid "Radeon DPM performance level.  Alternatives are auto, low, high."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17369 doc/guix.texi:17376 doc/guix.texi:17450
+#: doc/guix.texi:17418 doc/guix.texi:17425 doc/guix.texi:17499
 msgid "Defaults to @samp{\"auto\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17372
+#: doc/guix.texi:17421
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} string radeon-dpm-perf-level-on-bat"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17374
+#: doc/guix.texi:17423
 msgid "Same as @code{radeon-dpm-perf-ac} but on BAT mode."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17379
+#: doc/guix.texi:17428
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} on-off-boolean wifi-pwr-on-ac?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17381
+#: doc/guix.texi:17430
 msgid "Wifi power saving mode."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17386
+#: doc/guix.texi:17435
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} on-off-boolean wifi-pwr-on-bat?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17388
+#: doc/guix.texi:17437
 msgid "Same as @code{wifi-power-ac?} but on BAT mode."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17393
+#: doc/guix.texi:17442
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} y-n-boolean wol-disable?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17395
+#: doc/guix.texi:17444
 msgid "Disable wake on LAN."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17400
+#: doc/guix.texi:17449
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} non-negative-integer sound-power-save-on-ac"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17403
+#: doc/guix.texi:17452
 msgid ""
-"Timeout duration in seconds before activating audio power saving on Intel HDA and AC97 devices.  A value of 0 disables power saving."
+"Timeout duration in seconds before activating audio power saving on Intel "
+"HDA and AC97 devices.  A value of 0 disables power saving."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17408
+#: doc/guix.texi:17457
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} non-negative-integer sound-power-save-on-bat"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17410
+#: doc/guix.texi:17459
 msgid "Same as @code{sound-powersave-ac} but on BAT mode."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17412 doc/guix.texi:17927 doc/guix.texi:18071
+#: doc/guix.texi:17461 doc/guix.texi:17976 doc/guix.texi:18120
 msgid "Defaults to @samp{1}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17415
+#: doc/guix.texi:17464
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} y-n-boolean sound-power-save-controller?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17417
+#: doc/guix.texi:17466
 msgid "Disable controller in powersaving mode on Intel HDA devices."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17422
+#: doc/guix.texi:17471
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} boolean bay-poweroff-on-bat?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17426
+#: doc/guix.texi:17475
 msgid ""
-"Enable optical drive in UltraBay/MediaBay on BAT mode.  Drive can be powered on again by releasing (and reinserting) the eject lever "
-"or by pressing the disc eject button on newer models."
+"Enable optical drive in UltraBay/MediaBay on BAT mode.  Drive can be powered "
+"on again by releasing (and reinserting) the eject lever or by pressing the "
+"disc eject button on newer models."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17431
+#: doc/guix.texi:17480
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} string bay-device"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17433
+#: doc/guix.texi:17482
 msgid "Name of the optical drive device to power off."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17435
+#: doc/guix.texi:17484
 msgid "Defaults to @samp{\"sr0\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17438
+#: doc/guix.texi:17487
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} string runtime-pm-on-ac"
 msgstr ""
 
-#. type: deftypevr
-#: doc/guix.texi:17441
-msgid "Runtime Power Management for PCI(e) bus devices.  Alternatives are on and auto."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:17443
-msgid "Defaults to @samp{\"on\"}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:17446
-#, no-wrap
-msgid "{@code{tlp-configuration} parameter} string runtime-pm-on-bat"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:17448
-msgid "Same as @code{runtime-pm-ac} but on BAT mode."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:17453
-#, no-wrap
-msgid "{@code{tlp-configuration} parameter} boolean runtime-pm-all?"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:17456
-msgid "Runtime Power Management for all PCI(e) bus devices, except blacklisted ones."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:17461
-#, no-wrap
-msgid "{@code{tlp-configuration} parameter} maybe-space-separated-string-list runtime-pm-blacklist"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:17463
-msgid "Exclude specified PCI(e) device addresses from Runtime Power Management."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:17468
-#, no-wrap
-msgid "{@code{tlp-configuration} parameter} space-separated-string-list runtime-pm-driver-blacklist"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:17471
-msgid "Exclude PCI(e) devices assigned to the specified drivers from Runtime Power Management."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:17474
-#, no-wrap
-msgid "{@code{tlp-configuration} parameter} boolean usb-autosuspend?"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:17476
-msgid "Enable USB autosuspend feature."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:17481
-#, no-wrap
-msgid "{@code{tlp-configuration} parameter} maybe-string usb-blacklist"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:17483
-msgid "Exclude specified devices from USB autosuspend."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:17488
-#, no-wrap
-msgid "{@code{tlp-configuration} parameter} boolean usb-blacklist-wwan?"
-msgstr ""
-
 #. type: deftypevr
 #: doc/guix.texi:17490
-msgid "Exclude WWAN devices from USB autosuspend."
+msgid ""
+"Runtime Power Management for PCI(e) bus devices.  Alternatives are on and "
+"auto."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:17492
+msgid "Defaults to @samp{\"on\"}."
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:17495
 #, no-wrap
-msgid "{@code{tlp-configuration} parameter} maybe-string usb-whitelist"
+msgid "{@code{tlp-configuration} parameter} string runtime-pm-on-bat"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17498
-msgid ""
-"Include specified devices into USB autosuspend, even if they are already excluded by the driver or via @code{usb-blacklist-wwan?}."
+#: doc/guix.texi:17497
+msgid "Same as @code{runtime-pm-ac} but on BAT mode."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17503
+#: doc/guix.texi:17502
 #, no-wrap
-msgid "{@code{tlp-configuration} parameter} maybe-boolean usb-autosuspend-disable-on-shutdown?"
+msgid "{@code{tlp-configuration} parameter} boolean runtime-pm-all?"
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:17505
-msgid "Enable USB autosuspend before shutdown."
+msgid ""
+"Runtime Power Management for all PCI(e) bus devices, except blacklisted ones."
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:17510
 #, no-wrap
+msgid "{@code{tlp-configuration} parameter} maybe-space-separated-string-list runtime-pm-blacklist"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:17512
+msgid ""
+"Exclude specified PCI(e) device addresses from Runtime Power Management."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:17517
+#, no-wrap
+msgid "{@code{tlp-configuration} parameter} space-separated-string-list runtime-pm-driver-blacklist"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:17520
+msgid ""
+"Exclude PCI(e) devices assigned to the specified drivers from Runtime Power "
+"Management."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:17523
+#, no-wrap
+msgid "{@code{tlp-configuration} parameter} boolean usb-autosuspend?"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:17525
+msgid "Enable USB autosuspend feature."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:17530
+#, no-wrap
+msgid "{@code{tlp-configuration} parameter} maybe-string usb-blacklist"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:17532
+msgid "Exclude specified devices from USB autosuspend."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:17537
+#, no-wrap
+msgid "{@code{tlp-configuration} parameter} boolean usb-blacklist-wwan?"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:17539
+msgid "Exclude WWAN devices from USB autosuspend."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:17544
+#, no-wrap
+msgid "{@code{tlp-configuration} parameter} maybe-string usb-whitelist"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:17547
+msgid ""
+"Include specified devices into USB autosuspend, even if they are already "
+"excluded by the driver or via @code{usb-blacklist-wwan?}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:17552
+#, no-wrap
+msgid "{@code{tlp-configuration} parameter} maybe-boolean usb-autosuspend-disable-on-shutdown?"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:17554
+msgid "Enable USB autosuspend before shutdown."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:17559
+#, no-wrap
 msgid "{@code{tlp-configuration} parameter} boolean restore-device-state-on-startup?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17513
-msgid "Restore radio device state (bluetooth, wifi, wwan) from previous shutdown on system startup."
+#: doc/guix.texi:17562
+msgid ""
+"Restore radio device state (bluetooth, wifi, wwan) from previous shutdown on "
+"system startup."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:17521
+#: doc/guix.texi:17570
 msgid ""
-"The @code{(gnu services pm)} module provides an interface to thermald, a CPU frequency scaling service which helps prevent "
-"overheating."
+"The @code{(gnu services pm)} module provides an interface to thermald, a CPU "
+"frequency scaling service which helps prevent overheating."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:17522
+#: doc/guix.texi:17571
 #, no-wrap
 msgid "{Scheme Variable} thermald-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:17527
+#: doc/guix.texi:17576
 msgid ""
-"This is the service type for @uref{https://01.org/linux-thermal-daemon/, thermald}, the Linux Thermal Daemon, which is responsible "
-"for controlling the thermal state of processors and preventing overheating."
+"This is the service type for @uref{https://01.org/linux-thermal-daemon/, "
+"thermald}, the Linux Thermal Daemon, which is responsible for controlling "
+"the thermal state of processors and preventing overheating."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:17529
+#: doc/guix.texi:17578
 #, no-wrap
 msgid "{Data Type} thermald-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:17531
-msgid "Data type representing the configuration of @code{thermald-service-type}."
+#: doc/guix.texi:17580
+msgid ""
+"Data type representing the configuration of @code{thermald-service-type}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:17533
+#: doc/guix.texi:17582
 #, no-wrap
 msgid "@code{ignore-cpuid-check?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17535
+#: doc/guix.texi:17584
 msgid "Ignore cpuid check for supported CPU models."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:17536
+#: doc/guix.texi:17585
 #, no-wrap
 msgid "@code{thermald} (default: @var{thermald})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17538
+#: doc/guix.texi:17587
 msgid "Package object of thermald."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:17547
-msgid "The @code{(gnu services audio)} module provides a service to start MPD (the Music Player Daemon)."
+#: doc/guix.texi:17596
+msgid ""
+"The @code{(gnu services audio)} module provides a service to start MPD (the "
+"Music Player Daemon)."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:17548
+#: doc/guix.texi:17597
 #, no-wrap
 msgid "mpd"
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:17549
+#: doc/guix.texi:17598
 #, no-wrap
 msgid "Music Player Daemon"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:17554
+#: doc/guix.texi:17603
 msgid ""
-"The Music Player Daemon (MPD) is a service that can play music while being controlled from the local machine or over the network by "
-"a variety of clients."
+"The Music Player Daemon (MPD) is a service that can play music while being "
+"controlled from the local machine or over the network by a variety of "
+"clients."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:17557
+#: doc/guix.texi:17606
 msgid ""
-"The following example shows how one might run @code{mpd} as user @code{\"bob\"} on port @code{6666}.  It uses pulseaudio for output."
+"The following example shows how one might run @code{mpd} as user @code{\"bob"
+"\"} on port @code{6666}.  It uses pulseaudio for output."
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:17563
+#: doc/guix.texi:17612
 #, no-wrap
 msgid ""
 "(service mpd-service-type\n"
@@ -34550,121 +39189,127 @@ msgid ""
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:17565
+#: doc/guix.texi:17614
 #, no-wrap
 msgid "{Scheme Variable} mpd-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:17567
+#: doc/guix.texi:17616
 msgid "The service type for @command{mpd}"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:17569
+#: doc/guix.texi:17618
 #, no-wrap
 msgid "{Data Type} mpd-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:17571
+#: doc/guix.texi:17620
 msgid "Data type representing the configuration of @command{mpd}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:17573
+#: doc/guix.texi:17622
 #, no-wrap
 msgid "@code{user} (default: @code{\"mpd\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17575
+#: doc/guix.texi:17624
 msgid "The user to run mpd as."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:17576
+#: doc/guix.texi:17625
 #, no-wrap
 msgid "@code{music-dir} (default: @code{\"~/Music\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17578
+#: doc/guix.texi:17627
 msgid "The directory to scan for music files."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:17579
+#: doc/guix.texi:17628
 #, no-wrap
 msgid "@code{playlist-dir} (default: @code{\"~/.mpd/playlists\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17581
+#: doc/guix.texi:17630
 msgid "The directory to store playlists."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:17582
+#: doc/guix.texi:17631
 #, no-wrap
 msgid "@code{port} (default: @code{\"6600\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17584
+#: doc/guix.texi:17633
 msgid "The port to run mpd on."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:17585
+#: doc/guix.texi:17634
 #, no-wrap
 msgid "@code{address} (default: @code{\"any\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17588
-msgid "The address that mpd will bind to.  To use a Unix domain socket, an absolute path can be specified here."
+#: doc/guix.texi:17637
+msgid ""
+"The address that mpd will bind to.  To use a Unix domain socket, an absolute "
+"path can be specified here."
 msgstr ""
 
 #. type: subsubsection
-#: doc/guix.texi:17593
+#: doc/guix.texi:17642
 #, no-wrap
 msgid "Virtualization services"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:17598
+#: doc/guix.texi:17647
 msgid ""
-"The @code{(gnu services virtualization)} module provides services for the libvirt and virtlog daemons, as well as other "
-"virtualization-related services."
+"The @code{(gnu services virtualization)} module provides services for the "
+"libvirt and virtlog daemons, as well as other virtualization-related "
+"services."
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:17599
+#: doc/guix.texi:17648
 #, no-wrap
 msgid "Libvirt daemon"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:17603
+#: doc/guix.texi:17652
 msgid ""
-"@code{libvirtd} is the server side daemon component of the libvirt virtualization management system. This daemon runs on host "
-"servers and performs required management tasks for virtualized guests."
+"@code{libvirtd} is the server side daemon component of the libvirt "
+"virtualization management system. This daemon runs on host servers and "
+"performs required management tasks for virtualized guests."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:17604
+#: doc/guix.texi:17653
 #, no-wrap
 msgid "{Scheme Variable} libvirt-service-type"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:17607
-msgid "This is the type of the @uref{https://libvirt.org, libvirt daemon}.  Its value must be a @code{libvirt-configuration}."
+#: doc/guix.texi:17656
+msgid ""
+"This is the type of the @uref{https://libvirt.org, libvirt daemon}.  Its "
+"value must be a @code{libvirt-configuration}."
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:17613
+#: doc/guix.texi:17662
 #, no-wrap
 msgid ""
 "(service libvirt-service-type\n"
@@ -34674,918 +39319,995 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:17618
+#: doc/guix.texi:17667
 msgid "Available @code{libvirt-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17619
+#: doc/guix.texi:17668
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} package libvirt"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17621
+#: doc/guix.texi:17670
 msgid "Libvirt package."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17624
+#: doc/guix.texi:17673
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} boolean listen-tls?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17627
-msgid "Flag listening for secure TLS connections on the public TCP/IP port.  must set @code{listen} for this to have any effect."
+#: doc/guix.texi:17676
+msgid ""
+"Flag listening for secure TLS connections on the public TCP/IP port.  must "
+"set @code{listen} for this to have any effect."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17630
-msgid "It is necessary to setup a CA and issue server certificates before using this capability."
+#: doc/guix.texi:17679
+msgid ""
+"It is necessary to setup a CA and issue server certificates before using "
+"this capability."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17635
+#: doc/guix.texi:17684
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} boolean listen-tcp?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17638
-msgid "Listen for unencrypted TCP connections on the public TCP/IP port.  must set @code{listen} for this to have any effect."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:17642
+#: doc/guix.texi:17687
 msgid ""
-"Using the TCP socket requires SASL authentication by default.  Only SASL mechanisms which support data encryption are allowed.  This "
-"is DIGEST_MD5 and GSSAPI (Kerberos5)"
+"Listen for unencrypted TCP connections on the public TCP/IP port.  must set "
+"@code{listen} for this to have any effect."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17647
+#: doc/guix.texi:17691
+msgid ""
+"Using the TCP socket requires SASL authentication by default.  Only SASL "
+"mechanisms which support data encryption are allowed.  This is DIGEST_MD5 "
+"and GSSAPI (Kerberos5)"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:17696
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} string tls-port"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17650
-msgid "Port for accepting secure TLS connections This can be a port number, or service name"
+#: doc/guix.texi:17699
+msgid ""
+"Port for accepting secure TLS connections This can be a port number, or "
+"service name"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17652
+#: doc/guix.texi:17701
 msgid "Defaults to @samp{\"16514\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17655
+#: doc/guix.texi:17704
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} string tcp-port"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17658
-msgid "Port for accepting insecure TCP connections This can be a port number, or service name"
+#: doc/guix.texi:17707
+msgid ""
+"Port for accepting insecure TCP connections This can be a port number, or "
+"service name"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17660
+#: doc/guix.texi:17709
 msgid "Defaults to @samp{\"16509\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17663
+#: doc/guix.texi:17712
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} string listen-addr"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17665
+#: doc/guix.texi:17714
 msgid "IP address or hostname used for client connections."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17667
+#: doc/guix.texi:17716
 msgid "Defaults to @samp{\"0.0.0.0\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17670
+#: doc/guix.texi:17719
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} boolean mdns-adv?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17672
+#: doc/guix.texi:17721
 msgid "Flag toggling mDNS advertisement of the libvirt service."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17675
-msgid "Alternatively can disable for all services on a host by stopping the Avahi daemon."
+#: doc/guix.texi:17724
+msgid ""
+"Alternatively can disable for all services on a host by stopping the Avahi "
+"daemon."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17680
+#: doc/guix.texi:17729
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} string mdns-name"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17683
-msgid "Default mDNS advertisement name.  This must be unique on the immediate broadcast network."
+#: doc/guix.texi:17732
+msgid ""
+"Default mDNS advertisement name.  This must be unique on the immediate "
+"broadcast network."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17685
+#: doc/guix.texi:17734
 msgid "Defaults to @samp{\"Virtualization Host <hostname>\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17688
+#: doc/guix.texi:17737
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} string unix-sock-group"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17692
+#: doc/guix.texi:17741
 msgid ""
-"UNIX domain socket group ownership.  This can be used to allow a 'trusted' set of users access to management capabilities without "
-"becoming root."
+"UNIX domain socket group ownership.  This can be used to allow a 'trusted' "
+"set of users access to management capabilities without becoming root."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17694
+#: doc/guix.texi:17743
 msgid "Defaults to @samp{\"root\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17697
+#: doc/guix.texi:17746
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} string unix-sock-ro-perms"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17700
-msgid "UNIX socket permissions for the R/O socket.  This is used for monitoring VM status only."
+#: doc/guix.texi:17749
+msgid ""
+"UNIX socket permissions for the R/O socket.  This is used for monitoring VM "
+"status only."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17702 doc/guix.texi:17720
+#: doc/guix.texi:17751 doc/guix.texi:17769
 msgid "Defaults to @samp{\"0777\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17705
+#: doc/guix.texi:17754
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} string unix-sock-rw-perms"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17709
+#: doc/guix.texi:17758
 msgid ""
-"UNIX socket permissions for the R/W socket.  Default allows only root.  If PolicyKit is enabled on the socket, the default will "
-"change to allow everyone (eg, 0777)"
+"UNIX socket permissions for the R/W socket.  Default allows only root.  If "
+"PolicyKit is enabled on the socket, the default will change to allow "
+"everyone (eg, 0777)"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17711
+#: doc/guix.texi:17760
 msgid "Defaults to @samp{\"0770\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17714
+#: doc/guix.texi:17763
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} string unix-sock-admin-perms"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17718
+#: doc/guix.texi:17767
 msgid ""
-"UNIX socket permissions for the admin socket.  Default allows only owner (root), do not change it unless you are sure to whom you "
-"are exposing the access to."
+"UNIX socket permissions for the admin socket.  Default allows only owner "
+"(root), do not change it unless you are sure to whom you are exposing the "
+"access to."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17723
+#: doc/guix.texi:17772
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} string unix-sock-dir"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17725
+#: doc/guix.texi:17774
 msgid "The directory in which sockets will be found/created."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17727
+#: doc/guix.texi:17776
 msgid "Defaults to @samp{\"/var/run/libvirt\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17730
+#: doc/guix.texi:17779
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} string auth-unix-ro"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17733
-msgid "Authentication scheme for UNIX read-only sockets.  By default socket permissions allow anyone to connect"
+#: doc/guix.texi:17782
+msgid ""
+"Authentication scheme for UNIX read-only sockets.  By default socket "
+"permissions allow anyone to connect"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17735 doc/guix.texi:17744
+#: doc/guix.texi:17784 doc/guix.texi:17793
 msgid "Defaults to @samp{\"polkit\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17738
+#: doc/guix.texi:17787
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} string auth-unix-rw"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17742
+#: doc/guix.texi:17791
 msgid ""
-"Authentication scheme for UNIX read-write sockets.  By default socket permissions only allow root.  If PolicyKit support was "
-"compiled into libvirt, the default will be to use 'polkit' auth."
+"Authentication scheme for UNIX read-write sockets.  By default socket "
+"permissions only allow root.  If PolicyKit support was compiled into "
+"libvirt, the default will be to use 'polkit' auth."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17747
+#: doc/guix.texi:17796
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} string auth-tcp"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17751
+#: doc/guix.texi:17800
 msgid ""
-"Authentication scheme for TCP sockets.  If you don't enable SASL, then all TCP traffic is cleartext.  Don't do this outside of a dev/"
-"test scenario."
+"Authentication scheme for TCP sockets.  If you don't enable SASL, then all "
+"TCP traffic is cleartext.  Don't do this outside of a dev/test scenario."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17753
+#: doc/guix.texi:17802
 msgid "Defaults to @samp{\"sasl\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17756
+#: doc/guix.texi:17805
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} string auth-tls"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17760
+#: doc/guix.texi:17809
 msgid ""
-"Authentication scheme for TLS sockets.  TLS sockets already have encryption provided by the TLS layer, and limited authentication is "
-"done by certificates."
+"Authentication scheme for TLS sockets.  TLS sockets already have encryption "
+"provided by the TLS layer, and limited authentication is done by "
+"certificates."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17763
-msgid "It is possible to make use of any SASL authentication mechanism as well, by using 'sasl' for this option"
+#: doc/guix.texi:17812
+msgid ""
+"It is possible to make use of any SASL authentication mechanism as well, by "
+"using 'sasl' for this option"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17765
+#: doc/guix.texi:17814
 msgid "Defaults to @samp{\"none\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17768
+#: doc/guix.texi:17817
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} optional-list access-drivers"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17770
+#: doc/guix.texi:17819
 msgid "API access control scheme."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17773
-msgid "By default an authenticated user is allowed access to all APIs.  Access drivers can place restrictions on this."
+#: doc/guix.texi:17822
+msgid ""
+"By default an authenticated user is allowed access to all APIs.  Access "
+"drivers can place restrictions on this."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17778
+#: doc/guix.texi:17827
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} string key-file"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17781
-msgid "Server key file path.  If set to an empty string, then no private key is loaded."
+#: doc/guix.texi:17830
+msgid ""
+"Server key file path.  If set to an empty string, then no private key is "
+"loaded."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17786
+#: doc/guix.texi:17835
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} string cert-file"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17789
-msgid "Server key file path.  If set to an empty string, then no certificate is loaded."
+#: doc/guix.texi:17838
+msgid ""
+"Server key file path.  If set to an empty string, then no certificate is "
+"loaded."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17794
+#: doc/guix.texi:17843
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} string ca-file"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17797
-msgid "Server key file path.  If set to an empty string, then no CA certificate is loaded."
+#: doc/guix.texi:17846
+msgid ""
+"Server key file path.  If set to an empty string, then no CA certificate is "
+"loaded."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17802
+#: doc/guix.texi:17851
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} string crl-file"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17805
-msgid "Certificate revocation list path.  If set to an empty string, then no CRL is loaded."
+#: doc/guix.texi:17854
+msgid ""
+"Certificate revocation list path.  If set to an empty string, then no CRL is "
+"loaded."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17810
+#: doc/guix.texi:17859
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} boolean tls-no-sanity-cert"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17812
+#: doc/guix.texi:17861
 msgid "Disable verification of our own server certificates."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17815
-msgid "When libvirtd starts it performs some sanity checks against its own certificates."
+#: doc/guix.texi:17864
+msgid ""
+"When libvirtd starts it performs some sanity checks against its own "
+"certificates."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17820
+#: doc/guix.texi:17869
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} boolean tls-no-verify-cert"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17822
+#: doc/guix.texi:17871
 msgid "Disable verification of client certificates."
 msgstr ""
 
-#. type: deftypevr
-#: doc/guix.texi:17826
-msgid ""
-"Client certificate verification is the primary authentication mechanism.  Any client which does not present a certificate signed by "
-"the CA will be rejected."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:17831
-#, no-wrap
-msgid "{@code{libvirt-configuration} parameter} optional-list tls-allowed-dn-list"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:17833
-msgid "Whitelist of allowed x509 Distinguished Name."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:17838
-#, no-wrap
-msgid "{@code{libvirt-configuration} parameter} optional-list sasl-allowed-usernames"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:17841
-msgid "Whitelist of allowed SASL usernames.  The format for username depends on the SASL authentication mechanism."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:17846
-#, no-wrap
-msgid "{@code{libvirt-configuration} parameter} string tls-priority"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:17850
-msgid ""
-"Override the compile time default TLS priority string.  The default is usually \"NORMAL\" unless overridden at build time.  Only set "
-"this is it is desired for libvirt to deviate from the global default settings."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:17852
-msgid "Defaults to @samp{\"NORMAL\"}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:17855
-#, no-wrap
-msgid "{@code{libvirt-configuration} parameter} integer max-clients"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:17858 doc/guix.texi:18281
-msgid "Maximum number of concurrent client connections to allow over all sockets combined."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:17860
-msgid "Defaults to @samp{5000}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:17863
-#, no-wrap
-msgid "{@code{libvirt-configuration} parameter} integer max-queued-clients"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:17867
-msgid ""
-"Maximum length of queue of connections waiting to be accepted by the daemon.  Note, that some protocols supporting retransmission "
-"may obey this so that a later reattempt at connection succeeds."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:17872
-#, no-wrap
-msgid "{@code{libvirt-configuration} parameter} integer max-anonymous-clients"
-msgstr ""
-
 #. type: deftypevr
 #: doc/guix.texi:17875
-msgid "Maximum length of queue of accepted but not yet authenticated clients.  Set this to zero to turn this feature off"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:17877 doc/guix.texi:17895 doc/guix.texi:17911
-msgid "Defaults to @samp{20}."
+msgid ""
+"Client certificate verification is the primary authentication mechanism.  "
+"Any client which does not present a certificate signed by the CA will be "
+"rejected."
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:17880
 #, no-wrap
-msgid "{@code{libvirt-configuration} parameter} integer min-workers"
+msgid "{@code{libvirt-configuration} parameter} optional-list tls-allowed-dn-list"
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:17882
-msgid "Number of workers to start up initially."
+msgid "Whitelist of allowed x509 Distinguished Name."
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:17887
 #, no-wrap
+msgid "{@code{libvirt-configuration} parameter} optional-list sasl-allowed-usernames"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:17890
+msgid ""
+"Whitelist of allowed SASL usernames.  The format for username depends on the "
+"SASL authentication mechanism."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:17895
+#, no-wrap
+msgid "{@code{libvirt-configuration} parameter} string tls-priority"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:17899
+msgid ""
+"Override the compile time default TLS priority string.  The default is "
+"usually \"NORMAL\" unless overridden at build time.  Only set this is it is "
+"desired for libvirt to deviate from the global default settings."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:17901
+msgid "Defaults to @samp{\"NORMAL\"}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:17904
+#, no-wrap
+msgid "{@code{libvirt-configuration} parameter} integer max-clients"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:17907 doc/guix.texi:18330
+msgid ""
+"Maximum number of concurrent client connections to allow over all sockets "
+"combined."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:17909
+msgid "Defaults to @samp{5000}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:17912
+#, no-wrap
+msgid "{@code{libvirt-configuration} parameter} integer max-queued-clients"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:17916
+msgid ""
+"Maximum length of queue of connections waiting to be accepted by the "
+"daemon.  Note, that some protocols supporting retransmission may obey this "
+"so that a later reattempt at connection succeeds."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:17921
+#, no-wrap
+msgid "{@code{libvirt-configuration} parameter} integer max-anonymous-clients"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:17924
+msgid ""
+"Maximum length of queue of accepted but not yet authenticated clients.  Set "
+"this to zero to turn this feature off"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:17926 doc/guix.texi:17944 doc/guix.texi:17960
+msgid "Defaults to @samp{20}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:17929
+#, no-wrap
+msgid "{@code{libvirt-configuration} parameter} integer min-workers"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:17931
+msgid "Number of workers to start up initially."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:17936
+#, no-wrap
 msgid "{@code{libvirt-configuration} parameter} integer max-workers"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17889
+#: doc/guix.texi:17938
 msgid "Maximum number of worker threads."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17893
+#: doc/guix.texi:17942
 msgid ""
-"If the number of active clients exceeds @code{min-workers}, then more threads are spawned, up to max_workers limit.  Typically you'd "
-"want max_workers to equal maximum number of clients allowed."
+"If the number of active clients exceeds @code{min-workers}, then more "
+"threads are spawned, up to max_workers limit.  Typically you'd want "
+"max_workers to equal maximum number of clients allowed."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17898
+#: doc/guix.texi:17947
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} integer prio-workers"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17902
+#: doc/guix.texi:17951
 msgid ""
-"Number of priority workers.  If all workers from above pool are stuck, some calls marked as high priority (notably domainDestroy) "
-"can be executed in this pool."
+"Number of priority workers.  If all workers from above pool are stuck, some "
+"calls marked as high priority (notably domainDestroy) can be executed in "
+"this pool."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17907
+#: doc/guix.texi:17956
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} integer max-requests"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17909
+#: doc/guix.texi:17958
 msgid "Total global limit on concurrent RPC calls."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17914
+#: doc/guix.texi:17963
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} integer max-client-requests"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17918
+#: doc/guix.texi:17967
 msgid ""
-"Limit on concurrent requests from a single client connection.  To avoid one client monopolizing the server this should be a small "
-"fraction of the global max_requests and max_workers parameter."
+"Limit on concurrent requests from a single client connection.  To avoid one "
+"client monopolizing the server this should be a small fraction of the global "
+"max_requests and max_workers parameter."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17923
+#: doc/guix.texi:17972
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} integer admin-min-workers"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17925
+#: doc/guix.texi:17974
 msgid "Same as @code{min-workers} but for the admin interface."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17930
+#: doc/guix.texi:17979
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} integer admin-max-workers"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17932
+#: doc/guix.texi:17981
 msgid "Same as @code{max-workers} but for the admin interface."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17937
+#: doc/guix.texi:17986
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} integer admin-max-clients"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17939
+#: doc/guix.texi:17988
 msgid "Same as @code{max-clients} but for the admin interface."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17944
+#: doc/guix.texi:17993
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} integer admin-max-queued-clients"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17946
+#: doc/guix.texi:17995
 msgid "Same as @code{max-queued-clients} but for the admin interface."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17951
+#: doc/guix.texi:18000
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} integer admin-max-client-requests"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17953
+#: doc/guix.texi:18002
 msgid "Same as @code{max-client-requests} but for the admin interface."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17958
+#: doc/guix.texi:18007
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} integer log-level"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17960 doc/guix.texi:18183
+#: doc/guix.texi:18009 doc/guix.texi:18232
 msgid "Logging level.  4 errors, 3 warnings, 2 information, 1 debug."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17965
+#: doc/guix.texi:18014
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} string log-filters"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17967 doc/guix.texi:18190
+#: doc/guix.texi:18016 doc/guix.texi:18239
 msgid "Logging filters."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17970 doc/guix.texi:18193
-msgid "A filter allows to select a different logging level for a given category of logs The format for a filter is one of:"
+#: doc/guix.texi:18019 doc/guix.texi:18242
+msgid ""
+"A filter allows to select a different logging level for a given category of "
+"logs The format for a filter is one of:"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:17974 doc/guix.texi:18197
+#: doc/guix.texi:18023 doc/guix.texi:18246
 msgid "x:name"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:17977 doc/guix.texi:18200
+#: doc/guix.texi:18026 doc/guix.texi:18249
 msgid "x:+name"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17987 doc/guix.texi:18210
+#: doc/guix.texi:18036 doc/guix.texi:18259
 msgid ""
-"where @code{name} is a string which is matched against the category given in the @code{VIR_LOG_INIT()} at the top of each libvirt "
-"source file, e.g., \"remote\", \"qemu\", or \"util.json\" (the name in the filter can be a substring of the full category name, in "
-"order to match multiple similar categories), the optional \"+\" prefix tells libvirt to log stack trace for each message matching "
-"name, and @code{x} is the minimal level where matching messages should be logged:"
+"where @code{name} is a string which is matched against the category given in "
+"the @code{VIR_LOG_INIT()} at the top of each libvirt source file, e.g., "
+"\"remote\", \"qemu\", or \"util.json\" (the name in the filter can be a "
+"substring of the full category name, in order to match multiple similar "
+"categories), the optional \"+\" prefix tells libvirt to log stack trace for "
+"each message matching name, and @code{x} is the minimal level where matching "
+"messages should be logged:"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:17991 doc/guix.texi:18036 doc/guix.texi:18214 doc/guix.texi:18259
+#: doc/guix.texi:18040 doc/guix.texi:18085 doc/guix.texi:18263
+#: doc/guix.texi:18308
 msgid "1: DEBUG"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:17994 doc/guix.texi:18039 doc/guix.texi:18217 doc/guix.texi:18262
+#: doc/guix.texi:18043 doc/guix.texi:18088 doc/guix.texi:18266
+#: doc/guix.texi:18311
 msgid "2: INFO"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:17997 doc/guix.texi:18042 doc/guix.texi:18220 doc/guix.texi:18265
+#: doc/guix.texi:18046 doc/guix.texi:18091 doc/guix.texi:18269
+#: doc/guix.texi:18314
 msgid "3: WARNING"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:18000 doc/guix.texi:18045 doc/guix.texi:18223 doc/guix.texi:18268
+#: doc/guix.texi:18049 doc/guix.texi:18094 doc/guix.texi:18272
+#: doc/guix.texi:18317
 msgid "4: ERROR"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18005 doc/guix.texi:18228
-msgid "Multiple filters can be defined in a single filters statement, they just need to be separated by spaces."
+#: doc/guix.texi:18054 doc/guix.texi:18277
+msgid ""
+"Multiple filters can be defined in a single filters statement, they just "
+"need to be separated by spaces."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18007 doc/guix.texi:18230
+#: doc/guix.texi:18056 doc/guix.texi:18279
 msgid "Defaults to @samp{\"3:remote 4:event\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18010
+#: doc/guix.texi:18059
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} string log-outputs"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18012 doc/guix.texi:18235
+#: doc/guix.texi:18061 doc/guix.texi:18284
 msgid "Logging outputs."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18015 doc/guix.texi:18238
-msgid "An output is one of the places to save logging information The format for an output can be:"
+#: doc/guix.texi:18064 doc/guix.texi:18287
+msgid ""
+"An output is one of the places to save logging information The format for an "
+"output can be:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18017 doc/guix.texi:18240
+#: doc/guix.texi:18066 doc/guix.texi:18289
 #, no-wrap
 msgid "x:stderr"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18019 doc/guix.texi:18242
+#: doc/guix.texi:18068 doc/guix.texi:18291
 msgid "output goes to stderr"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18020 doc/guix.texi:18243
+#: doc/guix.texi:18069 doc/guix.texi:18292
 #, no-wrap
 msgid "x:syslog:name"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18022 doc/guix.texi:18245
+#: doc/guix.texi:18071 doc/guix.texi:18294
 msgid "use syslog for the output and use the given name as the ident"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18023 doc/guix.texi:18246
+#: doc/guix.texi:18072 doc/guix.texi:18295
 #, no-wrap
 msgid "x:file:file_path"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18025 doc/guix.texi:18248
+#: doc/guix.texi:18074 doc/guix.texi:18297
 msgid "output to a file, with the given filepath"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18026 doc/guix.texi:18249
+#: doc/guix.texi:18075 doc/guix.texi:18298
 #, no-wrap
 msgid "x:journald"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18028 doc/guix.texi:18251
+#: doc/guix.texi:18077 doc/guix.texi:18300
 msgid "output to journald logging system"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18032 doc/guix.texi:18255
+#: doc/guix.texi:18081 doc/guix.texi:18304
 msgid "In all case the x prefix is the minimal level, acting as a filter"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18050 doc/guix.texi:18273
-msgid "Multiple outputs can be defined, they just need to be separated by spaces."
+#: doc/guix.texi:18099 doc/guix.texi:18322
+msgid ""
+"Multiple outputs can be defined, they just need to be separated by spaces."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18052 doc/guix.texi:18275
+#: doc/guix.texi:18101 doc/guix.texi:18324
 msgid "Defaults to @samp{\"3:stderr\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18055
+#: doc/guix.texi:18104
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} integer audit-level"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18057
+#: doc/guix.texi:18106
 msgid "Allows usage of the auditing subsystem to be altered"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:18061
+#: doc/guix.texi:18110
 msgid "0: disable all auditing"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:18064
+#: doc/guix.texi:18113
 msgid "1: enable auditing, only if enabled on host"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:18067
+#: doc/guix.texi:18116
 msgid "2: enable auditing, and exit if disabled on host."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18074
+#: doc/guix.texi:18123
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} boolean audit-logging"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18076
+#: doc/guix.texi:18125
 msgid "Send audit messages via libvirt logging infrastructure."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18081
+#: doc/guix.texi:18130
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} optional-string host-uuid"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18083
+#: doc/guix.texi:18132
 msgid "Host UUID.  UUID must not have all digits be the same."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18088
+#: doc/guix.texi:18137
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} string host-uuid-source"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18090
+#: doc/guix.texi:18139
 msgid "Source to read host UUID."
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:18094
+#: doc/guix.texi:18143
 msgid "@code{smbios}: fetch the UUID from @code{dmidecode -s system-uuid}"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:18097
+#: doc/guix.texi:18146
 msgid "@code{machine-id}: fetch the UUID from @code{/etc/machine-id}"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18102
-msgid "If @code{dmidecode} does not provide a valid UUID a temporary UUID will be generated."
+#: doc/guix.texi:18151
+msgid ""
+"If @code{dmidecode} does not provide a valid UUID a temporary UUID will be "
+"generated."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18104
+#: doc/guix.texi:18153
 msgid "Defaults to @samp{\"smbios\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18107
+#: doc/guix.texi:18156
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} integer keepalive-interval"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18112
+#: doc/guix.texi:18161
 msgid ""
-"A keepalive message is sent to a client after @code{keepalive_interval} seconds of inactivity to check if the client is still "
-"responding.  If set to -1, libvirtd will never send keepalive requests; however clients can still send them and the daemon will send "
-"responses."
+"A keepalive message is sent to a client after @code{keepalive_interval} "
+"seconds of inactivity to check if the client is still responding.  If set to "
+"-1, libvirtd will never send keepalive requests; however clients can still "
+"send them and the daemon will send responses."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18117
+#: doc/guix.texi:18166
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} integer keepalive-count"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18121
+#: doc/guix.texi:18170
 msgid ""
-"Maximum number of keepalive messages that are allowed to be sent to the client without getting any response before the connection is "
-"considered broken."
+"Maximum number of keepalive messages that are allowed to be sent to the "
+"client without getting any response before the connection is considered "
+"broken."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18128
+#: doc/guix.texi:18177
 msgid ""
-"In other words, the connection is automatically closed approximately after @code{keepalive_interval * (keepalive_count + 1)} seconds "
-"since the last message received from the client.  When @code{keepalive-count} is set to 0, connections will be automatically closed "
-"after @code{keepalive-interval} seconds of inactivity without sending any keepalive messages."
+"In other words, the connection is automatically closed approximately after "
+"@code{keepalive_interval * (keepalive_count + 1)} seconds since the last "
+"message received from the client.  When @code{keepalive-count} is set to 0, "
+"connections will be automatically closed after @code{keepalive-interval} "
+"seconds of inactivity without sending any keepalive messages."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18133
+#: doc/guix.texi:18182
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} integer admin-keepalive-interval"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18135 doc/guix.texi:18142
+#: doc/guix.texi:18184 doc/guix.texi:18191
 msgid "Same as above but for admin interface."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18140
+#: doc/guix.texi:18189
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} integer admin-keepalive-count"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18147
+#: doc/guix.texi:18196
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} integer ovs-timeout"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18149
+#: doc/guix.texi:18198
 msgid "Timeout for Open vSwitch calls."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18153
+#: doc/guix.texi:18202
 msgid ""
-"The @code{ovs-vsctl} utility is used for the configuration and its timeout option is set by default to 5 seconds to avoid potential "
-"infinite waits blocking libvirt."
+"The @code{ovs-vsctl} utility is used for the configuration and its timeout "
+"option is set by default to 5 seconds to avoid potential infinite waits "
+"blocking libvirt."
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:18160
+#: doc/guix.texi:18209
 #, no-wrap
 msgid "Virtlog daemon"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:18163
-msgid "The virtlogd service is a server side daemon component of libvirt that is used to manage logs from virtual machine consoles."
+#: doc/guix.texi:18212
+msgid ""
+"The virtlogd service is a server side daemon component of libvirt that is "
+"used to manage logs from virtual machine consoles."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:18169
+#: doc/guix.texi:18218
 msgid ""
-"This daemon is not used directly by libvirt client applications, rather it is called on their behalf by @code{libvirtd}. By "
-"maintaining the logs in a standalone daemon, the main @code{libvirtd} daemon can be restarted without risk of losing logs. The "
-"@code{virtlogd} daemon has the ability to re-exec()  itself upon receiving @code{SIGUSR1}, to allow live upgrades without downtime."
+"This daemon is not used directly by libvirt client applications, rather it "
+"is called on their behalf by @code{libvirtd}. By maintaining the logs in a "
+"standalone daemon, the main @code{libvirtd} daemon can be restarted without "
+"risk of losing logs. The @code{virtlogd} daemon has the ability to re-"
+"exec()  itself upon receiving @code{SIGUSR1}, to allow live upgrades without "
+"downtime."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:18170
+#: doc/guix.texi:18219
 #, no-wrap
 msgid "{Scheme Variable} virtlog-service-type"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:18173
-msgid "This is the type of the virtlog daemon.  Its value must be a @code{virtlog-configuration}."
+#: doc/guix.texi:18222
+msgid ""
+"This is the type of the virtlog daemon.  Its value must be a @code{virtlog-"
+"configuration}."
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:18178
+#: doc/guix.texi:18227
 #, no-wrap
 msgid ""
 "(service virtlog-service-type\n"
@@ -35594,107 +40316,110 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18181
+#: doc/guix.texi:18230
 #, no-wrap
 msgid "{@code{virtlog-configuration} parameter} integer log-level"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18188
+#: doc/guix.texi:18237
 #, no-wrap
 msgid "{@code{virtlog-configuration} parameter} string log-filters"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18233
+#: doc/guix.texi:18282
 #, no-wrap
 msgid "{@code{virtlog-configuration} parameter} string log-outputs"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18278
+#: doc/guix.texi:18327
 #, no-wrap
 msgid "{@code{virtlog-configuration} parameter} integer max-clients"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18283
+#: doc/guix.texi:18332
 msgid "Defaults to @samp{1024}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18286
+#: doc/guix.texi:18335
 #, no-wrap
 msgid "{@code{virtlog-configuration} parameter} integer max-size"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18288
+#: doc/guix.texi:18337
 msgid "Maximum file size before rolling over."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18290
+#: doc/guix.texi:18339
 msgid "Defaults to @samp{2MB}"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18293
+#: doc/guix.texi:18342
 #, no-wrap
 msgid "{@code{virtlog-configuration} parameter} integer max-backups"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18295
+#: doc/guix.texi:18344
 msgid "Maximum number of backup files to keep."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18297
+#: doc/guix.texi:18346
 msgid "Defaults to @samp{3}"
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:18300
+#: doc/guix.texi:18349
 #, no-wrap
 msgid "Transparent Emulation with QEMU"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:18302
+#: doc/guix.texi:18351
 #, no-wrap
 msgid "emulation"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:18303
+#: doc/guix.texi:18352
 #, no-wrap
 msgid "binfmt_misc"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:18309
+#: doc/guix.texi:18358
 msgid ""
-"@code{qemu-binfmt-service-type} provides support for transparent emulation of program binaries built for different architectures---e."
-"g., it allows you to transparently execute an ARMv7 program on an x86_64 machine.  It achieves this by combining the @uref{https://"
-"www.qemu.org, QEMU} emulator and the @code{binfmt_misc} feature of the kernel Linux."
+"@code{qemu-binfmt-service-type} provides support for transparent emulation "
+"of program binaries built for different architectures---e.g., it allows you "
+"to transparently execute an ARMv7 program on an x86_64 machine.  It achieves "
+"this by combining the @uref{https://www.qemu.org, QEMU} emulator and the "
+"@code{binfmt_misc} feature of the kernel Linux."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:18310
+#: doc/guix.texi:18359
 #, no-wrap
 msgid "{Scheme Variable} qemu-binfmt-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:18315
+#: doc/guix.texi:18364
 msgid ""
-"This is the type of the QEMU/binfmt service for transparent emulation.  Its value must be a @code{qemu-binfmt-configuration} object, "
-"which specifies the QEMU package to use as well as the architecture we want to emulated:"
+"This is the type of the QEMU/binfmt service for transparent emulation.  Its "
+"value must be a @code{qemu-binfmt-configuration} object, which specifies the "
+"QEMU package to use as well as the architecture we want to emulated:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:18320
+#: doc/guix.texi:18369
 #, no-wrap
 msgid ""
 "(service qemu-binfmt-service-type\n"
@@ -35703,58 +40428,63 @@ msgid ""
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:18326
+#: doc/guix.texi:18375
 msgid ""
-"In this example, we enable transparent emulation for the ARM and aarch64 platforms.  Running @code{herd stop qemu-binfmt} turns it "
-"off, and running @code{herd start qemu-binfmt} turns it back on (@pxref{Invoking herd, the @command{herd} command,, shepherd, The "
-"GNU Shepherd Manual})."
+"In this example, we enable transparent emulation for the ARM and aarch64 "
+"platforms.  Running @code{herd stop qemu-binfmt} turns it off, and running "
+"@code{herd start qemu-binfmt} turns it back on (@pxref{Invoking herd, the "
+"@command{herd} command,, shepherd, The GNU Shepherd Manual})."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:18328
+#: doc/guix.texi:18377
 #, no-wrap
 msgid "{Data Type} qemu-binfmt-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:18330
+#: doc/guix.texi:18379
 msgid "This is the configuration for the @code{qemu-binfmt} service."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18332
+#: doc/guix.texi:18381
 #, no-wrap
 msgid "@code{platforms} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18335
+#: doc/guix.texi:18384
 msgid ""
-"The list of emulated QEMU platforms.  Each item must be a @dfn{platform object} as returned by @code{lookup-qemu-platforms} (see "
-"below)."
+"The list of emulated QEMU platforms.  Each item must be a @dfn{platform "
+"object} as returned by @code{lookup-qemu-platforms} (see below)."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18336
+#: doc/guix.texi:18385
 #, no-wrap
 msgid "@code{guix-support?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18342
+#: doc/guix.texi:18391
 msgid ""
-"When it is true, QEMU and all its dependencies are added to the build environment of @command{guix-daemon} (@pxref{Invoking guix-"
-"daemon, @code{--chroot-directory} option}).  This allows the @code{binfmt_misc} handlers to be used within the build environment, "
-"which in turn means that you can transparently build programs for another architecture."
+"When it is true, QEMU and all its dependencies are added to the build "
+"environment of @command{guix-daemon} (@pxref{Invoking guix-daemon, @code{--"
+"chroot-directory} option}).  This allows the @code{binfmt_misc} handlers to "
+"be used within the build environment, which in turn means that you can "
+"transparently build programs for another architecture."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18345
-msgid "For example, let's suppose you're on an x86_64 machine and you have this service:"
+#: doc/guix.texi:18394
+msgid ""
+"For example, let's suppose you're on an x86_64 machine and you have this "
+"service:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:18351
+#: doc/guix.texi:18400
 #, no-wrap
 msgid ""
 "(service qemu-binfmt-service-type\n"
@@ -35764,295 +40494,323 @@ msgid ""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18354
+#: doc/guix.texi:18403
 msgid "You can run:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:18357
+#: doc/guix.texi:18406
 #, no-wrap
 msgid "guix build -s armhf-linux inkscape\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18364
+#: doc/guix.texi:18413
 msgid ""
-"and it will build Inkscape for ARMv7 @emph{as if it were a native build}, transparently using QEMU to emulate the ARMv7 CPU.  Pretty "
-"handy if you'd like to test a package build for an architecture you don't have access to!"
+"and it will build Inkscape for ARMv7 @emph{as if it were a native build}, "
+"transparently using QEMU to emulate the ARMv7 CPU.  Pretty handy if you'd "
+"like to test a package build for an architecture you don't have access to!"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18365
+#: doc/guix.texi:18414
 #, no-wrap
 msgid "@code{qemu} (default: @code{qemu})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18367
+#: doc/guix.texi:18416
 msgid "The QEMU package to use."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:18370
+#: doc/guix.texi:18419
 #, no-wrap
 msgid "{Scheme Procedure} lookup-qemu-platforms @var{platforms}@dots{}"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:18375
+#: doc/guix.texi:18424
 msgid ""
-"Return the list of QEMU platform objects corresponding to @var{platforms}@dots{}.  @var{platforms} must be a list of strings "
-"corresponding to platform names, such as @code{\"arm\"}, @code{\"sparc\"}, @code{\"mips64el\"}, and so on."
+"Return the list of QEMU platform objects corresponding to @var{platforms}"
+"@dots{}.  @var{platforms} must be a list of strings corresponding to "
+"platform names, such as @code{\"arm\"}, @code{\"sparc\"}, @code{\"mips64el"
+"\"}, and so on."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:18377
+#: doc/guix.texi:18426
 #, no-wrap
 msgid "{Scheme Procedure} qemu-platform? @var{obj}"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:18379
+#: doc/guix.texi:18428
 msgid "Return true if @var{obj} is a platform object."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:18381
+#: doc/guix.texi:18430
 #, no-wrap
 msgid "{Scheme Procedure} qemu-platform-name @var{platform}"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:18383
+#: doc/guix.texi:18432
 msgid "Return the name of @var{platform}---a string such as @code{\"arm\"}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:18395
+#: doc/guix.texi:18444
 msgid ""
-"The @code{(gnu services version-control)} module provides a service to allow remote access to local Git repositories.  There are "
-"three options: the @code{git-daemon-service}, which provides access to repositories via the @code{git://} unsecured TCP-based "
-"protocol, extending the @code{nginx} web server to proxy some requests to @code{git-http-backend}, or providing a web interface with "
-"@code{cgit-service-type}."
+"The @code{(gnu services version-control)} module provides a service to allow "
+"remote access to local Git repositories.  There are three options: the "
+"@code{git-daemon-service}, which provides access to repositories via the "
+"@code{git://} unsecured TCP-based protocol, extending the @code{nginx} web "
+"server to proxy some requests to @code{git-http-backend}, or providing a web "
+"interface with @code{cgit-service-type}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:18396
+#: doc/guix.texi:18445
 #, no-wrap
 msgid "{Scheme Procedure} git-daemon-service [#:config (git-daemon-configuration)]"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:18400
+#: doc/guix.texi:18449
 msgid ""
-"Return a service that runs @command{git daemon}, a simple TCP server to expose repositories over the Git protocol for anonymous "
-"access."
+"Return a service that runs @command{git daemon}, a simple TCP server to "
+"expose repositories over the Git protocol for anonymous access."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:18406
+#: doc/guix.texi:18455
 msgid ""
-"The optional @var{config} argument should be a @code{<git-daemon-configuration>} object, by default it allows read-only access to "
-"exported@footnote{By creating the magic file \"git-daemon-export-ok\" in the repository directory.} repositories under @file{/srv/"
-"git}."
+"The optional @var{config} argument should be a @code{<git-daemon-"
+"configuration>} object, by default it allows read-only access to "
+"exported@footnote{By creating the magic file \"git-daemon-export-ok\" in the "
+"repository directory.} repositories under @file{/srv/git}."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:18409
+#: doc/guix.texi:18458
 #, no-wrap
 msgid "{Data Type} git-daemon-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:18411
+#: doc/guix.texi:18460
 msgid "Data type representing the configuration for @code{git-daemon-service}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18413 doc/guix.texi:18469
+#: doc/guix.texi:18462 doc/guix.texi:18518
 #, no-wrap
 msgid "@code{package} (default: @var{git})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18415 doc/guix.texi:18471
+#: doc/guix.texi:18464 doc/guix.texi:18520
 msgid "Package object of the Git distributed version control system."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18416 doc/guix.texi:18475
+#: doc/guix.texi:18465 doc/guix.texi:18524
 #, no-wrap
 msgid "@code{export-all?} (default: @var{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18419
-msgid "Whether to allow access for all Git repositories, even if they do not have the @file{git-daemon-export-ok} file."
+#: doc/guix.texi:18468
+msgid ""
+"Whether to allow access for all Git repositories, even if they do not have "
+"the @file{git-daemon-export-ok} file."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18420
+#: doc/guix.texi:18469
 #, no-wrap
 msgid "@code{base-path} (default: @file{/srv/git})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18425
+#: doc/guix.texi:18474
 msgid ""
-"Whether to remap all the path requests as relative to the given path.  If you run git daemon with @var{(base-path \"/srv/git\")} on "
-"example.com, then if you later try to pull @code{git://example.com/hello.git}, git daemon will interpret the path as @code{/srv/git/"
-"hello.git}."
+"Whether to remap all the path requests as relative to the given path.  If "
+"you run git daemon with @var{(base-path \"/srv/git\")} on example.com, then "
+"if you later try to pull @code{git://example.com/hello.git}, git daemon will "
+"interpret the path as @code{/srv/git/hello.git}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18426
+#: doc/guix.texi:18475
 #, no-wrap
 msgid "@code{user-path} (default: @var{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18433
+#: doc/guix.texi:18482
 msgid ""
-"Whether to allow @code{~user} notation to be used in requests.  When specified with empty string, requests to @code{git://host/"
-"~alice/foo} is taken as a request to access @code{foo} repository in the home directory of user @code{alice}.  If @var{(user-path "
-"\"path\")} is specified, the same request is taken as a request to access @code{path/foo} repository in the home directory of user "
-"@code{alice}."
+"Whether to allow @code{~user} notation to be used in requests.  When "
+"specified with empty string, requests to @code{git://host/~alice/foo} is "
+"taken as a request to access @code{foo} repository in the home directory of "
+"user @code{alice}.  If @var{(user-path \"path\")} is specified, the same "
+"request is taken as a request to access @code{path/foo} repository in the "
+"home directory of user @code{alice}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18434
+#: doc/guix.texi:18483
 #, no-wrap
 msgid "@code{listen} (default: @var{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18437
-msgid "Whether to listen on specific IP addresses or hostnames, defaults to all."
+#: doc/guix.texi:18486
+msgid ""
+"Whether to listen on specific IP addresses or hostnames, defaults to all."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18438
+#: doc/guix.texi:18487
 #, no-wrap
 msgid "@code{port} (default: @var{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18440
+#: doc/guix.texi:18489
 msgid "Whether to listen on an alternative port, which defaults to 9418."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18441
+#: doc/guix.texi:18490
 #, no-wrap
 msgid "@code{whitelist} (default: @var{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18443
+#: doc/guix.texi:18492
 msgid "If not empty, only allow access to this list of directories."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18444
+#: doc/guix.texi:18493
 #, no-wrap
 msgid "@code{extra-options} (default: @var{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18447
-msgid "Extra options will be passed to @code{git daemon}, please run @command{man git-daemon} for more information."
-msgstr ""
-
-#. type: Plain text
-#: doc/guix.texi:18461
+#: doc/guix.texi:18496
 msgid ""
-"The @code{git://} protocol lacks authentication.  When you pull from a repository fetched via @code{git://}, you don't know that the "
-"data you receive was modified is really coming from the specified host, and you have your connection is subject to eavesdropping.  "
-"It's better to use an authenticated and encrypted transport, such as @code{https}.  Although Git allows you to serve repositories "
-"using unsophisticated file-based web servers, there is a faster protocol implemented by the @code{git-http-backend} program.  This "
-"program is the back-end of a proper Git web service.  It is designed to sit behind a FastCGI proxy.  @xref{Web Services}, for more "
-"on running the necessary @code{fcgiwrap} daemon."
+"Extra options will be passed to @code{git daemon}, please run @command{man "
+"git-daemon} for more information."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:18464
-msgid "Guix has a separate configuration data type for serving Git repositories over HTTP."
+#: doc/guix.texi:18510
+msgid ""
+"The @code{git://} protocol lacks authentication.  When you pull from a "
+"repository fetched via @code{git://}, you don't know that the data you "
+"receive was modified is really coming from the specified host, and you have "
+"your connection is subject to eavesdropping.  It's better to use an "
+"authenticated and encrypted transport, such as @code{https}.  Although Git "
+"allows you to serve repositories using unsophisticated file-based web "
+"servers, there is a faster protocol implemented by the @code{git-http-"
+"backend} program.  This program is the back-end of a proper Git web "
+"service.  It is designed to sit behind a FastCGI proxy.  @xref{Web "
+"Services}, for more on running the necessary @code{fcgiwrap} daemon."
+msgstr ""
+
+#. type: Plain text
+#: doc/guix.texi:18513
+msgid ""
+"Guix has a separate configuration data type for serving Git repositories "
+"over HTTP."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:18465
+#: doc/guix.texi:18514
 #, no-wrap
 msgid "{Data Type} git-http-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:18467
+#: doc/guix.texi:18516
 msgid "Data type representing the configuration for @code{git-http-service}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18472
+#: doc/guix.texi:18521
 #, no-wrap
 msgid "@code{git-root} (default: @file{/srv/git})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18474
+#: doc/guix.texi:18523
 msgid "Directory containing the Git repositories to expose to the world."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18478
+#: doc/guix.texi:18527
 msgid ""
-"Whether to expose access for all Git repositories in @var{git-root}, even if they do not have the @file{git-daemon-export-ok} file."
+"Whether to expose access for all Git repositories in @var{git-root}, even if "
+"they do not have the @file{git-daemon-export-ok} file."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18479
+#: doc/guix.texi:18528
 #, no-wrap
 msgid "@code{uri-path} (default: @file{/git/})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18484
+#: doc/guix.texi:18533
 msgid ""
-"Path prefix for Git access.  With the default @code{/git/} prefix, this will map @code{http://@var{server}/git/@var{repo}.git} to "
-"@code{/srv/git/@var{repo}.git}.  Requests whose URI paths do not begin with this prefix are not passed on to this Git instance."
+"Path prefix for Git access.  With the default @code{/git/} prefix, this will "
+"map @code{http://@var{server}/git/@var{repo}.git} to @code{/srv/git/"
+"@var{repo}.git}.  Requests whose URI paths do not begin with this prefix are "
+"not passed on to this Git instance."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18485
+#: doc/guix.texi:18534
 #, no-wrap
 msgid "@code{fcgiwrap-socket} (default: @code{127.0.0.1:9000})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18488
-msgid "The socket on which the @code{fcgiwrap} daemon is listening.  @xref{Web Services}."
+#: doc/guix.texi:18537
+msgid ""
+"The socket on which the @code{fcgiwrap} daemon is listening.  @xref{Web "
+"Services}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:18495
+#: doc/guix.texi:18544
 msgid ""
-"There is no @code{git-http-service-type}, currently; instead you can create an @code{nginx-location-configuration} from a @code{git-"
-"http-configuration} and then add that location to a web server."
+"There is no @code{git-http-service-type}, currently; instead you can create "
+"an @code{nginx-location-configuration} from a @code{git-http-configuration} "
+"and then add that location to a web server."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:18496
+#: doc/guix.texi:18545
 #, no-wrap
 msgid "{Scheme Procedure} git-http-nginx-location-configuration @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:18501
+#: doc/guix.texi:18550
 msgid ""
-"[config=(git-http-configuration)] Compute an @code{nginx-location-configuration} that corresponds to the given Git http "
-"configuration.  An example nginx service definition to serve the default @file{/srv/git} over HTTPS might be:"
+"[config=(git-http-configuration)] Compute an @code{nginx-location-"
+"configuration} that corresponds to the given Git http configuration.  An "
+"example nginx service definition to serve the default @file{/srv/git} over "
+"HTTPS might be:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:18518
+#: doc/guix.texi:18567
 #, no-wrap
 msgid ""
 "(service nginx-service-type\n"
@@ -36073,1455 +40831,1595 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:18525
+#: doc/guix.texi:18574
 msgid ""
-"This example assumes that you are using Let's Encrypt to get your TLS certificate.  @xref{Certificate Services}.  The default "
-"@code{certbot} service will redirect all HTTP traffic on @code{git.my-host.org} to HTTPS.  You will also need to add an "
-"@code{fcgiwrap} proxy to your system services.  @xref{Web Services}."
+"This example assumes that you are using Let's Encrypt to get your TLS "
+"certificate.  @xref{Certificate Services}.  The default @code{certbot} "
+"service will redirect all HTTP traffic on @code{git.my-host.org} to HTTPS.  "
+"You will also need to add an @code{fcgiwrap} proxy to your system services.  "
+"@xref{Web Services}."
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:18527
+#: doc/guix.texi:18576
 #, no-wrap
 msgid "Cgit Service"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:18529
+#: doc/guix.texi:18578
 #, no-wrap
 msgid "Cgit service"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:18530
+#: doc/guix.texi:18579
 #, no-wrap
 msgid "Git, web interface"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:18533
-msgid "@uref{https://git.zx2c4.com/cgit/, Cgit} is a web frontend for Git repositories written in C."
+#: doc/guix.texi:18582
+msgid ""
+"@uref{https://git.zx2c4.com/cgit/, Cgit} is a web frontend for Git "
+"repositories written in C."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:18536
+#: doc/guix.texi:18585
 msgid ""
-"The following example will configure the service with default values.  By default, Cgit can be accessed on port 80 (@code{http://"
-"localhost:80})."
+"The following example will configure the service with default values.  By "
+"default, Cgit can be accessed on port 80 (@code{http://localhost:80})."
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:18539
+#: doc/guix.texi:18588
 #, no-wrap
 msgid "(service cgit-service-type)\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:18544
+#: doc/guix.texi:18592
+msgid ""
+"The @code{file-object} type designates either a file-like object (@pxref{G-"
+"Expressions, file-like objects}) or a string."
+msgstr ""
+
+#. type: Plain text
+#: doc/guix.texi:18596
 msgid "Available @code{cgit-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18545
+#: doc/guix.texi:18597
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} package package"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18547
+#: doc/guix.texi:18599
 msgid "The CGIT package."
 msgstr ""
 
-#. type: deftypevr
-#: doc/guix.texi:18550
-#, no-wrap
-msgid "{@code{cgit-configuration} parameter} nginx-server-configuration-list nginx"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:18552
-msgid "NGINX configuration."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:18555
-#, no-wrap
-msgid "{@code{cgit-configuration} parameter} string about-filter"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:18558
-msgid "Specifies a command which will be invoked to format the content of about pages (both top-level and for each repository)."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:18563
-#, no-wrap
-msgid "{@code{cgit-configuration} parameter} string agefile"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:18566
-msgid ""
-"Specifies a path, relative to each repository path, which can be used to specify the date and time of the youngest commit in the "
-"repository."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:18571
-#, no-wrap
-msgid "{@code{cgit-configuration} parameter} string auth-filter"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:18574
-msgid "Specifies a command that will be invoked for authenticating repository access."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:18579
-#, no-wrap
-msgid "{@code{cgit-configuration} parameter} string branch-sort"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:18582
-msgid ""
-"Flag which, when set to @samp{age}, enables date ordering in the branch ref list, and when set @samp{name} enables ordering by "
-"branch name."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:18584
-msgid "Defaults to @samp{\"name\"}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:18587
-#, no-wrap
-msgid "{@code{cgit-configuration} parameter} string cache-root"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:18589
-msgid "Path used to store the cgit cache entries."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:18591
-msgid "Defaults to @samp{\"/var/cache/cgit\"}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:18594
-#, no-wrap
-msgid "{@code{cgit-configuration} parameter} integer cache-static-ttl"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:18597
-msgid "Number which specifies the time-to-live, in minutes, for the cached version of repository pages accessed with a fixed SHA1."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:18599 doc/guix.texi:19033
-msgid "Defaults to @samp{-1}."
-msgstr ""
-
 #. type: deftypevr
 #: doc/guix.texi:18602
 #, no-wrap
-msgid "{@code{cgit-configuration} parameter} integer cache-dynamic-ttl"
+msgid "{@code{cgit-configuration} parameter} nginx-server-configuration-list nginx"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18605
-msgid "Number which specifies the time-to-live, in minutes, for the cached version of repository pages accessed without a fixed SHA1."
+#: doc/guix.texi:18604
+msgid "NGINX configuration."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:18607
+#, no-wrap
+msgid "{@code{cgit-configuration} parameter} file-object about-filter"
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:18610
+msgid ""
+"Specifies a command which will be invoked to format the content of about "
+"pages (both top-level and for each repository)."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:18615
+#, no-wrap
+msgid "{@code{cgit-configuration} parameter} string agefile"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:18618
+msgid ""
+"Specifies a path, relative to each repository path, which can be used to "
+"specify the date and time of the youngest commit in the repository."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:18623
+#, no-wrap
+msgid "{@code{cgit-configuration} parameter} file-object auth-filter"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:18626
+msgid ""
+"Specifies a command that will be invoked for authenticating repository "
+"access."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:18631
+#, no-wrap
+msgid "{@code{cgit-configuration} parameter} string branch-sort"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:18634
+msgid ""
+"Flag which, when set to @samp{age}, enables date ordering in the branch ref "
+"list, and when set @samp{name} enables ordering by branch name."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:18636
+msgid "Defaults to @samp{\"name\"}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:18639
+#, no-wrap
+msgid "{@code{cgit-configuration} parameter} string cache-root"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:18641
+msgid "Path used to store the cgit cache entries."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:18643
+msgid "Defaults to @samp{\"/var/cache/cgit\"}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:18646
+#, no-wrap
+msgid "{@code{cgit-configuration} parameter} integer cache-static-ttl"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:18649
+msgid ""
+"Number which specifies the time-to-live, in minutes, for the cached version "
+"of repository pages accessed with a fixed SHA1."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:18651 doc/guix.texi:19094
+msgid "Defaults to @samp{-1}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:18654
+#, no-wrap
+msgid "{@code{cgit-configuration} parameter} integer cache-dynamic-ttl"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:18657
+msgid ""
+"Number which specifies the time-to-live, in minutes, for the cached version "
+"of repository pages accessed without a fixed SHA1."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:18662
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} integer cache-repo-ttl"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18613
-msgid "Number which specifies the time-to-live, in minutes, for the cached version of the repository summary page."
+#: doc/guix.texi:18665
+msgid ""
+"Number which specifies the time-to-live, in minutes, for the cached version "
+"of the repository summary page."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18618
+#: doc/guix.texi:18670
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} integer cache-root-ttl"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18621
-msgid "Number which specifies the time-to-live, in minutes, for the cached version of the repository index page."
+#: doc/guix.texi:18673
+msgid ""
+"Number which specifies the time-to-live, in minutes, for the cached version "
+"of the repository index page."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18626
+#: doc/guix.texi:18678
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} integer cache-scanrc-ttl"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18629
-msgid "Number which specifies the time-to-live, in minutes, for the result of scanning a path for Git repositories."
+#: doc/guix.texi:18681
+msgid ""
+"Number which specifies the time-to-live, in minutes, for the result of "
+"scanning a path for Git repositories."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18634
+#: doc/guix.texi:18686
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} integer cache-about-ttl"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18637
-msgid "Number which specifies the time-to-live, in minutes, for the cached version of the repository about page."
+#: doc/guix.texi:18689
+msgid ""
+"Number which specifies the time-to-live, in minutes, for the cached version "
+"of the repository about page."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18642
+#: doc/guix.texi:18694
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} integer cache-snapshot-ttl"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18645
-msgid "Number which specifies the time-to-live, in minutes, for the cached version of snapshots."
+#: doc/guix.texi:18697
+msgid ""
+"Number which specifies the time-to-live, in minutes, for the cached version "
+"of snapshots."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18650
+#: doc/guix.texi:18702
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} integer cache-size"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18653
-msgid "The maximum number of entries in the cgit cache.  When set to @samp{0}, caching is disabled."
+#: doc/guix.texi:18705
+msgid ""
+"The maximum number of entries in the cgit cache.  When set to @samp{0}, "
+"caching is disabled."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18658
+#: doc/guix.texi:18710
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} boolean case-sensitive-sort?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18660
+#: doc/guix.texi:18712
 msgid "Sort items in the repo list case sensitively."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18665
+#: doc/guix.texi:18717
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} list clone-prefix"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18668
-msgid "List of common prefixes which, when combined with a repository URL, generates valid clone URLs for the repository."
+#: doc/guix.texi:18720
+msgid ""
+"List of common prefixes which, when combined with a repository URL, "
+"generates valid clone URLs for the repository."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18673
+#: doc/guix.texi:18725
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} list clone-url"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18675
+#: doc/guix.texi:18727
 msgid "List of @code{clone-url} templates."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18680
+#: doc/guix.texi:18732
 #, no-wrap
-msgid "{@code{cgit-configuration} parameter} string commit-filter"
+msgid "{@code{cgit-configuration} parameter} file-object commit-filter"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18682
+#: doc/guix.texi:18734
 msgid "Command which will be invoked to format commit messages."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18687
+#: doc/guix.texi:18739
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} string commit-sort"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18691 doc/guix.texi:19240
+#: doc/guix.texi:18743 doc/guix.texi:19301
 msgid ""
-"Flag which, when set to @samp{date}, enables strict date ordering in the commit log, and when set to @samp{topo} enables strict "
-"topological ordering."
+"Flag which, when set to @samp{date}, enables strict date ordering in the "
+"commit log, and when set to @samp{topo} enables strict topological ordering."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18693
+#: doc/guix.texi:18745
 msgid "Defaults to @samp{\"git log\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18696
+#: doc/guix.texi:18748
 #, no-wrap
-msgid "{@code{cgit-configuration} parameter} string css"
+msgid "{@code{cgit-configuration} parameter} file-object css"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18698
+#: doc/guix.texi:18750
 msgid "URL which specifies the css document to include in all cgit pages."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18700
+#: doc/guix.texi:18752
 msgid "Defaults to @samp{\"/share/cgit/cgit.css\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18703
+#: doc/guix.texi:18755
 #, no-wrap
-msgid "{@code{cgit-configuration} parameter} string email-filter"
+msgid "{@code{cgit-configuration} parameter} file-object email-filter"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18707
+#: doc/guix.texi:18759
 msgid ""
-"Specifies a command which will be invoked to format names and email address of committers, authors, and taggers, as represented in "
-"various places throughout the cgit interface."
+"Specifies a command which will be invoked to format names and email address "
+"of committers, authors, and taggers, as represented in various places "
+"throughout the cgit interface."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18712
+#: doc/guix.texi:18764
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} boolean embedded?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18715
-msgid "Flag which, when set to @samp{#t}, will make cgit generate a HTML fragment suitable for embedding in other HTML pages."
+#: doc/guix.texi:18767
+msgid ""
+"Flag which, when set to @samp{#t}, will make cgit generate a HTML fragment "
+"suitable for embedding in other HTML pages."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18720
+#: doc/guix.texi:18772
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} boolean enable-commit-graph?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18724
+#: doc/guix.texi:18776
 msgid ""
-"Flag which, when set to @samp{#t}, will make cgit print an ASCII-art commit history graph to the left of the commit messages in the "
-"repository log page."
+"Flag which, when set to @samp{#t}, will make cgit print an ASCII-art commit "
+"history graph to the left of the commit messages in the repository log page."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18729
+#: doc/guix.texi:18781
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} boolean enable-filter-overrides?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18732
-msgid "Flag which, when set to @samp{#t}, allows all filter settings to be overridden in repository-specific cgitrc files."
+#: doc/guix.texi:18784
+msgid ""
+"Flag which, when set to @samp{#t}, allows all filter settings to be "
+"overridden in repository-specific cgitrc files."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18737
+#: doc/guix.texi:18789
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} boolean enable-follow-links?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18740
-msgid "Flag which, when set to @samp{#t}, allows users to follow a file in the log view."
+#: doc/guix.texi:18792
+msgid ""
+"Flag which, when set to @samp{#t}, allows users to follow a file in the log "
+"view."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18745
+#: doc/guix.texi:18797
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} boolean enable-http-clone?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18748
-msgid "If set to @samp{#t}, cgit will act as an dumb HTTP endpoint for Git clones."
+#: doc/guix.texi:18800
+msgid ""
+"If set to @samp{#t}, cgit will act as an dumb HTTP endpoint for Git clones."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18753
+#: doc/guix.texi:18805
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} boolean enable-index-links?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18756
+#: doc/guix.texi:18808
 msgid ""
-"Flag which, when set to @samp{#t}, will make cgit generate extra links \"summary\", \"commit\", \"tree\" for each repo in the "
-"repository index."
+"Flag which, when set to @samp{#t}, will make cgit generate extra links "
+"\"summary\", \"commit\", \"tree\" for each repo in the repository index."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18761
+#: doc/guix.texi:18813
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} boolean enable-index-owner?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18764
-msgid "Flag which, when set to @samp{#t}, will make cgit display the owner of each repo in the repository index."
+#: doc/guix.texi:18816
+msgid ""
+"Flag which, when set to @samp{#t}, will make cgit display the owner of each "
+"repo in the repository index."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18769
+#: doc/guix.texi:18821
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} boolean enable-log-filecount?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18772
+#: doc/guix.texi:18824
 msgid ""
-"Flag which, when set to @samp{#t}, will make cgit print the number of modified files for each commit on the repository log page."
+"Flag which, when set to @samp{#t}, will make cgit print the number of "
+"modified files for each commit on the repository log page."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18777
+#: doc/guix.texi:18829
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} boolean enable-log-linecount?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18780
+#: doc/guix.texi:18832
 msgid ""
-"Flag which, when set to @samp{#t}, will make cgit print the number of added and removed lines for each commit on the repository log "
-"page."
+"Flag which, when set to @samp{#t}, will make cgit print the number of added "
+"and removed lines for each commit on the repository log page."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18785
+#: doc/guix.texi:18837
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} boolean enable-remote-branches?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18788 doc/guix.texi:19303
-msgid "Flag which, when set to @code{#t}, will make cgit display remote branches in the summary and refs views."
+#: doc/guix.texi:18840 doc/guix.texi:19364
+msgid ""
+"Flag which, when set to @code{#t}, will make cgit display remote branches in "
+"the summary and refs views."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18793
+#: doc/guix.texi:18845
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} boolean enable-subject-links?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18797
+#: doc/guix.texi:18849
 msgid ""
-"Flag which, when set to @code{1}, will make cgit use the subject of the parent commit as link text when generating links to parent "
-"commits in commit view."
+"Flag which, when set to @code{1}, will make cgit use the subject of the "
+"parent commit as link text when generating links to parent commits in commit "
+"view."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18802
+#: doc/guix.texi:18854
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} boolean enable-html-serving?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18806
+#: doc/guix.texi:18858
 msgid ""
-"Flag which, when set to @samp{#t}, will make cgit use the subject of the parent commit as link text when generating links to parent "
-"commits in commit view."
+"Flag which, when set to @samp{#t}, will make cgit use the subject of the "
+"parent commit as link text when generating links to parent commits in commit "
+"view."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18811
+#: doc/guix.texi:18863
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} boolean enable-tree-linenumbers?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18814
-msgid "Flag which, when set to @samp{#t}, will make cgit generate linenumber links for plaintext blobs printed in the tree view."
+#: doc/guix.texi:18866
+msgid ""
+"Flag which, when set to @samp{#t}, will make cgit generate linenumber links "
+"for plaintext blobs printed in the tree view."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18819
+#: doc/guix.texi:18871
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} boolean enable-git-config?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18822
-msgid "Flag which, when set to @samp{#f}, will allow cgit to use Git config to set any repo specific settings."
+#: doc/guix.texi:18874
+msgid ""
+"Flag which, when set to @samp{#f}, will allow cgit to use Git config to set "
+"any repo specific settings."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18827
+#: doc/guix.texi:18879
 #, no-wrap
-msgid "{@code{cgit-configuration} parameter} string favicon"
+msgid "{@code{cgit-configuration} parameter} file-object favicon"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18829
+#: doc/guix.texi:18881
 msgid "URL used as link to a shortcut icon for cgit."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18831
+#: doc/guix.texi:18883
 msgid "Defaults to @samp{\"/favicon.ico\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18834
+#: doc/guix.texi:18886
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} string footer"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18838
+#: doc/guix.texi:18890
 msgid ""
-"The content of the file specified with this option will be included verbatim at the bottom of all pages (i.e.  it replaces the "
-"standard \"generated by...\" message)."
+"The content of the file specified with this option will be included verbatim "
+"at the bottom of all pages (i.e.  it replaces the standard \"generated by..."
+"\" message)."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18843
+#: doc/guix.texi:18895
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} string head-include"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18846
-msgid "The content of the file specified with this option will be included verbatim in the HTML HEAD section on all pages."
+#: doc/guix.texi:18898
+msgid ""
+"The content of the file specified with this option will be included verbatim "
+"in the HTML HEAD section on all pages."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18851
+#: doc/guix.texi:18903
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} string header"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18854
-msgid "The content of the file specified with this option will be included verbatim at the top of all pages."
+#: doc/guix.texi:18906
+msgid ""
+"The content of the file specified with this option will be included verbatim "
+"at the top of all pages."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18859
+#: doc/guix.texi:18911
 #, no-wrap
-msgid "{@code{cgit-configuration} parameter} string include"
+msgid "{@code{cgit-configuration} parameter} file-object include"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18862
-msgid "Name of a configfile to include before the rest of the current config- file is parsed."
+#: doc/guix.texi:18914
+msgid ""
+"Name of a configfile to include before the rest of the current config- file "
+"is parsed."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18867
+#: doc/guix.texi:18919
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} string index-header"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18870
-msgid "The content of the file specified with this option will be included verbatim above the repository index."
+#: doc/guix.texi:18922
+msgid ""
+"The content of the file specified with this option will be included verbatim "
+"above the repository index."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18875
+#: doc/guix.texi:18927
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} string index-info"
 msgstr ""
 
-#. type: deftypevr
-#: doc/guix.texi:18878
-msgid "The content of the file specified with this option will be included verbatim below the heading on the repository index page."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:18883
-#, no-wrap
-msgid "{@code{cgit-configuration} parameter} boolean local-time?"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:18886
-msgid "Flag which, if set to @samp{#t}, makes cgit print commit and tag times in the servers timezone."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:18891
-#, no-wrap
-msgid "{@code{cgit-configuration} parameter} string logo"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:18894
-msgid "URL which specifies the source of an image which will be used as a logo on all cgit pages."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:18896
-msgid "Defaults to @samp{\"/share/cgit/cgit.png\"}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:18899
-#, no-wrap
-msgid "{@code{cgit-configuration} parameter} string logo-link"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:18901 doc/guix.texi:19349
-msgid "URL loaded when clicking on the cgit logo image."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:18906
-#, no-wrap
-msgid "{@code{cgit-configuration} parameter} string owner-filter"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:18909
-msgid "Command which will be invoked to format the Owner column of the main page."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:18914
-#, no-wrap
-msgid "{@code{cgit-configuration} parameter} integer max-atom-items"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:18916
-msgid "Number of items to display in atom feeds view."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:18918 doc/guix.texi:19144 doc/guix.texi:19152 doc/guix.texi:19160
-msgid "Defaults to @samp{10}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:18921
-#, no-wrap
-msgid "{@code{cgit-configuration} parameter} integer max-commit-count"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:18923
-msgid "Number of entries to list per page in \"log\" view."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:18925 doc/guix.texi:18940
-msgid "Defaults to @samp{50}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:18928
-#, no-wrap
-msgid "{@code{cgit-configuration} parameter} integer max-message-length"
-msgstr ""
-
 #. type: deftypevr
 #: doc/guix.texi:18930
-msgid "Number of commit message characters to display in \"log\" view."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:18932 doc/guix.texi:18948
-msgid "Defaults to @samp{80}."
+msgid ""
+"The content of the file specified with this option will be included verbatim "
+"below the heading on the repository index page."
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:18935
 #, no-wrap
-msgid "{@code{cgit-configuration} parameter} integer max-repo-count"
+msgid "{@code{cgit-configuration} parameter} boolean local-time?"
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:18938
-msgid "Specifies the number of entries to list per page on the repository index page."
+msgid ""
+"Flag which, if set to @samp{#t}, makes cgit print commit and tag times in "
+"the servers timezone."
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:18943
 #, no-wrap
-msgid "{@code{cgit-configuration} parameter} integer max-repodesc-length"
+msgid "{@code{cgit-configuration} parameter} file-object logo"
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:18946
-msgid "Specifies the maximum number of repo description characters to display on the repository index page."
+msgid ""
+"URL which specifies the source of an image which will be used as a logo on "
+"all cgit pages."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:18948
+msgid "Defaults to @samp{\"/share/cgit/cgit.png\"}."
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:18951
 #, no-wrap
-msgid "{@code{cgit-configuration} parameter} integer max-blob-size"
+msgid "{@code{cgit-configuration} parameter} string logo-link"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18953
-msgid "Specifies the maximum size of a blob to display HTML for in KBytes."
+#: doc/guix.texi:18953 doc/guix.texi:19410
+msgid "URL loaded when clicking on the cgit logo image."
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:18958
 #, no-wrap
-msgid "{@code{cgit-configuration} parameter} string max-stats"
+msgid "{@code{cgit-configuration} parameter} file-object owner-filter"
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:18961
-msgid "Maximum statistics period.  Valid values are @samp{week},@samp{month}, @samp{quarter} and @samp{year}."
+msgid ""
+"Command which will be invoked to format the Owner column of the main page."
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:18966
 #, no-wrap
-msgid "{@code{cgit-configuration} parameter} mimetype-alist mimetype"
+msgid "{@code{cgit-configuration} parameter} integer max-atom-items"
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:18968
-msgid "Mimetype for the specified filename extension."
+msgid "Number of items to display in atom feeds view."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18972
-msgid ""
-"Defaults to @samp{((gif \"image/gif\") (html \"text/html\") (jpg \"image/jpeg\") (jpeg \"image/jpeg\") (pdf \"application/pdf\") "
-"(png \"image/png\") (svg \"image/svg+xml\"))}."
+#: doc/guix.texi:18970 doc/guix.texi:19205 doc/guix.texi:19213
+#: doc/guix.texi:19221
+msgid "Defaults to @samp{10}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:18973
+#, no-wrap
+msgid "{@code{cgit-configuration} parameter} integer max-commit-count"
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:18975
-#, no-wrap
-msgid "{@code{cgit-configuration} parameter} string mimetype-file"
+msgid "Number of entries to list per page in \"log\" view."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18977
-msgid "Specifies the file to use for automatic mimetype lookup."
+#: doc/guix.texi:18977 doc/guix.texi:18992
+msgid "Defaults to @samp{50}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:18980
+#, no-wrap
+msgid "{@code{cgit-configuration} parameter} integer max-message-length"
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:18982
-#, no-wrap
-msgid "{@code{cgit-configuration} parameter} string module-link"
+msgid "Number of commit message characters to display in \"log\" view."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18985
-msgid "Text which will be used as the formatstring for a hyperlink when a submodule is printed in a directory listing."
+#: doc/guix.texi:18984 doc/guix.texi:19000
+msgid "Defaults to @samp{80}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:18987
+#, no-wrap
+msgid "{@code{cgit-configuration} parameter} integer max-repo-count"
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:18990
+msgid ""
+"Specifies the number of entries to list per page on the repository index "
+"page."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:18995
 #, no-wrap
-msgid "{@code{cgit-configuration} parameter} boolean nocache?"
+msgid "{@code{cgit-configuration} parameter} integer max-repodesc-length"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18992
-msgid "If set to the value @samp{#t} caching will be disabled."
+#: doc/guix.texi:18998
+msgid ""
+"Specifies the maximum number of repo description characters to display on "
+"the repository index page."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18997
+#: doc/guix.texi:19003
 #, no-wrap
-msgid "{@code{cgit-configuration} parameter} boolean noplainemail?"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:19000
-msgid "If set to @samp{#t} showing full author email addresses will be disabled."
+msgid "{@code{cgit-configuration} parameter} integer max-blob-size"
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:19005
-#, no-wrap
-msgid "{@code{cgit-configuration} parameter} boolean noheader?"
+msgid "Specifies the maximum size of a blob to display HTML for in KBytes."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19008
-msgid "Flag which, when set to @samp{#t}, will make cgit omit the standard header on all pages."
+#: doc/guix.texi:19010
+#, no-wrap
+msgid "{@code{cgit-configuration} parameter} string max-stats"
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:19013
-#, no-wrap
-msgid "{@code{cgit-configuration} parameter} string readme"
+msgid ""
+"Maximum statistics period.  Valid values are @samp{week},@samp{month}, "
+"@samp{quarter} and @samp{year}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19015
-msgid "Text which will be used as default value for @code{cgit-repo-readme}."
+#: doc/guix.texi:19018
+#, no-wrap
+msgid "{@code{cgit-configuration} parameter} mimetype-alist mimetype"
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:19020
-#, no-wrap
-msgid "{@code{cgit-configuration} parameter} boolean remove-suffix?"
+msgid "Mimetype for the specified filename extension."
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:19024
 msgid ""
-"If set to @code{#t} and @code{repository-directory} is enabled, if any repositories are found with a suffix of @code{.git}, this "
-"suffix will be removed for the URL and name."
+"Defaults to @samp{((gif \"image/gif\") (html \"text/html\") (jpg \"image/jpeg"
+"\") (jpeg \"image/jpeg\") (pdf \"application/pdf\") (png \"image/png\") (svg "
+"\"image/svg+xml\"))}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:19027
+#, no-wrap
+msgid "{@code{cgit-configuration} parameter} file-object mimetype-file"
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:19029
+msgid "Specifies the file to use for automatic mimetype lookup."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:19034
 #, no-wrap
-msgid "{@code{cgit-configuration} parameter} integer renamelimit"
+msgid "{@code{cgit-configuration} parameter} string module-link"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19031
-msgid "Maximum number of files to consider when detecting renames."
+#: doc/guix.texi:19037
+msgid ""
+"Text which will be used as the formatstring for a hyperlink when a submodule "
+"is printed in a directory listing."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19036
+#: doc/guix.texi:19042
 #, no-wrap
-msgid "{@code{cgit-configuration} parameter} string repository-sort"
+msgid "{@code{cgit-configuration} parameter} boolean nocache?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19038
-msgid "The way in which repositories in each section are sorted."
+#: doc/guix.texi:19044
+msgid "If set to the value @samp{#t} caching will be disabled."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19043
+#: doc/guix.texi:19049
 #, no-wrap
-msgid "{@code{cgit-configuration} parameter} robots-list robots"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:19045
-msgid "Text used as content for the @code{robots} meta-tag."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:19047
-msgid "Defaults to @samp{(\"noindex\" \"nofollow\")}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:19050
-#, no-wrap
-msgid "{@code{cgit-configuration} parameter} string root-desc"
+msgid "{@code{cgit-configuration} parameter} boolean noplainemail?"
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:19052
-msgid "Text printed below the heading on the repository index page."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:19054
-msgid "Defaults to @samp{\"a fast webinterface for the git dscm\"}."
+msgid ""
+"If set to @samp{#t} showing full author email addresses will be disabled."
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:19057
 #, no-wrap
-msgid "{@code{cgit-configuration} parameter} string root-readme"
+msgid "{@code{cgit-configuration} parameter} boolean noheader?"
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:19060
 msgid ""
-"The content of the file specified with this option will be included verbatim below thef \"about\" link on the repository index page."
+"Flag which, when set to @samp{#t}, will make cgit omit the standard header "
+"on all pages."
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:19065
 #, no-wrap
+msgid "{@code{cgit-configuration} parameter} list project-list"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:19069
+msgid ""
+"A list of subdirectories inside of @code{repository-directory}, relative to "
+"it, that should loaded as Git repositories.  An empty list means that all "
+"subdirectories will be loaded."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:19074
+#, no-wrap
+msgid "{@code{cgit-configuration} parameter} file-object readme"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:19076
+msgid "Text which will be used as default value for @code{cgit-repo-readme}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:19081
+#, no-wrap
+msgid "{@code{cgit-configuration} parameter} boolean remove-suffix?"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:19085
+msgid ""
+"If set to @code{#t} and @code{repository-directory} is enabled, if any "
+"repositories are found with a suffix of @code{.git}, this suffix will be "
+"removed for the URL and name."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:19090
+#, no-wrap
+msgid "{@code{cgit-configuration} parameter} integer renamelimit"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:19092
+msgid "Maximum number of files to consider when detecting renames."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:19097
+#, no-wrap
+msgid "{@code{cgit-configuration} parameter} string repository-sort"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:19099
+msgid "The way in which repositories in each section are sorted."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:19104
+#, no-wrap
+msgid "{@code{cgit-configuration} parameter} robots-list robots"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:19106
+msgid "Text used as content for the @code{robots} meta-tag."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:19108
+msgid "Defaults to @samp{(\"noindex\" \"nofollow\")}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:19111
+#, no-wrap
+msgid "{@code{cgit-configuration} parameter} string root-desc"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:19113
+msgid "Text printed below the heading on the repository index page."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:19115
+msgid "Defaults to @samp{\"a fast webinterface for the git dscm\"}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:19118
+#, no-wrap
+msgid "{@code{cgit-configuration} parameter} string root-readme"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:19121
+msgid ""
+"The content of the file specified with this option will be included verbatim "
+"below thef \"about\" link on the repository index page."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:19126
+#, no-wrap
 msgid "{@code{cgit-configuration} parameter} string root-title"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19067
+#: doc/guix.texi:19128
 msgid "Text printed as heading on the repository index page."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19072
+#: doc/guix.texi:19133
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} boolean scan-hidden-path"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19078
+#: doc/guix.texi:19139
 msgid ""
-"If set to @samp{#t} and repository-directory is enabled, repository-directory will recurse into directories whose name starts with a "
-"period.  Otherwise, repository-directory will stay away from such directories, considered as \"hidden\".  Note that this does not "
-"apply to the \".git\" directory in non-bare repos."
+"If set to @samp{#t} and repository-directory is enabled, repository-"
+"directory will recurse into directories whose name starts with a period.  "
+"Otherwise, repository-directory will stay away from such directories, "
+"considered as \"hidden\".  Note that this does not apply to the \".git\" "
+"directory in non-bare repos."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19083
+#: doc/guix.texi:19144
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} list snapshots"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19086
-msgid "Text which specifies the default set of snapshot formats that cgit generates links for."
+#: doc/guix.texi:19147
+msgid ""
+"Text which specifies the default set of snapshot formats that cgit generates "
+"links for."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19091
+#: doc/guix.texi:19152
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} repository-directory repository-directory"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19094
-msgid "Name of the directory to scan for repositories (represents @code{scan-path})."
+#: doc/guix.texi:19155
+msgid ""
+"Name of the directory to scan for repositories (represents @code{scan-path})."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19096
+#: doc/guix.texi:19157
 msgid "Defaults to @samp{\"/srv/git\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19099
+#: doc/guix.texi:19160
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} string section"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19102 doc/guix.texi:19418
-msgid "The name of the current repository section - all repositories defined after this option will inherit the current section name."
+#: doc/guix.texi:19163 doc/guix.texi:19479
+msgid ""
+"The name of the current repository section - all repositories defined after "
+"this option will inherit the current section name."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19107
+#: doc/guix.texi:19168
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} string section-sort"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19110
-msgid "Flag which, when set to @samp{1}, will sort the sections on the repository listing by name."
+#: doc/guix.texi:19171
+msgid ""
+"Flag which, when set to @samp{1}, will sort the sections on the repository "
+"listing by name."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19115
+#: doc/guix.texi:19176
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} integer section-from-path"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19118
+#: doc/guix.texi:19179
 msgid ""
-"A number which, if defined prior to repository-directory, specifies how many path elements from each repo path to use as a default "
-"section name."
+"A number which, if defined prior to repository-directory, specifies how many "
+"path elements from each repo path to use as a default section name."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19123
+#: doc/guix.texi:19184
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} boolean side-by-side-diffs?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19126
-msgid "If set to @samp{#t} shows side-by-side diffs instead of unidiffs per default."
+#: doc/guix.texi:19187
+msgid ""
+"If set to @samp{#t} shows side-by-side diffs instead of unidiffs per default."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19131
+#: doc/guix.texi:19192
 #, no-wrap
-msgid "{@code{cgit-configuration} parameter} string source-filter"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:19134
-msgid "Specifies a command which will be invoked to format plaintext blobs in the tree view."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:19139
-#, no-wrap
-msgid "{@code{cgit-configuration} parameter} integer summary-branches"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:19142
-msgid "Specifies the number of branches to display in the repository \"summary\" view."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:19147
-#, no-wrap
-msgid "{@code{cgit-configuration} parameter} integer summary-log"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:19150
-msgid "Specifies the number of log entries to display in the repository \"summary\" view."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:19155
-#, no-wrap
-msgid "{@code{cgit-configuration} parameter} integer summary-tags"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:19158
-msgid "Specifies the number of tags to display in the repository \"summary\" view."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:19163
-#, no-wrap
-msgid "{@code{cgit-configuration} parameter} string strict-export"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:19166
-msgid "Filename which, if specified, needs to be present within the repository for cgit to allow access to that repository."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:19171
-#, no-wrap
-msgid "{@code{cgit-configuration} parameter} string virtual-root"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:19173
-msgid "URL which, if specified, will be used as root for all cgit links."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:19175
-msgid "Defaults to @samp{\"/\"}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:19178
-#, no-wrap
-msgid "{@code{cgit-configuration} parameter} repository-cgit-configuration-list repositories"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:19180
-msgid "A list of @dfn{cgit-repo} records to use with config."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:19184
-msgid "Available @code{repository-cgit-configuration} fields are:"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:19185
-#, no-wrap
-msgid "{@code{repository-cgit-configuration} parameter} repo-list snapshots"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:19188
-msgid "A mask of snapshot formats for this repo that cgit generates links for, restricted by the global @code{snapshots} setting."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:19193
-#, no-wrap
-msgid "{@code{repository-cgit-configuration} parameter} repo-string source-filter"
+msgid "{@code{cgit-configuration} parameter} file-object source-filter"
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:19195
-msgid "Override the default @code{source-filter}."
+msgid ""
+"Specifies a command which will be invoked to format plaintext blobs in the "
+"tree view."
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:19200
 #, no-wrap
+msgid "{@code{cgit-configuration} parameter} integer summary-branches"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:19203
+msgid ""
+"Specifies the number of branches to display in the repository \"summary\" "
+"view."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:19208
+#, no-wrap
+msgid "{@code{cgit-configuration} parameter} integer summary-log"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:19211
+msgid ""
+"Specifies the number of log entries to display in the repository \"summary\" "
+"view."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:19216
+#, no-wrap
+msgid "{@code{cgit-configuration} parameter} integer summary-tags"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:19219
+msgid ""
+"Specifies the number of tags to display in the repository \"summary\" view."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:19224
+#, no-wrap
+msgid "{@code{cgit-configuration} parameter} string strict-export"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:19227
+msgid ""
+"Filename which, if specified, needs to be present within the repository for "
+"cgit to allow access to that repository."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:19232
+#, no-wrap
+msgid "{@code{cgit-configuration} parameter} string virtual-root"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:19234
+msgid "URL which, if specified, will be used as root for all cgit links."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:19236
+msgid "Defaults to @samp{\"/\"}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:19239
+#, no-wrap
+msgid "{@code{cgit-configuration} parameter} repository-cgit-configuration-list repositories"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:19241
+msgid "A list of @dfn{cgit-repo} records to use with config."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:19245
+msgid "Available @code{repository-cgit-configuration} fields are:"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:19246
+#, no-wrap
+msgid "{@code{repository-cgit-configuration} parameter} repo-list snapshots"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:19249
+msgid ""
+"A mask of snapshot formats for this repo that cgit generates links for, "
+"restricted by the global @code{snapshots} setting."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:19254
+#, no-wrap
+msgid "{@code{repository-cgit-configuration} parameter} repo-file-object source-filter"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:19256
+msgid "Override the default @code{source-filter}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:19261
+#, no-wrap
 msgid "{@code{repository-cgit-configuration} parameter} repo-string url"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19202
+#: doc/guix.texi:19263
 msgid "The relative URL used to access the repository."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19207
+#: doc/guix.texi:19268
 #, no-wrap
-msgid "{@code{repository-cgit-configuration} parameter} repo-string about-filter"
+msgid "{@code{repository-cgit-configuration} parameter} repo-file-object about-filter"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19209
+#: doc/guix.texi:19270
 msgid "Override the default @code{about-filter}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19214
+#: doc/guix.texi:19275
 #, no-wrap
 msgid "{@code{repository-cgit-configuration} parameter} repo-string branch-sort"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19217
+#: doc/guix.texi:19278
 msgid ""
-"Flag which, when set to @samp{age}, enables date ordering in the branch ref list, and when set to @samp{name} enables ordering by "
-"branch name."
+"Flag which, when set to @samp{age}, enables date ordering in the branch ref "
+"list, and when set to @samp{name} enables ordering by branch name."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19222
+#: doc/guix.texi:19283
 #, no-wrap
 msgid "{@code{repository-cgit-configuration} parameter} repo-list clone-url"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19224
+#: doc/guix.texi:19285
 msgid "A list of URLs which can be used to clone repo."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19229
+#: doc/guix.texi:19290
 #, no-wrap
-msgid "{@code{repository-cgit-configuration} parameter} repo-string commit-filter"
+msgid "{@code{repository-cgit-configuration} parameter} repo-file-object commit-filter"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19231
+#: doc/guix.texi:19292
 msgid "Override the default @code{commit-filter}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19236
+#: doc/guix.texi:19297
 #, no-wrap
 msgid "{@code{repository-cgit-configuration} parameter} repo-string commit-sort"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19245
+#: doc/guix.texi:19306
 #, no-wrap
 msgid "{@code{repository-cgit-configuration} parameter} repo-string defbranch"
 msgstr ""
 
-#. type: deftypevr
-#: doc/guix.texi:19250
-msgid ""
-"The name of the default branch for this repository.  If no such branch exists in the repository, the first branch name (when sorted) "
-"is used as default instead.  By default branch pointed to by HEAD, or \"master\" if there is no suitable HEAD."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:19255
-#, no-wrap
-msgid "{@code{repository-cgit-configuration} parameter} repo-string desc"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:19257
-msgid "The value to show as repository description."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:19262
-#, no-wrap
-msgid "{@code{repository-cgit-configuration} parameter} repo-string homepage"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:19264
-msgid "The value to show as repository homepage."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:19269
-#, no-wrap
-msgid "{@code{repository-cgit-configuration} parameter} repo-string email-filter"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:19271
-msgid "Override the default @code{email-filter}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:19276
-#, no-wrap
-msgid "{@code{repository-cgit-configuration} parameter} repo-boolean enable-commit-graph?"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:19279
-msgid "A flag which can be used to disable the global setting @code{enable-commit-graph?}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:19284
-#, no-wrap
-msgid "{@code{repository-cgit-configuration} parameter} repo-boolean enable-log-filecount?"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:19287
-msgid "A flag which can be used to disable the global setting @code{enable-log-filecount?}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:19292
-#, no-wrap
-msgid "{@code{repository-cgit-configuration} parameter} repo-boolean enable-log-linecount?"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:19295
-msgid "A flag which can be used to disable the global setting @code{enable-log-linecount?}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:19300
-#, no-wrap
-msgid "{@code{repository-cgit-configuration} parameter} repo-boolean enable-remote-branches?"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:19308
-#, no-wrap
-msgid "{@code{repository-cgit-configuration} parameter} repo-boolean enable-subject-links?"
-msgstr ""
-
 #. type: deftypevr
 #: doc/guix.texi:19311
-msgid "A flag which can be used to override the global setting @code{enable-subject-links?}."
+msgid ""
+"The name of the default branch for this repository.  If no such branch "
+"exists in the repository, the first branch name (when sorted) is used as "
+"default instead.  By default branch pointed to by HEAD, or \"master\" if "
+"there is no suitable HEAD."
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:19316
 #, no-wrap
-msgid "{@code{repository-cgit-configuration} parameter} repo-boolean enable-html-serving?"
+msgid "{@code{repository-cgit-configuration} parameter} repo-string desc"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19319
-msgid "A flag which can be used to override the global setting @code{enable-html-serving?}."
+#: doc/guix.texi:19318
+msgid "The value to show as repository description."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19324
+#: doc/guix.texi:19323
 #, no-wrap
-msgid "{@code{repository-cgit-configuration} parameter} repo-boolean hide?"
+msgid "{@code{repository-cgit-configuration} parameter} repo-string homepage"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19327
-msgid "Flag which, when set to @code{#t}, hides the repository from the repository index."
+#: doc/guix.texi:19325
+msgid "The value to show as repository homepage."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:19330
+#, no-wrap
+msgid "{@code{repository-cgit-configuration} parameter} repo-file-object email-filter"
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:19332
+msgid "Override the default @code{email-filter}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:19337
 #, no-wrap
-msgid "{@code{repository-cgit-configuration} parameter} repo-boolean ignore?"
+msgid "{@code{repository-cgit-configuration} parameter} repo-boolean enable-commit-graph?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19334
-msgid "Flag which, when set to @samp{#t}, ignores the repository."
+#: doc/guix.texi:19340
+msgid ""
+"A flag which can be used to disable the global setting @code{enable-commit-"
+"graph?}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19339
+#: doc/guix.texi:19345
 #, no-wrap
-msgid "{@code{repository-cgit-configuration} parameter} repo-string logo"
+msgid "{@code{repository-cgit-configuration} parameter} repo-boolean enable-log-filecount?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19342
-msgid "URL which specifies the source of an image which will be used as a logo on this repo’s pages."
+#: doc/guix.texi:19348
+msgid ""
+"A flag which can be used to disable the global setting @code{enable-log-"
+"filecount?}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19347
+#: doc/guix.texi:19353
 #, no-wrap
-msgid "{@code{repository-cgit-configuration} parameter} repo-string logo-link"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:19354
-#, no-wrap
-msgid "{@code{repository-cgit-configuration} parameter} repo-string owner-filter"
+msgid "{@code{repository-cgit-configuration} parameter} repo-boolean enable-log-linecount?"
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:19356
-msgid "Override the default @code{owner-filter}."
+msgid ""
+"A flag which can be used to disable the global setting @code{enable-log-"
+"linecount?}."
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:19361
 #, no-wrap
-msgid "{@code{repository-cgit-configuration} parameter} repo-string module-link"
+msgid "{@code{repository-cgit-configuration} parameter} repo-boolean enable-remote-branches?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19365
+#: doc/guix.texi:19369
+#, no-wrap
+msgid "{@code{repository-cgit-configuration} parameter} repo-boolean enable-subject-links?"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:19372
 msgid ""
-"Text which will be used as the formatstring for a hyperlink when a submodule is printed in a directory listing.  The arguments for "
-"the formatstring are the path and SHA1 of the submodule commit."
+"A flag which can be used to override the global setting @code{enable-subject-"
+"links?}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19370
+#: doc/guix.texi:19377
 #, no-wrap
-msgid "{@code{repository-cgit-configuration} parameter} module-link-path module-link-path"
+msgid "{@code{repository-cgit-configuration} parameter} repo-boolean enable-html-serving?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19374
+#: doc/guix.texi:19380
 msgid ""
-"Text which will be used as the formatstring for a hyperlink when a submodule with the specified subdirectory path is printed in a "
-"directory listing."
+"A flag which can be used to override the global setting @code{enable-html-"
+"serving?}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19379
+#: doc/guix.texi:19385
 #, no-wrap
-msgid "{@code{repository-cgit-configuration} parameter} repo-string max-stats"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:19381
-msgid "Override the default maximum statistics period."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:19386
-#, no-wrap
-msgid "{@code{repository-cgit-configuration} parameter} repo-string name"
+msgid "{@code{repository-cgit-configuration} parameter} repo-boolean hide?"
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:19388
-msgid "The value to show as repository name."
+msgid ""
+"Flag which, when set to @code{#t}, hides the repository from the repository "
+"index."
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:19393
 #, no-wrap
-msgid "{@code{repository-cgit-configuration} parameter} repo-string owner"
+msgid "{@code{repository-cgit-configuration} parameter} repo-boolean ignore?"
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:19395
-msgid "A value used to identify the owner of the repository."
+msgid "Flag which, when set to @samp{#t}, ignores the repository."
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:19400
 #, no-wrap
-msgid "{@code{repository-cgit-configuration} parameter} repo-string path"
+msgid "{@code{repository-cgit-configuration} parameter} repo-file-object logo"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19402
-msgid "An absolute path to the repository directory."
+#: doc/guix.texi:19403
+msgid ""
+"URL which specifies the source of an image which will be used as a logo on "
+"this repo’s pages."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19407
+#: doc/guix.texi:19408
 #, no-wrap
-msgid "{@code{repository-cgit-configuration} parameter} repo-string readme"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:19410
-msgid "A path (relative to repo) which specifies a file to include verbatim as the \"About\" page for this repo."
+msgid "{@code{repository-cgit-configuration} parameter} repo-string logo-link"
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:19415
 #, no-wrap
+msgid "{@code{repository-cgit-configuration} parameter} repo-file-object owner-filter"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:19417
+msgid "Override the default @code{owner-filter}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:19422
+#, no-wrap
+msgid "{@code{repository-cgit-configuration} parameter} repo-string module-link"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:19426
+msgid ""
+"Text which will be used as the formatstring for a hyperlink when a submodule "
+"is printed in a directory listing.  The arguments for the formatstring are "
+"the path and SHA1 of the submodule commit."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:19431
+#, no-wrap
+msgid "{@code{repository-cgit-configuration} parameter} module-link-path module-link-path"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:19435
+msgid ""
+"Text which will be used as the formatstring for a hyperlink when a submodule "
+"with the specified subdirectory path is printed in a directory listing."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:19440
+#, no-wrap
+msgid "{@code{repository-cgit-configuration} parameter} repo-string max-stats"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:19442
+msgid "Override the default maximum statistics period."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:19447
+#, no-wrap
+msgid "{@code{repository-cgit-configuration} parameter} repo-string name"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:19449
+msgid "The value to show as repository name."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:19454
+#, no-wrap
+msgid "{@code{repository-cgit-configuration} parameter} repo-string owner"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:19456
+msgid "A value used to identify the owner of the repository."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:19461
+#, no-wrap
+msgid "{@code{repository-cgit-configuration} parameter} repo-string path"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:19463
+msgid "An absolute path to the repository directory."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:19468
+#, no-wrap
+msgid "{@code{repository-cgit-configuration} parameter} repo-string readme"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:19471
+msgid ""
+"A path (relative to repo) which specifies a file to include verbatim as the "
+"\"About\" page for this repo."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:19476
+#, no-wrap
 msgid "{@code{repository-cgit-configuration} parameter} repo-string section"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19423
+#: doc/guix.texi:19484
 #, no-wrap
 msgid "{@code{repository-cgit-configuration} parameter} repo-list extra-options"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19425 doc/guix.texi:19434
+#: doc/guix.texi:19486 doc/guix.texi:19495
 msgid "Extra options will be appended to cgitrc file."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19432
+#: doc/guix.texi:19493
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} list extra-options"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:19445
+#: doc/guix.texi:19507
 msgid ""
-"However, it could be that you just want to get a @code{cgitrc} up and running.  In that case, you can pass an @code{opaque-cgit-"
-"configuration} as a record to @code{cgit-service-type}.  As its name indicates, an opaque configuration does not have easy "
-"reflective capabilities."
+"However, it could be that you just want to get a @code{cgitrc} up and "
+"running.  In that case, you can pass an @code{opaque-cgit-configuration} as "
+"a record to @code{cgit-service-type}.  As its name indicates, an opaque "
+"configuration does not have easy reflective capabilities."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:19447
+#: doc/guix.texi:19509
 msgid "Available @code{opaque-cgit-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19448
+#: doc/guix.texi:19510
 #, no-wrap
 msgid "{@code{opaque-cgit-configuration} parameter} package cgit"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19450
+#: doc/guix.texi:19512
 msgid "The cgit package."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19452
+#: doc/guix.texi:19514
 #, no-wrap
 msgid "{@code{opaque-cgit-configuration} parameter} string string"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19454
+#: doc/guix.texi:19516
 msgid "The contents of the @code{cgitrc}, as a string."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:19458
-msgid "For example, if your @code{cgitrc} is just the empty string, you could instantiate a cgit service like this:"
+#: doc/guix.texi:19520
+msgid ""
+"For example, if your @code{cgitrc} is just the empty string, you could "
+"instantiate a cgit service like this:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:19463
+#: doc/guix.texi:19525
 #, no-wrap
 msgid ""
 "(service cgit-service-type\n"
@@ -37530,108 +42428,113 @@ msgid ""
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:19469
+#: doc/guix.texi:19531
 #, no-wrap
 msgid "The Battle for Wesnoth Service"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:19470
+#: doc/guix.texi:19532
 #, no-wrap
 msgid "wesnothd"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:19474
+#: doc/guix.texi:19536
 msgid ""
-"@uref{https://wesnoth.org, The Battle for Wesnoth} is a fantasy, turn based tactical strategy game, with several single player "
-"campaigns, and multiplayer games (both networked and local)."
+"@uref{https://wesnoth.org, The Battle for Wesnoth} is a fantasy, turn based "
+"tactical strategy game, with several single player campaigns, and "
+"multiplayer games (both networked and local)."
 msgstr ""
 
 #. type: defvar
-#: doc/guix.texi:19475
+#: doc/guix.texi:19537
 #, no-wrap
 msgid "{Scheme Variable} wesnothd-service-type"
 msgstr ""
 
 #. type: defvar
-#: doc/guix.texi:19479
+#: doc/guix.texi:19541
 msgid ""
-"Service type for the wesnothd service.  Its value must be a @code{wesnothd-configuration} object.  To run wesnothd in the default "
-"configuration, instantiate it as:"
+"Service type for the wesnothd service.  Its value must be a @code{wesnothd-"
+"configuration} object.  To run wesnothd in the default configuration, "
+"instantiate it as:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:19482
+#: doc/guix.texi:19544
 #, no-wrap
 msgid "(service wesnothd-service-type)\n"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:19485
+#: doc/guix.texi:19547
 #, no-wrap
 msgid "{Data Type} wesnothd-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:19487
+#: doc/guix.texi:19549
 msgid "Data type representing the configuration of @command{wesnothd}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19489
+#: doc/guix.texi:19551
 #, no-wrap
 msgid "@code{package} (default: @code{wesnoth-server})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19491
+#: doc/guix.texi:19553
 msgid "The wesnoth server package to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19492
+#: doc/guix.texi:19554
 #, no-wrap
 msgid "@code{port} (default: @code{15000})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19494
+#: doc/guix.texi:19556
 msgid "The port to bind the server to."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:19500
+#: doc/guix.texi:19562
 #, no-wrap
 msgid "sysctl"
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:19501
+#: doc/guix.texi:19563
 #, no-wrap
 msgid "System Control Service"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:19505
-msgid "The @code{(gnu services sysctl)} provides a service to configure kernel parameters at boot."
+#: doc/guix.texi:19567
+msgid ""
+"The @code{(gnu services sysctl)} provides a service to configure kernel "
+"parameters at boot."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:19506
+#: doc/guix.texi:19568
 #, no-wrap
 msgid "{Scheme Variable} sysctl-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:19510
+#: doc/guix.texi:19572
 msgid ""
-"The service type for @command{sysctl}, which modifies kernel parameters under @file{/proc/sys/}.  To enable IPv4 forwarding, it can "
-"be instantiated as:"
+"The service type for @command{sysctl}, which modifies kernel parameters "
+"under @file{/proc/sys/}.  To enable IPv4 forwarding, it can be instantiated "
+"as:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:19515
+#: doc/guix.texi:19577
 #, no-wrap
 msgid ""
 "(service sysctl-service-type\n"
@@ -37640,314 +42543,331 @@ msgid ""
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:19518
+#: doc/guix.texi:19580
 #, no-wrap
 msgid "{Data Type} sysctl-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:19520
+#: doc/guix.texi:19582
 msgid "The data type representing the configuration of @command{sysctl}."
 msgstr ""
 
-#. type: item
-#: doc/guix.texi:19522
-#, no-wrap
-msgid "@code{sysctl} (default: @code{(file-append procps \"/sbin/sysctl\"})"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:19524
-msgid "The @command{sysctl} executable to use."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:19525
-#, no-wrap
-msgid "@code{settings} (default: @code{'()})"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:19527
-msgid "An association list specifies kernel parameters and their values."
-msgstr ""
-
-#. type: cindex
-#: doc/guix.texi:19530
-#, no-wrap
-msgid "lirc"
-msgstr ""
-
-#. type: subsubheading
-#: doc/guix.texi:19531
-#, no-wrap
-msgid "Lirc Service"
-msgstr ""
-
-#. type: Plain text
-#: doc/guix.texi:19534
-msgid "The @code{(gnu services lirc)} module provides the following service."
-msgstr ""
-
-#. type: deffn
-#: doc/guix.texi:19535
-#, no-wrap
-msgid "{Scheme Procedure} lirc-service [#:lirc lirc] @"
-msgstr ""
-
-#. type: deffn
-#: doc/guix.texi:19540
-msgid ""
-"[#:device #f] [#:driver #f] [#:config-file #f] @ [#:extra-options '()] Return a service that runs @url{http://www.lirc.org,LIRC}, a "
-"daemon that decodes infrared signals from remote controls."
-msgstr ""
-
-#. type: deffn
-#: doc/guix.texi:19544
-msgid ""
-"Optionally, @var{device}, @var{driver} and @var{config-file} (configuration file name) may be specified.  See @command{lircd} manual "
-"for details."
-msgstr ""
-
-#. type: deffn
-#: doc/guix.texi:19547
-msgid "Finally, @var{extra-options} is a list of additional command-line options passed to @command{lircd}."
-msgstr ""
-
-#. type: cindex
-#: doc/guix.texi:19549
-#, no-wrap
-msgid "spice"
-msgstr ""
-
-#. type: subsubheading
-#: doc/guix.texi:19550
-#, no-wrap
-msgid "Spice Service"
-msgstr ""
-
-#. type: Plain text
-#: doc/guix.texi:19553
-msgid "The @code{(gnu services spice)} module provides the following service."
-msgstr ""
-
-#. type: deffn
-#: doc/guix.texi:19554
-#, no-wrap
-msgid "{Scheme Procedure} spice-vdagent-service [#:spice-vdagent]"
-msgstr ""
-
-#. type: deffn
-#: doc/guix.texi:19558
-msgid ""
-"Returns a service that runs @url{http://www.spice-space.org,VDAGENT}, a daemon that enables sharing the clipboard with a vm and "
-"setting the guest display resolution when the graphical console window resizes."
-msgstr ""
-
-#. type: subsubsection
-#: doc/guix.texi:19560
-#, no-wrap
-msgid "Dictionary Services"
-msgstr ""
-
-#. type: cindex
-#: doc/guix.texi:19561
-#, no-wrap
-msgid "dictionary"
-msgstr ""
-
-#. type: Plain text
-#: doc/guix.texi:19563
-msgid "The @code{(gnu services dict)} module provides the following service:"
-msgstr ""
-
-#. type: deffn
-#: doc/guix.texi:19564
-#, no-wrap
-msgid "{Scheme Procedure} dicod-service [#:config (dicod-configuration)]"
-msgstr ""
-
-#. type: deffn
-#: doc/guix.texi:19567
-msgid ""
-"Return a service that runs the @command{dicod} daemon, an implementation of DICT server (@pxref{Dicod,,, dico, GNU Dico Manual})."
-msgstr ""
-
-#. type: deffn
-#: doc/guix.texi:19571
-msgid ""
-"The optional @var{config} argument specifies the configuration for @command{dicod}, which should be a @code{<dicod-configuration>} "
-"object, by default it serves the GNU Collaborative International Dictonary of English."
-msgstr ""
-
-#. type: deffn
-#: doc/guix.texi:19575
-msgid ""
-"You can add @command{open localhost} to your @file{~/.dico} file to make @code{localhost} the default server for @command{dico} "
-"client (@pxref{Initialization File,,, dico, GNU Dico Manual})."
-msgstr ""
-
-#. type: deftp
-#: doc/guix.texi:19577
-#, no-wrap
-msgid "{Data Type} dicod-configuration"
-msgstr ""
-
-#. type: deftp
-#: doc/guix.texi:19579
-msgid "Data type representing the configuration of dicod."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:19581
-#, no-wrap
-msgid "@code{dico} (default: @var{dico})"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:19583
-msgid "Package object of the GNU Dico dictionary server."
-msgstr ""
-
 #. type: item
 #: doc/guix.texi:19584
 #, no-wrap
+msgid "@code{sysctl} (default: @code{(file-append procps \"/sbin/sysctl\"})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:19586
+msgid "The @command{sysctl} executable to use."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:19587
+#, no-wrap
+msgid "@code{settings} (default: @code{'()})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:19589
+msgid "An association list specifies kernel parameters and their values."
+msgstr ""
+
+#. type: cindex
+#: doc/guix.texi:19592
+#, no-wrap
+msgid "lirc"
+msgstr ""
+
+#. type: subsubheading
+#: doc/guix.texi:19593
+#, no-wrap
+msgid "Lirc Service"
+msgstr ""
+
+#. type: Plain text
+#: doc/guix.texi:19596
+msgid "The @code{(gnu services lirc)} module provides the following service."
+msgstr ""
+
+#. type: deffn
+#: doc/guix.texi:19597
+#, no-wrap
+msgid "{Scheme Procedure} lirc-service [#:lirc lirc] @"
+msgstr ""
+
+#. type: deffn
+#: doc/guix.texi:19602
+msgid ""
+"[#:device #f] [#:driver #f] [#:config-file #f] @ [#:extra-options '()] "
+"Return a service that runs @url{http://www.lirc.org,LIRC}, a daemon that "
+"decodes infrared signals from remote controls."
+msgstr ""
+
+#. type: deffn
+#: doc/guix.texi:19606
+msgid ""
+"Optionally, @var{device}, @var{driver} and @var{config-file} (configuration "
+"file name) may be specified.  See @command{lircd} manual for details."
+msgstr ""
+
+#. type: deffn
+#: doc/guix.texi:19609
+msgid ""
+"Finally, @var{extra-options} is a list of additional command-line options "
+"passed to @command{lircd}."
+msgstr ""
+
+#. type: cindex
+#: doc/guix.texi:19611
+#, no-wrap
+msgid "spice"
+msgstr ""
+
+#. type: subsubheading
+#: doc/guix.texi:19612
+#, no-wrap
+msgid "Spice Service"
+msgstr ""
+
+#. type: Plain text
+#: doc/guix.texi:19615
+msgid "The @code{(gnu services spice)} module provides the following service."
+msgstr ""
+
+#. type: deffn
+#: doc/guix.texi:19616
+#, no-wrap
+msgid "{Scheme Procedure} spice-vdagent-service [#:spice-vdagent]"
+msgstr ""
+
+#. type: deffn
+#: doc/guix.texi:19620
+msgid ""
+"Returns a service that runs @url{http://www.spice-space.org,VDAGENT}, a "
+"daemon that enables sharing the clipboard with a vm and setting the guest "
+"display resolution when the graphical console window resizes."
+msgstr ""
+
+#. type: subsubsection
+#: doc/guix.texi:19622
+#, no-wrap
+msgid "Dictionary Services"
+msgstr ""
+
+#. type: cindex
+#: doc/guix.texi:19623
+#, no-wrap
+msgid "dictionary"
+msgstr ""
+
+#. type: Plain text
+#: doc/guix.texi:19625
+msgid "The @code{(gnu services dict)} module provides the following service:"
+msgstr ""
+
+#. type: deffn
+#: doc/guix.texi:19626
+#, no-wrap
+msgid "{Scheme Procedure} dicod-service [#:config (dicod-configuration)]"
+msgstr ""
+
+#. type: deffn
+#: doc/guix.texi:19629
+msgid ""
+"Return a service that runs the @command{dicod} daemon, an implementation of "
+"DICT server (@pxref{Dicod,,, dico, GNU Dico Manual})."
+msgstr ""
+
+#. type: deffn
+#: doc/guix.texi:19633
+msgid ""
+"The optional @var{config} argument specifies the configuration for "
+"@command{dicod}, which should be a @code{<dicod-configuration>} object, by "
+"default it serves the GNU Collaborative International Dictonary of English."
+msgstr ""
+
+#. type: deffn
+#: doc/guix.texi:19637
+msgid ""
+"You can add @command{open localhost} to your @file{~/.dico} file to make "
+"@code{localhost} the default server for @command{dico} client "
+"(@pxref{Initialization File,,, dico, GNU Dico Manual})."
+msgstr ""
+
+#. type: deftp
+#: doc/guix.texi:19639
+#, no-wrap
+msgid "{Data Type} dicod-configuration"
+msgstr ""
+
+#. type: deftp
+#: doc/guix.texi:19641
+msgid "Data type representing the configuration of dicod."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:19643
+#, no-wrap
+msgid "@code{dico} (default: @var{dico})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:19645
+msgid "Package object of the GNU Dico dictionary server."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:19646
+#, no-wrap
 msgid "@code{interfaces} (default: @var{'(\"localhost\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19588
+#: doc/guix.texi:19650
 msgid ""
-"This is the list of IP addresses and ports and possibly socket file names to listen to (@pxref{Server Settings, @code{listen} "
-"directive,, dico, GNU Dico Manual})."
+"This is the list of IP addresses and ports and possibly socket file names to "
+"listen to (@pxref{Server Settings, @code{listen} directive,, dico, GNU Dico "
+"Manual})."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19589
+#: doc/guix.texi:19651
 #, no-wrap
 msgid "@code{handlers} (default: @var{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19591
-msgid "List of @code{<dicod-handler>} objects denoting handlers (module instances)."
+#: doc/guix.texi:19653
+msgid ""
+"List of @code{<dicod-handler>} objects denoting handlers (module instances)."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19592
+#: doc/guix.texi:19654
 #, no-wrap
 msgid "@code{databases} (default: @var{(list %dicod-database:gcide)})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19594
-msgid "List of @code{<dicod-database>} objects denoting dictionaries to be served."
+#: doc/guix.texi:19656
+msgid ""
+"List of @code{<dicod-database>} objects denoting dictionaries to be served."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:19597
+#: doc/guix.texi:19659
 #, no-wrap
 msgid "{Data Type} dicod-handler"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:19599
+#: doc/guix.texi:19661
 msgid "Data type representing a dictionary handler (module instance)."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19603
+#: doc/guix.texi:19665
 msgid "Name of the handler (module instance)."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19604
+#: doc/guix.texi:19666
 #, no-wrap
 msgid "@code{module} (default: @var{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19608
+#: doc/guix.texi:19670
 msgid ""
-"Name of the dicod module of the handler (instance).  If it is @code{#f}, the module has the same name as the handler.  "
-"(@pxref{Modules,,, dico, GNU Dico Manual})."
+"Name of the dicod module of the handler (instance).  If it is @code{#f}, the "
+"module has the same name as the handler.  (@pxref{Modules,,, dico, GNU Dico "
+"Manual})."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:19609 doc/guix.texi:19629
+#: doc/guix.texi:19671 doc/guix.texi:19691
 #, no-wrap
 msgid "options"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19611
-msgid "List of strings or gexps representing the arguments for the module handler"
+#: doc/guix.texi:19673
+msgid ""
+"List of strings or gexps representing the arguments for the module handler"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:19614
+#: doc/guix.texi:19676
 #, no-wrap
 msgid "{Data Type} dicod-database"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:19616
+#: doc/guix.texi:19678
 msgid "Data type representing a dictionary database."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19620
+#: doc/guix.texi:19682
 msgid "Name of the database, will be used in DICT commands."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:19621
+#: doc/guix.texi:19683
 #, no-wrap
 msgid "handler"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19624
-msgid "Name of the dicod handler (module instance) used by this database (@pxref{Handlers,,, dico, GNU Dico Manual})."
+#: doc/guix.texi:19686
+msgid ""
+"Name of the dicod handler (module instance) used by this database "
+"(@pxref{Handlers,,, dico, GNU Dico Manual})."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19625
+#: doc/guix.texi:19687
 #, no-wrap
 msgid "@code{complex?} (default: @var{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19628
+#: doc/guix.texi:19690
 msgid ""
-"Whether the database configuration complex.  The complex configuration will need a corresponding @code{<dicod-handler>} object, "
-"otherwise not."
+"Whether the database configuration complex.  The complex configuration will "
+"need a corresponding @code{<dicod-handler>} object, otherwise not."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19632
-msgid "List of strings or gexps representing the arguments for the database (@pxref{Databases,,, dico, GNU Dico Manual})."
+#: doc/guix.texi:19694
+msgid ""
+"List of strings or gexps representing the arguments for the database "
+"(@pxref{Databases,,, dico, GNU Dico Manual})."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:19635
+#: doc/guix.texi:19697
 #, no-wrap
 msgid "{Scheme Variable} %dicod-database:gcide"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:19638
+#: doc/guix.texi:19700
 msgid ""
-"A @code{<dicod-database>} object serving the GNU Collaborative International Dictionary of English using the @code{gcide} package."
+"A @code{<dicod-database>} object serving the GNU Collaborative International "
+"Dictionary of English using the @code{gcide} package."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:19641
+#: doc/guix.texi:19703
 msgid "The following is an example @code{dicod-service} configuration."
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:19656
+#: doc/guix.texi:19718
 #, no-wrap
 msgid ""
 "(dicod-service #:config\n"
@@ -37966,139 +42886,162 @@ msgid ""
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:19661
+#: doc/guix.texi:19723
 #, no-wrap
 msgid "setuid programs"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:19671
+#: doc/guix.texi:19733
 msgid ""
-"Some programs need to run with ``root'' privileges, even when they are launched by unprivileged users.  A notorious example is the "
-"@command{passwd} program, which users can run to change their password, and which needs to access the @file{/etc/passwd} and @file{/"
-"etc/shadow} files---something normally restricted to root, for obvious security reasons.  To address that, these executables are "
-"@dfn{setuid-root}, meaning that they always run with root privileges (@pxref{How Change Persona,,, libc, The GNU C Library Reference "
-"Manual}, for more info about the setuid mechanism.)"
+"Some programs need to run with ``root'' privileges, even when they are "
+"launched by unprivileged users.  A notorious example is the @command{passwd} "
+"program, which users can run to change their password, and which needs to "
+"access the @file{/etc/passwd} and @file{/etc/shadow} files---something "
+"normally restricted to root, for obvious security reasons.  To address that, "
+"these executables are @dfn{setuid-root}, meaning that they always run with "
+"root privileges (@pxref{How Change Persona,,, libc, The GNU C Library "
+"Reference Manual}, for more info about the setuid mechanism.)"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:19678
+#: doc/guix.texi:19740
 msgid ""
-"The store itself @emph{cannot} contain setuid programs: that would be a security issue since any user on the system can write "
-"derivations that populate the store (@pxref{The Store}).  Thus, a different mechanism is used: instead of changing the setuid bit "
-"directly on files that are in the store, we let the system administrator @emph{declare} which programs should be setuid root."
-msgstr ""
-
-#. type: Plain text
-#: doc/guix.texi:19684
-msgid ""
-"The @code{setuid-programs} field of an @code{operating-system} declaration contains a list of G-expressions denoting the names of "
-"programs to be setuid-root (@pxref{Using the Configuration System}).  For instance, the @command{passwd} program, which is part of "
-"the Shadow package, can be designated by this G-expression (@pxref{G-Expressions}):"
-msgstr ""
-
-#. type: example
-#: doc/guix.texi:19687
-#, no-wrap
-msgid "#~(string-append #$shadow \"/bin/passwd\")\n"
-msgstr ""
-
-#. type: Plain text
-#: doc/guix.texi:19691
-msgid "A default set of setuid programs is defined by the @code{%setuid-programs} variable of the @code{(gnu system)} module."
-msgstr ""
-
-#. type: defvr
-#: doc/guix.texi:19692
-#, no-wrap
-msgid "{Scheme Variable} %setuid-programs"
-msgstr ""
-
-#. type: defvr
-#: doc/guix.texi:19694
-msgid "A list of G-expressions denoting common programs that are setuid-root."
-msgstr ""
-
-#. type: defvr
-#: doc/guix.texi:19697
-msgid "The list includes commands such as @command{passwd}, @command{ping}, @command{su}, and @command{sudo}."
-msgstr ""
-
-#. type: Plain text
-#: doc/guix.texi:19703
-msgid ""
-"Under the hood, the actual setuid programs are created in the @file{/run/setuid-programs} directory at system activation time.  The "
-"files in this directory refer to the ``real'' binaries, which are in the store."
-msgstr ""
-
-#. type: cindex
-#: doc/guix.texi:19707
-#, no-wrap
-msgid "HTTPS, certificates"
-msgstr ""
-
-#. type: cindex
-#: doc/guix.texi:19708
-#, no-wrap
-msgid "X.509 certificates"
-msgstr ""
-
-#. type: cindex
-#: doc/guix.texi:19709
-#, no-wrap
-msgid "TLS"
-msgstr ""
-
-#. type: Plain text
-#: doc/guix.texi:19716
-msgid ""
-"Web servers available over HTTPS (that is, HTTP over the transport-layer security mechanism, TLS) send client programs an @dfn{X.509 "
-"certificate} that the client can then use to @emph{authenticate} the server.  To do that, clients verify that the server's "
-"certificate is signed by a so-called @dfn{certificate authority} (CA).  But to verify the CA's signature, clients must have first "
-"acquired the CA's certificate."
-msgstr ""
-
-#. type: Plain text
-#: doc/guix.texi:19720
-msgid ""
-"Web browsers such as GNU@tie{}IceCat include their own set of CA certificates, such that they are able to verify CA signatures out-"
-"of-the-box."
-msgstr ""
-
-#. type: Plain text
-#: doc/guix.texi:19724
-msgid ""
-"However, most other programs that can talk HTTPS---@command{wget}, @command{git}, @command{w3m}, etc.---need to be told where CA "
-"certificates can be found."
-msgstr ""
-
-#. type: Plain text
-#: doc/guix.texi:19731
-msgid ""
-"In GuixSD, this is done by adding a package that provides certificates to the @code{packages} field of the @code{operating-system} "
-"declaration (@pxref{operating-system Reference}).  GuixSD includes one such package, @code{nss-certs}, which is a set of CA "
-"certificates provided as part of Mozilla's Network Security Services."
-msgstr ""
-
-#. type: Plain text
-#: doc/guix.texi:19736
-msgid ""
-"Note that it is @emph{not} part of @var{%base-packages}, so you need to explicitly add it.  The @file{/etc/ssl/certs} directory, "
-"which is where most applications and libraries look for certificates by default, points to the certificates installed globally."
+"The store itself @emph{cannot} contain setuid programs: that would be a "
+"security issue since any user on the system can write derivations that "
+"populate the store (@pxref{The Store}).  Thus, a different mechanism is "
+"used: instead of changing the setuid bit directly on files that are in the "
+"store, we let the system administrator @emph{declare} which programs should "
+"be setuid root."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:19746
 msgid ""
-"Unprivileged users, including users of Guix on a foreign distro, can also install their own certificate package in their profile.  A "
-"number of environment variables need to be defined so that applications and libraries know where to find them.  Namely, the OpenSSL "
-"library honors the @code{SSL_CERT_DIR} and @code{SSL_CERT_FILE} variables.  Some applications add their own environment variables; "
-"for instance, the Git version control system honors the certificate bundle pointed to by the @code{GIT_SSL_CAINFO} environment "
-"variable.  Thus, you would typically run something like:"
+"The @code{setuid-programs} field of an @code{operating-system} declaration "
+"contains a list of G-expressions denoting the names of programs to be setuid-"
+"root (@pxref{Using the Configuration System}).  For instance, the "
+"@command{passwd} program, which is part of the Shadow package, can be "
+"designated by this G-expression (@pxref{G-Expressions}):"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:19752
+#: doc/guix.texi:19749
+#, no-wrap
+msgid "#~(string-append #$shadow \"/bin/passwd\")\n"
+msgstr ""
+
+#. type: Plain text
+#: doc/guix.texi:19753
+msgid ""
+"A default set of setuid programs is defined by the @code{%setuid-programs} "
+"variable of the @code{(gnu system)} module."
+msgstr ""
+
+#. type: defvr
+#: doc/guix.texi:19754
+#, no-wrap
+msgid "{Scheme Variable} %setuid-programs"
+msgstr ""
+
+#. type: defvr
+#: doc/guix.texi:19756
+msgid "A list of G-expressions denoting common programs that are setuid-root."
+msgstr ""
+
+#. type: defvr
+#: doc/guix.texi:19759
+msgid ""
+"The list includes commands such as @command{passwd}, @command{ping}, "
+"@command{su}, and @command{sudo}."
+msgstr ""
+
+#. type: Plain text
+#: doc/guix.texi:19765
+msgid ""
+"Under the hood, the actual setuid programs are created in the @file{/run/"
+"setuid-programs} directory at system activation time.  The files in this "
+"directory refer to the ``real'' binaries, which are in the store."
+msgstr ""
+
+#. type: cindex
+#: doc/guix.texi:19769
+#, no-wrap
+msgid "HTTPS, certificates"
+msgstr ""
+
+#. type: cindex
+#: doc/guix.texi:19770
+#, no-wrap
+msgid "X.509 certificates"
+msgstr ""
+
+#. type: cindex
+#: doc/guix.texi:19771
+#, no-wrap
+msgid "TLS"
+msgstr ""
+
+#. type: Plain text
+#: doc/guix.texi:19778
+msgid ""
+"Web servers available over HTTPS (that is, HTTP over the transport-layer "
+"security mechanism, TLS) send client programs an @dfn{X.509 certificate} "
+"that the client can then use to @emph{authenticate} the server.  To do that, "
+"clients verify that the server's certificate is signed by a so-called "
+"@dfn{certificate authority} (CA).  But to verify the CA's signature, clients "
+"must have first acquired the CA's certificate."
+msgstr ""
+
+#. type: Plain text
+#: doc/guix.texi:19782
+msgid ""
+"Web browsers such as GNU@tie{}IceCat include their own set of CA "
+"certificates, such that they are able to verify CA signatures out-of-the-box."
+msgstr ""
+
+#. type: Plain text
+#: doc/guix.texi:19786
+msgid ""
+"However, most other programs that can talk HTTPS---@command{wget}, "
+"@command{git}, @command{w3m}, etc.---need to be told where CA certificates "
+"can be found."
+msgstr ""
+
+#. type: Plain text
+#: doc/guix.texi:19793
+msgid ""
+"In GuixSD, this is done by adding a package that provides certificates to "
+"the @code{packages} field of the @code{operating-system} declaration "
+"(@pxref{operating-system Reference}).  GuixSD includes one such package, "
+"@code{nss-certs}, which is a set of CA certificates provided as part of "
+"Mozilla's Network Security Services."
+msgstr ""
+
+#. type: Plain text
+#: doc/guix.texi:19798
+msgid ""
+"Note that it is @emph{not} part of @var{%base-packages}, so you need to "
+"explicitly add it.  The @file{/etc/ssl/certs} directory, which is where most "
+"applications and libraries look for certificates by default, points to the "
+"certificates installed globally."
+msgstr ""
+
+#. type: Plain text
+#: doc/guix.texi:19808
+msgid ""
+"Unprivileged users, including users of Guix on a foreign distro, can also "
+"install their own certificate package in their profile.  A number of "
+"environment variables need to be defined so that applications and libraries "
+"know where to find them.  Namely, the OpenSSL library honors the "
+"@code{SSL_CERT_DIR} and @code{SSL_CERT_FILE} variables.  Some applications "
+"add their own environment variables; for instance, the Git version control "
+"system honors the certificate bundle pointed to by the @code{GIT_SSL_CAINFO} "
+"environment variable.  Thus, you would typically run something like:"
+msgstr ""
+
+#. type: example
+#: doc/guix.texi:19814
 #, no-wrap
 msgid ""
 "$ guix package -i nss-certs\n"
@@ -38108,14 +43051,15 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:19757
+#: doc/guix.texi:19819
 msgid ""
-"As another example, R requires the @code{CURL_CA_BUNDLE} environment variable to point to a certificate bundle, so you would have to "
-"run something like this:"
+"As another example, R requires the @code{CURL_CA_BUNDLE} environment "
+"variable to point to a certificate bundle, so you would have to run "
+"something like this:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:19761
+#: doc/guix.texi:19823
 #, no-wrap
 msgid ""
 "$ guix package -i nss-certs\n"
@@ -38123,61 +43067,71 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:19765
-msgid "For other applications you may want to look up the required environment variable in the relevant documentation."
+#: doc/guix.texi:19827
+msgid ""
+"For other applications you may want to look up the required environment "
+"variable in the relevant documentation."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:19770
+#: doc/guix.texi:19832
 #, no-wrap
 msgid "name service switch"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:19771
+#: doc/guix.texi:19833
 #, no-wrap
 msgid "NSS"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:19780
+#: doc/guix.texi:19842
 msgid ""
-"The @code{(gnu system nss)} module provides bindings to the configuration file of the libc @dfn{name service switch} or @dfn{NSS} "
-"(@pxref{NSS Configuration File,,, libc, The GNU C Library Reference Manual}).  In a nutshell, the NSS is a mechanism that allows "
-"libc to be extended with new ``name'' lookup methods for system databases, which includes host names, service names, user accounts, "
-"and more (@pxref{Name Service Switch, System Databases and Name Service Switch,, libc, The GNU C Library Reference Manual})."
+"The @code{(gnu system nss)} module provides bindings to the configuration "
+"file of the libc @dfn{name service switch} or @dfn{NSS} (@pxref{NSS "
+"Configuration File,,, libc, The GNU C Library Reference Manual}).  In a "
+"nutshell, the NSS is a mechanism that allows libc to be extended with new "
+"``name'' lookup methods for system databases, which includes host names, "
+"service names, user accounts, and more (@pxref{Name Service Switch, System "
+"Databases and Name Service Switch,, libc, The GNU C Library Reference "
+"Manual})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:19787
+#: doc/guix.texi:19849
 msgid ""
-"The NSS configuration specifies, for each system database, which lookup method is to be used, and how the various methods are "
-"chained together---for instance, under which circumstances NSS should try the next method in the list.  The NSS configuration is "
-"given in the @code{name-service-switch} field of @code{operating-system} declarations (@pxref{operating-system Reference, @code{name-"
-"service-switch}})."
+"The NSS configuration specifies, for each system database, which lookup "
+"method is to be used, and how the various methods are chained together---for "
+"instance, under which circumstances NSS should try the next method in the "
+"list.  The NSS configuration is given in the @code{name-service-switch} "
+"field of @code{operating-system} declarations (@pxref{operating-system "
+"Reference, @code{name-service-switch}})."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:19788
+#: doc/guix.texi:19850
 #, no-wrap
 msgid "nss-mdns"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:19789
+#: doc/guix.texi:19851
 #, no-wrap
 msgid ".local, host name lookup"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:19794
+#: doc/guix.texi:19856
 msgid ""
-"As an example, the declaration below configures the NSS to use the @uref{http://0pointer.de/lennart/projects/nss-mdns/, @code{nss-"
-"mdns} back-end}, which supports host name lookups over multicast DNS (mDNS)  for host names ending in @code{.local}:"
+"As an example, the declaration below configures the NSS to use the "
+"@uref{http://0pointer.de/lennart/projects/nss-mdns/, @code{nss-mdns} back-"
+"end}, which supports host name lookups over multicast DNS (mDNS)  for host "
+"names ending in @code{.local}:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:19798
+#: doc/guix.texi:19860
 #, no-wrap
 msgid ""
 "(name-service-switch\n"
@@ -38186,7 +43140,7 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:19803
+#: doc/guix.texi:19865
 #, no-wrap
 msgid ""
 "                ;; If the above did not succeed, try\n"
@@ -38197,7 +43151,7 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:19809
+#: doc/guix.texi:19871
 #, no-wrap
 msgid ""
 "                  ;; 'mdns_minimal' is authoritative for\n"
@@ -38209,7 +43163,7 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:19813
+#: doc/guix.texi:19875
 #, no-wrap
 msgid ""
 "                ;; Then fall back to DNS.\n"
@@ -38219,7 +43173,7 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:19817
+#: doc/guix.texi:19879
 #, no-wrap
 msgid ""
 "                ;; Finally, try with the \"full\" 'mdns'.\n"
@@ -38228,176 +43182,195 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:19822
+#: doc/guix.texi:19884
 msgid ""
-"Do not worry: the @code{%mdns-host-lookup-nss} variable (see below)  contains this configuration, so you will not have to type it if "
-"all you want is to have @code{.local} host lookup working."
+"Do not worry: the @code{%mdns-host-lookup-nss} variable (see below)  "
+"contains this configuration, so you will not have to type it if all you want "
+"is to have @code{.local} host lookup working."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:19830
+#: doc/guix.texi:19892
 msgid ""
-"Note that, in this case, in addition to setting the @code{name-service-switch} of the @code{operating-system} declaration, you also "
-"need to use @code{avahi-service} (@pxref{Networking Services, @code{avahi-service}}), or @var{%desktop-services}, which includes it "
-"(@pxref{Desktop Services}).  Doing this makes @code{nss-mdns} accessible to the name service cache daemon (@pxref{Base Services, "
-"@code{nscd-service}})."
+"Note that, in this case, in addition to setting the @code{name-service-"
+"switch} of the @code{operating-system} declaration, you also need to use "
+"@code{avahi-service} (@pxref{Networking Services, @code{avahi-service}}), or "
+"@var{%desktop-services}, which includes it (@pxref{Desktop Services}).  "
+"Doing this makes @code{nss-mdns} accessible to the name service cache daemon "
+"(@pxref{Base Services, @code{nscd-service}})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:19833
-msgid "For convenience, the following variables provide typical NSS configurations."
+#: doc/guix.texi:19895
+msgid ""
+"For convenience, the following variables provide typical NSS configurations."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:19834
+#: doc/guix.texi:19896
 #, no-wrap
 msgid "{Scheme Variable} %default-nss"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:19837
-msgid "This is the default name service switch configuration, a @code{name-service-switch} object."
+#: doc/guix.texi:19899
+msgid ""
+"This is the default name service switch configuration, a @code{name-service-"
+"switch} object."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:19839
+#: doc/guix.texi:19901
 #, no-wrap
 msgid "{Scheme Variable} %mdns-host-lookup-nss"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:19842
+#: doc/guix.texi:19904
 msgid ""
-"This is the name service switch configuration with support for host name lookup over multicast DNS (mDNS) for host names ending in "
-"@code{.local}."
+"This is the name service switch configuration with support for host name "
+"lookup over multicast DNS (mDNS) for host names ending in @code{.local}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:19852
+#: doc/guix.texi:19914
 msgid ""
-"The reference for name service switch configuration is given below.  It is a direct mapping of the configuration file format of the "
-"C library , so please refer to the C library manual for more information (@pxref{NSS Configuration File,,, libc, The GNU C Library "
-"Reference Manual}).  Compared to the configuration file format of libc NSS, it has the advantage not only of adding this warm "
-"parenthetic feel that we like, but also static checks: you will know about syntax errors and typos as soon as you run @command{guix "
+"The reference for name service switch configuration is given below.  It is a "
+"direct mapping of the configuration file format of the C library , so please "
+"refer to the C library manual for more information (@pxref{NSS Configuration "
+"File,,, libc, The GNU C Library Reference Manual}).  Compared to the "
+"configuration file format of libc NSS, it has the advantage not only of "
+"adding this warm parenthetic feel that we like, but also static checks: you "
+"will know about syntax errors and typos as soon as you run @command{guix "
 "system}."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:19853
+#: doc/guix.texi:19915
 #, no-wrap
 msgid "{Data Type} name-service-switch"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:19858
+#: doc/guix.texi:19920
 msgid ""
-"This is the data type representation the configuration of libc's name service switch (NSS).  Each field below represents one of the "
-"supported system databases."
+"This is the data type representation the configuration of libc's name "
+"service switch (NSS).  Each field below represents one of the supported "
+"system databases."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19860
+#: doc/guix.texi:19922
 #, no-wrap
 msgid "aliases"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:19861
+#: doc/guix.texi:19923
 #, no-wrap
 msgid "ethers"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:19863
+#: doc/guix.texi:19925
 #, no-wrap
 msgid "gshadow"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:19864
+#: doc/guix.texi:19926
 #, no-wrap
 msgid "hosts"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:19865
+#: doc/guix.texi:19927
 #, no-wrap
 msgid "initgroups"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:19866
+#: doc/guix.texi:19928
 #, no-wrap
 msgid "netgroup"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:19867
+#: doc/guix.texi:19929
 #, no-wrap
 msgid "networks"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:19869
+#: doc/guix.texi:19931
 #, no-wrap
 msgid "public-key"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:19870
+#: doc/guix.texi:19932
 #, no-wrap
 msgid "rpc"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:19872
+#: doc/guix.texi:19934
 #, no-wrap
 msgid "shadow"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19875
-msgid "The system databases handled by the NSS.  Each of these fields must be a list of @code{<name-service>} objects (see below)."
+#: doc/guix.texi:19937
+msgid ""
+"The system databases handled by the NSS.  Each of these fields must be a "
+"list of @code{<name-service>} objects (see below)."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:19878
+#: doc/guix.texi:19940
 #, no-wrap
 msgid "{Data Type} name-service"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:19882
-msgid "This is the data type representing an actual name service and the associated lookup action."
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:19887
-msgid "A string denoting the name service (@pxref{Services in the NSS configuration,,, libc, The GNU C Library Reference Manual})."
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:19892
+#: doc/guix.texi:19944
 msgid ""
-"Note that name services listed here must be visible to nscd.  This is achieved by passing the @code{#:name-services} argument to "
-"@code{nscd-service} the list of packages providing the needed name services (@pxref{Base Services, @code{nscd-service}})."
+"This is the data type representing an actual name service and the associated "
+"lookup action."
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:19949
+msgid ""
+"A string denoting the name service (@pxref{Services in the NSS "
+"configuration,,, libc, The GNU C Library Reference Manual})."
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:19954
+msgid ""
+"Note that name services listed here must be visible to nscd.  This is "
+"achieved by passing the @code{#:name-services} argument to @code{nscd-"
+"service} the list of packages providing the needed name services "
+"(@pxref{Base Services, @code{nscd-service}})."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19893
+#: doc/guix.texi:19955
 #, no-wrap
 msgid "reaction"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19897
+#: doc/guix.texi:19959
 msgid ""
-"An action specified using the @code{lookup-specification} macro (@pxref{Actions in the NSS configuration,,, libc, The GNU C Library "
+"An action specified using the @code{lookup-specification} macro "
+"(@pxref{Actions in the NSS configuration,,, libc, The GNU C Library "
 "Reference Manual}).  For example:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:19901
+#: doc/guix.texi:19963
 #, no-wrap
 msgid ""
 "(lookup-specification (unavailable => continue)\n"
@@ -38405,24 +43378,29 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:19915
+#: doc/guix.texi:19977
 msgid ""
-"For bootstrapping purposes, the Linux-Libre kernel is passed an @dfn{initial RAM disk}, or @dfn{initrd}.  An initrd contains a "
-"temporary root file system as well as an initialization script.  The latter is responsible for mounting the real root file system, "
-"and for loading any kernel modules that may be needed to achieve that."
+"For bootstrapping purposes, the Linux-Libre kernel is passed an @dfn{initial "
+"RAM disk}, or @dfn{initrd}.  An initrd contains a temporary root file system "
+"as well as an initialization script.  The latter is responsible for mounting "
+"the real root file system, and for loading any kernel modules that may be "
+"needed to achieve that."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:19924
+#: doc/guix.texi:19986
 msgid ""
-"The @code{initrd-modules} field of an @code{operating-system} declaration allows you to specify Linux-libre kernel modules that must "
-"be available in the initrd.  In particular, this is where you would list modules needed to actually drive the hard disk where your "
-"root partition is---although the default value of @code{initrd-modules} should cover most use cases.  For example, assuming you need "
-"the @code{megaraid_sas} module in addition to the default modules to be able to access your root file system, you would write:"
+"The @code{initrd-modules} field of an @code{operating-system} declaration "
+"allows you to specify Linux-libre kernel modules that must be available in "
+"the initrd.  In particular, this is where you would list modules needed to "
+"actually drive the hard disk where your root partition is---although the "
+"default value of @code{initrd-modules} should cover most use cases.  For "
+"example, assuming you need the @code{megaraid_sas} module in addition to the "
+"default modules to be able to access your root file system, you would write:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:19929
+#: doc/guix.texi:19991
 #, no-wrap
 msgid ""
 "(operating-system\n"
@@ -38431,33 +43409,37 @@ msgid ""
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:19931
+#: doc/guix.texi:19993
 #, no-wrap
 msgid "{Scheme Variable} %base-initrd-modules"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:19933
+#: doc/guix.texi:19995
 msgid "This is the list of kernel modules included in the initrd by default."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:19941
+#: doc/guix.texi:20003
 msgid ""
-"Furthermore, if you need lower-level customization, the @code{initrd} field of an @code{operating-system} declaration allows you to "
-"specify which initrd you would like to use.  The @code{(gnu system linux-initrd)} module provides three ways to build an initrd: the "
-"high-level @code{base-initrd} procedure and the low-level @code{raw-initrd} and @code{expression->initrd} procedures."
+"Furthermore, if you need lower-level customization, the @code{initrd} field "
+"of an @code{operating-system} declaration allows you to specify which initrd "
+"you would like to use.  The @code{(gnu system linux-initrd)} module provides "
+"three ways to build an initrd: the high-level @code{base-initrd} procedure "
+"and the low-level @code{raw-initrd} and @code{expression->initrd} procedures."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:19946
+#: doc/guix.texi:20008
 msgid ""
-"The @code{base-initrd} procedure is intended to cover most common uses.  For example, if you want to add a bunch of kernel modules "
-"to be loaded at boot time, you can define the @code{initrd} field of the operating system declaration like this:"
+"The @code{base-initrd} procedure is intended to cover most common uses.  For "
+"example, if you want to add a bunch of kernel modules to be loaded at boot "
+"time, you can define the @code{initrd} field of the operating system "
+"declaration like this:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:19954
+#: doc/guix.texi:20016
 #, no-wrap
 msgid ""
 "(initrd (lambda (file-systems . rest)\n"
@@ -38469,386 +43451,440 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:19959
+#: doc/guix.texi:20021
 msgid ""
-"The @code{base-initrd} procedure also handles common use cases that involves using the system as a QEMU guest, or as a ``live'' "
-"system with volatile root file system."
+"The @code{base-initrd} procedure also handles common use cases that involves "
+"using the system as a QEMU guest, or as a ``live'' system with volatile root "
+"file system."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:19966
+#: doc/guix.texi:20028
 msgid ""
-"The @code{base-initrd} procedure is built from @code{raw-initrd} procedure.  Unlike @code{base-initrd}, @code{raw-initrd} doesn't do "
-"anything high-level, such as trying to guess which kernel modules and packages should be included to the initrd. An example use of "
-"@code{raw-initrd} is when a user has a custom Linux kernel configuration and default kernel modules included by @code{base-initrd} "
-"are not available."
+"The @code{base-initrd} procedure is built from @code{raw-initrd} procedure.  "
+"Unlike @code{base-initrd}, @code{raw-initrd} doesn't do anything high-level, "
+"such as trying to guess which kernel modules and packages should be included "
+"to the initrd. An example use of @code{raw-initrd} is when a user has a "
+"custom Linux kernel configuration and default kernel modules included by "
+"@code{base-initrd} are not available."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:19971
+#: doc/guix.texi:20033
 msgid ""
-"The initial RAM disk produced by @code{base-initrd} or @code{raw-initrd} honors several options passed on the Linux kernel command "
-"line (that is, arguments passed @i{via} the @code{linux} command of GRUB, or the @code{-append} option of QEMU), notably:"
+"The initial RAM disk produced by @code{base-initrd} or @code{raw-initrd} "
+"honors several options passed on the Linux kernel command line (that is, "
+"arguments passed @i{via} the @code{linux} command of GRUB, or the @code{-"
+"append} option of QEMU), notably:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19973
+#: doc/guix.texi:20035
 #, no-wrap
 msgid "--load=@var{boot}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19976
-msgid "Tell the initial RAM disk to load @var{boot}, a file containing a Scheme program, once it has mounted the root file system."
+#: doc/guix.texi:20038
+msgid ""
+"Tell the initial RAM disk to load @var{boot}, a file containing a Scheme "
+"program, once it has mounted the root file system."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19980
+#: doc/guix.texi:20042
 msgid ""
-"GuixSD uses this option to yield control to a boot program that runs the service activation programs and then spawns the GNU@tie{}"
-"Shepherd, the initialization system."
+"GuixSD uses this option to yield control to a boot program that runs the "
+"service activation programs and then spawns the GNU@tie{}Shepherd, the "
+"initialization system."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19981
+#: doc/guix.texi:20043
 #, no-wrap
 msgid "--root=@var{root}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19985
+#: doc/guix.texi:20047
 msgid ""
-"Mount @var{root} as the root file system.  @var{root} can be a device name like @code{/dev/sda1}, a file system label, or a file "
-"system UUID."
+"Mount @var{root} as the root file system.  @var{root} can be a device name "
+"like @code{/dev/sda1}, a file system label, or a file system UUID."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19989
-msgid "Have @file{/run/booted-system} and @file{/run/current-system} point to @var{system}."
+#: doc/guix.texi:20051
+msgid ""
+"Have @file{/run/booted-system} and @file{/run/current-system} point to "
+"@var{system}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19990
+#: doc/guix.texi:20052
 #, no-wrap
 msgid "modprobe.blacklist=@var{modules}@dots{}"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:19991
+#: doc/guix.texi:20053
 #, no-wrap
 msgid "module, black-listing"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:19992
+#: doc/guix.texi:20054
 #, no-wrap
 msgid "black list, of kernel modules"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19997
+#: doc/guix.texi:20059
 msgid ""
-"Instruct the initial RAM disk as well as the @command{modprobe} command (from the kmod package) to refuse to load @var{modules}.  "
-"@var{modules} must be a comma-separated list of module names---e.g., @code{usbkbd,9pnet}."
+"Instruct the initial RAM disk as well as the @command{modprobe} command "
+"(from the kmod package) to refuse to load @var{modules}.  @var{modules} must "
+"be a comma-separated list of module names---e.g., @code{usbkbd,9pnet}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19998
+#: doc/guix.texi:20060
 #, no-wrap
 msgid "--repl"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20004
+#: doc/guix.texi:20066
 msgid ""
-"Start a read-eval-print loop (REPL) from the initial RAM disk before it tries to load kernel modules and to mount the root file "
-"system.  Our marketing team calls it @dfn{boot-to-Guile}.  The Schemer in you will love it.  @xref{Using Guile Interactively,,, "
-"guile, GNU Guile Reference Manual}, for more information on Guile's REPL."
+"Start a read-eval-print loop (REPL) from the initial RAM disk before it "
+"tries to load kernel modules and to mount the root file system.  Our "
+"marketing team calls it @dfn{boot-to-Guile}.  The Schemer in you will love "
+"it.  @xref{Using Guile Interactively,,, guile, GNU Guile Reference Manual}, "
+"for more information on Guile's REPL."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20010
+#: doc/guix.texi:20072
 msgid ""
-"Now that you know all the features that initial RAM disks produced by @code{base-initrd} and @code{raw-initrd} provide, here is how "
-"to use it and customize it further."
+"Now that you know all the features that initial RAM disks produced by "
+"@code{base-initrd} and @code{raw-initrd} provide, here is how to use it and "
+"customize it further."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:20013
+#: doc/guix.texi:20075
 #, no-wrap
 msgid "{Monadic Procedure} raw-initrd @var{file-systems} @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:20025
+#: doc/guix.texi:20087
 msgid ""
-"[#:linux-modules '()] [#:mapped-devices '()] @ [#:helper-packages '()] [#:qemu-networking? #f] [#:volatile-root? #f] Return a "
-"monadic derivation that builds a raw initrd.  @var{file-systems} is a list of file systems to be mounted by the initrd, possibly in "
-"addition to the root file system specified on the kernel command line via @code{--root}.  @var{linux-modules} is a list of kernel "
-"modules to be loaded at boot time.  @var{mapped-devices} is a list of device mappings to realize before @var{file-systems} are "
-"mounted (@pxref{Mapped Devices}).  @var{helper-packages} is a list of packages to be copied in the initrd. It may include "
-"@code{e2fsck/static} or other packages needed by the initrd to check the root file system."
+"[#:linux-modules '()] [#:mapped-devices '()] @ [#:helper-packages '()] [#:"
+"qemu-networking? #f] [#:volatile-root? #f] Return a monadic derivation that "
+"builds a raw initrd.  @var{file-systems} is a list of file systems to be "
+"mounted by the initrd, possibly in addition to the root file system "
+"specified on the kernel command line via @code{--root}.  @var{linux-modules} "
+"is a list of kernel modules to be loaded at boot time.  @var{mapped-devices} "
+"is a list of device mappings to realize before @var{file-systems} are "
+"mounted (@pxref{Mapped Devices}).  @var{helper-packages} is a list of "
+"packages to be copied in the initrd. It may include @code{e2fsck/static} or "
+"other packages needed by the initrd to check the root file system."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:20029
+#: doc/guix.texi:20091
 msgid ""
-"When @var{qemu-networking?} is true, set up networking with the standard QEMU parameters.  When @var{virtio?} is true, load "
-"additional modules so that the initrd can be used as a QEMU guest with para-virtualized I/O drivers."
+"When @var{qemu-networking?} is true, set up networking with the standard "
+"QEMU parameters.  When @var{virtio?} is true, load additional modules so "
+"that the initrd can be used as a QEMU guest with para-virtualized I/O "
+"drivers."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:20032
-msgid "When @var{volatile-root?} is true, the root file system is writable but any changes to it are lost."
+#: doc/guix.texi:20094
+msgid ""
+"When @var{volatile-root?} is true, the root file system is writable but any "
+"changes to it are lost."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:20034
+#: doc/guix.texi:20096
 #, no-wrap
 msgid "{Monadic Procedure} base-initrd @var{file-systems} @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:20042
+#: doc/guix.texi:20104
 msgid ""
-"[#:mapped-devices '()] [#:qemu-networking? #f] [#:volatile-root? #f]@ [#:linux-modules '()] Return a monadic derivation that builds "
-"a generic initrd, with kernel modules taken from @var{linux}.  @var{file-systems} is a list of file-systems to be mounted by the "
-"initrd, possibly in addition to the root file system specified on the kernel command line via @code{--root}.  @var{mapped-devices} "
-"is a list of device mappings to realize before @var{file-systems} are mounted."
+"[#:mapped-devices '()] [#:qemu-networking? #f] [#:volatile-root? #f]@ [#:"
+"linux-modules '()] Return a monadic derivation that builds a generic initrd, "
+"with kernel modules taken from @var{linux}.  @var{file-systems} is a list of "
+"file-systems to be mounted by the initrd, possibly in addition to the root "
+"file system specified on the kernel command line via @code{--root}.  "
+"@var{mapped-devices} is a list of device mappings to realize before "
+"@var{file-systems} are mounted."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:20044
-msgid "@var{qemu-networking?} and @var{volatile-root?} behaves as in @code{raw-initrd}."
+#: doc/guix.texi:20106
+msgid ""
+"@var{qemu-networking?} and @var{volatile-root?} behaves as in @code{raw-"
+"initrd}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:20049
+#: doc/guix.texi:20111
 msgid ""
-"The initrd is automatically populated with all the kernel modules necessary for @var{file-systems} and for the given options.  "
-"Additional kernel modules can be listed in @var{linux-modules}.  They will be added to the initrd, and loaded at boot time in the "
-"order in which they appear."
+"The initrd is automatically populated with all the kernel modules necessary "
+"for @var{file-systems} and for the given options.  Additional kernel modules "
+"can be listed in @var{linux-modules}.  They will be added to the initrd, and "
+"loaded at boot time in the order in which they appear."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20056
+#: doc/guix.texi:20118
 msgid ""
-"Needless to say, the initrds we produce and use embed a statically-linked Guile, and the initialization program is a Guile program.  "
-"That gives a lot of flexibility.  The @code{expression->initrd} procedure builds such an initrd, given the program to run in that "
-"initrd."
+"Needless to say, the initrds we produce and use embed a statically-linked "
+"Guile, and the initialization program is a Guile program.  That gives a lot "
+"of flexibility.  The @code{expression->initrd} procedure builds such an "
+"initrd, given the program to run in that initrd."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:20057
+#: doc/guix.texi:20119
 #, no-wrap
 msgid "{Monadic Procedure} expression->initrd @var{exp} @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:20063
+#: doc/guix.texi:20125
 msgid ""
-"[#:guile %guile-static-stripped] [#:name \"guile-initrd\"] Return a derivation that builds a Linux initrd (a gzipped cpio archive)  "
-"containing @var{guile} and that evaluates @var{exp}, a G-expression, upon booting.  All the derivations referenced by @var{exp} are "
-"automatically copied to the initrd."
+"[#:guile %guile-static-stripped] [#:name \"guile-initrd\"] Return a "
+"derivation that builds a Linux initrd (a gzipped cpio archive)  containing "
+"@var{guile} and that evaluates @var{exp}, a G-expression, upon booting.  All "
+"the derivations referenced by @var{exp} are automatically copied to the "
+"initrd."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:20069
+#: doc/guix.texi:20131
 #, no-wrap
 msgid "boot loader"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20076
+#: doc/guix.texi:20138
 msgid ""
-"The operating system supports multiple bootloaders.  The bootloader is configured using @code{bootloader-configuration} "
-"declaration.  All the fields of this structure are bootloader agnostic except for one field, @code{bootloader} that indicates the "
-"bootloader to be configured and installed."
+"The operating system supports multiple bootloaders.  The bootloader is "
+"configured using @code{bootloader-configuration} declaration.  All the "
+"fields of this structure are bootloader agnostic except for one field, "
+"@code{bootloader} that indicates the bootloader to be configured and "
+"installed."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20081
+#: doc/guix.texi:20143
 msgid ""
-"Some of the bootloaders do not honor every field of @code{bootloader-configuration}.  For instance, the extlinux bootloader does not "
-"support themes and thus ignores the @code{theme} field."
+"Some of the bootloaders do not honor every field of @code{bootloader-"
+"configuration}.  For instance, the extlinux bootloader does not support "
+"themes and thus ignores the @code{theme} field."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:20082
+#: doc/guix.texi:20144
 #, no-wrap
 msgid "{Data Type} bootloader-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:20084
+#: doc/guix.texi:20146
 msgid "The type of a bootloader configuration declaration."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:20088
+#: doc/guix.texi:20150
 #, no-wrap
 msgid "EFI, bootloader"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:20089
+#: doc/guix.texi:20151
 #, no-wrap
 msgid "UEFI, bootloader"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:20090
+#: doc/guix.texi:20152
 #, no-wrap
 msgid "BIOS, bootloader"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20096
+#: doc/guix.texi:20158
 msgid ""
-"The bootloader to use, as a @code{bootloader} object. For now @code{grub-bootloader}, @code{grub-efi-bootloader}, @code{extlinux-"
-"bootloader} and @code{u-boot-bootloader} are supported.  @code{grub-efi-bootloader} allows to boot on modern systems using the "
-"@dfn{Unified Extensible Firmware Interface} (UEFI)."
+"The bootloader to use, as a @code{bootloader} object. For now @code{grub-"
+"bootloader}, @code{grub-efi-bootloader}, @code{extlinux-bootloader} and "
+"@code{u-boot-bootloader} are supported.  @code{grub-efi-bootloader} allows "
+"to boot on modern systems using the @dfn{Unified Extensible Firmware "
+"Interface} (UEFI)."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20099
-msgid "Available bootloaders are described in @code{(gnu bootloader @dots{})} modules."
+#: doc/guix.texi:20161
+msgid ""
+"Available bootloaders are described in @code{(gnu bootloader @dots{})} "
+"modules."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20109
+#: doc/guix.texi:20171
 msgid ""
-"This is a string denoting the target onto which to install the bootloader.  The exact interpretation depends on the bootloader in "
-"question; for @code{grub-bootloader}, for example, it should be a device name understood by the bootloader @command{installer} "
-"command, such as @code{/dev/sda} or @code{(hd0)} (for GRUB, @pxref{Invoking grub-install,,, grub, GNU GRUB Manual}).  For @code{grub-"
-"efi-bootloader}, it should be the path to a mounted EFI file system."
+"This is a string denoting the target onto which to install the bootloader.  "
+"The exact interpretation depends on the bootloader in question; for "
+"@code{grub-bootloader}, for example, it should be a device name understood "
+"by the bootloader @command{installer} command, such as @code{/dev/sda} or "
+"@code{(hd0)} (for GRUB, @pxref{Invoking grub-install,,, grub, GNU GRUB "
+"Manual}).  For @code{grub-efi-bootloader}, it should be the path to a "
+"mounted EFI file system."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20110
+#: doc/guix.texi:20172
 #, no-wrap
 msgid "@code{menu-entries} (default: @code{()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20114
+#: doc/guix.texi:20176
 msgid ""
-"A possibly empty list of @code{menu-entry} objects (see below), denoting entries to appear in the bootloader menu, in addition to "
-"the current system entry and the entry pointing to previous system generations."
+"A possibly empty list of @code{menu-entry} objects (see below), denoting "
+"entries to appear in the bootloader menu, in addition to the current system "
+"entry and the entry pointing to previous system generations."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20115
+#: doc/guix.texi:20177
 #, no-wrap
 msgid "@code{default-entry} (default: @code{0})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20118
-msgid "The index of the default boot menu entry.  Index 0 is for the entry of the current system."
+#: doc/guix.texi:20180
+msgid ""
+"The index of the default boot menu entry.  Index 0 is for the entry of the "
+"current system."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20119
+#: doc/guix.texi:20181
 #, no-wrap
 msgid "@code{timeout} (default: @code{5})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20122
-msgid "The number of seconds to wait for keyboard input before booting.  Set to 0 to boot immediately, and to -1 to wait indefinitely."
+#: doc/guix.texi:20184
+msgid ""
+"The number of seconds to wait for keyboard input before booting.  Set to 0 "
+"to boot immediately, and to -1 to wait indefinitely."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20123
+#: doc/guix.texi:20185
 #, no-wrap
 msgid "@code{theme} (default: @var{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20127
+#: doc/guix.texi:20189
 msgid ""
-"The bootloader theme object describing the theme to use.  If no theme is provided, some bootloaders might use a default theme, "
-"that's true for GRUB."
+"The bootloader theme object describing the theme to use.  If no theme is "
+"provided, some bootloaders might use a default theme, that's true for GRUB."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20128
+#: doc/guix.texi:20190
 #, no-wrap
 msgid "@code{terminal-outputs} (default: @code{'gfxterm})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20135
+#: doc/guix.texi:20197
 msgid ""
-"The output terminals used for the bootloader boot menu, as a list of symbols.  GRUB accepts the values: @code{console}, "
-"@code{serial}, @code{serial_@{0-3@}}, @code{gfxterm}, @code{vga_text}, @code{mda_text}, @code{morse}, and @code{pkmodem}.  This "
-"field corresponds to the GRUB variable GRUB_TERMINAL_OUTPUT (@pxref{Simple configuration,,, grub,GNU GRUB manual})."
+"The output terminals used for the bootloader boot menu, as a list of "
+"symbols.  GRUB accepts the values: @code{console}, @code{serial}, "
+"@code{serial_@{0-3@}}, @code{gfxterm}, @code{vga_text}, @code{mda_text}, "
+"@code{morse}, and @code{pkmodem}.  This field corresponds to the GRUB "
+"variable GRUB_TERMINAL_OUTPUT (@pxref{Simple configuration,,, grub,GNU GRUB "
+"manual})."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20136
+#: doc/guix.texi:20198
 #, no-wrap
 msgid "@code{terminal-inputs} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20144
+#: doc/guix.texi:20206
 msgid ""
-"The input terminals used for the bootloader boot menu, as a list of symbols.  For GRUB, the default is the native platform terminal "
-"as determined at run-time.  GRUB accepts the values: @code{console}, @code{serial}, @code{serial_@{0-3@}}, @code{at_keyboard}, and "
-"@code{usb_keyboard}.  This field corresponds to the GRUB variable GRUB_TERMINAL_INPUT (@pxref{Simple configuration,,, grub,GNU GRUB "
-"manual})."
+"The input terminals used for the bootloader boot menu, as a list of "
+"symbols.  For GRUB, the default is the native platform terminal as "
+"determined at run-time.  GRUB accepts the values: @code{console}, "
+"@code{serial}, @code{serial_@{0-3@}}, @code{at_keyboard}, and "
+"@code{usb_keyboard}.  This field corresponds to the GRUB variable "
+"GRUB_TERMINAL_INPUT (@pxref{Simple configuration,,, grub,GNU GRUB manual})."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20145
+#: doc/guix.texi:20207
 #, no-wrap
 msgid "@code{serial-unit} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20149
+#: doc/guix.texi:20211
 msgid ""
-"The serial unit used by the bootloader, as an integer from 0 to 3.  For GRUB, it is chosen at run-time; currently GRUB chooses 0, "
-"which corresponds to COM1 (@pxref{Serial terminal,,, grub,GNU GRUB manual})."
+"The serial unit used by the bootloader, as an integer from 0 to 3.  For "
+"GRUB, it is chosen at run-time; currently GRUB chooses 0, which corresponds "
+"to COM1 (@pxref{Serial terminal,,, grub,GNU GRUB manual})."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20150
+#: doc/guix.texi:20212
 #, no-wrap
 msgid "@code{serial-speed} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20154
+#: doc/guix.texi:20216
 msgid ""
-"The speed of the serial interface, as an integer.  For GRUB, the default value is chosen at run-time; currently GRUB chooses "
-"9600@tie{}bps (@pxref{Serial terminal,,, grub,GNU GRUB manual})."
+"The speed of the serial interface, as an integer.  For GRUB, the default "
+"value is chosen at run-time; currently GRUB chooses 9600@tie{}bps "
+"(@pxref{Serial terminal,,, grub,GNU GRUB manual})."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:20158
+#: doc/guix.texi:20220
 #, no-wrap
 msgid "dual boot"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:20159
+#: doc/guix.texi:20221
 #, no-wrap
 msgid "boot menu"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20165
+#: doc/guix.texi:20227
 msgid ""
-"Should you want to list additional boot menu entries @i{via} the @code{menu-entries} field above, you will need to create them with "
-"the @code{menu-entry} form.  For example, imagine you want to be able to boot another distro (hard to imagine!), you can define a "
-"menu entry along these lines:"
+"Should you want to list additional boot menu entries @i{via} the @code{menu-"
+"entries} field above, you will need to create them with the @code{menu-"
+"entry} form.  For example, imagine you want to be able to boot another "
+"distro (hard to imagine!), you can define a menu entry along these lines:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:20172
+#: doc/guix.texi:20234
 #, no-wrap
 msgid ""
 "(menu-entry\n"
@@ -38859,160 +43895,176 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20175
+#: doc/guix.texi:20237
 msgid "Details below."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:20176
+#: doc/guix.texi:20238
 #, no-wrap
 msgid "{Data Type} menu-entry"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:20178
+#: doc/guix.texi:20240
 msgid "The type of an entry in the bootloader menu."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:20181
+#: doc/guix.texi:20243
 #, no-wrap
 msgid "label"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20183
+#: doc/guix.texi:20245
 msgid "The label to show in the menu---e.g., @code{\"GNU\"}."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:20184
+#: doc/guix.texi:20246
 #, no-wrap
 msgid "linux"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20186
+#: doc/guix.texi:20248
 msgid "The Linux kernel image to boot, for example:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:20189
+#: doc/guix.texi:20251
 #, no-wrap
 msgid "(file-append linux-libre \"/bzImage\")\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20194
+#: doc/guix.texi:20256
 msgid ""
-"For GRUB, it is also possible to specify a device explicitly in the file path using GRUB's device naming convention (@pxref{Naming "
-"convention,,, grub, GNU GRUB manual}), for example:"
+"For GRUB, it is also possible to specify a device explicitly in the file "
+"path using GRUB's device naming convention (@pxref{Naming convention,,, "
+"grub, GNU GRUB manual}), for example:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:20197
+#: doc/guix.texi:20259
 #, no-wrap
 msgid "\"(hd0,msdos1)/boot/vmlinuz\"\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20201
-msgid "If the device is specified explicitly as above, then the @code{device} field is ignored entirely."
+#: doc/guix.texi:20263
+msgid ""
+"If the device is specified explicitly as above, then the @code{device} field "
+"is ignored entirely."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20202
+#: doc/guix.texi:20264
 #, no-wrap
 msgid "@code{linux-arguments} (default: @code{()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20205
-msgid "The list of extra Linux kernel command-line arguments---e.g., @code{(\"console=ttyS0\")}."
+#: doc/guix.texi:20267
+msgid ""
+"The list of extra Linux kernel command-line arguments---e.g., "
+"@code{(\"console=ttyS0\")}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20209
-msgid "A G-Expression or string denoting the file name of the initial RAM disk to use (@pxref{G-Expressions})."
+#: doc/guix.texi:20271
+msgid ""
+"A G-Expression or string denoting the file name of the initial RAM disk to "
+"use (@pxref{G-Expressions})."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20209
+#: doc/guix.texi:20271
 #, no-wrap
 msgid "@code{device} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20212
+#: doc/guix.texi:20274
 msgid ""
-"The device where the kernel and initrd are to be found---i.e., for GRUB, @dfn{root} for this menu entry (@pxref{root,,, grub, GNU "
-"GRUB manual})."
+"The device where the kernel and initrd are to be found---i.e., for GRUB, "
+"@dfn{root} for this menu entry (@pxref{root,,, grub, GNU GRUB manual})."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20218
+#: doc/guix.texi:20280
 msgid ""
-"This may be a file system label (a string), a file system UUID (a bytevector, @pxref{File Systems}), or @code{#f}, in which case the "
-"bootloader will search the device containing the file specified by the @code{linux} field (@pxref{search,,, grub, GNU GRUB "
-"manual}).  It must @emph{not} be an OS device name such as @file{/dev/sda1}."
+"This may be a file system label (a string), a file system UUID (a "
+"bytevector, @pxref{File Systems}), or @code{#f}, in which case the "
+"bootloader will search the device containing the file specified by the "
+"@code{linux} field (@pxref{search,,, grub, GNU GRUB manual}).  It must "
+"@emph{not} be an OS device name such as @file{/dev/sda1}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20225
-msgid "Fow now only GRUB has theme support. GRUB themes are created using the @code{grub-theme} form, which is not documented yet."
-msgstr ""
-
-#. type: defvr
-#: doc/guix.texi:20230
+#: doc/guix.texi:20287
 msgid ""
-"This is the default GRUB theme used by the operating system if no @code{theme} field is specified in @code{bootloader-configuration} "
-"record."
+"Fow now only GRUB has theme support. GRUB themes are created using the "
+"@code{grub-theme} form, which is not documented yet."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:20233
-msgid "It comes with a fancy background image displaying the GNU and Guix logos."
+#: doc/guix.texi:20292
+msgid ""
+"This is the default GRUB theme used by the operating system if no "
+"@code{theme} field is specified in @code{bootloader-configuration} record."
+msgstr ""
+
+#. type: defvr
+#: doc/guix.texi:20295
+msgid ""
+"It comes with a fancy background image displaying the GNU and Guix logos."
 msgstr ""
 
 #. type: subsection
-#: doc/guix.texi:20237
+#: doc/guix.texi:20299
 #, no-wrap
 msgid "Invoking @code{guix system}"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20242
+#: doc/guix.texi:20304
 msgid ""
-"Once you have written an operating system declaration as seen in the previous section, it can be @dfn{instantiated} using the "
-"@command{guix system} command.  The synopsis is:"
+"Once you have written an operating system declaration as seen in the "
+"previous section, it can be @dfn{instantiated} using the @command{guix "
+"system} command.  The synopsis is:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:20245
+#: doc/guix.texi:20307
 #, no-wrap
 msgid "guix system @var{options}@dots{} @var{action} @var{file}\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20251
+#: doc/guix.texi:20313
 msgid ""
-"@var{file} must be the name of a file containing an @code{operating-system} declaration.  @var{action} specifies how the operating "
-"system is instantiated.  Currently the following values are supported:"
+"@var{file} must be the name of a file containing an @code{operating-system} "
+"declaration.  @var{action} specifies how the operating system is "
+"instantiated.  Currently the following values are supported:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20253
+#: doc/guix.texi:20315
 #, no-wrap
 msgid "search"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20256
-msgid "Display available service type definitions that match the given regular expressions, sorted by relevance:"
+#: doc/guix.texi:20318
+msgid ""
+"Display available service type definitions that match the given regular "
+"expressions, sorted by relevance:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:20268
+#: doc/guix.texi:20330
 #, no-wrap
 msgid ""
 "$ guix system search console font\n"
@@ -39029,7 +44081,7 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:20274
+#: doc/guix.texi:20336
 #, no-wrap
 msgid ""
 "name: mingetty\n"
@@ -39041,7 +44093,7 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:20281
+#: doc/guix.texi:20343
 #, no-wrap
 msgid ""
 "name: login\n"
@@ -39054,244 +44106,270 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:20283
+#: doc/guix.texi:20345
 #, no-wrap
 msgid "@dots{}\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20288
+#: doc/guix.texi:20350
 msgid ""
-"As for @command{guix package --search}, the result is written in @code{recutils} format, which makes it easy to filter the output "
+"As for @command{guix package --search}, the result is written in "
+"@code{recutils} format, which makes it easy to filter the output "
 "(@pxref{Top, GNU recutils databases,, recutils, GNU recutils manual})."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20289
+#: doc/guix.texi:20351
 #, no-wrap
 msgid "reconfigure"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20294
+#: doc/guix.texi:20356
 msgid ""
-"Build the operating system described in @var{file}, activate it, and switch to it@footnote{This action (and the related actions "
-"@code{switch-generation} and @code{roll-back}) are usable only on systems already running GuixSD.}."
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:20301
-msgid ""
-"This effects all the configuration specified in @var{file}: user accounts, system services, global package list, setuid programs, "
-"etc.  The command starts system services specified in @var{file} that are not currently running; if a service is currently running, "
-"it does not attempt to upgrade it since this would not be possible without stopping it first."
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:20307
-msgid ""
-"This command creates a new generation whose number is one greater than the current generation (as reported by @command{guix system "
-"list-generations}).  If that generation already exists, it will be overwritten.  This behavior mirrors that of @command{guix "
-"package} (@pxref{Invoking guix package})."
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:20312
-msgid ""
-"It also adds a bootloader menu entry for the new OS configuration, ---unless @option{--no-bootloader} is passed.  For GRUB, it moves "
-"entries for older configurations to a submenu, allowing you to choose an older system generation at boot time should you need it."
-msgstr ""
-
-#. type: quotation
-#: doc/guix.texi:20320
-msgid ""
-"It is highly recommended to run @command{guix pull} once before you run @command{guix system reconfigure} for the first time "
-"(@pxref{Invoking guix pull}).  Failing to do that you would see an older version of Guix once @command{reconfigure} has completed."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:20322
-#, no-wrap
-msgid "switch-generation"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:20331
-msgid ""
-"Switch to an existing system generation.  This action atomically switches the system profile to the specified system generation.  It "
-"also rearranges the system's existing bootloader menu entries.  It makes the menu entry for the specified system generation the "
-"default, and it moves the entries for the other generatiors to a submenu, if supported by the bootloader being used.  The next time "
-"the system boots, it will use the specified system generation."
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:20335
-msgid ""
-"The bootloader itself is not being reinstalled when using this command.  Thus, the installed bootloader is used with an updated "
-"configuration file."
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:20339
-msgid ""
-"The target generation can be specified explicitly by its generation number.  For example, the following invocation would switch to "
-"system generation 7:"
-msgstr ""
-
-#. type: example
-#: doc/guix.texi:20342
-#, no-wrap
-msgid "guix system switch-generation 7\n"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:20350
-msgid ""
-"The target generation can also be specified relative to the current generation with the form @code{+N} or @code{-N}, where @code{+3} "
-"means ``3 generations ahead of the current generation,'' and @code{-1} means ``1 generation prior to the current generation.'' When "
-"specifying a negative value such as @code{-1}, you must precede it with @code{--} to prevent it from being parsed as an option.  For "
-"example:"
-msgstr ""
-
-#. type: example
-#: doc/guix.texi:20353
-#, no-wrap
-msgid "guix system switch-generation -- -1\n"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:20361
-msgid ""
-"Currently, the effect of invoking this action is @emph{only} to switch the system profile to an existing generation and rearrange "
-"the bootloader menu entries.  To actually start using the target system generation, you must reboot after running this action.  In "
-"the future, it will be updated to do the same things as @command{reconfigure}, like activating and deactivating services."
+"Build the operating system described in @var{file}, activate it, and switch "
+"to it@footnote{This action (and the related actions @code{switch-generation} "
+"and @code{roll-back}) are usable only on systems already running GuixSD.}."
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:20363
-msgid "This action will fail if the specified generation does not exist."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:20364
-#, no-wrap
-msgid "roll-back"
+msgid ""
+"This effects all the configuration specified in @var{file}: user accounts, "
+"system services, global package list, setuid programs, etc.  The command "
+"starts system services specified in @var{file} that are not currently "
+"running; if a service is currently running, it does not attempt to upgrade "
+"it since this would not be possible without stopping it first."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20370
+#: doc/guix.texi:20369
 msgid ""
-"Switch to the preceding system generation.  The next time the system boots, it will use the preceding system generation.  This is "
-"the inverse of @command{reconfigure}, and it is exactly the same as invoking @command{switch-generation} with an argument of "
-"@code{-1}."
+"This command creates a new generation whose number is one greater than the "
+"current generation (as reported by @command{guix system list-generations}).  "
+"If that generation already exists, it will be overwritten.  This behavior "
+"mirrors that of @command{guix package} (@pxref{Invoking guix package})."
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:20374
 msgid ""
-"Currently, as with @command{switch-generation}, you must reboot after running this action to actually start using the preceding "
-"system generation."
+"It also adds a bootloader menu entry for the new OS configuration, ---unless "
+"@option{--no-bootloader} is passed.  For GRUB, it moves entries for older "
+"configurations to a submenu, allowing you to choose an older system "
+"generation at boot time should you need it."
 msgstr ""
 
-#. type: table
-#: doc/guix.texi:20379
+#. type: quotation
+#: doc/guix.texi:20382
 msgid ""
-"Build the derivation of the operating system, which includes all the configuration files and programs needed to boot and run the "
-"system.  This action does not actually install anything."
+"It is highly recommended to run @command{guix pull} once before you run "
+"@command{guix system reconfigure} for the first time (@pxref{Invoking guix "
+"pull}).  Failing to do that you would see an older version of Guix once "
+"@command{reconfigure} has completed."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20380
-#, no-wrap
-msgid "init"
-msgstr ""
-
-#. type: table
 #: doc/guix.texi:20384
-msgid ""
-"Populate the given directory with all the files necessary to run the operating system specified in @var{file}.  This is useful for "
-"first-time installations of GuixSD.  For instance:"
-msgstr ""
-
-#. type: example
-#: doc/guix.texi:20387
 #, no-wrap
-msgid "guix system init my-os-config.scm /mnt\n"
+msgid "switch-generation"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20394
+#: doc/guix.texi:20393
 msgid ""
-"copies to @file{/mnt} all the store items required by the configuration specified in @file{my-os-config.scm}.  This includes "
-"configuration files, packages, and so on.  It also creates other essential files needed for the system to operate correctly---e.g., "
-"the @file{/etc}, @file{/var}, and @file{/run} directories, and the @file{/bin/sh} file."
+"Switch to an existing system generation.  This action atomically switches "
+"the system profile to the specified system generation.  It also rearranges "
+"the system's existing bootloader menu entries.  It makes the menu entry for "
+"the specified system generation the default, and it moves the entries for "
+"the other generatiors to a submenu, if supported by the bootloader being "
+"used.  The next time the system boots, it will use the specified system "
+"generation."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20398
+#: doc/guix.texi:20397
 msgid ""
-"This command also installs bootloader on the target specified in @file{my-os-config}, unless the @option{--no-bootloader} option was "
-"passed."
+"The bootloader itself is not being reinstalled when using this command.  "
+"Thus, the installed bootloader is used with an updated configuration file."
 msgstr ""
 
-#. type: item
-#: doc/guix.texi:20399
-#, no-wrap
-msgid "vm"
-msgstr ""
-
-#. type: cindex
-#: doc/guix.texi:20400 doc/guix.texi:20664
-#, no-wrap
-msgid "virtual machine"
-msgstr ""
-
-#. type: cindex
+#. type: table
 #: doc/guix.texi:20401
-#, no-wrap
-msgid "VM"
-msgstr ""
-
-#. type: anchor{#1}
-#: doc/guix.texi:20408
-msgid "guix system vm"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:20408
 msgid ""
-"Build a virtual machine that contains the operating system declared in @var{file}, and return a script to run that virtual machine "
-"(VM).  Arguments given to the script are passed to QEMU as in the example below, which enables networking and requests 1@tie{}GiB of "
-"RAM for the emulated machine:"
+"The target generation can be specified explicitly by its generation number.  "
+"For example, the following invocation would switch to system generation 7:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:20411
+#: doc/guix.texi:20404
 #, no-wrap
-msgid "$ /gnu/store/@dots{}-run-vm.sh -m 1024 -net user\n"
+msgid "guix system switch-generation 7\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20414
-msgid "The VM shares its store with the host system."
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:20419
+#: doc/guix.texi:20412
 msgid ""
-"Additional file systems can be shared between the host and the VM using the @code{--share} and @code{--expose} command-line options: "
-"the former specifies a directory to be shared with write access, while the latter provides read-only access to the shared directory."
+"The target generation can also be specified relative to the current "
+"generation with the form @code{+N} or @code{-N}, where @code{+3} means ``3 "
+"generations ahead of the current generation,'' and @code{-1} means ``1 "
+"generation prior to the current generation.'' When specifying a negative "
+"value such as @code{-1}, you must precede it with @code{--} to prevent it "
+"from being parsed as an option.  For example:"
+msgstr ""
+
+#. type: example
+#: doc/guix.texi:20415
+#, no-wrap
+msgid "guix system switch-generation -- -1\n"
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:20423
 msgid ""
-"The example below creates a VM in which the user's home directory is accessible read-only, and where the @file{/exchange} directory "
-"is a read-write mapping of @file{$HOME/tmp} on the host:"
+"Currently, the effect of invoking this action is @emph{only} to switch the "
+"system profile to an existing generation and rearrange the bootloader menu "
+"entries.  To actually start using the target system generation, you must "
+"reboot after running this action.  In the future, it will be updated to do "
+"the same things as @command{reconfigure}, like activating and deactivating "
+"services."
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:20425
+msgid "This action will fail if the specified generation does not exist."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:20426
+#, no-wrap
+msgid "roll-back"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:20432
+msgid ""
+"Switch to the preceding system generation.  The next time the system boots, "
+"it will use the preceding system generation.  This is the inverse of "
+"@command{reconfigure}, and it is exactly the same as invoking "
+"@command{switch-generation} with an argument of @code{-1}."
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:20436
+msgid ""
+"Currently, as with @command{switch-generation}, you must reboot after "
+"running this action to actually start using the preceding system generation."
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:20441
+msgid ""
+"Build the derivation of the operating system, which includes all the "
+"configuration files and programs needed to boot and run the system.  This "
+"action does not actually install anything."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:20442
+#, no-wrap
+msgid "init"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:20446
+msgid ""
+"Populate the given directory with all the files necessary to run the "
+"operating system specified in @var{file}.  This is useful for first-time "
+"installations of GuixSD.  For instance:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:20427
+#: doc/guix.texi:20449
+#, no-wrap
+msgid "guix system init my-os-config.scm /mnt\n"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:20456
+msgid ""
+"copies to @file{/mnt} all the store items required by the configuration "
+"specified in @file{my-os-config.scm}.  This includes configuration files, "
+"packages, and so on.  It also creates other essential files needed for the "
+"system to operate correctly---e.g., the @file{/etc}, @file{/var}, and @file{/"
+"run} directories, and the @file{/bin/sh} file."
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:20460
+msgid ""
+"This command also installs bootloader on the target specified in @file{my-os-"
+"config}, unless the @option{--no-bootloader} option was passed."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:20461
+#, no-wrap
+msgid "vm"
+msgstr ""
+
+#. type: cindex
+#: doc/guix.texi:20462 doc/guix.texi:20726
+#, no-wrap
+msgid "virtual machine"
+msgstr ""
+
+#. type: cindex
+#: doc/guix.texi:20463
+#, no-wrap
+msgid "VM"
+msgstr ""
+
+#. type: anchor{#1}
+#: doc/guix.texi:20470
+msgid "guix system vm"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:20470
+msgid ""
+"Build a virtual machine that contains the operating system declared in "
+"@var{file}, and return a script to run that virtual machine (VM).  Arguments "
+"given to the script are passed to QEMU as in the example below, which "
+"enables networking and requests 1@tie{}GiB of RAM for the emulated machine:"
+msgstr ""
+
+#. type: example
+#: doc/guix.texi:20473
+#, no-wrap
+msgid "$ /gnu/store/@dots{}-run-vm.sh -m 1024 -net user\n"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:20476
+msgid "The VM shares its store with the host system."
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:20481
+msgid ""
+"Additional file systems can be shared between the host and the VM using the "
+"@code{--share} and @code{--expose} command-line options: the former "
+"specifies a directory to be shared with write access, while the latter "
+"provides read-only access to the shared directory."
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:20485
+msgid ""
+"The example below creates a VM in which the user's home directory is "
+"accessible read-only, and where the @file{/exchange} directory is a read-"
+"write mapping of @file{$HOME/tmp} on the host:"
+msgstr ""
+
+#. type: example
+#: doc/guix.texi:20489
 #, no-wrap
 msgid ""
 "guix system vm my-config.scm \\\n"
@@ -39299,94 +44377,105 @@ msgid ""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20432
+#: doc/guix.texi:20494
 msgid ""
-"On GNU/Linux, the default is to boot directly to the kernel; this has the advantage of requiring only a very tiny root disk image "
-"since the store of the host can then be mounted."
+"On GNU/Linux, the default is to boot directly to the kernel; this has the "
+"advantage of requiring only a very tiny root disk image since the store of "
+"the host can then be mounted."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20438
+#: doc/guix.texi:20500
 msgid ""
-"The @code{--full-boot} option forces a complete boot sequence, starting with the bootloader.  This requires more disk space since a "
-"root image containing at least the kernel, initrd, and bootloader data files must be created.  The @code{--image-size} option can be "
-"used to specify the size of the image."
+"The @code{--full-boot} option forces a complete boot sequence, starting with "
+"the bootloader.  This requires more disk space since a root image containing "
+"at least the kernel, initrd, and bootloader data files must be created.  The "
+"@code{--image-size} option can be used to specify the size of the image."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:20439
+#: doc/guix.texi:20501
 #, no-wrap
 msgid "System images, creation in various formats"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:20440
+#: doc/guix.texi:20502
 #, no-wrap
 msgid "Creating system images in various formats"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20441
+#: doc/guix.texi:20503
 #, no-wrap
 msgid "vm-image"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:20442
+#: doc/guix.texi:20504
 #, no-wrap
 msgid "disk-image"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:20443
+#: doc/guix.texi:20505
 #, no-wrap
 msgid "docker-image"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20451
+#: doc/guix.texi:20513
 msgid ""
-"Return a virtual machine, disk image, or Docker image of the operating system declared in @var{file} that stands alone.  By default, "
-"@command{guix system} estimates the size of the image needed to store the system, but you can use the @option{--image-size} option "
-"to specify a value.  Docker images are built to contain exactly what they need, so the @option{--image-size} option is ignored in "
-"the case of @code{docker-image}."
+"Return a virtual machine, disk image, or Docker image of the operating "
+"system declared in @var{file} that stands alone.  By default, @command{guix "
+"system} estimates the size of the image needed to store the system, but you "
+"can use the @option{--image-size} option to specify a value.  Docker images "
+"are built to contain exactly what they need, so the @option{--image-size} "
+"option is ignored in the case of @code{docker-image}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20454
-msgid "You can specify the root file system type by using the @option{--file-system-type} option.  It defaults to @code{ext4}."
+#: doc/guix.texi:20516
+msgid ""
+"You can specify the root file system type by using the @option{--file-system-"
+"type} option.  It defaults to @code{ext4}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20458
+#: doc/guix.texi:20520
 msgid ""
-"When using @code{vm-image}, the returned image is in qcow2 format, which the QEMU emulator can efficiently use. @xref{Running GuixSD "
-"in a VM}, for more information on how to run the image in a virtual machine."
+"When using @code{vm-image}, the returned image is in qcow2 format, which the "
+"QEMU emulator can efficiently use. @xref{Running GuixSD in a VM}, for more "
+"information on how to run the image in a virtual machine."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20463
+#: doc/guix.texi:20525
 msgid ""
-"When using @code{disk-image}, a raw disk image is produced; it can be copied as is to a USB stick, for instance.  Assuming @code{/"
-"dev/sdc} is the device corresponding to a USB stick, one can copy the image to it using the following command:"
+"When using @code{disk-image}, a raw disk image is produced; it can be copied "
+"as is to a USB stick, for instance.  Assuming @code{/dev/sdc} is the device "
+"corresponding to a USB stick, one can copy the image to it using the "
+"following command:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:20466
+#: doc/guix.texi:20528
 #, no-wrap
 msgid "# dd if=$(guix system disk-image my-os.scm) of=/dev/sdc\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20473
+#: doc/guix.texi:20535
 msgid ""
-"When using @code{docker-image}, a Docker image is produced.  Guix builds the image from scratch, not from a pre-existing Docker base "
-"image.  As a result, it contains @emph{exactly} what you define in the operating system configuration file.  You can then load the "
-"image and launch a Docker container using commands like the following:"
+"When using @code{docker-image}, a Docker image is produced.  Guix builds the "
+"image from scratch, not from a pre-existing Docker base image.  As a result, "
+"it contains @emph{exactly} what you define in the operating system "
+"configuration file.  You can then load the image and launch a Docker "
+"container using commands like the following:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:20479
+#: doc/guix.texi:20541
 #, no-wrap
 msgid ""
 "image_id=\"$(docker load < guixsd-docker-image.tar.gz)\"\n"
@@ -39396,39 +44485,45 @@ msgid ""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20489
+#: doc/guix.texi:20551
 msgid ""
-"This command starts a new Docker container from the specified image.  It will boot the GuixSD system in the usual manner, which "
-"means it will start any services you have defined in the operating system configuration.  Depending on what you run in the Docker "
-"container, it may be necessary to give the container additional permissions.  For example, if you intend to build software using "
-"Guix inside of the Docker container, you may need to pass the @option{--privileged} option to @code{docker run}."
+"This command starts a new Docker container from the specified image.  It "
+"will boot the GuixSD system in the usual manner, which means it will start "
+"any services you have defined in the operating system configuration.  "
+"Depending on what you run in the Docker container, it may be necessary to "
+"give the container additional permissions.  For example, if you intend to "
+"build software using Guix inside of the Docker container, you may need to "
+"pass the @option{--privileged} option to @code{docker run}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20497
+#: doc/guix.texi:20559
 msgid ""
-"Return a script to run the operating system declared in @var{file} within a container.  Containers are a set of lightweight "
-"isolation mechanisms provided by the kernel Linux-libre.  Containers are substantially less resource-demanding than full virtual "
-"machines since the kernel, shared objects, and other resources can be shared with the host system; this also means they provide "
-"thinner isolation."
+"Return a script to run the operating system declared in @var{file} within a "
+"container.  Containers are a set of lightweight isolation mechanisms "
+"provided by the kernel Linux-libre.  Containers are substantially less "
+"resource-demanding than full virtual machines since the kernel, shared "
+"objects, and other resources can be shared with the host system; this also "
+"means they provide thinner isolation."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20501
+#: doc/guix.texi:20563
 msgid ""
-"Currently, the script must be run as root in order to support more than a single user and group.  The container shares its store "
-"with the host system."
+"Currently, the script must be run as root in order to support more than a "
+"single user and group.  The container shares its store with the host system."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20505
+#: doc/guix.texi:20567
 msgid ""
-"As with the @code{vm} action (@pxref{guix system vm}), additional file systems to be shared between the host and container can be "
-"specified using the @option{--share} and @option{--expose} options:"
+"As with the @code{vm} action (@pxref{guix system vm}), additional file "
+"systems to be shared between the host and container can be specified using "
+"the @option{--share} and @option{--expose} options:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:20509
+#: doc/guix.texi:20571
 #, no-wrap
 msgid ""
 "guix system container my-config.scm \\\n"
@@ -39436,299 +44531,332 @@ msgid ""
 msgstr ""
 
 #. type: quotation
-#: doc/guix.texi:20513
+#: doc/guix.texi:20575
 msgid "This option requires Linux-libre 3.19 or newer."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20520
+#: doc/guix.texi:20582
 msgid ""
-"@var{options} can contain any of the common build options (@pxref{Common Build Options}).  In addition, @var{options} can contain "
-"one of the following:"
+"@var{options} can contain any of the common build options (@pxref{Common "
+"Build Options}).  In addition, @var{options} can contain one of the "
+"following:"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20529
+#: doc/guix.texi:20591
 msgid ""
-"Consider the operating-system @var{expr} evaluates to.  This is an alternative to specifying a file which evaluates to an operating "
-"system.  This is used to generate the GuixSD installer @pxref{Building the Installation Image})."
+"Consider the operating-system @var{expr} evaluates to.  This is an "
+"alternative to specifying a file which evaluates to an operating system.  "
+"This is used to generate the GuixSD installer @pxref{Building the "
+"Installation Image})."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20534
+#: doc/guix.texi:20596
 msgid ""
-"Attempt to build for @var{system} instead of the host system type.  This works as per @command{guix build} (@pxref{Invoking guix "
-"build})."
+"Attempt to build for @var{system} instead of the host system type.  This "
+"works as per @command{guix build} (@pxref{Invoking guix build})."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20535
+#: doc/guix.texi:20597
 #, no-wrap
 msgid "--derivation"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20539
-msgid "Return the derivation file name of the given operating system without building anything."
+#: doc/guix.texi:20601
+msgid ""
+"Return the derivation file name of the given operating system without "
+"building anything."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20540
+#: doc/guix.texi:20602
 #, no-wrap
 msgid "--file-system-type=@var{type}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20544
-msgid "For the @code{disk-image} action, create a file system of the given @var{type} on the image."
+#: doc/guix.texi:20606
+msgid ""
+"For the @code{disk-image} action, create a file system of the given "
+"@var{type} on the image."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20546
+#: doc/guix.texi:20608
 msgid "When this option is omitted, @command{guix system} uses @code{ext4}."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:20547
+#: doc/guix.texi:20609
 #, no-wrap
 msgid "ISO-9660 format"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:20548
+#: doc/guix.texi:20610
 #, no-wrap
 msgid "CD image format"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:20549
+#: doc/guix.texi:20611
 #, no-wrap
 msgid "DVD image format"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20552
-msgid "@code{--file-system-type=iso9660} produces an ISO-9660 image, suitable for burning on CDs and DVDs."
+#: doc/guix.texi:20614
+msgid ""
+"@code{--file-system-type=iso9660} produces an ISO-9660 image, suitable for "
+"burning on CDs and DVDs."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20553
+#: doc/guix.texi:20615
 #, no-wrap
 msgid "--image-size=@var{size}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20558
+#: doc/guix.texi:20620
 msgid ""
-"For the @code{vm-image} and @code{disk-image} actions, create an image of the given @var{size}.  @var{size} may be a number of "
-"bytes, or it may include a unit as a suffix (@pxref{Block size, size specifications,, coreutils, GNU Coreutils})."
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:20562
-msgid ""
-"When this option is omitted, @command{guix system} computes an estimate of the image size as a function of the size of the system "
-"declared in @var{file}."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:20568
-#, no-wrap
-msgid "--skip-checks"
-msgstr "--skip-checks"
-
-#. type: table
-#: doc/guix.texi:20570
-msgid "Skip pre-installation safety checks."
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:20577
-msgid ""
-"By default, @command{guix system init} and @command{guix system reconfigure} perform safety checks: they make sure the file systems "
-"that appear in the @code{operating-system} declaration actually exist (@pxref{File Systems}), and that any Linux kernel modules that "
-"may be needed at boot time are listed in @code{initrd-modules} (@pxref{Initial RAM Disk}).  Passing this option skips these tests "
-"altogether."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:20578
-#, no-wrap
-msgid "--on-error=@var{strategy}"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:20581
-msgid "Apply @var{strategy} when an error occurs when reading @var{file}.  @var{strategy} may be one of the following:"
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:20583
-#, no-wrap
-msgid "nothing-special"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:20585
-msgid "Report the error concisely and exit.  This is the default strategy."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:20586
-#, no-wrap
-msgid "backtrace"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:20588
-msgid "Likewise, but also display a backtrace."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:20589
-#, no-wrap
-msgid "debug"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:20595
-msgid ""
-"Report the error and enter Guile's debugger.  From there, you can run commands such as @code{,bt} to get a backtrace, @code{,locals} "
-"to display local variable values, and more generally inspect the state of the program.  @xref{Debug Commands,,, guile, GNU Guile "
-"Reference Manual}, for a list of available debugging commands."
-msgstr ""
-
-#. type: quotation
-#: doc/guix.texi:20605
-msgid ""
-"All the actions above, except @code{build} and @code{init}, can use KVM support in the Linux-libre kernel.  Specifically, if the "
-"machine has hardware virtualization support, the corresponding KVM kernel module should be loaded, and the @file{/dev/kvm} device "
-"node must exist and be readable and writable by the user and by the build users of the daemon (@pxref{Build Environment Setup})."
-msgstr ""
-
-#. type: Plain text
-#: doc/guix.texi:20611
-msgid ""
-"Once you have built, configured, re-configured, and re-re-configured your GuixSD installation, you may find it useful to list the "
-"operating system generations available on disk---and that you can choose from the bootloader boot menu:"
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:20614
-#, no-wrap
-msgid "list-generations"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:20619
-msgid ""
-"List a summary of each generation of the operating system available on disk, in a human-readable way.  This is similar to the "
-"@option{--list-generations} option of @command{guix package} (@pxref{Invoking guix package})."
+"For the @code{vm-image} and @code{disk-image} actions, create an image of "
+"the given @var{size}.  @var{size} may be a number of bytes, or it may "
+"include a unit as a suffix (@pxref{Block size, size specifications,, "
+"coreutils, GNU Coreutils})."
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:20624
 msgid ""
-"Optionally, one can specify a pattern, with the same syntax that is used in @command{guix package --list-generations}, to restrict "
-"the list of generations displayed.  For instance, the following command displays generations that are up to 10 days old:"
-msgstr ""
-
-#. type: example
-#: doc/guix.texi:20627
-#, no-wrap
-msgid "$ guix system list-generations 10d\n"
-msgstr ""
-
-#. type: Plain text
-#: doc/guix.texi:20634
-msgid ""
-"The @command{guix system} command has even more to offer! The following sub-commands allow you to visualize how your system services "
-"relate to each other:"
-msgstr ""
-
-#. type: anchor{#1}
-#: doc/guix.texi:20636
-msgid "system-extension-graph"
+"When this option is omitted, @command{guix system} computes an estimate of "
+"the image size as a function of the size of the system declared in "
+"@var{file}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20638
+#: doc/guix.texi:20630
 #, no-wrap
-msgid "extension-graph"
+msgid "--skip-checks"
+msgstr "--skip-checks"
+
+#. type: table
+#: doc/guix.texi:20632
+msgid "Skip pre-installation safety checks."
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:20639
+msgid ""
+"By default, @command{guix system init} and @command{guix system reconfigure} "
+"perform safety checks: they make sure the file systems that appear in the "
+"@code{operating-system} declaration actually exist (@pxref{File Systems}), "
+"and that any Linux kernel modules that may be needed at boot time are listed "
+"in @code{initrd-modules} (@pxref{Initial RAM Disk}).  Passing this option "
+"skips these tests altogether."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:20640
+#, no-wrap
+msgid "--on-error=@var{strategy}"
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:20643
 msgid ""
-"Emit in Dot/Graphviz format to standard output the @dfn{service extension graph} of the operating system defined in @var{file} "
-"(@pxref{Service Composition}, for more information on service extensions.)"
+"Apply @var{strategy} when an error occurs when reading @var{file}.  "
+"@var{strategy} may be one of the following:"
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:20645
+#, no-wrap
+msgid "nothing-special"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20645
+#: doc/guix.texi:20647
+msgid "Report the error concisely and exit.  This is the default strategy."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:20648
+#, no-wrap
+msgid "backtrace"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:20650
+msgid "Likewise, but also display a backtrace."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:20651
+#, no-wrap
+msgid "debug"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:20657
+msgid ""
+"Report the error and enter Guile's debugger.  From there, you can run "
+"commands such as @code{,bt} to get a backtrace, @code{,locals} to display "
+"local variable values, and more generally inspect the state of the program.  "
+"@xref{Debug Commands,,, guile, GNU Guile Reference Manual}, for a list of "
+"available debugging commands."
+msgstr ""
+
+#. type: quotation
+#: doc/guix.texi:20667
+msgid ""
+"All the actions above, except @code{build} and @code{init}, can use KVM "
+"support in the Linux-libre kernel.  Specifically, if the machine has "
+"hardware virtualization support, the corresponding KVM kernel module should "
+"be loaded, and the @file{/dev/kvm} device node must exist and be readable "
+"and writable by the user and by the build users of the daemon (@pxref{Build "
+"Environment Setup})."
+msgstr ""
+
+#. type: Plain text
+#: doc/guix.texi:20673
+msgid ""
+"Once you have built, configured, re-configured, and re-re-configured your "
+"GuixSD installation, you may find it useful to list the operating system "
+"generations available on disk---and that you can choose from the bootloader "
+"boot menu:"
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:20676
+#, no-wrap
+msgid "list-generations"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:20681
+msgid ""
+"List a summary of each generation of the operating system available on disk, "
+"in a human-readable way.  This is similar to the @option{--list-generations} "
+"option of @command{guix package} (@pxref{Invoking guix package})."
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:20686
+msgid ""
+"Optionally, one can specify a pattern, with the same syntax that is used in "
+"@command{guix package --list-generations}, to restrict the list of "
+"generations displayed.  For instance, the following command displays "
+"generations that are up to 10 days old:"
+msgstr ""
+
+#. type: example
+#: doc/guix.texi:20689
+#, no-wrap
+msgid "$ guix system list-generations 10d\n"
+msgstr ""
+
+#. type: Plain text
+#: doc/guix.texi:20696
+msgid ""
+"The @command{guix system} command has even more to offer! The following sub-"
+"commands allow you to visualize how your system services relate to each "
+"other:"
+msgstr ""
+
+#. type: anchor{#1}
+#: doc/guix.texi:20698
+msgid "system-extension-graph"
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:20700
+#, no-wrap
+msgid "extension-graph"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:20705
+msgid ""
+"Emit in Dot/Graphviz format to standard output the @dfn{service extension "
+"graph} of the operating system defined in @var{file} (@pxref{Service "
+"Composition}, for more information on service extensions.)"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:20707
 msgid "The command:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:20648
+#: doc/guix.texi:20710
 #, no-wrap
 msgid "$ guix system extension-graph @var{file} | dot -Tpdf > services.pdf\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20651
+#: doc/guix.texi:20713
 msgid "produces a PDF file showing the extension relations among services."
 msgstr ""
 
 #. type: anchor{#1}
-#: doc/guix.texi:20653
+#: doc/guix.texi:20715
 msgid "system-shepherd-graph"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20653
+#: doc/guix.texi:20715
 #, no-wrap
 msgid "shepherd-graph"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20658
+#: doc/guix.texi:20720
 msgid ""
-"Emit in Dot/Graphviz format to standard output the @dfn{dependency graph} of shepherd services of the operating system defined in "
-"@var{file}.  @xref{Shepherd Services}, for more information and for an example graph."
+"Emit in Dot/Graphviz format to standard output the @dfn{dependency graph} of "
+"shepherd services of the operating system defined in @var{file}.  "
+"@xref{Shepherd Services}, for more information and for an example graph."
 msgstr ""
 
 #. type: subsection
-#: doc/guix.texi:20662
+#: doc/guix.texi:20724
 #, no-wrap
 msgid "Running GuixSD in a Virtual Machine"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20672
+#: doc/guix.texi:20734
 msgid ""
-"To run GuixSD in a virtual machine (VM), one can either use the pre-built GuixSD VM image distributed at @indicateurl{ftp://alpha."
-"gnu.org/guix/guixsd-vm-image-@value{VERSION}.@var{system}.tar.xz} , or build their own virtual machine image using @command{guix "
-"system vm-image} (@pxref{Invoking guix system}).  The returned image is in qcow2 format, which the @uref{http://qemu.org/, QEMU "
-"emulator} can efficiently use."
+"To run GuixSD in a virtual machine (VM), one can either use the pre-built "
+"GuixSD VM image distributed at @indicateurl{ftp://alpha.gnu.org/guix/guixsd-"
+"vm-image-@value{VERSION}.@var{system}.tar.xz} , or build their own virtual "
+"machine image using @command{guix system vm-image} (@pxref{Invoking guix "
+"system}).  The returned image is in qcow2 format, which the @uref{http://"
+"qemu.org/, QEMU emulator} can efficiently use."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:20673
+#: doc/guix.texi:20735
 #, no-wrap
 msgid "QEMU"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20680
+#: doc/guix.texi:20742
 msgid ""
-"If you built your own image, you must copy it out of the store (@pxref{The Store}) and give yourself permission to write to the copy "
-"before you can use it.  When invoking QEMU, you must choose a system emulator that is suitable for your hardware platform.  Here is "
-"a minimal QEMU invocation that will boot the result of @command{guix system vm-image} on x86_64 hardware:"
+"If you built your own image, you must copy it out of the store (@pxref{The "
+"Store}) and give yourself permission to write to the copy before you can use "
+"it.  When invoking QEMU, you must choose a system emulator that is suitable "
+"for your hardware platform.  Here is a minimal QEMU invocation that will "
+"boot the result of @command{guix system vm-image} on x86_64 hardware:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:20685
+#: doc/guix.texi:20747
 #, no-wrap
 msgid ""
 "$ qemu-system-x86_64 \\\n"
@@ -39737,154 +44865,171 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20688
+#: doc/guix.texi:20750
 msgid "Here is what each of these options means:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20690
+#: doc/guix.texi:20752
 #, no-wrap
 msgid "qemu-system-x86_64"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20693
-msgid "This specifies the hardware platform to emulate.  This should match the host."
+#: doc/guix.texi:20755
+msgid ""
+"This specifies the hardware platform to emulate.  This should match the host."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20694
+#: doc/guix.texi:20756
 #, no-wrap
 msgid "-net user"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20698
+#: doc/guix.texi:20760
 msgid ""
-"Enable the unprivileged user-mode network stack.  The guest OS can access the host but not vice versa.  This is the simplest way to "
-"get the guest OS online."
+"Enable the unprivileged user-mode network stack.  The guest OS can access "
+"the host but not vice versa.  This is the simplest way to get the guest OS "
+"online."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20699
+#: doc/guix.texi:20761
 #, no-wrap
 msgid "-net nic,model=virtio"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20704
+#: doc/guix.texi:20766
 msgid ""
-"You must create a network interface of a given model.  If you do not create a NIC, the boot will fail.  Assuming your hardware "
-"platform is x86_64, you can get a list of available NIC models by running @command{qemu-system-x86_64 -net nic,model=help}."
+"You must create a network interface of a given model.  If you do not create "
+"a NIC, the boot will fail.  Assuming your hardware platform is x86_64, you "
+"can get a list of available NIC models by running @command{qemu-system-"
+"x86_64 -net nic,model=help}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20705
+#: doc/guix.texi:20767
 #, no-wrap
 msgid "-enable-kvm"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20709
+#: doc/guix.texi:20771
 msgid ""
-"If your system has hardware virtualization extensions, enabling the virtual machine support (KVM) of the Linux kernel will make "
-"things run faster."
+"If your system has hardware virtualization extensions, enabling the virtual "
+"machine support (KVM) of the Linux kernel will make things run faster."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20710
+#: doc/guix.texi:20772
 #, no-wrap
 msgid "-m 256"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20713
-msgid "RAM available to the guest OS, in mebibytes.  Defaults to 128@tie{}MiB, which may be insufficient for some operations."
+#: doc/guix.texi:20775
+msgid ""
+"RAM available to the guest OS, in mebibytes.  Defaults to 128@tie{}MiB, "
+"which may be insufficient for some operations."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20714
+#: doc/guix.texi:20776
 #, no-wrap
 msgid "/tmp/qemu-image"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20716
+#: doc/guix.texi:20778
 msgid "The file name of the qcow2 image."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20726
+#: doc/guix.texi:20788
 msgid ""
-"The default @command{run-vm.sh} script that is returned by an invocation of @command{guix system vm} does not add a @command{-net "
-"user} flag by default.  To get network access from within the vm add the @code{(dhcp-client-service)} to your system definition and "
-"start the VM using @command{`guix system vm config.scm` -net user}.  An important caveat of using @command{-net user} for networking "
-"is that @command{ping} will not work, because it uses the ICMP protocol.  You'll have to use a different command to check for "
-"network connectivity, for example @command{guix download}."
+"The default @command{run-vm.sh} script that is returned by an invocation of "
+"@command{guix system vm} does not add a @command{-net user} flag by "
+"default.  To get network access from within the vm add the @code{(dhcp-"
+"client-service)} to your system definition and start the VM using "
+"@command{`guix system vm config.scm` -net user}.  An important caveat of "
+"using @command{-net user} for networking is that @command{ping} will not "
+"work, because it uses the ICMP protocol.  You'll have to use a different "
+"command to check for network connectivity, for example @command{guix "
+"download}."
 msgstr ""
 
 #. type: subsubsection
-#: doc/guix.texi:20727
+#: doc/guix.texi:20789
 #, no-wrap
 msgid "Connecting Through SSH"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20736
+#: doc/guix.texi:20798
 msgid ""
-"To enable SSH inside a VM you need to add a SSH server like @code{(dropbear-service)} or @code{(lsh-service)} to your VM.  The "
-"@code{(lsh-service}) doesn't currently boot unsupervised.  It requires you to type some characters to initialize the randomness "
-"generator.  In addition you need to forward the SSH port, 22 by default, to the host.  You can do this with"
+"To enable SSH inside a VM you need to add a SSH server like @code{(dropbear-"
+"service)} or @code{(lsh-service)} to your VM.  The @code{(lsh-service}) "
+"doesn't currently boot unsupervised.  It requires you to type some "
+"characters to initialize the randomness generator.  In addition you need to "
+"forward the SSH port, 22 by default, to the host.  You can do this with"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:20739
+#: doc/guix.texi:20801
 #, no-wrap
 msgid "`guix system vm config.scm` -net user,hostfwd=tcp::10022-:22\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20742
+#: doc/guix.texi:20804
 msgid "To connect to the VM you can run"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:20745
+#: doc/guix.texi:20807
 #, no-wrap
 msgid "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 10022\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20752
+#: doc/guix.texi:20814
 msgid ""
-"The @command{-p} tells @command{ssh} the port you want to connect to.  @command{-o UserKnownHostsFile=/dev/null} prevents "
-"@command{ssh} from complaining every time you modify your @command{config.scm} file and the @command{-o StrictHostKeyChecking=no} "
-"prevents you from having to allow a connection to an unknown host every time you connect."
+"The @command{-p} tells @command{ssh} the port you want to connect to.  "
+"@command{-o UserKnownHostsFile=/dev/null} prevents @command{ssh} from "
+"complaining every time you modify your @command{config.scm} file and the "
+"@command{-o StrictHostKeyChecking=no} prevents you from having to allow a "
+"connection to an unknown host every time you connect."
 msgstr ""
 
 #. type: subsubsection
-#: doc/guix.texi:20753
+#: doc/guix.texi:20815
 #, no-wrap
 msgid "Using @command{virt-viewer} with Spice"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20759
+#: doc/guix.texi:20821
 msgid ""
-"As an alternative to the default @command{qemu} graphical client you can use the @command{remote-viewer} from the @command{virt-"
-"viewer} package.  To connect pass the @command{-spice port=5930,disable-ticketing} flag to @command{qemu}.  See previous section for "
-"further information on how to do this."
+"As an alternative to the default @command{qemu} graphical client you can use "
+"the @command{remote-viewer} from the @command{virt-viewer} package.  To "
+"connect pass the @command{-spice port=5930,disable-ticketing} flag to "
+"@command{qemu}.  See previous section for further information on how to do "
+"this."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20762
+#: doc/guix.texi:20824
 msgid ""
-"Spice also allows you to do some nice stuff like share your clipboard with your VM.  To enable that you'll also have to pass the "
-"following flags to @command{qemu}:"
+"Spice also allows you to do some nice stuff like share your clipboard with "
+"your VM.  To enable that you'll also have to pass the following flags to "
+"@command{qemu}:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:20768
+#: doc/guix.texi:20830
 #, no-wrap
 msgid ""
 "-device virtio-serial-pci,id=virtio-serial0,max_ports=16,bus=pci.0,addr=0x5\n"
@@ -39894,107 +45039,125 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20771
-msgid "You'll also need to add the @pxref{Miscellaneous Services, Spice service}."
+#: doc/guix.texi:20833
+msgid ""
+"You'll also need to add the @pxref{Miscellaneous Services, Spice service}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20778
+#: doc/guix.texi:20840
 msgid ""
-"The previous sections show the available services and how one can combine them in an @code{operating-system} declaration.  But how "
-"do we define them in the first place? And what is a service anyway?"
+"The previous sections show the available services and how one can combine "
+"them in an @code{operating-system} declaration.  But how do we define them "
+"in the first place? And what is a service anyway?"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:20790
+#: doc/guix.texi:20852
 #, no-wrap
 msgid "daemons"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20803
+#: doc/guix.texi:20865
 msgid ""
-"Here we define a @dfn{service} as, broadly, something that extends the functionality of the operating system.  Often a service is a "
-"process---a @dfn{daemon}---started when the system boots: a secure shell server, a Web server, the Guix build daemon, etc.  "
-"Sometimes a service is a daemon whose execution can be triggered by another daemon---e.g., an FTP server started by @command{inetd} "
-"or a D-Bus service activated by @command{dbus-daemon}.  Occasionally, a service does not map to a daemon.  For instance, the "
-"``account'' service collects user accounts and makes sure they exist when the system runs; the ``udev'' service collects device "
-"management rules and makes them available to the eudev daemon; the @file{/etc} service populates the @file{/etc} directory of the "
-"system."
+"Here we define a @dfn{service} as, broadly, something that extends the "
+"functionality of the operating system.  Often a service is a process---a "
+"@dfn{daemon}---started when the system boots: a secure shell server, a Web "
+"server, the Guix build daemon, etc.  Sometimes a service is a daemon whose "
+"execution can be triggered by another daemon---e.g., an FTP server started "
+"by @command{inetd} or a D-Bus service activated by @command{dbus-daemon}.  "
+"Occasionally, a service does not map to a daemon.  For instance, the "
+"``account'' service collects user accounts and makes sure they exist when "
+"the system runs; the ``udev'' service collects device management rules and "
+"makes them available to the eudev daemon; the @file{/etc} service populates "
+"the @file{/etc} directory of the system."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:20804
+#: doc/guix.texi:20866
 #, no-wrap
 msgid "service extensions"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20816
+#: doc/guix.texi:20878
 msgid ""
-"GuixSD services are connected by @dfn{extensions}.  For instance, the secure shell service @emph{extends} the Shepherd---the GuixSD "
-"initialization system, running as PID@tie{}1---by giving it the command lines to start and stop the secure shell daemon "
-"(@pxref{Networking Services, @code{lsh-service}}); the UPower service extends the D-Bus service by passing it its @file{.service} "
-"specification, and extends the udev service by passing it device management rules (@pxref{Desktop Services, @code{upower-service}}); "
-"the Guix daemon service extends the Shepherd by passing it the command lines to start and stop the daemon, and extends the account "
-"service by passing it a list of required build user accounts (@pxref{Base Services})."
+"GuixSD services are connected by @dfn{extensions}.  For instance, the secure "
+"shell service @emph{extends} the Shepherd---the GuixSD initialization "
+"system, running as PID@tie{}1---by giving it the command lines to start and "
+"stop the secure shell daemon (@pxref{Networking Services, @code{lsh-"
+"service}}); the UPower service extends the D-Bus service by passing it its "
+"@file{.service} specification, and extends the udev service by passing it "
+"device management rules (@pxref{Desktop Services, @code{upower-service}}); "
+"the Guix daemon service extends the Shepherd by passing it the command lines "
+"to start and stop the daemon, and extends the account service by passing it "
+"a list of required build user accounts (@pxref{Base Services})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20820
+#: doc/guix.texi:20882
 msgid ""
-"All in all, services and their ``extends'' relations form a directed acyclic graph (DAG).  If we represent services as boxes and "
-"extensions as arrows, a typical system might provide something like this:"
+"All in all, services and their ``extends'' relations form a directed acyclic "
+"graph (DAG).  If we represent services as boxes and extensions as arrows, a "
+"typical system might provide something like this:"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20822
+#: doc/guix.texi:20884
 msgid "@image{images/service-graph,,5in,Typical service extension graph.}"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:20823
+#: doc/guix.texi:20885
 #, no-wrap
 msgid "system service"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20831
+#: doc/guix.texi:20893
 msgid ""
-"At the bottom, we see the @dfn{system service}, which produces the directory containing everything to run and boot the system, as "
-"returned by the @command{guix system build} command.  @xref{Service Reference}, to learn about the other service types shown here.  "
-"@xref{system-extension-graph, the @command{guix system extension-graph} command}, for information on how to generate this "
-"representation for a particular operating system definition."
+"At the bottom, we see the @dfn{system service}, which produces the directory "
+"containing everything to run and boot the system, as returned by the "
+"@command{guix system build} command.  @xref{Service Reference}, to learn "
+"about the other service types shown here.  @xref{system-extension-graph, the "
+"@command{guix system extension-graph} command}, for information on how to "
+"generate this representation for a particular operating system definition."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:20832
+#: doc/guix.texi:20894
 #, no-wrap
 msgid "service types"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20838
+#: doc/guix.texi:20900
 msgid ""
-"Technically, developers can define @dfn{service types} to express these relations.  There can be any number of services of a given "
-"type on the system---for instance, a system running two instances of the GNU secure shell server (lsh) has two instances of @var{lsh-"
-"service-type}, with different parameters."
+"Technically, developers can define @dfn{service types} to express these "
+"relations.  There can be any number of services of a given type on the "
+"system---for instance, a system running two instances of the GNU secure "
+"shell server (lsh) has two instances of @var{lsh-service-type}, with "
+"different parameters."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20841
-msgid "The following section describes the programming interface for service types and services."
+#: doc/guix.texi:20903
+msgid ""
+"The following section describes the programming interface for service types "
+"and services."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20848
+#: doc/guix.texi:20910
 msgid ""
-"A @dfn{service type} is a node in the DAG described above.  Let us start with a simple example, the service type for the Guix build "
-"daemon (@pxref{Invoking guix-daemon}):"
+"A @dfn{service type} is a node in the DAG described above.  Let us start "
+"with a simple example, the service type for the Guix build daemon "
+"(@pxref{Invoking guix-daemon}):"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:20858
+#: doc/guix.texi:20920
 #, no-wrap
 msgid ""
 "(define guix-service-type\n"
@@ -40008,85 +45171,90 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20862
+#: doc/guix.texi:20924
 msgid "It defines three things:"
 msgstr ""
 
 #. type: enumerate
-#: doc/guix.texi:20866
+#: doc/guix.texi:20928
 msgid "A name, whose sole purpose is to make inspection and debugging easier."
 msgstr ""
 
 #. type: enumerate
-#: doc/guix.texi:20871
+#: doc/guix.texi:20933
 msgid ""
-"A list of @dfn{service extensions}, where each extension designates the target service type and a procedure that, given the "
-"parameters of the service, returns a list of objects to extend the service of that type."
+"A list of @dfn{service extensions}, where each extension designates the "
+"target service type and a procedure that, given the parameters of the "
+"service, returns a list of objects to extend the service of that type."
 msgstr ""
 
 #. type: enumerate
-#: doc/guix.texi:20874
+#: doc/guix.texi:20936
 msgid ""
-"Every service type has at least one service extension.  The only exception is the @dfn{boot service type}, which is the ultimate "
-"service."
+"Every service type has at least one service extension.  The only exception "
+"is the @dfn{boot service type}, which is the ultimate service."
 msgstr ""
 
 #. type: enumerate
-#: doc/guix.texi:20877
+#: doc/guix.texi:20939
 msgid "Optionally, a default value for instances of this type."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20880
+#: doc/guix.texi:20942
 msgid "In this example, @var{guix-service-type} extends three services:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20882
+#: doc/guix.texi:20944
 #, no-wrap
 msgid "shepherd-root-service-type"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20887
+#: doc/guix.texi:20949
 msgid ""
-"The @var{guix-shepherd-service} procedure defines how the Shepherd service is extended.  Namely, it returns a @code{<shepherd-"
-"service>} object that defines how @command{guix-daemon} is started and stopped (@pxref{Shepherd Services})."
+"The @var{guix-shepherd-service} procedure defines how the Shepherd service "
+"is extended.  Namely, it returns a @code{<shepherd-service>} object that "
+"defines how @command{guix-daemon} is started and stopped (@pxref{Shepherd "
+"Services})."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20888
+#: doc/guix.texi:20950
 #, no-wrap
 msgid "account-service-type"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20893
+#: doc/guix.texi:20955
 msgid ""
-"This extension for this service is computed by @var{guix-accounts}, which returns a list of @code{user-group} and @code{user-"
-"account} objects representing the build user accounts (@pxref{Invoking guix-daemon})."
+"This extension for this service is computed by @var{guix-accounts}, which "
+"returns a list of @code{user-group} and @code{user-account} objects "
+"representing the build user accounts (@pxref{Invoking guix-daemon})."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20894
+#: doc/guix.texi:20956
 #, no-wrap
 msgid "activation-service-type"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20898
+#: doc/guix.texi:20960
 msgid ""
-"Here @var{guix-activation} is a procedure that returns a gexp, which is a code snippet to run at ``activation time''---e.g., when "
-"the service is booted."
+"Here @var{guix-activation} is a procedure that returns a gexp, which is a "
+"code snippet to run at ``activation time''---e.g., when the service is "
+"booted."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20901
+#: doc/guix.texi:20963
 msgid "A service of this type is instantiated like this:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:20907
+#: doc/guix.texi:20969
 #, no-wrap
 msgid ""
 "(service guix-service-type\n"
@@ -40096,31 +45264,35 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20915
+#: doc/guix.texi:20977
 msgid ""
-"The second argument to the @code{service} form is a value representing the parameters of this specific service instance.  @xref{guix-"
-"configuration-type, @code{guix-configuration}}, for information about the @code{guix-configuration} data type.  When the value is "
-"omitted, the default value specified by @code{guix-service-type} is used:"
+"The second argument to the @code{service} form is a value representing the "
+"parameters of this specific service instance.  @xref{guix-configuration-"
+"type, @code{guix-configuration}}, for information about the @code{guix-"
+"configuration} data type.  When the value is omitted, the default value "
+"specified by @code{guix-service-type} is used:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:20918
+#: doc/guix.texi:20980
 #, no-wrap
 msgid "(service guix-service-type)\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20922
-msgid "@var{guix-service-type} is quite simple because it extends other services but is not extensible itself."
+#: doc/guix.texi:20984
+msgid ""
+"@var{guix-service-type} is quite simple because it extends other services "
+"but is not extensible itself."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20926
+#: doc/guix.texi:20988
 msgid "The service type for an @emph{extensible} service looks like this:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:20933
+#: doc/guix.texi:20995
 #, no-wrap
 msgid ""
 "(define udev-service-type\n"
@@ -40132,7 +45304,7 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:20941
+#: doc/guix.texi:21003
 #, no-wrap
 msgid ""
 "                (compose concatenate)       ;concatenate the list of rules\n"
@@ -40145,110 +45317,128 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20947
+#: doc/guix.texi:21009
 msgid ""
-"This is the service type for the @uref{https://wiki.gentoo.org/wiki/Project:Eudev, eudev device management daemon}.  Compared to the "
-"previous example, in addition to an extension of @var{shepherd-root-service-type}, we see two new fields:"
+"This is the service type for the @uref{https://wiki.gentoo.org/wiki/Project:"
+"Eudev, eudev device management daemon}.  Compared to the previous example, "
+"in addition to an extension of @var{shepherd-root-service-type}, we see two "
+"new fields:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20949
+#: doc/guix.texi:21011
 #, no-wrap
 msgid "compose"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20952
-msgid "This is the procedure to @dfn{compose} the list of extensions to services of this type."
+#: doc/guix.texi:21014
+msgid ""
+"This is the procedure to @dfn{compose} the list of extensions to services of "
+"this type."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20955
-msgid "Services can extend the udev service by passing it lists of rules; we compose those extensions simply by concatenating them."
+#: doc/guix.texi:21017
+msgid ""
+"Services can extend the udev service by passing it lists of rules; we "
+"compose those extensions simply by concatenating them."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20956
+#: doc/guix.texi:21018
 #, no-wrap
 msgid "extend"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20959
-msgid "This procedure defines how the value of the service is @dfn{extended} with the composition of the extensions."
+#: doc/guix.texi:21021
+msgid ""
+"This procedure defines how the value of the service is @dfn{extended} with "
+"the composition of the extensions."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20964
+#: doc/guix.texi:21026
 msgid ""
-"Udev extensions are composed into a list of rules, but the udev service value is itself a @code{<udev-configuration>} record.  So "
-"here, we extend that record by appending the list of rules it contains to the list of contributed rules."
+"Udev extensions are composed into a list of rules, but the udev service "
+"value is itself a @code{<udev-configuration>} record.  So here, we extend "
+"that record by appending the list of rules it contains to the list of "
+"contributed rules."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20970
+#: doc/guix.texi:21032
 msgid ""
-"This is a string giving an overview of the service type.  The string can contain Texinfo markup (@pxref{Overview,,, texinfo, GNU "
-"Texinfo}).  The @command{guix system search} command searches these strings and displays them (@pxref{Invoking guix system})."
+"This is a string giving an overview of the service type.  The string can "
+"contain Texinfo markup (@pxref{Overview,,, texinfo, GNU Texinfo}).  The "
+"@command{guix system search} command searches these strings and displays "
+"them (@pxref{Invoking guix system})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20975
+#: doc/guix.texi:21037
 msgid ""
-"There can be only one instance of an extensible service type such as @var{udev-service-type}.  If there were more, the @code{service-"
-"extension} specifications would be ambiguous."
+"There can be only one instance of an extensible service type such as "
+"@var{udev-service-type}.  If there were more, the @code{service-extension} "
+"specifications would be ambiguous."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20978
-msgid "Still here? The next section provides a reference of the programming interface for services."
+#: doc/guix.texi:21040
+msgid ""
+"Still here? The next section provides a reference of the programming "
+"interface for services."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20986
+#: doc/guix.texi:21048
 msgid ""
-"We have seen an overview of service types (@pxref{Service Types and Services}).  This section provides a reference on how to "
-"manipulate services and service types.  This interface is provided by the @code{(gnu services)} module."
+"We have seen an overview of service types (@pxref{Service Types and "
+"Services}).  This section provides a reference on how to manipulate services "
+"and service types.  This interface is provided by the @code{(gnu services)} "
+"module."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:20987
+#: doc/guix.texi:21049
 #, no-wrap
 msgid "{Scheme Procedure} service @var{type} [@var{value}]"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:20991
+#: doc/guix.texi:21053
 msgid ""
-"Return a new service of @var{type}, a @code{<service-type>} object (see below.)  @var{value} can be any object; it represents the "
-"parameters of this particular service instance."
+"Return a new service of @var{type}, a @code{<service-type>} object (see "
+"below.)  @var{value} can be any object; it represents the parameters of this "
+"particular service instance."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:20995
+#: doc/guix.texi:21057
 msgid ""
-"When @var{value} is omitted, the default value specified by @var{type} is used; if @var{type} does not specify a default value, an "
-"error is raised."
+"When @var{value} is omitted, the default value specified by @var{type} is "
+"used; if @var{type} does not specify a default value, an error is raised."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:20997
+#: doc/guix.texi:21059
 msgid "For instance, this:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:21000
+#: doc/guix.texi:21062
 #, no-wrap
 msgid "(service openssh-service-type)\n"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:21004
+#: doc/guix.texi:21066
 msgid "is equivalent to this:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:21008
+#: doc/guix.texi:21070
 #, no-wrap
 msgid ""
 "(service openssh-service-type\n"
@@ -40256,50 +45446,55 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:21012
-msgid "In both cases the result is an instance of @code{openssh-service-type} with the default configuration."
+#: doc/guix.texi:21074
+msgid ""
+"In both cases the result is an instance of @code{openssh-service-type} with "
+"the default configuration."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:21014
+#: doc/guix.texi:21076
 #, no-wrap
 msgid "{Scheme Procedure} service? @var{obj}"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:21016
+#: doc/guix.texi:21078
 msgid "Return true if @var{obj} is a service."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:21018
+#: doc/guix.texi:21080
 #, no-wrap
 msgid "{Scheme Procedure} service-kind @var{service}"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:21020
-msgid "Return the type of @var{service}---i.e., a @code{<service-type>} object."
+#: doc/guix.texi:21082
+msgid ""
+"Return the type of @var{service}---i.e., a @code{<service-type>} object."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:21022
+#: doc/guix.texi:21084
 #, no-wrap
 msgid "{Scheme Procedure} service-value @var{service}"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:21025
-msgid "Return the value associated with @var{service}.  It represents its parameters."
+#: doc/guix.texi:21087
+msgid ""
+"Return the value associated with @var{service}.  It represents its "
+"parameters."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21028
+#: doc/guix.texi:21090
 msgid "Here is an example of how a service is created and manipulated:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:21037
+#: doc/guix.texi:21099
 #, no-wrap
 msgid ""
 "(define s\n"
@@ -40313,7 +45508,7 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:21040
+#: doc/guix.texi:21102
 #, no-wrap
 msgid ""
 "(service? s)\n"
@@ -40322,7 +45517,7 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:21043
+#: doc/guix.texi:21105
 #, no-wrap
 msgid ""
 "(eq? (service-kind s) nginx-service-type)\n"
@@ -40330,193 +45525,215 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21053
+#: doc/guix.texi:21115
 msgid ""
-"The @code{modify-services} form provides a handy way to change the parameters of some of the services of a list such as @var{%base-"
-"services} (@pxref{Base Services, @code{%base-services}}).  It evaluates to a list of services.  Of course, you could always use "
-"standard list combinators such as @code{map} and @code{fold} to do that (@pxref{SRFI-1, List Library,, guile, GNU Guile Reference "
-"Manual}); @code{modify-services} simply provides a more concise form for this common pattern."
+"The @code{modify-services} form provides a handy way to change the "
+"parameters of some of the services of a list such as @var{%base-services} "
+"(@pxref{Base Services, @code{%base-services}}).  It evaluates to a list of "
+"services.  Of course, you could always use standard list combinators such as "
+"@code{map} and @code{fold} to do that (@pxref{SRFI-1, List Library,, guile, "
+"GNU Guile Reference Manual}); @code{modify-services} simply provides a more "
+"concise form for this common pattern."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:21054
+#: doc/guix.texi:21116
 #, no-wrap
 msgid "{Scheme Syntax} modify-services @var{services} @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:21056
+#: doc/guix.texi:21118
 msgid "(@var{type} @var{variable} => @var{body}) @dots{}"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:21059
-msgid "Modify the services listed in @var{services} according to the given clauses.  Each clause has the form:"
+#: doc/guix.texi:21121
+msgid ""
+"Modify the services listed in @var{services} according to the given "
+"clauses.  Each clause has the form:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:21062
+#: doc/guix.texi:21124
 #, no-wrap
 msgid "(@var{type} @var{variable} => @var{body})\n"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:21069
+#: doc/guix.texi:21131
 msgid ""
-"where @var{type} is a service type---e.g., @code{guix-service-type}---and @var{variable} is an identifier that is bound within the "
-"@var{body} to the service parameters---e.g., a @code{guix-configuration} instance---of the original service of that @var{type}."
+"where @var{type} is a service type---e.g., @code{guix-service-type}---and "
+"@var{variable} is an identifier that is bound within the @var{body} to the "
+"service parameters---e.g., a @code{guix-configuration} instance---of the "
+"original service of that @var{type}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:21076
+#: doc/guix.texi:21138
 msgid ""
-"The @var{body} should evaluate to the new service parameters, which will be used to configure the new service.  This new service "
-"will replace the original in the resulting list.  Because a service's service parameters are created using @code{define-record-"
-"type*}, you can write a succinct @var{body} that evaluates to the new service parameters by using the @code{inherit} feature that "
-"@code{define-record-type*} provides."
+"The @var{body} should evaluate to the new service parameters, which will be "
+"used to configure the new service.  This new service will replace the "
+"original in the resulting list.  Because a service's service parameters are "
+"created using @code{define-record-type*}, you can write a succinct "
+"@var{body} that evaluates to the new service parameters by using the "
+"@code{inherit} feature that @code{define-record-type*} provides."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:21078
+#: doc/guix.texi:21140
 msgid "@xref{Using the Configuration System}, for example usage."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21085
+#: doc/guix.texi:21147
 msgid ""
-"Next comes the programming interface for service types.  This is something you want to know when writing new service definitions, "
-"but not necessarily when simply looking for ways to customize your @code{operating-system} declaration."
+"Next comes the programming interface for service types.  This is something "
+"you want to know when writing new service definitions, but not necessarily "
+"when simply looking for ways to customize your @code{operating-system} "
+"declaration."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:21086
+#: doc/guix.texi:21148
 #, no-wrap
 msgid "{Data Type} service-type"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:21087
+#: doc/guix.texi:21149
 #, no-wrap
 msgid "service type"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:21090
-msgid "This is the representation of a @dfn{service type} (@pxref{Service Types and Services})."
+#: doc/guix.texi:21152
+msgid ""
+"This is the representation of a @dfn{service type} (@pxref{Service Types and "
+"Services})."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21094
+#: doc/guix.texi:21156
 msgid "This is a symbol, used only to simplify inspection and debugging."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:21095
+#: doc/guix.texi:21157
 #, no-wrap
 msgid "extensions"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21097
+#: doc/guix.texi:21159
 msgid "A non-empty list of @code{<service-extension>} objects (see below)."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21098
+#: doc/guix.texi:21160
 #, no-wrap
 msgid "@code{compose} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21102
+#: doc/guix.texi:21164
 msgid ""
-"If this is @code{#f}, then the service type denotes services that cannot be extended---i.e., services that do not receive ``values'' "
-"from other services."
+"If this is @code{#f}, then the service type denotes services that cannot be "
+"extended---i.e., services that do not receive ``values'' from other services."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21106
+#: doc/guix.texi:21168
 msgid ""
-"Otherwise, it must be a one-argument procedure.  The procedure is called by @code{fold-services} and is passed a list of values "
-"collected from extensions.  It may return any single value."
+"Otherwise, it must be a one-argument procedure.  The procedure is called by "
+"@code{fold-services} and is passed a list of values collected from "
+"extensions.  It may return any single value."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21107
+#: doc/guix.texi:21169
 #, no-wrap
 msgid "@code{extend} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21109
+#: doc/guix.texi:21171
 msgid "If this is @code{#f}, services of this type cannot be extended."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21115
+#: doc/guix.texi:21177
 msgid ""
-"Otherwise, it must be a two-argument procedure: @code{fold-services} calls it, passing it the initial value of the service as the "
-"first argument and the result of applying @code{compose} to the extension values as the second argument.  It must return a value "
-"that is a valid parameter value for the service instance."
+"Otherwise, it must be a two-argument procedure: @code{fold-services} calls "
+"it, passing it the initial value of the service as the first argument and "
+"the result of applying @code{compose} to the extension values as the second "
+"argument.  It must return a value that is a valid parameter value for the "
+"service instance."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:21118
+#: doc/guix.texi:21180
 msgid "@xref{Service Types and Services}, for examples."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:21120
+#: doc/guix.texi:21182
 #, no-wrap
 msgid "{Scheme Procedure} service-extension @var{target-type} @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:21126
+#: doc/guix.texi:21188
 msgid ""
-"@var{compute} Return a new extension for services of type @var{target-type}.  @var{compute} must be a one-argument procedure: "
-"@code{fold-services} calls it, passing it the value associated with the service that provides the extension; it must return a valid "
-"value for the target service."
+"@var{compute} Return a new extension for services of type @var{target-"
+"type}.  @var{compute} must be a one-argument procedure: @code{fold-services} "
+"calls it, passing it the value associated with the service that provides the "
+"extension; it must return a valid value for the target service."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:21128
+#: doc/guix.texi:21190
 #, no-wrap
 msgid "{Scheme Procedure} service-extension? @var{obj}"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:21130
+#: doc/guix.texi:21192
 msgid "Return true if @var{obj} is a service extension."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21136
+#: doc/guix.texi:21198
 msgid ""
-"Occasionally, you might want to simply extend an existing service.  This involves creating a new service type and specifying the "
-"extension of interest, which can be verbose; the @code{simple-service} procedure provides a shorthand for this."
+"Occasionally, you might want to simply extend an existing service.  This "
+"involves creating a new service type and specifying the extension of "
+"interest, which can be verbose; the @code{simple-service} procedure provides "
+"a shorthand for this."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:21137
+#: doc/guix.texi:21199
 #, no-wrap
 msgid "{Scheme Procedure} simple-service @var{name} @var{target} @var{value}"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:21141
+#: doc/guix.texi:21203
 msgid ""
-"Return a service that extends @var{target} with @var{value}.  This works by creating a singleton service type @var{name}, of which "
-"the returned service is an instance."
+"Return a service that extends @var{target} with @var{value}.  This works by "
+"creating a singleton service type @var{name}, of which the returned service "
+"is an instance."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:21144
-msgid "For example, this extends mcron (@pxref{Scheduled Job Execution}) with an additional job:"
+#: doc/guix.texi:21206
+msgid ""
+"For example, this extends mcron (@pxref{Scheduled Job Execution}) with an "
+"additional job:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:21148
+#: doc/guix.texi:21210
 #, no-wrap
 msgid ""
 "(simple-service 'my-mcron-job mcron-service-type\n"
@@ -40524,336 +45741,364 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21158
+#: doc/guix.texi:21220
 msgid ""
-"At the core of the service abstraction lies the @code{fold-services} procedure, which is responsible for ``compiling'' a list of "
-"services down to a single directory that contains everything needed to boot and run the system---the directory shown by the "
-"@command{guix system build} command (@pxref{Invoking guix system}).  In essence, it propagates service extensions down the service "
-"graph, updating each node parameters on the way, until it reaches the root node."
+"At the core of the service abstraction lies the @code{fold-services} "
+"procedure, which is responsible for ``compiling'' a list of services down to "
+"a single directory that contains everything needed to boot and run the "
+"system---the directory shown by the @command{guix system build} command "
+"(@pxref{Invoking guix system}).  In essence, it propagates service "
+"extensions down the service graph, updating each node parameters on the way, "
+"until it reaches the root node."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:21159
+#: doc/guix.texi:21221
 #, no-wrap
 msgid "{Scheme Procedure} fold-services @var{services} @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:21163
+#: doc/guix.texi:21225
 msgid ""
-"[#:target-type @var{system-service-type}] Fold @var{services} by propagating their extensions down to the root of type @var{target-"
-"type}; return the root service adjusted accordingly."
+"[#:target-type @var{system-service-type}] Fold @var{services} by propagating "
+"their extensions down to the root of type @var{target-type}; return the root "
+"service adjusted accordingly."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21167
-msgid "Lastly, the @code{(gnu services)} module also defines several essential service types, some of which are listed below."
+#: doc/guix.texi:21229
+msgid ""
+"Lastly, the @code{(gnu services)} module also defines several essential "
+"service types, some of which are listed below."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:21168
+#: doc/guix.texi:21230
 #, no-wrap
 msgid "{Scheme Variable} system-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:21171
+#: doc/guix.texi:21233
 msgid ""
-"This is the root of the service graph.  It produces the system directory as returned by the @command{guix system build} command."
+"This is the root of the service graph.  It produces the system directory as "
+"returned by the @command{guix system build} command."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:21173
+#: doc/guix.texi:21235
 #, no-wrap
 msgid "{Scheme Variable} boot-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:21176
+#: doc/guix.texi:21238
 msgid ""
-"The type of the ``boot service'', which produces the @dfn{boot script}.  The boot script is what the initial RAM disk runs when "
-"booting."
+"The type of the ``boot service'', which produces the @dfn{boot script}.  The "
+"boot script is what the initial RAM disk runs when booting."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:21178
+#: doc/guix.texi:21240
 #, no-wrap
 msgid "{Scheme Variable} etc-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:21182
+#: doc/guix.texi:21244
 msgid ""
-"The type of the @file{/etc} service.  This service is used to create files under @file{/etc} and can be extended by passing it name/"
-"file tuples such as:"
+"The type of the @file{/etc} service.  This service is used to create files "
+"under @file{/etc} and can be extended by passing it name/file tuples such as:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:21185
+#: doc/guix.texi:21247
 #, no-wrap
 msgid "(list `(\"issue\" ,(plain-file \"issue\" \"Welcome!\\n\")))\n"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:21189
-msgid "In this example, the effect would be to add an @file{/etc/issue} file pointing to the given file."
+#: doc/guix.texi:21251
+msgid ""
+"In this example, the effect would be to add an @file{/etc/issue} file "
+"pointing to the given file."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:21191
+#: doc/guix.texi:21253
 #, no-wrap
 msgid "{Scheme Variable} setuid-program-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:21195
+#: doc/guix.texi:21257
 msgid ""
-"Type for the ``setuid-program service''.  This service collects lists of executable file names, passed as gexps, and adds them to "
-"the set of setuid-root programs on the system (@pxref{Setuid Programs})."
+"Type for the ``setuid-program service''.  This service collects lists of "
+"executable file names, passed as gexps, and adds them to the set of setuid-"
+"root programs on the system (@pxref{Setuid Programs})."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:21197
+#: doc/guix.texi:21259
 #, no-wrap
 msgid "{Scheme Variable} profile-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:21201
+#: doc/guix.texi:21263
 msgid ""
-"Type of the service that populates the @dfn{system profile}---i.e., the programs under @file{/run/current-system/profile}.  Other "
-"services can extend it by passing it lists of packages to add to the system profile."
+"Type of the service that populates the @dfn{system profile}---i.e., the "
+"programs under @file{/run/current-system/profile}.  Other services can "
+"extend it by passing it lists of packages to add to the system profile."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:21207
+#: doc/guix.texi:21269
 #, no-wrap
 msgid "shepherd services"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:21208
+#: doc/guix.texi:21270
 #, no-wrap
 msgid "PID 1"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:21209
+#: doc/guix.texi:21271
 #, no-wrap
 msgid "init system"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21215
+#: doc/guix.texi:21277
 msgid ""
-"The @code{(gnu services shepherd)} module provides a way to define services managed by the GNU@tie{}Shepherd, which is the GuixSD "
-"initialization system---the first process that is started when the system boots, also known as PID@tie{}1 (@pxref{Introduction,,, "
-"shepherd, The GNU Shepherd Manual})."
+"The @code{(gnu services shepherd)} module provides a way to define services "
+"managed by the GNU@tie{}Shepherd, which is the GuixSD initialization "
+"system---the first process that is started when the system boots, also known "
+"as PID@tie{}1 (@pxref{Introduction,,, shepherd, The GNU Shepherd Manual})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21221
+#: doc/guix.texi:21283
 msgid ""
-"Services in the Shepherd can depend on each other.  For instance, the SSH daemon may need to be started after the syslog daemon has "
-"been started, which in turn can only happen once all the file systems have been mounted.  The simple operating system defined "
-"earlier (@pxref{Using the Configuration System}) results in a service graph like this:"
+"Services in the Shepherd can depend on each other.  For instance, the SSH "
+"daemon may need to be started after the syslog daemon has been started, "
+"which in turn can only happen once all the file systems have been mounted.  "
+"The simple operating system defined earlier (@pxref{Using the Configuration "
+"System}) results in a service graph like this:"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21223
+#: doc/guix.texi:21285
 msgid "@image{images/shepherd-graph,,5in,Typical shepherd service graph.}"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21227
+#: doc/guix.texi:21289
 msgid ""
-"You can actually generate such a graph for any operating system definition using the @command{guix system shepherd-graph} command "
-"(@pxref{system-shepherd-graph, @command{guix system shepherd-graph}})."
+"You can actually generate such a graph for any operating system definition "
+"using the @command{guix system shepherd-graph} command (@pxref{system-"
+"shepherd-graph, @command{guix system shepherd-graph}})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21231
+#: doc/guix.texi:21293
 msgid ""
-"The @var{%shepherd-root-service} is a service object representing PID@tie{}1, of type @var{shepherd-root-service-type}; it can be "
-"extended by passing it lists of @code{<shepherd-service>} objects."
+"The @var{%shepherd-root-service} is a service object representing PID@tie{}"
+"1, of type @var{shepherd-root-service-type}; it can be extended by passing "
+"it lists of @code{<shepherd-service>} objects."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:21232
+#: doc/guix.texi:21294
 #, no-wrap
 msgid "{Data Type} shepherd-service"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:21234
+#: doc/guix.texi:21296
 msgid "The data type representing a service managed by the Shepherd."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:21236
+#: doc/guix.texi:21298
 #, no-wrap
 msgid "provision"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21238
+#: doc/guix.texi:21300
 msgid "This is a list of symbols denoting what the service provides."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21243
+#: doc/guix.texi:21305
 msgid ""
-"These are the names that may be passed to @command{herd start}, @command{herd status}, and similar commands (@pxref{Invoking herd,,, "
-"shepherd, The GNU Shepherd Manual}).  @xref{Slots of services, the @code{provides} slot,, shepherd, The GNU Shepherd Manual}, for "
-"details."
+"These are the names that may be passed to @command{herd start}, "
+"@command{herd status}, and similar commands (@pxref{Invoking herd,,, "
+"shepherd, The GNU Shepherd Manual}).  @xref{Slots of services, the "
+"@code{provides} slot,, shepherd, The GNU Shepherd Manual}, for details."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21244
+#: doc/guix.texi:21306
 #, no-wrap
 msgid "@code{requirements} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21246
+#: doc/guix.texi:21308
 msgid "List of symbols denoting the Shepherd services this one depends on."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21247
+#: doc/guix.texi:21309
 #, no-wrap
 msgid "@code{respawn?} (default: @code{#t})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21250
-msgid "Whether to restart the service when it stops, for instance when the underlying process dies."
+#: doc/guix.texi:21312
+msgid ""
+"Whether to restart the service when it stops, for instance when the "
+"underlying process dies."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:21251
+#: doc/guix.texi:21313
 #, no-wrap
 msgid "start"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:21252
+#: doc/guix.texi:21314
 #, no-wrap
 msgid "@code{stop} (default: @code{#~(const #f)})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21258
+#: doc/guix.texi:21320
 msgid ""
-"The @code{start} and @code{stop} fields refer to the Shepherd's facilities to start and stop processes (@pxref{Service De- and "
-"Constructors,,, shepherd, The GNU Shepherd Manual}).  They are given as G-expressions that get expanded in the Shepherd "
-"configuration file (@pxref{G-Expressions})."
+"The @code{start} and @code{stop} fields refer to the Shepherd's facilities "
+"to start and stop processes (@pxref{Service De- and Constructors,,, "
+"shepherd, The GNU Shepherd Manual}).  They are given as G-expressions that "
+"get expanded in the Shepherd configuration file (@pxref{G-Expressions})."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21261
+#: doc/guix.texi:21323
 msgid "A documentation string, as shown when running:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:21264
+#: doc/guix.texi:21326
 #, no-wrap
 msgid "herd doc @var{service-name}\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21268
-msgid "where @var{service-name} is one of the symbols in @var{provision} (@pxref{Invoking herd,,, shepherd, The GNU Shepherd Manual})."
+#: doc/guix.texi:21330
+msgid ""
+"where @var{service-name} is one of the symbols in @var{provision} "
+"(@pxref{Invoking herd,,, shepherd, The GNU Shepherd Manual})."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21269
+#: doc/guix.texi:21331
 #, no-wrap
 msgid "@code{modules} (default: @var{%default-modules})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21272
-msgid "This is the list of modules that must be in scope when @code{start} and @code{stop} are evaluated."
+#: doc/guix.texi:21334
+msgid ""
+"This is the list of modules that must be in scope when @code{start} and "
+"@code{stop} are evaluated."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:21276
+#: doc/guix.texi:21338
 #, no-wrap
 msgid "{Scheme Variable} shepherd-root-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:21278
+#: doc/guix.texi:21340
 msgid "The service type for the Shepherd ``root service''---i.e., PID@tie{}1."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:21282
+#: doc/guix.texi:21344
 msgid ""
-"This is the service type that extensions target when they want to create shepherd services (@pxref{Service Types and Services}, for "
-"an example).  Each extension must pass a list of @code{<shepherd-service>}."
+"This is the service type that extensions target when they want to create "
+"shepherd services (@pxref{Service Types and Services}, for an example).  "
+"Each extension must pass a list of @code{<shepherd-service>}."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:21284
+#: doc/guix.texi:21346
 #, no-wrap
 msgid "{Scheme Variable} %shepherd-root-service"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:21286
+#: doc/guix.texi:21348
 msgid "This service represents PID@tie{}1."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:21292
+#: doc/guix.texi:21354
 #, no-wrap
 msgid "documentation, searching for"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:21293
+#: doc/guix.texi:21355
 #, no-wrap
 msgid "searching for documentation"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:21294
+#: doc/guix.texi:21356
 #, no-wrap
 msgid "Info, documentation format"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:21295
+#: doc/guix.texi:21357
 #, no-wrap
 msgid "man pages"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:21296
+#: doc/guix.texi:21358
 #, no-wrap
 msgid "manual pages"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21303
+#: doc/guix.texi:21365
 msgid ""
-"In most cases packages installed with Guix come with documentation.  There are two main documentation formats: ``Info'', a "
-"browseable hypertext format used for GNU software, and ``manual pages'' (or ``man pages''), the linear documentation format "
-"traditionally found on Unix.  Info manuals are accessed with the @command{info} command or with Emacs, and man pages are accessed "
+"In most cases packages installed with Guix come with documentation.  There "
+"are two main documentation formats: ``Info'', a browseable hypertext format "
+"used for GNU software, and ``manual pages'' (or ``man pages''), the linear "
+"documentation format traditionally found on Unix.  Info manuals are accessed "
+"with the @command{info} command or with Emacs, and man pages are accessed "
 "using @command{man}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21307
+#: doc/guix.texi:21369
 msgid ""
-"You can look for documentation of software installed on your system by keyword.  For example, the following command searches for "
-"information about ``TLS'' in Info manuals:"
+"You can look for documentation of software installed on your system by "
+"keyword.  For example, the following command searches for information about "
+"``TLS'' in Info manuals:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:21315
+#: doc/guix.texi:21377
 #, no-wrap
 msgid ""
 "$ info -k TLS\n"
@@ -40865,12 +46110,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21319
+#: doc/guix.texi:21381
 msgid "The command below searches for the same keyword in man pages:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:21325
+#: doc/guix.texi:21387
 #, no-wrap
 msgid ""
 "$ man -k TLS\n"
@@ -40880,146 +46125,175 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21331
+#: doc/guix.texi:21393
 msgid ""
-"These searches are purely local to your computer so you have the guarantee that documentation you find corresponds to what you have "
-"actually installed, you can access it off-line, and your privacy is respected."
+"These searches are purely local to your computer so you have the guarantee "
+"that documentation you find corresponds to what you have actually installed, "
+"you can access it off-line, and your privacy is respected."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21334
-msgid "Once you have these results, you can view the relevant documentation by running, say:"
+#: doc/guix.texi:21396
+msgid ""
+"Once you have these results, you can view the relevant documentation by "
+"running, say:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:21337
+#: doc/guix.texi:21399
 #, no-wrap
 msgid "$ info \"(gnutls)Core TLS API\"\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21341
+#: doc/guix.texi:21403
 msgid "or:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:21344
+#: doc/guix.texi:21406
 #, no-wrap
 msgid "$ man certtool\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21352
+#: doc/guix.texi:21414
 msgid ""
-"Info manuals contain sections and indices as well as hyperlinks like those found in Web pages.  The @command{info} reader "
-"(@pxref{Top, Info reader,, info-stnd, Stand-alone GNU Info}) and its Emacs counterpart (@pxref{Misc Help,,, emacs, The GNU Emacs "
-"Manual}) provide intuitive key bindings to navigate manuals.  @xref{Getting Started,,, info, Info: An Introduction}, for an "
-"introduction to Info navigation."
+"Info manuals contain sections and indices as well as hyperlinks like those "
+"found in Web pages.  The @command{info} reader (@pxref{Top, Info reader,, "
+"info-stnd, Stand-alone GNU Info}) and its Emacs counterpart (@pxref{Misc "
+"Help,,, emacs, The GNU Emacs Manual}) provide intuitive key bindings to "
+"navigate manuals.  @xref{Getting Started,,, info, Info: An Introduction}, "
+"for an introduction to Info navigation."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:21356
+#: doc/guix.texi:21418
 #, no-wrap
 msgid "debugging files"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21362
+#: doc/guix.texi:21424
 msgid ""
-"Program binaries, as produced by the GCC compilers for instance, are typically written in the ELF format, with a section containing "
-"@dfn{debugging information}.  Debugging information is what allows the debugger, GDB, to map binary code to source code; it is "
-"required to debug a compiled program in good conditions."
+"Program binaries, as produced by the GCC compilers for instance, are "
+"typically written in the ELF format, with a section containing "
+"@dfn{debugging information}.  Debugging information is what allows the "
+"debugger, GDB, to map binary code to source code; it is required to debug a "
+"compiled program in good conditions."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21370
+#: doc/guix.texi:21432
 msgid ""
-"The problem with debugging information is that is takes up a fair amount of disk space.  For example, debugging information for the "
-"GNU C Library weighs in at more than 60 MiB.  Thus, as a user, keeping all the debugging info of all the installed programs is "
-"usually not an option.  Yet, space savings should not come at the cost of an impediment to debugging---especially in the GNU system, "
-"which should make it easier for users to exert their computing freedom (@pxref{GNU Distribution})."
+"The problem with debugging information is that is takes up a fair amount of "
+"disk space.  For example, debugging information for the GNU C Library weighs "
+"in at more than 60 MiB.  Thus, as a user, keeping all the debugging info of "
+"all the installed programs is usually not an option.  Yet, space savings "
+"should not come at the cost of an impediment to debugging---especially in "
+"the GNU system, which should make it easier for users to exert their "
+"computing freedom (@pxref{GNU Distribution})."
 msgstr ""
-"Le problème avec les informations de débogage est qu'elles prennent pas mal de place sur le disque. Par exemple, les informations de "
-"débogage de la bibliothèque C de GNU prend plus de 60 Mo. Ainsi, en tant qu'utilisateur, garder toutes les informations de débogage "
-"de tous les programmes installés n'est souvent pas une possibilité. Cependant, l'économie d'espace ne devrait pas empêcher le "
-"débogage — en particulier, dans le système GNU, qui devrait faciliter pour ses utilisateurs l'exercice de leurs libertés "
+"Le problème avec les informations de débogage est qu'elles prennent pas mal "
+"de place sur le disque. Par exemple, les informations de débogage de la "
+"bibliothèque C de GNU prend plus de 60 Mo. Ainsi, en tant qu'utilisateur, "
+"garder toutes les informations de débogage de tous les programmes installés "
+"n'est souvent pas une possibilité. Cependant, l'économie d'espace ne devrait "
+"pas empêcher le débogage — en particulier, dans le système GNU, qui devrait "
+"faciliter pour ses utilisateurs l'exercice de leurs libertés "
 "(@pxref{Distribution GNU})."
 
 #. type: Plain text
-#: doc/guix.texi:21377
+#: doc/guix.texi:21439
 msgid ""
-"Thankfully, the GNU Binary Utilities (Binutils) and GDB provide a mechanism that allows users to get the best of both worlds: "
-"debugging information can be stripped from the binaries and stored in separate files.  GDB is then able to load debugging "
-"information from those files, when they are available (@pxref{Separate Debug Files,,, gdb, Debugging with GDB})."
+"Thankfully, the GNU Binary Utilities (Binutils) and GDB provide a mechanism "
+"that allows users to get the best of both worlds: debugging information can "
+"be stripped from the binaries and stored in separate files.  GDB is then "
+"able to load debugging information from those files, when they are available "
+"(@pxref{Separate Debug Files,,, gdb, Debugging with GDB})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21385
+#: doc/guix.texi:21447
 msgid ""
-"The GNU distribution takes advantage of this by storing debugging information in the @code{lib/debug} sub-directory of a separate "
-"package output unimaginatively called @code{debug} (@pxref{Packages with Multiple Outputs}).  Users can choose to install the "
-"@code{debug} output of a package when they need it.  For instance, the following command installs the debugging information for the "
-"GNU C Library and for GNU Guile:"
+"The GNU distribution takes advantage of this by storing debugging "
+"information in the @code{lib/debug} sub-directory of a separate package "
+"output unimaginatively called @code{debug} (@pxref{Packages with Multiple "
+"Outputs}).  Users can choose to install the @code{debug} output of a package "
+"when they need it.  For instance, the following command installs the "
+"debugging information for the GNU C Library and for GNU Guile:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:21388
+#: doc/guix.texi:21450
 #, no-wrap
 msgid "guix package -i glibc:debug guile:debug\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21394
+#: doc/guix.texi:21456
 msgid ""
-"GDB must then be told to look for debug files in the user's profile, by setting the @code{debug-file-directory} variable (consider "
-"setting it from the @file{~/.gdbinit} file, @pxref{Startup,,, gdb, Debugging with GDB}):"
+"GDB must then be told to look for debug files in the user's profile, by "
+"setting the @code{debug-file-directory} variable (consider setting it from "
+"the @file{~/.gdbinit} file, @pxref{Startup,,, gdb, Debugging with GDB}):"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:21397
+#: doc/guix.texi:21459
 #, no-wrap
 msgid "(gdb) set debug-file-directory ~/.guix-profile/lib/debug\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21401
-msgid "From there on, GDB will pick up debugging information from the @code{.debug} files under @file{~/.guix-profile/lib/debug}."
+#: doc/guix.texi:21463
+msgid ""
+"From there on, GDB will pick up debugging information from the @code{.debug} "
+"files under @file{~/.guix-profile/lib/debug}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21408
+#: doc/guix.texi:21470
 msgid ""
-"In addition, you will most likely want GDB to be able to show the source code being debugged.  To do that, you will have to unpack "
-"the source code of the package of interest (obtained with @code{guix build --source}, @pxref{Invoking guix build}), and to point GDB "
-"to that source directory using the @code{directory} command (@pxref{Source Path, @code{directory},, gdb, Debugging with GDB})."
+"In addition, you will most likely want GDB to be able to show the source "
+"code being debugged.  To do that, you will have to unpack the source code of "
+"the package of interest (obtained with @code{guix build --source}, "
+"@pxref{Invoking guix build}), and to point GDB to that source directory "
+"using the @code{directory} command (@pxref{Source Path, @code{directory},, "
+"gdb, Debugging with GDB})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21417
+#: doc/guix.texi:21479
 msgid ""
-"The @code{debug} output mechanism in Guix is implemented by the @code{gnu-build-system} (@pxref{Build Systems}).  Currently, it is "
-"opt-in---debugging information is available only for the packages with definitions explicitly declaring a @code{debug} output.  This "
-"may be changed to opt-out in the future if our build farm servers can handle the load.  To check whether a package has a "
-"@code{debug} output, use @command{guix package --list-available} (@pxref{Invoking guix package})."
+"The @code{debug} output mechanism in Guix is implemented by the @code{gnu-"
+"build-system} (@pxref{Build Systems}).  Currently, it is opt-in---debugging "
+"information is available only for the packages with definitions explicitly "
+"declaring a @code{debug} output.  This may be changed to opt-out in the "
+"future if our build farm servers can handle the load.  To check whether a "
+"package has a @code{debug} output, use @command{guix package --list-"
+"available} (@pxref{Invoking guix package})."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:21422
+#: doc/guix.texi:21484
 #, no-wrap
 msgid "security updates"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21431
+#: doc/guix.texi:21493
 msgid ""
-"Occasionally, important security vulnerabilities are discovered in software packages and must be patched.  Guix developers try hard "
-"to keep track of known vulnerabilities and to apply fixes as soon as possible in the @code{master} branch of Guix (we do not yet "
-"provide a ``stable'' branch containing only security updates.)  The @command{guix lint} tool helps developers find out about "
-"vulnerable versions of software packages in the distribution:"
+"Occasionally, important security vulnerabilities are discovered in software "
+"packages and must be patched.  Guix developers try hard to keep track of "
+"known vulnerabilities and to apply fixes as soon as possible in the "
+"@code{master} branch of Guix (we do not yet provide a ``stable'' branch "
+"containing only security updates.)  The @command{guix lint} tool helps "
+"developers find out about vulnerable versions of software packages in the "
+"distribution:"
 msgstr ""
 
 #. type: smallexample
-#: doc/guix.texi:21438
+#: doc/guix.texi:21500
 #, no-wrap
 msgid ""
 "$ guix lint -c cve\n"
@@ -41030,59 +46304,73 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21441
+#: doc/guix.texi:21503
 msgid "@xref{Invoking guix lint}, for more information."
 msgstr ""
 
 #. type: quotation
-#: doc/guix.texi:21445
-msgid "As of version @value{VERSION}, the feature described below is considered ``beta''."
+#: doc/guix.texi:21507
+msgid ""
+"As of version @value{VERSION}, the feature described below is considered "
+"``beta''."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21455
+#: doc/guix.texi:21517
 msgid ""
-"Guix follows a functional package management discipline (@pxref{Introduction}), which implies that, when a package is changed, "
-"@emph{every package that depends on it} must be rebuilt.  This can significantly slow down the deployment of fixes in core packages "
-"such as libc or Bash, since basically the whole distribution would need to be rebuilt.  Using pre-built binaries helps "
-"(@pxref{Substitutes}), but deployment may still take more time than desired."
+"Guix follows a functional package management discipline "
+"(@pxref{Introduction}), which implies that, when a package is changed, "
+"@emph{every package that depends on it} must be rebuilt.  This can "
+"significantly slow down the deployment of fixes in core packages such as "
+"libc or Bash, since basically the whole distribution would need to be "
+"rebuilt.  Using pre-built binaries helps (@pxref{Substitutes}), but "
+"deployment may still take more time than desired."
 msgstr ""
-"Guix suit une discipline de gestion de paquets fonctionnelle (@pxref{Introduction}), ce qui implique que lorsqu'un paquet change, "
-"@emph{tous les paquets qui en dépendent} doivent être reconstruits. Cela peut grandement ralentir le déploiement de corrections dans "
-"les paquets du cœur comme libc ou bash comme presque toute la distribution aurait besoin d'être reconstruite. Cela aide d'utiliser "
-"des binaires pré-construits (@pxref{Substituts}), mais le déploiement peut toujours prendre plus de temps de souhaité."
+"Guix suit une discipline de gestion de paquets fonctionnelle "
+"(@pxref{Introduction}), ce qui implique que lorsqu'un paquet change, "
+"@emph{tous les paquets qui en dépendent} doivent être reconstruits. Cela "
+"peut grandement ralentir le déploiement de corrections dans les paquets du "
+"cœur comme libc ou bash comme presque toute la distribution aurait besoin "
+"d'être reconstruite. Cela aide d'utiliser des binaires pré-construits "
+"(@pxref{Substituts}), mais le déploiement peut toujours prendre plus de "
+"temps de souhaité."
 
 #. type: cindex
-#: doc/guix.texi:21456
+#: doc/guix.texi:21518
 #, no-wrap
 msgid "grafts"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21464
+#: doc/guix.texi:21526
 msgid ""
-"To address this, Guix implements @dfn{grafts}, a mechanism that allows for fast deployment of critical updates without the costs "
-"associated with a whole-distribution rebuild.  The idea is to rebuild only the package that needs to be patched, and then to "
-"``graft'' it onto packages explicitly installed by the user and that were previously referring to the original package.  The cost of "
-"grafting is typically very low, and order of magnitudes lower than a full rebuild of the dependency chain."
+"To address this, Guix implements @dfn{grafts}, a mechanism that allows for "
+"fast deployment of critical updates without the costs associated with a "
+"whole-distribution rebuild.  The idea is to rebuild only the package that "
+"needs to be patched, and then to ``graft'' it onto packages explicitly "
+"installed by the user and that were previously referring to the original "
+"package.  The cost of grafting is typically very low, and order of "
+"magnitudes lower than a full rebuild of the dependency chain."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:21465
+#: doc/guix.texi:21527
 #, no-wrap
 msgid "replacements of packages, for grafts"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21471
+#: doc/guix.texi:21533
 msgid ""
-"For instance, suppose a security update needs to be applied to Bash.  Guix developers will provide a package definition for the "
-"``fixed'' Bash, say @var{bash-fixed}, in the usual way (@pxref{Defining Packages}).  Then, the original package definition is "
-"augmented with a @code{replacement} field pointing to the package containing the bug fix:"
+"For instance, suppose a security update needs to be applied to Bash.  Guix "
+"developers will provide a package definition for the ``fixed'' Bash, say "
+"@var{bash-fixed}, in the usual way (@pxref{Defining Packages}).  Then, the "
+"original package definition is augmented with a @code{replacement} field "
+"pointing to the package containing the bug fix:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:21478
+#: doc/guix.texi:21540
 #, no-wrap
 msgid ""
 "(define bash\n"
@@ -41093,330 +46381,398 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21488
+#: doc/guix.texi:21550
 msgid ""
-"From there on, any package depending directly or indirectly on Bash---as reported by @command{guix gc --requisites} (@pxref{Invoking "
-"guix gc})---that is installed is automatically ``rewritten'' to refer to @var{bash-fixed} instead of @var{bash}.  This grafting "
-"process takes time proportional to the size of the package, usually less than a minute for an ``average'' package on a recent "
-"machine.  Grafting is recursive: when an indirect dependency requires grafting, then grafting ``propagates'' up to the package that "
-"the user is installing."
+"From there on, any package depending directly or indirectly on Bash---as "
+"reported by @command{guix gc --requisites} (@pxref{Invoking guix gc})---that "
+"is installed is automatically ``rewritten'' to refer to @var{bash-fixed} "
+"instead of @var{bash}.  This grafting process takes time proportional to the "
+"size of the package, usually less than a minute for an ``average'' package "
+"on a recent machine.  Grafting is recursive: when an indirect dependency "
+"requires grafting, then grafting ``propagates'' up to the package that the "
+"user is installing."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21496
+#: doc/guix.texi:21558
 msgid ""
-"Currently, the length of the name and version of the graft and that of the package it replaces (@var{bash-fixed} and @var{bash} in "
-"the example above) must be equal.  This restriction mostly comes from the fact that grafting works by patching files, including "
-"binary files, directly.  Other restrictions may apply: for instance, when adding a graft to a package providing a shared library, "
-"the original shared library and its replacement must have the same @code{SONAME} and be binary-compatible."
+"Currently, the length of the name and version of the graft and that of the "
+"package it replaces (@var{bash-fixed} and @var{bash} in the example above) "
+"must be equal.  This restriction mostly comes from the fact that grafting "
+"works by patching files, including binary files, directly.  Other "
+"restrictions may apply: for instance, when adding a graft to a package "
+"providing a shared library, the original shared library and its replacement "
+"must have the same @code{SONAME} and be binary-compatible."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21500
+#: doc/guix.texi:21562
 msgid ""
-"The @option{--no-grafts} command-line option allows you to forcefully avoid grafting (@pxref{Common Build Options, @option{--no-"
-"grafts}}).  Thus, the command:"
+"The @option{--no-grafts} command-line option allows you to forcefully avoid "
+"grafting (@pxref{Common Build Options, @option{--no-grafts}}).  Thus, the "
+"command:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:21503
+#: doc/guix.texi:21565
 #, no-wrap
 msgid "guix build bash --no-grafts\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21507
+#: doc/guix.texi:21569
 msgid "returns the store file name of the original Bash, whereas:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:21510
+#: doc/guix.texi:21572
 #, no-wrap
 msgid "guix build bash\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21515
+#: doc/guix.texi:21577
 msgid ""
-"returns the store file name of the ``fixed'', replacement Bash.  This allows you to distinguish between the two variants of Bash."
+"returns the store file name of the ``fixed'', replacement Bash.  This allows "
+"you to distinguish between the two variants of Bash."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21518
-msgid "To verify which Bash your whole profile refers to, you can run (@pxref{Invoking guix gc}):"
+#: doc/guix.texi:21580
+msgid ""
+"To verify which Bash your whole profile refers to, you can run "
+"(@pxref{Invoking guix gc}):"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:21521
+#: doc/guix.texi:21583
 #, no-wrap
 msgid "guix gc -R `readlink -f ~/.guix-profile` | grep bash\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21526
-msgid "@dots{} and compare the store file names that you get with those above.  Likewise for a complete GuixSD system generation:"
+#: doc/guix.texi:21588
+msgid ""
+"@dots{} and compare the store file names that you get with those above.  "
+"Likewise for a complete GuixSD system generation:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:21529
+#: doc/guix.texi:21591
 #, no-wrap
 msgid "guix gc -R `guix system build my-config.scm` | grep bash\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21533
-msgid "Lastly, to check which Bash running processes are using, you can use the @command{lsof} command:"
+#: doc/guix.texi:21595
+msgid ""
+"Lastly, to check which Bash running processes are using, you can use the "
+"@command{lsof} command:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:21536
+#: doc/guix.texi:21598
 #, no-wrap
 msgid "lsof | grep /gnu/store/.*bash\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21553
+#: doc/guix.texi:21615
 msgid ""
-"From a programming viewpoint, the package definitions of the GNU distribution are provided by Guile modules in the @code{(gnu "
-"packages @dots{})} name space@footnote{Note that packages under the @code{(gnu packages @dots{})} module name space are not "
-"necessarily ``GNU packages''.  This module naming scheme follows the usual Guile module naming convention: @code{gnu} means that "
-"these modules are distributed as part of the GNU system, and @code{packages} identifies modules that define packages.} "
-"(@pxref{Modules, Guile modules,, guile, GNU Guile Reference Manual}).  For instance, the @code{(gnu packages emacs)} module exports "
-"a variable named @code{emacs}, which is bound to a @code{<package>} object (@pxref{Defining Packages})."
+"From a programming viewpoint, the package definitions of the GNU "
+"distribution are provided by Guile modules in the @code{(gnu packages "
+"@dots{})} name space@footnote{Note that packages under the @code{(gnu "
+"packages @dots{})} module name space are not necessarily ``GNU packages''.  "
+"This module naming scheme follows the usual Guile module naming convention: "
+"@code{gnu} means that these modules are distributed as part of the GNU "
+"system, and @code{packages} identifies modules that define packages.} "
+"(@pxref{Modules, Guile modules,, guile, GNU Guile Reference Manual}).  For "
+"instance, the @code{(gnu packages emacs)} module exports a variable named "
+"@code{emacs}, which is bound to a @code{<package>} object (@pxref{Defining "
+"Packages})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21560
+#: doc/guix.texi:21622
 msgid ""
-"The @code{(gnu packages @dots{})} module name space is automatically scanned for packages by the command-line tools.  For instance, "
-"when running @code{guix package -i emacs}, all the @code{(gnu packages @dots{})} modules are scanned until one that exports a "
-"package object whose name is @code{emacs} is found.  This package search facility is implemented in the @code{(gnu packages)} module."
+"The @code{(gnu packages @dots{})} module name space is automatically scanned "
+"for packages by the command-line tools.  For instance, when running "
+"@code{guix package -i emacs}, all the @code{(gnu packages @dots{})} modules "
+"are scanned until one that exports a package object whose name is "
+"@code{emacs} is found.  This package search facility is implemented in the "
+"@code{(gnu packages)} module."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:21562
+#: doc/guix.texi:21624
 #, no-wrap
 msgid "package module search path"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21579
+#: doc/guix.texi:21641
 msgid ""
-"Users can store package definitions in modules with different names---e.g., @code{(my-packages emacs)}@footnote{Note that the file "
-"name and module name must match.  For instance, the @code{(my-packages emacs)} module must be stored in a @file{my-packages/emacs."
-"scm} file relative to the load path specified with @option{--load-path} or @code{GUIX_PACKAGE_PATH}.  @xref{Modules and the File "
-"System,,, guile, GNU Guile Reference Manual}, for details.}.  These package definitions will not be visible by default.  Users can "
-"invoke commands such as @command{guix package} and @command{guix build} with the @code{-e} option so that they know where to find "
-"the package.  Better yet, they can use the @code{-L} option of these commands to make those modules visible (@pxref{Invoking guix "
-"build, @code{--load-path}}), or define the @code{GUIX_PACKAGE_PATH} environment variable.  This environment variable makes it easy "
-"to extend or customize the distribution and is honored by all the user interfaces."
+"Users can store package definitions in modules with different names---e.g., "
+"@code{(my-packages emacs)}@footnote{Note that the file name and module name "
+"must match.  For instance, the @code{(my-packages emacs)} module must be "
+"stored in a @file{my-packages/emacs.scm} file relative to the load path "
+"specified with @option{--load-path} or @code{GUIX_PACKAGE_PATH}.  "
+"@xref{Modules and the File System,,, guile, GNU Guile Reference Manual}, for "
+"details.}.  These package definitions will not be visible by default.  Users "
+"can invoke commands such as @command{guix package} and @command{guix build} "
+"with the @code{-e} option so that they know where to find the package.  "
+"Better yet, they can use the @code{-L} option of these commands to make "
+"those modules visible (@pxref{Invoking guix build, @code{--load-path}}), or "
+"define the @code{GUIX_PACKAGE_PATH} environment variable.  This environment "
+"variable makes it easy to extend or customize the distribution and is "
+"honored by all the user interfaces."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:21580
+#: doc/guix.texi:21642
 #, no-wrap
 msgid "{Environment Variable} GUIX_PACKAGE_PATH"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:21584
+#: doc/guix.texi:21646
 msgid ""
-"This is a colon-separated list of directories to search for additional package modules.  Directories listed in this variable take "
-"precedence over the own modules of the distribution."
+"This is a colon-separated list of directories to search for additional "
+"package modules.  Directories listed in this variable take precedence over "
+"the own modules of the distribution."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21592
+#: doc/guix.texi:21654
 msgid ""
-"The distribution is fully @dfn{bootstrapped} and @dfn{self-contained}: each package is built based solely on other packages in the "
-"distribution.  The root of this dependency graph is a small set of @dfn{bootstrap binaries}, provided by the @code{(gnu packages "
-"bootstrap)} module.  For more information on bootstrapping, @pxref{Bootstrapping}."
+"The distribution is fully @dfn{bootstrapped} and @dfn{self-contained}: each "
+"package is built based solely on other packages in the distribution.  The "
+"root of this dependency graph is a small set of @dfn{bootstrap binaries}, "
+"provided by the @code{(gnu packages bootstrap)} module.  For more "
+"information on bootstrapping, @pxref{Bootstrapping}."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:21596
+#: doc/guix.texi:21658
 #, no-wrap
 msgid "packages, creating"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21601
+#: doc/guix.texi:21663
 msgid ""
-"The GNU distribution is nascent and may well lack some of your favorite packages.  This section describes how you can help make the "
-"distribution grow.  @xref{Contributing}, for additional information on how you can help."
+"The GNU distribution is nascent and may well lack some of your favorite "
+"packages.  This section describes how you can help make the distribution "
+"grow.  @xref{Contributing}, for additional information on how you can help."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21609
+#: doc/guix.texi:21671
 msgid ""
-"Free software packages are usually distributed in the form of @dfn{source code tarballs}---typically @file{tar.gz} files that "
-"contain all the source files.  Adding a package to the distribution means essentially two things: adding a @dfn{recipe} that "
-"describes how to build the package, including a list of other packages required to build it, and adding @dfn{package metadata} along "
-"with that recipe, such as a description and licensing information."
+"Free software packages are usually distributed in the form of @dfn{source "
+"code tarballs}---typically @file{tar.gz} files that contain all the source "
+"files.  Adding a package to the distribution means essentially two things: "
+"adding a @dfn{recipe} that describes how to build the package, including a "
+"list of other packages required to build it, and adding @dfn{package "
+"metadata} along with that recipe, such as a description and licensing "
+"information."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21618
+#: doc/guix.texi:21680
 msgid ""
-"In Guix all this information is embodied in @dfn{package definitions}.  Package definitions provide a high-level view of the "
-"package.  They are written using the syntax of the Scheme programming language; in fact, for each package we define a variable bound "
-"to the package definition, and export that variable from a module (@pxref{Package Modules}).  However, in-depth Scheme knowledge is "
-"@emph{not} a prerequisite for creating packages.  For more information on package definitions, @pxref{Defining Packages}."
+"In Guix all this information is embodied in @dfn{package definitions}.  "
+"Package definitions provide a high-level view of the package.  They are "
+"written using the syntax of the Scheme programming language; in fact, for "
+"each package we define a variable bound to the package definition, and "
+"export that variable from a module (@pxref{Package Modules}).  However, in-"
+"depth Scheme knowledge is @emph{not} a prerequisite for creating packages.  "
+"For more information on package definitions, @pxref{Defining Packages}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21624
+#: doc/guix.texi:21686
 msgid ""
-"Once a package definition is in place, stored in a file in the Guix source tree, it can be tested using the @command{guix build} "
-"command (@pxref{Invoking guix build}).  For example, assuming the new package is called @code{gnew}, you may run this command from "
-"the Guix build tree (@pxref{Running Guix Before It Is Installed}):"
+"Once a package definition is in place, stored in a file in the Guix source "
+"tree, it can be tested using the @command{guix build} command "
+"(@pxref{Invoking guix build}).  For example, assuming the new package is "
+"called @code{gnew}, you may run this command from the Guix build tree "
+"(@pxref{Running Guix Before It Is Installed}):"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:21627
+#: doc/guix.texi:21689
 #, no-wrap
 msgid "./pre-inst-env guix build gnew --keep-failed\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21633
+#: doc/guix.texi:21695
 msgid ""
-"Using @code{--keep-failed} makes it easier to debug build failures since it provides access to the failed build tree.  Another "
-"useful command-line option when debugging is @code{--log-file}, to access the build log."
+"Using @code{--keep-failed} makes it easier to debug build failures since it "
+"provides access to the failed build tree.  Another useful command-line "
+"option when debugging is @code{--log-file}, to access the build log."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21638
+#: doc/guix.texi:21700
 msgid ""
-"If the package is unknown to the @command{guix} command, it may be that the source file contains a syntax error, or lacks a "
-"@code{define-public} clause to export the package variable.  To figure it out, you may load the module from Guile to get more "
-"information about the actual error:"
+"If the package is unknown to the @command{guix} command, it may be that the "
+"source file contains a syntax error, or lacks a @code{define-public} clause "
+"to export the package variable.  To figure it out, you may load the module "
+"from Guile to get more information about the actual error:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:21641
+#: doc/guix.texi:21703
 #, no-wrap
 msgid "./pre-inst-env guile -c '(use-modules (gnu packages gnew))'\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21649
+#: doc/guix.texi:21711
 msgid ""
-"Once your package builds correctly, please send us a patch (@pxref{Contributing}).  Well, if you need help, we will be happy to help "
-"you too.  Once the patch is committed in the Guix repository, the new package automatically gets built on the supported platforms by "
-"@url{http://hydra.gnu.org/jobset/gnu/master, our continuous integration system}."
+"Once your package builds correctly, please send us a patch "
+"(@pxref{Contributing}).  Well, if you need help, we will be happy to help "
+"you too.  Once the patch is committed in the Guix repository, the new "
+"package automatically gets built on the supported platforms by @url{http://"
+"hydra.gnu.org/jobset/gnu/master, our continuous integration system}."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:21650
+#: doc/guix.texi:21712
 #, no-wrap
 msgid "substituter"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21657
+#: doc/guix.texi:21719
 msgid ""
-"Users can obtain the new package definition simply by running @command{guix pull} (@pxref{Invoking guix pull}).  When @code{hydra."
-"gnu.org} is done building the package, installing the package automatically downloads binaries from there (@pxref{Substitutes}).  "
-"The only place where human intervention is needed is to review and apply the patch."
+"Users can obtain the new package definition simply by running @command{guix "
+"pull} (@pxref{Invoking guix pull}).  When @code{hydra.gnu.org} is done "
+"building the package, installing the package automatically downloads "
+"binaries from there (@pxref{Substitutes}).  The only place where human "
+"intervention is needed is to review and apply the patch."
 msgstr ""
-"On peut obtenir la nouvelle définition du paquet simplement en lançant @command{guix pull} (@pxref{Invoking guix pull}). Lorsque "
-"@code{hydra.gnu.org} a fini de construire le paquet, l'installation du paquet y télécharge automatiquement les binaires "
-"(@pxref{Substituts}). La seule intervention humaine requise est pendant la revue et l'application du correctif."
+"On peut obtenir la nouvelle définition du paquet simplement en lançant "
+"@command{guix pull} (@pxref{Invoking guix pull}). Lorsque @code{hydra.gnu."
+"org} a fini de construire le paquet, l'installation du paquet y télécharge "
+"automatiquement les binaires (@pxref{Substituts}). La seule intervention "
+"humaine requise est pendant la revue et l'application du correctif."
 
 #. type: cindex
-#: doc/guix.texi:21674
+#: doc/guix.texi:21736
 #, no-wrap
 msgid "free software"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21682
+#: doc/guix.texi:21744
 msgid ""
-"The GNU operating system has been developed so that users can have freedom in their computing.  GNU is @dfn{free software}, meaning "
-"that users have the @url{http://www.gnu.org/philosophy/free-sw.html,four essential freedoms}: to run the program, to study and "
-"change the program in source code form, to redistribute exact copies, and to distribute modified versions.  Packages found in the "
-"GNU distribution provide only software that conveys these four freedoms."
+"The GNU operating system has been developed so that users can have freedom "
+"in their computing.  GNU is @dfn{free software}, meaning that users have the "
+"@url{http://www.gnu.org/philosophy/free-sw.html,four essential freedoms}: to "
+"run the program, to study and change the program in source code form, to "
+"redistribute exact copies, and to distribute modified versions.  Packages "
+"found in the GNU distribution provide only software that conveys these four "
+"freedoms."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21688
+#: doc/guix.texi:21750
 msgid ""
-"In addition, the GNU distribution follow the @url{http://www.gnu.org/distros/free-system-distribution-guidelines.html,free software "
-"distribution guidelines}.  Among other things, these guidelines reject non-free firmware, recommendations of non-free software, and "
-"discuss ways to deal with trademarks and patents."
+"In addition, the GNU distribution follow the @url{http://www.gnu.org/distros/"
+"free-system-distribution-guidelines.html,free software distribution "
+"guidelines}.  Among other things, these guidelines reject non-free firmware, "
+"recommendations of non-free software, and discuss ways to deal with "
+"trademarks and patents."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21696
+#: doc/guix.texi:21758
 msgid ""
-"Some otherwise free upstream package sources contain a small and optional subset that violates the above guidelines, for instance "
-"because this subset is itself non-free code.  When that happens, the offending items are removed with appropriate patches or code "
-"snippets in the @code{origin} form of the package (@pxref{Defining Packages}).  This way, @code{guix build --source} returns the "
-"``freed'' source rather than the unmodified upstream source."
+"Some otherwise free upstream package sources contain a small and optional "
+"subset that violates the above guidelines, for instance because this subset "
+"is itself non-free code.  When that happens, the offending items are removed "
+"with appropriate patches or code snippets in the @code{origin} form of the "
+"package (@pxref{Defining Packages}).  This way, @code{guix build --source} "
+"returns the ``freed'' source rather than the unmodified upstream source."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:21701
+#: doc/guix.texi:21763
 #, no-wrap
 msgid "package name"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21709
+#: doc/guix.texi:21771
 msgid ""
-"A package has actually two names associated with it: First, there is the name of the @emph{Scheme variable}, the one following "
-"@code{define-public}.  By this name, the package can be made known in the Scheme code, for instance as input to another package.  "
-"Second, there is the string in the @code{name} field of a package definition.  This name is used by package management commands such "
-"as @command{guix package} and @command{guix build}."
+"A package has actually two names associated with it: First, there is the "
+"name of the @emph{Scheme variable}, the one following @code{define-public}.  "
+"By this name, the package can be made known in the Scheme code, for instance "
+"as input to another package.  Second, there is the string in the @code{name} "
+"field of a package definition.  This name is used by package management "
+"commands such as @command{guix package} and @command{guix build}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21714
+#: doc/guix.texi:21776
 msgid ""
-"Both are usually the same and correspond to the lowercase conversion of the project name chosen upstream, with underscores replaced "
-"with hyphens.  For instance, GNUnet is available as @code{gnunet}, and SDL_net as @code{sdl-net}."
+"Both are usually the same and correspond to the lowercase conversion of the "
+"project name chosen upstream, with underscores replaced with hyphens.  For "
+"instance, GNUnet is available as @code{gnunet}, and SDL_net as @code{sdl-"
+"net}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21719
+#: doc/guix.texi:21781
 msgid ""
-"We do not add @code{lib} prefixes for library packages, unless these are already part of the official project name.  But "
-"@pxref{Python Modules} and @ref{Perl Modules} for special rules concerning modules for the Python and Perl languages."
+"We do not add @code{lib} prefixes for library packages, unless these are "
+"already part of the official project name.  But @pxref{Python Modules} and "
+"@ref{Perl Modules} for special rules concerning modules for the Python and "
+"Perl languages."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21721
+#: doc/guix.texi:21783
 msgid "Font package names are handled differently, @pxref{Fonts}."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:21726
+#: doc/guix.texi:21788
 #, no-wrap
 msgid "package version"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21735
+#: doc/guix.texi:21797
 msgid ""
-"We usually package only the latest version of a given free software project.  But sometimes, for instance for incompatible library "
-"versions, two (or more) versions of the same package are needed.  These require different Scheme variable names.  We use the name as "
-"defined in @ref{Package Naming} for the most recent version; previous versions use the same name, suffixed by @code{-} and the "
-"smallest prefix of the version number that may distinguish the two versions."
+"We usually package only the latest version of a given free software "
+"project.  But sometimes, for instance for incompatible library versions, two "
+"(or more) versions of the same package are needed.  These require different "
+"Scheme variable names.  We use the name as defined in @ref{Package Naming} "
+"for the most recent version; previous versions use the same name, suffixed "
+"by @code{-} and the smallest prefix of the version number that may "
+"distinguish the two versions."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21738
-msgid "The name inside the package definition is the same for all versions of a package and does not contain any version number."
+#: doc/guix.texi:21800
+msgid ""
+"The name inside the package definition is the same for all versions of a "
+"package and does not contain any version number."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21740
-msgid "For instance, the versions 2.24.20 and 3.9.12 of GTK+ may be packaged as follows:"
+#: doc/guix.texi:21802
+msgid ""
+"For instance, the versions 2.24.20 and 3.9.12 of GTK+ may be packaged as "
+"follows:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:21752
+#: doc/guix.texi:21814
 #, no-wrap
 msgid ""
 "(define-public gtk+\n"
@@ -41432,12 +46788,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21754
+#: doc/guix.texi:21816
 msgid "If we also wanted GTK+ 3.8.2, this would be packaged as"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:21760
+#: doc/guix.texi:21822
 #, no-wrap
 msgid ""
 "(define-public gtk+-3.8\n"
@@ -41448,30 +46804,35 @@ msgid ""
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:21764
+#: doc/guix.texi:21826
 #, no-wrap
 msgid "version number, for VCS snapshots"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21770
+#: doc/guix.texi:21832
 msgid ""
-"Occasionally, we package snapshots of upstream's version control system (VCS) instead of formal releases.  This should remain "
-"exceptional, because it is up to upstream developers to clarify what the stable release is.  Yet, it is sometimes necessary.  So, "
-"what should we put in the @code{version} field?"
+"Occasionally, we package snapshots of upstream's version control system "
+"(VCS) instead of formal releases.  This should remain exceptional, because "
+"it is up to upstream developers to clarify what the stable release is.  Yet, "
+"it is sometimes necessary.  So, what should we put in the @code{version} "
+"field?"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21778
+#: doc/guix.texi:21840
 msgid ""
-"Clearly, we need to make the commit identifier of the VCS snapshot visible in the version string, but we also need to make sure that "
-"the version string is monotonically increasing so that @command{guix package --upgrade} can determine which version is newer.  Since "
-"commit identifiers, notably with Git, are not monotonically increasing, we add a revision number that we increase each time we "
-"upgrade to a newer snapshot.  The resulting version string looks like this:"
+"Clearly, we need to make the commit identifier of the VCS snapshot visible "
+"in the version string, but we also need to make sure that the version string "
+"is monotonically increasing so that @command{guix package --upgrade} can "
+"determine which version is newer.  Since commit identifiers, notably with "
+"Git, are not monotonically increasing, we add a revision number that we "
+"increase each time we upgrade to a newer snapshot.  The resulting version "
+"string looks like this:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:21787
+#: doc/guix.texi:21849
 #, no-wrap
 msgid ""
 "2.0.11-3.cabba9e\n"
@@ -41484,16 +46845,18 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21796
+#: doc/guix.texi:21858
 msgid ""
-"It is a good idea to strip commit identifiers in the @code{version} field to, say, 7 digits.  It avoids an aesthetic annoyance "
-"(assuming aesthetics have a role to play here) as well as problems related to OS limits such as the maximum shebang length (127 "
-"bytes for the Linux kernel.)  It is best to use the full commit identifiers in @code{origin}s, though, to avoid ambiguities.  A "
-"typical package definition may look like this:"
+"It is a good idea to strip commit identifiers in the @code{version} field "
+"to, say, 7 digits.  It avoids an aesthetic annoyance (assuming aesthetics "
+"have a role to play here) as well as problems related to OS limits such as "
+"the maximum shebang length (127 bytes for the Linux kernel.)  It is best to "
+"use the full commit identifiers in @code{origin}s, though, to avoid "
+"ambiguities.  A typical package definition may look like this:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:21812
+#: doc/guix.texi:21874
 #, no-wrap
 msgid ""
 "(define my-package\n"
@@ -41513,85 +46876,102 @@ msgid ""
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:21817
+#: doc/guix.texi:21879
 #, no-wrap
 msgid "package description"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:21818
+#: doc/guix.texi:21880
 #, no-wrap
 msgid "package synopsis"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21825
+#: doc/guix.texi:21887
 msgid ""
-"As we have seen before, each package in GNU@tie{}Guix includes a synopsis and a description (@pxref{Defining Packages}).  Synopses "
-"and descriptions are important: They are what @command{guix package --search} searches, and a crucial piece of information to help "
-"users determine whether a given package suits their needs.  Consequently, packagers should pay attention to what goes into them."
+"As we have seen before, each package in GNU@tie{}Guix includes a synopsis "
+"and a description (@pxref{Defining Packages}).  Synopses and descriptions "
+"are important: They are what @command{guix package --search} searches, and a "
+"crucial piece of information to help users determine whether a given package "
+"suits their needs.  Consequently, packagers should pay attention to what "
+"goes into them."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21833
+#: doc/guix.texi:21895
 msgid ""
-"Synopses must start with a capital letter and must not end with a period.  They must not start with ``a'' or ``the'', which usually "
-"does not bring anything; for instance, prefer ``File-frobbing tool'' over ``A tool that frobs files''.  The synopsis should say what "
-"the package is---e.g., ``Core GNU utilities (file, text, shell)''---or what it is used for---e.g., the synopsis for GNU@tie{}grep is "
-"``Print lines matching a pattern''."
+"Synopses must start with a capital letter and must not end with a period.  "
+"They must not start with ``a'' or ``the'', which usually does not bring "
+"anything; for instance, prefer ``File-frobbing tool'' over ``A tool that "
+"frobs files''.  The synopsis should say what the package is---e.g., ``Core "
+"GNU utilities (file, text, shell)''---or what it is used for---e.g., the "
+"synopsis for GNU@tie{}grep is ``Print lines matching a pattern''."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21843
+#: doc/guix.texi:21905
 msgid ""
-"Keep in mind that the synopsis must be meaningful for a very wide audience.  For example, ``Manipulate alignments in the SAM "
-"format'' might make sense for a seasoned bioinformatics researcher, but might be fairly unhelpful or even misleading to a non-"
-"specialized audience.  It is a good idea to come up with a synopsis that gives an idea of the application domain of the package.  In "
-"this example, this might give something like ``Manipulate nucleotide sequence alignments'', which hopefully gives the user a better "
+"Keep in mind that the synopsis must be meaningful for a very wide audience.  "
+"For example, ``Manipulate alignments in the SAM format'' might make sense "
+"for a seasoned bioinformatics researcher, but might be fairly unhelpful or "
+"even misleading to a non-specialized audience.  It is a good idea to come up "
+"with a synopsis that gives an idea of the application domain of the "
+"package.  In this example, this might give something like ``Manipulate "
+"nucleotide sequence alignments'', which hopefully gives the user a better "
 "idea of whether this is what they are looking for."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21851
+#: doc/guix.texi:21913
 msgid ""
-"Descriptions should take between five and ten lines.  Use full sentences, and avoid using acronyms without first introducing them.  "
-"Please avoid marketing phrases such as ``world-leading'', ``industrial-strength'', and ``next-generation'', and avoid superlatives "
-"like ``the most advanced''---they are not helpful to users looking for a package and may even sound suspicious.  Instead, try to be "
-"factual, mentioning use cases and features."
+"Descriptions should take between five and ten lines.  Use full sentences, "
+"and avoid using acronyms without first introducing them.  Please avoid "
+"marketing phrases such as ``world-leading'', ``industrial-strength'', and "
+"``next-generation'', and avoid superlatives like ``the most advanced''---"
+"they are not helpful to users looking for a package and may even sound "
+"suspicious.  Instead, try to be factual, mentioning use cases and features."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:21852
+#: doc/guix.texi:21914
 #, no-wrap
 msgid "Texinfo markup, in package descriptions"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21861
+#: doc/guix.texi:21923
 msgid ""
-"Descriptions can include Texinfo markup, which is useful to introduce ornaments such as @code{@@code} or @code{@@dfn}, bullet lists, "
-"or hyperlinks (@pxref{Overview,,, texinfo, GNU Texinfo}).  However you should be careful when using some characters for example "
-"@samp{@@} and curly braces which are the basic special characters in Texinfo (@pxref{Special Characters,,, texinfo, GNU Texinfo}).  "
-"User interfaces such as @command{guix package --show} take care of rendering it appropriately."
+"Descriptions can include Texinfo markup, which is useful to introduce "
+"ornaments such as @code{@@code} or @code{@@dfn}, bullet lists, or hyperlinks "
+"(@pxref{Overview,,, texinfo, GNU Texinfo}).  However you should be careful "
+"when using some characters for example @samp{@@} and curly braces which are "
+"the basic special characters in Texinfo (@pxref{Special Characters,,, "
+"texinfo, GNU Texinfo}).  User interfaces such as @command{guix package --"
+"show} take care of rendering it appropriately."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21867
+#: doc/guix.texi:21929
 msgid ""
-"Synopses and descriptions are translated by volunteers @uref{http://translationproject.org/domain/guix-packages.html, at the "
-"Translation Project} so that as many users as possible can read them in their native language.  User interfaces search them and "
-"display them in the language specified by the current locale."
+"Synopses and descriptions are translated by volunteers @uref{http://"
+"translationproject.org/domain/guix-packages.html, at the Translation "
+"Project} so that as many users as possible can read them in their native "
+"language.  User interfaces search them and display them in the language "
+"specified by the current locale."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21872
+#: doc/guix.texi:21934
 msgid ""
-"To allow @command{xgettext} to extract them as translatable strings, synopses and descriptions @emph{must be literal strings}.  This "
-"means that you cannot use @code{string-append} or @code{format} to construct these strings:"
+"To allow @command{xgettext} to extract them as translatable strings, "
+"synopses and descriptions @emph{must be literal strings}.  This means that "
+"you cannot use @code{string-append} or @code{format} to construct these "
+"strings:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:21878
+#: doc/guix.texi:21940
 #, no-wrap
 msgid ""
 "(package\n"
@@ -41601,15 +46981,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21886
+#: doc/guix.texi:21948
 msgid ""
-"Translation is a lot of work so, as a packager, please pay even more attention to your synopses and descriptions as every change may "
-"entail additional work for translators.  In order to help them, it is possible to make recommendations or instructions visible to "
-"them by inserting special comments like this (@pxref{xgettext Invocation,,, gettext, GNU Gettext}):"
+"Translation is a lot of work so, as a packager, please pay even more "
+"attention to your synopses and descriptions as every change may entail "
+"additional work for translators.  In order to help them, it is possible to "
+"make recommendations or instructions visible to them by inserting special "
+"comments like this (@pxref{xgettext Invocation,,, gettext, GNU Gettext}):"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:21891
+#: doc/guix.texi:21953
 #, no-wrap
 msgid ""
 ";; TRANSLATORS: \"X11 resize-and-rotate\" should not be translated.\n"
@@ -41618,246 +47000,292 @@ msgid ""
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:21897
+#: doc/guix.texi:21959
 #, no-wrap
 msgid "python"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21903
+#: doc/guix.texi:21965
 msgid ""
-"We currently package Python 2 and Python 3, under the Scheme variable names @code{python-2} and @code{python} as explained in "
-"@ref{Version Numbers}.  To avoid confusion and naming clashes with other programming languages, it seems desirable that the name of "
-"a package for a Python module contains the word @code{python}."
+"We currently package Python 2 and Python 3, under the Scheme variable names "
+"@code{python-2} and @code{python} as explained in @ref{Version Numbers}.  To "
+"avoid confusion and naming clashes with other programming languages, it "
+"seems desirable that the name of a package for a Python module contains the "
+"word @code{python}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21909
+#: doc/guix.texi:21971
 msgid ""
-"Some modules are compatible with only one version of Python, others with both.  If the package Foo compiles only with Python 3, we "
-"name it @code{python-foo}; if it compiles only with Python 2, we name it @code{python2-foo}. If it is compatible with both versions, "
-"we create two packages with the corresponding names."
+"Some modules are compatible with only one version of Python, others with "
+"both.  If the package Foo compiles only with Python 3, we name it "
+"@code{python-foo}; if it compiles only with Python 2, we name it "
+"@code{python2-foo}. If it is compatible with both versions, we create two "
+"packages with the corresponding names."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21915
+#: doc/guix.texi:21977
 msgid ""
-"If a project already contains the word @code{python}, we drop this; for instance, the module python-dateutil is packaged under the "
-"names @code{python-dateutil} and @code{python2-dateutil}.  If the project name starts with @code{py} (e.g. @code{pytz}), we keep it "
-"and prefix it as described above."
+"If a project already contains the word @code{python}, we drop this; for "
+"instance, the module python-dateutil is packaged under the names "
+"@code{python-dateutil} and @code{python2-dateutil}.  If the project name "
+"starts with @code{py} (e.g. @code{pytz}), we keep it and prefix it as "
+"described above."
 msgstr ""
 
 #. type: subsubsection
-#: doc/guix.texi:21916
+#: doc/guix.texi:21978
 #, no-wrap
 msgid "Specifying Dependencies"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:21917
+#: doc/guix.texi:21979
 #, no-wrap
 msgid "inputs, for Python packages"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21922
+#: doc/guix.texi:21984
 msgid ""
-"Dependency information for Python packages is usually available in the package source tree, with varying degrees of accuracy: in the "
-"@file{setup.py} file, in @file{requirements.txt}, or in @file{tox.ini}."
+"Dependency information for Python packages is usually available in the "
+"package source tree, with varying degrees of accuracy: in the @file{setup."
+"py} file, in @file{requirements.txt}, or in @file{tox.ini}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21928
+#: doc/guix.texi:21990
 msgid ""
-"Your mission, when writing a recipe for a Python package, is to map these dependencies to the appropriate type of "
-"``input'' (@pxref{package Reference, inputs}).  Although the @code{pypi} importer normally does a good job (@pxref{Invoking guix "
-"import}), you may want to check the following check list to determine which dependency goes where."
+"Your mission, when writing a recipe for a Python package, is to map these "
+"dependencies to the appropriate type of ``input'' (@pxref{package Reference, "
+"inputs}).  Although the @code{pypi} importer normally does a good job "
+"(@pxref{Invoking guix import}), you may want to check the following check "
+"list to determine which dependency goes where."
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:21936
+#: doc/guix.texi:21998
 msgid ""
-"We currently package Python 2 with @code{setuptools} and @code{pip} installed like Python 3.4 has per default.  Thus you don't need "
-"to specify either of these as an input.  @command{guix lint} will warn you if you do."
+"We currently package Python 2 with @code{setuptools} and @code{pip} "
+"installed like Python 3.4 has per default.  Thus you don't need to specify "
+"either of these as an input.  @command{guix lint} will warn you if you do."
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:21942
+#: doc/guix.texi:22004
 msgid ""
-"Python dependencies required at run time go into @code{propagated-inputs}.  They are typically defined with the "
-"@code{install_requires} keyword in @file{setup.py}, or in the @file{requirements.txt} file."
+"Python dependencies required at run time go into @code{propagated-inputs}.  "
+"They are typically defined with the @code{install_requires} keyword in "
+"@file{setup.py}, or in the @file{requirements.txt} file."
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:21950
+#: doc/guix.texi:22012
 msgid ""
-"Python packages required only at build time---e.g., those listed with the @code{setup_requires} keyword in @file{setup.py}---or only "
-"for testing---e.g., those in @code{tests_require}---go into @code{native-inputs}.  The rationale is that (1) they do not need to be "
-"propagated because they are not needed at run time, and (2) in a cross-compilation context, it's the ``native'' input that we'd want."
+"Python packages required only at build time---e.g., those listed with the "
+"@code{setup_requires} keyword in @file{setup.py}---or only for testing---e."
+"g., those in @code{tests_require}---go into @code{native-inputs}.  The "
+"rationale is that (1) they do not need to be propagated because they are not "
+"needed at run time, and (2) in a cross-compilation context, it's the "
+"``native'' input that we'd want."
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:21954
+#: doc/guix.texi:22016
 msgid ""
-"Examples are the @code{pytest}, @code{mock}, and @code{nose} test frameworks.  Of course if any of these packages is also required "
-"at run-time, it needs to go to @code{propagated-inputs}."
+"Examples are the @code{pytest}, @code{mock}, and @code{nose} test "
+"frameworks.  Of course if any of these packages is also required at run-"
+"time, it needs to go to @code{propagated-inputs}."
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:21959
+#: doc/guix.texi:22021
 msgid ""
-"Anything that does not fall in the previous categories goes to @code{inputs}, for example programs or C libraries required for "
-"building Python packages containing C extensions."
+"Anything that does not fall in the previous categories goes to "
+"@code{inputs}, for example programs or C libraries required for building "
+"Python packages containing C extensions."
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:21965
+#: doc/guix.texi:22027
 msgid ""
-"If a Python package has optional dependencies (@code{extras_require}), it is up to you to decide whether to add them or not, based "
-"on their usefulness/overhead ratio (@pxref{Submitting Patches, @command{guix size}})."
+"If a Python package has optional dependencies (@code{extras_require}), it is "
+"up to you to decide whether to add them or not, based on their usefulness/"
+"overhead ratio (@pxref{Submitting Patches, @command{guix size}})."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:21972
+#: doc/guix.texi:22034
 #, no-wrap
 msgid "perl"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21983
+#: doc/guix.texi:22045
 msgid ""
-"Perl programs standing for themselves are named as any other package, using the lowercase upstream name.  For Perl packages "
-"containing a single class, we use the lowercase class name, replace all occurrences of @code{::} by dashes and prepend the prefix "
-"@code{perl-}.  So the class @code{XML::Parser} becomes @code{perl-xml-parser}.  Modules containing several classes keep their "
-"lowercase upstream name and are also prepended by @code{perl-}.  Such modules tend to have the word @code{perl} somewhere in their "
-"name, which gets dropped in favor of the prefix.  For instance, @code{libwww-perl} becomes @code{perl-libwww}."
+"Perl programs standing for themselves are named as any other package, using "
+"the lowercase upstream name.  For Perl packages containing a single class, "
+"we use the lowercase class name, replace all occurrences of @code{::} by "
+"dashes and prepend the prefix @code{perl-}.  So the class @code{XML::Parser} "
+"becomes @code{perl-xml-parser}.  Modules containing several classes keep "
+"their lowercase upstream name and are also prepended by @code{perl-}.  Such "
+"modules tend to have the word @code{perl} somewhere in their name, which "
+"gets dropped in favor of the prefix.  For instance, @code{libwww-perl} "
+"becomes @code{perl-libwww}."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:21988
+#: doc/guix.texi:22050
 #, no-wrap
 msgid "java"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21991
-msgid "Java programs standing for themselves are named as any other package, using the lowercase upstream name."
-msgstr ""
-
-#. type: Plain text
-#: doc/guix.texi:21997
+#: doc/guix.texi:22053
 msgid ""
-"To avoid confusion and naming clashes with other programming languages, it is desirable that the name of a package for a Java "
-"package is prefixed with @code{java-}.  If a project already contains the word @code{java}, we drop this; for instance, the package "
-"@code{ngsjava} is packaged under the name @code{java-ngs}."
-msgstr ""
-
-#. type: Plain text
-#: doc/guix.texi:22003
-msgid ""
-"For Java packages containing a single class or a small class hierarchy, we use the lowercase class name, replace all occurrences of "
-"@code{.} by dashes and prepend the prefix @code{java-}.  So the class @code{apache.commons.cli} becomes package @code{java-apache-"
-"commons-cli}."
-msgstr ""
-
-#. type: Plain text
-#: doc/guix.texi:22014
-msgid ""
-"For fonts that are in general not installed by a user for typesetting purposes, or that are distributed as part of a larger software "
-"package, we rely on the general packaging rules for software; for instance, this applies to the fonts delivered as part of the X.Org "
-"system or fonts that are part of TeX Live."
-msgstr ""
-
-#. type: Plain text
-#: doc/guix.texi:22018
-msgid ""
-"To make it easier for a user to search for fonts, names for other packages containing only fonts are constructed as follows, "
-"independently of the upstream package name."
-msgstr ""
-
-#. type: Plain text
-#: doc/guix.texi:22026
-msgid ""
-"The name of a package containing only one font family starts with @code{font-}; it is followed by the foundry name and a dash "
-"@code{-} if the foundry is known, and the font family name, in which spaces are replaced by dashes (and as usual, all upper case "
-"letters are transformed to lower case).  For example, the Gentium font family by SIL is packaged under the name @code{font-sil-"
-"gentium}."
-msgstr ""
-
-#. type: Plain text
-#: doc/guix.texi:22035
-msgid ""
-"For a package containing several font families, the name of the collection is used in the place of the font family name.  For "
-"instance, the Liberation fonts consist of three families, Liberation Sans, Liberation Serif and Liberation Mono.  These could be "
-"packaged separately under the names @code{font-liberation-sans} and so on; but as they are distributed together under a common name, "
-"we prefer to package them together as @code{font-liberation}."
-msgstr ""
-
-#. type: Plain text
-#: doc/guix.texi:22041
-msgid ""
-"In the case where several formats of the same font family or font collection are packaged separately, a short form of the format, "
-"prepended by a dash, is added to the package name.  We use @code{-ttf} for TrueType fonts, @code{-otf} for OpenType fonts and @code{-"
-"type1} for PostScript Type 1 fonts."
-msgstr ""
-
-#. type: cindex
-#: doc/guix.texi:22049
-#, no-wrap
-msgid "bootstrapping"
+"Java programs standing for themselves are named as any other package, using "
+"the lowercase upstream name."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:22059
 msgid ""
-"Bootstrapping in our context refers to how the distribution gets built ``from nothing''.  Remember that the build environment of a "
-"derivation contains nothing but its declared inputs (@pxref{Introduction}).  So there's an obvious chicken-and-egg problem: how does "
-"the first package get built? How does the first compiler get compiled? Note that this is a question of interest only to the curious "
-"hacker, not to the regular user, so you can shamelessly skip this section if you consider yourself a ``regular user''."
+"To avoid confusion and naming clashes with other programming languages, it "
+"is desirable that the name of a package for a Java package is prefixed with "
+"@code{java-}.  If a project already contains the word @code{java}, we drop "
+"this; for instance, the package @code{ngsjava} is packaged under the name "
+"@code{java-ngs}."
+msgstr ""
+
+#. type: Plain text
+#: doc/guix.texi:22065
+msgid ""
+"For Java packages containing a single class or a small class hierarchy, we "
+"use the lowercase class name, replace all occurrences of @code{.} by dashes "
+"and prepend the prefix @code{java-}.  So the class @code{apache.commons.cli} "
+"becomes package @code{java-apache-commons-cli}."
+msgstr ""
+
+#. type: Plain text
+#: doc/guix.texi:22076
+msgid ""
+"For fonts that are in general not installed by a user for typesetting "
+"purposes, or that are distributed as part of a larger software package, we "
+"rely on the general packaging rules for software; for instance, this applies "
+"to the fonts delivered as part of the X.Org system or fonts that are part of "
+"TeX Live."
+msgstr ""
+
+#. type: Plain text
+#: doc/guix.texi:22080
+msgid ""
+"To make it easier for a user to search for fonts, names for other packages "
+"containing only fonts are constructed as follows, independently of the "
+"upstream package name."
+msgstr ""
+
+#. type: Plain text
+#: doc/guix.texi:22088
+msgid ""
+"The name of a package containing only one font family starts with "
+"@code{font-}; it is followed by the foundry name and a dash @code{-} if the "
+"foundry is known, and the font family name, in which spaces are replaced by "
+"dashes (and as usual, all upper case letters are transformed to lower "
+"case).  For example, the Gentium font family by SIL is packaged under the "
+"name @code{font-sil-gentium}."
+msgstr ""
+
+#. type: Plain text
+#: doc/guix.texi:22097
+msgid ""
+"For a package containing several font families, the name of the collection "
+"is used in the place of the font family name.  For instance, the Liberation "
+"fonts consist of three families, Liberation Sans, Liberation Serif and "
+"Liberation Mono.  These could be packaged separately under the names "
+"@code{font-liberation-sans} and so on; but as they are distributed together "
+"under a common name, we prefer to package them together as @code{font-"
+"liberation}."
+msgstr ""
+
+#. type: Plain text
+#: doc/guix.texi:22103
+msgid ""
+"In the case where several formats of the same font family or font collection "
+"are packaged separately, a short form of the format, prepended by a dash, is "
+"added to the package name.  We use @code{-ttf} for TrueType fonts, @code{-"
+"otf} for OpenType fonts and @code{-type1} for PostScript Type 1 fonts."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:22060 doc/guix.texi:22182
+#: doc/guix.texi:22111
+#, no-wrap
+msgid "bootstrapping"
+msgstr ""
+
+#. type: Plain text
+#: doc/guix.texi:22121
+msgid ""
+"Bootstrapping in our context refers to how the distribution gets built "
+"``from nothing''.  Remember that the build environment of a derivation "
+"contains nothing but its declared inputs (@pxref{Introduction}).  So there's "
+"an obvious chicken-and-egg problem: how does the first package get built? "
+"How does the first compiler get compiled? Note that this is a question of "
+"interest only to the curious hacker, not to the regular user, so you can "
+"shamelessly skip this section if you consider yourself a ``regular user''."
+msgstr ""
+
+#. type: cindex
+#: doc/guix.texi:22122 doc/guix.texi:22244
 #, no-wrap
 msgid "bootstrap binaries"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:22070
+#: doc/guix.texi:22132
 msgid ""
-"The GNU system is primarily made of C code, with libc at its core.  The GNU build system itself assumes the availability of a Bourne "
-"shell and command-line tools provided by GNU Coreutils, Awk, Findutils, `sed', and `grep'.  Furthermore, build programs---programs "
-"that run @code{./configure}, @code{make}, etc.---are written in Guile Scheme (@pxref{Derivations}).  Consequently, to be able to "
-"build anything at all, from scratch, Guix relies on pre-built binaries of Guile, GCC, Binutils, libc, and the other packages "
+"The GNU system is primarily made of C code, with libc at its core.  The GNU "
+"build system itself assumes the availability of a Bourne shell and command-"
+"line tools provided by GNU Coreutils, Awk, Findutils, `sed', and `grep'.  "
+"Furthermore, build programs---programs that run @code{./configure}, "
+"@code{make}, etc.---are written in Guile Scheme (@pxref{Derivations}).  "
+"Consequently, to be able to build anything at all, from scratch, Guix relies "
+"on pre-built binaries of Guile, GCC, Binutils, libc, and the other packages "
 "mentioned above---the @dfn{bootstrap binaries}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:22073
-msgid "These bootstrap binaries are ``taken for granted'', though we can also re-create them if needed (more on that later)."
+#: doc/guix.texi:22135
+msgid ""
+"These bootstrap binaries are ``taken for granted'', though we can also re-"
+"create them if needed (more on that later)."
 msgstr ""
 
 #. type: unnumberedsubsec
-#: doc/guix.texi:22074
+#: doc/guix.texi:22136
 #, no-wrap
 msgid "Preparing to Use the Bootstrap Binaries"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:22079
-msgid "@image{images/bootstrap-graph,6in,,Dependency graph of the early bootstrap derivations}"
+#: doc/guix.texi:22141
+msgid ""
+"@image{images/bootstrap-graph,6in,,Dependency graph of the early bootstrap "
+"derivations}"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:22084
+#: doc/guix.texi:22146
 msgid ""
-"The figure above shows the very beginning of the dependency graph of the distribution, corresponding to the package definitions of "
-"the @code{(gnu packages bootstrap)} module.  A similar figure can be generated with @command{guix graph} (@pxref{Invoking guix "
-"graph}), along the lines of:"
+"The figure above shows the very beginning of the dependency graph of the "
+"distribution, corresponding to the package definitions of the @code{(gnu "
+"packages bootstrap)} module.  A similar figure can be generated with "
+"@command{guix graph} (@pxref{Invoking guix graph}), along the lines of:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:22089
+#: doc/guix.texi:22151
 #, no-wrap
 msgid ""
 "guix graph -t derivation \\\n"
@@ -41866,67 +47294,83 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:22098
+#: doc/guix.texi:22160
 msgid ""
-"At this level of detail, things are slightly complex.  First, Guile itself consists of an ELF executable, along with many source and "
-"compiled Scheme files that are dynamically loaded when it runs.  This gets stored in the @file{guile-2.0.7.tar.xz} tarball shown in "
-"this graph.  This tarball is part of Guix's ``source'' distribution, and gets inserted into the store with @code{add-to-store} "
-"(@pxref{The Store})."
+"At this level of detail, things are slightly complex.  First, Guile itself "
+"consists of an ELF executable, along with many source and compiled Scheme "
+"files that are dynamically loaded when it runs.  This gets stored in the "
+"@file{guile-2.0.7.tar.xz} tarball shown in this graph.  This tarball is part "
+"of Guix's ``source'' distribution, and gets inserted into the store with "
+"@code{add-to-store} (@pxref{The Store})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:22107
+#: doc/guix.texi:22169
 msgid ""
-"But how do we write a derivation that unpacks this tarball and adds it to the store? To solve this problem, the @code{guile-"
-"bootstrap-2.0.drv} derivation---the first one that gets built---uses @code{bash} as its builder, which runs @code{build-bootstrap-"
-"guile.sh}, which in turn calls @code{tar} to unpack the tarball.  Thus, @file{bash}, @file{tar}, @file{xz}, and @file{mkdir} are "
-"statically-linked binaries, also part of the Guix source distribution, whose sole purpose is to allow the Guile tarball to be "
+"But how do we write a derivation that unpacks this tarball and adds it to "
+"the store? To solve this problem, the @code{guile-bootstrap-2.0.drv} "
+"derivation---the first one that gets built---uses @code{bash} as its "
+"builder, which runs @code{build-bootstrap-guile.sh}, which in turn calls "
+"@code{tar} to unpack the tarball.  Thus, @file{bash}, @file{tar}, @file{xz}, "
+"and @file{mkdir} are statically-linked binaries, also part of the Guix "
+"source distribution, whose sole purpose is to allow the Guile tarball to be "
 "unpacked."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:22119
+#: doc/guix.texi:22181
 msgid ""
-"Once @code{guile-bootstrap-2.0.drv} is built, we have a functioning Guile that can be used to run subsequent build programs.  Its "
-"first task is to download tarballs containing the other pre-built binaries---this is what the @code{.tar.xz.drv} derivations do.  "
-"Guix modules such as @code{ftp-client.scm} are used for this purpose.  The @code{module-import.drv} derivations import those modules "
-"in a directory in the store, using the original layout.  The @code{module-import-compiled.drv} derivations compile those modules, "
-"and write them in an output directory with the right layout.  This corresponds to the @code{#:modules} argument of @code{build-"
-"expression->derivation} (@pxref{Derivations})."
+"Once @code{guile-bootstrap-2.0.drv} is built, we have a functioning Guile "
+"that can be used to run subsequent build programs.  Its first task is to "
+"download tarballs containing the other pre-built binaries---this is what the "
+"@code{.tar.xz.drv} derivations do.  Guix modules such as @code{ftp-client."
+"scm} are used for this purpose.  The @code{module-import.drv} derivations "
+"import those modules in a directory in the store, using the original "
+"layout.  The @code{module-import-compiled.drv} derivations compile those "
+"modules, and write them in an output directory with the right layout.  This "
+"corresponds to the @code{#:modules} argument of @code{build-expression-"
+">derivation} (@pxref{Derivations})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:22123
+#: doc/guix.texi:22185
 msgid ""
-"Finally, the various tarballs are unpacked by the derivations @code{gcc-bootstrap-0.drv}, @code{glibc-bootstrap-0.drv}, etc., at "
-"which point we have a working C tool chain."
+"Finally, the various tarballs are unpacked by the derivations @code{gcc-"
+"bootstrap-0.drv}, @code{glibc-bootstrap-0.drv}, etc., at which point we have "
+"a working C tool chain."
 msgstr ""
 
 #. type: unnumberedsubsec
-#: doc/guix.texi:22125
+#: doc/guix.texi:22187
 #, no-wrap
 msgid "Building the Build Tools"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:22134
+#: doc/guix.texi:22196
 msgid ""
-"Bootstrapping is complete when we have a full tool chain that does not depend on the pre-built bootstrap tools discussed above.  "
-"This no-dependency requirement is verified by checking whether the files of the final tool chain contain references to the @file{/"
-"gnu/store} directories of the bootstrap inputs.  The process that leads to this ``final'' tool chain is described by the package "
-"definitions found in the @code{(gnu packages commencement)} module."
+"Bootstrapping is complete when we have a full tool chain that does not "
+"depend on the pre-built bootstrap tools discussed above.  This no-dependency "
+"requirement is verified by checking whether the files of the final tool "
+"chain contain references to the @file{/gnu/store} directories of the "
+"bootstrap inputs.  The process that leads to this ``final'' tool chain is "
+"described by the package definitions found in the @code{(gnu packages "
+"commencement)} module."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:22141
+#: doc/guix.texi:22203
 msgid ""
-"The @command{guix graph} command allows us to ``zoom out'' compared to the graph above, by looking at the level of package objects "
-"instead of individual derivations---remember that a package may translate to several derivations, typically one derivation to "
-"download its source, one to build the Guile modules it needs, and one to actually build the package from source.  The command:"
+"The @command{guix graph} command allows us to ``zoom out'' compared to the "
+"graph above, by looking at the level of package objects instead of "
+"individual derivations---remember that a package may translate to several "
+"derivations, typically one derivation to download its source, one to build "
+"the Guile modules it needs, and one to actually build the package from "
+"source.  The command:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:22146
+#: doc/guix.texi:22208
 #, no-wrap
 msgid ""
 "guix graph -t bag \\\n"
@@ -41935,211 +47379,248 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:22153
+#: doc/guix.texi:22215
 msgid ""
-"produces the dependency graph leading to the ``final'' C library@footnote{You may notice the @code{glibc-intermediate} label, "
-"suggesting that it is not @emph{quite} final, but as a good approximation, we will consider it final.}, depicted below."
+"produces the dependency graph leading to the ``final'' C "
+"library@footnote{You may notice the @code{glibc-intermediate} label, "
+"suggesting that it is not @emph{quite} final, but as a good approximation, "
+"we will consider it final.}, depicted below."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:22155
-msgid "@image{images/bootstrap-packages,6in,,Dependency graph of the early packages}"
+#: doc/guix.texi:22217
+msgid ""
+"@image{images/bootstrap-packages,6in,,Dependency graph of the early packages}"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:22161
+#: doc/guix.texi:22223
 msgid ""
-"The first tool that gets built with the bootstrap binaries is GNU@tie{}Make---noted @code{make-boot0} above---which is a "
-"prerequisite for all the following packages.  From there Findutils and Diffutils get built."
+"The first tool that gets built with the bootstrap binaries is GNU@tie{}"
+"Make---noted @code{make-boot0} above---which is a prerequisite for all the "
+"following packages.  From there Findutils and Diffutils get built."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:22166
+#: doc/guix.texi:22228
 msgid ""
-"Then come the first-stage Binutils and GCC, built as pseudo cross tools---i.e., with @code{--target} equal to @code{--host}.  They "
-"are used to build libc.  Thanks to this cross-build trick, this libc is guaranteed not to hold any reference to the initial tool "
-"chain."
+"Then come the first-stage Binutils and GCC, built as pseudo cross tools---i."
+"e., with @code{--target} equal to @code{--host}.  They are used to build "
+"libc.  Thanks to this cross-build trick, this libc is guaranteed not to hold "
+"any reference to the initial tool chain."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:22172
+#: doc/guix.texi:22234
 msgid ""
-"From there the final Binutils and GCC (not shown above) are built.  GCC uses @code{ld} from the final Binutils, and links programs "
-"against the just-built libc.  This tool chain is used to build the other packages used by Guix and by the GNU Build System: Guile, "
-"Bash, Coreutils, etc."
+"From there the final Binutils and GCC (not shown above) are built.  GCC uses "
+"@code{ld} from the final Binutils, and links programs against the just-built "
+"libc.  This tool chain is used to build the other packages used by Guix and "
+"by the GNU Build System: Guile, Bash, Coreutils, etc."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:22178
+#: doc/guix.texi:22240
 msgid ""
-"And voilà! At this point we have the complete set of build tools that the GNU Build System expects.  These are in the @code{%final-"
-"inputs} variable of the @code{(gnu packages commencement)} module, and are implicitly used by any package that uses @code{gnu-build-"
-"system} (@pxref{Build Systems, @code{gnu-build-system}})."
+"And voilà! At this point we have the complete set of build tools that the "
+"GNU Build System expects.  These are in the @code{%final-inputs} variable of "
+"the @code{(gnu packages commencement)} module, and are implicitly used by "
+"any package that uses @code{gnu-build-system} (@pxref{Build Systems, "
+"@code{gnu-build-system}})."
 msgstr ""
 
 #. type: unnumberedsubsec
-#: doc/guix.texi:22180
+#: doc/guix.texi:22242
 #, no-wrap
 msgid "Building the Bootstrap Binaries"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:22187
+#: doc/guix.texi:22249
 msgid ""
-"Because the final tool chain does not depend on the bootstrap binaries, those rarely need to be updated.  Nevertheless, it is useful "
-"to have an automated way to produce them, should an update occur, and this is what the @code{(gnu packages make-bootstrap)} module "
-"provides."
-msgstr ""
-
-#. type: Plain text
-#: doc/guix.texi:22191
-msgid ""
-"The following command builds the tarballs containing the bootstrap binaries (Guile, Binutils, GCC, libc, and a tarball containing a "
-"mixture of Coreutils and other basic command-line tools):"
-msgstr ""
-
-#. type: example
-#: doc/guix.texi:22194
-#, no-wrap
-msgid "guix build bootstrap-tarballs\n"
-msgstr ""
-
-#. type: Plain text
-#: doc/guix.texi:22199
-msgid ""
-"The generated tarballs are those that should be referred to in the @code{(gnu packages bootstrap)} module mentioned at the beginning "
-"of this section."
-msgstr ""
-
-#. type: Plain text
-#: doc/guix.texi:22205
-msgid ""
-"Still here? Then perhaps by now you've started to wonder: when do we reach a fixed point? That is an interesting question! The "
-"answer is unknown, but if you would like to investigate further (and have significant computational and storage resources to do so), "
-"then let us know."
-msgstr ""
-
-#. type: unnumberedsubsec
-#: doc/guix.texi:22206
-#, no-wrap
-msgid "Reducing the Set of Bootstrap Binaries"
-msgstr ""
-
-#. type: Plain text
-#: doc/guix.texi:22214
-msgid ""
-"Our bootstrap binaries currently include GCC, Guile, etc.  That's a lot of binary code! Why is that a problem? It's a problem "
-"because these big chunks of binary code are practically non-auditable, which makes it hard to establish what source code produced "
-"them.  Every unauditable binary also leaves us vulnerable to compiler backdoors as described by Ken Thompson in the 1984 paper "
-"@emph{Reflections on Trusting Trust}."
-msgstr ""
-
-#. type: Plain text
-#: doc/guix.texi:22220
-msgid ""
-"This is mitigated by the fact that our bootstrap binaries were generated from an earlier Guix revision.  Nevertheless it lacks the "
-"level of transparency that we get in the rest of the package dependency graph, where Guix always gives us a source-to-binary "
-"mapping.  Thus, our goal is to reduce the set of bootstrap binaries to the bare minimum."
-msgstr ""
-
-#. type: Plain text
-#: doc/guix.texi:22226
-msgid ""
-"The @uref{http://bootstrappable.org, Bootstrappable.org web site} lists on-going projects to do that.  One of these is about "
-"replacing the bootstrap GCC with a sequence of assemblers, interpreters, and compilers of increasing complexity, which could be "
-"built from source starting from a simple and auditable assembler.  Your help is welcome!"
-msgstr ""
-
-#. type: section
-#: doc/guix.texi:22229
-#, no-wrap
-msgid "Porting to a New Platform"
-msgstr ""
-
-#. type: Plain text
-#: doc/guix.texi:22238
-msgid ""
-"As discussed above, the GNU distribution is self-contained, and self-containment is achieved by relying on pre-built ``bootstrap "
-"binaries'' (@pxref{Bootstrapping}).  These binaries are specific to an operating system kernel, CPU architecture, and application "
-"binary interface (ABI).  Thus, to port the distribution to a platform that is not yet supported, one must build those bootstrap "
-"binaries, and update the @code{(gnu packages bootstrap)} module to use them on that platform."
-msgstr ""
-
-#. type: Plain text
-#: doc/guix.texi:22243
-msgid ""
-"Fortunately, Guix can @emph{cross compile} those bootstrap binaries.  When everything goes well, and assuming the GNU tool chain "
-"supports the target platform, this can be as simple as running a command like this one:"
-msgstr ""
-
-#. type: example
-#: doc/guix.texi:22246
-#, no-wrap
-msgid "guix build --target=armv5tel-linux-gnueabi bootstrap-tarballs\n"
+"Because the final tool chain does not depend on the bootstrap binaries, "
+"those rarely need to be updated.  Nevertheless, it is useful to have an "
+"automated way to produce them, should an update occur, and this is what the "
+"@code{(gnu packages make-bootstrap)} module provides."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:22253
 msgid ""
-"For this to work, the @code{glibc-dynamic-linker} procedure in @code{(gnu packages bootstrap)} must be augmented to return the right "
-"file name for libc's dynamic linker on that platform; likewise, @code{system->linux-architecture} in @code{(gnu packages linux)} "
-"must be taught about the new platform."
+"The following command builds the tarballs containing the bootstrap binaries "
+"(Guile, Binutils, GCC, libc, and a tarball containing a mixture of Coreutils "
+"and other basic command-line tools):"
+msgstr ""
+
+#. type: example
+#: doc/guix.texi:22256
+#, no-wrap
+msgid "guix build bootstrap-tarballs\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:22262
+#: doc/guix.texi:22261
 msgid ""
-"Once these are built, the @code{(gnu packages bootstrap)} module needs to be updated to refer to these binaries on the target "
-"platform.  That is, the hashes and URLs of the bootstrap tarballs for the new platform must be added alongside those of the "
-"currently supported platforms.  The bootstrap Guile tarball is treated specially: it is expected to be available locally, and "
-"@file{gnu/local.mk} has rules do download it for the supported architectures; a rule for the new platform must be added as well."
+"The generated tarballs are those that should be referred to in the "
+"@code{(gnu packages bootstrap)} module mentioned at the beginning of this "
+"section."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:22271
+#: doc/guix.texi:22267
 msgid ""
-"In practice, there may be some complications.  First, it may be that the extended GNU triplet that specifies an ABI (like the "
-"@code{eabi} suffix above) is not recognized by all the GNU tools.  Typically, glibc recognizes some of these, whereas GCC uses an "
-"extra @code{--with-abi} configure flag (see @code{gcc.scm} for examples of how to handle this).  Second, some of the required "
-"packages could fail to build for that platform.  Lastly, the generated binaries could be broken for some reason."
+"Still here? Then perhaps by now you've started to wonder: when do we reach a "
+"fixed point? That is an interesting question! The answer is unknown, but if "
+"you would like to investigate further (and have significant computational "
+"and storage resources to do so), then let us know."
+msgstr ""
+
+#. type: unnumberedsubsec
+#: doc/guix.texi:22268
+#, no-wrap
+msgid "Reducing the Set of Bootstrap Binaries"
+msgstr ""
+
+#. type: Plain text
+#: doc/guix.texi:22276
+msgid ""
+"Our bootstrap binaries currently include GCC, Guile, etc.  That's a lot of "
+"binary code! Why is that a problem? It's a problem because these big chunks "
+"of binary code are practically non-auditable, which makes it hard to "
+"establish what source code produced them.  Every unauditable binary also "
+"leaves us vulnerable to compiler backdoors as described by Ken Thompson in "
+"the 1984 paper @emph{Reflections on Trusting Trust}."
+msgstr ""
+
+#. type: Plain text
+#: doc/guix.texi:22282
+msgid ""
+"This is mitigated by the fact that our bootstrap binaries were generated "
+"from an earlier Guix revision.  Nevertheless it lacks the level of "
+"transparency that we get in the rest of the package dependency graph, where "
+"Guix always gives us a source-to-binary mapping.  Thus, our goal is to "
+"reduce the set of bootstrap binaries to the bare minimum."
+msgstr ""
+
+#. type: Plain text
+#: doc/guix.texi:22288
+msgid ""
+"The @uref{http://bootstrappable.org, Bootstrappable.org web site} lists on-"
+"going projects to do that.  One of these is about replacing the bootstrap "
+"GCC with a sequence of assemblers, interpreters, and compilers of increasing "
+"complexity, which could be built from source starting from a simple and "
+"auditable assembler.  Your help is welcome!"
+msgstr ""
+
+#. type: section
+#: doc/guix.texi:22291
+#, no-wrap
+msgid "Porting to a New Platform"
+msgstr ""
+
+#. type: Plain text
+#: doc/guix.texi:22300
+msgid ""
+"As discussed above, the GNU distribution is self-contained, and self-"
+"containment is achieved by relying on pre-built ``bootstrap "
+"binaries'' (@pxref{Bootstrapping}).  These binaries are specific to an "
+"operating system kernel, CPU architecture, and application binary interface "
+"(ABI).  Thus, to port the distribution to a platform that is not yet "
+"supported, one must build those bootstrap binaries, and update the "
+"@code{(gnu packages bootstrap)} module to use them on that platform."
+msgstr ""
+
+#. type: Plain text
+#: doc/guix.texi:22305
+msgid ""
+"Fortunately, Guix can @emph{cross compile} those bootstrap binaries.  When "
+"everything goes well, and assuming the GNU tool chain supports the target "
+"platform, this can be as simple as running a command like this one:"
+msgstr ""
+
+#. type: example
+#: doc/guix.texi:22308
+#, no-wrap
+msgid "guix build --target=armv5tel-linux-gnueabi bootstrap-tarballs\n"
+msgstr ""
+
+#. type: Plain text
+#: doc/guix.texi:22315
+msgid ""
+"For this to work, the @code{glibc-dynamic-linker} procedure in @code{(gnu "
+"packages bootstrap)} must be augmented to return the right file name for "
+"libc's dynamic linker on that platform; likewise, @code{system->linux-"
+"architecture} in @code{(gnu packages linux)} must be taught about the new "
+"platform."
+msgstr ""
+
+#. type: Plain text
+#: doc/guix.texi:22324
+msgid ""
+"Once these are built, the @code{(gnu packages bootstrap)} module needs to be "
+"updated to refer to these binaries on the target platform.  That is, the "
+"hashes and URLs of the bootstrap tarballs for the new platform must be added "
+"alongside those of the currently supported platforms.  The bootstrap Guile "
+"tarball is treated specially: it is expected to be available locally, and "
+"@file{gnu/local.mk} has rules do download it for the supported "
+"architectures; a rule for the new platform must be added as well."
+msgstr ""
+
+#. type: Plain text
+#: doc/guix.texi:22333
+msgid ""
+"In practice, there may be some complications.  First, it may be that the "
+"extended GNU triplet that specifies an ABI (like the @code{eabi} suffix "
+"above) is not recognized by all the GNU tools.  Typically, glibc recognizes "
+"some of these, whereas GCC uses an extra @code{--with-abi} configure flag "
+"(see @code{gcc.scm} for examples of how to handle this).  Second, some of "
+"the required packages could fail to build for that platform.  Lastly, the "
+"generated binaries could be broken for some reason."
 msgstr ""
 
 #. type: include
-#: doc/guix.texi:22273
+#: doc/guix.texi:22335
 #, no-wrap
 msgid "contributing.texi"
 msgstr "contributing.fr.texi"
 
 #. type: Plain text
-#: doc/guix.texi:22286
+#: doc/guix.texi:22348
 msgid ""
-"Guix is based on the @uref{http://nixos.org/nix/, Nix package manager}, which was designed and implemented by Eelco Dolstra, with "
-"contributions from other people (see the @file{nix/AUTHORS} file in Guix.)  Nix pioneered functional package management, and "
-"promoted unprecedented features, such as transactional package upgrades and rollbacks, per-user profiles, and referentially "
-"transparent build processes.  Without this work, Guix would not exist."
+"Guix is based on the @uref{http://nixos.org/nix/, Nix package manager}, "
+"which was designed and implemented by Eelco Dolstra, with contributions from "
+"other people (see the @file{nix/AUTHORS} file in Guix.)  Nix pioneered "
+"functional package management, and promoted unprecedented features, such as "
+"transactional package upgrades and rollbacks, per-user profiles, and "
+"referentially transparent build processes.  Without this work, Guix would "
+"not exist."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:22289
-msgid "The Nix-based software distributions, Nixpkgs and NixOS, have also been an inspiration for Guix."
+#: doc/guix.texi:22351
+msgid ""
+"The Nix-based software distributions, Nixpkgs and NixOS, have also been an "
+"inspiration for Guix."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:22295
+#: doc/guix.texi:22357
 msgid ""
-"GNU@tie{}Guix itself is a collective work with contributions from a number of people.  See the @file{AUTHORS} file in Guix for more "
-"information on these fine people.  The @file{THANKS} file lists people who have helped by reporting bugs, taking care of the "
-"infrastructure, providing artwork and themes, making suggestions, and more---thank you!"
+"GNU@tie{}Guix itself is a collective work with contributions from a number "
+"of people.  See the @file{AUTHORS} file in Guix for more information on "
+"these fine people.  The @file{THANKS} file lists people who have helped by "
+"reporting bugs, taking care of the infrastructure, providing artwork and "
+"themes, making suggestions, and more---thank you!"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:22300
+#: doc/guix.texi:22362
 #, no-wrap
 msgid "license, GNU Free Documentation License"
 msgstr "license, GNU Free Documentation License"
 
 #. type: include
-#: doc/guix.texi:22301
+#: doc/guix.texi:22363
 #, no-wrap
 msgid "fdl-1.3.texi"
 msgstr "fdl-1.3.texi"
diff --git a/po/doc/guix.pot b/po/doc/guix-manual.pot
similarity index 84%
rename from po/doc/guix.pot
rename to po/doc/guix-manual.pot
index 93ba711403..72a89105a8 100644
--- a/po/doc/guix.pot
+++ b/po/doc/guix-manual.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: guix 0.14.0.4279-63c2a\n"
+"Project-Id-Version: guix 0.14.0.4289-6527\n"
 "Report-Msgid-Bugs-To: ludo@gnu.org\n"
-"POT-Creation-Date: 2018-04-19 21:17+0200\n"
+"POT-Creation-Date: 2018-04-29 20:48+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,6 +17,1000 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#. #-#-#-#-#  contributing.pot (guix 0.14.0.4289-6527)  #-#-#-#-#
+#. type: chapter
+#. #-#-#-#-#  guix.pot (guix 0.14.0.4289-6527)  #-#-#-#-#
+#. type: menuentry
+#: doc/contributing.texi:1 doc/contributing.texi:2 doc/guix.texi:106
+#: doc/guix.texi:276
+#, no-wrap
+msgid "Contributing"
+msgstr ""
+
+#. type: Plain text
+#: doc/contributing.texi:9
+msgid ""
+"This project is a cooperative effort, and we need your help to make it grow! "
+"Please get in touch with us on @email{guix-devel@@gnu.org} and @code{#guix} "
+"on the Freenode IRC network.  We welcome ideas, bug reports, patches, and "
+"anything that may be helpful to the project.  We particularly welcome help "
+"on packaging (@pxref{Packaging Guidelines})."
+msgstr ""
+
+#. type: cindex
+#: doc/contributing.texi:10
+#, no-wrap
+msgid "code of conduct, of contributors"
+msgstr ""
+
+#. type: cindex
+#: doc/contributing.texi:11
+#, no-wrap
+msgid "contributor covenant"
+msgstr ""
+
+#. type: Plain text
+#: doc/contributing.texi:17
+msgid ""
+"We want to provide a warm, friendly, and harassment-free environment, so "
+"that anyone can contribute to the best of their abilities.  To this end our "
+"project uses a ``Contributor Covenant'', which was adapted from @url{http://"
+"contributor-covenant.org/}.  You can find a local version in the @file{CODE-"
+"OF-CONDUCT} file in the source tree."
+msgstr ""
+
+#. type: Plain text
+#: doc/contributing.texi:21
+msgid ""
+"Contributors are not required to use their legal name in patches and on-line "
+"communication; they can use any name or pseudonym of their choice."
+msgstr ""
+
+#. #-#-#-#-#  contributing.pot (guix 0.14.0.4289-6527)  #-#-#-#-#
+#. type: section
+#. #-#-#-#-#  guix.pot (guix 0.14.0.4289-6527)  #-#-#-#-#
+#. type: menuentry
+#: doc/contributing.texi:28 doc/contributing.texi:30 doc/contributing.texi:31
+#: doc/guix.texi:282
+#, no-wrap
+msgid "Building from Git"
+msgstr ""
+
+#. type: menuentry
+#: doc/contributing.texi:28 doc/guix.texi:282
+msgid "The latest and greatest."
+msgstr ""
+
+#. #-#-#-#-#  contributing.pot (guix 0.14.0.4289-6527)  #-#-#-#-#
+#. type: section
+#. #-#-#-#-#  guix.pot (guix 0.14.0.4289-6527)  #-#-#-#-#
+#. type: menuentry
+#: doc/contributing.texi:28 doc/contributing.texi:102 doc/contributing.texi:103
+#: doc/guix.texi:282
+#, no-wrap
+msgid "Running Guix Before It Is Installed"
+msgstr ""
+
+#. type: menuentry
+#: doc/contributing.texi:28 doc/guix.texi:282
+msgid "Hacker tricks."
+msgstr ""
+
+#. #-#-#-#-#  contributing.pot (guix 0.14.0.4289-6527)  #-#-#-#-#
+#. type: section
+#. #-#-#-#-#  guix.pot (guix 0.14.0.4289-6527)  #-#-#-#-#
+#. type: menuentry
+#: doc/contributing.texi:28 doc/contributing.texi:169 doc/contributing.texi:170
+#: doc/guix.texi:282
+#, no-wrap
+msgid "The Perfect Setup"
+msgstr ""
+
+#. type: menuentry
+#: doc/contributing.texi:28 doc/guix.texi:282
+msgid "The right tools."
+msgstr ""
+
+#. #-#-#-#-#  contributing.pot (guix 0.14.0.4289-6527)  #-#-#-#-#
+#. type: section
+#. #-#-#-#-#  guix.pot (guix 0.14.0.4289-6527)  #-#-#-#-#
+#. type: menuentry
+#: doc/contributing.texi:28 doc/contributing.texi:228 doc/contributing.texi:229
+#: doc/guix.texi:282 doc/guix.texi:284
+#, no-wrap
+msgid "Coding Style"
+msgstr ""
+
+#. type: menuentry
+#: doc/contributing.texi:28 doc/guix.texi:282
+msgid "Hygiene of the contributor."
+msgstr ""
+
+#. #-#-#-#-#  contributing.pot (guix 0.14.0.4289-6527)  #-#-#-#-#
+#. type: section
+#. #-#-#-#-#  guix.pot (guix 0.14.0.4289-6527)  #-#-#-#-#
+#. type: menuentry
+#: doc/contributing.texi:28 doc/contributing.texi:326 doc/contributing.texi:327
+#: doc/guix.texi:282
+#, no-wrap
+msgid "Submitting Patches"
+msgstr ""
+
+#. type: menuentry
+#: doc/contributing.texi:28 doc/guix.texi:282
+msgid "Share your work."
+msgstr ""
+
+#. type: Plain text
+#: doc/contributing.texi:35
+msgid ""
+"If you want to hack Guix itself, it is recommended to use the latest version "
+"from the Git repository:"
+msgstr ""
+
+#. type: example
+#: doc/contributing.texi:38
+#, no-wrap
+msgid "git clone https://git.savannah.gnu.org/git/guix.git\n"
+msgstr ""
+
+#. type: Plain text
+#: doc/contributing.texi:43
+msgid ""
+"When building Guix from a checkout, the following packages are required in "
+"addition to those mentioned in the installation instructions "
+"(@pxref{Requirements})."
+msgstr ""
+
+#. type: item
+#: doc/contributing.texi:45
+#, no-wrap
+msgid "@url{http://gnu.org/software/autoconf/, GNU Autoconf};"
+msgstr ""
+
+#. type: item
+#: doc/contributing.texi:46
+#, no-wrap
+msgid "@url{http://gnu.org/software/automake/, GNU Automake};"
+msgstr ""
+
+#. type: item
+#: doc/contributing.texi:47
+#, no-wrap
+msgid "@url{http://gnu.org/software/gettext/, GNU Gettext};"
+msgstr ""
+
+#. type: item
+#: doc/contributing.texi:48
+#, no-wrap
+msgid "@url{http://gnu.org/software/texinfo/, GNU Texinfo};"
+msgstr ""
+
+#. type: item
+#: doc/contributing.texi:49
+#, no-wrap
+msgid "@url{http://www.graphviz.org/, Graphviz};"
+msgstr ""
+
+#. type: item
+#: doc/contributing.texi:50
+#, no-wrap
+msgid "@url{http://www.gnu.org/software/help2man/, GNU Help2man (optional)}."
+msgstr ""
+
+#. type: Plain text
+#: doc/contributing.texi:57
+msgid ""
+"The easiest way to set up a development environment for Guix is, of course, "
+"by using Guix! The following command starts a new shell where all the "
+"dependencies and appropriate environment variables are set up to hack on "
+"Guix:"
+msgstr ""
+
+#. type: example
+#: doc/contributing.texi:60
+#, no-wrap
+msgid "guix environment guix\n"
+msgstr ""
+
+#. type: Plain text
+#: doc/contributing.texi:64
+msgid ""
+"@xref{Invoking guix environment}, for more information on that command.  "
+"Extra dependencies can be added with @option{--ad-hoc}:"
+msgstr ""
+
+#. type: example
+#: doc/contributing.texi:67
+#, no-wrap
+msgid "guix environment guix --ad-hoc help2man git strace\n"
+msgstr ""
+
+#. type: Plain text
+#: doc/contributing.texi:71
+msgid ""
+"Run @command{./bootstrap} to generate the build system infrastructure using "
+"Autoconf and Automake.  If you get an error like this one:"
+msgstr ""
+
+#. type: example
+#: doc/contributing.texi:74
+#, no-wrap
+msgid "configure.ac:46: error: possibly undefined macro: PKG_CHECK_MODULES\n"
+msgstr ""
+
+#. type: Plain text
+#: doc/contributing.texi:83
+msgid ""
+"it probably means that Autoconf couldn’t find @file{pkg.m4}, which is "
+"provided by pkg-config.  Make sure that @file{pkg.m4} is available.  The "
+"same holds for the @file{guile.m4} set of macros provided by Guile.  For "
+"instance, if you installed Automake in @file{/usr/local}, it wouldn’t look "
+"for @file{.m4} files in @file{/usr/share}.  In that case, you have to invoke "
+"the following command:"
+msgstr ""
+
+#. type: example
+#: doc/contributing.texi:86
+#, no-wrap
+msgid "export ACLOCAL_PATH=/usr/share/aclocal\n"
+msgstr ""
+
+#. type: Plain text
+#: doc/contributing.texi:90
+msgid ""
+"@xref{Macro Search Path,,, automake, The GNU Automake Manual}, for more "
+"information."
+msgstr ""
+
+#. type: Plain text
+#: doc/contributing.texi:95
+msgid ""
+"Then, run @command{./configure} as usual.  Make sure to pass @code{--"
+"localstatedir=@var{directory}} where @var{directory} is the "
+"@code{localstatedir} value used by your current installation (@pxref{The "
+"Store}, for information about this)."
+msgstr ""
+
+#. type: Plain text
+#: doc/contributing.texi:100
+msgid ""
+"Finally, you have to invoke @code{make check} to run tests (@pxref{Running "
+"the Test Suite}).  If anything fails, take a look at installation "
+"instructions (@pxref{Installation})  or send a message to the @email{guix-"
+"devel@@gnu.org, mailing list}."
+msgstr ""
+
+#. type: Plain text
+#: doc/contributing.texi:109
+msgid ""
+"In order to keep a sane working environment, you will find it useful to test "
+"the changes made in your local source tree checkout without actually "
+"installing them.  So that you can distinguish between your ``end-user'' hat "
+"and your ``motley'' costume."
+msgstr ""
+
+#. type: Plain text
+#: doc/contributing.texi:117
+msgid ""
+"To that end, all the command-line tools can be used even if you have not run "
+"@code{make install}.  To do that, prefix each command with @command{./pre-"
+"inst-env} (the @file{pre-inst-env} script lives in the top build tree of "
+"Guix), as in@footnote{The @option{-E} flag to @command{sudo} guarantees that "
+"@code{GUILE_LOAD_PATH} is correctly set such that @command{guix-daemon} and "
+"the tools it uses can find the Guile modules they need.}:"
+msgstr ""
+
+#. type: example
+#: doc/contributing.texi:121
+#, no-wrap
+msgid ""
+"$ sudo -E ./pre-inst-env guix-daemon --build-users-group=guixbuild\n"
+"$ ./pre-inst-env guix build hello\n"
+msgstr ""
+
+#. type: Plain text
+#: doc/contributing.texi:125
+msgid "Similarly, for a Guile session using the Guix modules:"
+msgstr ""
+
+#. type: example
+#: doc/contributing.texi:128
+#, no-wrap
+msgid ""
+"$ ./pre-inst-env guile -c '(use-modules (guix utils)) (pk (%current-system))'\n"
+"\n"
+msgstr ""
+
+#. type: example
+#: doc/contributing.texi:130
+#, no-wrap
+msgid ";;; (\"x86_64-linux\")\n"
+msgstr ""
+
+#. type: cindex
+#: doc/contributing.texi:133
+#, no-wrap
+msgid "REPL"
+msgstr ""
+
+#. type: cindex
+#: doc/contributing.texi:134
+#, no-wrap
+msgid "read-eval-print loop"
+msgstr ""
+
+#. type: Plain text
+#: doc/contributing.texi:137
+msgid ""
+"@dots{} and for a REPL (@pxref{Using Guile Interactively,,, guile, Guile "
+"Reference Manual}):"
+msgstr ""
+
+#. type: example
+#: doc/contributing.texi:152
+#, no-wrap
+msgid ""
+"$ ./pre-inst-env guile\n"
+"scheme@@(guile-user)> ,use(guix)\n"
+"scheme@@(guile-user)> ,use(gnu)\n"
+"scheme@@(guile-user)> (define snakes\n"
+"                       (fold-packages\n"
+"                         (lambda (package lst)\n"
+"                           (if (string-prefix? \"python\"\n"
+"                                               (package-name package))\n"
+"                               (cons package lst)\n"
+"                               lst))\n"
+"                         '()))\n"
+"scheme@@(guile-user)> (length snakes)\n"
+"$1 = 361\n"
+msgstr ""
+
+#. type: Plain text
+#: doc/contributing.texi:156
+msgid ""
+"The @command{pre-inst-env} script sets up all the environment variables "
+"necessary to support this, including @env{PATH} and @env{GUILE_LOAD_PATH}."
+msgstr ""
+
+#. type: Plain text
+#: doc/contributing.texi:167
+msgid ""
+"Note that @command{./pre-inst-env guix pull} does @emph{not} upgrade the "
+"local source tree; it simply updates the @file{~/.config/guix/latest} "
+"symlink (@pxref{Invoking guix pull}).  Run @command{git pull} instead if you "
+"want to upgrade your local source tree.@footnote{If you would like to set up "
+"@command{guix} to use your Git checkout, you can point the @file{~/.config/"
+"guix/latest} symlink to your Git checkout directory.  If you are the sole "
+"user of your system, you may also consider pointing the @file{/root/.config/"
+"guix/latest} symlink to point to @file{~/.config/guix/latest}; this way it "
+"will always use the same @command{guix} as your user does.}"
+msgstr ""
+
+#. type: Plain text
+#: doc/contributing.texi:177
+msgid ""
+"The Perfect Setup to hack on Guix is basically the perfect setup used for "
+"Guile hacking (@pxref{Using Guile in Emacs,,, guile, Guile Reference "
+"Manual}).  First, you need more than an editor, you need @url{http://www.gnu."
+"org/software/emacs, Emacs}, empowered by the wonderful @url{http://nongnu."
+"org/geiser/, Geiser}."
+msgstr ""
+
+#. type: Plain text
+#: doc/contributing.texi:185
+msgid ""
+"Geiser allows for interactive and incremental development from within Emacs: "
+"code compilation and evaluation from within buffers, access to on-line "
+"documentation (docstrings), context-sensitive completion, @kbd{M-.} to jump "
+"to an object definition, a REPL to try out your code, and more "
+"(@pxref{Introduction,,, geiser, Geiser User Manual}).  For convenient Guix "
+"development, make sure to augment Guile’s load path so that it finds source "
+"files from your checkout:"
+msgstr ""
+
+#. type: lisp
+#: doc/contributing.texi:190
+#, no-wrap
+msgid ""
+";; @r{Assuming the Guix checkout is in ~/src/guix.}\n"
+"(with-eval-after-load 'geiser-guile\n"
+"  (add-to-list 'geiser-guile-load-path \"~/src/guix\"))\n"
+msgstr ""
+
+#. type: Plain text
+#: doc/contributing.texi:198
+msgid ""
+"To actually edit the code, Emacs already has a neat Scheme mode.  But in "
+"addition to that, you must not miss @url{http://www.emacswiki.org/emacs/"
+"ParEdit, Paredit}.  It provides facilities to directly operate on the syntax "
+"tree, such as raising an s-expression or wrapping it, swallowing or "
+"rejecting the following s-expression, etc."
+msgstr ""
+
+#. type: cindex
+#: doc/contributing.texi:199
+#, no-wrap
+msgid "code snippets"
+msgstr ""
+
+#. type: cindex
+#: doc/contributing.texi:200
+#, no-wrap
+msgid "templates"
+msgstr ""
+
+#. type: cindex
+#: doc/contributing.texi:201
+#, no-wrap
+msgid "reducing boilerplate"
+msgstr ""
+
+#. type: Plain text
+#: doc/contributing.texi:208
+msgid ""
+"We also provide templates for common git commit messages and package "
+"definitions in the @file{etc/snippets} directory.  These templates can be "
+"used with @url{http://joaotavora.github.io/yasnippet/, YASnippet} to expand "
+"short trigger strings to interactive text snippets.  You may want to add the "
+"snippets directory to the @var{yas-snippet-dirs} variable in Emacs."
+msgstr ""
+
+#. type: lisp
+#: doc/contributing.texi:213
+#, no-wrap
+msgid ""
+";; @r{Assuming the Guix checkout is in ~/src/guix.}\n"
+"(with-eval-after-load 'yasnippet\n"
+"  (add-to-list 'yas-snippet-dirs \"~/src/guix/etc/snippets\"))\n"
+msgstr ""
+
+#. type: Plain text
+#: doc/contributing.texi:220
+msgid ""
+"The commit message snippets depend on @url{https://magit.vc/, Magit} to "
+"display staged files.  When editing a commit message type @code{add} "
+"followed by @kbd{TAB} to insert a commit message template for adding a "
+"package; type @code{update} followed by @kbd{TAB} to insert a template for "
+"updating a package."
+msgstr ""
+
+#. type: Plain text
+#: doc/contributing.texi:226
+msgid ""
+"The main snippet for @code{scheme-mode} is triggered by typing "
+"@code{package...} followed by @kbd{TAB}.  This snippet also inserts the "
+"trigger string @code{origin...}, which can be expanded further.  The "
+"@code{origin} snippet in turn may insert other trigger strings ending on "
+"@code{...}, which also can be expanded further."
+msgstr ""
+
+#. type: Plain text
+#: doc/contributing.texi:234
+msgid ""
+"In general our code follows the GNU Coding Standards (@pxref{Top,,, "
+"standards, GNU Coding Standards}).  However, they do not say much about "
+"Scheme, so here are some additional rules."
+msgstr ""
+
+#. #-#-#-#-#  contributing.pot (guix 0.14.0.4289-6527)  #-#-#-#-#
+#. type: subsection
+#. #-#-#-#-#  guix.pot (guix 0.14.0.4289-6527)  #-#-#-#-#
+#. type: menuentry
+#: doc/contributing.texi:240 doc/contributing.texi:242
+#: doc/contributing.texi:243 doc/guix.texi:289
+#, no-wrap
+msgid "Programming Paradigm"
+msgstr ""
+
+#. type: menuentry
+#: doc/contributing.texi:240 doc/guix.texi:289
+msgid "How to compose your elements."
+msgstr ""
+
+#. #-#-#-#-#  contributing.pot (guix 0.14.0.4289-6527)  #-#-#-#-#
+#. type: subsection
+#. #-#-#-#-#  guix.pot (guix 0.14.0.4289-6527)  #-#-#-#-#
+#. type: menuentry
+#: doc/contributing.texi:240 doc/contributing.texi:249
+#: doc/contributing.texi:250 doc/guix.texi:289
+#, no-wrap
+msgid "Modules"
+msgstr ""
+
+#. type: menuentry
+#: doc/contributing.texi:240 doc/guix.texi:289
+msgid "Where to store your code?"
+msgstr ""
+
+#. #-#-#-#-#  contributing.pot (guix 0.14.0.4289-6527)  #-#-#-#-#
+#. type: subsection
+#. #-#-#-#-#  guix.pot (guix 0.14.0.4289-6527)  #-#-#-#-#
+#. type: menuentry
+#: doc/contributing.texi:240 doc/contributing.texi:260
+#: doc/contributing.texi:261 doc/guix.texi:289
+#, no-wrap
+msgid "Data Types and Pattern Matching"
+msgstr ""
+
+#. type: menuentry
+#: doc/contributing.texi:240 doc/guix.texi:289
+msgid "Implementing data structures."
+msgstr ""
+
+#. #-#-#-#-#  contributing.pot (guix 0.14.0.4289-6527)  #-#-#-#-#
+#. type: subsection
+#. #-#-#-#-#  guix.pot (guix 0.14.0.4289-6527)  #-#-#-#-#
+#. type: menuentry
+#: doc/contributing.texi:240 doc/contributing.texi:274
+#: doc/contributing.texi:275 doc/guix.texi:289
+#, no-wrap
+msgid "Formatting Code"
+msgstr ""
+
+#. type: menuentry
+#: doc/contributing.texi:240 doc/guix.texi:289
+msgid "Writing conventions."
+msgstr ""
+
+#. type: Plain text
+#: doc/contributing.texi:248
+msgid ""
+"Scheme code in Guix is written in a purely functional style.  One exception "
+"is code that involves input/output, and procedures that implement low-level "
+"concepts, such as the @code{memoize} procedure."
+msgstr ""
+
+#. type: Plain text
+#: doc/contributing.texi:256
+msgid ""
+"Guile modules that are meant to be used on the builder side must live in the "
+"@code{(guix build @dots{})} name space.  They must not refer to other Guix "
+"or GNU modules.  However, it is OK for a ``host-side'' module to use a build-"
+"side module."
+msgstr ""
+
+#. type: Plain text
+#: doc/contributing.texi:259
+msgid ""
+"Modules that deal with the broader GNU system should be in the @code{(gnu "
+"@dots{})} name space rather than @code{(guix @dots{})}."
+msgstr ""
+
+#. type: Plain text
+#: doc/contributing.texi:268
+msgid ""
+"The tendency in classical Lisp is to use lists to represent everything, and "
+"then to browse them ``by hand'' using @code{car}, @code{cdr}, @code{cadr}, "
+"and co.  There are several problems with that style, notably the fact that "
+"it is hard to read, error-prone, and a hindrance to proper type error "
+"reports."
+msgstr ""
+
+#. type: Plain text
+#: doc/contributing.texi:273
+msgid ""
+"Guix code should define appropriate data types (for instance, using "
+"@code{define-record-type*}) rather than abuse lists.  In addition, it should "
+"use pattern matching, via Guile’s @code{(ice-9 match)} module, especially "
+"when matching lists."
+msgstr ""
+
+#. type: cindex
+#: doc/contributing.texi:277
+#, no-wrap
+msgid "formatting code"
+msgstr ""
+
+#. type: cindex
+#: doc/contributing.texi:278
+#, no-wrap
+msgid "coding style"
+msgstr ""
+
+#. type: Plain text
+#: doc/contributing.texi:285
+msgid ""
+"When writing Scheme code, we follow common wisdom among Scheme programmers.  "
+"In general, we follow the @url{http://mumble.net/~campbell/scheme/style.txt, "
+"Riastradh's Lisp Style Rules}.  This document happens to describe the "
+"conventions mostly used in Guile’s code too.  It is very thoughtful and well "
+"written, so please do read it."
+msgstr ""
+
+#. type: Plain text
+#: doc/contributing.texi:292
+msgid ""
+"Some special forms introduced in Guix, such as the @code{substitute*} macro, "
+"have special indentation rules.  These are defined in the @file{.dir-locals."
+"el} file, which Emacs automatically uses.  Also note that Emacs-Guix "
+"provides @code{guix-devel-mode} mode that indents and highlights Guix code "
+"properly (@pxref{Development,,, emacs-guix, The Emacs-Guix Reference "
+"Manual})."
+msgstr ""
+
+#. type: cindex
+#: doc/contributing.texi:293
+#, no-wrap
+msgid "indentation, of code"
+msgstr ""
+
+#. type: cindex
+#: doc/contributing.texi:294
+#, no-wrap
+msgid "formatting, of code"
+msgstr ""
+
+#. type: Plain text
+#: doc/contributing.texi:297
+msgid ""
+"If you do not use Emacs, please make sure to let your editor knows these "
+"rules.  To automatically indent a package definition, you can also run:"
+msgstr ""
+
+#. type: example
+#: doc/contributing.texi:300
+#, no-wrap
+msgid "./etc/indent-code.el gnu/packages/@var{file}.scm @var{package}\n"
+msgstr ""
+
+#. type: Plain text
+#: doc/contributing.texi:306
+msgid ""
+"This automatically indents the definition of @var{package} in @file{gnu/"
+"packages/@var{file}.scm} by running Emacs in batch mode.  To indent a whole "
+"file, omit the second argument:"
+msgstr ""
+
+#. type: example
+#: doc/contributing.texi:309
+#, no-wrap
+msgid "./etc/indent-code.el gnu/services/@var{file}.scm\n"
+msgstr ""
+
+#. type: cindex
+#: doc/contributing.texi:311
+#, no-wrap
+msgid "Vim, Scheme code editing"
+msgstr ""
+
+#. type: Plain text
+#: doc/contributing.texi:317
+msgid ""
+"If you are editing code with Vim, we recommend that you run @code{:set "
+"autoindent} so that your code is automatically indented as you type.  "
+"Additionally, @uref{https://www.vim.org/scripts/script.php?script_id=3998, "
+"@code{paredit.vim}} may help you deal with all these parentheses."
+msgstr ""
+
+#. type: Plain text
+#: doc/contributing.texi:321
+msgid ""
+"We require all top-level procedures to carry a docstring.  This requirement "
+"can be relaxed for simple private procedures in the @code{(guix build "
+"@dots{})} name space, though."
+msgstr ""
+
+#. type: Plain text
+#: doc/contributing.texi:324
+msgid ""
+"Procedures should not have more than four positional parameters.  Use "
+"keyword parameters for procedures that take more than four parameters."
+msgstr ""
+
+#. type: Plain text
+#: doc/contributing.texi:333
+msgid ""
+"Development is done using the Git distributed version control system.  Thus, "
+"access to the repository is not strictly necessary.  We welcome "
+"contributions in the form of patches as produced by @code{git format-patch} "
+"sent to the @email{guix-patches@@gnu.org} mailing list."
+msgstr ""
+
+#. type: Plain text
+#: doc/contributing.texi:340
+msgid ""
+"This mailing list is backed by a Debbugs instance accessible at "
+"@uref{https://bugs.gnu.org/guix-patches}, which allows us to keep track of "
+"submissions.  Each message sent to that mailing list gets a new tracking "
+"number assigned; people can then follow up on the submission by sending "
+"email to @code{@var{NNN}@@debbugs.gnu.org}, where @var{NNN} is the tracking "
+"number (@pxref{Sending a Patch Series})."
+msgstr ""
+
+#. type: Plain text
+#: doc/contributing.texi:344
+msgid ""
+"Please write commit logs in the ChangeLog format (@pxref{Change Logs,,, "
+"standards, GNU Coding Standards}); you can check the commit history for "
+"examples."
+msgstr ""
+
+#. type: Plain text
+#: doc/contributing.texi:347
+msgid ""
+"Before submitting a patch that adds or modifies a package definition, please "
+"run through this check list:"
+msgstr ""
+
+#. type: enumerate
+#: doc/contributing.texi:354
+msgid ""
+"If the authors of the packaged software provide a cryptographic signature "
+"for the release tarball, make an effort to verify the authenticity of the "
+"archive.  For a detached GPG signature file this would be done with the "
+"@code{gpg --verify} command."
+msgstr ""
+
+#. type: enumerate
+#: doc/contributing.texi:358
+msgid ""
+"Take some time to provide an adequate synopsis and description for the "
+"package.  @xref{Synopses and Descriptions}, for some guidelines."
+msgstr ""
+
+#. type: enumerate
+#: doc/contributing.texi:363
+msgid ""
+"Run @code{guix lint @var{package}}, where @var{package} is the name of the "
+"new or modified package, and fix any errors it reports (@pxref{Invoking guix "
+"lint})."
+msgstr ""
+
+#. type: enumerate
+#: doc/contributing.texi:367
+msgid ""
+"Make sure the package builds on your platform, using @code{guix build "
+"@var{package}}."
+msgstr ""
+
+#. type: cindex
+#: doc/contributing.texi:369
+#, no-wrap
+msgid "bundling"
+msgstr ""
+
+#. type: enumerate
+#: doc/contributing.texi:372
+msgid ""
+"Make sure the package does not use bundled copies of software already "
+"available as separate packages."
+msgstr ""
+
+#. type: enumerate
+#: doc/contributing.texi:381
+msgid ""
+"Sometimes, packages include copies of the source code of their dependencies "
+"as a convenience for users.  However, as a distribution, we want to make "
+"sure that such packages end up using the copy we already have in the "
+"distribution, if there is one.  This improves resource usage (the dependency "
+"is built and stored only once), and allows the distribution to make "
+"transverse changes such as applying security updates for a given software "
+"package in a single place and have them affect the whole system---something "
+"that bundled copies prevent."
+msgstr ""
+
+#. type: enumerate
+#: doc/contributing.texi:388
+msgid ""
+"Take a look at the profile reported by @command{guix size} (@pxref{Invoking "
+"guix size}).  This will allow you to notice references to other packages "
+"unwillingly retained.  It may also help determine whether to split the "
+"package (@pxref{Packages with Multiple Outputs}), and which optional "
+"dependencies should be used."
+msgstr ""
+
+#. type: enumerate
+#: doc/contributing.texi:393
+msgid ""
+"For important changes, check that dependent package (if applicable) are not "
+"affected by the change; @code{guix refresh --list-dependent @var{package}} "
+"will help you do that (@pxref{Invoking guix refresh})."
+msgstr ""
+
+#. type: cindex
+#: doc/contributing.texi:395
+#, no-wrap
+msgid "branching strategy"
+msgstr ""
+
+#. type: cindex
+#: doc/contributing.texi:396
+#, no-wrap
+msgid "rebuild scheduling strategy"
+msgstr ""
+
+#. type: enumerate
+#: doc/contributing.texi:399
+msgid ""
+"Depending on the number of dependent packages and thus the amount of "
+"rebuilding induced, commits go to different branches, along these lines:"
+msgstr ""
+
+#. type: item
+#: doc/contributing.texi:401
+#, no-wrap
+msgid "300 dependent packages or less"
+msgstr ""
+
+#. type: table
+#: doc/contributing.texi:403
+msgid "@code{master} branch (non-disruptive changes)."
+msgstr ""
+
+#. type: item
+#: doc/contributing.texi:404
+#, no-wrap
+msgid "between 300 and 1,200 dependent packages"
+msgstr ""
+
+#. type: table
+#: doc/contributing.texi:409
+msgid ""
+"@code{staging} branch (non-disruptive changes).  This branch is intended to "
+"be merged in @code{master} every 3 weeks or so.  Topical changes (e.g., an "
+"update of the GNOME stack) can instead go to a specific branch (say, "
+"@code{gnome-updates})."
+msgstr ""
+
+#. type: item
+#: doc/contributing.texi:410
+#, no-wrap
+msgid "more than 1,200 dependent packages"
+msgstr ""
+
+#. type: table
+#: doc/contributing.texi:414
+msgid ""
+"@code{core-updates} branch (may include major and potentially disruptive "
+"changes).  This branch is intended to be merged in @code{master} every 2.5 "
+"months or so."
+msgstr ""
+
+#. type: enumerate
+#: doc/contributing.texi:421
+msgid ""
+"All these branches are tracked by our build farm and merged into "
+"@code{master} once everything has been successfully built.  This allows us "
+"to fix issues before they hit users, and to reduce the window during which "
+"pre-built binaries are not available."
+msgstr ""
+
+#. type: cindex
+#: doc/contributing.texi:423
+#, no-wrap
+msgid "determinism, of build processes"
+msgstr ""
+
+#. type: cindex
+#: doc/contributing.texi:424
+#, no-wrap
+msgid "reproducible builds, checking"
+msgstr ""
+
+#. type: enumerate
+#: doc/contributing.texi:428
+msgid ""
+"Check whether the package's build process is deterministic.  This typically "
+"means checking whether an independent build of the package yields the exact "
+"same result that you obtained, bit for bit."
+msgstr ""
+
+#. type: enumerate
+#: doc/contributing.texi:431
+msgid ""
+"A simple way to do that is by building the same package several times in a "
+"row on your machine (@pxref{Invoking guix build}):"
+msgstr ""
+
+#. type: example
+#: doc/contributing.texi:434
+#, no-wrap
+msgid "guix build --rounds=2 my-package\n"
+msgstr ""
+
+#. type: enumerate
+#: doc/contributing.texi:438
+msgid ""
+"This is enough to catch a class of common non-determinism issues, such as "
+"timestamps or randomly-generated output in the build result."
+msgstr ""
+
+#. type: enumerate
+#: doc/contributing.texi:448
+msgid ""
+"Another option is to use @command{guix challenge} (@pxref{Invoking guix "
+"challenge}).  You may run it once the package has been committed and built "
+"by @code{hydra.gnu.org} to check whether it obtains the same result as you "
+"did.  Better yet: Find another machine that can build it and run "
+"@command{guix publish}.  Since the remote build machine is likely different "
+"from yours, this can catch non-determinism issues related to the hardware---"
+"e.g., use of different instruction set extensions---or to the operating "
+"system kernel---e.g., reliance on @code{uname} or @file{/proc} files."
+msgstr ""
+
+#. type: enumerate
+#: doc/contributing.texi:454
+msgid ""
+"When writing documentation, please use gender-neutral wording when referring "
+"to people, such as @uref{https://en.wikipedia.org/wiki/Singular_they, "
+"singular ``they''@comma{} ``their''@comma{} ``them''}, and so forth."
+msgstr ""
+
+#. type: enumerate
+#: doc/contributing.texi:458
+msgid ""
+"Verify that your patch contains only one set of related changes.  Bundling "
+"unrelated changes together makes reviewing harder and slower."
+msgstr ""
+
+#. type: enumerate
+#: doc/contributing.texi:461
+msgid ""
+"Examples of unrelated changes include the addition of several packages, or a "
+"package update along with fixes to that package."
+msgstr ""
+
+#. type: enumerate
+#: doc/contributing.texi:466
+msgid ""
+"Please follow our code formatting rules, possibly running the @command{etc/"
+"indent-code.el} script to do that automatically for you (@pxref{Formatting "
+"Code})."
+msgstr ""
+
+#. type: Plain text
+#: doc/contributing.texi:476
+msgid ""
+"When posting a patch to the mailing list, use @samp{[PATCH] @dots{}} as a "
+"subject.  You may use your email client or the @command{git send-email} "
+"command (@pxref{Sending a Patch Series}).  We prefer to get patches in plain "
+"text messages, either inline or as MIME attachments.  You are advised to pay "
+"attention if your email client changes anything like line breaks or "
+"indentation which could potentially break the patches."
+msgstr ""
+
+#. type: Plain text
+#: doc/contributing.texi:479
+msgid ""
+"When a bug is resolved, please close the thread by sending an email to "
+"@email{@var{NNN}-done@@debbugs.gnu.org}."
+msgstr ""
+
+#. type: anchor{#1}
+#: doc/contributing.texi:480 doc/contributing.texi:482
+#, no-wrap
+msgid "Sending a Patch Series"
+msgstr ""
+
+#. type: cindex
+#: doc/contributing.texi:482
+#, no-wrap
+msgid "patch series"
+msgstr ""
+
+#. type: code{#1}
+#: doc/contributing.texi:483
+#, no-wrap
+msgid "git send-email"
+msgstr ""
+
+#. type: code{#1}
+#: doc/contributing.texi:484
+#, no-wrap
+msgid "git-send-email"
+msgstr ""
+
+#. type: Plain text
+#: doc/contributing.texi:492
+msgid ""
+"When sending a patch series (e.g., using @code{git send-email}), please "
+"first send one message to @email{guix-patches@@gnu.org}, and then send "
+"subsequent patches to @email{@var{NNN}@@debbugs.gnu.org} to make sure they "
+"are kept together.  See @uref{https://debbugs.gnu.org/Advanced.html, the "
+"Debbugs documentation} for more information."
+msgstr ""
+
 #. type: Plain text
 #: doc/guix.texi:7
 msgid "@documentencoding UTF-8"
@@ -269,18 +1263,13 @@ msgstr ""
 msgid "Software for your friendly GNU system."
 msgstr ""
 
-#. type: menuentry
-#: doc/guix.texi:106 doc/guix.texi:276
-msgid "Contributing"
-msgstr ""
-
 #. type: menuentry
 #: doc/guix.texi:106
 msgid "Your help needed!"
 msgstr ""
 
 #. type: chapter
-#: doc/guix.texi:111 doc/guix.texi:22293 doc/guix.texi:22294
+#: doc/guix.texi:111 doc/guix.texi:22338 doc/guix.texi:22339
 #, no-wrap
 msgid "Acknowledgments"
 msgstr ""
@@ -291,7 +1280,7 @@ msgid "Thanks!"
 msgstr ""
 
 #. type: appendix
-#: doc/guix.texi:111 doc/guix.texi:22315 doc/guix.texi:22316
+#: doc/guix.texi:111 doc/guix.texi:22360 doc/guix.texi:22361
 #, no-wrap
 msgid "GNU Free Documentation License"
 msgstr ""
@@ -302,7 +1291,7 @@ msgid "The license of this manual."
 msgstr ""
 
 #. type: unnumbered
-#: doc/guix.texi:111 doc/guix.texi:22321 doc/guix.texi:22322
+#: doc/guix.texi:111 doc/guix.texi:22366 doc/guix.texi:22367
 #, no-wrap
 msgid "Concept Index"
 msgstr ""
@@ -313,7 +1302,7 @@ msgid "Concepts."
 msgstr ""
 
 #. type: unnumbered
-#: doc/guix.texi:111 doc/guix.texi:22325 doc/guix.texi:22326
+#: doc/guix.texi:111 doc/guix.texi:22370 doc/guix.texi:22371
 #, no-wrap
 msgid "Programming Index"
 msgstr ""
@@ -362,7 +1351,8 @@ msgid "Testing Guix."
 msgstr ""
 
 #. type: section
-#: doc/guix.texi:123 doc/guix.texi:125 doc/guix.texi:398 doc/guix.texi:743 doc/guix.texi:744
+#: doc/guix.texi:123 doc/guix.texi:125 doc/guix.texi:398 doc/guix.texi:743
+#: doc/guix.texi:744
 #, no-wrap
 msgid "Setting Up the Daemon"
 msgstr ""
@@ -450,7 +1440,8 @@ msgid "Package installation, removal, etc."
 msgstr ""
 
 #. type: section
-#: doc/guix.texi:140 doc/guix.texi:142 doc/guix.texi:1682 doc/guix.texi:2245 doc/guix.texi:2246
+#: doc/guix.texi:140 doc/guix.texi:142 doc/guix.texi:1682 doc/guix.texi:2245
+#: doc/guix.texi:2246
 #, no-wrap
 msgid "Substitutes"
 msgstr ""
@@ -582,7 +1573,8 @@ msgid "How can you trust that binary blob?"
 msgstr ""
 
 #. type: section
-#: doc/guix.texi:158 doc/guix.texi:160 doc/guix.texi:3141 doc/guix.texi:3143 doc/guix.texi:3144
+#: doc/guix.texi:158 doc/guix.texi:160 doc/guix.texi:3141 doc/guix.texi:3143
+#: doc/guix.texi:3144
 #, no-wrap
 msgid "Defining Packages"
 msgstr ""
@@ -885,7 +1877,8 @@ msgid "Real life packaging experience."
 msgstr ""
 
 #. type: section
-#: doc/guix.texi:200 doc/guix.texi:202 doc/guix.texi:8053 doc/guix.texi:8058 doc/guix.texi:8059
+#: doc/guix.texi:200 doc/guix.texi:202 doc/guix.texi:8053 doc/guix.texi:8058
+#: doc/guix.texi:8059
 #, no-wrap
 msgid "System Installation"
 msgstr ""
@@ -896,7 +1889,8 @@ msgid "Installing the whole operating system."
 msgstr ""
 
 #. type: section
-#: doc/guix.texi:200 doc/guix.texi:212 doc/guix.texi:8053 doc/guix.texi:8674 doc/guix.texi:8675
+#: doc/guix.texi:200 doc/guix.texi:212 doc/guix.texi:8053 doc/guix.texi:8674
+#: doc/guix.texi:8675
 #, no-wrap
 msgid "System Configuration"
 msgstr ""
@@ -907,7 +1901,7 @@ msgid "Configuring the operating system."
 msgstr ""
 
 #. type: section
-#: doc/guix.texi:200 doc/guix.texi:8053 doc/guix.texi:21306 doc/guix.texi:21307
+#: doc/guix.texi:200 doc/guix.texi:8053 doc/guix.texi:21351 doc/guix.texi:21352
 #, no-wrap
 msgid "Documentation"
 msgstr ""
@@ -918,7 +1912,7 @@ msgid "Browsing software user manuals."
 msgstr ""
 
 #. type: section
-#: doc/guix.texi:200 doc/guix.texi:8053 doc/guix.texi:21370 doc/guix.texi:21371
+#: doc/guix.texi:200 doc/guix.texi:8053 doc/guix.texi:21415 doc/guix.texi:21416
 #, no-wrap
 msgid "Installing Debugging Files"
 msgstr ""
@@ -929,7 +1923,7 @@ msgid "Feeding the debugger."
 msgstr ""
 
 #. type: section
-#: doc/guix.texi:200 doc/guix.texi:8053 doc/guix.texi:21436 doc/guix.texi:21437
+#: doc/guix.texi:200 doc/guix.texi:8053 doc/guix.texi:21481 doc/guix.texi:21482
 #, no-wrap
 msgid "Security Updates"
 msgstr ""
@@ -940,7 +1934,7 @@ msgid "Deploying security fixes quickly."
 msgstr ""
 
 #. type: section
-#: doc/guix.texi:200 doc/guix.texi:8053 doc/guix.texi:21556 doc/guix.texi:21557
+#: doc/guix.texi:200 doc/guix.texi:8053 doc/guix.texi:21601 doc/guix.texi:21602
 #, no-wrap
 msgid "Package Modules"
 msgstr ""
@@ -951,7 +1945,8 @@ msgid "Packages from the programmer's viewpoint."
 msgstr ""
 
 #. type: section
-#: doc/guix.texi:200 doc/guix.texi:265 doc/guix.texi:8053 doc/guix.texi:21610 doc/guix.texi:21611
+#: doc/guix.texi:200 doc/guix.texi:265 doc/guix.texi:8053 doc/guix.texi:21655
+#: doc/guix.texi:21656
 #, no-wrap
 msgid "Packaging Guidelines"
 msgstr ""
@@ -962,7 +1957,7 @@ msgid "Growing the distribution."
 msgstr ""
 
 #. type: section
-#: doc/guix.texi:200 doc/guix.texi:8053 doc/guix.texi:22061 doc/guix.texi:22062
+#: doc/guix.texi:200 doc/guix.texi:8053 doc/guix.texi:22106 doc/guix.texi:22107
 #, no-wrap
 msgid "Bootstrapping"
 msgstr ""
@@ -973,7 +1968,7 @@ msgid "GNU/Linux built from scratch."
 msgstr ""
 
 #. type: node
-#: doc/guix.texi:200 doc/guix.texi:8053 doc/guix.texi:22245
+#: doc/guix.texi:200 doc/guix.texi:8053 doc/guix.texi:22290
 #, no-wrap
 msgid "Porting"
 msgstr ""
@@ -984,7 +1979,8 @@ msgid "Targeting another platform or kernel."
 msgstr ""
 
 #. type: subsection
-#: doc/guix.texi:210 doc/guix.texi:1126 doc/guix.texi:8090 doc/guix.texi:8092 doc/guix.texi:8093
+#: doc/guix.texi:210 doc/guix.texi:1126 doc/guix.texi:8090 doc/guix.texi:8092
+#: doc/guix.texi:8093
 #, no-wrap
 msgid "Limitations"
 msgstr ""
@@ -1116,7 +2112,8 @@ msgid "Specifying user accounts."
 msgstr ""
 
 #. type: subsection
-#: doc/guix.texi:228 doc/guix.texi:1449 doc/guix.texi:8715 doc/guix.texi:9506 doc/guix.texi:9507
+#: doc/guix.texi:228 doc/guix.texi:1449 doc/guix.texi:8715 doc/guix.texi:9506
+#: doc/guix.texi:9507
 #, no-wrap
 msgid "Locales"
 msgstr ""
@@ -1127,7 +2124,8 @@ msgid "Language and cultural convention settings."
 msgstr ""
 
 #. type: subsection
-#: doc/guix.texi:228 doc/guix.texi:230 doc/guix.texi:8715 doc/guix.texi:9646 doc/guix.texi:9647
+#: doc/guix.texi:228 doc/guix.texi:230 doc/guix.texi:8715 doc/guix.texi:9646
+#: doc/guix.texi:9647
 #, no-wrap
 msgid "Services"
 msgstr ""
@@ -1138,7 +2136,7 @@ msgid "Specifying system services."
 msgstr ""
 
 #. type: subsection
-#: doc/guix.texi:228 doc/guix.texi:8715 doc/guix.texi:19675 doc/guix.texi:19676
+#: doc/guix.texi:228 doc/guix.texi:8715 doc/guix.texi:19720 doc/guix.texi:19721
 #, no-wrap
 msgid "Setuid Programs"
 msgstr ""
@@ -1149,7 +2147,8 @@ msgid "Programs running with root privileges."
 msgstr ""
 
 #. type: subsection
-#: doc/guix.texi:228 doc/guix.texi:1594 doc/guix.texi:8715 doc/guix.texi:19721 doc/guix.texi:19722
+#: doc/guix.texi:228 doc/guix.texi:1594 doc/guix.texi:8715 doc/guix.texi:19766
+#: doc/guix.texi:19767
 #, no-wrap
 msgid "X.509 Certificates"
 msgstr ""
@@ -1160,7 +2159,8 @@ msgid "Authenticating HTTPS servers."
 msgstr ""
 
 #. type: subsection
-#: doc/guix.texi:228 doc/guix.texi:1492 doc/guix.texi:8715 doc/guix.texi:19784 doc/guix.texi:19785
+#: doc/guix.texi:228 doc/guix.texi:1492 doc/guix.texi:8715 doc/guix.texi:19829
+#: doc/guix.texi:19830
 #, no-wrap
 msgid "Name Service Switch"
 msgstr ""
@@ -1171,7 +2171,7 @@ msgid "Configuring libc's name service switch."
 msgstr ""
 
 #. type: subsection
-#: doc/guix.texi:228 doc/guix.texi:8715 doc/guix.texi:19922 doc/guix.texi:19923
+#: doc/guix.texi:228 doc/guix.texi:8715 doc/guix.texi:19967 doc/guix.texi:19968
 #, no-wrap
 msgid "Initial RAM Disk"
 msgstr ""
@@ -1182,7 +2182,7 @@ msgid "Linux-Libre bootstrapping."
 msgstr ""
 
 #. type: subsection
-#: doc/guix.texi:228 doc/guix.texi:8715 doc/guix.texi:20082 doc/guix.texi:20083
+#: doc/guix.texi:228 doc/guix.texi:8715 doc/guix.texi:20127 doc/guix.texi:20128
 #, no-wrap
 msgid "Bootloader Configuration"
 msgstr ""
@@ -1193,7 +2193,7 @@ msgid "Configuring the boot loader."
 msgstr ""
 
 #. type: node
-#: doc/guix.texi:228 doc/guix.texi:8715 doc/guix.texi:20253
+#: doc/guix.texi:228 doc/guix.texi:8715 doc/guix.texi:20298
 #, no-wrap
 msgid "Invoking guix system"
 msgstr ""
@@ -1204,7 +2204,7 @@ msgid "Instantiating a system configuration."
 msgstr ""
 
 #. type: node
-#: doc/guix.texi:228 doc/guix.texi:8715 doc/guix.texi:20678
+#: doc/guix.texi:228 doc/guix.texi:8715 doc/guix.texi:20723
 #, no-wrap
 msgid "Running GuixSD in a VM"
 msgstr ""
@@ -1215,7 +2215,8 @@ msgid "How to run GuixSD in a virtual machine."
 msgstr ""
 
 #. type: subsection
-#: doc/guix.texi:228 doc/guix.texi:258 doc/guix.texi:8715 doc/guix.texi:20789 doc/guix.texi:20790
+#: doc/guix.texi:228 doc/guix.texi:258 doc/guix.texi:8715 doc/guix.texi:20834
+#: doc/guix.texi:20835
 #, no-wrap
 msgid "Defining Services"
 msgstr ""
@@ -1270,7 +2271,7 @@ msgid "Network setup, SSH daemon, etc."
 msgstr ""
 
 #. type: subsubsection
-#: doc/guix.texi:256 doc/guix.texi:9718 doc/guix.texi:11386 doc/guix.texi:11387
+#: doc/guix.texi:256 doc/guix.texi:9718 doc/guix.texi:11431 doc/guix.texi:11432
 #, no-wrap
 msgid "X Window"
 msgstr ""
@@ -1281,7 +2282,7 @@ msgid "Graphical display."
 msgstr ""
 
 #. type: subsubsection
-#: doc/guix.texi:256 doc/guix.texi:9718 doc/guix.texi:11632 doc/guix.texi:11633
+#: doc/guix.texi:256 doc/guix.texi:9718 doc/guix.texi:11677 doc/guix.texi:11678
 #, no-wrap
 msgid "Printing Services"
 msgstr ""
@@ -1292,7 +2293,7 @@ msgid "Local and remote printer support."
 msgstr ""
 
 #. type: subsubsection
-#: doc/guix.texi:256 doc/guix.texi:9718 doc/guix.texi:12469 doc/guix.texi:12470
+#: doc/guix.texi:256 doc/guix.texi:9718 doc/guix.texi:12514 doc/guix.texi:12515
 #, no-wrap
 msgid "Desktop Services"
 msgstr ""
@@ -1303,7 +2304,7 @@ msgid "D-Bus and desktop services."
 msgstr ""
 
 #. type: subsubsection
-#: doc/guix.texi:256 doc/guix.texi:9718 doc/guix.texi:12762 doc/guix.texi:12763
+#: doc/guix.texi:256 doc/guix.texi:9718 doc/guix.texi:12807 doc/guix.texi:12808
 #, no-wrap
 msgid "Database Services"
 msgstr ""
@@ -1314,7 +2315,7 @@ msgid "SQL databases, key-value stores, etc."
 msgstr ""
 
 #. type: subsubsection
-#: doc/guix.texi:256 doc/guix.texi:9718 doc/guix.texi:12886 doc/guix.texi:12887
+#: doc/guix.texi:256 doc/guix.texi:9718 doc/guix.texi:12931 doc/guix.texi:12932
 #, no-wrap
 msgid "Mail Services"
 msgstr ""
@@ -1325,7 +2326,7 @@ msgid "IMAP, POP3, SMTP, and all that."
 msgstr ""
 
 #. type: subsubsection
-#: doc/guix.texi:256 doc/guix.texi:9718 doc/guix.texi:14338 doc/guix.texi:14339
+#: doc/guix.texi:256 doc/guix.texi:9718 doc/guix.texi:14383 doc/guix.texi:14384
 #, no-wrap
 msgid "Messaging Services"
 msgstr ""
@@ -1336,7 +2337,7 @@ msgid "Messaging services."
 msgstr ""
 
 #. type: subsubsection
-#: doc/guix.texi:256 doc/guix.texi:9718 doc/guix.texi:14806 doc/guix.texi:14807
+#: doc/guix.texi:256 doc/guix.texi:9718 doc/guix.texi:14851 doc/guix.texi:14852
 #, no-wrap
 msgid "Telephony Services"
 msgstr ""
@@ -1347,7 +2348,7 @@ msgid "Telephony services."
 msgstr ""
 
 #. type: subsubsection
-#: doc/guix.texi:256 doc/guix.texi:9718 doc/guix.texi:15011 doc/guix.texi:15012
+#: doc/guix.texi:256 doc/guix.texi:9718 doc/guix.texi:15056 doc/guix.texi:15057
 #, no-wrap
 msgid "Monitoring Services"
 msgstr ""
@@ -1358,7 +2359,7 @@ msgid "Monitoring services."
 msgstr ""
 
 #. type: subsubsection
-#: doc/guix.texi:256 doc/guix.texi:9718 doc/guix.texi:15164 doc/guix.texi:15165
+#: doc/guix.texi:256 doc/guix.texi:9718 doc/guix.texi:15209 doc/guix.texi:15210
 #, no-wrap
 msgid "Kerberos Services"
 msgstr ""
@@ -1369,7 +2370,7 @@ msgid "Kerberos services."
 msgstr ""
 
 #. type: subsubsection
-#: doc/guix.texi:256 doc/guix.texi:9718 doc/guix.texi:15290 doc/guix.texi:15291
+#: doc/guix.texi:256 doc/guix.texi:9718 doc/guix.texi:15335 doc/guix.texi:15336
 #, no-wrap
 msgid "Web Services"
 msgstr ""
@@ -1380,7 +2381,7 @@ msgid "Web servers."
 msgstr ""
 
 #. type: subsubsection
-#: doc/guix.texi:256 doc/guix.texi:9718 doc/guix.texi:15899 doc/guix.texi:15900
+#: doc/guix.texi:256 doc/guix.texi:9718 doc/guix.texi:15944 doc/guix.texi:15945
 #, no-wrap
 msgid "Certificate Services"
 msgstr ""
@@ -1391,7 +2392,7 @@ msgid "TLS certificates via Let's Encrypt."
 msgstr ""
 
 #. type: subsubsection
-#: doc/guix.texi:256 doc/guix.texi:9718 doc/guix.texi:16045 doc/guix.texi:16046
+#: doc/guix.texi:256 doc/guix.texi:9718 doc/guix.texi:16090 doc/guix.texi:16091
 #, no-wrap
 msgid "DNS Services"
 msgstr ""
@@ -1402,7 +2403,7 @@ msgid "DNS daemons."
 msgstr ""
 
 #. type: subsubsection
-#: doc/guix.texi:256 doc/guix.texi:9718 doc/guix.texi:16449 doc/guix.texi:16450
+#: doc/guix.texi:256 doc/guix.texi:9718 doc/guix.texi:16494 doc/guix.texi:16495
 #, no-wrap
 msgid "VPN Services"
 msgstr ""
@@ -1413,7 +2414,7 @@ msgid "VPN daemons."
 msgstr ""
 
 #. type: subsubsection
-#: doc/guix.texi:256 doc/guix.texi:9718 doc/guix.texi:16807 doc/guix.texi:16808
+#: doc/guix.texi:256 doc/guix.texi:9718 doc/guix.texi:16852 doc/guix.texi:16853
 #, no-wrap
 msgid "Network File System"
 msgstr ""
@@ -1424,7 +2425,7 @@ msgid "NFS related services."
 msgstr ""
 
 #. type: subsubsection
-#: doc/guix.texi:256 doc/guix.texi:9718 doc/guix.texi:16922 doc/guix.texi:16923
+#: doc/guix.texi:256 doc/guix.texi:9718 doc/guix.texi:16967 doc/guix.texi:16968
 #, no-wrap
 msgid "Continuous Integration"
 msgstr ""
@@ -1435,7 +2436,7 @@ msgid "The Cuirass service."
 msgstr ""
 
 #. type: subsubsection
-#: doc/guix.texi:256 doc/guix.texi:9718 doc/guix.texi:17018 doc/guix.texi:17019
+#: doc/guix.texi:256 doc/guix.texi:9718 doc/guix.texi:17063 doc/guix.texi:17064
 #, no-wrap
 msgid "Power management Services"
 msgstr ""
@@ -1446,7 +2447,7 @@ msgid "The TLP tool."
 msgstr ""
 
 #. type: subsubsection
-#: doc/guix.texi:256 doc/guix.texi:9718 doc/guix.texi:17546 doc/guix.texi:17547
+#: doc/guix.texi:256 doc/guix.texi:9718 doc/guix.texi:17591 doc/guix.texi:17592
 #, no-wrap
 msgid "Audio Services"
 msgstr ""
@@ -1457,7 +2458,7 @@ msgid "The MPD."
 msgstr ""
 
 #. type: node
-#: doc/guix.texi:256 doc/guix.texi:9718 doc/guix.texi:17596
+#: doc/guix.texi:256 doc/guix.texi:9718 doc/guix.texi:17641
 #, no-wrap
 msgid "Virtualization Services"
 msgstr ""
@@ -1468,7 +2469,7 @@ msgid "Virtualization services."
 msgstr ""
 
 #. type: subsubsection
-#: doc/guix.texi:256 doc/guix.texi:9718 doc/guix.texi:18389 doc/guix.texi:18390
+#: doc/guix.texi:256 doc/guix.texi:9718 doc/guix.texi:18434 doc/guix.texi:18435
 #, no-wrap
 msgid "Version Control Services"
 msgstr ""
@@ -1479,7 +2480,7 @@ msgid "Providing remote access to Git repositories."
 msgstr ""
 
 #. type: subsubsection
-#: doc/guix.texi:256 doc/guix.texi:9718 doc/guix.texi:19483 doc/guix.texi:19484
+#: doc/guix.texi:256 doc/guix.texi:9718 doc/guix.texi:19528 doc/guix.texi:19529
 #, no-wrap
 msgid "Game Services"
 msgstr ""
@@ -1490,7 +2491,7 @@ msgid "Game servers."
 msgstr ""
 
 #. type: subsubsection
-#: doc/guix.texi:256 doc/guix.texi:9718 doc/guix.texi:19514 doc/guix.texi:19515
+#: doc/guix.texi:256 doc/guix.texi:9718 doc/guix.texi:19559 doc/guix.texi:19560
 #, no-wrap
 msgid "Miscellaneous Services"
 msgstr ""
@@ -1501,227 +2502,149 @@ msgid "Other services."
 msgstr ""
 
 #. type: subsubsection
-#: doc/guix.texi:263 doc/guix.texi:20801 doc/guix.texi:20803 doc/guix.texi:20804
+#: doc/guix.texi:263 doc/guix.texi:20846 doc/guix.texi:20848
+#: doc/guix.texi:20849
 #, no-wrap
 msgid "Service Composition"
 msgstr ""
 
 #. type: menuentry
-#: doc/guix.texi:263 doc/guix.texi:20801
+#: doc/guix.texi:263 doc/guix.texi:20846
 msgid "The model for composing services."
 msgstr ""
 
 #. type: subsubsection
-#: doc/guix.texi:263 doc/guix.texi:20801 doc/guix.texi:20859 doc/guix.texi:20860
+#: doc/guix.texi:263 doc/guix.texi:20846 doc/guix.texi:20904
+#: doc/guix.texi:20905
 #, no-wrap
 msgid "Service Types and Services"
 msgstr ""
 
 #. type: menuentry
-#: doc/guix.texi:263 doc/guix.texi:20801
+#: doc/guix.texi:263 doc/guix.texi:20846
 msgid "Types and services."
 msgstr ""
 
 #. type: subsubsection
-#: doc/guix.texi:263 doc/guix.texi:20801 doc/guix.texi:20996 doc/guix.texi:20997
+#: doc/guix.texi:263 doc/guix.texi:20846 doc/guix.texi:21041
+#: doc/guix.texi:21042
 #, no-wrap
 msgid "Service Reference"
 msgstr ""
 
 #. type: menuentry
-#: doc/guix.texi:263 doc/guix.texi:20801
+#: doc/guix.texi:263 doc/guix.texi:20846
 msgid "API reference."
 msgstr ""
 
 #. type: subsubsection
-#: doc/guix.texi:263 doc/guix.texi:20801 doc/guix.texi:21221 doc/guix.texi:21222
+#: doc/guix.texi:263 doc/guix.texi:20846 doc/guix.texi:21266
+#: doc/guix.texi:21267
 #, no-wrap
 msgid "Shepherd Services"
 msgstr ""
 
 #. type: menuentry
-#: doc/guix.texi:263 doc/guix.texi:20801
+#: doc/guix.texi:263 doc/guix.texi:20846
 msgid "A particular type of service."
 msgstr ""
 
 #. type: subsection
-#: doc/guix.texi:274 doc/guix.texi:21685 doc/guix.texi:21687 doc/guix.texi:21688
+#: doc/guix.texi:274 doc/guix.texi:21730 doc/guix.texi:21732
+#: doc/guix.texi:21733
 #, no-wrap
 msgid "Software Freedom"
 msgstr ""
 
 #. type: menuentry
-#: doc/guix.texi:274 doc/guix.texi:21685
+#: doc/guix.texi:274 doc/guix.texi:21730
 msgid "What may go into the distribution."
 msgstr ""
 
 #. type: subsection
-#: doc/guix.texi:274 doc/guix.texi:21685 doc/guix.texi:21715 doc/guix.texi:21716
+#: doc/guix.texi:274 doc/guix.texi:21730 doc/guix.texi:21760
+#: doc/guix.texi:21761
 #, no-wrap
 msgid "Package Naming"
 msgstr ""
 
 #. type: menuentry
-#: doc/guix.texi:274 doc/guix.texi:21685
+#: doc/guix.texi:274 doc/guix.texi:21730
 msgid "What's in a name?"
 msgstr ""
 
 #. type: subsection
-#: doc/guix.texi:274 doc/guix.texi:21685 doc/guix.texi:21740 doc/guix.texi:21741
+#: doc/guix.texi:274 doc/guix.texi:21730 doc/guix.texi:21785
+#: doc/guix.texi:21786
 #, no-wrap
 msgid "Version Numbers"
 msgstr ""
 
 #. type: menuentry
-#: doc/guix.texi:274 doc/guix.texi:21685
+#: doc/guix.texi:274 doc/guix.texi:21730
 msgid "When the name is not enough."
 msgstr ""
 
 #. type: subsection
-#: doc/guix.texi:274 doc/guix.texi:21685 doc/guix.texi:21831 doc/guix.texi:21832
+#: doc/guix.texi:274 doc/guix.texi:21730 doc/guix.texi:21876
+#: doc/guix.texi:21877
 #, no-wrap
 msgid "Synopses and Descriptions"
 msgstr ""
 
 #. type: menuentry
-#: doc/guix.texi:274 doc/guix.texi:21685
+#: doc/guix.texi:274 doc/guix.texi:21730
 msgid "Helping users find the right package."
 msgstr ""
 
 #. type: subsection
-#: doc/guix.texi:274 doc/guix.texi:21685 doc/guix.texi:21911 doc/guix.texi:21912
+#: doc/guix.texi:274 doc/guix.texi:21730 doc/guix.texi:21956
+#: doc/guix.texi:21957
 #, no-wrap
 msgid "Python Modules"
 msgstr ""
 
 #. type: menuentry
-#: doc/guix.texi:274 doc/guix.texi:21685
+#: doc/guix.texi:274 doc/guix.texi:21730
 msgid "A touch of British comedy."
 msgstr ""
 
 #. type: subsection
-#: doc/guix.texi:274 doc/guix.texi:21685 doc/guix.texi:21986 doc/guix.texi:21987
+#: doc/guix.texi:274 doc/guix.texi:21730 doc/guix.texi:22031
+#: doc/guix.texi:22032
 #, no-wrap
 msgid "Perl Modules"
 msgstr ""
 
 #. type: menuentry
-#: doc/guix.texi:274 doc/guix.texi:21685
+#: doc/guix.texi:274 doc/guix.texi:21730
 msgid "Little pearls."
 msgstr ""
 
 #. type: subsection
-#: doc/guix.texi:274 doc/guix.texi:21685 doc/guix.texi:22002 doc/guix.texi:22003
+#: doc/guix.texi:274 doc/guix.texi:21730 doc/guix.texi:22047
+#: doc/guix.texi:22048
 #, no-wrap
 msgid "Java Packages"
 msgstr ""
 
 #. type: menuentry
-#: doc/guix.texi:274 doc/guix.texi:21685
+#: doc/guix.texi:274 doc/guix.texi:21730
 msgid "Coffee break."
 msgstr ""
 
 #. type: subsection
-#: doc/guix.texi:274 doc/guix.texi:21685 doc/guix.texi:22022 doc/guix.texi:22023
+#: doc/guix.texi:274 doc/guix.texi:21730 doc/guix.texi:22067
+#: doc/guix.texi:22068
 #, no-wrap
 msgid "Fonts"
 msgstr ""
 
 #. type: menuentry
-#: doc/guix.texi:274 doc/guix.texi:21685
+#: doc/guix.texi:274 doc/guix.texi:21730
 msgid "Fond of fonts."
 msgstr ""
 
-#. type: menuentry
-#: doc/guix.texi:282
-msgid "Building from Git"
-msgstr ""
-
-#. type: menuentry
-#: doc/guix.texi:282
-msgid "The latest and greatest."
-msgstr ""
-
-#. type: menuentry
-#: doc/guix.texi:282
-msgid "Running Guix Before It Is Installed"
-msgstr ""
-
-#. type: menuentry
-#: doc/guix.texi:282
-msgid "Hacker tricks."
-msgstr ""
-
-#. type: menuentry
-#: doc/guix.texi:282
-msgid "The Perfect Setup"
-msgstr ""
-
-#. type: menuentry
-#: doc/guix.texi:282
-msgid "The right tools."
-msgstr ""
-
-#. type: menuentry
-#: doc/guix.texi:282 doc/guix.texi:284
-msgid "Coding Style"
-msgstr ""
-
-#. type: menuentry
-#: doc/guix.texi:282
-msgid "Hygiene of the contributor."
-msgstr ""
-
-#. type: menuentry
-#: doc/guix.texi:282
-msgid "Submitting Patches"
-msgstr ""
-
-#. type: menuentry
-#: doc/guix.texi:282
-msgid "Share your work."
-msgstr ""
-
-#. type: menuentry
-#: doc/guix.texi:289
-msgid "Programming Paradigm"
-msgstr ""
-
-#. type: menuentry
-#: doc/guix.texi:289
-msgid "How to compose your elements."
-msgstr ""
-
-#. type: menuentry
-#: doc/guix.texi:289
-msgid "Modules"
-msgstr ""
-
-#. type: menuentry
-#: doc/guix.texi:289
-msgid "Where to store your code?"
-msgstr ""
-
-#. type: menuentry
-#: doc/guix.texi:289
-msgid "Data Types and Pattern Matching"
-msgstr ""
-
-#. type: menuentry
-#: doc/guix.texi:289
-msgid "Implementing data structures."
-msgstr ""
-
-#. type: menuentry
-#: doc/guix.texi:289
-msgid "Formatting Code"
-msgstr ""
-
-#. type: menuentry
-#: doc/guix.texi:289
-msgid "Writing conventions."
-msgstr ""
-
 #. type: cindex
 #: doc/guix.texi:297
 #, no-wrap
@@ -1774,7 +2697,7 @@ msgid "extensibility of the distribution"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:316 doc/guix.texi:21578
+#: doc/guix.texi:316 doc/guix.texi:21623
 #, no-wrap
 msgid "customization, of packages"
 msgstr ""
@@ -1875,10 +2798,9 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:375
 msgid ""
-"GNU Guix is available for download from its website at "
-"@url{http://www.gnu.org/software/guix/}.  This section describes the "
-"software requirements of Guix, as well as how to install it and get ready to "
-"use it."
+"GNU Guix is available for download from its website at @url{http://www.gnu."
+"org/software/guix/}.  This section describes the software requirements of "
+"Guix, as well as how to install it and get ready to use it."
 msgstr ""
 
 #. type: Plain text
@@ -1901,9 +2823,9 @@ msgstr ""
 msgid ""
 "When installed on a running GNU/Linux system---thereafter called a "
 "@dfn{foreign distro}---GNU@tie{}Guix complements the available tools without "
-"interference.  Its data lives exclusively in two directories, usually "
-"@file{/gnu/store} and @file{/var/guix}; other files on your system, such as "
-"@file{/etc}, are left untouched."
+"interference.  Its data lives exclusively in two directories, usually @file{/"
+"gnu/store} and @file{/var/guix}; other files on your system, such as @file{/"
+"etc}, are left untouched."
 msgstr ""
 
 #. type: Plain text
@@ -1925,17 +2847,17 @@ msgid ""
 "This section describes how to install Guix on an arbitrary system from a "
 "self-contained tarball providing binaries for Guix and for all its "
 "dependencies.  This is often quicker than installing from source, which is "
-"described in the next sections.  The only requirement is to have "
-"GNU@tie{}tar and Xz."
+"described in the next sections.  The only requirement is to have GNU@tie{}"
+"tar and Xz."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:414
 msgid ""
-"We provide a "
-"@uref{https://git.savannah.gnu.org/cgit/guix.git/plain/etc/guix-install.sh, "
-"shell installer script}, which automates the download, installation, and "
-"initial configuration of Guix.  It should be run as the root user."
+"We provide a @uref{https://git.savannah.gnu.org/cgit/guix.git/plain/etc/guix-"
+"install.sh, shell installer script}, which automates the download, "
+"installation, and initial configuration of Guix.  It should be run as the "
+"root user."
 msgstr ""
 
 #. type: Plain text
@@ -1952,10 +2874,10 @@ msgstr ""
 #. type: enumerate
 #: doc/guix.texi:424
 msgid ""
-"Download the binary tarball from "
-"@indicateurl{ftp://alpha.gnu.org/gnu/guix/guix-binary-@value{VERSION}.@var{system}.tar.xz}, "
-"where @var{system} is @code{x86_64-linux} for an @code{x86_64} machine "
-"already running the kernel Linux, and so on."
+"Download the binary tarball from @indicateurl{ftp://alpha.gnu.org/gnu/guix/"
+"guix-binary-@value{VERSION}.@var{system}.tar.xz}, where @var{system} is "
+"@code{x86_64-linux} for an @code{x86_64} machine already running the kernel "
+"Linux, and so on."
 msgstr ""
 
 #. type: enumerate
@@ -1969,8 +2891,7 @@ msgstr ""
 #: doc/guix.texi:432
 #, no-wrap
 msgid ""
-"$ wget "
-"ftp://alpha.gnu.org/gnu/guix/guix-binary-@value{VERSION}.@var{system}.tar.xz.sig\n"
+"$ wget ftp://alpha.gnu.org/gnu/guix/guix-binary-@value{VERSION}.@var{system}.tar.xz.sig\n"
 "$ gpg --verify guix-binary-@value{VERSION}.@var{system}.tar.xz.sig\n"
 msgstr ""
 
@@ -2175,9 +3096,7 @@ msgstr ""
 #. type: example
 #: doc/guix.texi:558
 #, no-wrap
-msgid ""
-"# guix archive --authorize < "
-"~root/.guix-profile/share/guix/hydra.gnu.org.pub\n"
+msgid "# guix archive --authorize < ~root/.guix-profile/share/guix/hydra.gnu.org.pub\n"
 msgstr ""
 
 #. type: enumerate
@@ -2320,9 +3239,8 @@ msgstr ""
 #: doc/guix.texi:638
 msgid ""
 "Support for build offloading (@pxref{Daemon Offload Setup}) and "
-"@command{guix copy} (@pxref{Invoking guix copy}) depends on "
-"@uref{https://github.com/artyom-poptsov/guile-ssh, Guile-SSH}, version "
-"0.10.2 or later."
+"@command{guix copy} (@pxref{Invoking guix copy}) depends on @uref{https://"
+"github.com/artyom-poptsov/guile-ssh, Guile-SSH}, version 0.10.2 or later."
 msgstr ""
 
 #. type: itemize
@@ -2384,9 +3302,8 @@ msgstr ""
 #: doc/guix.texi:667
 msgid ""
 "When a working installation of @url{http://nixos.org/nix/, the Nix package "
-"manager} is available, you can instead configure Guix with "
-"@code{--disable-daemon}.  In that case, Nix replaces the three dependencies "
-"above."
+"manager} is available, you can instead configure Guix with @code{--disable-"
+"daemon}.  In that case, Nix replaces the three dependencies above."
 msgstr ""
 
 #. type: Plain text
@@ -2397,9 +3314,9 @@ msgid ""
 "@code{--with-store-dir} value, but also the same @code{--localstatedir} "
 "value.  The latter is essential because it specifies where the database that "
 "stores metadata about the store is located, among other things.  The default "
-"values for Nix are @code{--with-store-dir=/nix/store} and "
-"@code{--localstatedir=/nix/var}.  Note that @code{--disable-daemon} is not "
-"required if your goal is to share the store with Nix."
+"values for Nix are @code{--with-store-dir=/nix/store} and @code{--"
+"localstatedir=/nix/var}.  Note that @code{--disable-daemon} is not required "
+"if your goal is to share the store with Nix."
 msgstr ""
 
 #. type: cindex
@@ -2426,10 +3343,10 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:697
 msgid ""
-"Test cases can run in parallel: you can use the @code{-j} option of "
-"GNU@tie{}make to speed things up.  The first run may take a few minutes on a "
-"recent machine; subsequent runs will be faster because the store that is "
-"created for test purposes will already have various things in cache."
+"Test cases can run in parallel: you can use the @code{-j} option of GNU@tie{}"
+"make to speed things up.  The first run may take a few minutes on a recent "
+"machine; subsequent runs will be faster because the store that is created "
+"for test purposes will already have various things in cache."
 msgstr ""
 
 #. type: Plain text
@@ -2546,9 +3463,9 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:776
 msgid ""
-"In a standard multi-user setup, Guix and its daemon---the "
-"@command{guix-daemon} program---are installed by the system administrator; "
-"@file{/gnu/store} is owned by @code{root} and @command{guix-daemon} runs as "
+"In a standard multi-user setup, Guix and its daemon---the @command{guix-"
+"daemon} program---are installed by the system administrator; @file{/gnu/"
+"store} is owned by @code{root} and @command{guix-daemon} runs as "
 "@code{root}.  Unprivileged users may use Guix tools to build packages or "
 "otherwise access the store, and the daemon will do it on their behalf, "
 "ensuring that the store is kept in a consistent state, and allowing built "
@@ -2739,17 +3656,17 @@ msgstr ""
 #: doc/guix.texi:900
 msgid ""
 "When desired, the build daemon can @dfn{offload} derivation builds to other "
-"machines running Guix, using the @code{offload} @dfn{build "
-"hook}@footnote{This feature is available only when "
-"@uref{https://github.com/artyom-poptsov/guile-ssh, Guile-SSH} is present.}.  "
-"When that feature is enabled, a list of user-specified build machines is "
-"read from @file{/etc/guix/machines.scm}; every time a build is requested, "
-"for instance via @code{guix build}, the daemon attempts to offload it to one "
-"of the machines that satisfy the constraints of the derivation, in "
-"particular its system type---e.g., @file{x86_64-linux}.  Missing "
-"prerequisites for the build are copied over SSH to the target machine, which "
-"then proceeds with the build; upon success the output(s) of the build are "
-"copied back to the initial machine."
+"machines running Guix, using the @code{offload} @dfn{build hook}"
+"@footnote{This feature is available only when @uref{https://github.com/"
+"artyom-poptsov/guile-ssh, Guile-SSH} is present.}.  When that feature is "
+"enabled, a list of user-specified build machines is read from @file{/etc/"
+"guix/machines.scm}; every time a build is requested, for instance via "
+"@code{guix build}, the daemon attempts to offload it to one of the machines "
+"that satisfy the constraints of the derivation, in particular its system "
+"type---e.g., @file{x86_64-linux}.  Missing prerequisites for the build are "
+"copied over SSH to the target machine, which then proceeds with the build; "
+"upon success the output(s) of the build are copied back to the initial "
+"machine."
 msgstr ""
 
 #. type: Plain text
@@ -2817,7 +3734,11 @@ msgid ""
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:941 doc/guix.texi:3402 doc/guix.texi:9406 doc/guix.texi:9470 doc/guix.texi:9565 doc/guix.texi:10955 doc/guix.texi:14992 doc/guix.texi:15225 doc/guix.texi:15358 doc/guix.texi:15632 doc/guix.texi:15673 doc/guix.texi:19618 doc/guix.texi:19635 doc/guix.texi:19901 doc/guix.texi:21109
+#: doc/guix.texi:941 doc/guix.texi:3402 doc/guix.texi:9406 doc/guix.texi:9470
+#: doc/guix.texi:9565 doc/guix.texi:11000 doc/guix.texi:15037
+#: doc/guix.texi:15270 doc/guix.texi:15403 doc/guix.texi:15677
+#: doc/guix.texi:15718 doc/guix.texi:19663 doc/guix.texi:19680
+#: doc/guix.texi:19946 doc/guix.texi:21154
 #, no-wrap
 msgid "name"
 msgstr ""
@@ -2839,7 +3760,7 @@ msgid "The system type of the remote machine---e.g., @code{\"x86_64-linux\"}."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:947 doc/guix.texi:10965
+#: doc/guix.texi:947 doc/guix.texi:11010
 #, no-wrap
 msgid "user"
 msgstr ""
@@ -3053,7 +3974,8 @@ msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:1047
-msgid "Likewise, the master machine must authorize the key of each build machine."
+msgid ""
+"Likewise, the master machine must authorize the key of each build machine."
 msgstr ""
 
 #. type: Plain text
@@ -3265,27 +4187,26 @@ msgstr ""
 #. type: enumerate
 #: doc/guix.texi:1166
 msgid ""
-"Currently all files with a name matching the regular expression "
-"@code{/gnu/store/.+-(guix-.+|profile)/bin/guix-daemon} are assigned the "
-"label @code{guix_daemon_exec_t}; this means that @emph{any} file with that "
-"name in any profile would be permitted to run in the @code{guix_daemon_t} "
-"domain.  This is not ideal.  An attacker could build a package that provides "
-"this executable and convince a user to install and run it, which lifts it "
-"into the @code{guix_daemon_t} domain.  At that point SELinux could not "
-"prevent it from accessing files that are allowed for processes in that "
-"domain."
+"Currently all files with a name matching the regular expression @code{/gnu/"
+"store/.+-(guix-.+|profile)/bin/guix-daemon} are assigned the label "
+"@code{guix_daemon_exec_t}; this means that @emph{any} file with that name in "
+"any profile would be permitted to run in the @code{guix_daemon_t} domain.  "
+"This is not ideal.  An attacker could build a package that provides this "
+"executable and convince a user to install and run it, which lifts it into "
+"the @code{guix_daemon_t} domain.  At that point SELinux could not prevent it "
+"from accessing files that are allowed for processes in that domain."
 msgstr ""
 
 #. type: enumerate
 #: doc/guix.texi:1174
 msgid ""
 "We could generate a much more restrictive policy at installation time, so "
-"that only the @emph{exact} file name of the currently installed "
-"@code{guix-daemon} executable would be labelled with "
-"@code{guix_daemon_exec_t}, instead of using a broad regular expression.  The "
-"downside is that root would have to install or upgrade the policy at "
-"installation time whenever the Guix package that provides the effectively "
-"running @code{guix-daemon} executable is upgraded."
+"that only the @emph{exact} file name of the currently installed @code{guix-"
+"daemon} executable would be labelled with @code{guix_daemon_exec_t}, instead "
+"of using a broad regular expression.  The downside is that root would have "
+"to install or upgrade the policy at installation time whenever the Guix "
+"package that provides the effectively running @code{guix-daemon} executable "
+"is upgraded."
 msgstr ""
 
 #. type: section
@@ -3344,8 +4265,7 @@ msgid ""
 "container for the duration of the build.  Be aware that using a directory "
 "other than @file{/tmp} can affect build results---for example, with a longer "
 "directory name, a build process that uses Unix-domain sockets might hit the "
-"name length limitation for @code{sun_path}, which it would otherwise not "
-"hit."
+"name length limitation for @code{sun_path}, which it would otherwise not hit."
 msgstr ""
 
 #. type: Plain text
@@ -3403,7 +4323,8 @@ msgid ""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:1237 doc/guix.texi:5485 doc/guix.texi:6897 doc/guix.texi:7773 doc/guix.texi:7961
+#: doc/guix.texi:1237 doc/guix.texi:5485 doc/guix.texi:6897 doc/guix.texi:7773
+#: doc/guix.texi:7961
 #, no-wrap
 msgid "--substitute-urls=@var{urls}"
 msgstr ""
@@ -3417,9 +4338,9 @@ msgstr ""
 #: doc/guix.texi:1243
 msgid ""
 "Consider @var{urls} the default whitespace-separated list of substitute "
-"source URLs.  When this option is omitted, "
-"@indicateurl{https://mirror.hydra.gnu.org https://hydra.gnu.org} is used "
-"(@code{mirror.hydra.gnu.org} is a mirror of @code{hydra.gnu.org})."
+"source URLs.  When this option is omitted, @indicateurl{https://mirror.hydra."
+"gnu.org https://hydra.gnu.org} is used (@code{mirror.hydra.gnu.org} is a "
+"mirror of @code{hydra.gnu.org})."
 msgstr ""
 
 #. type: table
@@ -3463,8 +4384,8 @@ msgstr ""
 #: doc/guix.texi:1262
 msgid ""
 "When this option is used, @command{guix gc --list-failures} can be used to "
-"query the set of store items marked as failed; @command{guix gc "
-"--clear-failures} removes store items from the set of cached failures.  "
+"query the set of store items marked as failed; @command{guix gc --clear-"
+"failures} removes store items from the set of cached failures.  "
 "@xref{Invoking guix gc}."
 msgstr ""
 
@@ -3499,8 +4420,8 @@ msgstr ""
 #: doc/guix.texi:1275
 msgid ""
 "The effect is to define the @code{NIX_BUILD_CORES} environment variable in "
-"the build process, which can then use it to exploit internal "
-"parallelism---for instance, by running @code{make -j$NIX_BUILD_CORES}."
+"the build process, which can then use it to exploit internal parallelism---"
+"for instance, by running @code{make -j$NIX_BUILD_CORES}."
 msgstr ""
 
 #. type: item
@@ -3695,8 +4616,8 @@ msgid ""
 "By default, files added to the store are automatically ``deduplicated'': if "
 "a newly added file is identical to another one found in the store, the "
 "daemon makes the new file a hard link to the other file.  This can "
-"noticeably reduce disk usage, at the expense of slightly increased "
-"input/output load at the end of a build process.  This option disables this "
+"noticeably reduce disk usage, at the expense of slightly increased input/"
+"output load at the end of a build process.  This option disables this "
 "optimization."
 msgstr ""
 
@@ -3750,21 +4671,20 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:1373
 msgid ""
-"When set to ``yes'', as is the case by default, the GC keeps "
-"derivations---i.e., @code{.drv} files---as long as at least one of their "
-"outputs is live.  This allows users to keep track of the origins of items in "
-"their store.  Setting it to ``no'' saves a bit of disk space."
+"When set to ``yes'', as is the case by default, the GC keeps derivations---i."
+"e., @code{.drv} files---as long as at least one of their outputs is live.  "
+"This allows users to keep track of the origins of items in their store.  "
+"Setting it to ``no'' saves a bit of disk space."
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:1380
 msgid ""
-"Note that when both @code{--gc-keep-derivations} and "
-"@code{--gc-keep-outputs} are used, the effect is to keep all the build "
-"prerequisites (the sources, compiler, libraries, and other build-time tools) "
-"of live objects in the store, regardless of whether these prerequisites are "
-"live.  This is convenient for developers since it saves rebuilds or "
-"downloads."
+"Note that when both @code{--gc-keep-derivations} and @code{--gc-keep-"
+"outputs} are used, the effect is to keep all the build prerequisites (the "
+"sources, compiler, libraries, and other build-time tools) of live objects in "
+"the store, regardless of whether these prerequisites are live.  This is "
+"convenient for developers since it saves rebuilds or downloads."
 msgstr ""
 
 #. type: item
@@ -3801,7 +4721,9 @@ msgid ""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:1392 doc/guix.texi:2890 doc/guix.texi:5783 doc/guix.texi:6924 doc/guix.texi:7332 doc/guix.texi:7966 doc/guix.texi:20003 doc/guix.texi:20547
+#: doc/guix.texi:1392 doc/guix.texi:2890 doc/guix.texi:5783 doc/guix.texi:6924
+#: doc/guix.texi:7332 doc/guix.texi:7966 doc/guix.texi:20048
+#: doc/guix.texi:20592
 #, no-wrap
 msgid "--system=@var{system}"
 msgstr ""
@@ -3810,8 +4732,8 @@ msgstr ""
 #: doc/guix.texi:1396
 msgid ""
 "Assume @var{system} as the current system type.  By default it is the "
-"architecture/kernel pair found at configure time, such as "
-"@code{x86_64-linux}."
+"architecture/kernel pair found at configure time, such as @code{x86_64-"
+"linux}."
 msgstr ""
 
 #. type: item
@@ -3895,15 +4817,19 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:1426
 msgid ""
-"This option can be repeated multiple times, in which case "
-"@command{guix-daemon} accepts connections on all the specified endpoints.  "
-"Users can tell client commands what endpoint to connect to by setting the "
+"This option can be repeated multiple times, in which case @command{guix-"
+"daemon} accepts connections on all the specified endpoints.  Users can tell "
+"client commands what endpoint to connect to by setting the "
 "@code{GUIX_DAEMON_SOCKET} environment variable (@pxref{The Store, "
 "@code{GUIX_DAEMON_SOCKET}})."
 msgstr ""
 
 #. type: quotation
-#: doc/guix.texi:1427 doc/guix.texi:2325 doc/guix.texi:2789 doc/guix.texi:2952 doc/guix.texi:4205 doc/guix.texi:4273 doc/guix.texi:5788 doc/guix.texi:7224 doc/guix.texi:7851 doc/guix.texi:8069 doc/guix.texi:8280 doc/guix.texi:11446 doc/guix.texi:20330 doc/guix.texi:20528 doc/guix.texi:20615 doc/guix.texi:21459
+#: doc/guix.texi:1427 doc/guix.texi:2325 doc/guix.texi:2789 doc/guix.texi:2952
+#: doc/guix.texi:4205 doc/guix.texi:4273 doc/guix.texi:5788 doc/guix.texi:7224
+#: doc/guix.texi:7851 doc/guix.texi:8069 doc/guix.texi:8280 doc/guix.texi:11491
+#: doc/guix.texi:20375 doc/guix.texi:20573 doc/guix.texi:20660
+#: doc/guix.texi:21504
 #, no-wrap
 msgid "Note"
 msgstr ""
@@ -3922,15 +4848,15 @@ msgstr ""
 #: doc/guix.texi:1438
 msgid ""
 "When @code{--listen} is omitted, @command{guix-daemon} listens for "
-"connections on the Unix-domain socket located at "
-"@file{@var{localstatedir}/guix/daemon-socket/socket}."
+"connections on the Unix-domain socket located at @file{@var{localstatedir}/"
+"guix/daemon-socket/socket}."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:1448
 msgid ""
-"When using Guix on top of GNU/Linux distribution other than GuixSD---a "
-"so-called @dfn{foreign distro}---a few additional steps are needed to get "
+"When using Guix on top of GNU/Linux distribution other than GuixSD---a so-"
+"called @dfn{foreign distro}---a few additional steps are needed to get "
 "everything in place.  Here are some of them."
 msgstr ""
 
@@ -4086,9 +5012,9 @@ msgid ""
 "lookup implementations: for example, the @code{nss-mdns} plugin allow "
 "resolution of @code{.local} host names, the @code{nis} plugin allows user "
 "account lookup using the Network information service (NIS), and so on.  "
-"These extra ``lookup services'' are configured system-wide in "
-"@file{/etc/nsswitch.conf}, and all the programs running on the system honor "
-"those settings (@pxref{NSS Configuration File,,, libc, The GNU C Reference "
+"These extra ``lookup services'' are configured system-wide in @file{/etc/"
+"nsswitch.conf}, and all the programs running on the system honor those "
+"settings (@pxref{NSS Configuration File,,, libc, The GNU C Reference "
 "Manual})."
 msgstr ""
 
@@ -4129,7 +5055,7 @@ msgid "X11 Fonts"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:1544 doc/guix.texi:22025
+#: doc/guix.texi:1544 doc/guix.texi:22070
 #, no-wrap
 msgid "fonts"
 msgstr ""
@@ -4149,11 +5075,10 @@ msgstr ""
 #: doc/guix.texi:1559
 msgid ""
 "To display text written in Chinese languages, Japanese, or Korean in "
-"graphical applications, consider installing "
-"@code{font-adobe-source-han-sans} or @code{font-wqy-zenhei}.  The former has "
-"multiple outputs, one per language family (@pxref{Packages with Multiple "
-"Outputs}).  For instance, the following command installs fonts for Chinese "
-"languages:"
+"graphical applications, consider installing @code{font-adobe-source-han-"
+"sans} or @code{font-wqy-zenhei}.  The former has multiple outputs, one per "
+"language family (@pxref{Packages with Multiple Outputs}).  For instance, the "
+"following command installs fonts for Chinese languages:"
 msgstr ""
 
 #. type: example
@@ -4192,9 +5117,7 @@ msgstr ""
 #. type: example
 #: doc/guix.texi:1580
 #, no-wrap
-msgid ""
-"xset +fp $(dirname $(readlink -f "
-"~/.guix-profile/share/fonts/truetype/fonts.dir))\n"
+msgid "xset +fp $(dirname $(readlink -f ~/.guix-profile/share/fonts/truetype/fonts.dir))\n"
 msgstr ""
 
 #. type: code{#1}
@@ -4227,13 +5150,13 @@ msgstr ""
 msgid ""
 "After installing fonts you may have to refresh the font cache to use them in "
 "applications.  The same applies when applications installed via Guix do not "
-"seem to find fonts.  To force rebuilding of the font cache run "
-"@code{fc-cache -f}.  The @code{fc-cache} command is provided by the "
-"@code{fontconfig} package."
+"seem to find fonts.  To force rebuilding of the font cache run @code{fc-"
+"cache -f}.  The @code{fc-cache} command is provided by the @code{fontconfig} "
+"package."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:1596 doc/guix.texi:19742
+#: doc/guix.texi:1596 doc/guix.texi:19787
 #, no-wrap
 msgid "nss-certs"
 msgstr ""
@@ -4269,11 +5192,10 @@ msgstr ""
 #: doc/guix.texi:1618
 msgid ""
 "When you install Emacs packages with Guix, the elisp files may be placed "
-"either in @file{$HOME/.guix-profile/share/emacs/site-lisp/} or in "
-"sub-directories of "
-"@file{$HOME/.guix-profile/share/emacs/site-lisp/guix.d/}.  The latter "
-"directory exists because potentially there may exist thousands of Emacs "
-"packages and storing all their files in a single directory may not be "
+"either in @file{$HOME/.guix-profile/share/emacs/site-lisp/} or in sub-"
+"directories of @file{$HOME/.guix-profile/share/emacs/site-lisp/guix.d/}.  "
+"The latter directory exists because potentially there may exist thousands of "
+"Emacs packages and storing all their files in a single directory may not be "
 "reliable (because of name conflicts).  So we think using a separate "
 "directory for each package is a good idea.  It is very similar to how the "
 "Emacs package system organizes the file structure (@pxref{Package Files,,, "
@@ -4359,9 +5281,9 @@ msgid ""
 "This chapter describes the main features of Guix, as well as the package "
 "management tools it provides.  Along with the command-line interface "
 "described below (@pxref{Invoking guix package, @code{guix package}}), you "
-"may also use the Emacs-Guix interface (@pxref{Top,,, emacs-guix, The "
-"Emacs-Guix Reference Manual}), after installing @code{emacs-guix} package "
-"(run @kbd{M-x guix-help} command to start with it):"
+"may also use the Emacs-Guix interface (@pxref{Top,,, emacs-guix, The Emacs-"
+"Guix Reference Manual}), after installing @code{emacs-guix} package (run "
+"@kbd{M-x guix-help} command to start with it):"
 msgstr ""
 
 #. type: example
@@ -4383,20 +5305,19 @@ msgstr ""
 msgid ""
 "Instead of referring to these directories, users have their own "
 "@dfn{profile}, which points to the packages that they actually want to use.  "
-"These profiles are stored within each user's home directory, at "
-"@code{$HOME/.guix-profile}."
+"These profiles are stored within each user's home directory, at @code{$HOME/."
+"guix-profile}."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:1703
 msgid ""
-"For example, @code{alice} installs GCC 4.7.2.  As a result, "
-"@file{/home/alice/.guix-profile/bin/gcc} points to "
-"@file{/gnu/store/@dots{}-gcc-4.7.2/bin/gcc}.  Now, on the same machine, "
-"@code{bob} had already installed GCC 4.8.0.  The profile of @code{bob} "
-"simply continues to point to "
-"@file{/gnu/store/@dots{}-gcc-4.8.0/bin/gcc}---i.e., both versions of GCC "
-"coexist on the same system without any interference."
+"For example, @code{alice} installs GCC 4.7.2.  As a result, @file{/home/"
+"alice/.guix-profile/bin/gcc} points to @file{/gnu/store/@dots{}-gcc-4.7.2/"
+"bin/gcc}.  Now, on the same machine, @code{bob} had already installed GCC "
+"4.8.0.  The profile of @code{bob} simply continues to point to @file{/gnu/"
+"store/@dots{}-gcc-4.8.0/bin/gcc}---i.e., both versions of GCC coexist on the "
+"same system without any interference."
 msgstr ""
 
 #. type: Plain text
@@ -4546,8 +5467,8 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:1785
 msgid ""
-"For example, to remove @code{lua} and install @code{guile} and "
-"@code{guile-cairo} in a single transaction:"
+"For example, to remove @code{lua} and install @code{guile} and @code{guile-"
+"cairo} in a single transaction:"
 msgstr ""
 
 #. type: example
@@ -4561,8 +5482,8 @@ msgstr ""
 msgid ""
 "@command{guix package} also supports a @dfn{declarative approach} whereby "
 "the user specifies the exact set of packages to be available and passes it "
-"@i{via} the @option{--manifest} option (@pxref{profile-manifest, "
-"@option{--manifest}})."
+"@i{via} the @option{--manifest} option (@pxref{profile-manifest, @option{--"
+"manifest}})."
 msgstr ""
 
 #. type: cindex
@@ -4611,10 +5532,10 @@ msgid ""
 "@dfn{garbage-collector root}, which @file{$HOME/.guix-profile} points to "
 "(@pxref{Invoking guix gc}).  That directory is normally "
 "@code{@var{localstatedir}/guix/profiles/per-user/@var{user}}, where "
-"@var{localstatedir} is the value passed to @code{configure} as "
-"@code{--localstatedir}, and @var{user} is the user name.  The "
-"@file{per-user} directory is created when @command{guix-daemon} is started, "
-"and the @var{user} sub-directory is created by @command{guix package}."
+"@var{localstatedir} is the value passed to @code{configure} as @code{--"
+"localstatedir}, and @var{user} is the user name.  The @file{per-user} "
+"directory is created when @command{guix-daemon} is started, and the "
+"@var{user} sub-directory is created by @command{guix package}."
 msgstr ""
 
 #. type: Plain text
@@ -4669,10 +5590,9 @@ msgstr ""
 #: doc/guix.texi:1849
 msgid ""
 "Sometimes packages have @dfn{propagated inputs}: these are dependencies that "
-"automatically get installed along with the required package "
-"(@pxref{package-propagated-inputs, @code{propagated-inputs} in "
-"@code{package} objects}, for information about propagated inputs in package "
-"definitions)."
+"automatically get installed along with the required package (@pxref{package-"
+"propagated-inputs, @code{propagated-inputs} in @code{package} objects}, for "
+"information about propagated inputs in package definitions)."
 msgstr ""
 
 #. type: anchor{#1}
@@ -4729,8 +5649,8 @@ msgstr ""
 #: doc/guix.texi:1874
 msgid ""
 "Note that this option installs the first output of the specified package, "
-"which may be insufficient when needing a specific output of a "
-"multiple-output package."
+"which may be insufficient when needing a specific output of a multiple-"
+"output package."
 msgstr ""
 
 #. type: item
@@ -4792,8 +5712,8 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:1899
 msgid ""
-"As for @code{--install}, each @var{package} may specify a version number "
-"and/or output name in addition to the package name.  For instance, @code{-r "
+"As for @code{--install}, each @var{package} may specify a version number and/"
+"or output name in addition to the package name.  For instance, @code{-r "
 "glibc:debug} would remove the @code{debug} output of @code{glibc}."
 msgstr ""
 
@@ -4859,7 +5779,8 @@ msgid "profile-manifest"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:1922 doc/guix.texi:2877 doc/guix.texi:6577 doc/guix.texi:7288 doc/guix.texi:7972
+#: doc/guix.texi:1922 doc/guix.texi:2877 doc/guix.texi:6577 doc/guix.texi:7288
+#: doc/guix.texi:7972
 #, no-wrap
 msgid "--manifest=@var{file}"
 msgstr ""
@@ -4962,7 +5883,7 @@ msgid "--roll-back"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:1964 doc/guix.texi:20382
+#: doc/guix.texi:1964 doc/guix.texi:20427
 #, no-wrap
 msgid "rolling back"
 msgstr ""
@@ -5022,7 +5943,7 @@ msgid "-S @var{pattern}"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:1983 doc/guix.texi:2181 doc/guix.texi:20340
+#: doc/guix.texi:1983 doc/guix.texi:2181 doc/guix.texi:20385
 #, no-wrap
 msgid "generations"
 msgstr ""
@@ -5035,10 +5956,10 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:1991
 msgid ""
-"@var{pattern} may be either a generation number or a number prefixed with "
-"``+'' or ``-''.  The latter means: move forward/backward by a specified "
-"number of generations.  For example, if you want to return to the latest "
-"generation after @code{--roll-back}, use @code{--switch-generation=+1}."
+"@var{pattern} may be either a generation number or a number prefixed with ``"
+"+'' or ``-''.  The latter means: move forward/backward by a specified number "
+"of generations.  For example, if you want to return to the latest generation "
+"after @code{--roll-back}, use @code{--switch-generation=+1}."
 msgstr ""
 
 #. type: table
@@ -5078,7 +5999,8 @@ msgstr ""
 
 #. type: table
 #: doc/guix.texi:2014
-msgid "The typical use case is to define these environment variables in the shell:"
+msgid ""
+"The typical use case is to define these environment variables in the shell:"
 msgstr ""
 
 #. type: example
@@ -5520,9 +6442,8 @@ msgstr ""
 #. type: itemize
 #: doc/guix.texi:2210
 msgid ""
-"It is also possible to omit the endpoint.  For example, "
-"@code{--list-generations=2..}, returns all generations starting from the "
-"second one."
+"It is also possible to omit the endpoint.  For example, @code{--list-"
+"generations=2..}, returns all generations starting from the second one."
 msgstr ""
 
 #. type: item
@@ -5554,8 +6475,7 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:2221
 msgid ""
-"When @var{pattern} is omitted, delete all generations except the current "
-"one."
+"When @var{pattern} is omitted, delete all generations except the current one."
 msgstr ""
 
 #. type: table
@@ -5640,8 +6560,8 @@ msgid ""
 "substitutes; it can be overridden by passing the @option{--substitute-urls} "
 "option either to @command{guix-daemon} (@pxref{daemon-substitute-urls,, "
 "@code{guix-daemon --substitute-urls}})  or to client tools such as "
-"@command{guix package} (@pxref{client-substitute-urls,, client "
-"@option{--substitute-urls} option})."
+"@command{guix package} (@pxref{client-substitute-urls,, client @option{--"
+"substitute-urls} option})."
 msgstr ""
 
 #. type: Plain text
@@ -5714,8 +6634,8 @@ msgstr ""
 #: doc/guix.texi:2329
 msgid ""
 "Similarly, the @file{berlin.guixsd.org.pub} file contains the public key for "
-"the project's new build farm, reachable at "
-"@indicateurl{https://berlin.guixsd.org}."
+"the project's new build farm, reachable at @indicateurl{https://berlin."
+"guixsd.org}."
 msgstr ""
 
 #. type: quotation
@@ -5742,8 +6662,7 @@ msgid ""
 "The following derivations would be built:\n"
 "   /gnu/store/yr7bnx8xwcayd6j95r2clmkdl1qh688w-emacs-24.3.drv\n"
 "   /gnu/store/x8qsh1hlhgjx6cwsjyvybnfv2i37z23w-dbus-1.6.4.tar.gz.drv\n"
-"   "
-"/gnu/store/1ixwp12fl950d15h2cj11c73733jay0z-alsa-lib-1.0.27.1.tar.bz2.drv\n"
+"   /gnu/store/1ixwp12fl950d15h2cj11c73733jay0z-alsa-lib-1.0.27.1.tar.bz2.drv\n"
 "   /gnu/store/nlma1pw0p603fpfiqy7kn4zm105r5dmw-util-linux-2.21.drv\n"
 "@dots{}\n"
 msgstr ""
@@ -5782,11 +6701,11 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:2372
 msgid ""
-"The substitute mechanism can be disabled globally by running "
-"@code{guix-daemon} with @code{--no-substitutes} (@pxref{Invoking "
-"guix-daemon}).  It can also be disabled temporarily by passing the "
-"@code{--no-substitutes} option to @command{guix package}, @command{guix "
-"build}, and other command-line tools."
+"The substitute mechanism can be disabled globally by running @code{guix-"
+"daemon} with @code{--no-substitutes} (@pxref{Invoking guix-daemon}).  It can "
+"also be disabled temporarily by passing the @code{--no-substitutes} option "
+"to @command{guix package}, @command{guix build}, and other command-line "
+"tools."
 msgstr ""
 
 #. type: cindex
@@ -5822,12 +6741,12 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:2400
 msgid ""
-"If the ACL contains only the key for @code{b.example.org}, and if "
-"@code{a.example.org} happens to serve the @emph{exact same} substitutes, "
-"then Guix will download substitutes from @code{a.example.org} because it "
-"comes first in the list and can be considered a mirror of "
-"@code{b.example.org}.  In practice, independent build machines usually "
-"produce the same binaries, thanks to bit-reproducible builds (see below)."
+"If the ACL contains only the key for @code{b.example.org}, and if @code{a."
+"example.org} happens to serve the @emph{exact same} substitutes, then Guix "
+"will download substitutes from @code{a.example.org} because it comes first "
+"in the list and can be considered a mirror of @code{b.example.org}.  In "
+"practice, independent build machines usually produce the same binaries, "
+"thanks to bit-reproducible builds (see below)."
 msgstr ""
 
 #. type: Plain text
@@ -5874,8 +6793,8 @@ msgid ""
 "locally, and the success or failure of the derivation depends on the success "
 "or failure of the local build.  Note that when substitutes are disabled or "
 "no substitute is available for the derivation in question, a local build "
-"will @emph{always} be performed, regardless of whether or not "
-"@code{--fallback} was given."
+"will @emph{always} be performed, regardless of whether or not @code{--"
+"fallback} was given."
 msgstr ""
 
 #. type: Plain text
@@ -5914,11 +6833,11 @@ msgid ""
 "derivation should yield bit-identical results.  Thus, through a diverse set "
 "of independent package builds, we can strengthen the integrity of our "
 "systems.  The @command{guix challenge} command aims to help users assess "
-"substitute servers, and to assist developers in finding out about "
-"non-deterministic package builds (@pxref{Invoking guix challenge}).  "
-"Similarly, the @option{--check} option of @command{guix build} allows users "
-"to check whether previously-installed substitutes are genuine by rebuilding "
-"them locally (@pxref{build-check, @command{guix build --check}})."
+"substitute servers, and to assist developers in finding out about non-"
+"deterministic package builds (@pxref{Invoking guix challenge}).  Similarly, "
+"the @option{--check} option of @command{guix build} allows users to check "
+"whether previously-installed substitutes are genuine by rebuilding them "
+"locally (@pxref{build-check, @command{guix build --check}})."
 msgstr ""
 
 #. type: Plain text
@@ -5978,7 +6897,7 @@ msgid "guix package -i glib\n"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:2506 doc/guix.texi:21276
+#: doc/guix.texi:2506 doc/guix.texi:21321
 #, no-wrap
 msgid "documentation"
 msgstr ""
@@ -6050,9 +6969,9 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:2553
 msgid ""
-"The garbage collector has a set of known @dfn{roots}: any file under "
-"@file{/gnu/store} reachable from a root is considered @dfn{live} and cannot "
-"be deleted; any other file is considered @dfn{dead} and may be deleted.  The "
+"The garbage collector has a set of known @dfn{roots}: any file under @file{/"
+"gnu/store} reachable from a root is considered @dfn{live} and cannot be "
+"deleted; any other file is considered @dfn{dead} and may be deleted.  The "
 "set of garbage collector roots (``GC roots'' for short)  includes default "
 "user profiles; by default, the symlinks under @file{/var/guix/gcroots} "
 "represent these GC roots.  New GC roots can be added with @command{guix "
@@ -6119,8 +7038,8 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:2588
 msgid ""
-"Collect garbage---i.e., unreachable @file{/gnu/store} files and "
-"sub-directories.  This is the default operation when no option is specified."
+"Collect garbage---i.e., unreachable @file{/gnu/store} files and sub-"
+"directories.  This is the default operation when no option is specified."
 msgstr ""
 
 #. type: table
@@ -6171,7 +7090,7 @@ msgid "--delete"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:2606 doc/guix.texi:5840 doc/guix.texi:20553
+#: doc/guix.texi:2606 doc/guix.texi:5840 doc/guix.texi:20598
 #, no-wrap
 msgid "-d"
 msgstr ""
@@ -6198,9 +7117,8 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:2617
 msgid ""
-"This prints nothing unless the daemon was started with "
-"@option{--cache-failures} (@pxref{Invoking guix-daemon, "
-"@option{--cache-failures}})."
+"This prints nothing unless the daemon was started with @option{--cache-"
+"failures} (@pxref{Invoking guix-daemon, @option{--cache-failures}})."
 msgstr ""
 
 #. type: item
@@ -6230,8 +7148,8 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:2627
 msgid ""
-"Show the list of dead files and directories still present in the "
-"store---i.e., files and directories no longer reachable from any root."
+"Show the list of dead files and directories still present in the store---i."
+"e., files and directories no longer reachable from any root."
 msgstr ""
 
 #. type: item
@@ -6451,8 +7369,8 @@ msgid ""
 "The daemon performs deduplication after each successful build or archive "
 "import, unless it was started with @code{--disable-deduplication} "
 "(@pxref{Invoking guix-daemon, @code{--disable-deduplication}}).  Thus, this "
-"option is primarily useful when the daemon was running with "
-"@code{--disable-deduplication}."
+"option is primarily useful when the daemon was running with @code{--disable-"
+"deduplication}."
 msgstr ""
 
 #. type: section
@@ -6528,7 +7446,8 @@ msgstr ""
 
 #. type: table
 #: doc/guix.texi:2756
-msgid "Produce verbose output, writing build logs to the standard error output."
+msgid ""
+"Produce verbose output, writing build logs to the standard error output."
 msgstr ""
 
 #. type: item
@@ -6685,10 +7604,9 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:2828
 msgid ""
-"Users of this pack would have to run "
-"@file{/gnu/store/@dots{}-profile/bin/guile} to run Guile, which you may find "
-"inconvenient.  To work around it, you can create, say, a @file{/opt/gnu/bin} "
-"symlink to the profile:"
+"Users of this pack would have to run @file{/gnu/store/@dots{}-profile/bin/"
+"guile} to run Guile, which you may find inconvenient.  To work around it, "
+"you can create, say, a @file{/opt/gnu/bin} symlink to the profile:"
 msgstr ""
 
 #. type: example
@@ -6719,9 +7637,8 @@ msgstr ""
 #: doc/guix.texi:2848
 msgid ""
 "The result is a tarball that can be passed to the @command{docker load} "
-"command.  See the "
-"@uref{https://docs.docker.com/engine/reference/commandline/load/, Docker "
-"documentation} for more information."
+"command.  See the @uref{https://docs.docker.com/engine/reference/commandline/"
+"load/, Docker documentation} for more information."
 msgstr ""
 
 #. type: Plain text
@@ -6773,19 +7690,20 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:2867
 msgid ""
-"This produces a tarball that follows the "
-"@uref{https://github.com/docker/docker/blob/master/image/spec/v1.2.md, "
-"Docker Image Specification}."
+"This produces a tarball that follows the @uref{https://github.com/docker/"
+"docker/blob/master/image/spec/v1.2.md, Docker Image Specification}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:2869 doc/guix.texi:5711 doc/guix.texi:6536 doc/guix.texi:7097 doc/guix.texi:7247 doc/guix.texi:20539
+#: doc/guix.texi:2869 doc/guix.texi:5711 doc/guix.texi:6536 doc/guix.texi:7097
+#: doc/guix.texi:7247 doc/guix.texi:20584
 #, no-wrap
 msgid "--expression=@var{expr}"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:2870 doc/guix.texi:5712 doc/guix.texi:6537 doc/guix.texi:7098 doc/guix.texi:7248 doc/guix.texi:20540
+#: doc/guix.texi:2870 doc/guix.texi:5712 doc/guix.texi:6537 doc/guix.texi:7098
+#: doc/guix.texi:7248 doc/guix.texi:20585
 #, no-wrap
 msgid "-e @var{expr}"
 msgstr ""
@@ -6822,7 +7740,8 @@ msgid ""
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:2891 doc/guix.texi:5784 doc/guix.texi:6925 doc/guix.texi:7333 doc/guix.texi:7967 doc/guix.texi:20548
+#: doc/guix.texi:2891 doc/guix.texi:5784 doc/guix.texi:6925 doc/guix.texi:7333
+#: doc/guix.texi:7967 doc/guix.texi:20593
 #, no-wrap
 msgid "-s @var{system}"
 msgstr ""
@@ -7121,8 +8040,8 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:3030
 msgid ""
-"Dependencies are @emph{not} included in the output, unless "
-"@code{--recursive} is passed."
+"Dependencies are @emph{not} included in the output, unless @code{--"
+"recursive} is passed."
 msgstr ""
 
 #. type: itemx
@@ -7157,8 +8076,8 @@ msgstr ""
 msgid ""
 "Read an archive from the standard input, and import the files listed therein "
 "into the store.  Abort if the archive has an invalid digital signature, or "
-"if it is signed by a public key not among the authorized keys (see "
-"@code{--authorize} below.)"
+"if it is signed by a public key not among the authorized keys (see @code{--"
+"authorize} below.)"
 msgstr ""
 
 #. type: item
@@ -7232,12 +8151,11 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:3078
 msgid ""
-"The list of authorized keys is kept in the human-editable file "
-"@file{/etc/guix/acl}.  The file contains "
-"@url{http://people.csail.mit.edu/rivest/Sexp.txt, ``advanced-format "
-"s-expressions''} and is structured as an access-control list in the "
-"@url{http://theworld.com/~cme/spki.txt, Simple Public-Key Infrastructure "
-"(SPKI)}."
+"The list of authorized keys is kept in the human-editable file @file{/etc/"
+"guix/acl}.  The file contains @url{http://people.csail.mit.edu/rivest/Sexp."
+"txt, ``advanced-format s-expressions''} and is structured as an access-"
+"control list in the @url{http://theworld.com/~cme/spki.txt, Simple Public-"
+"Key Infrastructure (SPKI)}."
 msgstr ""
 
 #. type: item
@@ -7256,8 +8174,8 @@ msgstr ""
 #: doc/guix.texi:3084
 msgid ""
 "Read a single-item archive as served by substitute servers "
-"(@pxref{Substitutes}) and extract it to @var{directory}.  This is a "
-"low-level operation needed in only very narrow use cases; see below."
+"(@pxref{Substitutes}) and extract it to @var{directory}.  This is a low-"
+"level operation needed in only very narrow use cases; see below."
 msgstr ""
 
 #. type: table
@@ -7296,21 +8214,21 @@ msgstr ""
 #: doc/guix.texi:3115
 msgid ""
 "GNU Guix provides several Scheme programming interfaces (APIs) to define, "
-"build, and query packages.  The first interface allows users to write "
-"high-level package definitions.  These definitions refer to familiar "
-"packaging concepts, such as the name and version of a package, its build "
-"system, and its dependencies.  These definitions can then be turned into "
-"concrete build actions."
+"build, and query packages.  The first interface allows users to write high-"
+"level package definitions.  These definitions refer to familiar packaging "
+"concepts, such as the name and version of a package, its build system, and "
+"its dependencies.  These definitions can then be turned into concrete build "
+"actions."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:3121
 msgid ""
 "Build actions are performed by the Guix daemon, on behalf of users.  In a "
-"standard setup, the daemon has write access to the store---the "
-"@file{/gnu/store} directory---whereas users do not.  The recommended setup "
-"also has the daemon perform builds in chroots, under a specific build users, "
-"to minimize interference with the rest of the system."
+"standard setup, the daemon has write access to the store---the @file{/gnu/"
+"store} directory---whereas users do not.  The recommended setup also has the "
+"daemon perform builds in chroots, under a specific build users, to minimize "
+"interference with the rest of the system."
 msgstr ""
 
 #. type: Plain text
@@ -7319,10 +8237,10 @@ msgid ""
 "Lower-level APIs are available to interact with the daemon and the store.  "
 "To instruct the daemon to perform a build action, users actually provide it "
 "with a @dfn{derivation}.  A derivation is a low-level representation of the "
-"build actions to be taken, and the environment in which they should "
-"occur---derivations are to package definitions what assembly is to C "
-"programs.  The term ``derivation'' comes from the fact that build results "
-"@emph{derive} from them."
+"build actions to be taken, and the environment in which they should occur---"
+"derivations are to package definitions what assembly is to C programs.  The "
+"term ``derivation'' comes from the fact that build results @emph{derive} "
+"from them."
 msgstr ""
 
 #. type: Plain text
@@ -7368,8 +8286,7 @@ msgid ""
 "                                  \".tar.gz\"))\n"
 "              (sha256\n"
 "               (base32\n"
-"                "
-"\"0ssi1wpaf7plaswqqjwigppsg5fyh99vdlb9kzl7c9lng89ndq1i\"))))\n"
+"                \"0ssi1wpaf7plaswqqjwigppsg5fyh99vdlb9kzl7c9lng89ndq1i\"))))\n"
 "    (build-system gnu-build-system)\n"
 "    (arguments '(#:configure-flags '(\"--enable-silent-rules\")))\n"
 "    (inputs `((\"gawk\" ,gawk)))\n"
@@ -7387,8 +8304,8 @@ msgid ""
 "a @code{<package>} object, which is essentially a record (@pxref{SRFI-9, "
 "Scheme records,, guile, GNU Guile Reference Manual}).  This package object "
 "can be inspected using procedures found in the @code{(guix packages)} "
-"module; for instance, @code{(package-name hello)} "
-"returns---surprise!---@code{\"hello\"}."
+"module; for instance, @code{(package-name hello)} returns---surprise!---"
+"@code{\"hello\"}."
 msgstr ""
 
 #. type: Plain text
@@ -7418,9 +8335,9 @@ msgstr ""
 #: doc/guix.texi:3206
 msgid ""
 "The @code{source} field of the package is an @code{<origin>} object "
-"(@pxref{origin Reference}, for the complete reference).  Here, the "
-"@code{url-fetch} method from @code{(guix download)} is used, meaning that "
-"the source is a file to be downloaded over FTP or HTTP."
+"(@pxref{origin Reference}, for the complete reference).  Here, the @code{url-"
+"fetch} method from @code{(guix download)} is used, meaning that the source "
+"is a file to be downloaded over FTP or HTTP."
 msgstr ""
 
 #. type: itemize
@@ -7476,8 +8393,7 @@ msgstr ""
 msgid ""
 "The @code{arguments} field specifies options for the build system "
 "(@pxref{Build Systems}).  Here it is interpreted by @var{gnu-build-system} "
-"as a request run @file{configure} with the @code{--enable-silent-rules} "
-"flag."
+"as a request run @file{configure} with the @code{--enable-silent-rules} flag."
 msgstr ""
 
 #. type: findex
@@ -7513,18 +8429,17 @@ msgstr ""
 #: doc/guix.texi:3253
 msgid ""
 "The hash-colon (@code{#:}) sequence defines a Scheme @dfn{keyword} "
-"(@pxref{Keywords,,, guile, GNU Guile Reference Manual}), and "
-"@code{#:configure-flags} is a keyword used to pass a keyword argument to the "
-"build system (@pxref{Coding With Keywords,,, guile, GNU Guile Reference "
-"Manual})."
+"(@pxref{Keywords,,, guile, GNU Guile Reference Manual}), and @code{#:"
+"configure-flags} is a keyword used to pass a keyword argument to the build "
+"system (@pxref{Coding With Keywords,,, guile, GNU Guile Reference Manual})."
 msgstr ""
 
 #. type: itemize
 #: doc/guix.texi:3259
 msgid ""
-"The @code{inputs} field specifies inputs to the build process---i.e., "
-"build-time or run-time dependencies of the package.  Here, we define an "
-"input called @code{\"gawk\"} whose value is that of the @var{gawk} variable; "
+"The @code{inputs} field specifies inputs to the build process---i.e., build-"
+"time or run-time dependencies of the package.  Here, we define an input "
+"called @code{\"gawk\"} whose value is that of the @var{gawk} variable; "
 "@var{gawk} is itself bound to a @code{<package>} object."
 msgstr ""
 
@@ -7648,16 +8563,14 @@ msgid ""
 "Behind the scenes, a derivation corresponding to the @code{<package>} object "
 "is first computed by the @code{package-derivation} procedure.  That "
 "derivation is stored in a @code{.drv} file under @file{/gnu/store}.  The "
-"build actions it prescribes may then be realized by using the "
-"@code{build-derivations} procedure (@pxref{The Store})."
+"build actions it prescribes may then be realized by using the @code{build-"
+"derivations} procedure (@pxref{The Store})."
 msgstr ""
 
 #. type: deffn
 #: doc/guix.texi:3310
 #, no-wrap
-msgid ""
-"{Scheme Procedure} package-derivation @var{store} @var{package} "
-"[@var{system}]"
+msgid "{Scheme Procedure} package-derivation @var{store} @var{package} [@var{system}]"
 msgstr ""
 
 #. type: deffn
@@ -7879,7 +8792,7 @@ msgid ""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:3420 doc/guix.texi:10973
+#: doc/guix.texi:3420 doc/guix.texi:11018
 #, no-wrap
 msgid "@code{arguments} (default: @code{'()})"
 msgstr ""
@@ -8065,7 +8978,7 @@ msgid "A one-line description of the package."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:3493 doc/guix.texi:6736 doc/guix.texi:20982
+#: doc/guix.texi:3493 doc/guix.texi:6736 doc/guix.texi:21027
 #, no-wrap
 msgid "description"
 msgstr ""
@@ -8168,7 +9081,7 @@ msgid "This is the data type representing a source code origin."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:3529 doc/guix.texi:15651
+#: doc/guix.texi:3529 doc/guix.texi:15696
 #, no-wrap
 msgid "uri"
 msgstr ""
@@ -8479,8 +9392,8 @@ msgstr ""
 #: doc/guix.texi:3663
 msgid ""
 "Patch shebangs encountered in source files so they refer to the right store "
-"file names.  For instance, this changes @code{#!/bin/sh} to "
-"@code{#!/gnu/store/@dots{}-bash-4.3/bin/sh}."
+"file names.  For instance, this changes @code{#!/bin/sh} to @code{#!/gnu/"
+"store/@dots{}-bash-4.3/bin/sh}."
 msgstr ""
 
 #. type: item
@@ -8498,7 +9411,7 @@ msgid ""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:3669 doc/guix.texi:4135 doc/guix.texi:20392
+#: doc/guix.texi:3669 doc/guix.texi:4135 doc/guix.texi:20437
 #, no-wrap
 msgid "build"
 msgstr ""
@@ -8520,10 +9433,9 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:3679
 msgid ""
-"Run @code{make check}, or some other target specified with "
-"@code{#:test-target}, unless @code{#:tests? #f} is passed.  If the "
-"@code{#:parallel-tests?} argument is true (the default), run @code{make "
-"check -j}."
+"Run @code{make check}, or some other target specified with @code{#:test-"
+"target}, unless @code{#:tests? #f} is passed.  If the @code{#:parallel-"
+"tests?} argument is true (the default), run @code{make check -j}."
 msgstr ""
 
 #. type: item
@@ -8572,9 +9484,9 @@ msgstr ""
 #: doc/guix.texi:3697
 msgid ""
 "The build-side module @code{(guix build gnu-build-system)} defines "
-"@var{%standard-phases} as the default list of build phases.  "
-"@var{%standard-phases} is a list of symbol/procedure pairs, where the "
-"procedure implements the actual phase."
+"@var{%standard-phases} as the default list of build phases.  @var{%standard-"
+"phases} is a list of symbol/procedure pairs, where the procedure implements "
+"the actual phase."
 msgstr ""
 
 #. type: defvr
@@ -8602,20 +9514,20 @@ msgstr ""
 msgid ""
 "In addition, this build system ensures that the ``standard'' environment for "
 "GNU packages is available.  This includes tools such as GCC, libc, "
-"Coreutils, Bash, Make, Diffutils, grep, and sed (see the @code{(guix "
-"build-system gnu)} module for a complete list).  We call these the "
-"@dfn{implicit inputs} of a package, because package definitions do not have "
-"to mention them."
+"Coreutils, Bash, Make, Diffutils, grep, and sed (see the @code{(guix build-"
+"system gnu)} module for a complete list).  We call these the @dfn{implicit "
+"inputs} of a package, because package definitions do not have to mention "
+"them."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:3721
 msgid ""
 "Other @code{<build-system>} objects are defined to support other conventions "
-"and tools used by free software packages.  They inherit most of "
-"@var{gnu-build-system}, and differ mainly in the set of inputs implicitly "
-"added to the build process, and in the list of phases executed.  Some of "
-"these build systems are listed below."
+"and tools used by free software packages.  They inherit most of @var{gnu-"
+"build-system}, and differ mainly in the set of inputs implicitly added to "
+"the build process, and in the list of phases executed.  Some of these build "
+"systems are listed below."
 msgstr ""
 
 #. type: defvr
@@ -8628,8 +9540,8 @@ msgstr ""
 #: doc/guix.texi:3726
 msgid ""
 "This variable is exported by @code{(guix build-system ant)}.  It implements "
-"the build procedure for Java packages that can be built with "
-"@url{http://ant.apache.org/, Ant build tool}."
+"the build procedure for Java packages that can be built with @url{http://ant."
+"apache.org/, Ant build tool}."
 msgstr ""
 
 #. type: defvr
@@ -8637,8 +9549,7 @@ msgstr ""
 msgid ""
 "It adds both @code{ant} and the @dfn{Java Development Kit} (JDK) as provided "
 "by the @code{icedtea} package to the set of inputs.  Different packages can "
-"be specified with the @code{#:ant} and @code{#:jdk} parameters, "
-"respectively."
+"be specified with the @code{#:ant} and @code{#:jdk} parameters, respectively."
 msgstr ""
 
 #. type: defvr
@@ -8647,8 +9558,8 @@ msgid ""
 "When the original package does not provide a suitable Ant build file, the "
 "parameter @code{#:jar-name} can be used to generate a minimal Ant build file "
 "@file{build.xml} with tasks to build the specified jar archive.  In this "
-"case the parameter @code{#:source-dir} can be used to specify the source "
-"sub-directory, defaulting to ``src''."
+"case the parameter @code{#:source-dir} can be used to specify the source sub-"
+"directory, defaulting to ``src''."
 msgstr ""
 
 #. type: defvr
@@ -8693,9 +9604,9 @@ msgstr ""
 #: doc/guix.texi:3760
 msgid ""
 "These variables, exported by @code{(guix build-system asdf)}, implement "
-"build procedures for Common Lisp packages using "
-"@url{https://common-lisp.net/project/asdf/, ``ASDF''}. ASDF is a system "
-"definition facility for Common Lisp programs and libraries."
+"build procedures for Common Lisp packages using @url{https://common-lisp.net/"
+"project/asdf/, ``ASDF''}. ASDF is a system definition facility for Common "
+"Lisp programs and libraries."
 msgstr ""
 
 #. type: defvr
@@ -8787,8 +9698,8 @@ msgstr ""
 #: doc/guix.texi:3809
 msgid ""
 "This variable is exported by @code{(guix build-system cargo)}.  It supports "
-"builds of packages using Cargo, the build tool of the "
-"@uref{https://www.rust-lang.org, Rust programming language}."
+"builds of packages using Cargo, the build tool of the @uref{https://www.rust-"
+"lang.org, Rust programming language}."
 msgstr ""
 
 #. type: defvr
@@ -8810,8 +9721,8 @@ msgstr ""
 #: doc/guix.texi:3820
 msgid ""
 "This variable is exported by @code{(guix build-system cmake)}.  It "
-"implements the build procedure for packages using the "
-"@url{http://www.cmake.org, CMake build tool}."
+"implements the build procedure for packages using the @url{http://www.cmake."
+"org, CMake build tool}."
 msgstr ""
 
 #. type: defvr
@@ -8828,8 +9739,8 @@ msgid ""
 "the @command{cmake} command.  The @code{#:build-type} parameter specifies in "
 "abstract terms the flags passed to the compiler; it defaults to "
 "@code{\"RelWithDebInfo\"} (short for ``release mode with debugging "
-"information''), which roughly means that code is compiled with @code{-O2 "
-"-g}, as is the case for Autoconf-based packages by default."
+"information''), which roughly means that code is compiled with @code{-O2 -"
+"g}, as is the case for Autoconf-based packages by default."
 msgstr ""
 
 #. type: defvr
@@ -8842,24 +9753,22 @@ msgstr ""
 #: doc/guix.texi:3838
 msgid ""
 "This variable is exported by @code{(guix build-system go)}.  It implements a "
-"build procedure for Go packages using the standard "
-"@url{https://golang.org/cmd/go/#hdr-Compile_packages_and_dependencies, Go "
-"build mechanisms}."
+"build procedure for Go packages using the standard @url{https://golang.org/"
+"cmd/go/#hdr-Compile_packages_and_dependencies, Go build mechanisms}."
 msgstr ""
 
 #. type: defvr
 #: doc/guix.texi:3849
 msgid ""
 "The user is expected to provide a value for the key @code{#:import-path} "
-"and, in some cases, @code{#:unpack-path}.  The "
-"@url{https://golang.org/doc/code.html#ImportPaths, import path} corresponds "
-"to the file system path expected by the package's build scripts and any "
-"referring packages, and provides a unique way to refer to a Go package.  It "
-"is typically based on a combination of the package source code's remote URI "
-"and file system hierarchy structure.  In some cases, you will need to unpack "
-"the package's source code to a different directory structure than the one "
-"indicated by the import path, and @code{#:unpack-path} should be used in "
-"such cases."
+"and, in some cases, @code{#:unpack-path}.  The @url{https://golang.org/doc/"
+"code.html#ImportPaths, import path} corresponds to the file system path "
+"expected by the package's build scripts and any referring packages, and "
+"provides a unique way to refer to a Go package.  It is typically based on a "
+"combination of the package source code's remote URI and file system "
+"hierarchy structure.  In some cases, you will need to unpack the package's "
+"source code to a different directory structure than the one indicated by the "
+"import path, and @code{#:unpack-path} should be used in such cases."
 msgstr ""
 
 #. type: defvr
@@ -8901,22 +9810,20 @@ msgstr ""
 #: doc/guix.texi:3871
 msgid ""
 "The phase @code{glib-or-gtk-wrap} ensures that programs in @file{bin/} are "
-"able to find GLib ``schemas'' and "
-"@uref{https://developer.gnome.org/gtk3/stable/gtk-running.html, GTK+ "
-"modules}.  This is achieved by wrapping the programs in launch scripts that "
-"appropriately set the @code{XDG_DATA_DIRS} and @code{GTK_PATH} environment "
-"variables."
+"able to find GLib ``schemas'' and @uref{https://developer.gnome.org/gtk3/"
+"stable/gtk-running.html, GTK+ modules}.  This is achieved by wrapping the "
+"programs in launch scripts that appropriately set the @code{XDG_DATA_DIRS} "
+"and @code{GTK_PATH} environment variables."
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:3878
 msgid ""
 "It is possible to exclude specific package outputs from that wrapping "
-"process by listing their names in the "
-"@code{#:glib-or-gtk-wrap-excluded-outputs} parameter.  This is useful when "
-"an output is known not to contain any GLib or GTK+ binaries, and where "
-"wrapping would gratuitously add a dependency of that output on GLib and "
-"GTK+."
+"process by listing their names in the @code{#:glib-or-gtk-wrap-excluded-"
+"outputs} parameter.  This is useful when an output is known not to contain "
+"any GLib or GTK+ binaries, and where wrapping would gratuitously add a "
+"dependency of that output on GLib and GTK+."
 msgstr ""
 
 #. type: item
@@ -8996,11 +9903,10 @@ msgid ""
 "@code{ocaml setup.ml -install}.  The build system will assume that this file "
 "was generated by @uref{http://oasis.forge.ocamlcore.org/, OASIS} and will "
 "take care of setting the prefix and enabling tests if they are not "
-"disabled.  You can pass configure and build flags with the "
-"@code{#:configure-flags} and @code{#:build-flags}.  The @code{#:test-flags} "
-"key can be passed to change the set of flags used to enable tests.  The "
-"@code{#:use-make?} key can be used to bypass this system in the build and "
-"install phases."
+"disabled.  You can pass configure and build flags with the @code{#:configure-"
+"flags} and @code{#:build-flags}.  The @code{#:test-flags} key can be passed "
+"to change the set of flags used to enable tests.  The @code{#:use-make?} key "
+"can be used to bypass this system in the build and install phases."
 msgstr ""
 
 #. type: defvr
@@ -9008,8 +9914,8 @@ msgstr ""
 msgid ""
 "When the package has a @file{configure} file, it is assumed that it is a "
 "hand-made configure script that requires a different argument format than in "
-"the @code{gnu-build-system}.  You can add more flags with the "
-"@code{#:configure-flags} key."
+"the @code{gnu-build-system}.  You can add more flags with the @code{#:"
+"configure-flags} key."
 msgstr ""
 
 #. type: defvr
@@ -9082,8 +9988,8 @@ msgstr ""
 msgid ""
 "By default guix calls @code{setup.py} under control of @code{setuptools}, "
 "much like @command{pip} does.  Some packages are not compatible with "
-"setuptools (and pip), thus you can disable this by setting the "
-"@code{#:use-setuptools} parameter to @code{#f}."
+"setuptools (and pip), thus you can disable this by setting the @code{#:use-"
+"setuptools} parameter to @code{#f}."
 msgstr ""
 
 #. type: defvr
@@ -9103,16 +10009,16 @@ msgid ""
 "depending on which of @code{Build.PL} or @code{Makefile.PL} is present in "
 "the package distribution.  Preference is given to the former if both "
 "@code{Build.PL} and @code{Makefile.PL} exist in the package distribution.  "
-"This preference can be reversed by specifying @code{#t} for the "
-"@code{#:make-maker?} parameter."
+"This preference can be reversed by specifying @code{#t} for the @code{#:make-"
+"maker?} parameter."
 msgstr ""
 
 #. type: defvr
 #: doc/guix.texi:3988
 msgid ""
 "The initial @code{perl Makefile.PL} or @code{perl Build.PL} invocation "
-"passes flags specified by the @code{#:make-maker-flags} or "
-"@code{#:module-build-flags} parameter, respectively."
+"passes flags specified by the @code{#:make-maker-flags} or @code{#:module-"
+"build-flags} parameter, respectively."
 msgstr ""
 
 #. type: defvr
@@ -9131,10 +10037,10 @@ msgstr ""
 msgid ""
 "This variable is exported by @code{(guix build-system r)}.  It implements "
 "the build procedure used by @uref{http://r-project.org, R} packages, which "
-"essentially is little more than running @code{R CMD INSTALL "
-"--library=/gnu/store/@dots{}} in an environment where @code{R_LIBS_SITE} "
-"contains the paths to all R package inputs.  Tests are run after "
-"installation using the R function @code{tools::testInstalledPackage}."
+"essentially is little more than running @code{R CMD INSTALL --library=/gnu/"
+"store/@dots{}} in an environment where @code{R_LIBS_SITE} contains the paths "
+"to all R package inputs.  Tests are run after installation using the R "
+"function @code{tools::testInstalledPackage}."
 msgstr ""
 
 #. type: defvr
@@ -9157,12 +10063,11 @@ msgstr ""
 msgid ""
 "By default it runs @code{luatex} on all files ending on @code{ins}.  A "
 "different engine and format can be specified with the @code{#:tex-format} "
-"argument.  Different build targets can be specified with the "
-"@code{#:build-targets} argument, which expects a list of file names.  The "
-"build system adds only @code{texlive-bin} and @code{texlive-latex-base} "
-"(both from @code{(gnu packages tex}) to the inputs.  Both can be overridden "
-"with the arguments @code{#:texlive-bin} and @code{#:texlive-latex-base}, "
-"respectively."
+"argument.  Different build targets can be specified with the @code{#:build-"
+"targets} argument, which expects a list of file names.  The build system "
+"adds only @code{texlive-bin} and @code{texlive-latex-base} (both from "
+"@code{(gnu packages tex}) to the inputs.  Both can be overridden with the "
+"arguments @code{#:texlive-bin} and @code{#:texlive-latex-base}, respectively."
 msgstr ""
 
 #. type: defvr
@@ -9216,9 +10121,9 @@ msgstr ""
 #: doc/guix.texi:4045
 msgid ""
 "This variable is exported by @code{(guix build-system waf)}.  It implements "
-"a build procedure around the @code{waf} script.  The common "
-"phases---@code{configure}, @code{build}, and @code{install}---are "
-"implemented by passing their names as arguments to the @code{waf} script."
+"a build procedure around the @code{waf} script.  The common phases---"
+"@code{configure}, @code{build}, and @code{install}---are implemented by "
+"passing their names as arguments to the @code{waf} script."
 msgstr ""
 
 #. type: defvr
@@ -9249,8 +10154,8 @@ msgstr ""
 msgid ""
 "Additional flags to be passed to @code{scons} can be specified with the "
 "@code{#:scons-flags} parameter.  The version of Python used to run SCons can "
-"be specified by selecting the appropriate SCons package with the "
-"@code{#:scons} parameter."
+"be specified by selecting the appropriate SCons package with the @code{#:"
+"scons} parameter."
 msgstr ""
 
 #. type: defvr
@@ -9264,17 +10169,16 @@ msgstr ""
 msgid ""
 "This variable is exported by @code{(guix build-system haskell)}.  It "
 "implements the Cabal build procedure used by Haskell packages, which "
-"involves running @code{runhaskell Setup.hs configure "
-"--prefix=/gnu/store/@dots{}} and @code{runhaskell Setup.hs build}.  Instead "
-"of installing the package by running @code{runhaskell Setup.hs install}, to "
-"avoid trying to register libraries in the read-only compiler store "
-"directory, the build system uses @code{runhaskell Setup.hs copy}, followed "
-"by @code{runhaskell Setup.hs register}.  In addition, the build system "
-"generates the package documentation by running @code{runhaskell Setup.hs "
-"haddock}, unless @code{#:haddock? #f} is passed.  Optional Haddock "
-"parameters can be passed with the help of the @code{#:haddock-flags} "
-"parameter.  If the file @code{Setup.hs} is not found, the build system looks "
-"for @code{Setup.lhs} instead."
+"involves running @code{runhaskell Setup.hs configure --prefix=/gnu/store/"
+"@dots{}} and @code{runhaskell Setup.hs build}.  Instead of installing the "
+"package by running @code{runhaskell Setup.hs install}, to avoid trying to "
+"register libraries in the read-only compiler store directory, the build "
+"system uses @code{runhaskell Setup.hs copy}, followed by @code{runhaskell "
+"Setup.hs register}.  In addition, the build system generates the package "
+"documentation by running @code{runhaskell Setup.hs haddock}, unless @code{#:"
+"haddock? #f} is passed.  Optional Haddock parameters can be passed with the "
+"help of the @code{#:haddock-flags} parameter.  If the file @code{Setup.hs} "
+"is not found, the build system looks for @code{Setup.lhs} instead."
 msgstr ""
 
 #. type: defvr
@@ -9340,9 +10244,9 @@ msgstr ""
 #: doc/guix.texi:4112
 msgid ""
 "This variable is exported by @code{(guix build-system font)}.  It implements "
-"an installation procedure for font packages where upstream provides "
-"pre-compiled TrueType, OpenType, etc. font files that merely need to be "
-"copied into place.  It copies font files to standard locations in the output "
+"an installation procedure for font packages where upstream provides pre-"
+"compiled TrueType, OpenType, etc. font files that merely need to be copied "
+"into place.  It copies font files to standard locations in the output "
 "directory."
 msgstr ""
 
@@ -9356,8 +10260,8 @@ msgstr ""
 #: doc/guix.texi:4118
 msgid ""
 "This variable is exported by @code{(guix build-system meson)}.  It "
-"implements the build procedure for packages that use "
-"@url{http://mesonbuild.com, Meson} as their build system."
+"implements the build procedure for packages that use @url{http://mesonbuild."
+"com, Meson} as their build system."
 msgstr ""
 
 #. type: defvr
@@ -9380,9 +10284,9 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:4134
 msgid ""
-"The phase runs @code{meson} with the flags specified in "
-"@code{#:configure-flags}.  The flag @code{--build-type} is always set to "
-"@code{plain} unless something else is specified in @code{#:build-type}."
+"The phase runs @code{meson} with the flags specified in @code{#:configure-"
+"flags}.  The flag @code{--build-type} is always set to @code{plain} unless "
+"something else is specified in @code{#:build-type}."
 msgstr ""
 
 #. type: table
@@ -9395,8 +10299,8 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:4142
 msgid ""
-"The phase runs @code{ninja} with the target specified in "
-"@code{#:test-target}, which is @code{\"test\"} by default."
+"The phase runs @code{ninja} with the target specified in @code{#:test-"
+"target}, which is @code{\"test\"} by default."
 msgstr ""
 
 #. type: table
@@ -9421,9 +10325,9 @@ msgid ""
 "This phase ensures that all binaries can find the libraries they need.  It "
 "searches for required libraries in subdirectories of the package being "
 "built, and adds those to @code{RUNPATH} where needed.  It also removes "
-"references to libraries left over from the build phase by "
-"@code{meson-for-build}, such as test dependencies, that aren't actually "
-"required for the program to run."
+"references to libraries left over from the build phase by @code{meson-for-"
+"build}, such as test dependencies, that aren't actually required for the "
+"program to run."
 msgstr ""
 
 #. type: table
@@ -9458,8 +10362,8 @@ msgstr ""
 msgid ""
 "This build system requires a @code{#:builder} argument.  This argument must "
 "be a Scheme expression that builds the package output(s)---as with "
-"@code{build-expression->derivation} (@pxref{Derivations, "
-"@code{build-expression->derivation}})."
+"@code{build-expression->derivation} (@pxref{Derivations, @code{build-"
+"expression->derivation}})."
 msgstr ""
 
 #. type: cindex
@@ -9478,14 +10382,14 @@ msgstr ""
 #: doc/guix.texi:4199
 msgid ""
 "Conceptually, the @dfn{store} is the place where derivations that have been "
-"built successfully are stored---by default, @file{/gnu/store}.  "
-"Sub-directories in the store are referred to as @dfn{store items} or "
-"sometimes @dfn{store paths}.  The store has an associated database that "
-"contains information such as the store paths referred to by each store path, "
-"and the list of @emph{valid} store items---results of successful builds.  "
-"This database resides in @file{@var{localstatedir}/guix/db}, where "
-"@var{localstatedir} is the state directory specified @i{via} "
-"@option{--localstatedir} at configure time, usually @file{/var}."
+"built successfully are stored---by default, @file{/gnu/store}.  Sub-"
+"directories in the store are referred to as @dfn{store items} or sometimes "
+"@dfn{store paths}.  The store has an associated database that contains "
+"information such as the store paths referred to by each store path, and the "
+"list of @emph{valid} store items---results of successful builds.  This "
+"database resides in @file{@var{localstatedir}/guix/db}, where "
+"@var{localstatedir} is the state directory specified @i{via} @option{--"
+"localstatedir} at configure time, usually @file{/var}."
 msgstr ""
 
 #. type: Plain text
@@ -9517,10 +10421,10 @@ msgstr ""
 #: doc/guix.texi:4220
 msgid ""
 "The @code{(guix store)} module provides procedures to connect to the daemon, "
-"and to perform RPCs.  These are described below.  By default, "
-"@code{open-connection}, and thus all the @command{guix} commands, connect to "
-"the local daemon or to the URI specified by the @code{GUIX_DAEMON_SOCKET} "
-"environment variable."
+"and to perform RPCs.  These are described below.  By default, @code{open-"
+"connection}, and thus all the @command{guix} commands, connect to the local "
+"daemon or to the URI specified by the @code{GUIX_DAEMON_SOCKET} environment "
+"variable."
 msgstr ""
 
 #. type: defvr
@@ -9533,13 +10437,13 @@ msgstr ""
 #: doc/guix.texi:4226
 msgid ""
 "When set, the value of this variable should be a file name or a URI "
-"designating the daemon endpoint.  When it is a file name, it denotes a "
-"Unix-domain socket to connect to.  In addition to file names, the supported "
-"URI schemes are:"
+"designating the daemon endpoint.  When it is a file name, it denotes a Unix-"
+"domain socket to connect to.  In addition to file names, the supported URI "
+"schemes are:"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:4228 doc/guix.texi:15361
+#: doc/guix.texi:4228 doc/guix.texi:15406
 #, no-wrap
 msgid "file"
 msgstr ""
@@ -9553,9 +10457,8 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:4233
 msgid ""
-"These are for Unix-domain sockets.  "
-"@code{file:///var/guix/daemon-socket/socket} is equivalent to "
-"@file{/var/guix/daemon-socket/socket}."
+"These are for Unix-domain sockets.  @code{file:///var/guix/daemon-socket/"
+"socket} is equivalent to @file{/var/guix/daemon-socket/socket}."
 msgstr ""
 
 #. type: item
@@ -9582,16 +10485,16 @@ msgstr ""
 #: doc/guix.texi:4250
 msgid ""
 "This setup is suitable on local networks, such as clusters, where only "
-"trusted nodes may connect to the build daemon at "
-"@code{master.guix.example.org}."
+"trusted nodes may connect to the build daemon at @code{master.guix.example."
+"org}."
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:4254
 msgid ""
 "The @code{--listen} option of @command{guix-daemon} can be used to instruct "
-"it to listen for TCP connections (@pxref{Invoking guix-daemon, "
-"@code{--listen}})."
+"it to listen for TCP connections (@pxref{Invoking guix-daemon, @code{--"
+"listen}})."
 msgstr ""
 
 #. type: item
@@ -9688,7 +10591,8 @@ msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:4301
-msgid "Procedures that make RPCs all take a server object as their first argument."
+msgid ""
+"Procedures that make RPCs all take a server object as their first argument."
 msgstr ""
 
 #. type: deffn
@@ -9721,9 +10625,7 @@ msgstr ""
 #. type: deffn
 #: doc/guix.texi:4313
 #, no-wrap
-msgid ""
-"{Scheme Procedure} add-text-to-store @var{server} @var{name} @var{text} "
-"[@var{references}]"
+msgid "{Scheme Procedure} add-text-to-store @var{server} @var{name} @var{text} [@var{references}]"
 msgstr ""
 
 #. type: deffn
@@ -9818,10 +10720,10 @@ msgstr ""
 msgid ""
 "Derivations allow clients of the daemon to communicate build actions to the "
 "store.  They exist in two forms: as an in-memory representation, both on the "
-"client- and daemon-side, and as files in the store whose name end in "
-"@code{.drv}---these files are referred to as @dfn{derivation paths}.  "
-"Derivations paths can be passed to the @code{build-derivations} procedure to "
-"perform the build actions they prescribe (@pxref{The Store})."
+"client- and daemon-side, and as files in the store whose name end in @code{."
+"drv}---these files are referred to as @dfn{derivation paths}.  Derivations "
+"paths can be passed to the @code{build-derivations} procedure to perform the "
+"build actions they prescribe (@pxref{The Store})."
 msgstr ""
 
 #. type: cindex
@@ -9834,10 +10736,10 @@ msgstr ""
 #: doc/guix.texi:4378
 msgid ""
 "Operations such as file downloads and version-control checkouts for which "
-"the expected content hash is known in advance are modeled as "
-"@dfn{fixed-output derivations}.  Unlike regular derivations, the outputs of "
-"a fixed-output derivation are independent of its inputs---e.g., a source "
-"code download produces the same result regardless of the download method and "
+"the expected content hash is known in advance are modeled as @dfn{fixed-"
+"output derivations}.  Unlike regular derivations, the outputs of a fixed-"
+"output derivation are independent of its inputs---e.g., a source code "
+"download produces the same result regardless of the download method and "
 "tools being used."
 msgstr ""
 
@@ -9859,12 +10761,12 @@ msgstr ""
 #. type: deffn
 #: doc/guix.texi:4393
 msgid ""
-"@var{args} [#:outputs '(\"out\")] [#:hash #f] [#:hash-algo #f] @ "
-"[#:recursive? #f] [#:inputs '()] [#:env-vars '()] @ [#:system "
-"(%current-system)] [#:references-graphs #f] @ [#:allowed-references #f] "
-"[#:disallowed-references #f] @ [#:leaked-env-vars #f] [#:local-build? #f] @ "
-"[#:substitutable? #t] Build a derivation with the given arguments, and "
-"return the resulting @code{<derivation>} object."
+"@var{args} [#:outputs '(\"out\")] [#:hash #f] [#:hash-algo #f] @ [#:"
+"recursive? #f] [#:inputs '()] [#:env-vars '()] @ [#:system (%current-"
+"system)] [#:references-graphs #f] @ [#:allowed-references #f] [#:disallowed-"
+"references #f] @ [#:leaked-env-vars #f] [#:local-build? #f] @ [#:"
+"substitutable? #t] Build a derivation with the given arguments, and return "
+"the resulting @code{<derivation>} object."
 msgstr ""
 
 #. type: deffn
@@ -9900,10 +10802,10 @@ msgstr ""
 msgid ""
 "When @var{leaked-env-vars} is true, it must be a list of strings denoting "
 "environment variables that are allowed to ``leak'' from the daemon's "
-"environment to the build environment.  This is only applicable to "
-"fixed-output derivations---i.e., when @var{hash} is true.  The main use is "
-"to allow variables such as @code{http_proxy} to be passed to derivations "
-"that download files."
+"environment to the build environment.  This is only applicable to fixed-"
+"output derivations---i.e., when @var{hash} is true.  The main use is to "
+"allow variables such as @code{http_proxy} to be passed to derivations that "
+"download files."
 msgstr ""
 
 #. type: deffn
@@ -9953,8 +10855,7 @@ msgid ""
 "              bash `(\"-e\" ,builder)\n"
 "              #:inputs `((,bash) (,builder))\n"
 "              #:env-vars '((\"HOME\" . \"/homeless\"))))\n"
-"@result{} #<derivation /gnu/store/@dots{}-foo.drv => "
-"/gnu/store/@dots{}-foo>\n"
+"@result{} #<derivation /gnu/store/@dots{}-foo.drv => /gnu/store/@dots{}-foo>\n"
 msgstr ""
 
 #. type: Plain text
@@ -9963,17 +10864,17 @@ msgid ""
 "As can be guessed, this primitive is cumbersome to use directly.  A better "
 "approach is to write build scripts in Scheme, of course! The best course of "
 "action for that is to write the build code as a ``G-expression'', and to "
-"pass it to @code{gexp->derivation}.  For more information, "
-"@pxref{G-Expressions}."
+"pass it to @code{gexp->derivation}.  For more information, @pxref{G-"
+"Expressions}."
 msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:4459
 msgid ""
 "Once upon a time, @code{gexp->derivation} did not exist and constructing "
-"derivations with build code written in Scheme was achieved with "
-"@code{build-expression->derivation}, documented below.  This procedure is "
-"now deprecated in favor of the much nicer @code{gexp->derivation}."
+"derivations with build code written in Scheme was achieved with @code{build-"
+"expression->derivation}, documented below.  This procedure is now deprecated "
+"in favor of the much nicer @code{gexp->derivation}."
 msgstr ""
 
 #. type: deffn
@@ -9985,18 +10886,17 @@ msgstr ""
 #. type: deffn
 #: doc/guix.texi:4476
 msgid ""
-"@var{name} @var{exp} @ [#:system (%current-system)] [#:inputs '()] @ "
-"[#:outputs '(\"out\")] [#:hash #f] [#:hash-algo #f] @ [#:recursive? #f] "
-"[#:env-vars '()] [#:modules '()] @ [#:references-graphs #f] "
-"[#:allowed-references #f] @ [#:disallowed-references #f] @ [#:local-build? "
-"#f] [#:substitutable? #t] [#:guile-for-build #f] Return a derivation that "
-"executes Scheme expression @var{exp} as a builder for derivation "
-"@var{name}.  @var{inputs} must be a list of @code{(name drv-path sub-drv)} "
-"tuples; when @var{sub-drv} is omitted, @code{\"out\"} is assumed.  "
-"@var{modules} is a list of names of Guile modules from the current search "
-"path to be copied in the store, compiled, and made available in the load "
-"path during the execution of @var{exp}---e.g., @code{((guix build utils) "
-"(guix build gnu-build-system))}."
+"@var{name} @var{exp} @ [#:system (%current-system)] [#:inputs '()] @ [#:"
+"outputs '(\"out\")] [#:hash #f] [#:hash-algo #f] @ [#:recursive? #f] [#:env-"
+"vars '()] [#:modules '()] @ [#:references-graphs #f] [#:allowed-references "
+"#f] @ [#:disallowed-references #f] @ [#:local-build? #f] [#:substitutable? "
+"#t] [#:guile-for-build #f] Return a derivation that executes Scheme "
+"expression @var{exp} as a builder for derivation @var{name}.  @var{inputs} "
+"must be a list of @code{(name drv-path sub-drv)} tuples; when @var{sub-drv} "
+"is omitted, @code{\"out\"} is assumed.  @var{modules} is a list of names of "
+"Guile modules from the current search path to be copied in the store, "
+"compiled, and made available in the load path during the execution of "
+"@var{exp}---e.g., @code{((guix build utils) (guix build gnu-build-system))}."
 msgstr ""
 
 #. type: deffn
@@ -10004,11 +10904,11 @@ msgstr ""
 msgid ""
 "@var{exp} is evaluated in an environment where @code{%outputs} is bound to a "
 "list of output/path pairs, and where @code{%build-inputs} is bound to a list "
-"of string/output-path pairs made from @var{inputs}.  Optionally, "
-"@var{env-vars} is a list of string pairs specifying the name and value of "
-"environment variables visible to the builder.  The builder terminates by "
-"passing the result of @var{exp} to @code{exit}; thus, when @var{exp} returns "
-"@code{#f}, the build is considered to have failed."
+"of string/output-path pairs made from @var{inputs}.  Optionally, @var{env-"
+"vars} is a list of string pairs specifying the name and value of environment "
+"variables visible to the builder.  The builder terminates by passing the "
+"result of @var{exp} to @code{exit}; thus, when @var{exp} returns @code{#f}, "
+"the build is considered to have failed."
 msgstr ""
 
 #. type: deffn
@@ -10022,9 +10922,9 @@ msgstr ""
 #. type: deffn
 #: doc/guix.texi:4493
 msgid ""
-"See the @code{derivation} procedure for the meaning of "
-"@var{references-graphs}, @var{allowed-references}, "
-"@var{disallowed-references}, @var{local-build?}, and @var{substitutable?}."
+"See the @code{derivation} procedure for the meaning of @var{references-"
+"graphs}, @var{allowed-references}, @var{disallowed-references}, @var{local-"
+"build?}, and @var{substitutable?}."
 msgstr ""
 
 #. type: Plain text
@@ -10154,8 +11054,8 @@ msgstr ""
 #: doc/guix.texi:4572
 msgid ""
 "As it turns out, the call to @code{package->derivation} can even be omitted "
-"since it will take place implicitly, as we will see later "
-"(@pxref{G-Expressions}):"
+"since it will take place implicitly, as we will see later (@pxref{G-"
+"Expressions}):"
 msgstr ""
 
 #. type: example
@@ -10173,8 +11073,8 @@ msgstr ""
 msgid ""
 "Calling the monadic @code{sh-symlink} has no effect.  As someone once said, "
 "``you exit a monad like you exit a building on fire: by running''.  So, to "
-"exit the monad and get the desired effect, one must use "
-"@code{run-with-store}:"
+"exit the monad and get the desired effect, one must use @code{run-with-"
+"store}:"
 msgstr ""
 
 #. type: example
@@ -10321,8 +11221,8 @@ msgid ""
 "@var{mval} in @var{body}, which is a sequence of expressions.  As with the "
 "bind operator, this can be thought of as ``unpacking'' the raw, non-monadic "
 "value ``contained'' in @var{mval} and making @var{var} refer to that raw, "
-"non-monadic value within the scope of the @var{body}.  The form (@var{var} "
-"-> @var{val}) binds @var{var} to the ``normal'' value @var{val}, as per "
+"non-monadic value within the scope of the @var{body}.  The form (@var{var} -"
+"> @var{val}) binds @var{var} to the ``normal'' value @var{val}, as per "
 "@code{let}.  The binding operations occur in sequence from left to right.  "
 "The last expression of @var{body} must be a monadic expression, and its "
 "result will become the result of the @code{mlet} or @code{mlet*} when run in "
@@ -10543,9 +11443,7 @@ msgstr ""
 #. type: deffn
 #: doc/guix.texi:4760
 #, no-wrap
-msgid ""
-"{Scheme Procedure} run-with-store @var{store} @var{mval} [#:guile-for-build] "
-"[#:system (%current-system)]"
+msgid "{Scheme Procedure} run-with-store @var{store} @var{mval} [#:guile-for-build] [#:system (%current-system)]"
 msgstr ""
 
 #. type: deffn
@@ -10619,9 +11517,7 @@ msgstr ""
 #. type: example
 #: doc/guix.texi:4795
 #, no-wrap
-msgid ""
-"@result{} (\"/gnu/store/rwm@dots{}-README\" "
-"\"/gnu/store/44i@dots{}-LEGU-MIN\")\n"
+msgid "@result{} (\"/gnu/store/rwm@dots{}-README\" \"/gnu/store/44i@dots{}-LEGU-MIN\")\n"
 msgstr ""
 
 #. type: Plain text
@@ -10684,8 +11580,8 @@ msgid ""
 "So we have ``derivations'', which represent a sequence of build actions to "
 "be performed to produce an item in the store (@pxref{Derivations}).  These "
 "build actions are performed when asking the daemon to actually build the "
-"derivations; they are run by the daemon in a container (@pxref{Invoking "
-"guix-daemon})."
+"derivations; they are run by the daemon in a container (@pxref{Invoking guix-"
+"daemon})."
 msgstr ""
 
 #. type: cindex
@@ -10701,12 +11597,12 @@ msgid ""
 "Scheme.  When we do that, we end up with two @dfn{strata} of Scheme "
 "code@footnote{The term @dfn{stratum} in this context was coined by Manuel "
 "Serrano et al.@: in the context of their work on Hop.  Oleg Kiselyov, who "
-"has written insightful "
-"@url{http://okmij.org/ftp/meta-programming/#meta-scheme, essays and code on "
-"this topic}, refers to this kind of code generation as @dfn{staging}.}: the "
-"``host code''---code that defines packages, talks to the daemon, etc.---and "
-"the ``build code''---code that actually performs build actions, such as "
-"making directories, invoking @command{make}, etc."
+"has written insightful @url{http://okmij.org/ftp/meta-programming/#meta-"
+"scheme, essays and code on this topic}, refers to this kind of code "
+"generation as @dfn{staging}.}: the ``host code''---code that defines "
+"packages, talks to the daemon, etc.---and the ``build code''---code that "
+"actually performs build actions, such as making directories, invoking "
+"@command{make}, etc."
 msgstr ""
 
 #. type: Plain text
@@ -10722,11 +11618,11 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:4859
 msgid ""
-"The @code{(guix gexp)} module implements @dfn{G-expressions}, a form of "
-"S-expressions adapted to build expressions.  G-expressions, or @dfn{gexps}, "
+"The @code{(guix gexp)} module implements @dfn{G-expressions}, a form of S-"
+"expressions adapted to build expressions.  G-expressions, or @dfn{gexps}, "
 "consist essentially of three syntactic forms: @code{gexp}, @code{ungexp}, "
-"and @code{ungexp-splicing} (or simply: @code{#~}, @code{#$}, and "
-"@code{#$@@}), which are comparable to @code{quasiquote}, @code{unquote}, and "
+"and @code{ungexp-splicing} (or simply: @code{#~}, @code{#$}, and @code{#"
+"$@@}), which are comparable to @code{quasiquote}, @code{unquote}, and "
 "@code{unquote-splicing}, respectively (@pxref{Expression Syntax, "
 "@code{quasiquote},, guile, GNU Guile Reference Manual}).  However, there are "
 "major differences:"
@@ -10793,8 +11689,8 @@ msgstr ""
 #: doc/guix.texi:4901
 msgid ""
 "This gexp can be passed to @code{gexp->derivation}; we obtain a derivation "
-"that builds a directory containing exactly one symlink to "
-"@file{/gnu/store/@dots{}-coreutils-8.22/bin/ls}:"
+"that builds a directory containing exactly one symlink to @file{/gnu/store/"
+"@dots{}-coreutils-8.22/bin/ls}:"
 msgstr ""
 
 #. type: example
@@ -10892,8 +11788,8 @@ msgstr ""
 #: doc/guix.texi:4959
 msgid ""
 "In this example, the @code{(guix build utils)} module is automatically "
-"pulled into the isolated build environment of our gexp, such that "
-"@code{(use-modules (guix build utils))} works as expected."
+"pulled into the isolated build environment of our gexp, such that @code{(use-"
+"modules (guix build utils))} works as expected."
 msgstr ""
 
 #. type: cindex
@@ -10982,8 +11878,8 @@ msgstr ""
 msgid ""
 "Introduce a reference to @var{obj}.  @var{obj} may have one of the supported "
 "types, for example a package or a derivation, in which case the "
-"@code{ungexp} form is replaced by its output file name---e.g., "
-"@code{\"/gnu/store/@dots{}-coreutils-8.22}."
+"@code{ungexp} form is replaced by its output file name---e.g., @code{\"/gnu/"
+"store/@dots{}-coreutils-8.22}."
 msgstr ""
 
 #. type: table
@@ -11200,17 +12096,16 @@ msgstr ""
 #. type: deffn
 #: doc/guix.texi:5090
 msgid ""
-"[#:system (%current-system)] [#:target #f] [#:graft? #t] @ [#:hash #f] "
-"[#:hash-algo #f] @ [#:recursive? #f] [#:env-vars '()] [#:modules '()] @ "
-"[#:module-path @var{%load-path}] @ [#:references-graphs #f] "
-"[#:allowed-references #f] @ [#:disallowed-references #f] @ "
-"[#:leaked-env-vars #f] @ [#:script-name (string-append @var{name} "
-"\"-builder\")] @ [#:deprecation-warnings #f] @ [#:local-build? #f] "
-"[#:substitutable? #t] [#:guile-for-build #f] Return a derivation @var{name} "
-"that runs @var{exp} (a gexp) with @var{guile-for-build} (a derivation) on "
-"@var{system}; @var{exp} is stored in a file called @var{script-name}.  When "
-"@var{target} is true, it is used as the cross-compilation target triplet for "
-"packages referred to by @var{exp}."
+"[#:system (%current-system)] [#:target #f] [#:graft? #t] @ [#:hash #f] [#:"
+"hash-algo #f] @ [#:recursive? #f] [#:env-vars '()] [#:modules '()] @ [#:"
+"module-path @var{%load-path}] @ [#:references-graphs #f] [#:allowed-"
+"references #f] @ [#:disallowed-references #f] @ [#:leaked-env-vars #f] @ [#:"
+"script-name (string-append @var{name} \"-builder\")] @ [#:deprecation-"
+"warnings #f] @ [#:local-build? #f] [#:substitutable? #t] [#:guile-for-build "
+"#f] Return a derivation @var{name} that runs @var{exp} (a gexp) with "
+"@var{guile-for-build} (a derivation) on @var{system}; @var{exp} is stored in "
+"a file called @var{script-name}.  When @var{target} is true, it is used as "
+"the cross-compilation target triplet for packages referred to by @var{exp}."
 msgstr ""
 
 #. type: deffn
@@ -11310,8 +12205,8 @@ msgid ""
 "The effect here is to ``intern'' @file{/tmp/my-nscd.conf} by copying it to "
 "the store.  Once expanded, for instance @i{via} @code{gexp->derivation}, the "
 "G-expression refers to that copy under @file{/gnu/store}; thus, modifying or "
-"removing the file in @file{/tmp} does not have any effect on what the "
-"G-expression does.  @code{plain-file} can be used similarly; it differs in "
+"removing the file in @file{/tmp} does not have any effect on what the G-"
+"expression does.  @code{plain-file} can be used similarly; it differs in "
 "that the file content is directly passed as a string."
 msgstr ""
 
@@ -11417,9 +12312,9 @@ msgstr ""
 #. type: deffn
 #: doc/guix.texi:5205
 msgid ""
-"When ``running'' it through the store (@pxref{The Store Monad, "
-"@code{run-with-store}}), we obtain a derivation that produces an executable "
-"file @file{/gnu/store/@dots{}-list-files} along these lines:"
+"When ``running'' it through the store (@pxref{The Store Monad, @code{run-"
+"with-store}}), we obtain a derivation that produces an executable file "
+"@file{/gnu/store/@dots{}-list-files} along these lines:"
 msgstr ""
 
 #. type: example
@@ -11741,7 +12636,9 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:5400 doc/guix.texi:6057 doc/guix.texi:6124 doc/guix.texi:6793 doc/guix.texi:7123 doc/guix.texi:7453 doc/guix.texi:7758 doc/guix.texi:7824 doc/guix.texi:7863
+#: doc/guix.texi:5400 doc/guix.texi:6057 doc/guix.texi:6124 doc/guix.texi:6793
+#: doc/guix.texi:7123 doc/guix.texi:7453 doc/guix.texi:7758 doc/guix.texi:7824
+#: doc/guix.texi:7863
 msgid "The general syntax is:"
 msgstr ""
 
@@ -11785,8 +12682,7 @@ msgid ""
 "software distribution such as @code{coreutils} or @code{coreutils@@8.20}, or "
 "a derivation such as @file{/gnu/store/@dots{}-coreutils-8.19.drv}.  In the "
 "former case, a package with the corresponding name (and optionally version) "
-"is searched for among the GNU distribution modules (@pxref{Package "
-"Modules})."
+"is searched for among the GNU distribution modules (@pxref{Package Modules})."
 msgstr ""
 
 #. type: Plain text
@@ -11931,8 +12827,8 @@ msgstr ""
 #: doc/guix.texi:5490
 msgid ""
 "Consider @var{urls} the whitespace-separated list of substitute source URLs, "
-"overriding the default list of URLs of @command{guix-daemon} "
-"(@pxref{daemon-substitute-urls,, @command{guix-daemon} URLs})."
+"overriding the default list of URLs of @command{guix-daemon} (@pxref{daemon-"
+"substitute-urls,, @command{guix-daemon} URLs})."
 msgstr ""
 
 #. type: table
@@ -11945,7 +12841,8 @@ msgstr ""
 
 #. type: table
 #: doc/guix.texi:5497
-msgid "When @var{urls} is the empty string, substitutes are effectively disabled."
+msgid ""
+"When @var{urls} is the empty string, substitutes are effectively disabled."
 msgstr ""
 
 #. type: item
@@ -11978,10 +12875,10 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:5516
 msgid ""
-"This is a useful way to detect non-deterministic builds processes.  "
-"Non-deterministic build processes are a problem because they make it "
-"practically impossible for users to @emph{verify} whether third-party "
-"binaries are genuine.  @xref{Invoking guix challenge}, for more."
+"This is a useful way to detect non-deterministic builds processes.  Non-"
+"deterministic build processes are a problem because they make it practically "
+"impossible for users to @emph{verify} whether third-party binaries are "
+"genuine.  @xref{Invoking guix challenge}, for more."
 msgstr ""
 
 #. type: table
@@ -12152,9 +13049,8 @@ msgstr ""
 #: doc/guix.texi:5619
 msgid ""
 "This option allows users to try out versions of packages other than the one "
-"provided by the distribution.  The example below downloads "
-"@file{ed-1.7.tar.gz} from a GNU mirror and uses that as the source for the "
-"@code{ed} package:"
+"provided by the distribution.  The example below downloads @file{ed-1.7.tar."
+"gz} from a GNU mirror and uses that as the source for the @code{ed} package:"
 msgstr ""
 
 #. type: example
@@ -12308,8 +13204,7 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:5703
 msgid ""
-"Build the package or derivation that the code within @var{file} evaluates "
-"to."
+"Build the package or derivation that the code within @var{file} evaluates to."
 msgstr ""
 
 #. type: table
@@ -12328,8 +13223,7 @@ msgstr ""
 #: doc/guix.texi:5718
 msgid ""
 "For example, @var{expr} may be @code{(@@ (gnu packages guile)  guile-1.8)}, "
-"which unambiguously designates this specific variant of version 1.8 of "
-"Guile."
+"which unambiguously designates this specific variant of version 1.8 of Guile."
 msgstr ""
 
 #. type: table
@@ -12369,9 +13263,8 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:5735
 msgid ""
-"For instance, @code{guix build -S gcc} returns something like "
-"@file{/gnu/store/@dots{}-gcc-4.7.2.tar.bz2}, which is the GCC source "
-"tarball."
+"For instance, @code{guix build -S gcc} returns something like @file{/gnu/"
+"store/@dots{}-gcc-4.7.2.tar.bz2}, which is the GCC source tarball."
 msgstr ""
 
 #. type: table
@@ -12412,7 +13305,7 @@ msgid ""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:5753 doc/guix.texi:11753
+#: doc/guix.texi:5753 doc/guix.texi:11798
 #, no-wrap
 msgid "all"
 msgstr ""
@@ -12524,8 +13417,7 @@ msgstr ""
 #: doc/guix.texi:5821
 msgid ""
 "Rebuild @var{package-or-derivation}, which are already available in the "
-"store, and raise an error if the build results are not bit-for-bit "
-"identical."
+"store, and raise an error if the build results are not bit-for-bit identical."
 msgstr ""
 
 #. type: table
@@ -12552,8 +13444,8 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:5836
 msgid ""
-"Attempt to repair the specified store items, if they are corrupt, by "
-"re-downloading or rebuilding them."
+"Attempt to repair the specified store items, if they are corrupt, by re-"
+"downloading or rebuilding them."
 msgstr ""
 
 #. type: table
@@ -12569,17 +13461,18 @@ msgstr ""
 
 #. type: table
 #: doc/guix.texi:5843
-msgid "Return the derivation paths, not the output paths, of the given packages."
+msgid ""
+"Return the derivation paths, not the output paths, of the given packages."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:5844 doc/guix.texi:7231 doc/guix.texi:20580
+#: doc/guix.texi:5844 doc/guix.texi:7231 doc/guix.texi:20625
 #, no-wrap
 msgid "--root=@var{file}"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:5845 doc/guix.texi:7232 doc/guix.texi:20581
+#: doc/guix.texi:5845 doc/guix.texi:7232 doc/guix.texi:20626
 #, no-wrap
 msgid "-r @var{file}"
 msgstr ""
@@ -12597,7 +13490,7 @@ msgid "garbage collector roots, adding"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5850 doc/guix.texi:20584
+#: doc/guix.texi:5850 doc/guix.texi:20629
 msgid ""
 "Make @var{file} a symlink to the result, and register it as a garbage "
 "collector root."
@@ -12627,8 +13520,8 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:5862
 msgid ""
-"Return the build log file names or URLs for the given "
-"@var{package-or-derivation}, or raise an error if build logs are missing."
+"Return the build log file names or URLs for the given @var{package-or-"
+"derivation}, or raise an error if build logs are missing."
 msgstr ""
 
 #. type: table
@@ -12763,9 +13656,9 @@ msgid ""
 "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 "
-"@option{--no-grafts} option makes sure we get the exact same environment, "
-"with ungrafted packages (@pxref{Security Updates}, for more info on grafts)."
+"container, which would 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)."
 msgstr ""
 
 #. type: Plain text
@@ -12976,7 +13869,8 @@ msgstr ""
 
 #. type: table
 #: doc/guix.texi:6045
-msgid "Save the downloaded file to @var{file} instead of adding it to the store."
+msgid ""
+"Save the downloaded file to @var{file} instead of adding it to the store."
 msgstr ""
 
 #. type: section
@@ -13158,8 +14052,8 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:6145
 msgid ""
-"For example, the following command returns a package definition for "
-"GNU@tie{}Hello:"
+"For example, the following command returns a package definition for GNU@tie{}"
+"Hello:"
 msgstr ""
 
 #. type: example
@@ -13264,8 +14158,8 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:6206
 msgid ""
-"Import metadata from @uref{https://www.metacpan.org/, "
-"MetaCPAN}@footnote{This functionality requires Guile-JSON to be installed.  "
+"Import metadata from @uref{https://www.metacpan.org/, MetaCPAN}"
+"@footnote{This functionality requires Guile-JSON to be installed.  "
 "@xref{Requirements}.}.  Information is taken from the JSON-formatted "
 "metadata provided through @uref{https://fastapi.metacpan.org/, MetaCPAN's "
 "API} and includes most relevant information, such as module dependencies.  "
@@ -13315,12 +14209,14 @@ msgstr ""
 
 #. type: table
 #: doc/guix.texi:6222
-msgid "Information is extracted from the @code{DESCRIPTION} file of the package."
+msgid ""
+"Information is extracted from the @code{DESCRIPTION} file of the package."
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:6225
-msgid "The command command below imports metadata for the @code{Cairo} R package:"
+msgid ""
+"The command command below imports metadata for the @code{Cairo} R package:"
 msgstr ""
 
 #. type: example
@@ -13355,7 +14251,8 @@ msgstr ""
 
 #. type: table
 #: doc/guix.texi:6244
-msgid "The command below imports metadata for the @code{GenomicRanges} R package:"
+msgid ""
+"The command below imports metadata for the @code{GenomicRanges} R package:"
 msgstr ""
 
 #. type: example
@@ -13386,8 +14283,8 @@ msgstr ""
 #: doc/guix.texi:6255
 msgid ""
 "Import metadata from @uref{http://www.ctan.org/, CTAN}, the comprehensive "
-"TeX archive network for TeX packages that are part of the "
-"@uref{https://www.tug.org/texlive/, TeX Live distribution}."
+"TeX archive network for TeX packages that are part of the @uref{https://www."
+"tug.org/texlive/, TeX Live distribution}."
 msgstr ""
 
 #. type: table
@@ -13526,13 +14423,13 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:6340
 msgid ""
-"Import metadata from a local copy of the source of the "
-"@uref{http://nixos.org/nixpkgs/, Nixpkgs distribution}@footnote{This relies "
-"on the @command{nix-instantiate} command of @uref{http://nixos.org/nix/, "
-"Nix}.}.  Package definitions in Nixpkgs are typically written in a mixture "
-"of Nix-language and Bash code.  This command only imports the high-level "
-"package structure that is written in the Nix language.  It normally includes "
-"all the basic fields of a package definition."
+"Import metadata from a local copy of the source of the @uref{http://nixos."
+"org/nixpkgs/, Nixpkgs distribution}@footnote{This relies on the @command{nix-"
+"instantiate} command of @uref{http://nixos.org/nix/, Nix}.}.  Package "
+"definitions in Nixpkgs are typically written in a mixture of Nix-language "
+"and Bash code.  This command only imports the high-level package structure "
+"that is written in the Nix language.  It normally includes all the basic "
+"fields of a package definition."
 msgstr ""
 
 #. type: table
@@ -13555,7 +14452,8 @@ msgstr ""
 
 #. type: table
 #: doc/guix.texi:6352
-msgid "so that @command{nix-instantiate} does not try to open the Nix database."
+msgid ""
+"so that @command{nix-instantiate} does not try to open the Nix database."
 msgstr ""
 
 #. type: table
@@ -13750,8 +14648,7 @@ msgstr ""
 #: doc/guix.texi:6445
 msgid ""
 "@var{repo} identifies the archive repository from which to retrieve the "
-"information.  Currently the supported repositories and their identifiers "
-"are:"
+"information.  Currently the supported repositories and their identifiers are:"
 msgstr ""
 
 #. type: itemize
@@ -13793,8 +14690,8 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:6470
 msgid ""
-"Import metadata from the crates.io Rust package repository "
-"@uref{https://crates.io, crates.io}."
+"Import metadata from the crates.io Rust package repository @uref{https://"
+"crates.io, crates.io}."
 msgstr ""
 
 #. type: Plain text
@@ -13831,8 +14728,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "$ guix refresh\n"
-"gnu/packages/gettext.scm:29:13: gettext would be upgraded from 0.18.1.1 to "
-"0.18.2.1\n"
+"gnu/packages/gettext.scm:29:13: gettext would be upgraded from 0.18.1.1 to 0.18.2.1\n"
 "gnu/packages/glib.scm:77:12: glib would be upgraded from 2.34.3 to 2.37.0\n"
 msgstr ""
 
@@ -13849,8 +14745,7 @@ msgstr ""
 msgid ""
 "$ guix refresh coreutils guile guile-ssh\n"
 "gnu/packages/ssh.scm:205:2: warning: no updater for guile-ssh\n"
-"gnu/packages/guile.scm:136:12: guile would be upgraded from 2.0.12 to "
-"2.0.13\n"
+"gnu/packages/guile.scm:136:12: guile would be upgraded from 2.0.12 to 2.0.13\n"
 msgstr ""
 
 #. type: Plain text
@@ -13969,8 +14864,8 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:6565
 msgid ""
-"Select all the packages in @var{subset}, one of @code{core} or "
-"@code{non-core}."
+"Select all the packages in @var{subset}, one of @code{core} or @code{non-"
+"core}."
 msgstr ""
 
 #. type: table
@@ -14143,10 +15038,8 @@ msgstr ""
 #, no-wrap
 msgid ""
 "$ guix refresh --type=elpa,cran\n"
-"gnu/packages/statistics.scm:819:13: r-testthat would be upgraded from 0.10.0 "
-"to 0.11.0\n"
-"gnu/packages/emacs.scm:856:13: emacs-auctex would be upgraded from 11.88.6 "
-"to 11.88.9\n"
+"gnu/packages/statistics.scm:819:13: r-testthat would be upgraded from 0.10.0 to 0.11.0\n"
+"gnu/packages/emacs.scm:856:13: emacs-auctex would be upgraded from 11.88.6 to 11.88.9\n"
 msgstr ""
 
 #. type: Plain text
@@ -14242,10 +15135,8 @@ msgstr ""
 #, no-wrap
 msgid ""
 "$ guix refresh --list-dependent flex\n"
-"Building the following 120 packages would ensure 213 dependent packages are "
-"rebuilt:\n"
-"hop@@2.4.0 geiser@@0.4 notmuch@@0.18 mu@@0.9.9.5 cflow@@1.4 idutils@@4.6 "
-"@dots{}\n"
+"Building the following 120 packages would ensure 213 dependent packages are rebuilt:\n"
+"hop@@2.4.0 geiser@@0.4 notmuch@@0.18 mu@@0.9.9.5 cflow@@1.4 idutils@@4.6 @dots{}\n"
 msgstr ""
 
 #. type: Plain text
@@ -14275,11 +15166,12 @@ msgstr ""
 
 #. type: table
 #: doc/guix.texi:6692
-msgid "Handle missing OpenPGP keys according to @var{policy}, which may be one of:"
+msgid ""
+"Handle missing OpenPGP keys according to @var{policy}, which may be one of:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:6694 doc/guix.texi:13670
+#: doc/guix.texi:6694 doc/guix.texi:13715
 #, no-wrap
 msgid "always"
 msgstr ""
@@ -14292,7 +15184,7 @@ msgid ""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:6698 doc/guix.texi:13672
+#: doc/guix.texi:6698 doc/guix.texi:13717
 #, no-wrap
 msgid "never"
 msgstr ""
@@ -14336,8 +15228,8 @@ msgid ""
 "refresh on all GitHub packages in Guix requires more than this.  "
 "Authentication with GitHub through the use of an API token alleviates these "
 "limits.  To use an API token, set the environment variable "
-"@code{GUIX_GITHUB_TOKEN} to a token procured from "
-"@uref{https://github.com/settings/tokens} or otherwise."
+"@code{GUIX_GITHUB_TOKEN} to a token procured from @uref{https://github.com/"
+"settings/tokens} or otherwise."
 msgstr ""
 
 #. type: section
@@ -14403,9 +15295,8 @@ msgstr ""
 msgid ""
 "Probe @code{home-page} and @code{source} URLs and report those that are "
 "invalid.  Suggest a @code{mirror://} URL when applicable.  Check that the "
-"source file name is meaningful, e.g. is not just a version number or "
-"``git-checkout'', without a declared @code{file-name} (@pxref{origin "
-"Reference})."
+"source file name is meaningful, e.g. is not just a version number or ``git-"
+"checkout'', without a declared @code{file-name} (@pxref{origin Reference})."
 msgstr ""
 
 #. type: item
@@ -14415,7 +15306,7 @@ msgid "cve"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:6754 doc/guix.texi:21440
+#: doc/guix.texi:6754 doc/guix.texi:21485
 #, no-wrap
 msgid "security vulnerabilities"
 msgstr ""
@@ -14430,13 +15321,14 @@ msgstr ""
 #: doc/guix.texi:6760
 msgid ""
 "Report known vulnerabilities found in the Common Vulnerabilities and "
-"Exposures (CVE) databases of the current and past year "
-"@uref{https://nvd.nist.gov/download.cfm#CVE_FEED, published by the US NIST}."
+"Exposures (CVE) databases of the current and past year @uref{https://nvd."
+"nist.gov/download.cfm#CVE_FEED, published by the US NIST}."
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:6762
-msgid "To view information about a particular vulnerability, visit pages such as:"
+msgid ""
+"To view information about a particular vulnerability, visit pages such as:"
 msgstr ""
 
 #. type: indicateurl{#1}
@@ -14459,10 +15351,9 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:6778
 msgid ""
-"Package developers can specify in package recipes the "
-"@uref{https://nvd.nist.gov/cpe.cfm,Common Platform Enumeration (CPE)} name "
-"and version of the package when they differ from the name that Guix uses, as "
-"in this example:"
+"Package developers can specify in package recipes the @uref{https://nvd.nist."
+"gov/cpe.cfm,Common Platform Enumeration (CPE)} name and version of the "
+"package when they differ from the name that Guix uses, as in this example:"
 msgstr ""
 
 #. type: example
@@ -14618,10 +15509,10 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:6863
 msgid ""
-"In this example, we see that the closure of Coreutils weighs in at "
-"70@tie{}MiB, half of which is taken by libc.  (That libc represents a large "
-"fraction of the closure is not a problem @i{per se} because it is always "
-"available on the system anyway.)"
+"In this example, we see that the closure of Coreutils weighs in at 70@tie{}"
+"MiB, half of which is taken by libc.  (That libc represents a large fraction "
+"of the closure is not a problem @i{per se} because it is always available on "
+"the system anyway.)"
 msgstr ""
 
 #. type: Plain text
@@ -14734,10 +15625,10 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:6923
 msgid ""
-"This option requires that "
-"@uref{http://wingolog.org/software/guile-charting/, Guile-Charting} be "
-"installed and visible in Guile's module search path.  When that is not the "
-"case, @command{guix size} fails as it tries to load it."
+"This option requires that @uref{http://wingolog.org/software/guile-"
+"charting/, Guile-Charting} be installed and visible in Guile's module search "
+"path.  When that is not the case, @command{guix size} fails as it tries to "
+"load it."
 msgstr ""
 
 #. type: table
@@ -14773,10 +15664,10 @@ msgid ""
 "representation in the input format of @uref{http://www.graphviz.org/, "
 "Graphviz}, so its output can be passed directly to the @command{dot} command "
 "of Graphviz.  It can also emit an HTML page with embedded JavaScript code to "
-"display a ``chord diagram'' in a Web browser, using the "
-"@uref{https://d3js.org/, d3.js} library, or emit Cypher queries to construct "
-"a graph in a graph database supporting the @uref{http://www.opencypher.org/, "
-"openCypher} query language.  The general syntax is:"
+"display a ``chord diagram'' in a Web browser, using the @uref{https://d3js."
+"org/, d3.js} library, or emit Cypher queries to construct a graph in a graph "
+"database supporting the @uref{http://www.opencypher.org/, openCypher} query "
+"language.  The general syntax is:"
 msgstr ""
 
 #. type: example
@@ -14806,7 +15697,8 @@ msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:6964
-msgid "@image{images/coreutils-graph,2in,,Dependency graph of the GNU Coreutils}"
+msgid ""
+"@image{images/coreutils-graph,2in,,Dependency graph of the GNU Coreutils}"
 msgstr ""
 
 #. type: Plain text
@@ -14900,8 +15792,8 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:7008
 msgid ""
-"At the bottom of the graph, we see all the implicit inputs of "
-"@var{gnu-build-system} (@pxref{Build Systems, @code{gnu-build-system}})."
+"At the bottom of the graph, we see all the implicit inputs of @var{gnu-build-"
+"system} (@pxref{Build Systems, @code{gnu-build-system}})."
 msgstr ""
 
 #. type: table
@@ -15060,7 +15952,7 @@ msgid "--type=@var{type}"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:7081 doc/guix.texi:20558
+#: doc/guix.texi:7081 doc/guix.texi:20603
 #, no-wrap
 msgid "-t @var{type}"
 msgstr ""
@@ -15188,15 +16080,15 @@ msgid ""
 "version of the environment that @command{guix environment} was run in.  It "
 "contains the necessary search paths for building the given package added to "
 "the existing environment variables.  To create a ``pure'' environment, in "
-"which the original environment variables have been unset, use the "
-"@code{--pure} option@footnote{Users sometimes wrongfully augment environment "
+"which the original environment variables have been unset, use the @code{--"
+"pure} option@footnote{Users sometimes wrongfully augment environment "
 "variables such as @code{PATH} in their @file{~/.bashrc} file.  As a "
 "consequence, when @code{guix environment} launches it, Bash may read "
 "@file{~/.bashrc}, thereby introducing ``impurities'' in these environment "
-"variables.  It is an error to define such environment variables in "
-"@file{.bashrc}; instead, they should be defined in @file{.bash_profile}, "
-"which is sourced only by log-in shells.  @xref{Bash Startup Files,,, bash, "
-"The GNU Bash Reference Manual}, for details on Bash start-up files.}."
+"variables.  It is an error to define such environment variables in @file{."
+"bashrc}; instead, they should be defined in @file{.bash_profile}, which is "
+"sourced only by log-in shells.  @xref{Bash Startup Files,,, bash, The GNU "
+"Bash Reference Manual}, for details on Bash start-up files.}."
 msgstr ""
 
 #. type: vindex
@@ -15304,11 +16196,10 @@ msgstr ""
 msgid ""
 "Sometimes it is desirable to isolate the environment as much as possible, "
 "for maximal purity and reproducibility.  In particular, when using Guix on a "
-"host distro that is not GuixSD, it is desirable to prevent access to "
-"@file{/usr/bin} and other system-wide resources from the development "
-"environment.  For example, the following command spawns a Guile REPL in a "
-"``container'' where only the store and the current working directory are "
-"mounted:"
+"host distro that is not GuixSD, it is desirable to prevent access to @file{/"
+"usr/bin} and other system-wide resources from the development environment.  "
+"For example, the following command spawns a Guile REPL in a ``container'' "
+"where only the store and the current working directory are mounted:"
 msgstr ""
 
 #. type: example
@@ -15414,9 +16305,7 @@ msgstr ""
 #. type: example
 #: doc/guix.texi:7274
 #, no-wrap
-msgid ""
-"guix environment --ad-hoc -e '(list (@@ (gnu packages bash) bash) "
-"\"include\")'\n"
+msgid "guix environment --ad-hoc -e '(list (@@ (gnu packages bash) bash) \"include\")'\n"
 msgstr ""
 
 #. type: item
@@ -15533,7 +16422,8 @@ msgstr ""
 
 #. type: table
 #: doc/guix.texi:7331
-msgid "Display the environment variable definitions that make up the environment."
+msgid ""
+"Display the environment variable definitions that make up the environment."
 msgstr ""
 
 #. type: table
@@ -15554,7 +16444,7 @@ msgid "-C"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:7338 doc/guix.texi:7849 doc/guix.texi:20507
+#: doc/guix.texi:7338 doc/guix.texi:7849 doc/guix.texi:20552
 #, no-wrap
 msgid "container"
 msgstr ""
@@ -15565,10 +16455,10 @@ msgid ""
 "Run @var{command} within an isolated container.  The current working "
 "directory outside the container is mapped inside the container.  "
 "Additionally, unless overridden with @code{--user}, a dummy home directory "
-"is created that matches the current user's home directory, and "
-"@file{/etc/passwd} is configured accordingly.  The spawned process runs as "
-"the current user outside the container, but has root privileges in the "
-"context of the container."
+"is created that matches the current user's home directory, and @file{/etc/"
+"passwd} is configured accordingly.  The spawned process runs as the current "
+"user outside the container, but has root privileges in the context of the "
+"container."
 msgstr ""
 
 #. type: item
@@ -15587,8 +16477,7 @@ msgstr ""
 #: doc/guix.texi:7352
 msgid ""
 "For containers, share the network namespace with the host system.  "
-"Containers created without this flag only have access to the loopback "
-"device."
+"Containers created without this flag only have access to the loopback device."
 msgstr ""
 
 #. type: item
@@ -15648,8 +16537,8 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:7381
 msgid ""
-"Additionally, any shared or exposed path (see @code{--share} and "
-"@code{--expose} respectively) whose target is within the current user's home "
+"Additionally, any shared or exposed path (see @code{--share} and @code{--"
+"expose} respectively) whose target is within the current user's home "
 "directory will be remapped relative to @file{/home/USER}; this includes the "
 "automatic mapping of the current working directory."
 msgstr ""
@@ -15698,9 +16587,7 @@ msgstr ""
 #. type: example
 #: doc/guix.texi:7406
 #, no-wrap
-msgid ""
-"guix environment --container --expose=$HOME=/exchange --ad-hoc guile -- "
-"guile\n"
+msgid "guix environment --container --expose=$HOME=/exchange --ad-hoc guile -- guile\n"
 msgstr ""
 
 #. type: item
@@ -15722,16 +16609,14 @@ msgstr ""
 #: doc/guix.texi:7417
 msgid ""
 "The example below spawns a Guile REPL in a container in which the user's "
-"home directory is accessible for both reading and writing via the "
-"@file{/exchange} directory:"
+"home directory is accessible for both reading and writing via the @file{/"
+"exchange} directory:"
 msgstr ""
 
 #. type: example
 #: doc/guix.texi:7420
 #, no-wrap
-msgid ""
-"guix environment --container --share=$HOME=/exchange --ad-hoc guile -- "
-"guile\n"
+msgid "guix environment --container --share=$HOME=/exchange --ad-hoc guile -- guile\n"
 msgstr ""
 
 #. type: Plain text
@@ -15767,8 +16652,8 @@ msgid ""
 "When @command{guix publish} runs, it spawns an HTTP server which allows "
 "anyone with network access to obtain substitutes from it.  This means that "
 "any machine running Guix can also act as if it were a build farm, since the "
-"HTTP interface is compatible with Hydra, the software behind the "
-"@code{hydra.gnu.org} build farm."
+"HTTP interface is compatible with Hydra, the software behind the @code{hydra."
+"gnu.org} build farm."
 msgstr ""
 
 #. type: Plain text
@@ -15839,9 +16724,9 @@ msgid ""
 "As a bonus, @command{guix publish} also serves as a content-addressed mirror "
 "for source files referenced in @code{origin} records (@pxref{origin "
 "Reference}).  For instance, assuming @command{guix publish} is running on "
-"@code{example.org}, the following URL returns the raw "
-"@file{hello-2.10.tar.gz} file with the given SHA256 hash (represented in "
-"@code{nix-base32} format, @pxref{Invoking guix hash}):"
+"@code{example.org}, the following URL returns the raw @file{hello-2.10.tar."
+"gz} file with the given SHA256 hash (represented in @code{nix-base32} "
+"format, @pxref{Invoking guix hash}):"
 msgstr ""
 
 #. type: example
@@ -15879,11 +16764,10 @@ msgstr ""
 msgid ""
 "When @command{guix-daemon} is configured to save compressed build logs, as "
 "is the case by default (@pxref{Invoking guix-daemon}), @code{/log} URLs "
-"return the compressed log as-is, with an appropriate @code{Content-Type} "
-"and/or @code{Content-Encoding} header.  We recommend running "
-"@command{guix-daemon} with @code{--log-compression=gzip} since Web browsers "
-"can automatically decompress it, which is not the case with bzip2 "
-"compression."
+"return the compressed log as-is, with an appropriate @code{Content-Type} and/"
+"or @code{Content-Encoding} header.  We recommend running @command{guix-"
+"daemon} with @code{--log-compression=gzip} since Web browsers can "
+"automatically decompress it, which is not the case with bzip2 compression."
 msgstr ""
 
 #. type: item
@@ -15904,7 +16788,7 @@ msgid "Listen for HTTP requests on @var{port}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:7517 doc/guix.texi:16987
+#: doc/guix.texi:7517 doc/guix.texi:17032
 #, no-wrap
 msgid "--listen=@var{host}"
 msgstr ""
@@ -16002,8 +16886,8 @@ msgstr ""
 #: doc/guix.texi:7566
 msgid ""
 "The ``baking'' process is performed by worker threads.  By default, one "
-"thread per CPU core is created, but this can be customized.  See "
-"@option{--workers} below."
+"thread per CPU core is created, but this can be customized.  See @option{--"
+"workers} below."
 msgstr ""
 
 #. type: table
@@ -16073,9 +16957,9 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:7595
 msgid ""
-"By default, nars are served at a URL such as "
-"@code{/nar/gzip/@dots{}-coreutils-8.25}.  This option allows you to change "
-"the @code{/nar} part to @var{path}."
+"By default, nars are served at a URL such as @code{/nar/gzip/@dots{}-"
+"coreutils-8.25}.  This option allows you to change the @code{/nar} part to "
+"@var{path}."
 msgstr ""
 
 #. type: item
@@ -16104,8 +16988,8 @@ msgid ""
 "signing and the public key is merely advertised in the signature metadata).  "
 "They must contain keys in the canonical s-expression format as produced by "
 "@command{guix archive --generate-key} (@pxref{Invoking guix archive}).  By "
-"default, @file{/etc/guix/signing-key.pub} and "
-"@file{/etc/guix/signing-key.sec} are used."
+"default, @file{/etc/guix/signing-key.pub} and @file{/etc/guix/signing-key."
+"sec} are used."
 msgstr ""
 
 #. type: item
@@ -16162,8 +17046,7 @@ msgstr ""
 #: doc/guix.texi:7639
 #, no-wrap
 msgid ""
-"# ln -s ~root/.guix-profile/lib/upstart/system/guix-publish.conf "
-"/etc/init/\n"
+"# ln -s ~root/.guix-profile/lib/upstart/system/guix-publish.conf /etc/init/\n"
 "# start guix-publish\n"
 msgstr ""
 
@@ -16220,12 +17103,12 @@ msgstr ""
 #: doc/guix.texi:7673
 msgid ""
 "We know that the hash that shows up in @file{/gnu/store} file names is the "
-"hash of all the inputs of the process that built the file or "
-"directory---compilers, libraries, build scripts, "
-"etc. (@pxref{Introduction}).  Assuming deterministic build processes, one "
-"store file name should map to exactly one build output.  @command{guix "
-"challenge} checks whether there is, indeed, a single mapping by comparing "
-"the build outputs of several independent builds of any given store item."
+"hash of all the inputs of the process that built the file or directory---"
+"compilers, libraries, build scripts, etc. (@pxref{Introduction}).  Assuming "
+"deterministic build processes, one store file name should map to exactly one "
+"build output.  @command{guix challenge} checks whether there is, indeed, a "
+"single mapping by comparing the build outputs of several independent builds "
+"of any given store item."
 msgstr ""
 
 #. type: Plain text
@@ -16237,28 +17120,21 @@ msgstr ""
 #: doc/guix.texi:7692
 #, no-wrap
 msgid ""
-"$ guix challenge --substitute-urls=\"https://hydra.gnu.org "
-"https://guix.example.org\"\n"
+"$ guix challenge --substitute-urls=\"https://hydra.gnu.org https://guix.example.org\"\n"
 "updating list of substitutes from 'https://hydra.gnu.org'... 100.0%\n"
 "updating list of substitutes from 'https://guix.example.org'... 100.0%\n"
 "/gnu/store/@dots{}-openssl-1.0.2d contents differ:\n"
 "  local hash: 0725l22r5jnzazaacncwsvp9kgf42266ayyp814v7djxs7nk963q\n"
-"  https://hydra.gnu.org/nar/@dots{}-openssl-1.0.2d: "
-"0725l22r5jnzazaacncwsvp9kgf42266ayyp814v7djxs7nk963q\n"
-"  https://guix.example.org/nar/@dots{}-openssl-1.0.2d: "
-"1zy4fmaaqcnjrzzajkdn3f5gmjk754b43qkq47llbyak9z0qjyim\n"
+"  https://hydra.gnu.org/nar/@dots{}-openssl-1.0.2d: 0725l22r5jnzazaacncwsvp9kgf42266ayyp814v7djxs7nk963q\n"
+"  https://guix.example.org/nar/@dots{}-openssl-1.0.2d: 1zy4fmaaqcnjrzzajkdn3f5gmjk754b43qkq47llbyak9z0qjyim\n"
 "/gnu/store/@dots{}-git-2.5.0 contents differ:\n"
 "  local hash: 00p3bmryhjxrhpn2gxs2fy0a15lnip05l97205pgbk5ra395hyha\n"
-"  https://hydra.gnu.org/nar/@dots{}-git-2.5.0: "
-"069nb85bv4d4a6slrwjdy8v1cn4cwspm3kdbmyb81d6zckj3nq9f\n"
-"  https://guix.example.org/nar/@dots{}-git-2.5.0: "
-"0mdqa9w1p6cmli6976v4wi0sw9r4p5prkj7lzfd1877wk11c9c73\n"
+"  https://hydra.gnu.org/nar/@dots{}-git-2.5.0: 069nb85bv4d4a6slrwjdy8v1cn4cwspm3kdbmyb81d6zckj3nq9f\n"
+"  https://guix.example.org/nar/@dots{}-git-2.5.0: 0mdqa9w1p6cmli6976v4wi0sw9r4p5prkj7lzfd1877wk11c9c73\n"
 "/gnu/store/@dots{}-pius-2.1.1 contents differ:\n"
 "  local hash: 0k4v3m9z1zp8xzzizb7d8kjj72f9172xv078sq4wl73vnq9ig3ax\n"
-"  https://hydra.gnu.org/nar/@dots{}-pius-2.1.1: "
-"0k4v3m9z1zp8xzzizb7d8kjj72f9172xv078sq4wl73vnq9ig3ax\n"
-"  https://guix.example.org/nar/@dots{}-pius-2.1.1: "
-"1cy25x1a4fzq5rk0pmvc8xhwyffnqz95h2bpvqsz2mpvlbccy0gs\n"
+"  https://hydra.gnu.org/nar/@dots{}-pius-2.1.1: 0k4v3m9z1zp8xzzizb7d8kjj72f9172xv078sq4wl73vnq9ig3ax\n"
+"  https://guix.example.org/nar/@dots{}-pius-2.1.1: 1cy25x1a4fzq5rk0pmvc8xhwyffnqz95h2bpvqsz2mpvlbccy0gs\n"
 "\n"
 msgstr ""
 
@@ -16301,11 +17177,11 @@ msgstr ""
 msgid ""
 "As an example, @code{guix.example.org} always gets a different answer.  "
 "Conversely, @code{hydra.gnu.org} agrees with local builds, except in the "
-"case of Git.  This might indicate that the build process of Git is "
-"non-deterministic, meaning that its output varies as a function of various "
+"case of Git.  This might indicate that the build process of Git is non-"
+"deterministic, meaning that its output varies as a function of various "
 "things that Guix does not fully control, in spite of building packages in "
-"isolated environments (@pxref{Features}).  Most common sources of "
-"non-determinism include the addition of timestamps in build results, the "
+"isolated environments (@pxref{Features}).  Most common sources of non-"
+"determinism include the addition of timestamps in build results, the "
 "inclusion of random numbers, and directory listings sorted by inode number.  "
 "See @uref{https://reproducible-builds.org/docs/}, for more information."
 msgstr ""
@@ -16482,8 +17358,8 @@ msgstr ""
 #: doc/guix.texi:7816
 msgid ""
 "The SSH connection is established using the Guile-SSH client, which is "
-"compatible with OpenSSH: it honors @file{~/.ssh/known_hosts} and "
-"@file{~/.ssh/config}, and uses the SSH agent for authentication."
+"compatible with OpenSSH: it honors @file{~/.ssh/known_hosts} and @file{~/."
+"ssh/config}, and uses the SSH agent for authentication."
 msgstr ""
 
 #. type: Plain text
@@ -16784,13 +17660,13 @@ msgstr ""
 #: doc/guix.texi:7995
 msgid ""
 "Guix comes with a distribution of the GNU system consisting entirely of free "
-"software@footnote{The term ``free'' here refers to the "
-"@url{http://www.gnu.org/philosophy/free-sw.html,freedom provided to users of "
-"that software}.}.  The distribution can be installed on its own "
-"(@pxref{System Installation}), but it is also possible to install Guix as a "
-"package manager on top of an installed GNU/Linux system "
-"(@pxref{Installation}).  To distinguish between the two, we refer to the "
-"standalone distribution as the Guix System Distribution, or GuixSD."
+"software@footnote{The term ``free'' here refers to the @url{http://www.gnu."
+"org/philosophy/free-sw.html,freedom provided to users of that software}.}.  "
+"The distribution can be installed on its own (@pxref{System Installation}), "
+"but it is also possible to install Guix as a package manager on top of an "
+"installed GNU/Linux system (@pxref{Installation}).  To distinguish between "
+"the two, we refer to the standalone distribution as the Guix System "
+"Distribution, or GuixSD."
 msgstr ""
 
 #. type: Plain text
@@ -16798,9 +17674,9 @@ msgstr ""
 msgid ""
 "The distribution provides core GNU packages such as GNU libc, GCC, and "
 "Binutils, as well as many GNU and non-GNU applications.  The complete list "
-"of available packages can be browsed "
-"@url{http://www.gnu.org/software/guix/packages,on-line} or by running "
-"@command{guix package} (@pxref{Invoking guix package}):"
+"of available packages can be browsed @url{http://www.gnu.org/software/guix/"
+"packages,on-line} or by running @command{guix package} (@pxref{Invoking guix "
+"package}):"
 msgstr ""
 
 #. type: example
@@ -16812,10 +17688,10 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:8010
 msgid ""
-"Our goal is to provide a practical 100% free software distribution of "
-"Linux-based and other variants of GNU, with a focus on the promotion and "
-"tight integration of GNU components, and an emphasis on programs and tools "
-"that help users exert that freedom."
+"Our goal is to provide a practical 100% free software distribution of Linux-"
+"based and other variants of GNU, with a focus on the promotion and tight "
+"integration of GNU components, and an emphasis on programs and tools that "
+"help users exert that freedom."
 msgstr ""
 
 #. type: Plain text
@@ -16854,8 +17730,8 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:8025
 msgid ""
-"ARMv7-A architecture with hard float, Thumb-2 and NEON, using the EABI "
-"hard-float application binary interface (ABI), and Linux-Libre kernel."
+"ARMv7-A architecture with hard float, Thumb-2 and NEON, using the EABI hard-"
+"float application binary interface (ABI), and Linux-Libre kernel."
 msgstr ""
 
 #. type: item
@@ -16887,7 +17763,8 @@ msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:8038
-msgid "GuixSD itself is currently only available on @code{i686} and @code{x86_64}."
+msgid ""
+"GuixSD itself is currently only available on @code{i686} and @code{x86_64}."
 msgstr ""
 
 #. type: Plain text
@@ -16940,12 +17817,11 @@ msgid ""
 "As of version @value{VERSION}, the Guix System Distribution (GuixSD) is not "
 "production-ready.  It may contain bugs and lack important features.  Thus, "
 "if you are looking for a stable production system that respects your freedom "
-"as a computer user, a good solution at this point is to consider "
-"@url{http://www.gnu.org/distros/free-distros.html, one of the more "
-"established GNU/Linux distributions}.  We hope you can soon switch to the "
-"GuixSD without fear, of course.  In the meantime, you can also keep using "
-"your distribution and try out the package manager on top of it "
-"(@pxref{Installation})."
+"as a computer user, a good solution at this point is to consider @url{http://"
+"www.gnu.org/distros/free-distros.html, one of the more established GNU/Linux "
+"distributions}.  We hope you can soon switch to the GuixSD without fear, of "
+"course.  In the meantime, you can also keep using your distribution and try "
+"out the package manager on top of it (@pxref{Installation})."
 msgstr ""
 
 #. type: Plain text
@@ -17045,11 +17921,11 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:8165
 msgid ""
-"The @uref{https://www.fsf.org/, Free Software Foundation} runs "
-"@uref{https://www.fsf.org/ryf, @dfn{Respects Your Freedom}} (RYF), a "
-"certification program for hardware products that respect your freedom and "
-"your privacy and ensure that you have control over your device.  We "
-"encourage you to check the list of RYF-certified devices."
+"The @uref{https://www.fsf.org/, Free Software Foundation} runs @uref{https://"
+"www.fsf.org/ryf, @dfn{Respects Your Freedom}} (RYF), a certification program "
+"for hardware products that respect your freedom and your privacy and ensure "
+"that you have control over your device.  We encourage you to check the list "
+"of RYF-certified devices."
 msgstr ""
 
 #. type: Plain text
@@ -17064,9 +17940,9 @@ msgstr ""
 #: doc/guix.texi:8178
 msgid ""
 "An ISO-9660 installation image that can be written to a USB stick or burnt "
-"to a DVD can be downloaded from "
-"@indicateurl{ftp://alpha.gnu.org/gnu/guix/guixsd-install-@value{VERSION}.@var{system}.iso.xz}, "
-"where @var{system} is one of:"
+"to a DVD can be downloaded from @indicateurl{ftp://alpha.gnu.org/gnu/guix/"
+"guixsd-install-@value{VERSION}.@var{system}.iso.xz}, where @var{system} is "
+"one of:"
 msgstr ""
 
 #. type: table
@@ -17090,8 +17966,7 @@ msgstr ""
 #: doc/guix.texi:8194
 #, no-wrap
 msgid ""
-"$ wget "
-"ftp://alpha.gnu.org/gnu/guix/guixsd-install-@value{VERSION}.@var{system}.iso.xz.sig\n"
+"$ wget ftp://alpha.gnu.org/gnu/guix/guixsd-install-@value{VERSION}.@var{system}.iso.xz.sig\n"
 "$ gpg --verify guixsd-install-@value{VERSION}.@var{system}.iso.xz.sig\n"
 msgstr ""
 
@@ -17160,16 +18035,13 @@ msgstr ""
 #: doc/guix.texi:8251
 msgid ""
 "Insert a blank DVD into your machine, and determine its device name.  "
-"Assuming that the DVD drive is known as @file{/dev/srX}, copy the image "
-"with:"
+"Assuming that the DVD drive is known as @file{/dev/srX}, copy the image with:"
 msgstr ""
 
 #. type: example
 #: doc/guix.texi:8254
 #, no-wrap
-msgid ""
-"growisofs -dvd-compat -Z "
-"/dev/srX=guixsd-install-@value{VERSION}.x86_64.iso\n"
+msgid "growisofs -dvd-compat -Z /dev/srX=guixsd-install-@value{VERSION}.x86_64.iso\n"
 msgstr ""
 
 #. type: enumerate
@@ -17204,10 +18076,10 @@ msgid ""
 "Once you have successfully booted your computer using the installation "
 "medium, you should end up with a root prompt.  Several console TTYs are "
 "configured and can be used to run commands as root.  TTY2 shows this "
-"documentation, browsable using the Info reader commands (@pxref{Top,,, "
-"info-stnd, Stand-alone GNU Info}).  The installation system runs the GPM "
-"mouse daemon, which allows you to select text with the left mouse button and "
-"to paste it with the middle button."
+"documentation, browsable using the Info reader commands (@pxref{Top,,, info-"
+"stnd, Stand-alone GNU Info}).  The installation system runs the GPM mouse "
+"daemon, which allows you to select text with the left mouse button and to "
+"paste it with the middle button."
 msgstr ""
 
 #. type: quotation
@@ -17324,13 +18196,13 @@ msgid "Wireless connection"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:8337 doc/guix.texi:10718
+#: doc/guix.texi:8337 doc/guix.texi:10763
 #, no-wrap
 msgid "wireless"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:8338 doc/guix.texi:10719
+#: doc/guix.texi:8338 doc/guix.texi:10764
 #, no-wrap
 msgid "WiFi"
 msgstr ""
@@ -17508,9 +18380,8 @@ msgstr ""
 #: doc/guix.texi:8424
 msgid ""
 "If you instead wish to use EFI-based GRUB, a FAT32 @dfn{EFI System "
-"Partition} (ESP) is required.  This partition should be mounted at "
-"@file{/boot/efi} and must have the @code{esp} flag set.  E.g., for "
-"@command{parted}:"
+"Partition} (ESP) is required.  This partition should be mounted at @file{/"
+"boot/efi} and must have the @code{esp} flag set.  E.g., for @command{parted}:"
 msgstr ""
 
 #. type: example
@@ -17541,9 +18412,8 @@ msgid ""
 "Preferably, assign file systems a label so that you can easily and reliably "
 "refer to them in @code{file-system} declarations (@pxref{File Systems}).  "
 "This is typically done using the @code{-L} option of @command{mkfs.ext4} and "
-"related commands.  So, assuming the target root partition lives at "
-"@file{/dev/sda1}, a file system with the label @code{my-root} can be created "
-"with:"
+"related commands.  So, assuming the target root partition lives at @file{/"
+"dev/sda1}, a file system with the label @code{my-root} can be created with:"
 msgstr ""
 
 #. type: example
@@ -17623,8 +18493,8 @@ msgstr ""
 msgid ""
 "Alternatively, you may use a swap file.  For example, assuming that in the "
 "new system you want to use the file @file{/swapfile} as a swap file, you "
-"would run@footnote{This example will work for many types of file systems "
-"(e.g., ext4).  However, for copy-on-write file systems (e.g., btrfs), the "
+"would run@footnote{This example will work for many types of file systems (e."
+"g., ext4).  However, for copy-on-write file systems (e.g., btrfs), the "
 "required steps may be different.  For details, see the manual pages for "
 "@command{mkswap} and @command{swapon}.}:"
 msgstr ""
@@ -17736,8 +18606,8 @@ msgstr ""
 #. type: itemize
 #: doc/guix.texi:8570
 msgid ""
-"If there are encrypted or RAID partitions, make sure to add a "
-"@code{mapped-devices} field to describe them (@pxref{Mapped Devices})."
+"If there are encrypted or RAID partitions, make sure to add a @code{mapped-"
+"devices} field to describe them (@pxref{Mapped Devices})."
 msgstr ""
 
 #. type: Plain text
@@ -17794,8 +18664,8 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:8604
 msgid ""
-"Join us on @code{#guix} on the Freenode IRC network or on "
-"@file{guix-devel@@gnu.org} to share your experience---good or not so good."
+"Join us on @code{#guix} on the Freenode IRC network or on @file{guix-"
+"devel@@gnu.org} to share your experience---good or not so good."
 msgstr ""
 
 #. type: subsection
@@ -17847,8 +18717,8 @@ msgstr ""
 #. type: enumerate
 #: doc/guix.texi:8626
 msgid ""
-"Create a disk image that will hold the installed system.  To make a "
-"qcow2-formatted disk image, use the @command{qemu-img} command:"
+"Create a disk image that will hold the installed system.  To make a qcow2-"
+"formatted disk image, use the @command{qemu-img} command:"
 msgstr ""
 
 #. type: example
@@ -18101,7 +18971,7 @@ msgid "System Services"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:8789 doc/guix.texi:19888 doc/guix.texi:20806
+#: doc/guix.texi:8789 doc/guix.texi:19933 doc/guix.texi:20851
 #, no-wrap
 msgid "services"
 msgstr ""
@@ -18185,14 +19055,14 @@ msgstr ""
 #: doc/guix.texi:8839
 msgid ""
 "This changes the configuration---i.e., the service parameters---of the "
-"@code{guix-service-type} instance, and that of all the "
-"@code{mingetty-service-type} instances in the @var{%base-services} list.  "
-"Observe how this is accomplished: first, we arrange for the original "
-"configuration to be bound to the identifier @code{config} in the @var{body}, "
-"and then we write the @var{body} so that it evaluates to the desired "
-"configuration.  In particular, notice how we use @code{inherit} to create a "
-"new configuration which has the same values as the old configuration, but "
-"with a few modifications."
+"@code{guix-service-type} instance, and that of all the @code{mingetty-"
+"service-type} instances in the @var{%base-services} list.  Observe how this "
+"is accomplished: first, we arrange for the original configuration to be "
+"bound to the identifier @code{config} in the @var{body}, and then we write "
+"the @var{body} so that it evaluates to the desired configuration.  In "
+"particular, notice how we use @code{inherit} to create a new configuration "
+"which has the same values as the old configuration, but with a few "
+"modifications."
 msgstr ""
 
 #. type: Plain text
@@ -18275,10 +19145,10 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:8887
 msgid ""
-"Assuming the @code{operating-system} declaration is stored in the "
-"@file{my-system-config.scm} file, the @command{guix system reconfigure "
-"my-system-config.scm} command instantiates that configuration, and makes it "
-"the default GRUB boot entry (@pxref{Invoking guix system})."
+"Assuming the @code{operating-system} declaration is stored in the @file{my-"
+"system-config.scm} file, the @command{guix system reconfigure my-system-"
+"config.scm} command instantiates that configuration, and makes it the "
+"default GRUB boot entry (@pxref{Invoking guix system})."
 msgstr ""
 
 #. type: Plain text
@@ -18306,10 +19176,10 @@ msgid ""
 "a new @dfn{generation} of the system is created---without modifying or "
 "deleting previous generations.  Old system generations get an entry in the "
 "bootloader boot menu, allowing you to boot them in case something went wrong "
-"with the latest generation.  Reassuring, no? The @command{guix system "
-"list-generations} command lists the system generations available on disk.  "
-"It is also possible to roll back the system via the commands @command{guix "
-"system roll-back} and @command{guix system switch-generation}."
+"with the latest generation.  Reassuring, no? The @command{guix system list-"
+"generations} command lists the system generations available on disk.  It is "
+"also possible to roll back the system via the commands @command{guix system "
+"roll-back} and @command{guix system switch-generation}."
 msgstr ""
 
 #. type: Plain text
@@ -18418,7 +19288,7 @@ msgid ""
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:8955 doc/guix.texi:20085 doc/guix.texi:20104
+#: doc/guix.texi:8955 doc/guix.texi:20130 doc/guix.texi:20149
 #, no-wrap
 msgid "bootloader"
 msgstr ""
@@ -18426,8 +19296,7 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:8957
 msgid ""
-"The system bootloader configuration object.  @xref{Bootloader "
-"Configuration}."
+"The system bootloader configuration object.  @xref{Bootloader Configuration}."
 msgstr ""
 
 #. type: item
@@ -18437,13 +19306,14 @@ msgid "@code{initrd-modules} (default: @code{%base-initrd-modules})"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:8959 doc/guix.texi:19925 doc/guix.texi:20028 doc/guix.texi:20223
+#: doc/guix.texi:8959 doc/guix.texi:19970 doc/guix.texi:20073
+#: doc/guix.texi:20268
 #, no-wrap
 msgid "initrd"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:8960 doc/guix.texi:19926 doc/guix.texi:20029
+#: doc/guix.texi:8960 doc/guix.texi:19971 doc/guix.texi:20074
 #, no-wrap
 msgid "initial RAM disk"
 msgstr ""
@@ -18564,12 +19434,12 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:9002
 msgid ""
-"A list of strings identifying devices or files to be used for ``swap space'' "
-"(@pxref{Memory Concepts,,, libc, The GNU C Library Reference Manual}).  For "
-"example, @code{'(\"/dev/sda3\")} or @code{'(\"/swapfile\")}.  It is possible "
-"to specify a swap file in a file system on a mapped device, provided that "
-"the necessary device mapping and file system are also specified.  "
-"@xref{Mapped Devices} and @ref{File Systems}."
+"A list of strings identifying devices or files to be used for ``swap "
+"space'' (@pxref{Memory Concepts,,, libc, The GNU C Library Reference "
+"Manual}).  For example, @code{'(\"/dev/sda3\")} or @code{'(\"/swapfile\")}.  "
+"It is possible to specify a swap file in a file system on a mapped device, "
+"provided that the necessary device mapping and file system are also "
+"specified.  @xref{Mapped Devices} and @ref{File Systems}."
 msgstr ""
 
 #. type: item
@@ -18605,9 +19475,9 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:9014
 msgid ""
-"A list target file name/file-like object tuples (@pxref{G-Expressions, "
-"file-like objects}).  These are the skeleton files that will be added to the "
-"home directory of newly-created user accounts."
+"A list target file name/file-like object tuples (@pxref{G-Expressions, file-"
+"like objects}).  These are the skeleton files that will be added to the home "
+"directory of newly-created user accounts."
 msgstr ""
 
 #. type: table
@@ -18726,9 +19596,8 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:9060
 msgid ""
-"Configuration of the libc name service switch (NSS)---a "
-"@code{<name-service-switch>} object.  @xref{Name Service Switch}, for "
-"details."
+"Configuration of the libc name service switch (NSS)---a @code{<name-service-"
+"switch>} object.  @xref{Name Service Switch}, for details."
 msgstr ""
 
 #. type: item
@@ -18793,8 +19662,8 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:9078
 msgid ""
-"The contents of the @file{/etc/sudoers} file as a file-like object "
-"(@pxref{G-Expressions, @code{local-file} and @code{plain-file}})."
+"The contents of the @file{/etc/sudoers} file as a file-like object (@pxref{G-"
+"Expressions, @code{local-file} and @code{plain-file}})."
 msgstr ""
 
 #. type: table
@@ -18809,10 +19678,10 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:9094
 msgid ""
-"The list of file systems to be mounted is specified in the "
-"@code{file-systems} field of the operating system declaration (@pxref{Using "
-"the Configuration System}).  Each file system is declared using the "
-"@code{file-system} form, like this:"
+"The list of file systems to be mounted is specified in the @code{file-"
+"systems} field of the operating system declaration (@pxref{Using the "
+"Configuration System}).  Each file system is declared using the @code{file-"
+"system} form, like this:"
 msgstr ""
 
 #. type: example
@@ -18910,11 +19779,10 @@ msgstr ""
 msgid ""
 "UUIDs may be converted from their string representation (as shown by the "
 "@command{tune2fs -l} command) using the @code{uuid} form@footnote{The "
-"@code{uuid} form expects 16-byte UUIDs as defined in "
-"@uref{https://tools.ietf.org/html/rfc4122, RFC@tie{}4122}.  This is the form "
-"of UUID used by the ext2 family of file systems and others, but it is "
-"different from ``UUIDs'' found in FAT file systems, for instance.}, like "
-"this:"
+"@code{uuid} form expects 16-byte UUIDs as defined in @uref{https://tools."
+"ietf.org/html/rfc4122, RFC@tie{}4122}.  This is the form of UUID used by the "
+"ext2 family of file systems and others, but it is different from ``UUIDs'' "
+"found in FAT file systems, for instance.}, like this:"
 msgstr ""
 
 #. type: example
@@ -18961,8 +19829,8 @@ msgstr ""
 msgid ""
 "This is a list of symbols denoting mount flags.  Recognized flags include "
 "@code{read-only}, @code{bind-mount}, @code{no-dev} (disallow access to "
-"special files), @code{no-suid} (ignore setuid and setgid bits), and "
-"@code{no-exec} (disallow program execution.)"
+"special files), @code{no-suid} (ignore setuid and setgid bits), and @code{no-"
+"exec} (disallow program execution.)"
 msgstr ""
 
 #. type: item
@@ -19060,7 +19928,8 @@ msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:9206
-msgid "The @code{(gnu system file-systems)} exports the following useful variables."
+msgid ""
+"The @code{(gnu system file-systems)} exports the following useful variables."
 msgstr ""
 
 #. type: defvr
@@ -19124,8 +19993,8 @@ msgstr ""
 #. type: defvr
 #: doc/guix.texi:9236
 msgid ""
-"The daemon itself is still able to write to the store: it remounts it "
-"read-write in its own ``name space.''"
+"The daemon itself is still able to write to the store: it remounts it read-"
+"write in its own ``name space.''"
 msgstr ""
 
 #. type: defvr
@@ -19218,7 +20087,7 @@ msgid ""
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:9286 doc/guix.texi:20117
+#: doc/guix.texi:9286 doc/guix.texi:20162
 #, no-wrap
 msgid "target"
 msgstr ""
@@ -19228,10 +20097,9 @@ msgstr ""
 msgid ""
 "This string specifies the name of the resulting mapped device.  For kernel "
 "mappers such as encrypted devices of type @code{luks-device-mapping}, "
-"specifying @code{\"my-partition\"} leads to the creation of the "
-"@code{\"/dev/mapper/my-partition\"} device.  For RAID devices of type "
-"@code{raid-device-mapping}, the full device name such as @code{\"/dev/md0\"} "
-"needs to be given."
+"specifying @code{\"my-partition\"} leads to the creation of the @code{\"/dev/"
+"mapper/my-partition\"} device.  For RAID devices of type @code{raid-device-"
+"mapping}, the full device name such as @code{\"/dev/md0\"} needs to be given."
 msgstr ""
 
 #. type: table
@@ -19251,8 +20119,8 @@ msgstr ""
 #: doc/guix.texi:9304
 msgid ""
 "This defines LUKS block device encryption using the @command{cryptsetup} "
-"command from the package with the same name.  It relies on the "
-"@code{dm-crypt} Linux kernel module."
+"command from the package with the same name.  It relies on the @code{dm-"
+"crypt} Linux kernel module."
 msgstr ""
 
 #. type: defvr
@@ -19285,12 +20153,11 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:9322
 msgid ""
-"The following example specifies a mapping from @file{/dev/sda3} to "
-"@file{/dev/mapper/home} using LUKS---the "
-"@url{https://gitlab.com/cryptsetup/cryptsetup,Linux Unified Key Setup}, a "
-"standard mechanism for disk encryption.  The @file{/dev/mapper/home} device "
-"can then be used as the @code{device} of a @code{file-system} declaration "
-"(@pxref{File Systems})."
+"The following example specifies a mapping from @file{/dev/sda3} to @file{/"
+"dev/mapper/home} using LUKS---the @url{https://gitlab.com/cryptsetup/"
+"cryptsetup,Linux Unified Key Setup}, a standard mechanism for disk "
+"encryption.  The @file{/dev/mapper/home} device can then be used as the "
+"@code{device} of a @code{file-system} declaration (@pxref{File Systems})."
 msgstr ""
 
 #. type: example
@@ -19394,9 +20261,9 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:9380
 msgid ""
-"User accounts and groups are entirely managed through the "
-"@code{operating-system} declaration.  They are specified with the "
-"@code{user-account} and @code{user-group} forms:"
+"User accounts and groups are entirely managed through the @code{operating-"
+"system} declaration.  They are specified with the @code{user-account} and "
+"@code{user-group} forms:"
 msgstr ""
 
 #. type: example
@@ -19445,7 +20312,7 @@ msgid "The name of the user account."
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:9409 doc/guix.texi:19879
+#: doc/guix.texi:9409 doc/guix.texi:19924
 #, no-wrap
 msgid "group"
 msgstr ""
@@ -19638,7 +20505,8 @@ msgstr ""
 
 #. type: Plain text
 #: doc/guix.texi:9490
-msgid "For convenience, a variable lists all the basic user groups one may expect:"
+msgid ""
+"For convenience, a variable lists all the basic user groups one may expect:"
 msgstr ""
 
 #. type: defvr
@@ -19688,9 +20556,9 @@ msgid ""
 "A @dfn{locale} defines cultural conventions for a particular language and "
 "region of the world (@pxref{Locales,,, libc, The GNU C Library Reference "
 "Manual}).  Each locale has a name that typically has the form "
-"@code{@var{language}_@var{territory}.@var{codeset}}---e.g., "
-"@code{fr_LU.utf8} designates the locale for the French language, with "
-"cultural conventions from Luxembourg, and using the UTF-8 encoding."
+"@code{@var{language}_@var{territory}.@var{codeset}}---e.g., @code{fr_LU."
+"utf8} designates the locale for the French language, with cultural "
+"conventions from Luxembourg, and using the UTF-8 encoding."
 msgstr ""
 
 #. type: cindex
@@ -19711,13 +20579,13 @@ msgstr ""
 #: doc/guix.texi:9530
 msgid ""
 "The selected locale is automatically added to the @dfn{locale definitions} "
-"known to the system if needed, with its codeset inferred from its "
-"name---e.g., @code{bo_CN.utf8} will be assumed to use the @code{UTF-8} "
-"codeset.  Additional locale definitions can be specified in the "
-"@code{locale-definitions} slot of @code{operating-system}---this is useful, "
-"for instance, if the codeset could not be inferred from the locale name.  "
-"The default set of locale definitions includes some widely used locales, but "
-"not all the available locales, in order to save space."
+"known to the system if needed, with its codeset inferred from its name---e."
+"g., @code{bo_CN.utf8} will be assumed to use the @code{UTF-8} codeset.  "
+"Additional locale definitions can be specified in the @code{locale-"
+"definitions} slot of @code{operating-system}---this is useful, for instance, "
+"if the codeset could not be inferred from the locale name.  The default set "
+"of locale definitions includes some widely used locales, but not all the "
+"available locales, in order to save space."
 msgstr ""
 
 #. type: Plain text
@@ -19755,12 +20623,11 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:9556
 msgid ""
-"The compiled locale definitions are available at "
-"@file{/run/current-system/locale/X.Y}, where @code{X.Y} is the libc version, "
-"which is the default location where the GNU@tie{}libc provided by Guix looks "
-"for locale data.  This can be overridden using the @code{LOCPATH} "
-"environment variable (@pxref{locales-and-locpath, @code{LOCPATH} and locale "
-"packages})."
+"The compiled locale definitions are available at @file{/run/current-system/"
+"locale/X.Y}, where @code{X.Y} is the libc version, which is the default "
+"location where the GNU@tie{}libc provided by Guix looks for locale data.  "
+"This can be overridden using the @code{LOCPATH} environment variable "
+"(@pxref{locales-and-locpath, @code{LOCPATH} and locale packages})."
 msgstr ""
 
 #. type: Plain text
@@ -19804,8 +20671,8 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:9577
 msgid ""
-"The ``character set'' or ``code set'' for that locale, "
-"@uref{http://www.iana.org/assignments/character-sets, as defined by IANA}."
+"The ``character set'' or ``code set'' for that locale, @uref{http://www.iana."
+"org/assignments/character-sets, as defined by IANA}."
 msgstr ""
 
 #. type: defvr
@@ -19897,12 +20764,11 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:9632
 msgid ""
-"Still, it is best if the system-wide locale data at "
-"@file{/run/current-system/locale} is built for all the libc versions "
-"actually in use on the system, so that all the programs can access it---this "
-"is especially crucial on a multi-user system.  To do that, the administrator "
-"can specify several libc packages in the @code{locale-libcs} field of "
-"@code{operating-system}:"
+"Still, it is best if the system-wide locale data at @file{/run/current-"
+"system/locale} is built for all the libc versions actually in use on the "
+"system, so that all the programs can access it---this is especially crucial "
+"on a multi-user system.  To do that, the administrator can specify several "
+"libc packages in the @code{locale-libcs} field of @code{operating-system}:"
 msgstr ""
 
 #. type: example
@@ -19926,8 +20792,8 @@ msgstr ""
 #: doc/guix.texi:9644
 msgid ""
 "This example would lead to a system containing locale definitions for both "
-"libc 2.21 and the current version of libc in "
-"@file{/run/current-system/locale}."
+"libc 2.21 and the current version of libc in @file{/run/current-system/"
+"locale}."
 msgstr ""
 
 #. type: cindex
@@ -20031,9 +20897,9 @@ msgstr ""
 #. type: defvr
 #: doc/guix.texi:9738
 msgid ""
-"This is the default value of the @code{services} field of "
-"@code{operating-system} declarations.  Usually, when customizing a system, "
-"you will want to append services to @var{%base-services}, like this:"
+"This is the default value of the @code{services} field of @code{operating-"
+"system} declarations.  Usually, when customizing a system, you will want to "
+"append services to @var{%base-services}, like this:"
 msgstr ""
 
 #. type: example
@@ -20111,10 +20977,10 @@ msgstr ""
 #. type: defvr
 #: doc/guix.texi:9773
 msgid ""
-"Since this is part of @code{%base-services}, you can use "
-"@code{modify-services} to customize the set of special files (@pxref{Service "
-"Reference, @code{modify-services}}).  But the simple way to add a special "
-"file is @i{via} the @code{extra-special-file} procedure (see below.)"
+"Since this is part of @code{%base-services}, you can use @code{modify-"
+"services} to customize the set of special files (@pxref{Service Reference, "
+"@code{modify-services}}).  But the simple way to add a special file is "
+"@i{via} the @code{extra-special-file} procedure (see below.)"
 msgstr ""
 
 #. type: deffn
@@ -20163,9 +21029,9 @@ msgstr ""
 #. type: deffn
 #: doc/guix.texi:9796
 msgid ""
-"Return a service to run login according to @var{config}, a "
-"@code{<login-configuration>} object, which specifies the message of the day, "
-"among other things."
+"Return a service to run login according to @var{config}, a @code{<login-"
+"configuration>} object, which specifies the message of the day, among other "
+"things."
 msgstr ""
 
 #. type: deftp
@@ -20197,7 +21063,7 @@ msgid "A file-like object containing the ``message of the day''."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9807 doc/guix.texi:11424
+#: doc/guix.texi:9807 doc/guix.texi:11469
 #, no-wrap
 msgid "@code{allow-empty-passwords?} (default: @code{#t})"
 msgstr ""
@@ -20308,9 +21174,8 @@ msgstr ""
 #. type: deffn
 #: doc/guix.texi:9853
 msgid ""
-"Return a service to run agetty according to @var{config}, an "
-"@code{<agetty-configuration>} object, which specifies the tty to run, among "
-"other things."
+"Return a service to run agetty according to @var{config}, an @code{<agetty-"
+"configuration>} object, which specifies the tty to run, among other things."
 msgstr ""
 
 #. type: deftp
@@ -20379,7 +21244,8 @@ msgstr ""
 
 #. type: table
 #: doc/guix.texi:9886
-msgid "A string containing the value used for the @code{TERM} environment variable."
+msgid ""
+"A string containing the value used for the @code{TERM} environment variable."
 msgstr ""
 
 #. type: item
@@ -20553,8 +21419,8 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:9944
 msgid ""
-"When set to @code{#t}, do not print a newline before printing the "
-"@file{/etc/issue} file."
+"When set to @code{#t}, do not print a newline before printing the @file{/etc/"
+"issue} file."
 msgstr ""
 
 #. type: item
@@ -20649,9 +21515,8 @@ msgstr ""
 msgid ""
 "When set to @code{#t}, turn on support for detecting an uppercase-only "
 "terminal.  This setting will detect a login name containing only uppercase "
-"letters as indicating an uppercase-only terminal and turn on some "
-"upper-to-lower case conversions.  Note that this will not support Unicode "
-"characters."
+"letters as indicating an uppercase-only terminal and turn on some upper-to-"
+"lower case conversions.  Note that this will not support Unicode characters."
 msgstr ""
 
 #. type: item
@@ -20676,7 +21541,8 @@ msgstr ""
 
 #. type: table
 #: doc/guix.texi:9990
-msgid "When set to @code{#t}, do not print hints about Num, Caps, and Scroll locks."
+msgid ""
+"When set to @code{#t}, do not print hints about Num, Caps, and Scroll locks."
 msgstr ""
 
 #. type: item
@@ -20794,10 +21660,9 @@ msgstr ""
 #. type: deffn
 #: doc/guix.texi:10032
 msgid ""
-"Return a service to run "
-"@uref{https://www.freedesktop.org/wiki/Software/kmscon,kmscon} according to "
-"@var{config}, a @code{<kmscon-configuration>} object, which specifies the "
-"tty to run, among other things."
+"Return a service to run @uref{https://www.freedesktop.org/wiki/Software/"
+"kmscon,kmscon} according to @var{config}, a @code{<kmscon-configuration>} "
+"object, which specifies the tty to run, among other things."
 msgstr ""
 
 #. type: deftp
@@ -20827,9 +21692,7 @@ msgstr ""
 #. type: item
 #: doc/guix.texi:10043
 #, no-wrap
-msgid ""
-"@code{login-program} (default: @code{#~(string-append #$shadow "
-"\"/bin/login\")})"
+msgid "@code{login-program} (default: @code{#~(string-append #$shadow \"/bin/login\")})"
 msgstr ""
 
 #. type: table
@@ -20908,8 +21771,8 @@ msgstr ""
 #: doc/guix.texi:10072
 msgid ""
 "This is the default @code{<nscd-configuration>} value (see below) used by "
-"@code{nscd-service}.  It uses the caches defined by "
-"@var{%nscd-default-caches}; see below."
+"@code{nscd-service}.  It uses the caches defined by @var{%nscd-default-"
+"caches}; see below."
 msgstr ""
 
 #. type: deftp
@@ -20985,7 +21848,8 @@ msgstr ""
 
 #. type: table
 #: doc/guix.texi:10099
-msgid "List of @code{<nscd-cache>} objects denoting things to be cached; see below."
+msgid ""
+"List of @code{<nscd-cache>} objects denoting things to be cached; see below."
 msgstr ""
 
 #. type: deftp
@@ -21000,7 +21864,7 @@ msgid "Data type representing a cache database of nscd and its parameters."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:10108 doc/guix.texi:12765
+#: doc/guix.texi:10108 doc/guix.texi:12810
 #, no-wrap
 msgid "database"
 msgstr ""
@@ -21041,7 +21905,8 @@ msgstr ""
 
 #. type: table
 #: doc/guix.texi:10122
-msgid "Whether to check for updates of the files corresponding to @var{database}."
+msgid ""
+"Whether to check for updates of the files corresponding to @var{database}."
 msgstr ""
 
 #. type: table
@@ -21094,8 +21959,8 @@ msgstr ""
 #. type: defvr
 #: doc/guix.texi:10145
 msgid ""
-"List of @code{<nscd-cache>} objects used by default by "
-"@code{nscd-configuration} (see above)."
+"List of @code{<nscd-cache>} objects used by default by @code{nscd-"
+"configuration} (see above)."
 msgstr ""
 
 #. type: defvr
@@ -21103,9 +21968,9 @@ msgstr ""
 msgid ""
 "It enables persistent and aggressive caching of service and host name "
 "lookups.  The latter provides better host name lookup performance, "
-"resilience in the face of unreliable name servers, and also better "
-"privacy---often the result of host name lookups is in local cache, so "
-"external name servers do not even need to be queried."
+"resilience in the face of unreliable name servers, and also better privacy---"
+"often the result of host name lookups is in local cache, so external name "
+"servers do not even need to be queried."
 msgstr ""
 
 #. type: anchor{#1}
@@ -21139,9 +22004,7 @@ msgstr ""
 #. type: item
 #: doc/guix.texi:10160
 #, no-wrap
-msgid ""
-"@code{syslogd} (default: @code{#~(string-append #$inetutils "
-"\"/libexec/syslogd\")})"
+msgid "@code{syslogd} (default: @code{#~(string-append #$inetutils \"/libexec/syslogd\")})"
 msgstr ""
 
 #. type: table
@@ -21243,9 +22106,8 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:10198
 msgid ""
-"Whether to authorize the substitute keys listed in "
-"@code{authorized-keys}---by default that of @code{hydra.gnu.org} "
-"(@pxref{Substitutes})."
+"Whether to authorize the substitute keys listed in @code{authorized-keys}---"
+"by default that of @code{hydra.gnu.org} (@pxref{Substitutes})."
 msgstr ""
 
 #. type: vindex
@@ -21263,9 +22125,9 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:10204
 msgid ""
-"The list of authorized key files for archive imports, as a list of "
-"string-valued gexps (@pxref{Invoking guix archive}).  By default, it "
-"contains that of @code{hydra.gnu.org} (@pxref{Substitutes})."
+"The list of authorized key files for archive imports, as a list of string-"
+"valued gexps (@pxref{Invoking guix archive}).  By default, it contains that "
+"of @code{hydra.gnu.org} (@pxref{Substitutes})."
 msgstr ""
 
 #. type: item
@@ -21350,8 +22212,7 @@ msgstr ""
 #. type: table
 #: doc/guix.texi:10231
 msgid ""
-"The HTTP proxy used for downloading fixed-output derivations and "
-"substitutes."
+"The HTTP proxy used for downloading fixed-output derivations and substitutes."
 msgstr ""
 
 #. type: item
@@ -21373,7 +22234,8 @@ msgstr ""
 
 #. type: deffn
 #: doc/guix.texi:10241
-msgid "Return a service that runs the Guix build daemon according to @var{config}."
+msgid ""
+"Return a service that runs the Guix build daemon according to @var{config}."
 msgstr ""
 
 #. type: deffn
@@ -21426,7 +22288,8 @@ msgstr ""
 
 #. type: deffn
 #: doc/guix.texi:10268
-msgid "Here we show how the default @var{udev-service} can be extended with it."
+msgid ""
+"Here we show how the default @var{udev-service} can be extended with it."
 msgstr ""
 
 #. type: example
@@ -21482,11 +22345,9 @@ msgid ""
 "      (origin\n"
 "       (method url-fetch)\n"
 "       (uri (string-append \"https://raw.githubusercontent.com/M0Rf30/\"\n"
-"                           \"android-udev-rules/\" version "
-"\"/51-android.rules\"))\n"
+"                           \"android-udev-rules/\" version \"/51-android.rules\"))\n"
 "       (sha256\n"
-"        (base32 "
-"\"0lmmagpyb6xsq6zcr2w1cyx9qmjqmajkvrdbhjx32gqf1d9is003\"))))))\n"
+"        (base32 \"0lmmagpyb6xsq6zcr2w1cyx9qmjqmajkvrdbhjx32gqf1d9is003\"))))))\n"
 msgstr ""
 
 #. type: deffn
@@ -21494,10 +22355,9 @@ msgstr ""
 msgid ""
 "Additionally, Guix package definitions can be included in @var{rules} in "
 "order to extend the udev rules with the definitions found under their "
-"@file{lib/udev/rules.d} sub-directory.  In lieu of the previous "
-"@var{file->udev-rule} example, we could have used the "
-"@var{android-udev-rules} package which exists in Guix in the @code{(gnu "
-"packages android)} module."
+"@file{lib/udev/rules.d} sub-directory.  In lieu of the previous @var{file-"
+">udev-rule} example, we could have used the @var{android-udev-rules} package "
+"which exists in Guix in the @code{(gnu packages android)} module."
 msgstr ""
 
 #. type: deffn
@@ -21509,8 +22369,8 @@ msgid ""
 "is required for the proper functioning of the rules defined within the "
 "@var{android-udev-rules} package.  To create such a group, we must define it "
 "both as part of the @var{supplementary-groups} of our @var{user-account} "
-"declaration, as well as in the @var{groups} field of the "
-"@var{operating-system} record."
+"declaration, as well as in the @var{groups} field of the @var{operating-"
+"system} record."
 msgstr ""
 
 #. type: example
@@ -21577,9 +22437,8 @@ msgstr ""
 #: doc/guix.texi:10353
 msgid ""
 "Save some entropy in @var{%random-seed-file} to seed @file{/dev/urandom} "
-"when rebooting.  It also tries to seed @file{/dev/urandom} from "
-"@file{/dev/hwrng} while booting, if @file{/dev/hwrng} exists and is "
-"readable."
+"when rebooting.  It also tries to seed @file{/dev/urandom} from @file{/dev/"
+"hwrng} while booting, if @file{/dev/hwrng} exists and is readable."
 msgstr ""
 
 #. type: defvr
@@ -21716,7 +22575,8 @@ msgstr ""
 
 #. type: deftp
 #: doc/guix.texi:10410
-msgid "Data type representing the configuration of the @code{guix publish} service."
+msgid ""
+"Data type representing the configuration of the @code{guix publish} service."
 msgstr ""
 
 #. type: item
@@ -21780,10 +22640,10 @@ msgstr ""
 #: doc/guix.texi:10437
 msgid ""
 "When it is @code{#f}, disable caching and instead generate archives on "
-"demand.  Otherwise, this should be the name of a directory---e.g., "
-"@code{\"/var/cache/guix/publish\"}---where @command{guix publish} caches "
-"archives and meta-data ready to be sent.  @xref{Invoking guix publish, "
-"@option{--cache}}, for more information on the tradeoffs involved."
+"demand.  Otherwise, this should be the name of a directory---e.g., @code{\"/"
+"var/cache/guix/publish\"}---where @command{guix publish} caches archives and "
+"meta-data ready to be sent.  @xref{Invoking guix publish, @option{--cache}}, "
+"for more information on the tradeoffs involved."
 msgstr ""
 
 #. type: item
@@ -21877,11 +22737,11 @@ msgstr ""
 #. type: deffn
 #: doc/guix.texi:10471
 msgid ""
-"Return a service that installs a configuration file for the "
-"@uref{http://linux-pam.org/Linux-PAM-html/sag-pam_limits.html, "
-"@code{pam_limits} module}.  The procedure optionally takes a list of "
-"@code{pam-limits-entry} values, which can be used to specify @code{ulimit} "
-"limits and nice priority limits to user sessions."
+"Return a service that installs a configuration file for the @uref{http://"
+"linux-pam.org/Linux-PAM-html/sag-pam_limits.html, @code{pam_limits} "
+"module}.  The procedure optionally takes a list of @code{pam-limits-entry} "
+"values, which can be used to specify @code{ulimit} limits and nice priority "
+"limits to user sessions."
 msgstr ""
 
 #. type: deffn
@@ -21931,9 +22791,9 @@ msgstr ""
 #. type: Plain text
 #: doc/guix.texi:10500
 msgid ""
-"The @code{(gnu services mcron)} module provides an interface to "
-"GNU@tie{}mcron, a daemon to run jobs at scheduled times (@pxref{Top,,, "
-"mcron, GNU@tie{}mcron}).  GNU@tie{}mcron is similar to the traditional Unix "
+"The @code{(gnu services mcron)} module provides an interface to GNU@tie{}"
+"mcron, a daemon to run jobs at scheduled times (@pxref{Top,,, mcron, "
+"GNU@tie{}mcron}).  GNU@tie{}mcron is similar to the traditional Unix "
 "@command{cron} daemon; the main difference is that it is implemented in "
 "Guile Scheme, which provides a lot of flexibility when specifying the "
 "scheduling of jobs and their actions."
@@ -22054,8 +22914,8 @@ msgstr ""
 #. type: defvr
 #: doc/guix.texi:10561
 msgid ""
-"This is the type of the @code{mcron} service, whose value is an "
-"@code{mcron-configuration} object."
+"This is the type of the @code{mcron} service, whose value is an @code{mcron-"
+"configuration} object."
 msgstr ""
 
 #. type: defvr
@@ -22161,8 +23021,8 @@ msgstr ""
 #. type: defvr
 #: doc/guix.texi:10612
 msgid ""
-"This is the type of the Rottlog service, whose value is a "
-"@code{rottlog-configuration} object."
+"This is the type of the Rottlog service, whose value is a @code{rottlog-"
+"configuration} object."
 msgstr ""
 
 #. type: defvr
@@ -22367,25 +23227,140 @@ msgid ""
 "(DHCP) client, on all the non-loopback network interfaces."
 msgstr ""
 
-#. type: defvr
+#. type: deffn
 #: doc/guix.texi:10697
 #, no-wrap
+msgid "{Scheme Procedure} dhcpd-service-type"
+msgstr ""
+
+#. type: deffn
+#: doc/guix.texi:10701
+msgid ""
+"This type defines a service that runs a DHCP daemon.  To create a service of "
+"this type, you must supply a @code{<dhcpd-configuration>}.  For example:"
+msgstr ""
+
+#. type: example
+#: doc/guix.texi:10707
+#, no-wrap
+msgid ""
+"(service dhcpd-service-type\n"
+"         (dhcpd-configuration\n"
+"          (config-file (local-file \"my-dhcpd.conf\"))\n"
+"          (interfaces '(\"enp0s25\"))))\n"
+msgstr ""
+
+#. type: deftp
+#: doc/guix.texi:10710
+#, no-wrap
+msgid "{Data Type} dhcpd-configuration"
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:10712
+#, no-wrap
+msgid "@code{package} (default: @code{isc-dhcp})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:10717
+msgid ""
+"The package that provides the DHCP daemon.  This package is expected to "
+"provide the daemon at @file{sbin/dhcpd} relative to its output directory.  "
+"The default package is the @uref{http://www.isc.org/products/DHCP, ISC's "
+"DHCP server}."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:10717 doc/guix.texi:14345
+#, no-wrap
+msgid "@code{config-file} (default: @code{#f})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:10722
+msgid ""
+"The configuration file to use.  This is required.  It will be passed to "
+"@code{dhcpd} via its @code{-cf} option.  This may be any ``file-like'' "
+"object (@pxref{G-Expressions, file-like objects}).  See @code{man dhcpd."
+"conf} for details on the configuration file syntax."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:10722
+#, no-wrap
+msgid "@code{version} (default: @code{\"4\"})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:10727
+msgid ""
+"The DHCP version to use.  The ISC DHCP server supports the values ``4'', "
+"``6'', and ``4o6''.  These correspond to the @code{dhcpd} program options "
+"@code{-4}, @code{-6}, and @code{-4o6}.  See @code{man dhcpd} for details."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:10727
+#, no-wrap
+msgid "@code{run-directory} (default: @code{\"/run/dhcpd\"})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:10730
+msgid ""
+"The run directory to use.  At service activation time, this directory will "
+"be created if it does not exist."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:10730
+#, no-wrap
+msgid "@code{pid-file} (default: @code{\"/run/dhcpd/dhcpd.pid\"})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:10733
+msgid ""
+"The PID file to use.  This corresponds to the @code{-pf} option of "
+"@code{dhcpd}.  See @code{man dhcpd} for details."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:10733
+#, no-wrap
+msgid "@code{interfaces} (default: @code{'()})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:10739
+msgid ""
+"The names of the network interfaces on which dhcpd should listen for "
+"broadcasts.  If this list is not empty, then its elements (which must be "
+"strings) will be appended to the @code{dhcpd} invocation when starting the "
+"daemon.  It may not be necessary to explicitly specify any interfaces here; "
+"see @code{man dhcpd} for details."
+msgstr ""
+
+#. type: defvr
+#: doc/guix.texi:10742
+#, no-wrap
 msgid "{Scheme Variable} static-networking-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:10700
+#: doc/guix.texi:10745
 msgid "This is the type for statically-configured network interfaces."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:10702
+#: doc/guix.texi:10747
 #, no-wrap
 msgid "{Scheme Procedure} static-networking-service @var{interface} @var{ip} @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:10710
+#: doc/guix.texi:10755
 msgid ""
 "[#:netmask #f] [#:gateway #f] [#:name-servers @code{'()}] [#:requirement "
 "@code{'(udev)}] Return a service that starts @var{interface} with address "
@@ -22396,130 +23371,129 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:10715
+#: doc/guix.texi:10760
 msgid ""
 "This procedure can be called several times, one for each network interface "
-"of interest.  Behind the scenes what it does is extend "
-"@code{static-networking-service-type} with additional network interfaces to "
-"handle."
+"of interest.  Behind the scenes what it does is extend @code{static-"
+"networking-service-type} with additional network interfaces to handle."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:10717
+#: doc/guix.texi:10762
 #, no-wrap
 msgid "wicd"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:10720
+#: doc/guix.texi:10765
 #, no-wrap
 msgid "network management"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:10721
+#: doc/guix.texi:10766
 #, no-wrap
 msgid "{Scheme Procedure} wicd-service [#:wicd @var{wicd}]"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:10724
+#: doc/guix.texi:10769
 msgid ""
 "Return a service that runs @url{https://launchpad.net/wicd,Wicd}, a network "
 "management daemon that aims to simplify wired and wireless networking."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:10729
+#: doc/guix.texi:10774
 msgid ""
 "This service adds the @var{wicd} package to the global profile, providing "
 "several commands to interact with the daemon and configure networking: "
-"@command{wicd-client}, a graphical user interface, and the "
-"@command{wicd-cli} and @command{wicd-curses} user interfaces."
+"@command{wicd-client}, a graphical user interface, and the @command{wicd-"
+"cli} and @command{wicd-curses} user interfaces."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:10731
+#: doc/guix.texi:10776
 #, no-wrap
 msgid "NetworkManager"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:10733
+#: doc/guix.texi:10778
 #, no-wrap
 msgid "{Scheme Variable} network-manager-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:10738
+#: doc/guix.texi:10783
 msgid ""
-"This is the service type for the "
-"@uref{https://wiki.gnome.org/Projects/NetworkManager, NetworkManager} "
-"service. The value for this service type is a "
-"@code{network-manager-configuration} record."
+"This is the service type for the @uref{https://wiki.gnome.org/Projects/"
+"NetworkManager, NetworkManager} service. The value for this service type is "
+"a @code{network-manager-configuration} record."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:10741
-msgid "This service is part of @code{%desktop-services} (@pxref{Desktop Services})."
+#: doc/guix.texi:10786
+msgid ""
+"This service is part of @code{%desktop-services} (@pxref{Desktop Services})."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:10743
+#: doc/guix.texi:10788
 #, no-wrap
 msgid "{Data Type} network-manager-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:10745
+#: doc/guix.texi:10790
 msgid "Data type representing the configuration of NetworkManager."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10747
+#: doc/guix.texi:10792
 #, no-wrap
 msgid "@code{network-manager} (default: @code{network-manager})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10749
+#: doc/guix.texi:10794
 msgid "The NetworkManager package to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10750
+#: doc/guix.texi:10795
 #, no-wrap
 msgid "@code{dns} (default: @code{\"default\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10753
+#: doc/guix.texi:10798
 msgid ""
 "Processing mode for DNS, which affects how NetworkManager uses the "
 "@code{resolv.conf} configuration file."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10755
+#: doc/guix.texi:10800
 #, no-wrap
 msgid "default"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10758
+#: doc/guix.texi:10803
 msgid ""
 "NetworkManager will update @code{resolv.conf} to reflect the nameservers "
 "provided by currently active connections."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10759
+#: doc/guix.texi:10804
 #, no-wrap
 msgid "dnsmasq"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10763
+#: doc/guix.texi:10808
 msgid ""
 "NetworkManager will run @code{dnsmasq} as a local caching nameserver, using "
 "a \"split DNS\" configuration if you are connected to a VPN, and then update "
@@ -22527,24 +23501,24 @@ msgid ""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10764 doc/guix.texi:11750
+#: doc/guix.texi:10809 doc/guix.texi:11795
 #, no-wrap
 msgid "none"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10766
+#: doc/guix.texi:10811
 msgid "NetworkManager will not modify @code{resolv.conf}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10768
+#: doc/guix.texi:10813
 #, no-wrap
 msgid "@code{vpn-plugins} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10772
+#: doc/guix.texi:10817
 msgid ""
 "This is the list of available plugins for virtual private networks (VPNs).  "
 "An example of this is the @code{network-manager-openvpn} package, which "
@@ -22552,31 +23526,32 @@ msgid ""
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:10776
+#: doc/guix.texi:10821
 #, no-wrap
 msgid "Connman"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:10777
+#: doc/guix.texi:10822
 #, no-wrap
 msgid "{Scheme Variable} connman-service-type"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:10780
+#: doc/guix.texi:10825
 msgid ""
 "This is the service type to run @url{https://01.org/connman,Connman}, a "
 "network connection manager."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:10783
-msgid "Its value must be an @code{connman-configuration} record as in this example:"
+#: doc/guix.texi:10828
+msgid ""
+"Its value must be an @code{connman-configuration} record as in this example:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:10788
+#: doc/guix.texi:10833
 #, no-wrap
 msgid ""
 "(service connman-service-type\n"
@@ -22585,57 +23560,57 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:10791
+#: doc/guix.texi:10836
 msgid "See below for details about @code{connman-configuration}."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:10793
+#: doc/guix.texi:10838
 #, no-wrap
 msgid "{Data Type} connman-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:10795
+#: doc/guix.texi:10840
 msgid "Data Type representing the configuration of connman."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10797
+#: doc/guix.texi:10842
 #, no-wrap
 msgid "@code{connman} (default: @var{connman})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10799
+#: doc/guix.texi:10844
 msgid "The connman package to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10800
+#: doc/guix.texi:10845
 #, no-wrap
 msgid "@code{disable-vpn?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10802
+#: doc/guix.texi:10847
 msgid "When true, enable connman's vpn plugin."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:10805
+#: doc/guix.texi:10850
 #, no-wrap
 msgid "WPA Supplicant"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:10806
+#: doc/guix.texi:10851
 #, no-wrap
 msgid "{Scheme Variable} wpa-supplicant-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:10811
+#: doc/guix.texi:10856
 msgid ""
 "This is the service type to run @url{https://w1.fi/wpa_supplicant/,WPA "
 "supplicant}, an authentication daemon required to authenticate against "
@@ -22644,14 +23619,14 @@ msgid ""
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:10814
+#: doc/guix.texi:10859
 msgid ""
 "The value of this service is the @code{wpa-supplicant} package to use.  "
 "Thus, it can be instantiated like this:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:10817
+#: doc/guix.texi:10862
 #, no-wrap
 msgid ""
 "(use-modules (gnu services networking))\n"
@@ -22659,31 +23634,31 @@ msgid ""
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:10819
+#: doc/guix.texi:10864
 #, no-wrap
 msgid "(service wpa-supplicant-service-type)\n"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:10822
+#: doc/guix.texi:10867
 #, no-wrap
 msgid "NTP"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:10823
+#: doc/guix.texi:10868
 #, no-wrap
 msgid "real time clock"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:10824
+#: doc/guix.texi:10869
 #, no-wrap
 msgid "{Scheme Procedure} ntp-service [#:ntp @var{ntp}] @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:10832
+#: doc/guix.texi:10877
 msgid ""
 "[#:servers @var{%ntp-servers}] @ [#:allow-large-adjustment? #f] Return a "
 "service that runs the daemon from @var{ntp}, the @uref{http://www.ntp.org, "
@@ -22694,30 +23669,30 @@ msgid ""
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:10834
+#: doc/guix.texi:10879
 #, no-wrap
 msgid "{Scheme Variable} %ntp-servers"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:10836
+#: doc/guix.texi:10881
 msgid "List of host names used as the default NTP servers."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:10838
+#: doc/guix.texi:10883
 #, no-wrap
 msgid "OpenNTPD"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:10839
+#: doc/guix.texi:10884
 #, no-wrap
 msgid "{Scheme Procedure} openntpd-service-type"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:10843
+#: doc/guix.texi:10888
 msgid ""
 "Run the @command{ntpd}, the Network Time Protocol (NTP) daemon, as "
 "implemented by @uref{http://www.openntpd.org, OpenNTPD}.  The daemon will "
@@ -22725,7 +23700,7 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:10853
+#: doc/guix.texi:10898
 #, no-wrap
 msgid ""
 "(service\n"
@@ -22740,52 +23715,54 @@ msgid ""
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:10857
+#: doc/guix.texi:10902
 #, no-wrap
 msgid "{Data Type} openntpd-configuration"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10859
+#: doc/guix.texi:10904
 #, no-wrap
 msgid "@code{openntpd} (default: @code{(file-append openntpd \"/sbin/ntpd\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10861
+#: doc/guix.texi:10906
 msgid "The openntpd executable to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10861
+#: doc/guix.texi:10906
 #, no-wrap
 msgid "@code{listen-on} (default: @code{'(\"127.0.0.1\" \"::1\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10863
-msgid "A list of local IP addresses or hostnames the ntpd daemon should listen on."
+#: doc/guix.texi:10908
+msgid ""
+"A list of local IP addresses or hostnames the ntpd daemon should listen on."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10863
+#: doc/guix.texi:10908
 #, no-wrap
 msgid "@code{query-from} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10865
-msgid "A list of local IP address the ntpd daemon should use for outgoing queries."
+#: doc/guix.texi:10910
+msgid ""
+"A list of local IP address the ntpd daemon should use for outgoing queries."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10865
+#: doc/guix.texi:10910
 #, no-wrap
 msgid "@code{sensor} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10870
+#: doc/guix.texi:10915
 msgid ""
 "Specify a list of timedelta sensor devices ntpd should use.  @code{ntpd} "
 "will listen to each sensor that acutally exists and ignore non-existant "
@@ -22794,37 +23771,37 @@ msgid ""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10870
+#: doc/guix.texi:10915
 #, no-wrap
 msgid "@code{server} (default: @var{%ntp-servers})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10872
+#: doc/guix.texi:10917
 msgid ""
-"Specify a list of IP addresses or hostnames of NTP servers to synchronize "
-"to."
+"Specify a list of IP addresses or hostnames of NTP servers to synchronize to."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10872
+#: doc/guix.texi:10917
 #, no-wrap
 msgid "@code{servers} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10874
-msgid "Specify a list of IP addresses or hostnames of NTP pools to synchronize to."
+#: doc/guix.texi:10919
+msgid ""
+"Specify a list of IP addresses or hostnames of NTP pools to synchronize to."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10874
+#: doc/guix.texi:10919
 #, no-wrap
 msgid "@code{constraint-from} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10881
+#: doc/guix.texi:10926
 msgid ""
 "@code{ntpd} can be configured to query the ‘Date’ from trusted HTTPS servers "
 "via TLS.  This time information is not used for precision but acts as an "
@@ -22834,13 +23811,13 @@ msgid ""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10881
+#: doc/guix.texi:10926
 #, no-wrap
 msgid "@code{constraints-from} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10885
+#: doc/guix.texi:10930
 msgid ""
 "As with constraint from, specify a list of URLs, IP addresses or hostnames "
 "of HTTPS servers to provide a constraint.  Should the hostname resolve to "
@@ -22849,32 +23826,32 @@ msgid ""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10885
+#: doc/guix.texi:10930
 #, no-wrap
 msgid "@code{allow-large-adjustment?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10888
+#: doc/guix.texi:10933
 msgid ""
 "Determines if @code{ntpd} is allowed to make an initial adjustment of more "
 "than 180 seconds."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:10891
+#: doc/guix.texi:10936
 #, no-wrap
 msgid "inetd"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:10892
+#: doc/guix.texi:10937
 #, no-wrap
 msgid "{Scheme variable} inetd-service-type"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:10897
+#: doc/guix.texi:10942
 msgid ""
 "This service runs the @command{inetd} (@pxref{inetd invocation,,, inetutils, "
 "GNU Inetutils}) daemon.  @command{inetd} listens for connections on internet "
@@ -22883,17 +23860,17 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:10903
+#: doc/guix.texi:10948
 msgid ""
 "The value of this service is an @code{inetd-configuration} object.  The "
-"following example configures the @command{inetd} daemon to provide the "
-"built-in @command{echo} service, as well as an smtp service which forwards "
-"smtp traffic over ssh to a server @code{smtp-server} behind a gateway "
+"following example configures the @command{inetd} daemon to provide the built-"
+"in @command{echo} service, as well as an smtp service which forwards smtp "
+"traffic over ssh to a server @code{smtp-server} behind a gateway "
 "@code{hostname}:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:10926
+#: doc/guix.texi:10971
 #, no-wrap
 msgid ""
 "(service\n"
@@ -22920,67 +23897,66 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:10929
+#: doc/guix.texi:10974
 msgid "See below for more details about @code{inetd-configuration}."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:10931
+#: doc/guix.texi:10976
 #, no-wrap
 msgid "{Data Type} inetd-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:10933
+#: doc/guix.texi:10978
 msgid "Data type representing the configuration of @command{inetd}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10935
+#: doc/guix.texi:10980
 #, no-wrap
 msgid "@code{program} (default: @code{(file-append inetutils \"/libexec/inetd\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10937
+#: doc/guix.texi:10982
 msgid "The @command{inetd} executable to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10938 doc/guix.texi:16195
+#: doc/guix.texi:10983 doc/guix.texi:16240
 #, no-wrap
 msgid "@code{entries} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10941
+#: doc/guix.texi:10986
 msgid ""
 "A list of @command{inetd} service entries.  Each entry should be created by "
 "the @code{inetd-entry} constructor."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:10944
+#: doc/guix.texi:10989
 #, no-wrap
 msgid "{Data Type} inetd-entry"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:10948
+#: doc/guix.texi:10993
 msgid ""
 "Data type representing an entry in the @command{inetd} configuration.  Each "
-"entry corresponds to a socket where @command{inetd} will listen for "
-"requests."
+"entry corresponds to a socket where @command{inetd} will listen for requests."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10950
+#: doc/guix.texi:10995
 #, no-wrap
 msgid "@code{node} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10955
+#: doc/guix.texi:11000
 msgid ""
 "Optional string, a comma-separated list of local addresses @command{inetd} "
 "should use when listening for this service.  @xref{Configuration file,,, "
@@ -22988,49 +23964,49 @@ msgid ""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10957
+#: doc/guix.texi:11002
 msgid "A string, the name must correspond to an entry in @code{/etc/services}."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:10957
+#: doc/guix.texi:11002
 #, no-wrap
 msgid "socket-type"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10960
+#: doc/guix.texi:11005
 msgid ""
 "One of @code{'stream}, @code{'dgram}, @code{'raw}, @code{'rdm} or "
 "@code{'seqpacket}."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:10960
+#: doc/guix.texi:11005
 #, no-wrap
 msgid "protocol"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10962
+#: doc/guix.texi:11007
 msgid "A string, must correspond to an entry in @code{/etc/protocols}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10962
+#: doc/guix.texi:11007
 #, no-wrap
 msgid "@code{wait?} (default: @code{#t})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10965
+#: doc/guix.texi:11010
 msgid ""
 "Whether @command{inetd} should wait for the server to exit before listening "
 "to new service requests."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10970
+#: doc/guix.texi:11015
 msgid ""
 "A string containing the user (and, optionally, group) name of the user as "
 "whom the server should run.  The group name can be specified in a suffix, "
@@ -23039,20 +24015,20 @@ msgid ""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10970
+#: doc/guix.texi:11015
 #, no-wrap
 msgid "@code{program} (default: @code{\"internal\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10973
+#: doc/guix.texi:11018
 msgid ""
 "The server program which will serve the requests, or @code{\"internal\"} if "
 "@command{inetd} should use a built-in service."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10978
+#: doc/guix.texi:11023
 msgid ""
 "A list strings or file-like objects, which are the server program's "
 "arguments, starting with the zeroth argument, i.e. the name of the program "
@@ -23061,33 +24037,33 @@ msgid ""
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:10982
+#: doc/guix.texi:11027
 msgid ""
 "@xref{Configuration file,,, inetutils, GNU Inetutils} for a more detailed "
 "discussion of each configuration field."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:10984
+#: doc/guix.texi:11029
 #, no-wrap
 msgid "Tor"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:10985
+#: doc/guix.texi:11030
 #, no-wrap
 msgid "{Scheme Procedure} tor-service [@var{config-file}] [#:tor @var{tor}]"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:10988
+#: doc/guix.texi:11033
 msgid ""
 "Return a service to run the @uref{https://torproject.org, Tor} anonymous "
 "networking daemon."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:10993
+#: doc/guix.texi:11038
 msgid ""
 "The daemon runs as the @code{tor} unprivileged user.  It is passed "
 "@var{config-file}, a file-like object, with an additional @code{User tor} "
@@ -23096,26 +24072,26 @@ msgid ""
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:10995
+#: doc/guix.texi:11040
 #, no-wrap
 msgid "hidden service"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:10996
+#: doc/guix.texi:11041
 #, no-wrap
 msgid "{Scheme Procedure} tor-hidden-service @var{name} @var{mapping}"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:10999
+#: doc/guix.texi:11044
 msgid ""
 "Define a new Tor @dfn{hidden service} called @var{name} and implementing "
 "@var{mapping}.  @var{mapping} is a list of port/host tuples, such as:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:11003
+#: doc/guix.texi:11048
 #, no-wrap
 msgid ""
 " '((22 \"127.0.0.1:22\")\n"
@@ -23123,14 +24099,14 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11007
+#: doc/guix.texi:11052
 msgid ""
 "In this example, port 22 of the hidden service is mapped to local port 22, "
 "and port 80 is mapped to local port 8080."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11011
+#: doc/guix.texi:11056
 msgid ""
 "This creates a @file{/var/lib/tor/hidden-services/@var{name}} directory, "
 "where the @file{hostname} file contains the @code{.onion} host name for the "
@@ -23138,78 +24114,78 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11014
+#: doc/guix.texi:11059
 msgid ""
 "See @uref{https://www.torproject.org/docs/tor-hidden-service.html.en, the "
 "Tor project's documentation} for more information."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:11017
+#: doc/guix.texi:11062
 msgid "The @code{(gnu services rsync)} module provides the following services:"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:11021
+#: doc/guix.texi:11066
 msgid ""
 "You might want an rsync daemon if you have files that you want available so "
 "anyone (or just yourself) can download existing files or upload new files."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11022
+#: doc/guix.texi:11067
 #, no-wrap
 msgid "{Scheme Variable} rsync-service-type"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11025
+#: doc/guix.texi:11070
 msgid ""
 "This is the type for the @uref{https://rsync.samba.org, rsync} rsync daemon, "
 "@command{rsync-configuration} record as in this example:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:11028
+#: doc/guix.texi:11073
 #, no-wrap
 msgid "(service rsync-service-type)\n"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11031
+#: doc/guix.texi:11076
 msgid "See below for details about @code{rsync-configuration}."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:11033
+#: doc/guix.texi:11078
 #, no-wrap
 msgid "{Data Type} rsync-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:11035
+#: doc/guix.texi:11080
 msgid "Data type representing the configuration for @code{rsync-service}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11037
+#: doc/guix.texi:11082
 #, no-wrap
 msgid "@code{package} (default: @var{rsync})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11039
+#: doc/guix.texi:11084
 msgid "@code{rsync} package to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11040
+#: doc/guix.texi:11085
 #, no-wrap
 msgid "@code{port-number} (default: @code{873})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11044
+#: doc/guix.texi:11089
 msgid ""
 "TCP port on which @command{rsync} listens for incoming connections.  If port "
 "is less than @code{1024} @command{rsync} needs to be started as the "
@@ -23217,176 +24193,175 @@ msgid ""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11045
+#: doc/guix.texi:11090
 #, no-wrap
 msgid "@code{pid-file} (default: @code{\"/var/run/rsyncd/rsyncd.pid\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11047
+#: doc/guix.texi:11092
 msgid "Name of the file where @command{rsync} writes its PID."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11048
+#: doc/guix.texi:11093
 #, no-wrap
 msgid "@code{lock-file} (default: @code{\"/var/run/rsyncd/rsyncd.lock\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11050
+#: doc/guix.texi:11095
 msgid "Name of the file where @command{rsync} writes its lock file."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11051
+#: doc/guix.texi:11096
 #, no-wrap
 msgid "@code{log-file} (default: @code{\"/var/log/rsyncd.log\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11053
+#: doc/guix.texi:11098
 msgid "Name of the file where @command{rsync} writes its log file."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11054
+#: doc/guix.texi:11099
 #, no-wrap
 msgid "@code{use-chroot?} (default: @var{#t})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11056
+#: doc/guix.texi:11101
 msgid "Whether to use chroot for @command{rsync} shared directory."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11057
+#: doc/guix.texi:11102
 #, no-wrap
 msgid "@code{share-path} (default: @file{/srv/rsync})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11059
+#: doc/guix.texi:11104
 msgid "Location of the @command{rsync} shared directory."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11060
+#: doc/guix.texi:11105
 #, no-wrap
 msgid "@code{share-comment} (default: @code{\"Rsync share\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11062
+#: doc/guix.texi:11107
 msgid "Comment of the @command{rsync} shared directory."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11063
+#: doc/guix.texi:11108
 #, no-wrap
 msgid "@code{read-only?} (default: @var{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11065
+#: doc/guix.texi:11110
 msgid "Read-write permissions to shared directory."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11066
+#: doc/guix.texi:11111
 #, no-wrap
 msgid "@code{timeout} (default: @code{300})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11068
+#: doc/guix.texi:11113
 msgid "I/O timeout in seconds."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11069
+#: doc/guix.texi:11114
 #, no-wrap
 msgid "@code{user} (default: @var{\"root\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11071
+#: doc/guix.texi:11116
 msgid "Owner of the @code{rsync} process."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11072
+#: doc/guix.texi:11117
 #, no-wrap
 msgid "@code{group} (default: @var{\"root\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11074
+#: doc/guix.texi:11119
 msgid "Group of the @code{rsync} process."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11075
+#: doc/guix.texi:11120
 #, no-wrap
 msgid "@code{uid} (default: @var{\"rsyncd\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11078
+#: doc/guix.texi:11123
 msgid ""
 "User name or user ID that file transfers to and from that module should take "
 "place as when the daemon was run as @code{root}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11079
+#: doc/guix.texi:11124
 #, no-wrap
 msgid "@code{gid} (default: @var{\"rsyncd\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11081
+#: doc/guix.texi:11126
 msgid "Group name or group ID that will be used when accessing the module."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:11086
+#: doc/guix.texi:11131
 msgid "Furthermore, @code{(gnu services ssh)} provides the following services."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:11086 doc/guix.texi:11125 doc/guix.texi:20746
+#: doc/guix.texi:11131 doc/guix.texi:11170 doc/guix.texi:20791
 #, no-wrap
 msgid "SSH"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:11087 doc/guix.texi:11126 doc/guix.texi:20747
+#: doc/guix.texi:11132 doc/guix.texi:11171 doc/guix.texi:20792
 #, no-wrap
 msgid "SSH server"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11089
+#: doc/guix.texi:11134
 #, no-wrap
 msgid "{Scheme Procedure} lsh-service [#:host-key \"/etc/lsh/host-key\"] @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11098
+#: doc/guix.texi:11143
 msgid ""
-"[#:daemonic? #t] [#:interfaces '()] [#:port-number 22] @ "
-"[#:allow-empty-passwords? #f] [#:root-login? #f] @ [#:syslog-output? #t] "
-"[#:x11-forwarding? #t] @ [#:tcp/ip-forwarding? #t] "
-"[#:password-authentication? #t] @ [#:public-key-authentication? #t] "
-"[#:initialize? #t] Run the @command{lshd} program from @var{lsh} to listen "
-"on port @var{port-number}.  @var{host-key} must designate a file containing "
-"the host key, and readable only by root."
+"[#:daemonic? #t] [#:interfaces '()] [#:port-number 22] @ [#:allow-empty-"
+"passwords? #f] [#:root-login? #f] @ [#:syslog-output? #t] [#:x11-forwarding? "
+"#t] @ [#:tcp/ip-forwarding? #t] [#:password-authentication? #t] @ [#:public-"
+"key-authentication? #t] [#:initialize? #t] Run the @command{lshd} program "
+"from @var{lsh} to listen on port @var{port-number}.  @var{host-key} must "
+"designate a file containing the host key, and readable only by root."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11104
+#: doc/guix.texi:11149
 msgid ""
 "When @var{daemonic?} is true, @command{lshd} will detach from the "
 "controlling terminal and log its output to syslogd, unless one sets "
@@ -23396,7 +24371,7 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11108
+#: doc/guix.texi:11153
 msgid ""
 "When @var{initialize?} is true, automatically create the seed and host key "
 "upon service activation if they do not exist yet.  This may take long and "
@@ -23404,7 +24379,7 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11113
+#: doc/guix.texi:11158
 msgid ""
 "When @var{initialize?} is false, it is up to the user to initialize the "
 "randomness generator (@pxref{lsh-make-seed,,, lsh, LSH Manual}), and to "
@@ -23413,7 +24388,7 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11117
+#: doc/guix.texi:11162
 msgid ""
 "When @var{interfaces} is empty, lshd listens for connections on all the "
 "network interfaces; otherwise, @var{interfaces} must be a list of host names "
@@ -23421,26 +24396,25 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11121
+#: doc/guix.texi:11166
 msgid ""
 "@var{allow-empty-passwords?} specifies whether to accept log-ins with empty "
-"passwords, and @var{root-login?} specifies whether to accept log-ins as "
-"root."
+"passwords, and @var{root-login?} specifies whether to accept log-ins as root."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11123
+#: doc/guix.texi:11168
 msgid "The other options should be self-descriptive."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11127
+#: doc/guix.texi:11172
 #, no-wrap
 msgid "{Scheme Variable} openssh-service-type"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11131
+#: doc/guix.texi:11176
 msgid ""
 "This is the type for the @uref{http://www.openssh.org, OpenSSH} secure shell "
 "daemon, @command{sshd}.  Its value must be an @code{openssh-configuration} "
@@ -23448,7 +24422,7 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:11140
+#: doc/guix.texi:11185
 #, no-wrap
 msgid ""
 "(service openssh-service-type\n"
@@ -23461,17 +24435,18 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11143
+#: doc/guix.texi:11188
 msgid "See below for details about @code{openssh-configuration}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11146
-msgid "This service can be extended with extra authorized keys, as in this example:"
+#: doc/guix.texi:11191
+msgid ""
+"This service can be extended with extra authorized keys, as in this example:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:11151
+#: doc/guix.texi:11196
 #, no-wrap
 msgid ""
 "(service-extension openssh-service-type\n"
@@ -23480,46 +24455,46 @@ msgid ""
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:11154
+#: doc/guix.texi:11199
 #, no-wrap
 msgid "{Data Type} openssh-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:11156
+#: doc/guix.texi:11201
 msgid "This is the configuration record for OpenSSH's @command{sshd}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11158
+#: doc/guix.texi:11203
 #, no-wrap
 msgid "@code{pid-file} (default: @code{\"/var/run/sshd.pid\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11160
+#: doc/guix.texi:11205
 msgid "Name of the file where @command{sshd} writes its PID."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11161
+#: doc/guix.texi:11206
 #, no-wrap
 msgid "@code{port-number} (default: @code{22})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11163
+#: doc/guix.texi:11208
 msgid "TCP port on which @command{sshd} listens for incoming connections."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11164
+#: doc/guix.texi:11209
 #, no-wrap
 msgid "@code{permit-root-login} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11169
+#: doc/guix.texi:11214
 msgid ""
 "This field determines whether and when to allow logins as root.  If "
 "@code{#f}, root logins are disallowed; if @code{#t}, they are allowed.  If "
@@ -23528,126 +24503,125 @@ msgid ""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11170 doc/guix.texi:11303
+#: doc/guix.texi:11215 doc/guix.texi:11348
 #, no-wrap
 msgid "@code{allow-empty-passwords?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11173
-msgid "When true, users with empty passwords may log in.  When false, they may not."
+#: doc/guix.texi:11218
+msgid ""
+"When true, users with empty passwords may log in.  When false, they may not."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11174 doc/guix.texi:11306
+#: doc/guix.texi:11219 doc/guix.texi:11351
 #, no-wrap
 msgid "@code{password-authentication?} (default: @code{#t})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11177
+#: doc/guix.texi:11222
 msgid ""
 "When true, users may log in with their password.  When false, they have "
 "other authentication methods."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11178
+#: doc/guix.texi:11223
 #, no-wrap
 msgid "@code{public-key-authentication?} (default: @code{#t})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11181
+#: doc/guix.texi:11226
 msgid ""
 "When true, users may log in using public key authentication.  When false, "
 "users have to use other authentication method."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11184
+#: doc/guix.texi:11229
 msgid ""
 "Authorized public keys are stored in @file{~/.ssh/authorized_keys}.  This is "
 "used only by protocol version 2."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11185
+#: doc/guix.texi:11230
 #, no-wrap
 msgid "@code{x11-forwarding?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11189
+#: doc/guix.texi:11234
 msgid ""
 "When true, forwarding of X11 graphical client connections is enabled---in "
 "other words, @command{ssh} options @option{-X} and @option{-Y} will work."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11190
+#: doc/guix.texi:11235
 #, no-wrap
 msgid "@code{challenge-response-authentication?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11193
+#: doc/guix.texi:11238
 msgid ""
 "Specifies whether challenge response authentication is allowed (e.g. via "
 "PAM)."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11194
+#: doc/guix.texi:11239
 #, no-wrap
 msgid "@code{use-pam?} (default: @code{#t})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11200
+#: doc/guix.texi:11245
 msgid ""
 "Enables the Pluggable Authentication Module interface.  If set to @code{#t}, "
-"this will enable PAM authentication using "
-"@code{challenge-response-authentication?} and "
-"@code{password-authentication?}, in addition to PAM account and session "
-"module processing for all authentication types."
+"this will enable PAM authentication using @code{challenge-response-"
+"authentication?} and @code{password-authentication?}, in addition to PAM "
+"account and session module processing for all authentication types."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11205
+#: doc/guix.texi:11250
 msgid ""
 "Because PAM challenge response authentication usually serves an equivalent "
-"role to password authentication, you should disable either "
-"@code{challenge-response-authentication?} or "
-"@code{password-authentication?}."
+"role to password authentication, you should disable either @code{challenge-"
+"response-authentication?} or @code{password-authentication?}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11206
+#: doc/guix.texi:11251
 #, no-wrap
 msgid "@code{print-last-log?} (default: @code{#t})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11209
+#: doc/guix.texi:11254
 msgid ""
 "Specifies whether @command{sshd} should print the date and time of the last "
 "user login when a user logs in interactively."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11210
+#: doc/guix.texi:11255
 #, no-wrap
 msgid "@code{subsystems} (default: @code{'((\"sftp\" \"internal-sftp\"))})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11212
+#: doc/guix.texi:11257
 msgid "Configures external subsystems (e.g. file transfer daemon)."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11216
+#: doc/guix.texi:11261
 msgid ""
 "This is a list of two-element lists, each of which containing the subsystem "
 "name and a command (with optional arguments) to execute upon subsystem "
@@ -23655,43 +24629,42 @@ msgid ""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11219
+#: doc/guix.texi:11264
 msgid ""
 "The command @command{internal-sftp} implements an in-process SFTP server.  "
 "Alternately, one can specify the @command{sftp-server} command:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:11224
+#: doc/guix.texi:11269
 #, no-wrap
 msgid ""
 "(service openssh-service-type\n"
 "         (openssh-configuration\n"
 "          (subsystems\n"
-"           `((\"sftp\" ,(file-append openssh "
-"\"/libexec/sftp-server\"))))))\n"
+"           `((\"sftp\" ,(file-append openssh \"/libexec/sftp-server\"))))))\n"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11226
+#: doc/guix.texi:11271
 #, no-wrap
 msgid "@code{accepted-environment} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11228
+#: doc/guix.texi:11273
 msgid "List of strings describing which environment variables may be exported."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11231
+#: doc/guix.texi:11276
 msgid ""
 "Each string gets on its own line.  See the @code{AcceptEnv} option in "
 "@code{man sshd_config}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11236
+#: doc/guix.texi:11281
 msgid ""
 "This example allows ssh-clients to export the @code{COLORTERM} variable.  It "
 "is set by terminal emulators, which support colors.  You can use it in your "
@@ -23700,7 +24673,7 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:11241
+#: doc/guix.texi:11286
 #, no-wrap
 msgid ""
 "(service openssh-service-type\n"
@@ -23709,25 +24682,25 @@ msgid ""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11243
+#: doc/guix.texi:11288
 #, no-wrap
 msgid "@code{authorized-keys} (default: @code{'()})"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:11244
+#: doc/guix.texi:11289
 #, no-wrap
 msgid "authorized keys, SSH"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:11245
+#: doc/guix.texi:11290
 #, no-wrap
 msgid "SSH authorized keys"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11249
+#: doc/guix.texi:11294
 msgid ""
 "This is the list of authorized keys.  Each element of the list is a user "
 "name followed by one or more file-like objects that represent SSH public "
@@ -23735,46 +24708,44 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:11256
+#: doc/guix.texi:11301
 #, no-wrap
 msgid ""
 "(openssh-configuration\n"
 "  (authorized-keys\n"
 "    `((\"rekado\" ,(local-file \"rekado.pub\"))\n"
 "      (\"chris\" ,(local-file \"chris.pub\"))\n"
-"      (\"root\" ,(local-file \"rekado.pub\") ,(local-file "
-"\"chris.pub\")))))\n"
+"      (\"root\" ,(local-file \"rekado.pub\") ,(local-file \"chris.pub\")))))\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11261
+#: doc/guix.texi:11306
 msgid ""
 "registers the specified public keys for user accounts @code{rekado}, "
 "@code{chris}, and @code{root}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11264
+#: doc/guix.texi:11309
 msgid ""
-"Additional authorized keys can be specified @i{via} "
-"@code{service-extension}."
+"Additional authorized keys can be specified @i{via} @code{service-extension}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11267
+#: doc/guix.texi:11312
 msgid ""
-"Note that this does @emph{not} interfere with the use of "
-"@file{~/.ssh/authorized_keys}."
+"Note that this does @emph{not} interfere with the use of @file{~/.ssh/"
+"authorized_keys}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11270
+#: doc/guix.texi:11315
 #, no-wrap
 msgid "{Scheme Procedure} dropbear-service [@var{config}]"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11274
+#: doc/guix.texi:11319
 msgid ""
 "Run the @uref{https://matt.ucc.asn.au/dropbear/dropbear.html,Dropbear SSH "
 "daemon} with the given @var{config}, a @code{<dropbear-configuration>} "
@@ -23782,14 +24753,14 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11277
+#: doc/guix.texi:11322
 msgid ""
 "For example, to specify a Dropbear service listening on port 1234, add this "
 "call to the operating system's @code{services} field:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:11281
+#: doc/guix.texi:11326
 #, no-wrap
 msgid ""
 "(dropbear-service (dropbear-configuration\n"
@@ -23797,89 +24768,89 @@ msgid ""
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:11284
+#: doc/guix.texi:11329
 #, no-wrap
 msgid "{Data Type} dropbear-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:11286
+#: doc/guix.texi:11331
 msgid "This data type represents the configuration of a Dropbear SSH daemon."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11288
+#: doc/guix.texi:11333
 #, no-wrap
 msgid "@code{dropbear} (default: @var{dropbear})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11290
+#: doc/guix.texi:11335
 msgid "The Dropbear package to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11291
+#: doc/guix.texi:11336
 #, no-wrap
 msgid "@code{port-number} (default: 22)"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11293
+#: doc/guix.texi:11338
 msgid "The TCP port where the daemon waits for incoming connections."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11294
+#: doc/guix.texi:11339
 #, no-wrap
 msgid "@code{syslog-output?} (default: @code{#t})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11296
+#: doc/guix.texi:11341
 msgid "Whether to enable syslog output."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11297
+#: doc/guix.texi:11342
 #, no-wrap
 msgid "@code{pid-file} (default: @code{\"/var/run/dropbear.pid\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11299
+#: doc/guix.texi:11344
 msgid "File name of the daemon's PID file."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11300
+#: doc/guix.texi:11345
 #, no-wrap
 msgid "@code{root-login?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11302
+#: doc/guix.texi:11347
 msgid "Whether to allow @code{root} logins."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11305
+#: doc/guix.texi:11350
 msgid "Whether to allow empty passwords."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11308
+#: doc/guix.texi:11353
 msgid "Whether to enable password-based authentication."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:11311
+#: doc/guix.texi:11356
 #, no-wrap
 msgid "{Scheme Variable} %facebook-host-aliases"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:11317
+#: doc/guix.texi:11362
 msgid ""
 "This variable contains a string for use in @file{/etc/hosts} (@pxref{Host "
 "Names,,, libc, The GNU C Library Reference Manual}).  Each line contains a "
@@ -23889,7 +24860,7 @@ msgid ""
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:11321
+#: doc/guix.texi:11366
 msgid ""
 "This variable is typically used in the @code{hosts-file} field of an "
 "@code{operating-system} declaration (@pxref{operating-system Reference, "
@@ -23897,7 +24868,7 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:11324
+#: doc/guix.texi:11369
 #, no-wrap
 msgid ""
 "(use-modules (gnu) (guix))\n"
@@ -23905,7 +24876,7 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:11334
+#: doc/guix.texi:11379
 #, no-wrap
 msgid ""
 "(operating-system\n"
@@ -23920,46 +24891,46 @@ msgid ""
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:11338
+#: doc/guix.texi:11383
 msgid ""
 "This mechanism can prevent programs running locally, such as Web browsers, "
 "from accessing Facebook."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:11341
+#: doc/guix.texi:11386
 msgid "The @code{(gnu services avahi)} provides the following definition."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11342
+#: doc/guix.texi:11387
 #, no-wrap
 msgid "{Scheme Procedure} avahi-service [#:avahi @var{avahi}] @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11354
+#: doc/guix.texi:11399
 msgid ""
 "[#:host-name #f] [#:publish? #t] [#:ipv4? #t] @ [#:ipv6? #t] [#:wide-area? "
 "#f] @ [#:domains-to-browse '()] [#:debug? #f] Return a service that runs "
 "@command{avahi-daemon}, a system-wide mDNS/DNS-SD responder that allows for "
 "service discovery and \"zero-configuration\" host name lookups (see "
 "@uref{http://avahi.org/}), and extends the name service cache daemon (nscd) "
-"so that it can resolve @code{.local} host names using "
-"@uref{http://0pointer.de/lennart/projects/nss-mdns/, nss-mdns}.  "
-"Additionally, add the @var{avahi} package to the system profile so that "
-"commands such as @command{avahi-browse} are directly usable."
+"so that it can resolve @code{.local} host names using @uref{http://0pointer."
+"de/lennart/projects/nss-mdns/, nss-mdns}.  Additionally, add the @var{avahi} "
+"package to the system profile so that commands such as @command{avahi-"
+"browse} are directly usable."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11357
+#: doc/guix.texi:11402
 msgid ""
 "If @var{host-name} is different from @code{#f}, use that as the host name to "
 "publish for this machine; otherwise, use the machine's actual host name."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11361
+#: doc/guix.texi:11406
 msgid ""
 "When @var{publish?} is true, publishing of host names and services is "
 "allowed; in particular, avahi-daemon will publish the machine's host name "
@@ -23967,38 +24938,38 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11363
+#: doc/guix.texi:11408
 msgid "When @var{wide-area?} is true, DNS-SD over unicast DNS is enabled."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11366
+#: doc/guix.texi:11411
 msgid ""
-"Boolean values @var{ipv4?} and @var{ipv6?} determine whether to use "
-"IPv4/IPv6 sockets."
+"Boolean values @var{ipv4?} and @var{ipv6?} determine whether to use IPv4/"
+"IPv6 sockets."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11368
+#: doc/guix.texi:11413
 #, no-wrap
 msgid "{Scheme Variable} openvswitch-service-type"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11372
+#: doc/guix.texi:11417
 msgid ""
 "This is the type of the @uref{http://www.openvswitch.org, Open vSwitch} "
 "service, whose value should be an @code{openvswitch-configuration} object."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:11374
+#: doc/guix.texi:11419
 #, no-wrap
 msgid "{Data Type} openvswitch-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:11378
+#: doc/guix.texi:11423
 msgid ""
 "Data type representing the configuration of Open vSwitch, a multilayer "
 "virtual switch which is designed to enable massive network automation "
@@ -24006,36 +24977,36 @@ msgid ""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11380
+#: doc/guix.texi:11425
 #, no-wrap
 msgid "@code{package} (default: @var{openvswitch})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11382
+#: doc/guix.texi:11427
 msgid "Package object of the Open vSwitch."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:11389
+#: doc/guix.texi:11434
 #, no-wrap
 msgid "X11"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:11390
+#: doc/guix.texi:11435
 #, no-wrap
 msgid "X Window System"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:11391 doc/guix.texi:11568
+#: doc/guix.texi:11436 doc/guix.texi:11613
 #, no-wrap
 msgid "login manager"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:11396
+#: doc/guix.texi:11441
 msgid ""
 "Support for the X Window graphical display system---specifically Xorg---is "
 "provided by the @code{(gnu services xorg)} module.  Note that there is no "
@@ -24044,13 +25015,13 @@ msgid ""
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:11397
+#: doc/guix.texi:11442
 #, no-wrap
 msgid "window manager"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:11402
+#: doc/guix.texi:11447
 msgid ""
 "To use X11, you must install at least one @dfn{window manager}---for example "
 "the @code{windowmaker} or @code{openbox} packages---preferably by adding it "
@@ -24059,30 +25030,30 @@ msgid ""
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:11403
+#: doc/guix.texi:11448
 #, no-wrap
 msgid "{Scheme Variable} slim-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:11405
+#: doc/guix.texi:11450
 msgid "This is the type for the SLiM graphical login manager for X11."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:11406
+#: doc/guix.texi:11451
 #, no-wrap
 msgid "session types (X11)"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:11407
+#: doc/guix.texi:11452
 #, no-wrap
 msgid "X11 session types"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:11414
+#: doc/guix.texi:11459
 msgid ""
 "SLiM looks for @dfn{session types} described by the @file{.desktop} files in "
 "@file{/run/current-system/profile/share/xsessions} and allows users to "
@@ -24093,85 +25064,85 @@ msgid ""
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:11418
+#: doc/guix.texi:11463
 msgid ""
-"In addition, @file{~/.xsession} files are honored.  When available, "
-"@file{~/.xsession} must be an executable that starts a window manager and/or "
-"other X clients."
+"In addition, @file{~/.xsession} files are honored.  When available, @file{~/."
+"xsession} must be an executable that starts a window manager and/or other X "
+"clients."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:11420
+#: doc/guix.texi:11465
 #, no-wrap
 msgid "{Data Type} slim-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:11422
+#: doc/guix.texi:11467
 msgid "Data type representing the configuration of @code{slim-service-type}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11426
+#: doc/guix.texi:11471
 msgid "Whether to allow logins with empty passwords."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11427
+#: doc/guix.texi:11472
 #, no-wrap
 msgid "@code{auto-login?} (default: @code{#f})"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:11428
+#: doc/guix.texi:11473
 #, no-wrap
 msgid "@code{default-user} (default: @code{\"\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11430
+#: doc/guix.texi:11475
 msgid "When @code{auto-login?} is false, SLiM presents a log-in screen."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11433
+#: doc/guix.texi:11478
 msgid ""
-"When @code{auto-login?} is true, SLiM logs in directly as "
-"@code{default-user}."
+"When @code{auto-login?} is true, SLiM logs in directly as @code{default-"
+"user}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11434
+#: doc/guix.texi:11479
 #, no-wrap
 msgid "@code{theme} (default: @code{%default-slim-theme})"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:11435
+#: doc/guix.texi:11480
 #, no-wrap
 msgid "@code{theme-name} (default: @code{%default-slim-theme-name})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11437
+#: doc/guix.texi:11482
 msgid "The graphical theme to use and its name."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11438
+#: doc/guix.texi:11483
 #, no-wrap
 msgid "@code{auto-login-session} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11441
+#: doc/guix.texi:11486
 msgid ""
 "If true, this must be the name of the executable to start as the default "
 "session---e.g., @code{(file-append windowmaker \"/bin/windowmaker\")}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11445
+#: doc/guix.texi:11490
 msgid ""
 "If false, a session described by one of the available @file{.desktop} files "
 "in @code{/run/current-system/profile} and @code{~/.guix-profile} will be "
@@ -24179,7 +25150,7 @@ msgid ""
 msgstr ""
 
 #. type: quotation
-#: doc/guix.texi:11450
+#: doc/guix.texi:11495
 msgid ""
 "You must install at least one window manager in the system profile or in "
 "your user profile.  Failing to do that, if @code{auto-login-session} is "
@@ -24187,443 +25158,421 @@ msgid ""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11452
+#: doc/guix.texi:11497
 #, no-wrap
 msgid "@code{startx} (default: @code{(xorg-start-command)})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11454
+#: doc/guix.texi:11499
 msgid "The command used to start the X11 graphical server."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11455
+#: doc/guix.texi:11500
 #, no-wrap
 msgid "@code{xauth} (default: @code{xauth})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11457
+#: doc/guix.texi:11502
 msgid "The XAuth package to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11458
+#: doc/guix.texi:11503
 #, no-wrap
 msgid "@code{shepherd} (default: @code{shepherd})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11461
-msgid "The Shepherd package used when invoking @command{halt} and @command{reboot}."
+#: doc/guix.texi:11506
+msgid ""
+"The Shepherd package used when invoking @command{halt} and @command{reboot}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11462
+#: doc/guix.texi:11507
 #, no-wrap
 msgid "@code{sessreg} (default: @code{sessreg})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11464
+#: doc/guix.texi:11509
 msgid "The sessreg package used in order to register the session."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11465
+#: doc/guix.texi:11510
 #, no-wrap
 msgid "@code{slim} (default: @code{slim})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11467
+#: doc/guix.texi:11512
 msgid "The SLiM package to use."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:11470 doc/guix.texi:20243
+#: doc/guix.texi:11515 doc/guix.texi:20288
 #, no-wrap
 msgid "{Scheme Variable} %default-theme"
 msgstr ""
 
 #. type: defvrx
-#: doc/guix.texi:11471
+#: doc/guix.texi:11516
 #, no-wrap
 msgid "{Scheme Variable} %default-theme-name"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:11473
+#: doc/guix.texi:11518
 msgid "The default SLiM theme and its name."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:11476
+#: doc/guix.texi:11521
 #, no-wrap
 msgid "{Data Type} sddm-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:11478
+#: doc/guix.texi:11523
 msgid "This is the data type representing the sddm service configuration."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11480
+#: doc/guix.texi:11525
 #, no-wrap
 msgid "@code{display-server} (default: \"x11\")"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11483
+#: doc/guix.texi:11528
 msgid ""
 "Select display server to use for the greeter. Valid values are \"x11\" or "
 "\"wayland\"."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11484
+#: doc/guix.texi:11529
 #, no-wrap
 msgid "@code{numlock} (default: \"on\")"
 msgstr ""
 
-#. type: table
-#: doc/guix.texi:11486
-msgid "Valid values are \"on\", \"off\" or \"none\"."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:11487
-#, no-wrap
-msgid ""
-"@code{halt-command} (default @code{#~(string-apppend #$shepherd "
-"\"/sbin/halt\")})"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:11489
-msgid "Command to run when halting."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:11490
-#, no-wrap
-msgid ""
-"@code{reboot-command} (default @code{#~(string-append #$shepherd "
-"\"/sbin/reboot\")})"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:11492
-msgid "Command to run when rebooting."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:11493
-#, no-wrap
-msgid "@code{theme} (default \"maldives\")"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:11495
-msgid ""
-"Theme to use. Default themes provided by SDDM are \"elarun\" or "
-"\"maldives\"."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:11496
-#, no-wrap
-msgid ""
-"@code{themes-directory} (default "
-"\"/run/current-system/profile/share/sddm/themes\")"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:11498
-msgid "Directory to look for themes."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:11499
-#, no-wrap
-msgid ""
-"@code{faces-directory} (default "
-"\"/run/current-system/profile/share/sddm/faces\")"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:11501
-msgid "Directory to look for faces."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:11502
-#, no-wrap
-msgid "@code{default-path} (default \"/run/current-system/profile/bin\")"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:11504
-msgid "Default PATH to use."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:11505
-#, no-wrap
-msgid "@code{minimum-uid} (default 1000)"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:11507
-msgid "Minimum UID to display in SDDM."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:11508
-#, no-wrap
-msgid "@code{maximum-uid} (default 2000)"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:11510
-msgid "Maximum UID to display in SDDM"
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:11511
-#, no-wrap
-msgid "@code{remember-last-user?} (default #t)"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:11513
-msgid "Remember last user."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:11514
-#, no-wrap
-msgid "@code{remember-last-session?} (default #t)"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:11516
-msgid "Remember last session."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:11517
-#, no-wrap
-msgid "@code{hide-users} (default \"\")"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:11519
-msgid "Usernames to hide from SDDM greeter."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:11520
-#, no-wrap
-msgid ""
-"@code{hide-shells} (default @code{#~(string-append #$shadow "
-"\"/sbin/nologin\")})"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:11522
-msgid "Users with shells listed will be hidden from the SDDM greeter."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:11523
-#, no-wrap
-msgid ""
-"@code{session-command} (default @code{#~(string-append #$sddm "
-"\"/share/sddm/scripts/wayland-session\")})"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:11525
-msgid "Script to run before starting a wayland session."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:11526
-#, no-wrap
-msgid ""
-"@code{sessions-directory} (default "
-"\"/run/current-system/profile/share/wayland-sessions\")"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:11528
-msgid "Directory to look for desktop files starting wayland sessions."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:11529
-#, no-wrap
-msgid "@code{xorg-server-path} (default @code{xorg-start-command})"
-msgstr ""
-
 #. type: table
 #: doc/guix.texi:11531
-msgid "Path to xorg-server."
+msgid "Valid values are \"on\", \"off\" or \"none\"."
 msgstr ""
 
 #. type: item
 #: doc/guix.texi:11532
 #, no-wrap
-msgid "@code{xauth-path} (default @code{#~(string-append #$xauth \"/bin/xauth\")})"
+msgid "@code{halt-command} (default @code{#~(string-apppend #$shepherd \"/sbin/halt\")})"
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:11534
-msgid "Path to xauth."
+msgid "Command to run when halting."
 msgstr ""
 
 #. type: item
 #: doc/guix.texi:11535
 #, no-wrap
-msgid ""
-"@code{xephyr-path} (default @code{#~(string-append #$xorg-server "
-"\"/bin/Xephyr\")})"
+msgid "@code{reboot-command} (default @code{#~(string-append #$shepherd \"/sbin/reboot\")})"
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:11537
-msgid "Path to Xephyr."
+msgid "Command to run when rebooting."
 msgstr ""
 
 #. type: item
 #: doc/guix.texi:11538
 #, no-wrap
-msgid ""
-"@code{xdisplay-start} (default @code{#~(string-append #$sddm "
-"\"/share/sddm/scripts/Xsetup\")})"
+msgid "@code{theme} (default \"maldives\")"
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:11540
-msgid "Script to run after starting xorg-server."
+msgid ""
+"Theme to use. Default themes provided by SDDM are \"elarun\" or \"maldives\"."
 msgstr ""
 
 #. type: item
 #: doc/guix.texi:11541
 #, no-wrap
-msgid ""
-"@code{xdisplay-stop} (default @code{#~(string-append #$sddm "
-"\"/share/sddm/scripts/Xstop\")})"
+msgid "@code{themes-directory} (default \"/run/current-system/profile/share/sddm/themes\")"
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:11543
-msgid "Script to run before stopping xorg-server."
+msgid "Directory to look for themes."
 msgstr ""
 
 #. type: item
 #: doc/guix.texi:11544
 #, no-wrap
-msgid "@code{xsession-command} (default: @code{xinitr })"
+msgid "@code{faces-directory} (default \"/run/current-system/profile/share/sddm/faces\")"
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:11546
-msgid "Script to run before starting a X session."
+msgid "Directory to look for faces."
 msgstr ""
 
 #. type: item
 #: doc/guix.texi:11547
 #, no-wrap
-msgid ""
-"@code{xsessions-directory} (default: "
-"\"/run/current-system/profile/share/xsessions\")"
+msgid "@code{default-path} (default \"/run/current-system/profile/bin\")"
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:11549
-msgid "Directory to look for desktop files starting X sessions."
+msgid "Default PATH to use."
 msgstr ""
 
 #. type: item
 #: doc/guix.texi:11550
 #, no-wrap
-msgid "@code{minimum-vt} (default: 7)"
+msgid "@code{minimum-uid} (default 1000)"
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:11552
-msgid "Minimum VT to use."
+msgid "Minimum UID to display in SDDM."
 msgstr ""
 
 #. type: item
 #: doc/guix.texi:11553
 #, no-wrap
-msgid "@code{xserver-arguments} (default \"-nolisten tcp\")"
+msgid "@code{maximum-uid} (default 2000)"
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:11555
-msgid "Arguments to pass to xorg-server."
+msgid "Maximum UID to display in SDDM"
 msgstr ""
 
 #. type: item
 #: doc/guix.texi:11556
 #, no-wrap
-msgid "@code{auto-login-user} (default \"\")"
+msgid "@code{remember-last-user?} (default #t)"
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:11558
-msgid "User to use for auto-login."
+msgid "Remember last user."
 msgstr ""
 
 #. type: item
 #: doc/guix.texi:11559
 #, no-wrap
-msgid "@code{auto-login-session} (default \"\")"
+msgid "@code{remember-last-session?} (default #t)"
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:11561
-msgid "Desktop file to use for auto-login."
+msgid "Remember last session."
 msgstr ""
 
 #. type: item
 #: doc/guix.texi:11562
 #, no-wrap
-msgid "@code{relogin?} (default #f)"
+msgid "@code{hide-users} (default \"\")"
 msgstr ""
 
 #. type: table
 #: doc/guix.texi:11564
+msgid "Usernames to hide from SDDM greeter."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:11565
+#, no-wrap
+msgid "@code{hide-shells} (default @code{#~(string-append #$shadow \"/sbin/nologin\")})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:11567
+msgid "Users with shells listed will be hidden from the SDDM greeter."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:11568
+#, no-wrap
+msgid "@code{session-command} (default @code{#~(string-append #$sddm \"/share/sddm/scripts/wayland-session\")})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:11570
+msgid "Script to run before starting a wayland session."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:11571
+#, no-wrap
+msgid "@code{sessions-directory} (default \"/run/current-system/profile/share/wayland-sessions\")"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:11573
+msgid "Directory to look for desktop files starting wayland sessions."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:11574
+#, no-wrap
+msgid "@code{xorg-server-path} (default @code{xorg-start-command})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:11576
+msgid "Path to xorg-server."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:11577
+#, no-wrap
+msgid "@code{xauth-path} (default @code{#~(string-append #$xauth \"/bin/xauth\")})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:11579
+msgid "Path to xauth."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:11580
+#, no-wrap
+msgid "@code{xephyr-path} (default @code{#~(string-append #$xorg-server \"/bin/Xephyr\")})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:11582
+msgid "Path to Xephyr."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:11583
+#, no-wrap
+msgid "@code{xdisplay-start} (default @code{#~(string-append #$sddm \"/share/sddm/scripts/Xsetup\")})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:11585
+msgid "Script to run after starting xorg-server."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:11586
+#, no-wrap
+msgid "@code{xdisplay-stop} (default @code{#~(string-append #$sddm \"/share/sddm/scripts/Xstop\")})"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:11588
+msgid "Script to run before stopping xorg-server."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:11589
+#, no-wrap
+msgid "@code{xsession-command} (default: @code{xinitr })"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:11591
+msgid "Script to run before starting a X session."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:11592
+#, no-wrap
+msgid "@code{xsessions-directory} (default: \"/run/current-system/profile/share/xsessions\")"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:11594
+msgid "Directory to look for desktop files starting X sessions."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:11595
+#, no-wrap
+msgid "@code{minimum-vt} (default: 7)"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:11597
+msgid "Minimum VT to use."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:11598
+#, no-wrap
+msgid "@code{xserver-arguments} (default \"-nolisten tcp\")"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:11600
+msgid "Arguments to pass to xorg-server."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:11601
+#, no-wrap
+msgid "@code{auto-login-user} (default \"\")"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:11603
+msgid "User to use for auto-login."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:11604
+#, no-wrap
+msgid "@code{auto-login-session} (default \"\")"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:11606
+msgid "Desktop file to use for auto-login."
+msgstr ""
+
+#. type: item
+#: doc/guix.texi:11607
+#, no-wrap
+msgid "@code{relogin?} (default #f)"
+msgstr ""
+
+#. type: table
+#: doc/guix.texi:11609
 msgid "Relogin after logout."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:11569
+#: doc/guix.texi:11614
 #, no-wrap
 msgid "X11 login"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11570
+#: doc/guix.texi:11615
 #, no-wrap
 msgid "{Scheme Procedure} sddm-service config"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11573
+#: doc/guix.texi:11618
 msgid ""
 "Return a service that spawns the SDDM graphical login manager for config of "
 "type @code{<sddm-configuration>}."
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:11578
+#: doc/guix.texi:11623
 #, no-wrap
 msgid ""
 "  (sddm-service (sddm-configuration\n"
@@ -24632,16 +25581,16 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11581
+#: doc/guix.texi:11626
 #, no-wrap
 msgid "{Scheme Procedure} xorg-start-command [#:guile] @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11590
+#: doc/guix.texi:11635
 msgid ""
-"[#:modules %default-xorg-modules] @ [#:fonts %default-xorg-fonts] @ "
-"[#:configuration-file (xorg-configuration-file @dots{})] @ [#:xorg-server "
+"[#:modules %default-xorg-modules] @ [#:fonts %default-xorg-fonts] @ [#:"
+"configuration-file (xorg-configuration-file @dots{})] @ [#:xorg-server "
 "@var{xorg-server}] Return a @code{startx} script in which @var{modules}, a "
 "list of X module packages, and @var{fonts}, a list of X font directories, "
 "are available.  See @code{xorg-wrapper} for more details on the arguments.  "
@@ -24649,27 +25598,26 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11592
+#: doc/guix.texi:11637
 msgid "Usually the X server is started by a login manager."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11594
+#: doc/guix.texi:11639
 #, no-wrap
 msgid "{Scheme Procedure} xorg-configuration-file @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11600
+#: doc/guix.texi:11645
 msgid ""
-"[#:modules %default-xorg-modules] @ [#:fonts %default-xorg-fonts] @ "
-"[#:drivers '()] [#:resolutions '()] [#:extra-config '()] Return a "
-"configuration file for the Xorg server containing search paths for all the "
-"common drivers."
+"[#:modules %default-xorg-modules] @ [#:fonts %default-xorg-fonts] @ [#:"
+"drivers '()] [#:resolutions '()] [#:extra-config '()] Return a configuration "
+"file for the Xorg server containing search paths for all the common drivers."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11605
+#: doc/guix.texi:11650
 msgid ""
 "@var{modules} must be a list of @dfn{module packages} loaded by the Xorg "
 "server---e.g., @code{xf86-video-vesa}, @code{xf86-input-keyboard}, and so "
@@ -24678,7 +25626,7 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11609
+#: doc/guix.texi:11654
 msgid ""
 "@var{drivers} must be either the empty list, in which case Xorg chooses a "
 "graphics driver automatically, or a list of driver names that will be tried "
@@ -24686,15 +25634,15 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11613
+#: doc/guix.texi:11658
 msgid ""
 "Likewise, when @var{resolutions} is the empty list, Xorg chooses an "
-"appropriate screen resolution; otherwise, it must be a list of "
-"resolutions---e.g., @code{((1024 768) (640 480))}."
+"appropriate screen resolution; otherwise, it must be a list of resolutions---"
+"e.g., @code{((1024 768) (640 480))}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11617
+#: doc/guix.texi:11662
 msgid ""
 "Last, @var{extra-config} is a list of strings or objects appended to the "
 "configuration file.  It is used to pass extra text to be added verbatim to "
@@ -24702,13 +25650,13 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11619
+#: doc/guix.texi:11664
 #, no-wrap
 msgid "{Scheme Procedure} screen-locker-service @var{package} [@var{program}]"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11623
+#: doc/guix.texi:11668
 msgid ""
 "Add @var{package}, a package for a screen locker or screen saver whose "
 "command is @var{program}, to the set of setuid programs and add a PAM entry "
@@ -24716,24 +25664,24 @@ msgid ""
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:11626
+#: doc/guix.texi:11671
 #, no-wrap
 msgid "(screen-locker-service xlockmore \"xlock\")\n"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11629
+#: doc/guix.texi:11674
 msgid "makes the good ol' XlockMore usable."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:11635
+#: doc/guix.texi:11680
 #, no-wrap
 msgid "printer support with CUPS"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:11639
+#: doc/guix.texi:11684
 msgid ""
 "The @code{(gnu services cups)} module provides a Guix service definition for "
 "the CUPS printing service.  To add printer support to a GuixSD system, add a "
@@ -24741,26 +25689,26 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11640
+#: doc/guix.texi:11685
 #, no-wrap
 msgid "{Scheme Variable} cups-service-type"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11644
+#: doc/guix.texi:11689
 msgid ""
 "The service type for the CUPS print server.  Its value should be a valid "
 "CUPS configuration (see below).  To use the default settings, simply write:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:11646
+#: doc/guix.texi:11691
 #, no-wrap
 msgid "(service cups-service-type)\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:11656
+#: doc/guix.texi:11701
 msgid ""
 "The CUPS configuration controls the basic things about your CUPS "
 "installation: what interfaces it listens on, what to do if a print job "
@@ -24772,7 +25720,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:11661
+#: doc/guix.texi:11706
 msgid ""
 "Suppose you want to enable the Web interface of CUPS and also add support "
 "for Epson printers @i{via} the @code{escpr} package and for HP printers "
@@ -24781,7 +25729,7 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:11668
+#: doc/guix.texi:11713
 #, no-wrap
 msgid ""
 "(service cups-service-type\n"
@@ -24792,7 +25740,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:11676
+#: doc/guix.texi:11721
 msgid ""
 "The available configuration parameters follow.  Each parameter definition is "
 "preceded by its type; for example, @samp{string-list foo} indicates that the "
@@ -24803,60 +25751,58 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:11687
+#: doc/guix.texi:11732
 msgid "Available @code{cups-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11688
+#: doc/guix.texi:11733
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} package cups"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11690 doc/guix.texi:12447
+#: doc/guix.texi:11735 doc/guix.texi:12492
 msgid "The CUPS package."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11692
+#: doc/guix.texi:11737
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} package-list extensions"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11694
+#: doc/guix.texi:11739
 msgid "Drivers and other extensions to the CUPS package."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11696
+#: doc/guix.texi:11741
 #, no-wrap
-msgid ""
-"{@code{cups-configuration} parameter} files-configuration "
-"files-configuration"
+msgid "{@code{cups-configuration} parameter} files-configuration files-configuration"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11699
+#: doc/guix.texi:11744
 msgid ""
 "Configuration of where to write logs, what directories to use for print "
 "spools, and related privileged configuration parameters."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11701
+#: doc/guix.texi:11746
 msgid "Available @code{files-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11702
+#: doc/guix.texi:11747
 #, no-wrap
 msgid "{@code{files-configuration} parameter} log-location access-log"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11710
+#: doc/guix.texi:11755
 msgid ""
 "Defines the access log filename.  Specifying a blank filename disables "
 "access log generation.  The value @code{stderr} causes log entries to be "
@@ -24868,41 +25814,41 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11712
+#: doc/guix.texi:11757
 msgid "Defaults to @samp{\"/var/log/cups/access_log\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11714
+#: doc/guix.texi:11759
 #, no-wrap
 msgid "{@code{files-configuration} parameter} file-name cache-dir"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11716
+#: doc/guix.texi:11761
 msgid "Where CUPS should cache data."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11718
+#: doc/guix.texi:11763
 msgid "Defaults to @samp{\"/var/cache/cups\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11720
+#: doc/guix.texi:11765
 #, no-wrap
 msgid "{@code{files-configuration} parameter} string config-file-perm"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11723
+#: doc/guix.texi:11768
 msgid ""
 "Specifies the permissions for all configuration files that the scheduler "
 "writes."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11729
+#: doc/guix.texi:11774
 msgid ""
 "Note that the permissions for the printers.conf file are currently masked to "
 "only allow access from the scheduler user (typically root).  This is done "
@@ -24912,18 +25858,18 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11731
+#: doc/guix.texi:11776
 msgid "Defaults to @samp{\"0640\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11733
+#: doc/guix.texi:11778
 #, no-wrap
 msgid "{@code{files-configuration} parameter} log-location error-log"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11741
+#: doc/guix.texi:11786
 msgid ""
 "Defines the error log filename.  Specifying a blank filename disables access "
 "log generation.  The value @code{stderr} causes log entries to be sent to "
@@ -24935,159 +25881,176 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11743
+#: doc/guix.texi:11788
 msgid "Defaults to @samp{\"/var/log/cups/error_log\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11745
+#: doc/guix.texi:11790
 #, no-wrap
 msgid "{@code{files-configuration} parameter} string fatal-errors"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11748
+#: doc/guix.texi:11793
 msgid ""
 "Specifies which errors are fatal, causing the scheduler to exit.  The kind "
 "strings are:"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11752
+#: doc/guix.texi:11797
 msgid "No errors are fatal."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11755
+#: doc/guix.texi:11800
 msgid "All of the errors below are fatal."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11756
+#: doc/guix.texi:11801
 #, no-wrap
 msgid "browse"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11759
+#: doc/guix.texi:11804
 msgid ""
 "Browsing initialization errors are fatal, for example failed connections to "
 "the DNS-SD daemon."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11760
+#: doc/guix.texi:11805
 #, no-wrap
 msgid "config"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11762
+#: doc/guix.texi:11807
 msgid "Configuration file syntax errors are fatal."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11763
+#: doc/guix.texi:11808
 #, no-wrap
 msgid "listen"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11766
+#: doc/guix.texi:11811
 msgid ""
 "Listen or Port errors are fatal, except for IPv6 failures on the loopback or "
 "@code{any} addresses."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11767
+#: doc/guix.texi:11812
 #, no-wrap
 msgid "log"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11769
+#: doc/guix.texi:11814
 msgid "Log file creation or write errors are fatal."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11770
+#: doc/guix.texi:11815
 #, no-wrap
 msgid "permissions"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11773
+#: doc/guix.texi:11818
 msgid ""
 "Bad startup file permissions are fatal, for example shared TLS certificate "
 "and key files with world-read permissions."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11776
+#: doc/guix.texi:11821
 msgid "Defaults to @samp{\"all -browse\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11778
+#: doc/guix.texi:11823
 #, no-wrap
 msgid "{@code{files-configuration} parameter} boolean file-device?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11781
+#: doc/guix.texi:11826
 msgid ""
 "Specifies whether the file pseudo-device can be used for new printer "
 "queues.  The URI @uref{file:///dev/null} is always allowed."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11783 doc/guix.texi:11853 doc/guix.texi:11889 doc/guix.texi:11901 doc/guix.texi:11907 doc/guix.texi:11923 doc/guix.texi:12011 doc/guix.texi:12105 doc/guix.texi:12421 doc/guix.texi:12434 doc/guix.texi:16561 doc/guix.texi:16575 doc/guix.texi:16697 doc/guix.texi:16718 doc/guix.texi:16739 doc/guix.texi:16746 doc/guix.texi:16791 doc/guix.texi:16798 doc/guix.texi:17201 doc/guix.texi:17215 doc/guix.texi:17387 doc/guix.texi:17432 doc/guix.texi:17519 doc/guix.texi:17648 doc/guix.texi:17681 doc/guix.texi:17821 doc/guix.texi:17832 doc/guix.texi:18082 doc/guix.texi:18724 doc/guix.texi:18733 doc/guix.texi:18741 doc/guix.texi:18749 doc/guix.texi:18765 doc/guix.texi:18781 doc/guix.texi:18789 doc/guix.texi:18797 doc/guix.texi:18806 doc/guix.texi:18815 doc/guix.texi:18831 doc/guix.texi:18895 doc/guix.texi:19001 doc/guix.texi:19009 doc/guix.texi:19017 doc/guix.texi:19042 doc/guix.texi:19096 doc/guix.texi:19144 doc/guix.texi:19297 doc/guix.texi:19305 doc/guix.texi:19313 doc/guix.texi:19321 doc/guix.texi:19329 doc/guix.texi:19337 doc/guix.texi:19345 doc/guix.texi:19352
+#: doc/guix.texi:11828 doc/guix.texi:11898 doc/guix.texi:11934
+#: doc/guix.texi:11946 doc/guix.texi:11952 doc/guix.texi:11968
+#: doc/guix.texi:12056 doc/guix.texi:12150 doc/guix.texi:12466
+#: doc/guix.texi:12479 doc/guix.texi:16606 doc/guix.texi:16620
+#: doc/guix.texi:16742 doc/guix.texi:16763 doc/guix.texi:16784
+#: doc/guix.texi:16791 doc/guix.texi:16836 doc/guix.texi:16843
+#: doc/guix.texi:17246 doc/guix.texi:17260 doc/guix.texi:17432
+#: doc/guix.texi:17477 doc/guix.texi:17564 doc/guix.texi:17693
+#: doc/guix.texi:17726 doc/guix.texi:17866 doc/guix.texi:17877
+#: doc/guix.texi:18127 doc/guix.texi:18769 doc/guix.texi:18778
+#: doc/guix.texi:18786 doc/guix.texi:18794 doc/guix.texi:18810
+#: doc/guix.texi:18826 doc/guix.texi:18834 doc/guix.texi:18842
+#: doc/guix.texi:18851 doc/guix.texi:18860 doc/guix.texi:18876
+#: doc/guix.texi:18940 doc/guix.texi:19046 doc/guix.texi:19054
+#: doc/guix.texi:19062 doc/guix.texi:19087 doc/guix.texi:19141
+#: doc/guix.texi:19189 doc/guix.texi:19342 doc/guix.texi:19350
+#: doc/guix.texi:19358 doc/guix.texi:19366 doc/guix.texi:19374
+#: doc/guix.texi:19382 doc/guix.texi:19390 doc/guix.texi:19397
 msgid "Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11785
+#: doc/guix.texi:11830
 #, no-wrap
 msgid "{@code{files-configuration} parameter} string group"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11788
+#: doc/guix.texi:11833
 msgid ""
 "Specifies the group name or ID that will be used when executing external "
 "programs."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11790 doc/guix.texi:11870
+#: doc/guix.texi:11835 doc/guix.texi:11915
 msgid "Defaults to @samp{\"lp\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11792
+#: doc/guix.texi:11837
 #, no-wrap
 msgid "{@code{files-configuration} parameter} string log-file-perm"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11794
+#: doc/guix.texi:11839
 msgid "Specifies the permissions for all log files that the scheduler writes."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11796
+#: doc/guix.texi:11841
 msgid "Defaults to @samp{\"0644\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11798
+#: doc/guix.texi:11843
 #, no-wrap
 msgid "{@code{files-configuration} parameter} log-location page-log"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11806
+#: doc/guix.texi:11851
 msgid ""
 "Defines the page log filename.  Specifying a blank filename disables access "
 "log generation.  The value @code{stderr} causes log entries to be sent to "
@@ -25099,54 +26062,53 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11808
+#: doc/guix.texi:11853
 msgid "Defaults to @samp{\"/var/log/cups/page_log\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11810
+#: doc/guix.texi:11855
 #, no-wrap
 msgid "{@code{files-configuration} parameter} string remote-root"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11813
+#: doc/guix.texi:11858
 msgid ""
 "Specifies the username that is associated with unauthenticated accesses by "
 "clients claiming to be the root user.  The default is @code{remroot}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11815
+#: doc/guix.texi:11860
 msgid "Defaults to @samp{\"remroot\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11817
+#: doc/guix.texi:11862
 #, no-wrap
 msgid "{@code{files-configuration} parameter} file-name request-root"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11820
+#: doc/guix.texi:11865
 msgid ""
-"Specifies the directory that contains print jobs and other HTTP request "
-"data."
+"Specifies the directory that contains print jobs and other HTTP request data."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11822
+#: doc/guix.texi:11867
 msgid "Defaults to @samp{\"/var/spool/cups\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11824
+#: doc/guix.texi:11869
 #, no-wrap
 msgid "{@code{files-configuration} parameter} sandboxing sandboxing"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11829
+#: doc/guix.texi:11874
 msgid ""
 "Specifies the level of security sandboxing that is applied to print filters, "
 "backends, and other child processes of the scheduler; either @code{relaxed} "
@@ -25154,107 +26116,106 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11831
+#: doc/guix.texi:11876
 msgid "Defaults to @samp{strict}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11833
+#: doc/guix.texi:11878
 #, no-wrap
 msgid "{@code{files-configuration} parameter} file-name server-keychain"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11838
+#: doc/guix.texi:11883
 msgid ""
 "Specifies the location of TLS certificates and private keys.  CUPS will look "
-"for public and private keys in this directory: a @code{.crt} files for "
-"PEM-encoded certificates and corresponding @code{.key} files for PEM-encoded "
+"for public and private keys in this directory: a @code{.crt} files for PEM-"
+"encoded certificates and corresponding @code{.key} files for PEM-encoded "
 "private keys."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11840
+#: doc/guix.texi:11885
 msgid "Defaults to @samp{\"/etc/cups/ssl\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11842
+#: doc/guix.texi:11887
 #, no-wrap
 msgid "{@code{files-configuration} parameter} file-name server-root"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11844
+#: doc/guix.texi:11889
 msgid "Specifies the directory containing the server configuration files."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11846
+#: doc/guix.texi:11891
 msgid "Defaults to @samp{\"/etc/cups\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11848
+#: doc/guix.texi:11893
 #, no-wrap
 msgid "{@code{files-configuration} parameter} boolean sync-on-close?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11851
+#: doc/guix.texi:11896
 msgid ""
 "Specifies whether the scheduler calls fsync(2) after writing configuration "
 "or state files."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11855
+#: doc/guix.texi:11900
 #, no-wrap
-msgid ""
-"{@code{files-configuration} parameter} space-separated-string-list "
-"system-group"
+msgid "{@code{files-configuration} parameter} space-separated-string-list system-group"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11857
+#: doc/guix.texi:11902
 msgid "Specifies the group(s) to use for @code{@@SYSTEM} group authentication."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11859
+#: doc/guix.texi:11904
 #, no-wrap
 msgid "{@code{files-configuration} parameter} file-name temp-dir"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11861
+#: doc/guix.texi:11906
 msgid "Specifies the directory where temporary files are stored."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11863
+#: doc/guix.texi:11908
 msgid "Defaults to @samp{\"/var/spool/cups/tmp\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11865
+#: doc/guix.texi:11910
 #, no-wrap
 msgid "{@code{files-configuration} parameter} string user"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11868
-msgid "Specifies the user name or ID that is used when running external programs."
+#: doc/guix.texi:11913
+msgid ""
+"Specifies the user name or ID that is used when running external programs."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11873
+#: doc/guix.texi:11918
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} access-log-level access-log-level"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11880
+#: doc/guix.texi:11925
 msgid ""
 "Specifies the logging level for the AccessLog file.  The @code{config} level "
 "logs when printers and classes are added, deleted, or modified and when "
@@ -25265,71 +26226,69 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11882
+#: doc/guix.texi:11927
 msgid "Defaults to @samp{actions}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11884
+#: doc/guix.texi:11929
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} boolean auto-purge-jobs?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11887
+#: doc/guix.texi:11932
 msgid ""
 "Specifies whether to purge job history data automatically when it is no "
 "longer required for quotas."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11891
+#: doc/guix.texi:11936
 #, no-wrap
-msgid ""
-"{@code{cups-configuration} parameter} browse-local-protocols "
-"browse-local-protocols"
+msgid "{@code{cups-configuration} parameter} browse-local-protocols browse-local-protocols"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11893
+#: doc/guix.texi:11938
 msgid "Specifies which protocols to use for local printer sharing."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11895
+#: doc/guix.texi:11940
 msgid "Defaults to @samp{dnssd}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11897
+#: doc/guix.texi:11942
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} boolean browse-web-if?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11899
+#: doc/guix.texi:11944
 msgid "Specifies whether the CUPS web interface is advertised."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11903
+#: doc/guix.texi:11948
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} boolean browsing?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11905
+#: doc/guix.texi:11950
 msgid "Specifies whether shared printers are advertised."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11909
+#: doc/guix.texi:11954
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} string classification"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11914
+#: doc/guix.texi:11959
 msgid ""
 "Specifies the security classification of the server.  Any valid banner name "
 "can be used, including \"classified\", \"confidential\", \"secret\", "
@@ -25338,79 +26297,96 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11916 doc/guix.texi:12253 doc/guix.texi:13612 doc/guix.texi:13624 doc/guix.texi:17787 doc/guix.texi:17795 doc/guix.texi:17803 doc/guix.texi:17811 doc/guix.texi:18089 doc/guix.texi:18567 doc/guix.texi:18575 doc/guix.texi:18583 doc/guix.texi:18691 doc/guix.texi:18716 doc/guix.texi:18847 doc/guix.texi:18855 doc/guix.texi:18863 doc/guix.texi:18871 doc/guix.texi:18879 doc/guix.texi:18887 doc/guix.texi:18910 doc/guix.texi:18918 doc/guix.texi:18970 doc/guix.texi:18986 doc/guix.texi:18994 doc/guix.texi:19033 doc/guix.texi:19056 doc/guix.texi:19078 doc/guix.texi:19085 doc/guix.texi:19120 doc/guix.texi:19128 doc/guix.texi:19152 doc/guix.texi:19184 doc/guix.texi:19213 doc/guix.texi:19220 doc/guix.texi:19227 doc/guix.texi:19235 doc/guix.texi:19249 doc/guix.texi:19258 doc/guix.texi:19268 doc/guix.texi:19275 doc/guix.texi:19282 doc/guix.texi:19289 doc/guix.texi:19360 doc/guix.texi:19367 doc/guix.texi:19374 doc/guix.texi:19383 doc/guix.texi:19399 doc/guix.texi:19406 doc/guix.texi:19413 doc/guix.texi:19420 doc/guix.texi:19428 doc/guix.texi:19436
+#: doc/guix.texi:11961 doc/guix.texi:12298 doc/guix.texi:13657
+#: doc/guix.texi:13669 doc/guix.texi:17832 doc/guix.texi:17840
+#: doc/guix.texi:17848 doc/guix.texi:17856 doc/guix.texi:18134
+#: doc/guix.texi:18612 doc/guix.texi:18620 doc/guix.texi:18628
+#: doc/guix.texi:18736 doc/guix.texi:18761 doc/guix.texi:18892
+#: doc/guix.texi:18900 doc/guix.texi:18908 doc/guix.texi:18916
+#: doc/guix.texi:18924 doc/guix.texi:18932 doc/guix.texi:18955
+#: doc/guix.texi:18963 doc/guix.texi:19015 doc/guix.texi:19031
+#: doc/guix.texi:19039 doc/guix.texi:19078 doc/guix.texi:19101
+#: doc/guix.texi:19123 doc/guix.texi:19130 doc/guix.texi:19165
+#: doc/guix.texi:19173 doc/guix.texi:19197 doc/guix.texi:19229
+#: doc/guix.texi:19258 doc/guix.texi:19265 doc/guix.texi:19272
+#: doc/guix.texi:19280 doc/guix.texi:19294 doc/guix.texi:19303
+#: doc/guix.texi:19313 doc/guix.texi:19320 doc/guix.texi:19327
+#: doc/guix.texi:19334 doc/guix.texi:19405 doc/guix.texi:19412
+#: doc/guix.texi:19419 doc/guix.texi:19428 doc/guix.texi:19444
+#: doc/guix.texi:19451 doc/guix.texi:19458 doc/guix.texi:19465
+#: doc/guix.texi:19473 doc/guix.texi:19481
 msgid "Defaults to @samp{\"\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11918
+#: doc/guix.texi:11963
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} boolean classify-override?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11921
+#: doc/guix.texi:11966
 msgid ""
 "Specifies whether users may override the classification (cover page) of "
 "individual print jobs using the @code{job-sheets} option."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11925
+#: doc/guix.texi:11970
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} default-auth-type default-auth-type"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11927
+#: doc/guix.texi:11972
 msgid "Specifies the default type of authentication to use."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11929
+#: doc/guix.texi:11974
 msgid "Defaults to @samp{Basic}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11931
+#: doc/guix.texi:11976
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} default-encryption default-encryption"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11933
+#: doc/guix.texi:11978
 msgid "Specifies whether encryption will be used for authenticated requests."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11935
+#: doc/guix.texi:11980
 msgid "Defaults to @samp{Required}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11937
+#: doc/guix.texi:11982
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} string default-language"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11939
+#: doc/guix.texi:11984
 msgid "Specifies the default language to use for text and web content."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11941
+#: doc/guix.texi:11986
 msgid "Defaults to @samp{\"en\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11943
+#: doc/guix.texi:11988
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} string default-paper-size"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11948
+#: doc/guix.texi:11993
 msgid ""
 "Specifies the default paper size for new print queues.  @samp{\"Auto\"} uses "
 "a locale-specific default, while @samp{\"None\"} specifies there is no "
@@ -25419,52 +26395,57 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11950
+#: doc/guix.texi:11995
 msgid "Defaults to @samp{\"Auto\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11952
+#: doc/guix.texi:11997
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} string default-policy"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11954
+#: doc/guix.texi:11999
 msgid "Specifies the default access policy to use."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11956
+#: doc/guix.texi:12001
 msgid "Defaults to @samp{\"default\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11958
+#: doc/guix.texi:12003
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} boolean default-shared?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11960
+#: doc/guix.texi:12005
 msgid "Specifies whether local printers are shared by default."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11962 doc/guix.texi:12042 doc/guix.texi:12338 doc/guix.texi:16531 doc/guix.texi:16538 doc/guix.texi:16546 doc/guix.texi:16568 doc/guix.texi:16582 doc/guix.texi:16667 doc/guix.texi:16674 doc/guix.texi:16682 doc/guix.texi:17068 doc/guix.texi:17208 doc/guix.texi:17394 doc/guix.texi:17401 doc/guix.texi:17423 doc/guix.texi:17462 doc/guix.texi:17482 doc/guix.texi:17496 doc/guix.texi:17636 doc/guix.texi:18669 doc/guix.texi:18757 doc/guix.texi:18773 doc/guix.texi:18823
+#: doc/guix.texi:12007 doc/guix.texi:12087 doc/guix.texi:12383
+#: doc/guix.texi:16576 doc/guix.texi:16583 doc/guix.texi:16591
+#: doc/guix.texi:16613 doc/guix.texi:16627 doc/guix.texi:16712
+#: doc/guix.texi:16719 doc/guix.texi:16727 doc/guix.texi:17113
+#: doc/guix.texi:17253 doc/guix.texi:17439 doc/guix.texi:17446
+#: doc/guix.texi:17468 doc/guix.texi:17507 doc/guix.texi:17527
+#: doc/guix.texi:17541 doc/guix.texi:17681 doc/guix.texi:18714
+#: doc/guix.texi:18802 doc/guix.texi:18818 doc/guix.texi:18868
 msgid "Defaults to @samp{#t}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11964
+#: doc/guix.texi:12009
 #, no-wrap
-msgid ""
-"{@code{cups-configuration} parameter} non-negative-integer "
-"dirty-clean-interval"
+msgid "{@code{cups-configuration} parameter} non-negative-integer dirty-clean-interval"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11968
+#: doc/guix.texi:12013
 msgid ""
 "Specifies the delay for updating of configuration and state files, in "
 "seconds.  A value of 0 causes the update to happen as soon as possible, "
@@ -25472,39 +26453,39 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11970 doc/guix.texi:12018 doc/guix.texi:12027 doc/guix.texi:12048 doc/guix.texi:12345
+#: doc/guix.texi:12015 doc/guix.texi:12063 doc/guix.texi:12072
+#: doc/guix.texi:12093 doc/guix.texi:12390
 msgid "Defaults to @samp{30}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11972
+#: doc/guix.texi:12017
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} error-policy error-policy"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11978
+#: doc/guix.texi:12023
 msgid ""
-"Specifies what to do when an error occurs.  Possible values are "
-"@code{abort-job}, which will discard the failed print job; @code{retry-job}, "
-"which will retry the job at a later time; @code{retry-this-job}, which "
-"retries the failed job immediately; and @code{stop-printer}, which stops the "
-"printer."
+"Specifies what to do when an error occurs.  Possible values are @code{abort-"
+"job}, which will discard the failed print job; @code{retry-job}, which will "
+"retry the job at a later time; @code{retry-this-job}, which retries the "
+"failed job immediately; and @code{stop-printer}, which stops the printer."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11980
+#: doc/guix.texi:12025
 msgid "Defaults to @samp{stop-printer}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11982
+#: doc/guix.texi:12027
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} non-negative-integer filter-limit"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11990
+#: doc/guix.texi:12035
 msgid ""
 "Specifies the maximum cost of filters that are run concurrently, which can "
 "be used to minimize disk, memory, and CPU resource problems.  A limit of 0 "
@@ -25515,18 +26496,22 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11992 doc/guix.texi:12000 doc/guix.texi:12055 doc/guix.texi:12171 doc/guix.texi:12185 doc/guix.texi:12192 doc/guix.texi:13716 doc/guix.texi:13728 doc/guix.texi:17084 doc/guix.texi:17409 doc/guix.texi:18662 doc/guix.texi:18962 doc/guix.texi:19136
+#: doc/guix.texi:12037 doc/guix.texi:12045 doc/guix.texi:12100
+#: doc/guix.texi:12216 doc/guix.texi:12230 doc/guix.texi:12237
+#: doc/guix.texi:13761 doc/guix.texi:13773 doc/guix.texi:17129
+#: doc/guix.texi:17454 doc/guix.texi:18707 doc/guix.texi:19007
+#: doc/guix.texi:19181
 msgid "Defaults to @samp{0}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11994
+#: doc/guix.texi:12039
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} non-negative-integer filter-nice"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:11998
+#: doc/guix.texi:12043
 msgid ""
 "Specifies the scheduling priority of filters that are run to print a job.  "
 "The nice value ranges from 0, the highest priority, to 19, the lowest "
@@ -25534,13 +26519,13 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12002
+#: doc/guix.texi:12047
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} host-name-lookups host-name-lookups"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12009
+#: doc/guix.texi:12054
 msgid ""
 "Specifies whether to do reverse lookups on connecting clients.  The "
 "@code{double} setting causes @code{cupsd} to verify that the hostname "
@@ -25551,28 +26536,26 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12013
+#: doc/guix.texi:12058
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} non-negative-integer job-kill-delay"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12016
+#: doc/guix.texi:12061
 msgid ""
 "Specifies the number of seconds to wait before killing the filters and "
 "backend associated with a canceled or held job."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12020
+#: doc/guix.texi:12065
 #, no-wrap
-msgid ""
-"{@code{cups-configuration} parameter} non-negative-integer "
-"job-retry-interval"
+msgid "{@code{cups-configuration} parameter} non-negative-integer job-retry-interval"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12025
+#: doc/guix.texi:12070
 msgid ""
 "Specifies the interval between retries of jobs in seconds.  This is "
 "typically used for fax queues but can also be used with normal print queues "
@@ -25580,13 +26563,13 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12029
+#: doc/guix.texi:12074
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} non-negative-integer job-retry-limit"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12034
+#: doc/guix.texi:12079
 msgid ""
 "Specifies the number of retries that are done for jobs.  This is typically "
 "used for fax queues but can also be used with normal print queues whose "
@@ -25594,57 +26577,58 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12036 doc/guix.texi:17888 doc/guix.texi:17908 doc/guix.texi:17924 doc/guix.texi:17938 doc/guix.texi:17945 doc/guix.texi:17952 doc/guix.texi:17959 doc/guix.texi:18118 doc/guix.texi:18134 doc/guix.texi:18141 doc/guix.texi:18148 doc/guix.texi:18159 doc/guix.texi:18614 doc/guix.texi:18622 doc/guix.texi:18630 doc/guix.texi:18654
+#: doc/guix.texi:12081 doc/guix.texi:17933 doc/guix.texi:17953
+#: doc/guix.texi:17969 doc/guix.texi:17983 doc/guix.texi:17990
+#: doc/guix.texi:17997 doc/guix.texi:18004 doc/guix.texi:18163
+#: doc/guix.texi:18179 doc/guix.texi:18186 doc/guix.texi:18193
+#: doc/guix.texi:18204 doc/guix.texi:18659 doc/guix.texi:18667
+#: doc/guix.texi:18675 doc/guix.texi:18699
 msgid "Defaults to @samp{5}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12038
+#: doc/guix.texi:12083
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} boolean keep-alive?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12040
+#: doc/guix.texi:12085
 msgid "Specifies whether to support HTTP keep-alive connections."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12044
+#: doc/guix.texi:12089
 #, no-wrap
-msgid ""
-"{@code{cups-configuration} parameter} non-negative-integer "
-"keep-alive-timeout"
+msgid "{@code{cups-configuration} parameter} non-negative-integer keep-alive-timeout"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12046
+#: doc/guix.texi:12091
 msgid "Specifies how long an idle client connection remains open, in seconds."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12050
+#: doc/guix.texi:12095
 #, no-wrap
-msgid ""
-"{@code{cups-configuration} parameter} non-negative-integer "
-"limit-request-body"
+msgid "{@code{cups-configuration} parameter} non-negative-integer limit-request-body"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12053
+#: doc/guix.texi:12098
 msgid ""
 "Specifies the maximum size of print files, IPP requests, and HTML form "
 "data.  A limit of 0 disables the limit check."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12057
+#: doc/guix.texi:12102
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} multiline-string-list listen"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12064
+#: doc/guix.texi:12109
 msgid ""
 "Listens on the specified interfaces for connections.  Valid values are of "
 "the form @var{address}:@var{port}, where @var{address} is either an IPv6 "
@@ -25655,13 +26639,13 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12066
+#: doc/guix.texi:12111
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} non-negative-integer listen-back-log"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12073
+#: doc/guix.texi:12118
 msgid ""
 "Specifies the number of pending connections that will be allowed.  This "
 "normally only affects very busy servers that have reached the MaxClients "
@@ -25671,124 +26655,123 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12075
+#: doc/guix.texi:12120
 msgid "Defaults to @samp{128}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12077
+#: doc/guix.texi:12122
 #, no-wrap
-msgid ""
-"{@code{cups-configuration} parameter} location-access-control-list "
-"location-access-controls"
+msgid "{@code{cups-configuration} parameter} location-access-control-list location-access-controls"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12079
+#: doc/guix.texi:12124
 msgid "Specifies a set of additional access controls."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12081
+#: doc/guix.texi:12126
 msgid "Available @code{location-access-controls} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12082
+#: doc/guix.texi:12127
 #, no-wrap
 msgid "{@code{location-access-controls} parameter} file-name path"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12084
+#: doc/guix.texi:12129
 msgid "Specifies the URI path to which the access control applies."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12086
+#: doc/guix.texi:12131
 #, no-wrap
-msgid ""
-"{@code{location-access-controls} parameter} access-control-list "
-"access-controls"
+msgid "{@code{location-access-controls} parameter} access-control-list access-controls"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12089
+#: doc/guix.texi:12134
 msgid ""
 "Access controls for all access to this path, in the same format as the "
 "@code{access-controls} of @code{operation-access-control}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12091 doc/guix.texi:12097 doc/guix.texi:12111 doc/guix.texi:12118 doc/guix.texi:12260 doc/guix.texi:12319 doc/guix.texi:12403 doc/guix.texi:12414 doc/guix.texi:14202 doc/guix.texi:16589 doc/guix.texi:16777 doc/guix.texi:17779 doc/guix.texi:17839 doc/guix.texi:17847 doc/guix.texi:18677 doc/guix.texi:18684 doc/guix.texi:19026 doc/guix.texi:19104 doc/guix.texi:19198 doc/guix.texi:19206 doc/guix.texi:19242 doc/guix.texi:19392 doc/guix.texi:19443 doc/guix.texi:19452
+#: doc/guix.texi:12136 doc/guix.texi:12142 doc/guix.texi:12156
+#: doc/guix.texi:12163 doc/guix.texi:12305 doc/guix.texi:12364
+#: doc/guix.texi:12448 doc/guix.texi:12459 doc/guix.texi:14247
+#: doc/guix.texi:16634 doc/guix.texi:16822 doc/guix.texi:17824
+#: doc/guix.texi:17884 doc/guix.texi:17892 doc/guix.texi:18722
+#: doc/guix.texi:18729 doc/guix.texi:19071 doc/guix.texi:19149
+#: doc/guix.texi:19243 doc/guix.texi:19251 doc/guix.texi:19287
+#: doc/guix.texi:19437 doc/guix.texi:19488 doc/guix.texi:19497
 msgid "Defaults to @samp{()}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12093
+#: doc/guix.texi:12138
 #, no-wrap
-msgid ""
-"{@code{location-access-controls} parameter} method-access-control-list "
-"method-access-controls"
+msgid "{@code{location-access-controls} parameter} method-access-control-list method-access-controls"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12095
+#: doc/guix.texi:12140
 msgid "Access controls for method-specific access to this path."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12099
+#: doc/guix.texi:12144
 msgid "Available @code{method-access-controls} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12100
+#: doc/guix.texi:12145
 #, no-wrap
 msgid "{@code{method-access-controls} parameter} boolean reverse?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12103
+#: doc/guix.texi:12148
 msgid ""
 "If @code{#t}, apply access controls to all methods except the listed "
 "methods.  Otherwise apply to only the listed methods."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12107
+#: doc/guix.texi:12152
 #, no-wrap
 msgid "{@code{method-access-controls} parameter} method-list methods"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12109
+#: doc/guix.texi:12154
 msgid "Methods to which this access control applies."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12113
+#: doc/guix.texi:12158
 #, no-wrap
-msgid ""
-"{@code{method-access-controls} parameter} access-control-list "
-"access-controls"
+msgid "{@code{method-access-controls} parameter} access-control-list access-controls"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12116
+#: doc/guix.texi:12161
 msgid ""
 "Access control directives, as a list of strings.  Each string should be one "
 "directive, such as \"Order allow,deny\"."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12122
+#: doc/guix.texi:12167
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} non-negative-integer log-debug-history"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12126
+#: doc/guix.texi:12171
 msgid ""
 "Specifies the number of debugging messages that are retained for logging if "
 "an error occurs in a print job.  Debug messages are logged regardless of the "
@@ -25796,98 +26779,98 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12128 doc/guix.texi:12149 doc/guix.texi:12156 doc/guix.texi:13962 doc/guix.texi:16762
+#: doc/guix.texi:12173 doc/guix.texi:12194 doc/guix.texi:12201
+#: doc/guix.texi:14007 doc/guix.texi:16807
 msgid "Defaults to @samp{100}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12130
+#: doc/guix.texi:12175
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} log-level log-level"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12133
+#: doc/guix.texi:12178
 msgid ""
 "Specifies the level of logging for the ErrorLog file.  The value @code{none} "
 "stops all logging while @code{debug2} logs everything."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12135
+#: doc/guix.texi:12180
 msgid "Defaults to @samp{info}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12137
+#: doc/guix.texi:12182
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} log-time-format log-time-format"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12140
+#: doc/guix.texi:12185
 msgid ""
 "Specifies the format of the date and time in the log files.  The value "
 "@code{standard} logs whole seconds while @code{usecs} logs microseconds."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12142
+#: doc/guix.texi:12187
 msgid "Defaults to @samp{standard}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12144
+#: doc/guix.texi:12189
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} non-negative-integer max-clients"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12147
+#: doc/guix.texi:12192
 msgid ""
 "Specifies the maximum number of simultaneous clients that are allowed by the "
 "scheduler."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12151
+#: doc/guix.texi:12196
 #, no-wrap
-msgid ""
-"{@code{cups-configuration} parameter} non-negative-integer "
-"max-clients-per-host"
+msgid "{@code{cups-configuration} parameter} non-negative-integer max-clients-per-host"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12154
+#: doc/guix.texi:12199
 msgid ""
 "Specifies the maximum number of simultaneous clients that are allowed from a "
 "single address."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12158
+#: doc/guix.texi:12203
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} non-negative-integer max-copies"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12161
-msgid "Specifies the maximum number of copies that a user can print of each job."
+#: doc/guix.texi:12206
+msgid ""
+"Specifies the maximum number of copies that a user can print of each job."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12163
+#: doc/guix.texi:12208
 msgid "Defaults to @samp{9999}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12165
+#: doc/guix.texi:12210
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} non-negative-integer max-hold-time"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12169
+#: doc/guix.texi:12214
 msgid ""
 "Specifies the maximum time a job may remain in the @code{indefinite} hold "
 "state before it is canceled.  A value of 0 disables cancellation of held "
@@ -25895,115 +26878,111 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12173
+#: doc/guix.texi:12218
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} non-negative-integer max-jobs"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12176
+#: doc/guix.texi:12221
 msgid ""
 "Specifies the maximum number of simultaneous jobs that are allowed.  Set to "
 "0 to allow an unlimited number of jobs."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12178
+#: doc/guix.texi:12223
 msgid "Defaults to @samp{500}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12180
+#: doc/guix.texi:12225
 #, no-wrap
-msgid ""
-"{@code{cups-configuration} parameter} non-negative-integer "
-"max-jobs-per-printer"
+msgid "{@code{cups-configuration} parameter} non-negative-integer max-jobs-per-printer"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12183
+#: doc/guix.texi:12228
 msgid ""
 "Specifies the maximum number of simultaneous jobs that are allowed per "
 "printer.  A value of 0 allows up to MaxJobs jobs per printer."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12187
+#: doc/guix.texi:12232
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} non-negative-integer max-jobs-per-user"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12190
+#: doc/guix.texi:12235
 msgid ""
 "Specifies the maximum number of simultaneous jobs that are allowed per "
 "user.  A value of 0 allows up to MaxJobs jobs per user."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12194
+#: doc/guix.texi:12239
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} non-negative-integer max-job-time"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12197
+#: doc/guix.texi:12242
 msgid ""
 "Specifies the maximum time a job may take to print before it is canceled, in "
 "seconds.  Set to 0 to disable cancellation of \"stuck\" jobs."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12199
+#: doc/guix.texi:12244
 msgid "Defaults to @samp{10800}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12201
+#: doc/guix.texi:12246
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} non-negative-integer max-log-size"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12204
+#: doc/guix.texi:12249
 msgid ""
 "Specifies the maximum size of the log files before they are rotated, in "
 "bytes.  The value 0 disables log rotation."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12206
+#: doc/guix.texi:12251
 msgid "Defaults to @samp{1048576}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12208
+#: doc/guix.texi:12253
 #, no-wrap
-msgid ""
-"{@code{cups-configuration} parameter} non-negative-integer "
-"multiple-operation-timeout"
+msgid "{@code{cups-configuration} parameter} non-negative-integer multiple-operation-timeout"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12211
+#: doc/guix.texi:12256
 msgid ""
 "Specifies the maximum amount of time to allow between files in a multiple "
 "file print job, in seconds."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12213 doc/guix.texi:12427
+#: doc/guix.texi:12258 doc/guix.texi:12472
 msgid "Defaults to @samp{300}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12215
+#: doc/guix.texi:12260
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} string page-log-format"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12220
+#: doc/guix.texi:12265
 msgid ""
 "Specifies the format of PageLog lines.  Sequences beginning with percent "
 "(@samp{%}) characters are replaced with the corresponding information, while "
@@ -26012,95 +26991,95 @@ msgid ""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12222
+#: doc/guix.texi:12267
 #, no-wrap
 msgid "%%"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12224
+#: doc/guix.texi:12269
 msgid "insert a single percent character"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12225
+#: doc/guix.texi:12270
 #, no-wrap
 msgid "%@{name@}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12227
+#: doc/guix.texi:12272
 msgid "insert the value of the specified IPP attribute"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12228
+#: doc/guix.texi:12273
 #, no-wrap
 msgid "%C"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12230
+#: doc/guix.texi:12275
 msgid "insert the number of copies for the current page"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12231
+#: doc/guix.texi:12276
 #, no-wrap
 msgid "%P"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12233
+#: doc/guix.texi:12278
 msgid "insert the current page number"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12234
+#: doc/guix.texi:12279
 #, no-wrap
 msgid "%T"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12236
+#: doc/guix.texi:12281
 msgid "insert the current date and time in common log format"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12237
+#: doc/guix.texi:12282
 #, no-wrap
 msgid "%j"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12239
+#: doc/guix.texi:12284
 msgid "insert the job ID"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12240 doc/guix.texi:13572
+#: doc/guix.texi:12285 doc/guix.texi:13617
 #, no-wrap
 msgid "%p"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12242
+#: doc/guix.texi:12287
 msgid "insert the printer name"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12243 doc/guix.texi:13595
+#: doc/guix.texi:12288 doc/guix.texi:13640
 #, no-wrap
 msgid "%u"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12245
+#: doc/guix.texi:12290
 msgid "insert the username"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12251
+#: doc/guix.texi:12296
 msgid ""
 "A value of the empty string disables page logging.  The string @code{%p %u "
 "%j %T %P %C %@{job-billing@} %@{job-originating-host-name@} %@{job-name@} "
@@ -26108,148 +27087,141 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12255
+#: doc/guix.texi:12300
 #, no-wrap
-msgid ""
-"{@code{cups-configuration} parameter} environment-variables "
-"environment-variables"
+msgid "{@code{cups-configuration} parameter} environment-variables environment-variables"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12258
+#: doc/guix.texi:12303
 msgid ""
 "Passes the specified environment variable(s) to child processes; a list of "
 "strings."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12262
+#: doc/guix.texi:12307
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} policy-configuration-list policies"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12264
+#: doc/guix.texi:12309
 msgid "Specifies named access control policies."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12266
+#: doc/guix.texi:12311
 msgid "Available @code{policy-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12267
+#: doc/guix.texi:12312
 #, no-wrap
 msgid "{@code{policy-configuration} parameter} string name"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12269
+#: doc/guix.texi:12314
 msgid "Name of the policy."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12271
+#: doc/guix.texi:12316
 #, no-wrap
 msgid "{@code{policy-configuration} parameter} string job-private-access"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12281
+#: doc/guix.texi:12326
 msgid ""
 "Specifies an access list for a job's private values.  @code{@@ACL} maps to "
 "the printer's requesting-user-name-allowed or requesting-user-name-denied "
 "values.  @code{@@OWNER} maps to the job's owner.  @code{@@SYSTEM} maps to "
-"the groups listed for the @code{system-group} field of the "
-"@code{files-config} configuration, which is reified into the "
-"@code{cups-files.conf(5)} file.  Other possible elements of the access list "
-"include specific user names, and @code{@@@var{group}} to indicate members of "
-"a specific group.  The access list may also be simply @code{all} or "
-"@code{default}."
+"the groups listed for the @code{system-group} field of the @code{files-"
+"config} configuration, which is reified into the @code{cups-files.conf(5)} "
+"file.  Other possible elements of the access list include specific user "
+"names, and @code{@@@var{group}} to indicate members of a specific group.  "
+"The access list may also be simply @code{all} or @code{default}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12283 doc/guix.texi:12305
+#: doc/guix.texi:12328 doc/guix.texi:12350
 msgid "Defaults to @samp{\"@@OWNER @@SYSTEM\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12285
+#: doc/guix.texi:12330
 #, no-wrap
 msgid "{@code{policy-configuration} parameter} string job-private-values"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12288 doc/guix.texi:12310
+#: doc/guix.texi:12333 doc/guix.texi:12355
 msgid ""
 "Specifies the list of job values to make private, or @code{all}, "
 "@code{default}, or @code{none}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12291
+#: doc/guix.texi:12336
 msgid ""
-"Defaults to @samp{\"job-name job-originating-host-name "
-"job-originating-user-name phone\"}."
+"Defaults to @samp{\"job-name job-originating-host-name job-originating-user-"
+"name phone\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12293
+#: doc/guix.texi:12338
 #, no-wrap
 msgid "{@code{policy-configuration} parameter} string subscription-private-access"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12303
+#: doc/guix.texi:12348
 msgid ""
 "Specifies an access list for a subscription's private values.  @code{@@ACL} "
-"maps to the printer's requesting-user-name-allowed or "
-"requesting-user-name-denied values.  @code{@@OWNER} maps to the job's "
-"owner.  @code{@@SYSTEM} maps to the groups listed for the "
-"@code{system-group} field of the @code{files-config} configuration, which is "
-"reified into the @code{cups-files.conf(5)} file.  Other possible elements of "
-"the access list include specific user names, and @code{@@@var{group}} to "
-"indicate members of a specific group.  The access list may also be simply "
-"@code{all} or @code{default}."
+"maps to the printer's requesting-user-name-allowed or requesting-user-name-"
+"denied values.  @code{@@OWNER} maps to the job's owner.  @code{@@SYSTEM} "
+"maps to the groups listed for the @code{system-group} field of the "
+"@code{files-config} configuration, which is reified into the @code{cups-"
+"files.conf(5)} file.  Other possible elements of the access list include "
+"specific user names, and @code{@@@var{group}} to indicate members of a "
+"specific group.  The access list may also be simply @code{all} or "
+"@code{default}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12307
+#: doc/guix.texi:12352
 #, no-wrap
 msgid "{@code{policy-configuration} parameter} string subscription-private-values"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12313
+#: doc/guix.texi:12358
 msgid ""
 "Defaults to @samp{\"notify-events notify-pull-method notify-recipient-uri "
 "notify-subscriber-user-name notify-user-data\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12315
+#: doc/guix.texi:12360
 #, no-wrap
-msgid ""
-"{@code{policy-configuration} parameter} operation-access-control-list "
-"access-controls"
+msgid "{@code{policy-configuration} parameter} operation-access-control-list access-controls"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12317
+#: doc/guix.texi:12362
 msgid "Access control by IPP operation."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12322
+#: doc/guix.texi:12367
 #, no-wrap
-msgid ""
-"{@code{cups-configuration} parameter} boolean-or-non-negative-integer "
-"preserve-job-files"
+msgid "{@code{cups-configuration} parameter} boolean-or-non-negative-integer preserve-job-files"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12327
+#: doc/guix.texi:12372
 msgid ""
 "Specifies whether job files (documents) are preserved after a job is "
 "printed.  If a numeric value is specified, job files are preserved for the "
@@ -26258,20 +27230,18 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12329
+#: doc/guix.texi:12374
 msgid "Defaults to @samp{86400}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12331
+#: doc/guix.texi:12376
 #, no-wrap
-msgid ""
-"{@code{cups-configuration} parameter} boolean-or-non-negative-integer "
-"preserve-job-history"
+msgid "{@code{cups-configuration} parameter} boolean-or-non-negative-integer preserve-job-history"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12336
+#: doc/guix.texi:12381
 msgid ""
 "Specifies whether the job history is preserved after a job is printed.  If a "
 "numeric value is specified, the job history is preserved for the indicated "
@@ -26280,60 +27250,60 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12340
+#: doc/guix.texi:12385
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} non-negative-integer reload-timeout"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12343
+#: doc/guix.texi:12388
 msgid ""
 "Specifies the amount of time to wait for job completion before restarting "
 "the scheduler."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12347
+#: doc/guix.texi:12392
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} string rip-cache"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12350
+#: doc/guix.texi:12395
 msgid ""
 "Specifies the maximum amount of memory to use when converting documents into "
 "bitmaps for a printer."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12352
+#: doc/guix.texi:12397
 msgid "Defaults to @samp{\"128m\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12354
+#: doc/guix.texi:12399
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} string server-admin"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12356
+#: doc/guix.texi:12401
 msgid "Specifies the email address of the server administrator."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12358
+#: doc/guix.texi:12403
 msgid "Defaults to @samp{\"root@@localhost.localdomain\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12360
+#: doc/guix.texi:12405
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} host-name-list-or-* server-alias"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12368
+#: doc/guix.texi:12413
 msgid ""
 "The ServerAlias directive is used for HTTP Host header validation when "
 "clients connect to the scheduler from external interfaces.  Using the "
@@ -26344,34 +27314,34 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12370
+#: doc/guix.texi:12415
 msgid "Defaults to @samp{*}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12372
+#: doc/guix.texi:12417
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} string server-name"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12374
+#: doc/guix.texi:12419
 msgid "Specifies the fully-qualified host name of the server."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12376
+#: doc/guix.texi:12421
 msgid "Defaults to @samp{\"localhost\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12378
+#: doc/guix.texi:12423
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} server-tokens server-tokens"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12386
+#: doc/guix.texi:12431
 msgid ""
 "Specifies what information is included in the Server header of HTTP "
 "responses.  @code{None} disables the Server header.  @code{ProductOnly} "
@@ -26383,34 +27353,34 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12388
+#: doc/guix.texi:12433
 msgid "Defaults to @samp{Minimal}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12390
+#: doc/guix.texi:12435
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} string set-env"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12392
+#: doc/guix.texi:12437
 msgid "Set the specified environment variable to be passed to child processes."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12394
+#: doc/guix.texi:12439
 msgid "Defaults to @samp{\"variable value\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12396
+#: doc/guix.texi:12441
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} multiline-string-list ssl-listen"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12401
+#: doc/guix.texi:12446
 msgid ""
 "Listens on the specified interfaces for encrypted connections.  Valid values "
 "are of the form @var{address}:@var{port}, where @var{address} is either an "
@@ -26419,13 +27389,13 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12405
+#: doc/guix.texi:12450
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} ssl-options ssl-options"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12412
+#: doc/guix.texi:12457
 msgid ""
 "Sets encryption options.  By default, CUPS only supports encryption using "
 "TLS v1.0 or higher using known secure cipher suites.  The @code{AllowRC4} "
@@ -26436,93 +27406,92 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12416
+#: doc/guix.texi:12461
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} boolean strict-conformance?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12419
+#: doc/guix.texi:12464
 msgid ""
 "Specifies whether the scheduler requires clients to strictly adhere to the "
 "IPP specifications."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12423
+#: doc/guix.texi:12468
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} non-negative-integer timeout"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12425
+#: doc/guix.texi:12470
 msgid "Specifies the HTTP request timeout, in seconds."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12430
+#: doc/guix.texi:12475
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} boolean web-interface?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12432
+#: doc/guix.texi:12477
 msgid "Specifies whether the web interface is enabled."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:12442
+#: doc/guix.texi:12487
 msgid ""
 "At this point you're probably thinking ``oh dear, Guix manual, I like you "
 "but you can stop already with the configuration options''.  Indeed.  "
-"However, one more point: it could be that you have an existing "
-"@code{cupsd.conf} that you want to use.  In that case, you can pass an "
-"@code{opaque-cups-configuration} as the configuration of a "
-"@code{cups-service-type}."
+"However, one more point: it could be that you have an existing @code{cupsd."
+"conf} that you want to use.  In that case, you can pass an @code{opaque-cups-"
+"configuration} as the configuration of a @code{cups-service-type}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:12444
+#: doc/guix.texi:12489
 msgid "Available @code{opaque-cups-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12445
+#: doc/guix.texi:12490
 #, no-wrap
 msgid "{@code{opaque-cups-configuration} parameter} package cups"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12449
+#: doc/guix.texi:12494
 #, no-wrap
 msgid "{@code{opaque-cups-configuration} parameter} string cupsd.conf"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12451
+#: doc/guix.texi:12496
 msgid "The contents of the @code{cupsd.conf}, as a string."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12453
+#: doc/guix.texi:12498
 #, no-wrap
 msgid "{@code{opaque-cups-configuration} parameter} string cups-files.conf"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12455
+#: doc/guix.texi:12500
 msgid "The contents of the @code{cups-files.conf} file, as a string."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:12460
+#: doc/guix.texi:12505
 msgid ""
 "For example, if your @code{cupsd.conf} and @code{cups-files.conf} are in "
 "strings of the same name, you could instantiate a CUPS service like this:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:12466
+#: doc/guix.texi:12511
 #, no-wrap
 msgid ""
 "(service cups-service-type\n"
@@ -26532,7 +27501,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:12477
+#: doc/guix.texi:12522
 msgid ""
 "The @code{(gnu services desktop)} module provides services that are usually "
 "useful in the context of a ``desktop'' setup---that is, on a machine running "
@@ -26542,7 +27511,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:12481
+#: doc/guix.texi:12526
 msgid ""
 "To simplify things, the module defines a variable containing the set of "
 "services that users typically expect on a machine with a graphical "
@@ -26550,20 +27519,20 @@ msgid ""
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:12482
+#: doc/guix.texi:12527
 #, no-wrap
 msgid "{Scheme Variable} %desktop-services"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:12485
+#: doc/guix.texi:12530
 msgid ""
 "This is a list of services that builds upon @var{%base-services} and adds or "
 "adjusts services for a typical ``desktop'' setup."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:12495
+#: doc/guix.texi:12540
 msgid ""
 "In particular, it adds a graphical login manager (@pxref{X Window, "
 "@code{slim-service}}), screen lockers, a network management tool "
@@ -26577,7 +27546,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:12500
+#: doc/guix.texi:12545
 msgid ""
 "The @var{%desktop-services} variable can be used as the @code{services} "
 "field of an @code{operating-system} declaration (@pxref{operating-system "
@@ -26585,15 +27554,15 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:12520
+#: doc/guix.texi:12565
 msgid ""
 "Additionally, the @code{gnome-desktop-service}, @code{xfce-desktop-service} "
 "and @code{mate-desktop-service} procedures can add GNOME, XFCE and/or MATE "
 "to a system.  To ``add GNOME'' means that system-level services like the "
 "backlight adjustment helpers and the power management utilities are added to "
 "the system, extending @code{polkit} and @code{dbus} appropriately, allowing "
-"GNOME to operate with elevated privileges on a limited number of "
-"special-purpose system interfaces.  Additionally, adding a service made by "
+"GNOME to operate with elevated privileges on a limited number of special-"
+"purpose system interfaces.  Additionally, adding a service made by "
 "@code{gnome-desktop-service} adds the GNOME metapackage to the system "
 "profile.  Likewise, adding the XFCE service not only adds the @code{xfce} "
 "metapackage to the system profile, but it also gives the Thunar file manager "
@@ -26602,44 +27571,43 @@ msgid ""
 "graphical interface.  To ``add MATE'' means that @code{polkit} and "
 "@code{dbus} are extended appropriately, allowing MATE to operate with "
 "elevated privileges on a limited number of special-purpose system "
-"interfaces.  Additionally, adding a service made by "
-"@code{mate-desktop-service} adds the MATE metapackage to the system profile."
+"interfaces.  Additionally, adding a service made by @code{mate-desktop-"
+"service} adds the MATE metapackage to the system profile."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:12529
+#: doc/guix.texi:12574
 msgid ""
 "The desktop environments in Guix use the Xorg display server by default.  If "
 "you'd like to use the newer display server protocol called Wayland, you need "
 "to use the @code{sddm-service} instead of the @code{slim-service} for the "
 "graphical login manager.  You should then select the ``GNOME (Wayland)'' "
 "session in SDDM.  Alternatively you can also try starting GNOME on Wayland "
-"manually from a TTY with the command ``XDG_SESSION_TYPE=wayland exec "
-"dbus-run-session gnome-session``.  Currently only GNOME has support for "
-"Wayland."
+"manually from a TTY with the command ``XDG_SESSION_TYPE=wayland exec dbus-"
+"run-session gnome-session``.  Currently only GNOME has support for Wayland."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12530
+#: doc/guix.texi:12575
 #, no-wrap
 msgid "{Scheme Procedure} gnome-desktop-service"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12534
+#: doc/guix.texi:12579
 msgid ""
 "Return a service that adds the @code{gnome} package to the system profile, "
 "and extends polkit with the actions from @code{gnome-settings-daemon}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12536
+#: doc/guix.texi:12581
 #, no-wrap
 msgid "{Scheme Procedure} xfce-desktop-service"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12541
+#: doc/guix.texi:12586
 msgid ""
 "Return a service that adds the @code{xfce} package to the system profile, "
 "and extends polkit with the ability for @code{thunar} to manipulate the file "
@@ -26648,20 +27616,20 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12543
+#: doc/guix.texi:12588
 #, no-wrap
 msgid "{Scheme Procedure} mate-desktop-service"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12547
+#: doc/guix.texi:12592
 msgid ""
 "Return a service that adds the @code{mate} package to the system profile, "
 "and extends polkit with the actions from @code{mate-settings-daemon}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:12554
+#: doc/guix.texi:12599
 msgid ""
 "Because the GNOME, XFCE and MATE desktop services pull in so many packages, "
 "the default @code{%desktop-services} variable doesn't include either of them "
@@ -26671,7 +27639,7 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:12565
+#: doc/guix.texi:12610
 #, no-wrap
 msgid ""
 "(use-modules (gnu))\n"
@@ -26686,14 +27654,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:12569
+#: doc/guix.texi:12614
 msgid ""
 "These desktop environments will then be available as options in the "
 "graphical login window."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:12573
+#: doc/guix.texi:12618
 msgid ""
 "The actual service definitions included in @code{%desktop-services} and "
 "provided by @code{(gnu services dbus)} and @code{(gnu services desktop)} are "
@@ -26701,20 +27669,20 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12574
+#: doc/guix.texi:12619
 #, no-wrap
 msgid "{Scheme Procedure} dbus-service [#:dbus @var{dbus}] [#:services '()]"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12577
+#: doc/guix.texi:12622
 msgid ""
 "Return a service that runs the ``system bus'', using @var{dbus}, with "
 "support for @var{services}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12581
+#: doc/guix.texi:12626
 msgid ""
 "@uref{http://dbus.freedesktop.org/, D-Bus} is an inter-process communication "
 "facility.  Its system bus is used to allow system services to communicate "
@@ -26722,22 +27690,22 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12586
+#: doc/guix.texi:12631
 msgid ""
-"@var{services} must be a list of packages that provide an "
-"@file{etc/dbus-1/system.d} directory containing additional D-Bus "
-"configuration and policy files.  For example, to allow avahi-daemon to use "
-"the system bus, @var{services} must be equal to @code{(list avahi)}."
+"@var{services} must be a list of packages that provide an @file{etc/dbus-1/"
+"system.d} directory containing additional D-Bus configuration and policy "
+"files.  For example, to allow avahi-daemon to use the system bus, "
+"@var{services} must be equal to @code{(list avahi)}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12588
+#: doc/guix.texi:12633
 #, no-wrap
 msgid "{Scheme Procedure} elogind-service [#:config @var{config}]"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12594
+#: doc/guix.texi:12639
 msgid ""
 "Return a service that runs the @code{elogind} login and seat management "
 "daemon.  @uref{https://github.com/elogind/elogind, Elogind} exposes a D-Bus "
@@ -26747,7 +27715,7 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12598
+#: doc/guix.texi:12643
 msgid ""
 "Elogind handles most system-level power events for a computer, for example "
 "suspending the system when a lid is closed, or shutting it down when the "
@@ -26755,7 +27723,7 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12603
+#: doc/guix.texi:12648
 msgid ""
 "The @var{config} keyword argument specifies the configuration for elogind, "
 "and should be the result of an @code{(elogind-configuration (@var{parameter} "
@@ -26764,307 +27732,305 @@ msgid ""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12605
+#: doc/guix.texi:12650
 #, no-wrap
 msgid "kill-user-processes?"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:12607 doc/guix.texi:12625 doc/guix.texi:12627 doc/guix.texi:12629 doc/guix.texi:12641
+#: doc/guix.texi:12652 doc/guix.texi:12670 doc/guix.texi:12672
+#: doc/guix.texi:12674 doc/guix.texi:12686
 msgid "#f"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12607
+#: doc/guix.texi:12652
 #, no-wrap
 msgid "kill-only-users"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:12609 doc/guix.texi:12647
+#: doc/guix.texi:12654 doc/guix.texi:12692
 msgid "()"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12609
+#: doc/guix.texi:12654
 #, no-wrap
 msgid "kill-exclude-users"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:12611
+#: doc/guix.texi:12656
 msgid "(\"root\")"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12611
+#: doc/guix.texi:12656
 #, no-wrap
 msgid "inhibit-delay-max-seconds"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:12613
+#: doc/guix.texi:12658
 msgid "5"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12613
+#: doc/guix.texi:12658
 #, no-wrap
 msgid "handle-power-key"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:12615
+#: doc/guix.texi:12660
 msgid "poweroff"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12615
+#: doc/guix.texi:12660
 #, no-wrap
 msgid "handle-suspend-key"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:12617 doc/guix.texi:12621
+#: doc/guix.texi:12662 doc/guix.texi:12666
 msgid "suspend"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12617
+#: doc/guix.texi:12662
 #, no-wrap
 msgid "handle-hibernate-key"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:12619
+#: doc/guix.texi:12664
 msgid "hibernate"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12619
+#: doc/guix.texi:12664
 #, no-wrap
 msgid "handle-lid-switch"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12621
+#: doc/guix.texi:12666
 #, no-wrap
 msgid "handle-lid-switch-docked"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:12623 doc/guix.texi:12635
+#: doc/guix.texi:12668 doc/guix.texi:12680
 msgid "ignore"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12623
+#: doc/guix.texi:12668
 #, no-wrap
 msgid "power-key-ignore-inhibited?"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12625
+#: doc/guix.texi:12670
 #, no-wrap
 msgid "suspend-key-ignore-inhibited?"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12627
+#: doc/guix.texi:12672
 #, no-wrap
 msgid "hibernate-key-ignore-inhibited?"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12629
+#: doc/guix.texi:12674
 #, no-wrap
 msgid "lid-switch-ignore-inhibited?"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:12631 doc/guix.texi:12643
+#: doc/guix.texi:12676 doc/guix.texi:12688
 msgid "#t"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12631
+#: doc/guix.texi:12676
 #, no-wrap
 msgid "holdoff-timeout-seconds"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:12633
+#: doc/guix.texi:12678
 msgid "30"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12633
+#: doc/guix.texi:12678
 #, no-wrap
 msgid "idle-action"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12635
+#: doc/guix.texi:12680
 #, no-wrap
 msgid "idle-action-seconds"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:12637
+#: doc/guix.texi:12682
 msgid "(* 30 60)"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12637
+#: doc/guix.texi:12682
 #, no-wrap
 msgid "runtime-directory-size-percent"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:12639
+#: doc/guix.texi:12684
 msgid "10"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12639
+#: doc/guix.texi:12684
 #, no-wrap
 msgid "runtime-directory-size"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12641
+#: doc/guix.texi:12686
 #, no-wrap
 msgid "remove-ipc?"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12643
+#: doc/guix.texi:12688
 #, no-wrap
 msgid "suspend-state"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:12645
+#: doc/guix.texi:12690
 msgid "(\"mem\" \"standby\" \"freeze\")"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12645
+#: doc/guix.texi:12690
 #, no-wrap
 msgid "suspend-mode"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12647
+#: doc/guix.texi:12692
 #, no-wrap
 msgid "hibernate-state"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:12649 doc/guix.texi:12653
+#: doc/guix.texi:12694 doc/guix.texi:12698
 msgid "(\"disk\")"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12649
+#: doc/guix.texi:12694
 #, no-wrap
 msgid "hibernate-mode"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:12651
+#: doc/guix.texi:12696
 msgid "(\"platform\" \"shutdown\")"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12651
+#: doc/guix.texi:12696
 #, no-wrap
 msgid "hybrid-sleep-state"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12653
+#: doc/guix.texi:12698
 #, no-wrap
 msgid "hybrid-sleep-mode"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:12655
+#: doc/guix.texi:12700
 msgid "(\"suspend\" \"platform\" \"shutdown\")"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12658
+#: doc/guix.texi:12703
 #, no-wrap
 msgid "{Scheme Procedure} accountsservice-service @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12666
+#: doc/guix.texi:12711
 msgid ""
 "[#:accountsservice @var{accountsservice}] Return a service that runs "
 "AccountsService, a system service that can list available accounts, change "
 "their passwords, and so on.  AccountsService integrates with PolicyKit to "
 "enable unprivileged users to acquire the capability to modify their system "
-"configuration.  "
-"@uref{https://www.freedesktop.org/wiki/Software/AccountsService/, the "
-"accountsservice web site} for more information."
+"configuration.  @uref{https://www.freedesktop.org/wiki/Software/"
+"AccountsService/, the accountsservice web site} for more information."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12669
+#: doc/guix.texi:12714
 msgid ""
 "The @var{accountsservice} keyword argument is the @code{accountsservice} "
 "package to expose as a service."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12671
+#: doc/guix.texi:12716
 #, no-wrap
 msgid "{Scheme Procedure} polkit-service @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12680
+#: doc/guix.texi:12725
 msgid ""
-"[#:polkit @var{polkit}] Return a service that runs the "
-"@uref{http://www.freedesktop.org/wiki/Software/polkit/, Polkit privilege "
-"management service}, which allows system administrators to grant access to "
-"privileged operations in a structured way.  By querying the Polkit service, "
-"a privileged system component can know when it should grant additional "
-"capabilities to ordinary users.  For example, an ordinary user can be "
-"granted the capability to suspend the system if the user is logged in "
-"locally."
+"[#:polkit @var{polkit}] Return a service that runs the @uref{http://www."
+"freedesktop.org/wiki/Software/polkit/, Polkit privilege management service}, "
+"which allows system administrators to grant access to privileged operations "
+"in a structured way.  By querying the Polkit service, a privileged system "
+"component can know when it should grant additional capabilities to ordinary "
+"users.  For example, an ordinary user can be granted the capability to "
+"suspend the system if the user is logged in locally."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12682
+#: doc/guix.texi:12727
 #, no-wrap
 msgid "{Scheme Procedure} upower-service [#:upower @var{upower}] @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12699
+#: doc/guix.texi:12744
 msgid ""
-"[#:watts-up-pro? #f] @ [#:poll-batteries? #t] @ [#:ignore-lid? #f] @ "
-"[#:use-percentage-for-policy? #f] @ [#:percentage-low 10] @ "
-"[#:percentage-critical 3] @ [#:percentage-action 2] @ [#:time-low 1200] @ "
-"[#:time-critical 300] @ [#:time-action 120] @ [#:critical-power-action "
-"'hybrid-sleep] Return a service that runs "
-"@uref{http://upower.freedesktop.org/, @command{upowerd}}, a system-wide "
-"monitor for power consumption and battery levels, with the given "
-"configuration settings.  It implements the @code{org.freedesktop.UPower} "
-"D-Bus interface, and is notably used by GNOME."
+"[#:watts-up-pro? #f] @ [#:poll-batteries? #t] @ [#:ignore-lid? #f] @ [#:use-"
+"percentage-for-policy? #f] @ [#:percentage-low 10] @ [#:percentage-critical "
+"3] @ [#:percentage-action 2] @ [#:time-low 1200] @ [#:time-critical 300] @ "
+"[#:time-action 120] @ [#:critical-power-action 'hybrid-sleep] Return a "
+"service that runs @uref{http://upower.freedesktop.org/, @command{upowerd}}, "
+"a system-wide monitor for power consumption and battery levels, with the "
+"given configuration settings.  It implements the @code{org.freedesktop."
+"UPower} D-Bus interface, and is notably used by GNOME."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12701
+#: doc/guix.texi:12746
 #, no-wrap
 msgid "{Scheme Procedure} udisks-service [#:udisks @var{udisks}]"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12706
+#: doc/guix.texi:12751
 msgid ""
 "Return a service for @uref{http://udisks.freedesktop.org/docs/latest/, "
 "UDisks}, a @dfn{disk management} daemon that provides user interfaces with "
@@ -27073,13 +28039,13 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12708
+#: doc/guix.texi:12753
 #, no-wrap
 msgid "{Scheme Procedure} colord-service [#:colord @var{colord}]"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12714
+#: doc/guix.texi:12759
 msgid ""
 "Return a service that runs @command{colord}, a system service with a D-Bus "
 "interface to manage the color profiles of input and output devices such as "
@@ -27089,20 +28055,18 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12716
+#: doc/guix.texi:12761
 #, no-wrap
-msgid ""
-"{Scheme Procedure} geoclue-application name [#:allowed? #t] [#:system? #f] "
-"[#:users '()]"
+msgid "{Scheme Procedure} geoclue-application name [#:allowed? #t] [#:system? #f] [#:users '()]"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12725
+#: doc/guix.texi:12770
 msgid ""
 "Return a configuration allowing an application to access GeoClue location "
-"data.  @var{name} is the Desktop ID of the application, without the "
-"@code{.desktop} part.  If @var{allowed?} is true, the application will have "
-"access to location information by default.  The boolean @var{system?} value "
+"data.  @var{name} is the Desktop ID of the application, without the @code{."
+"desktop} part.  If @var{allowed?} is true, the application will have access "
+"to location information by default.  The boolean @var{system?} value "
 "indicates whether an application is a system component or not.  Finally "
 "@var{users} is a list of UIDs of all users for which this application is "
 "allowed location info access.  An empty users list means that all users are "
@@ -27110,13 +28074,13 @@ msgid ""
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:12727
+#: doc/guix.texi:12772
 #, no-wrap
 msgid "{Scheme Variable} %standard-geoclue-applications"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:12734
+#: doc/guix.texi:12779
 msgid ""
 "The standard list of well-known GeoClue application configurations, granting "
 "authority to the GNOME date-and-time utility to ask for the current location "
@@ -27126,67 +28090,66 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12736
+#: doc/guix.texi:12781
 #, no-wrap
 msgid "{Scheme Procedure} geoclue-service [#:colord @var{colord}] @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12749
+#: doc/guix.texi:12794
 msgid ""
-"[#:whitelist '()] @ [#:wifi-geolocation-url "
-"\"https://location.services.mozilla.com/v1/geolocate?key=geoclue\"] @ "
-"[#:submit-data? #f] [#:wifi-submission-url "
-"\"https://location.services.mozilla.com/v1/submit?key=geoclue\"] @ "
-"[#:submission-nick \"geoclue\"] @ [#:applications "
-"%standard-geoclue-applications] Return a service that runs the GeoClue "
-"location service.  This service provides a D-Bus interface to allow "
-"applications to request access to a user's physical location, and optionally "
-"to add information to online location databases.  See "
-"@uref{https://wiki.freedesktop.org/www/Software/GeoClue/, the GeoClue web "
-"site} for more information."
+"[#:whitelist '()] @ [#:wifi-geolocation-url \"https://location.services."
+"mozilla.com/v1/geolocate?key=geoclue\"] @ [#:submit-data? #f] [#:wifi-"
+"submission-url \"https://location.services.mozilla.com/v1/submit?key=geoclue"
+"\"] @ [#:submission-nick \"geoclue\"] @ [#:applications %standard-geoclue-"
+"applications] Return a service that runs the GeoClue location service.  This "
+"service provides a D-Bus interface to allow applications to request access "
+"to a user's physical location, and optionally to add information to online "
+"location databases.  See @uref{https://wiki.freedesktop.org/www/Software/"
+"GeoClue/, the GeoClue web site} for more information."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12751
+#: doc/guix.texi:12796
 #, no-wrap
 msgid "{Scheme Procedure} bluetooth-service [#:bluez @var{bluez}] @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12758
+#: doc/guix.texi:12803
 msgid ""
 "[@w{#:auto-enable? #f}] Return a service that runs the @command{bluetoothd} "
-"daemon, which manages all the Bluetooth devices and provides a number of "
-"D-Bus interfaces.  When AUTO-ENABLE? is true, the bluetooth controller is "
+"daemon, which manages all the Bluetooth devices and provides a number of D-"
+"Bus interfaces.  When AUTO-ENABLE? is true, the bluetooth controller is "
 "powered automatically at boot, which can be useful when using a bluetooth "
 "keyboard or mouse."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12760
+#: doc/guix.texi:12805
 msgid "Users need to be in the @code{lp} group to access the D-Bus service."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:12766
+#: doc/guix.texi:12811
 #, no-wrap
 msgid "SQL"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:12768
-msgid "The @code{(gnu services databases)} module provides the following services."
+#: doc/guix.texi:12813
+msgid ""
+"The @code{(gnu services databases)} module provides the following services."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12769
+#: doc/guix.texi:12814
 #, no-wrap
 msgid "{Scheme Procedure} postgresql-service [#:postgresql postgresql] @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12774
+#: doc/guix.texi:12819
 msgid ""
 "[#:config-file] [#:data-directory ``/var/lib/postgresql/data''] @ [#:port "
 "5432] [#:locale ``en_US.utf8''] Return a service that runs @var{postgresql}, "
@@ -27194,84 +28157,83 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12778
+#: doc/guix.texi:12823
 msgid ""
-"The PostgreSQL daemon loads its runtime configuration from "
-"@var{config-file}, creates a database cluster with @var{locale} as the "
-"default locale, stored in @var{data-directory}.  It then listens on "
-"@var{port}."
+"The PostgreSQL daemon loads its runtime configuration from @var{config-"
+"file}, creates a database cluster with @var{locale} as the default locale, "
+"stored in @var{data-directory}.  It then listens on @var{port}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12780
+#: doc/guix.texi:12825
 #, no-wrap
 msgid "{Scheme Procedure} mysql-service [#:config (mysql-configuration)]"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12783
+#: doc/guix.texi:12828
 msgid ""
 "Return a service that runs @command{mysqld}, the MySQL or MariaDB database "
 "server."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12786
+#: doc/guix.texi:12831
 msgid ""
 "The optional @var{config} argument specifies the configuration for "
 "@command{mysqld}, which should be a @code{<mysql-configuration>} object."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:12788
+#: doc/guix.texi:12833
 #, no-wrap
 msgid "{Data Type} mysql-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:12790
+#: doc/guix.texi:12835
 msgid "Data type representing the configuration of @var{mysql-service}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12792
+#: doc/guix.texi:12837
 #, no-wrap
 msgid "@code{mysql} (default: @var{mariadb})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12795
+#: doc/guix.texi:12840
 msgid ""
 "Package object of the MySQL database server, can be either @var{mariadb} or "
 "@var{mysql}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12798
+#: doc/guix.texi:12843
 msgid ""
 "For MySQL, a temporary root password will be displayed at activation time.  "
 "For MariaDB, the root password is empty."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12799
+#: doc/guix.texi:12844
 #, no-wrap
 msgid "@code{port} (default: @code{3306})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12801
+#: doc/guix.texi:12846
 msgid "TCP port on which the database server listens for incoming connections."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:12804
+#: doc/guix.texi:12849
 #, no-wrap
 msgid "{Scheme Variable} memcached-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:12808
+#: doc/guix.texi:12853
 msgid ""
 "This is the service type for the @uref{https://memcached.org/, Memcached} "
 "service, which provides a distributed in memory cache.  The value for the "
@@ -27279,139 +28241,139 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:12812
+#: doc/guix.texi:12857
 #, no-wrap
 msgid "(service memcached-service-type)\n"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:12814
+#: doc/guix.texi:12859
 #, no-wrap
 msgid "{Data Type} memcached-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:12816
+#: doc/guix.texi:12861
 msgid "Data type representing the configuration of memcached."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12818
+#: doc/guix.texi:12863
 #, no-wrap
 msgid "@code{memcached} (default: @code{memcached})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12820
+#: doc/guix.texi:12865
 msgid "The Memcached package to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12821
+#: doc/guix.texi:12866
 #, no-wrap
 msgid "@code{interfaces} (default: @code{'(\"0.0.0.0\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12823
+#: doc/guix.texi:12868
 msgid "Network interfaces on which to listen."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12824
+#: doc/guix.texi:12869
 #, no-wrap
 msgid "@code{tcp-port} (default: @code{11211})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12826
+#: doc/guix.texi:12871
 msgid "Port on which to accept connections on,"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12827
+#: doc/guix.texi:12872
 #, no-wrap
 msgid "@code{udp-port} (default: @code{11211})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12830
+#: doc/guix.texi:12875
 msgid ""
 "Port on which to accept UDP connections on, a value of 0 will disable "
 "listening on a UDP socket."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12831
+#: doc/guix.texi:12876
 #, no-wrap
 msgid "@code{additional-options} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12833
+#: doc/guix.texi:12878
 msgid "Additional command line options to pass to @code{memcached}."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:12836
+#: doc/guix.texi:12881
 #, no-wrap
 msgid "{Scheme Variable} mongodb-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:12839
+#: doc/guix.texi:12884
 msgid ""
 "This is the service type for @uref{https://www.mongodb.com/, MongoDB}.  The "
 "value for the service type is a @code{mongodb-configuration} object."
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:12843
+#: doc/guix.texi:12888
 #, no-wrap
 msgid "(service mongodb-service-type)\n"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:12845
+#: doc/guix.texi:12890
 #, no-wrap
 msgid "{Data Type} mongodb-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:12847
+#: doc/guix.texi:12892
 msgid "Data type representing the configuration of mongodb."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12849
+#: doc/guix.texi:12894
 #, no-wrap
 msgid "@code{mongodb} (default: @code{mongodb})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12851
+#: doc/guix.texi:12896
 msgid "The MongoDB package to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12852
+#: doc/guix.texi:12897
 #, no-wrap
 msgid "@code{config-file} (default: @code{%default-mongodb-configuration-file})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12854
+#: doc/guix.texi:12899
 msgid "The configuration file for MongoDB."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12855
+#: doc/guix.texi:12900
 #, no-wrap
 msgid "@code{data-directory} (default: @code{\"/var/lib/mongodb\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12859
+#: doc/guix.texi:12904
 msgid ""
 "This value is used to create the directory, so that it exists and is owned "
 "by the mongodb user.  It should match the data-directory which MongoDB is "
@@ -27419,89 +28381,89 @@ msgid ""
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:12862
+#: doc/guix.texi:12907
 #, no-wrap
 msgid "{Scheme Variable} redis-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:12865
+#: doc/guix.texi:12910
 msgid ""
 "This is the service type for the @uref{https://redis.io/, Redis} key/value "
 "store, whose value is a @code{redis-configuration} object."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:12867
+#: doc/guix.texi:12912
 #, no-wrap
 msgid "{Data Type} redis-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:12869
+#: doc/guix.texi:12914
 msgid "Data type representing the configuration of redis."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12871
+#: doc/guix.texi:12916
 #, no-wrap
 msgid "@code{redis} (default: @code{redis})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12873
+#: doc/guix.texi:12918
 msgid "The Redis package to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12874
+#: doc/guix.texi:12919
 #, no-wrap
 msgid "@code{bind} (default: @code{\"127.0.0.1\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12876
+#: doc/guix.texi:12921
 msgid "Network interface on which to listen."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12877
+#: doc/guix.texi:12922
 #, no-wrap
 msgid "@code{port} (default: @code{6379})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12880
+#: doc/guix.texi:12925
 msgid ""
 "Port on which to accept connections on, a value of 0 will disable listening "
 "on a TCP socket."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12881
+#: doc/guix.texi:12926
 #, no-wrap
 msgid "@code{working-directory} (default: @code{\"/var/lib/redis\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12883
+#: doc/guix.texi:12928
 msgid "Directory in which to store the database and related files."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:12889
+#: doc/guix.texi:12934
 #, no-wrap
 msgid "mail"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:12890 doc/guix.texi:15985
+#: doc/guix.texi:12935 doc/guix.texi:16030
 #, no-wrap
 msgid "email"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:12895
+#: doc/guix.texi:12940
 msgid ""
 "The @code{(gnu services mail)} module provides Guix service definitions for "
 "email services: IMAP, POP3, and LMTP servers, as well as mail transport "
@@ -27510,24 +28472,24 @@ msgid ""
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:12896
+#: doc/guix.texi:12941
 #, no-wrap
 msgid "Dovecot Service"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12898
+#: doc/guix.texi:12943
 #, no-wrap
 msgid "{Scheme Procedure} dovecot-service [#:config (dovecot-configuration)]"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12900
+#: doc/guix.texi:12945
 msgid "Return a service that runs the Dovecot IMAP/POP3/LMTP mail server."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:12910
+#: doc/guix.texi:12955
 msgid ""
 "By default, Dovecot does not need much configuration; the default "
 "configuration object created by @code{(dovecot-configuration)} will suffice "
@@ -27540,14 +28502,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:12913
+#: doc/guix.texi:12958
 msgid ""
 "For example, to specify that mail is located at @code{maildir~/.mail}, one "
 "would instantiate the Dovecot service like this:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:12918
+#: doc/guix.texi:12963
 #, no-wrap
 msgid ""
 "(dovecot-service #:config\n"
@@ -27556,7 +28518,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:12926
+#: doc/guix.texi:12971
 msgid ""
 "The available configuration parameters follow.  Each parameter definition is "
 "preceded by its type; for example, @samp{string-list foo} indicates that the "
@@ -27567,29 +28529,29 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:12936
+#: doc/guix.texi:12981
 msgid "Available @code{dovecot-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12937
+#: doc/guix.texi:12982
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} package dovecot"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12939 doc/guix.texi:14226
+#: doc/guix.texi:12984 doc/guix.texi:14271
 msgid "The dovecot package."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12941
+#: doc/guix.texi:12986
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} comma-separated-string-list listen"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12947
+#: doc/guix.texi:12992
 msgid ""
 "A list of IPs or hosts where to listen for connections.  @samp{*} listens on "
 "all IPv4 interfaces, @samp{::} listens on all IPv6 interfaces.  If you want "
@@ -27599,86 +28561,80 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12949
+#: doc/guix.texi:12994
 #, no-wrap
-msgid ""
-"{@code{dovecot-configuration} parameter} protocol-configuration-list "
-"protocols"
+msgid "{@code{dovecot-configuration} parameter} protocol-configuration-list protocols"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12952
+#: doc/guix.texi:12997
 msgid ""
 "List of protocols we want to serve.  Available protocols include "
 "@samp{imap}, @samp{pop3}, and @samp{lmtp}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12954
+#: doc/guix.texi:12999
 msgid "Available @code{protocol-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12955
+#: doc/guix.texi:13000
 #, no-wrap
 msgid "{@code{protocol-configuration} parameter} string name"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12957
+#: doc/guix.texi:13002
 msgid "The name of the protocol."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12959
+#: doc/guix.texi:13004
 #, no-wrap
 msgid "{@code{protocol-configuration} parameter} string auth-socket-path"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12963
+#: doc/guix.texi:13008
 msgid ""
 "UNIX socket path to the master authentication server to find users.  This is "
-"used by imap (for shared users) and lda.  It defaults to "
-"@samp{\"/var/run/dovecot/auth-userdb\"}."
+"used by imap (for shared users) and lda.  It defaults to @samp{\"/var/run/"
+"dovecot/auth-userdb\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12965
+#: doc/guix.texi:13010
 #, no-wrap
-msgid ""
-"{@code{protocol-configuration} parameter} space-separated-string-list "
-"mail-plugins"
+msgid "{@code{protocol-configuration} parameter} space-separated-string-list mail-plugins"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12967
+#: doc/guix.texi:13012
 msgid "Space separated list of plugins to load."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12969
+#: doc/guix.texi:13014
 #, no-wrap
-msgid ""
-"{@code{protocol-configuration} parameter} non-negative-integer "
-"mail-max-userip-connections"
+msgid "{@code{protocol-configuration} parameter} non-negative-integer mail-max-userip-connections"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12973
+#: doc/guix.texi:13018
 msgid ""
 "Maximum number of IMAP connections allowed for a user from each IP address.  "
 "NOTE: The username is compared case-sensitively.  Defaults to @samp{10}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12977
+#: doc/guix.texi:13022
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} service-configuration-list services"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12981
+#: doc/guix.texi:13026
 msgid ""
 "List of services to enable.  Available services include @samp{imap}, "
 "@samp{imap-login}, @samp{pop3}, @samp{pop3-login}, @samp{auth}, and "
@@ -27686,18 +28642,18 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12983
+#: doc/guix.texi:13028
 msgid "Available @code{service-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12984
+#: doc/guix.texi:13029
 #, no-wrap
 msgid "{@code{service-configuration} parameter} string kind"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12989
+#: doc/guix.texi:13034
 msgid ""
 "The service kind.  Valid values include @code{director}, @code{imap-login}, "
 "@code{pop3-login}, @code{lmtp}, @code{imap}, @code{pop3}, @code{auth}, "
@@ -27706,162 +28662,160 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12991
+#: doc/guix.texi:13036
 #, no-wrap
-msgid ""
-"{@code{service-configuration} parameter} listener-configuration-list "
-"listeners"
+msgid "{@code{service-configuration} parameter} listener-configuration-list listeners"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12996
+#: doc/guix.texi:13041
 msgid ""
-"Listeners for the service.  A listener is either a "
-"@code{unix-listener-configuration}, a @code{fifo-listener-configuration}, or "
-"an @code{inet-listener-configuration}.  Defaults to @samp{()}."
+"Listeners for the service.  A listener is either a @code{unix-listener-"
+"configuration}, a @code{fifo-listener-configuration}, or an @code{inet-"
+"listener-configuration}.  Defaults to @samp{()}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12998
+#: doc/guix.texi:13043
 msgid "Available @code{unix-listener-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:12999
+#: doc/guix.texi:13044
 #, no-wrap
 msgid "{@code{unix-listener-configuration} parameter} string path"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13002 doc/guix.texi:13025
+#: doc/guix.texi:13047 doc/guix.texi:13070
 msgid ""
 "Path to the file, relative to @code{base-dir} field.  This is also used as "
 "the section name."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13004
+#: doc/guix.texi:13049
 #, no-wrap
 msgid "{@code{unix-listener-configuration} parameter} string mode"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13007 doc/guix.texi:13030
+#: doc/guix.texi:13052 doc/guix.texi:13075
 msgid "The access mode for the socket.  Defaults to @samp{\"0600\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13009
+#: doc/guix.texi:13054
 #, no-wrap
 msgid "{@code{unix-listener-configuration} parameter} string user"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13012 doc/guix.texi:13035
+#: doc/guix.texi:13057 doc/guix.texi:13080
 msgid "The user to own the socket.  Defaults to @samp{\"\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13014
+#: doc/guix.texi:13059
 #, no-wrap
 msgid "{@code{unix-listener-configuration} parameter} string group"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13017 doc/guix.texi:13040
+#: doc/guix.texi:13062 doc/guix.texi:13085
 msgid "The group to own the socket.  Defaults to @samp{\"\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13021
+#: doc/guix.texi:13066
 msgid "Available @code{fifo-listener-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13022
+#: doc/guix.texi:13067
 #, no-wrap
 msgid "{@code{fifo-listener-configuration} parameter} string path"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13027
+#: doc/guix.texi:13072
 #, no-wrap
 msgid "{@code{fifo-listener-configuration} parameter} string mode"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13032
+#: doc/guix.texi:13077
 #, no-wrap
 msgid "{@code{fifo-listener-configuration} parameter} string user"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13037
+#: doc/guix.texi:13082
 #, no-wrap
 msgid "{@code{fifo-listener-configuration} parameter} string group"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13044
+#: doc/guix.texi:13089
 msgid "Available @code{inet-listener-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13045
+#: doc/guix.texi:13090
 #, no-wrap
 msgid "{@code{inet-listener-configuration} parameter} string protocol"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13047
+#: doc/guix.texi:13092
 msgid "The protocol to listen for."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13049
+#: doc/guix.texi:13094
 #, no-wrap
 msgid "{@code{inet-listener-configuration} parameter} string address"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13052
+#: doc/guix.texi:13097
 msgid ""
 "The address on which to listen, or empty for all addresses.  Defaults to "
 "@samp{\"\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13054
+#: doc/guix.texi:13099
 #, no-wrap
 msgid "{@code{inet-listener-configuration} parameter} non-negative-integer port"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13056
+#: doc/guix.texi:13101
 msgid "The port on which to listen."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13058
+#: doc/guix.texi:13103
 #, no-wrap
 msgid "{@code{inet-listener-configuration} parameter} boolean ssl?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13062
+#: doc/guix.texi:13107
 msgid ""
 "Whether to use SSL for this service; @samp{yes}, @samp{no}, or "
 "@samp{required}.  Defaults to @samp{#t}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13066
+#: doc/guix.texi:13111
 #, no-wrap
 msgid "{@code{service-configuration} parameter} non-negative-integer service-count"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13071
+#: doc/guix.texi:13116
 msgid ""
 "Number of connections to handle before starting a new process.  Typically "
 "the only useful values are 0 (unlimited) or 1.  1 is more secure, but 0 is "
@@ -27869,88 +28823,86 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13073
+#: doc/guix.texi:13118
 #, no-wrap
-msgid ""
-"{@code{service-configuration} parameter} non-negative-integer "
-"process-min-avail"
+msgid "{@code{service-configuration} parameter} non-negative-integer process-min-avail"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13076
+#: doc/guix.texi:13121
 msgid ""
 "Number of processes to always keep waiting for more connections.  Defaults "
 "to @samp{0}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13078
+#: doc/guix.texi:13123
 #, no-wrap
 msgid "{@code{service-configuration} parameter} non-negative-integer vsz-limit"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13082
+#: doc/guix.texi:13127
 msgid ""
 "If you set @samp{service-count 0}, you probably need to grow this.  Defaults "
 "to @samp{256000000}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13086
+#: doc/guix.texi:13131
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} dict-configuration dict"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13089
-msgid "Dict configuration, as created by the @code{dict-configuration} constructor."
+#: doc/guix.texi:13134
+msgid ""
+"Dict configuration, as created by the @code{dict-configuration} constructor."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13091
+#: doc/guix.texi:13136
 msgid "Available @code{dict-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13092
+#: doc/guix.texi:13137
 #, no-wrap
 msgid "{@code{dict-configuration} parameter} free-form-fields entries"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13095
+#: doc/guix.texi:13140
 msgid ""
-"A list of key-value pairs that this dict should hold.  Defaults to "
-"@samp{()}."
+"A list of key-value pairs that this dict should hold.  Defaults to @samp{()}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13099
+#: doc/guix.texi:13144
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} passdb-configuration-list passdbs"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13102
+#: doc/guix.texi:13147
 msgid ""
-"A list of passdb configurations, each one created by the "
-"@code{passdb-configuration} constructor."
+"A list of passdb configurations, each one created by the @code{passdb-"
+"configuration} constructor."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13104
+#: doc/guix.texi:13149
 msgid "Available @code{passdb-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13105
+#: doc/guix.texi:13150
 #, no-wrap
 msgid "{@code{passdb-configuration} parameter} string driver"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13110
+#: doc/guix.texi:13155
 msgid ""
 "The driver that the passdb should use.  Valid values include @samp{pam}, "
 "@samp{passwd}, @samp{shadow}, @samp{bsdauth}, and @samp{static}.  Defaults "
@@ -27958,140 +28910,136 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13112
+#: doc/guix.texi:13157
 #, no-wrap
 msgid "{@code{passdb-configuration} parameter} space-separated-string-list args"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13115
+#: doc/guix.texi:13160
 msgid ""
 "Space separated list of arguments to the passdb driver.  Defaults to "
 "@samp{\"\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13119
+#: doc/guix.texi:13164
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} userdb-configuration-list userdbs"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13122
+#: doc/guix.texi:13167
 msgid ""
-"List of userdb configurations, each one created by the "
-"@code{userdb-configuration} constructor."
+"List of userdb configurations, each one created by the @code{userdb-"
+"configuration} constructor."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13124
+#: doc/guix.texi:13169
 msgid "Available @code{userdb-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13125
+#: doc/guix.texi:13170
 #, no-wrap
 msgid "{@code{userdb-configuration} parameter} string driver"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13129
+#: doc/guix.texi:13174
 msgid ""
 "The driver that the userdb should use.  Valid values include @samp{passwd} "
 "and @samp{static}.  Defaults to @samp{\"passwd\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13131
+#: doc/guix.texi:13176
 #, no-wrap
 msgid "{@code{userdb-configuration} parameter} space-separated-string-list args"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13134
+#: doc/guix.texi:13179
 msgid ""
 "Space separated list of arguments to the userdb driver.  Defaults to "
 "@samp{\"\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13136
+#: doc/guix.texi:13181
 #, no-wrap
 msgid "{@code{userdb-configuration} parameter} free-form-args override-fields"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13139
+#: doc/guix.texi:13184
 msgid "Override fields from passwd.  Defaults to @samp{()}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13143
+#: doc/guix.texi:13188
 #, no-wrap
-msgid ""
-"{@code{dovecot-configuration} parameter} plugin-configuration "
-"plugin-configuration"
+msgid "{@code{dovecot-configuration} parameter} plugin-configuration plugin-configuration"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13146
+#: doc/guix.texi:13191
 msgid ""
 "Plug-in configuration, created by the @code{plugin-configuration} "
 "constructor."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13148
+#: doc/guix.texi:13193
 #, no-wrap
-msgid ""
-"{@code{dovecot-configuration} parameter} list-of-namespace-configuration "
-"namespaces"
+msgid "{@code{dovecot-configuration} parameter} list-of-namespace-configuration namespaces"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13151
+#: doc/guix.texi:13196
 msgid ""
-"List of namespaces.  Each item in the list is created by the "
-"@code{namespace-configuration} constructor."
+"List of namespaces.  Each item in the list is created by the @code{namespace-"
+"configuration} constructor."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13153
+#: doc/guix.texi:13198
 msgid "Available @code{namespace-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13154
+#: doc/guix.texi:13199
 #, no-wrap
 msgid "{@code{namespace-configuration} parameter} string name"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13156
+#: doc/guix.texi:13201
 msgid "Name for this namespace."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13158
+#: doc/guix.texi:13203
 #, no-wrap
 msgid "{@code{namespace-configuration} parameter} string type"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13161
+#: doc/guix.texi:13206
 msgid ""
 "Namespace type: @samp{private}, @samp{shared} or @samp{public}.  Defaults to "
 "@samp{\"private\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13163
+#: doc/guix.texi:13208
 #, no-wrap
 msgid "{@code{namespace-configuration} parameter} string separator"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13169
+#: doc/guix.texi:13214
 msgid ""
 "Hierarchy separator to use. You should use the same separator for all "
 "namespaces or some clients get confused.  @samp{/} is usually a good one.  "
@@ -28100,52 +29048,52 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13171
+#: doc/guix.texi:13216
 #, no-wrap
 msgid "{@code{namespace-configuration} parameter} string prefix"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13175
+#: doc/guix.texi:13220
 msgid ""
 "Prefix required to access this namespace.  This needs to be different for "
 "all namespaces. For example @samp{Public/}.  Defaults to @samp{\"\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13177
+#: doc/guix.texi:13222
 #, no-wrap
 msgid "{@code{namespace-configuration} parameter} string location"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13181
+#: doc/guix.texi:13226
 msgid ""
 "Physical location of the mailbox. This is in the same format as "
 "mail_location, which is also the default for it.  Defaults to @samp{\"\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13183
+#: doc/guix.texi:13228
 #, no-wrap
 msgid "{@code{namespace-configuration} parameter} boolean inbox?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13187
+#: doc/guix.texi:13232
 msgid ""
 "There can be only one INBOX, and this setting defines which namespace has "
 "it.  Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13189
+#: doc/guix.texi:13234
 #, no-wrap
 msgid "{@code{namespace-configuration} parameter} boolean hidden?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13197
+#: doc/guix.texi:13242
 msgid ""
 "If namespace is hidden, it's not advertised to clients via NAMESPACE "
 "extension. You'll most likely also want to set @samp{list? #f}.  This is "
@@ -28156,13 +29104,13 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13199
+#: doc/guix.texi:13244
 #, no-wrap
 msgid "{@code{namespace-configuration} parameter} boolean list?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13205
+#: doc/guix.texi:13250
 msgid ""
 "Show the mailboxes under this namespace with the LIST command. This makes "
 "the namespace visible for clients that do not support the NAMESPACE "
@@ -28171,13 +29119,13 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13207
+#: doc/guix.texi:13252
 #, no-wrap
 msgid "{@code{namespace-configuration} parameter} boolean subscriptions?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13212
+#: doc/guix.texi:13257
 msgid ""
 "Namespace handles its own subscriptions.  If set to @code{#f}, the parent "
 "namespace handles them.  The empty prefix should always have this as "
@@ -28185,57 +29133,53 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13214
+#: doc/guix.texi:13259
 #, no-wrap
-msgid ""
-"{@code{namespace-configuration} parameter} mailbox-configuration-list "
-"mailboxes"
+msgid "{@code{namespace-configuration} parameter} mailbox-configuration-list mailboxes"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13217
+#: doc/guix.texi:13262
 msgid "List of predefined mailboxes in this namespace.  Defaults to @samp{()}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13219
+#: doc/guix.texi:13264
 msgid "Available @code{mailbox-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13220
+#: doc/guix.texi:13265
 #, no-wrap
 msgid "{@code{mailbox-configuration} parameter} string name"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13222
+#: doc/guix.texi:13267
 msgid "Name for this mailbox."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13224
+#: doc/guix.texi:13269
 #, no-wrap
 msgid "{@code{mailbox-configuration} parameter} string auto"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13228
+#: doc/guix.texi:13273
 msgid ""
 "@samp{create} will automatically create this mailbox.  @samp{subscribe} will "
 "both create and subscribe to the mailbox.  Defaults to @samp{\"no\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13230
+#: doc/guix.texi:13275
 #, no-wrap
-msgid ""
-"{@code{mailbox-configuration} parameter} space-separated-string-list "
-"special-use"
+msgid "{@code{mailbox-configuration} parameter} space-separated-string-list special-use"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13235
+#: doc/guix.texi:13280
 msgid ""
 "List of IMAP @code{SPECIAL-USE} attributes as specified by RFC 6154.  Valid "
 "values are @code{\\All}, @code{\\Archive}, @code{\\Drafts}, "
@@ -28244,39 +29188,37 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13241
+#: doc/guix.texi:13286
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} file-name base-dir"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13244
+#: doc/guix.texi:13289
 msgid ""
-"Base directory where to store runtime data.  Defaults to "
-"@samp{\"/var/run/dovecot/\"}."
+"Base directory where to store runtime data.  Defaults to @samp{\"/var/run/"
+"dovecot/\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13246
+#: doc/guix.texi:13291
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string login-greeting"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13249
+#: doc/guix.texi:13294
 msgid "Greeting message for clients.  Defaults to @samp{\"Dovecot ready.\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13251
+#: doc/guix.texi:13296
 #, no-wrap
-msgid ""
-"{@code{dovecot-configuration} parameter} space-separated-string-list "
-"login-trusted-networks"
+msgid "{@code{dovecot-configuration} parameter} space-separated-string-list login-trusted-networks"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13258
+#: doc/guix.texi:13303
 msgid ""
 "List of trusted network ranges.  Connections from these IPs are allowed to "
 "override their IP addresses and ports (for logging and for authentication "
@@ -28286,41 +29228,40 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13260
+#: doc/guix.texi:13305
 #, no-wrap
+msgid "{@code{dovecot-configuration} parameter} space-separated-string-list login-access-sockets"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:13308
 msgid ""
-"{@code{dovecot-configuration} parameter} space-separated-string-list "
-"login-access-sockets"
+"List of login access check sockets (e.g. tcpwrap).  Defaults to @samp{()}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13263
-msgid "List of login access check sockets (e.g. tcpwrap).  Defaults to @samp{()}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:13265
+#: doc/guix.texi:13310
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean verbose-proctitle?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13271
+#: doc/guix.texi:13316
 msgid ""
 "Show more verbose process titles (in ps).  Currently shows user name and IP "
-"address.  Useful for seeing who is actually using the IMAP processes "
-"(e.g. shared mailboxes or if the same uid is used for multiple accounts).  "
+"address.  Useful for seeing who is actually using the IMAP processes (e.g. "
+"shared mailboxes or if the same uid is used for multiple accounts).  "
 "Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13273
+#: doc/guix.texi:13318
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean shutdown-clients?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13279
+#: doc/guix.texi:13324
 msgid ""
 "Should all processes be killed when Dovecot master process shuts down.  "
 "Setting this to @code{#f} means that Dovecot can be upgraded without forcing "
@@ -28329,43 +29270,39 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13281
+#: doc/guix.texi:13326
 #, no-wrap
-msgid ""
-"{@code{dovecot-configuration} parameter} non-negative-integer "
-"doveadm-worker-count"
+msgid "{@code{dovecot-configuration} parameter} non-negative-integer doveadm-worker-count"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13285
+#: doc/guix.texi:13330
 msgid ""
 "If non-zero, run mail commands via this many connections to doveadm server, "
 "instead of running them directly in the same process.  Defaults to @samp{0}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13287
+#: doc/guix.texi:13332
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string doveadm-socket-path"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13290
+#: doc/guix.texi:13335
 msgid ""
 "UNIX socket or host:port used for connecting to doveadm server.  Defaults to "
 "@samp{\"doveadm-server\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13292
+#: doc/guix.texi:13337
 #, no-wrap
-msgid ""
-"{@code{dovecot-configuration} parameter} space-separated-string-list "
-"import-environment"
+msgid "{@code{dovecot-configuration} parameter} space-separated-string-list import-environment"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13296
+#: doc/guix.texi:13341
 msgid ""
 "List of environment variables that are preserved on Dovecot startup and "
 "passed down to all of its child processes.  You can also give key=value "
@@ -28373,13 +29310,13 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13298
+#: doc/guix.texi:13343
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean disable-plaintext-auth?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13305
+#: doc/guix.texi:13350
 msgid ""
 "Disable LOGIN command and all other plaintext authentications unless SSL/TLS "
 "is used (LOGINDISABLED capability).  Note that if the remote IP matches the "
@@ -28389,15 +29326,13 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13307
+#: doc/guix.texi:13352
 #, no-wrap
-msgid ""
-"{@code{dovecot-configuration} parameter} non-negative-integer "
-"auth-cache-size"
+msgid "{@code{dovecot-configuration} parameter} non-negative-integer auth-cache-size"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13312
+#: doc/guix.texi:13357
 msgid ""
 "Authentication cache size (e.g. @samp{#e10e6}).  0 means it's disabled.  "
 "Note that bsdauth, PAM and vpopmail require @samp{cache-key} to be set for "
@@ -28405,13 +29340,13 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13314
+#: doc/guix.texi:13359
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string auth-cache-ttl"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13322
+#: doc/guix.texi:13367
 msgid ""
 "Time to live for cached data.  After TTL expires the cached record is no "
 "longer used, *except* if the main database lookup returns internal failure.  "
@@ -28422,28 +29357,26 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13324
+#: doc/guix.texi:13369
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string auth-cache-negative-ttl"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13328
+#: doc/guix.texi:13373
 msgid ""
 "TTL for negative hits (user not found, password mismatch).  0 disables "
 "caching them completely.  Defaults to @samp{\"1 hour\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13330
+#: doc/guix.texi:13375
 #, no-wrap
-msgid ""
-"{@code{dovecot-configuration} parameter} space-separated-string-list "
-"auth-realms"
+msgid "{@code{dovecot-configuration} parameter} space-separated-string-list auth-realms"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13336
+#: doc/guix.texi:13381
 msgid ""
 "List of realms for SASL authentication mechanisms that need them.  You can "
 "leave it empty if you don't want to support multiple realms.  Many clients "
@@ -28452,13 +29385,13 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13338
+#: doc/guix.texi:13383
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string auth-default-realm"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13343
+#: doc/guix.texi:13388
 msgid ""
 "Default realm/domain to use if none was specified.  This is used for both "
 "SASL realms and appending @@domain to username in plaintext logins.  "
@@ -28466,30 +29399,31 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13345
+#: doc/guix.texi:13390
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string auth-username-chars"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13352
+#: doc/guix.texi:13397
 msgid ""
 "List of allowed characters in username.  If the user-given username contains "
 "a character not listed in here, the login automatically fails.  This is just "
 "an extra check to make sure user can't exploit any potential quote escaping "
 "vulnerabilities with SQL/LDAP databases.  If you want to allow all "
 "characters, set this value to empty.  Defaults to "
-"@samp{\"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ01234567890.-_@@\"}."
+"@samp{\"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ01234567890.-_@@"
+"\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13354
+#: doc/guix.texi:13399
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string auth-username-translation"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13360
+#: doc/guix.texi:13405
 msgid ""
 "Username character translations before it's looked up from databases.  The "
 "value contains series of from -> to characters.  For example @samp{#@@/@@} "
@@ -28498,29 +29432,29 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13362
+#: doc/guix.texi:13407
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string auth-username-format"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13369
+#: doc/guix.texi:13414
 msgid ""
 "Username formatting before it's looked up from databases.  You can use the "
 "standard variables here, e.g. %Lu would lowercase the username, %n would "
 "drop away the domain if it was given, or @samp{%n-AT-%d} would change the "
-"@samp{@@} into @samp{-AT-}.  This translation is done after "
-"@samp{auth-username-translation} changes.  Defaults to @samp{\"%Lu\"}."
+"@samp{@@} into @samp{-AT-}.  This translation is done after @samp{auth-"
+"username-translation} changes.  Defaults to @samp{\"%Lu\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13371
+#: doc/guix.texi:13416
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string auth-master-user-separator"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13379
+#: doc/guix.texi:13424
 msgid ""
 "If you want to allow master users to log in by specifying the master "
 "username within the normal username string (i.e. not using SASL mechanism's "
@@ -28530,28 +29464,26 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13381
+#: doc/guix.texi:13426
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string auth-anonymous-username"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13385
+#: doc/guix.texi:13430
 msgid ""
 "Username to use for users logging in with ANONYMOUS SASL mechanism.  "
 "Defaults to @samp{\"anonymous\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13387
+#: doc/guix.texi:13432
 #, no-wrap
-msgid ""
-"{@code{dovecot-configuration} parameter} non-negative-integer "
-"auth-worker-max-count"
+msgid "{@code{dovecot-configuration} parameter} non-negative-integer auth-worker-max-count"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13392
+#: doc/guix.texi:13437
 msgid ""
 "Maximum number of dovecot-auth worker processes.  They're used to execute "
 "blocking passdb and userdb queries (e.g. MySQL and PAM).  They're "
@@ -28559,13 +29491,13 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13394
+#: doc/guix.texi:13439
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string auth-gssapi-hostname"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13399
+#: doc/guix.texi:13444
 msgid ""
 "Host name to use in GSSAPI principal names.  The default is to use the name "
 "returned by gethostname().  Use @samp{$ALL} (with quotes) to allow all "
@@ -28573,13 +29505,13 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13401
+#: doc/guix.texi:13446
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string auth-krb5-keytab"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13407
+#: doc/guix.texi:13452
 msgid ""
 "Kerberos keytab to use for the GSSAPI mechanism.  Will use the system "
 "default (usually @file{/etc/krb5.keytab}) if not specified.  You may need to "
@@ -28588,13 +29520,13 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13409
+#: doc/guix.texi:13454
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean auth-use-winbind?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13414
+#: doc/guix.texi:13459
 msgid ""
 "Do NTLM and GSS-SPNEGO authentication using Samba's winbind daemon and "
 "@samp{ntlm-auth} helper.  <doc/wiki/Authentication/Mechanisms/Winbind.txt>.  "
@@ -28602,56 +29534,52 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13416
+#: doc/guix.texi:13461
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} file-name auth-winbind-helper-path"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13419
+#: doc/guix.texi:13464
 msgid ""
-"Path for Samba's @samp{ntlm-auth} helper binary.  Defaults to "
-"@samp{\"/usr/bin/ntlm_auth\"}."
+"Path for Samba's @samp{ntlm-auth} helper binary.  Defaults to @samp{\"/usr/"
+"bin/ntlm_auth\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13421
+#: doc/guix.texi:13466
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string auth-failure-delay"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13424
+#: doc/guix.texi:13469
 msgid ""
 "Time to delay before replying to failed authentications.  Defaults to "
 "@samp{\"2 secs\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13426
+#: doc/guix.texi:13471
 #, no-wrap
-msgid ""
-"{@code{dovecot-configuration} parameter} boolean "
-"auth-ssl-require-client-cert?"
+msgid "{@code{dovecot-configuration} parameter} boolean auth-ssl-require-client-cert?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13430
+#: doc/guix.texi:13475
 msgid ""
 "Require a valid SSL client certificate or the authentication fails.  "
 "Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13432
+#: doc/guix.texi:13477
 #, no-wrap
-msgid ""
-"{@code{dovecot-configuration} parameter} boolean "
-"auth-ssl-username-from-cert?"
+msgid "{@code{dovecot-configuration} parameter} boolean auth-ssl-username-from-cert?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13437
+#: doc/guix.texi:13482
 msgid ""
 "Take the username from client's SSL certificate, using "
 "@code{X509_NAME_get_text_by_NID()} which returns the subject's DN's "
@@ -28659,33 +29587,29 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13439
+#: doc/guix.texi:13484
 #, no-wrap
-msgid ""
-"{@code{dovecot-configuration} parameter} space-separated-string-list "
-"auth-mechanisms"
+msgid "{@code{dovecot-configuration} parameter} space-separated-string-list auth-mechanisms"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13445
+#: doc/guix.texi:13490
 msgid ""
 "List of wanted authentication mechanisms.  Supported mechanisms are: "
 "@samp{plain}, @samp{login}, @samp{digest-md5}, @samp{cram-md5}, @samp{ntlm}, "
 "@samp{rpa}, @samp{apop}, @samp{anonymous}, @samp{gssapi}, @samp{otp}, "
-"@samp{skey}, and @samp{gss-spnego}.  NOTE: See also "
-"@samp{disable-plaintext-auth} setting."
+"@samp{skey}, and @samp{gss-spnego}.  NOTE: See also @samp{disable-plaintext-"
+"auth} setting."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13447
+#: doc/guix.texi:13492
 #, no-wrap
-msgid ""
-"{@code{dovecot-configuration} parameter} space-separated-string-list "
-"director-servers"
+msgid "{@code{dovecot-configuration} parameter} space-separated-string-list director-servers"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13452
+#: doc/guix.texi:13497
 msgid ""
 "List of IPs or hostnames to all director servers, including ourself.  Ports "
 "can be specified as ip:port.  The default port is the same as what director "
@@ -28693,41 +29617,39 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13454
+#: doc/guix.texi:13499
 #, no-wrap
-msgid ""
-"{@code{dovecot-configuration} parameter} space-separated-string-list "
-"director-mail-servers"
+msgid "{@code{dovecot-configuration} parameter} space-separated-string-list director-mail-servers"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13458
+#: doc/guix.texi:13503
 msgid ""
 "List of IPs or hostnames to all backend mail servers.  Ranges are allowed "
 "too, like 10.0.0.10-10.0.0.30.  Defaults to @samp{()}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13460
+#: doc/guix.texi:13505
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string director-user-expire"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13464
+#: doc/guix.texi:13509
 msgid ""
 "How long to redirect users to a specific server after it no longer has any "
 "connections.  Defaults to @samp{\"15 min\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13466
+#: doc/guix.texi:13511
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string director-username-hash"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13471
+#: doc/guix.texi:13516
 msgid ""
 "How the username is translated before being hashed.  Useful values include "
 "%Ln if user can log in with or without @@domain, %Ld if mailboxes are shared "
@@ -28735,52 +29657,52 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13473
+#: doc/guix.texi:13518
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string log-path"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13477
+#: doc/guix.texi:13522
 msgid ""
-"Log file to use for error messages.  @samp{syslog} logs to syslog, "
-"@samp{/dev/stderr} logs to stderr.  Defaults to @samp{\"syslog\"}."
+"Log file to use for error messages.  @samp{syslog} logs to syslog, @samp{/"
+"dev/stderr} logs to stderr.  Defaults to @samp{\"syslog\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13479
+#: doc/guix.texi:13524
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string info-log-path"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13483
+#: doc/guix.texi:13528
 msgid ""
 "Log file to use for informational messages.  Defaults to @samp{log-path}.  "
 "Defaults to @samp{\"\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13485
+#: doc/guix.texi:13530
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string debug-log-path"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13489
+#: doc/guix.texi:13534
 msgid ""
 "Log file to use for debug messages.  Defaults to @samp{info-log-path}.  "
 "Defaults to @samp{\"\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13491
+#: doc/guix.texi:13536
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string syslog-facility"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13496
+#: doc/guix.texi:13541
 msgid ""
 "Syslog facility to use if you're logging to syslog.  Usually if you don't "
 "want to use @samp{mail}, you'll use local0..local7.  Also other standard "
@@ -28788,55 +29710,55 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13498
+#: doc/guix.texi:13543
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean auth-verbose?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13502
+#: doc/guix.texi:13547
 msgid ""
 "Log unsuccessful authentication attempts and the reasons why they failed.  "
 "Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13504
+#: doc/guix.texi:13549
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean auth-verbose-passwords?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13511
+#: doc/guix.texi:13556
 msgid ""
 "In case of password mismatches, log the attempted password.  Valid values "
 "are no, plain and sha1.  sha1 can be useful for detecting brute force "
 "password attempts vs.  user simply trying the same password over and over "
-"again.  You can also truncate the value to n chars by appending \":n\" "
-"(e.g. sha1:6).  Defaults to @samp{#f}."
+"again.  You can also truncate the value to n chars by appending \":n\" (e.g. "
+"sha1:6).  Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13513
+#: doc/guix.texi:13558
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean auth-debug?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13517
+#: doc/guix.texi:13562
 msgid ""
 "Even more verbose logging for debugging purposes.  Shows for example SQL "
 "queries.  Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13519
+#: doc/guix.texi:13564
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean auth-debug-passwords?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13524
+#: doc/guix.texi:13569
 msgid ""
 "In case of password mismatches, log the passwords and used scheme so the "
 "problem can be debugged.  Enabling this also enables @samp{auth-debug}.  "
@@ -28844,168 +29766,166 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13526
+#: doc/guix.texi:13571
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean mail-debug?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13530
+#: doc/guix.texi:13575
 msgid ""
 "Enable mail process debugging.  This can help you figure out why Dovecot "
 "isn't finding your mails.  Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13532
+#: doc/guix.texi:13577
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean verbose-ssl?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13535
+#: doc/guix.texi:13580
 msgid "Show protocol level SSL errors.  Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13537
+#: doc/guix.texi:13582
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string log-timestamp"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13541
+#: doc/guix.texi:13586
 msgid ""
 "Prefix for each line written to log file.  % codes are in strftime(3) "
 "format.  Defaults to @samp{\"\\\"%b %d %H:%M:%S \\\"\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13543
+#: doc/guix.texi:13588
 #, no-wrap
-msgid ""
-"{@code{dovecot-configuration} parameter} space-separated-string-list "
-"login-log-format-elements"
+msgid "{@code{dovecot-configuration} parameter} space-separated-string-list login-log-format-elements"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13547
+#: doc/guix.texi:13592
 msgid ""
 "List of elements we want to log.  The elements which have a non-empty "
 "variable value are joined together to form a comma-separated string."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13549
+#: doc/guix.texi:13594
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string login-log-format"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13553
+#: doc/guix.texi:13598
 msgid ""
 "Login log format.  %s contains @samp{login-log-format-elements} string, %$ "
 "contains the data we want to log.  Defaults to @samp{\"%$: %s\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13555
+#: doc/guix.texi:13600
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string mail-log-prefix"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13559
+#: doc/guix.texi:13604
 msgid ""
 "Log prefix for mail processes.  See doc/wiki/Variables.txt for list of "
-"possible variables you can use.  Defaults to "
-"@samp{\"\\\"%s(%u)<%@{pid@}><%@{session@}>: \\\"\"}."
+"possible variables you can use.  Defaults to @samp{\"\\\"%s(%u)<%@{pid@}><"
+"%@{session@}>: \\\"\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13561
+#: doc/guix.texi:13606
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string deliver-log-format"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13563
+#: doc/guix.texi:13608
 msgid "Format to use for logging mail deliveries.  You can use variables:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13564
+#: doc/guix.texi:13609
 #, no-wrap
 msgid "%$"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13566
+#: doc/guix.texi:13611
 msgid "Delivery status message (e.g. @samp{saved to INBOX})"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13566
+#: doc/guix.texi:13611
 #, no-wrap
 msgid "%m"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13568
+#: doc/guix.texi:13613
 msgid "Message-ID"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13568 doc/guix.texi:14100
+#: doc/guix.texi:13613 doc/guix.texi:14145
 #, no-wrap
 msgid "%s"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13570
+#: doc/guix.texi:13615
 msgid "Subject"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13570
+#: doc/guix.texi:13615
 #, no-wrap
 msgid "%f"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13572
+#: doc/guix.texi:13617
 msgid "From address"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13574
+#: doc/guix.texi:13619
 msgid "Physical size"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13574
+#: doc/guix.texi:13619
 #, no-wrap
 msgid "%w"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13576
+#: doc/guix.texi:13621
 msgid "Virtual size."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13578
+#: doc/guix.texi:13623
 msgid "Defaults to @samp{\"msgid=%m: %$\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13580
+#: doc/guix.texi:13625
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string mail-location"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13585
+#: doc/guix.texi:13630
 msgid ""
 "Location for users' mailboxes.  The default is empty, which means that "
 "Dovecot tries to find the mailboxes automatically.  This won't work if the "
@@ -29014,7 +29934,7 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13591
+#: doc/guix.texi:13636
 msgid ""
 "If you're using mbox, giving a path to the INBOX file (e.g. /var/mail/%u) "
 "isn't enough.  You'll also need to tell Dovecot where the other mailboxes "
@@ -29023,79 +29943,79 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13593
+#: doc/guix.texi:13638
 msgid "There are a few special variables you can use, eg.:"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13597
+#: doc/guix.texi:13642
 msgid "username"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13597 doc/guix.texi:14096
+#: doc/guix.texi:13642 doc/guix.texi:14141
 #, no-wrap
 msgid "%n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13599
+#: doc/guix.texi:13644
 msgid "user part in user@@domain, same as %u if there's no domain"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13599
+#: doc/guix.texi:13644
 #, no-wrap
 msgid "%d"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13601
+#: doc/guix.texi:13646
 msgid "domain part in user@@domain, empty if there's no domain"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13601
+#: doc/guix.texi:13646
 #, no-wrap
 msgid "%h"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13603
+#: doc/guix.texi:13648
 msgid "home director"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13606
+#: doc/guix.texi:13651
 msgid "See doc/wiki/Variables.txt for full list.  Some examples:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13607
+#: doc/guix.texi:13652
 #, no-wrap
 msgid "maildir:~/Maildir"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13608
+#: doc/guix.texi:13653
 #, no-wrap
 msgid "mbox:~/mail:INBOX=/var/mail/%u"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13609
+#: doc/guix.texi:13654
 #, no-wrap
 msgid "mbox:/var/mail/%d/%1n/%n:INDEX=/var/indexes/%d/%1n/%"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13614
+#: doc/guix.texi:13659
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string mail-uid"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13619
+#: doc/guix.texi:13664
 msgid ""
 "System user and group used to access mails.  If you use multiple, userdb can "
 "override these by returning uid or gid fields.  You can use either numbers "
@@ -29103,19 +30023,19 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13621
+#: doc/guix.texi:13666
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string mail-gid"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13626
+#: doc/guix.texi:13671
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string mail-privileged-group"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13632
+#: doc/guix.texi:13677
 msgid ""
 "Group to enable temporarily for privileged operations.  Currently this is "
 "used only with INBOX when either its initial creation or dotlocking fails.  "
@@ -29124,13 +30044,13 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13634
+#: doc/guix.texi:13679
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string mail-access-groups"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13642
+#: doc/guix.texi:13687
 msgid ""
 "Grant access to these supplementary groups for mail processes.  Typically "
 "these are used to set up access to shared mailboxes.  Note that it may be "
@@ -29141,43 +30061,41 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13644
+#: doc/guix.texi:13689
 #, no-wrap
-msgid ""
-"{@code{dovecot-configuration} parameter} boolean "
-"mail-full-filesystem-access?"
+msgid "{@code{dovecot-configuration} parameter} boolean mail-full-filesystem-access?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13650
+#: doc/guix.texi:13695
 msgid ""
 "Allow full file system access to clients.  There's no access checks other "
 "than what the operating system does for the active UID/GID.  It works with "
-"both maildir and mboxes, allowing you to prefix mailboxes names with "
-"e.g. /path/ or ~user/.  Defaults to @samp{#f}."
+"both maildir and mboxes, allowing you to prefix mailboxes names with e.g. /"
+"path/ or ~user/.  Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13652
+#: doc/guix.texi:13697
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean mmap-disable?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13656
+#: doc/guix.texi:13701
 msgid ""
 "Don't use mmap() at all.  This is required if you store indexes to shared "
 "file systems (NFS or clustered file system).  Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13658
+#: doc/guix.texi:13703
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean dotlock-use-excl?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13663
+#: doc/guix.texi:13708
 msgid ""
 "Rely on @samp{O_EXCL} to work when creating dotlock files.  NFS supports "
 "@samp{O_EXCL} since version 3, so this should be safe to use nowadays by "
@@ -29185,50 +30103,50 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13665
+#: doc/guix.texi:13710
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string mail-fsync"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13667
+#: doc/guix.texi:13712
 msgid "When to use fsync() or fdatasync() calls:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13668
+#: doc/guix.texi:13713
 #, no-wrap
 msgid "optimized"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13670
+#: doc/guix.texi:13715
 msgid "Whenever necessary to avoid losing important data"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13672
+#: doc/guix.texi:13717
 msgid "Useful with e.g. NFS when write()s are delayed"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13674
+#: doc/guix.texi:13719
 msgid "Never use it (best performance, but crashes can lose data)."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13676
+#: doc/guix.texi:13721
 msgid "Defaults to @samp{\"optimized\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13678
+#: doc/guix.texi:13723
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean mail-nfs-storage?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13683
+#: doc/guix.texi:13728
 msgid ""
 "Mail storage exists in NFS.  Set this to yes to make Dovecot flush NFS "
 "caches whenever needed.  If you're using only a single mail server this "
@@ -29236,27 +30154,26 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13685
+#: doc/guix.texi:13730
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean mail-nfs-index?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13689
+#: doc/guix.texi:13734
 msgid ""
-"Mail index files also exist in NFS.  Setting this to yes requires "
-"@samp{mmap-disable? #t} and @samp{fsync-disable? #f}.  Defaults to "
-"@samp{#f}."
+"Mail index files also exist in NFS.  Setting this to yes requires @samp{mmap-"
+"disable? #t} and @samp{fsync-disable? #f}.  Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13691
+#: doc/guix.texi:13736
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string lock-method"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13697
+#: doc/guix.texi:13742
 msgid ""
 "Locking method for index files.  Alternatives are fcntl, flock and dotlock.  "
 "Dotlocking uses some tricks which may create more disk I/O than other "
@@ -29265,28 +30182,26 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13699
+#: doc/guix.texi:13744
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} file-name mail-temp-dir"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13703
+#: doc/guix.texi:13748
 msgid ""
 "Directory in which LDA/LMTP temporarily stores incoming mails >128 kB.  "
 "Defaults to @samp{\"/tmp\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13705
+#: doc/guix.texi:13750
 #, no-wrap
-msgid ""
-"{@code{dovecot-configuration} parameter} non-negative-integer "
-"first-valid-uid"
+msgid "{@code{dovecot-configuration} parameter} non-negative-integer first-valid-uid"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13711
+#: doc/guix.texi:13756
 msgid ""
 "Valid UID range for users.  This is mostly to make sure that users can't log "
 "in as daemons or other system users.  Note that denying root logins is "
@@ -29295,62 +30210,56 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13713
+#: doc/guix.texi:13758
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} non-negative-integer last-valid-uid"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13718
+#: doc/guix.texi:13763
 #, no-wrap
-msgid ""
-"{@code{dovecot-configuration} parameter} non-negative-integer "
-"first-valid-gid"
+msgid "{@code{dovecot-configuration} parameter} non-negative-integer first-valid-gid"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13723
+#: doc/guix.texi:13768
 msgid ""
 "Valid GID range for users.  Users having non-valid GID as primary group ID "
-"aren't allowed to log in.  If user belongs to supplementary groups with "
-"non-valid GIDs, those groups are not set.  Defaults to @samp{1}."
+"aren't allowed to log in.  If user belongs to supplementary groups with non-"
+"valid GIDs, those groups are not set.  Defaults to @samp{1}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13725
+#: doc/guix.texi:13770
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} non-negative-integer last-valid-gid"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13730
+#: doc/guix.texi:13775
 #, no-wrap
-msgid ""
-"{@code{dovecot-configuration} parameter} non-negative-integer "
-"mail-max-keyword-length"
+msgid "{@code{dovecot-configuration} parameter} non-negative-integer mail-max-keyword-length"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13734
+#: doc/guix.texi:13779
 msgid ""
 "Maximum allowed length for mail keyword name.  It's only forced when trying "
 "to create new keywords.  Defaults to @samp{50}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13736
+#: doc/guix.texi:13781
 #, no-wrap
-msgid ""
-"{@code{dovecot-configuration} parameter} colon-separated-file-name-list "
-"valid-chroot-dirs"
+msgid "{@code{dovecot-configuration} parameter} colon-separated-file-name-list valid-chroot-dirs"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13746
+#: doc/guix.texi:13791
 msgid ""
-"List of directories under which chrooting is allowed for mail processes "
-"(i.e. /var/mail will allow chrooting to /var/mail/foo/bar too).  This "
-"setting doesn't affect @samp{login-chroot} @samp{mail-chroot} or auth chroot "
+"List of directories under which chrooting is allowed for mail processes (i."
+"e. /var/mail will allow chrooting to /var/mail/foo/bar too).  This setting "
+"doesn't affect @samp{login-chroot} @samp{mail-chroot} or auth chroot "
 "settings.  If this setting is empty, \"/./\" in home dirs are ignored.  "
 "WARNING: Never add directories here which local users can modify, that may "
 "lead to root exploit.  Usually this should be done only if you don't allow "
@@ -29358,76 +30267,71 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13748
+#: doc/guix.texi:13793
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string mail-chroot"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13757
+#: doc/guix.texi:13802
 msgid ""
 "Default chroot directory for mail processes.  This can be overridden for "
-"specific users in user database by giving /./ in user's home directory "
-"(e.g. /home/./user chroots into /home).  Note that usually there is no real "
+"specific users in user database by giving /./ in user's home directory (e."
+"g. /home/./user chroots into /home).  Note that usually there is no real "
 "need to do chrooting, Dovecot doesn't allow users to access files outside "
 "their mail directory anyway.  If your home directories are prefixed with the "
-"chroot directory, append \"/.\" to @samp{mail-chroot}.  "
-"<doc/wiki/Chrooting.txt>.  Defaults to @samp{\"\"}."
+"chroot directory, append \"/.\" to @samp{mail-chroot}.  <doc/wiki/Chrooting."
+"txt>.  Defaults to @samp{\"\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13759
+#: doc/guix.texi:13804
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} file-name auth-socket-path"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13763
+#: doc/guix.texi:13808
 msgid ""
 "UNIX socket path to master authentication server to find users.  This is "
-"used by imap (for shared users) and lda.  Defaults to "
-"@samp{\"/var/run/dovecot/auth-userdb\"}."
+"used by imap (for shared users) and lda.  Defaults to @samp{\"/var/run/"
+"dovecot/auth-userdb\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13765
+#: doc/guix.texi:13810
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} file-name mail-plugin-dir"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13768
+#: doc/guix.texi:13813
 msgid ""
-"Directory where to look up mail plugins.  Defaults to "
-"@samp{\"/usr/lib/dovecot\"}."
+"Directory where to look up mail plugins.  Defaults to @samp{\"/usr/lib/"
+"dovecot\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13770
+#: doc/guix.texi:13815
 #, no-wrap
-msgid ""
-"{@code{dovecot-configuration} parameter} space-separated-string-list "
-"mail-plugins"
+msgid "{@code{dovecot-configuration} parameter} space-separated-string-list mail-plugins"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13774
+#: doc/guix.texi:13819
 msgid ""
 "List of plugins to load for all services.  Plugins specific to IMAP, LDA, "
-"etc. are added to this list in their own .conf files.  Defaults to "
-"@samp{()}."
+"etc. are added to this list in their own .conf files.  Defaults to @samp{()}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13776
+#: doc/guix.texi:13821
 #, no-wrap
-msgid ""
-"{@code{dovecot-configuration} parameter} non-negative-integer "
-"mail-cache-min-mail-count"
+msgid "{@code{dovecot-configuration} parameter} non-negative-integer mail-cache-min-mail-count"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13781
+#: doc/guix.texi:13826
 msgid ""
 "The minimum number of mails in a mailbox before updates are done to cache "
 "file.  This allows optimizing Dovecot's behavior to do less disk writes at "
@@ -29435,13 +30339,13 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13783
+#: doc/guix.texi:13828
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string mailbox-idle-check-interval"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13790
+#: doc/guix.texi:13835
 msgid ""
 "When IDLE command is running, mailbox is checked once in a while to see if "
 "there are any new mails or other changes.  This setting defines the minimum "
@@ -29451,13 +30355,13 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13792
+#: doc/guix.texi:13837
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean mail-save-crlf?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13799
+#: doc/guix.texi:13844
 msgid ""
 "Save mails with CR+LF instead of plain LF.  This makes sending those mails "
 "take less CPU, especially with sendfile() syscall with Linux and FreeBSD.  "
@@ -29467,31 +30371,29 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13801
+#: doc/guix.texi:13846
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean maildir-stat-dirs?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13809
+#: doc/guix.texi:13854
 msgid ""
 "By default LIST command returns all entries in maildir beginning with a "
 "dot.  Enabling this option makes Dovecot return only entries which are "
-"directories.  This is done by stat()ing each entry, so it causes more disk "
-"I/O.  (For systems setting struct @samp{dirent->d_type} this check is free "
-"and it's done always regardless of this setting).  Defaults to @samp{#f}."
+"directories.  This is done by stat()ing each entry, so it causes more disk I/"
+"O.  (For systems setting struct @samp{dirent->d_type} this check is free and "
+"it's done always regardless of this setting).  Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13811
+#: doc/guix.texi:13856
 #, no-wrap
-msgid ""
-"{@code{dovecot-configuration} parameter} boolean "
-"maildir-copy-with-hardlinks?"
+msgid "{@code{dovecot-configuration} parameter} boolean maildir-copy-with-hardlinks?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13816
+#: doc/guix.texi:13861
 msgid ""
 "When copying a message, do it with hard links whenever possible.  This makes "
 "the performance much better, and it's unlikely to have any side effects.  "
@@ -29499,13 +30401,13 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13818
+#: doc/guix.texi:13863
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean maildir-very-dirty-syncs?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13823
+#: doc/guix.texi:13868
 msgid ""
 "Assume Dovecot is the only MUA accessing Maildir: Scan cur/ directory only "
 "when its mtime changes unexpectedly or when we can't find the mail "
@@ -29513,26 +30415,25 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13825
+#: doc/guix.texi:13870
 #, no-wrap
-msgid ""
-"{@code{dovecot-configuration} parameter} space-separated-string-list "
-"mbox-read-locks"
+msgid "{@code{dovecot-configuration} parameter} space-separated-string-list mbox-read-locks"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13828
-msgid "Which locking methods to use for locking mbox.  There are four available:"
+#: doc/guix.texi:13873
+msgid ""
+"Which locking methods to use for locking mbox.  There are four available:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13830
+#: doc/guix.texi:13875
 #, no-wrap
 msgid "dotlock"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13834
+#: doc/guix.texi:13879
 msgid ""
 "Create <mailbox>.lock file.  This is the oldest and most NFS-safe solution.  "
 "If you want to use /var/mail/ like directory, the users will need write "
@@ -29540,48 +30441,48 @@ msgid ""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13834
+#: doc/guix.texi:13879
 #, no-wrap
 msgid "dotlock-try"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13837
+#: doc/guix.texi:13882
 msgid ""
 "Same as dotlock, but if it fails because of permissions or because there "
 "isn't enough disk space, just skip it."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13837
+#: doc/guix.texi:13882
 #, no-wrap
 msgid "fcntl"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13839
+#: doc/guix.texi:13884
 msgid "Use this if possible.  Works with NFS too if lockd is used."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13839
+#: doc/guix.texi:13884
 #, no-wrap
 msgid "flock"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13841 doc/guix.texi:13843
+#: doc/guix.texi:13886 doc/guix.texi:13888
 msgid "May not exist in all systems.  Doesn't work with NFS."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13841
+#: doc/guix.texi:13886
 #, no-wrap
 msgid "lockf"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13849
+#: doc/guix.texi:13894
 msgid ""
 "You can use multiple locking methods; if you do the order they're declared "
 "in is important to avoid deadlocks if other MTAs/MUAs are using multiple "
@@ -29590,47 +30491,45 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13851
+#: doc/guix.texi:13896
 #, no-wrap
-msgid ""
-"{@code{dovecot-configuration} parameter} space-separated-string-list "
-"mbox-write-locks"
+msgid "{@code{dovecot-configuration} parameter} space-separated-string-list mbox-write-locks"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13855
+#: doc/guix.texi:13900
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string mbox-lock-timeout"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13858
+#: doc/guix.texi:13903
 msgid ""
 "Maximum time to wait for lock (all of them) before aborting.  Defaults to "
 "@samp{\"5 mins\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13860
+#: doc/guix.texi:13905
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string mbox-dotlock-change-timeout"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13864
+#: doc/guix.texi:13909
 msgid ""
 "If dotlock exists but the mailbox isn't modified in any way, override the "
 "lock file after this much time.  Defaults to @samp{\"2 mins\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13866
+#: doc/guix.texi:13911
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean mbox-dirty-syncs?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13877
+#: doc/guix.texi:13922
 msgid ""
 "When mbox changes unexpectedly we have to fully read it to find out what "
 "changed.  If the mbox is large this can take a long time.  Since the change "
@@ -29644,13 +30543,13 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13879
+#: doc/guix.texi:13924
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean mbox-very-dirty-syncs?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13884
+#: doc/guix.texi:13929
 msgid ""
 "Like @samp{mbox-dirty-syncs}, but don't do full syncs even with SELECT, "
 "EXAMINE, EXPUNGE or CHECK commands.  If this is set, @samp{mbox-dirty-syncs} "
@@ -29658,13 +30557,13 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13886
+#: doc/guix.texi:13931
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean mbox-lazy-writes?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13892
+#: doc/guix.texi:13937
 msgid ""
 "Delay writing mbox headers until doing a full write sync (EXPUNGE and CHECK "
 "commands and when closing the mailbox).  This is especially useful for POP3 "
@@ -29673,15 +30572,13 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13894
+#: doc/guix.texi:13939
 #, no-wrap
-msgid ""
-"{@code{dovecot-configuration} parameter} non-negative-integer "
-"mbox-min-index-size"
+msgid "{@code{dovecot-configuration} parameter} non-negative-integer mbox-min-index-size"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13899
+#: doc/guix.texi:13944
 msgid ""
 "If mbox size is smaller than this (e.g. 100k), don't write index files.  If "
 "an index file already exists it's still read, just not updated.  Defaults to "
@@ -29689,26 +30586,25 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13901
+#: doc/guix.texi:13946
 #, no-wrap
+msgid "{@code{dovecot-configuration} parameter} non-negative-integer mdbox-rotate-size"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:13949
 msgid ""
-"{@code{dovecot-configuration} parameter} non-negative-integer "
-"mdbox-rotate-size"
+"Maximum dbox file size until it's rotated.  Defaults to @samp{10000000}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13904
-msgid "Maximum dbox file size until it's rotated.  Defaults to @samp{10000000}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:13906
+#: doc/guix.texi:13951
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string mdbox-rotate-interval"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13911
+#: doc/guix.texi:13956
 msgid ""
 "Maximum dbox file age until it's rotated.  Typically in days.  Day begins "
 "from midnight, so 1d = today, 2d = yesterday, etc.  0 = check disabled.  "
@@ -29716,13 +30612,13 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13913
+#: doc/guix.texi:13958
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean mdbox-preallocate-space?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13918
+#: doc/guix.texi:13963
 msgid ""
 "When creating new mdbox files, immediately preallocate their size to "
 "@samp{mdbox-rotate-size}.  This setting currently works only in Linux with "
@@ -29730,13 +30626,13 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13920
+#: doc/guix.texi:13965
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string mail-attachment-dir"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13924
+#: doc/guix.texi:13969
 msgid ""
 "sdbox and mdbox support saving mail attachments to external files, which "
 "also allows single instance storage for them.  Other backends don't support "
@@ -29744,27 +30640,26 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13926
-msgid "WARNING: This feature hasn't been tested much yet.  Use at your own risk."
+#: doc/guix.texi:13971
+msgid ""
+"WARNING: This feature hasn't been tested much yet.  Use at your own risk."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13929
+#: doc/guix.texi:13974
 msgid ""
 "Directory root where to store mail attachments.  Disabled, if empty.  "
 "Defaults to @samp{\"\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13931
+#: doc/guix.texi:13976
 #, no-wrap
-msgid ""
-"{@code{dovecot-configuration} parameter} non-negative-integer "
-"mail-attachment-min-size"
+msgid "{@code{dovecot-configuration} parameter} non-negative-integer mail-attachment-min-size"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13936
+#: doc/guix.texi:13981
 msgid ""
 "Attachments smaller than this aren't saved externally.  It's also possible "
 "to write a plugin to disable saving specific attachments externally.  "
@@ -29772,62 +30667,62 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13938
+#: doc/guix.texi:13983
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string mail-attachment-fs"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13940
+#: doc/guix.texi:13985
 msgid "File system backend to use for saving attachments:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13941
+#: doc/guix.texi:13986
 #, no-wrap
 msgid "posix"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13943
+#: doc/guix.texi:13988
 msgid "No SiS done by Dovecot (but this might help FS's own deduplication)"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13943
+#: doc/guix.texi:13988
 #, no-wrap
 msgid "sis posix"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13945
+#: doc/guix.texi:13990
 msgid "SiS with immediate byte-by-byte comparison during saving"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13945
+#: doc/guix.texi:13990
 #, no-wrap
 msgid "sis-queue posix"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13947
+#: doc/guix.texi:13992
 msgid "SiS with delayed comparison and deduplication."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13949
+#: doc/guix.texi:13994
 msgid "Defaults to @samp{\"sis posix\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13951
+#: doc/guix.texi:13996
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string mail-attachment-hash"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13957
+#: doc/guix.texi:14002
 msgid ""
 "Hash format to use in attachment filenames.  You can add any text and "
 "variables: @code{%@{md4@}}, @code{%@{md5@}}, @code{%@{sha1@}}, "
@@ -29837,36 +30732,30 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13959
+#: doc/guix.texi:14004
 #, no-wrap
-msgid ""
-"{@code{dovecot-configuration} parameter} non-negative-integer "
-"default-process-limit"
+msgid "{@code{dovecot-configuration} parameter} non-negative-integer default-process-limit"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13964
+#: doc/guix.texi:14009
 #, no-wrap
-msgid ""
-"{@code{dovecot-configuration} parameter} non-negative-integer "
-"default-client-limit"
+msgid "{@code{dovecot-configuration} parameter} non-negative-integer default-client-limit"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13967 doc/guix.texi:17873
+#: doc/guix.texi:14012 doc/guix.texi:17918
 msgid "Defaults to @samp{1000}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13969
+#: doc/guix.texi:14014
 #, no-wrap
-msgid ""
-"{@code{dovecot-configuration} parameter} non-negative-integer "
-"default-vsz-limit"
+msgid "{@code{dovecot-configuration} parameter} non-negative-integer default-vsz-limit"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13974
+#: doc/guix.texi:14019
 msgid ""
 "Default VSZ (virtual memory size) limit for service processes.  This is "
 "mainly intended to catch and kill processes that leak memory before they eat "
@@ -29874,13 +30763,13 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13976
+#: doc/guix.texi:14021
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string default-login-user"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13981
+#: doc/guix.texi:14026
 msgid ""
 "Login user is internally used by login processes.  This is the most "
 "untrusted user in Dovecot system.  It shouldn't have access to anything at "
@@ -29888,13 +30777,13 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13983
+#: doc/guix.texi:14028
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string default-internal-user"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13988
+#: doc/guix.texi:14033
 msgid ""
 "Internal user is used by unprivileged processes.  It should be separate from "
 "login user, so that login processes can't disturb other processes.  Defaults "
@@ -29902,39 +30791,39 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13990
+#: doc/guix.texi:14035
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string ssl?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13993
+#: doc/guix.texi:14038
 msgid ""
 "SSL/TLS support: yes, no, required.  <doc/wiki/SSL.txt>.  Defaults to "
 "@samp{\"required\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13995
+#: doc/guix.texi:14040
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string ssl-cert"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13998
+#: doc/guix.texi:14043
 msgid ""
-"PEM encoded X.509 SSL/TLS certificate (public key).  Defaults to "
-"@samp{\"</etc/dovecot/default.pem\"}."
+"PEM encoded X.509 SSL/TLS certificate (public key).  Defaults to @samp{\"</"
+"etc/dovecot/default.pem\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14000
+#: doc/guix.texi:14045
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string ssl-key"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14005
+#: doc/guix.texi:14050
 msgid ""
 "PEM encoded SSL/TLS private key.  The key is opened before dropping root "
 "privileges, so keep the key file unreadable by anyone but root.  Defaults to "
@@ -29942,13 +30831,13 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14007
+#: doc/guix.texi:14052
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string ssl-key-password"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14013
+#: doc/guix.texi:14058
 msgid ""
 "If key file is password protected, give the password here.  Alternatively "
 "give it when starting dovecot with -p parameter.  Since this file is often "
@@ -29957,41 +30846,41 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14015
+#: doc/guix.texi:14060
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string ssl-ca"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14021
+#: doc/guix.texi:14066
 msgid ""
 "PEM encoded trusted certificate authority.  Set this only if you intend to "
 "use @samp{ssl-verify-client-cert? #t}.  The file should contain the CA "
-"certificate(s) followed by the matching CRL(s).  (e.g. @samp{ssl-ca "
-"</etc/ssl/certs/ca.pem}).  Defaults to @samp{\"\"}."
+"certificate(s) followed by the matching CRL(s).  (e.g. @samp{ssl-ca </etc/"
+"ssl/certs/ca.pem}).  Defaults to @samp{\"\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14023
+#: doc/guix.texi:14068
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean ssl-require-crl?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14026
+#: doc/guix.texi:14071
 msgid ""
 "Require that CRL check succeeds for client certificates.  Defaults to "
 "@samp{#t}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14028
+#: doc/guix.texi:14073
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean ssl-verify-client-cert?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14032
+#: doc/guix.texi:14077
 msgid ""
 "Request client to send a certificate.  If you also want to require it, set "
 "@samp{auth-ssl-require-client-cert? #t} in auth section.  Defaults to "
@@ -29999,13 +30888,13 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14034
+#: doc/guix.texi:14079
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string ssl-cert-username-field"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14039
+#: doc/guix.texi:14084
 msgid ""
 "Which field from certificate to use for username.  commonName and "
 "x500UniqueIdentifier are the usual choices.  You'll also need to set "
@@ -30013,63 +30902,63 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14041
+#: doc/guix.texi:14086
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string ssl-min-protocol"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14044
+#: doc/guix.texi:14089
 msgid "Minimum SSL protocol version to accept.  Defaults to @samp{\"TLSv1\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14046
+#: doc/guix.texi:14091
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string ssl-cipher-list"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14049
+#: doc/guix.texi:14094
 msgid ""
-"SSL ciphers to use.  Defaults to "
-"@samp{\"ALL:!kRSA:!SRP:!kDHd:!DSS:!aNULL:!eNULL:!EXPORT:!DES:!3DES:!MD5:!PSK:!RC4:!ADH:!LOW@@STRENGTH\"}."
+"SSL ciphers to use.  Defaults to @samp{\"ALL:!kRSA:!SRP:!kDHd:!DSS:!aNULL:!"
+"eNULL:!EXPORT:!DES:!3DES:!MD5:!PSK:!RC4:!ADH:!LOW@@STRENGTH\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14051
+#: doc/guix.texi:14096
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string ssl-crypto-device"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14054
+#: doc/guix.texi:14099
 msgid ""
 "SSL crypto device to use, for valid values run \"openssl engine\".  Defaults "
 "to @samp{\"\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14056
+#: doc/guix.texi:14101
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string postmaster-address"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14060
+#: doc/guix.texi:14105
 msgid ""
 "Address to use when sending rejection mails.  %d expands to recipient "
 "domain.  Defaults to @samp{\"postmaster@@%d\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14062
+#: doc/guix.texi:14107
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string hostname"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14066
+#: doc/guix.texi:14111
 msgid ""
 "Hostname to use in various parts of sent mails (e.g. in Message-Id)  and in "
 "LMTP replies.  Default is the system's real hostname@@domain.  Defaults to "
@@ -30077,126 +30966,127 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14068
+#: doc/guix.texi:14113
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean quota-full-tempfail?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14072
+#: doc/guix.texi:14117
 msgid ""
 "If user is over quota, return with temporary failure instead of bouncing the "
 "mail.  Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14074
+#: doc/guix.texi:14119
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} file-name sendmail-path"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14077
-msgid "Binary to use for sending mails.  Defaults to @samp{\"/usr/sbin/sendmail\"}."
+#: doc/guix.texi:14122
+msgid ""
+"Binary to use for sending mails.  Defaults to @samp{\"/usr/sbin/sendmail\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14079
+#: doc/guix.texi:14124
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string submission-host"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14083
+#: doc/guix.texi:14128
 msgid ""
 "If non-empty, send mails via this SMTP host[:port] instead of sendmail.  "
 "Defaults to @samp{\"\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14085
+#: doc/guix.texi:14130
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string rejection-subject"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14089
+#: doc/guix.texi:14134
 msgid ""
 "Subject: header to use for rejection mails.  You can use the same variables "
 "as for @samp{rejection-reason} below.  Defaults to @samp{\"Rejected: %s\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14091
+#: doc/guix.texi:14136
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string rejection-reason"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14094
-msgid "Human readable error message for rejection mails.  You can use variables:"
+#: doc/guix.texi:14139
+msgid ""
+"Human readable error message for rejection mails.  You can use variables:"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14098
+#: doc/guix.texi:14143
 msgid "CRLF"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14098
+#: doc/guix.texi:14143
 #, no-wrap
 msgid "%r"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14100
+#: doc/guix.texi:14145
 msgid "reason"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14102
+#: doc/guix.texi:14147
 msgid "original subject"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14102
+#: doc/guix.texi:14147
 #, no-wrap
 msgid "%t"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14104
+#: doc/guix.texi:14149
 msgid "recipient"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14106
-msgid "Defaults to @samp{\"Your message to <%t> was automatically rejected:%n%r\"}."
+#: doc/guix.texi:14151
+msgid ""
+"Defaults to @samp{\"Your message to <%t> was automatically rejected:%n%r\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14108
+#: doc/guix.texi:14153
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string recipient-delimiter"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14112
+#: doc/guix.texi:14157
 msgid ""
 "Delimiter character between local-part and detail in email address.  "
 "Defaults to @samp{\"+\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14114
+#: doc/guix.texi:14159
 #, no-wrap
-msgid ""
-"{@code{dovecot-configuration} parameter} string "
-"lda-original-recipient-header"
+msgid "{@code{dovecot-configuration} parameter} string lda-original-recipient-header"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14120
+#: doc/guix.texi:14165
 msgid ""
 "Header where the original recipient address (SMTP's RCPT TO: address) is "
 "taken from if not available elsewhere.  With dovecot-lda -a parameter "
@@ -30205,41 +31095,39 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14122
+#: doc/guix.texi:14167
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean lda-mailbox-autocreate?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14126
+#: doc/guix.texi:14171
 msgid ""
 "Should saving a mail to a nonexistent mailbox automatically create it?.  "
 "Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14128
+#: doc/guix.texi:14173
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean lda-mailbox-autosubscribe?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14132
+#: doc/guix.texi:14177
 msgid ""
 "Should automatically created mailboxes be also automatically subscribed?.  "
 "Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14134
+#: doc/guix.texi:14179
 #, no-wrap
-msgid ""
-"{@code{dovecot-configuration} parameter} non-negative-integer "
-"imap-max-line-length"
+msgid "{@code{dovecot-configuration} parameter} non-negative-integer imap-max-line-length"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14140
+#: doc/guix.texi:14185
 msgid ""
 "Maximum IMAP command line length.  Some clients generate very long command "
 "lines with huge mailboxes, so you may need to raise this if you get \"Too "
@@ -30248,56 +31136,56 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14142
+#: doc/guix.texi:14187
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string imap-logout-format"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14144
+#: doc/guix.texi:14189
 msgid "IMAP logout format string:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14145
+#: doc/guix.texi:14190
 #, no-wrap
 msgid "%i"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14147
+#: doc/guix.texi:14192
 msgid "total number of bytes read from client"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14147
+#: doc/guix.texi:14192
 #, no-wrap
 msgid "%o"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14149
+#: doc/guix.texi:14194
 msgid "total number of bytes sent to client."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14152
+#: doc/guix.texi:14197
 msgid ""
 "See @file{doc/wiki/Variables.txt} for a list of all the variables you can "
-"use.  Defaults to @samp{\"in=%i out=%o deleted=%@{deleted@} "
-"expunged=%@{expunged@} trashed=%@{trashed@} hdr_count=%@{fetch_hdr_count@} "
-"hdr_bytes=%@{fetch_hdr_bytes@} body_count=%@{fetch_body_count@} "
-"body_bytes=%@{fetch_body_bytes@}\"}."
+"use.  Defaults to @samp{\"in=%i out=%o deleted=%@{deleted@} expunged="
+"%@{expunged@} trashed=%@{trashed@} hdr_count=%@{fetch_hdr_count@} hdr_bytes="
+"%@{fetch_hdr_bytes@} body_count=%@{fetch_body_count@} body_bytes="
+"%@{fetch_body_bytes@}\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14154
+#: doc/guix.texi:14199
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string imap-capability"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14158
+#: doc/guix.texi:14203
 msgid ""
 "Override the IMAP CAPABILITY response.  If the value begins with '+', add "
 "the given capabilities on top of the defaults (e.g. +XFOO XBAR).  Defaults "
@@ -30305,26 +31193,26 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14160
+#: doc/guix.texi:14205
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string imap-idle-notify-interval"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14164
+#: doc/guix.texi:14209
 msgid ""
 "How long to wait between \"OK Still here\" notifications when client is "
 "IDLEing.  Defaults to @samp{\"2 mins\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14166
+#: doc/guix.texi:14211
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string imap-id-send"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14172
+#: doc/guix.texi:14217
 msgid ""
 "ID field names and values to send to clients.  Using * as the value makes "
 "Dovecot use the default value.  The following fields have default values "
@@ -30333,39 +31221,37 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14174
+#: doc/guix.texi:14219
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string imap-id-log"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14177
+#: doc/guix.texi:14222
 msgid ""
 "ID fields sent by client to log.  * means everything.  Defaults to "
 "@samp{\"\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14179
+#: doc/guix.texi:14224
 #, no-wrap
-msgid ""
-"{@code{dovecot-configuration} parameter} space-separated-string-list "
-"imap-client-workarounds"
+msgid "{@code{dovecot-configuration} parameter} space-separated-string-list imap-client-workarounds"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14181
+#: doc/guix.texi:14226
 msgid "Workarounds for various client bugs:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14183
+#: doc/guix.texi:14228
 #, no-wrap
 msgid "delay-newmail"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14190
+#: doc/guix.texi:14235
 msgid ""
 "Send EXISTS/RECENT new mail notifications only when replying to NOOP and "
 "CHECK commands.  Some clients ignore them otherwise, for example OSX Mail "
@@ -30375,13 +31261,13 @@ msgid ""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14191
+#: doc/guix.texi:14236
 #, no-wrap
 msgid "tb-extra-mailbox-sep"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14195
+#: doc/guix.texi:14240
 msgid ""
 "Thunderbird gets somehow confused with LAYOUT=fs (mbox and dbox) and adds "
 "extra @samp{/} suffixes to mailbox names.  This option causes Dovecot to "
@@ -30389,13 +31275,13 @@ msgid ""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14196
+#: doc/guix.texi:14241
 #, no-wrap
 msgid "tb-lsub-flags"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14200
+#: doc/guix.texi:14245
 msgid ""
 "Show \\Noselect flags for LSUB replies with LAYOUT=fs (e.g. mbox).  This "
 "makes Thunderbird realize they aren't selectable and show them greyed out, "
@@ -30403,20 +31289,20 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14204
+#: doc/guix.texi:14249
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string imap-urlauth-host"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14207
+#: doc/guix.texi:14252
 msgid ""
 "Host allowed in URLAUTH URLs sent by client.  \"*\" allows all.  Defaults to "
 "@samp{\"\"}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:14215
+#: doc/guix.texi:14260
 msgid ""
 "Whew! Lots of configuration options.  The nice thing about it though is that "
 "GuixSD has a complete interface to Dovecot's configuration language.  This "
@@ -30426,7 +31312,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:14221
+#: doc/guix.texi:14266
 msgid ""
 "However, it could be that you just want to get a @code{dovecot.conf} up and "
 "running.  In that case, you can pass an @code{opaque-dovecot-configuration} "
@@ -30436,36 +31322,36 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:14223
+#: doc/guix.texi:14268
 msgid "Available @code{opaque-dovecot-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14224
+#: doc/guix.texi:14269
 #, no-wrap
 msgid "{@code{opaque-dovecot-configuration} parameter} package dovecot"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14228
+#: doc/guix.texi:14273
 #, no-wrap
 msgid "{@code{opaque-dovecot-configuration} parameter} string string"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14230
+#: doc/guix.texi:14275
 msgid "The contents of the @code{dovecot.conf}, as a string."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:14234
+#: doc/guix.texi:14279
 msgid ""
 "For example, if your @code{dovecot.conf} is just the empty string, you could "
 "instantiate a dovecot service like this:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:14239
+#: doc/guix.texi:14284
 #, no-wrap
 msgid ""
 "(dovecot-service #:config\n"
@@ -30474,19 +31360,19 @@ msgid ""
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:14241
+#: doc/guix.texi:14286
 #, no-wrap
 msgid "OpenSMTPD Service"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:14243
+#: doc/guix.texi:14288
 #, no-wrap
 msgid "{Scheme Variable} opensmtpd-service-type"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:14247
+#: doc/guix.texi:14292
 msgid ""
 "This is the type of the @uref{https://www.opensmtpd.org, OpenSMTPD} service, "
 "whose value should be an @code{opensmtpd-configuration} object as in this "
@@ -30494,7 +31380,7 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:14252
+#: doc/guix.texi:14297
 #, no-wrap
 msgid ""
 "(service opensmtpd-service-type\n"
@@ -30503,35 +31389,35 @@ msgid ""
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:14255
+#: doc/guix.texi:14300
 #, no-wrap
 msgid "{Data Type} opensmtpd-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:14257
+#: doc/guix.texi:14302
 msgid "Data type representing the configuration of opensmtpd."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14259
+#: doc/guix.texi:14304
 #, no-wrap
 msgid "@code{package} (default: @var{opensmtpd})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14261
+#: doc/guix.texi:14306
 msgid "Package object of the OpenSMTPD SMTP server."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14262
+#: doc/guix.texi:14307
 #, no-wrap
 msgid "@code{config-file} (default: @var{%default-opensmtpd-file})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14267
+#: doc/guix.texi:14312
 msgid ""
 "File-like object of the OpenSMTPD configuration file to use.  By default it "
 "listens on the loopback network interface, and allows for mail from users "
@@ -30540,37 +31426,37 @@ msgid ""
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:14271
+#: doc/guix.texi:14316
 #, no-wrap
 msgid "Exim Service"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:14273
+#: doc/guix.texi:14318
 #, no-wrap
 msgid "mail transfer agent (MTA)"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:14274
+#: doc/guix.texi:14319
 #, no-wrap
 msgid "MTA (mail transfer agent)"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:14275
+#: doc/guix.texi:14320
 #, no-wrap
 msgid "SMTP"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:14277
+#: doc/guix.texi:14322
 #, no-wrap
 msgid "{Scheme Variable} exim-service-type"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:14281
+#: doc/guix.texi:14326
 msgid ""
 "This is the type of the @uref{https://exim.org, Exim} mail transfer agent "
 "(MTA), whose value should be an @code{exim-configuration} object as in this "
@@ -30578,7 +31464,7 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:14286
+#: doc/guix.texi:14331
 #, no-wrap
 msgid ""
 "(service exim-service-type\n"
@@ -30587,43 +31473,37 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:14292
+#: doc/guix.texi:14337
 msgid ""
 "In order to use an @code{exim-service-type} service you must also have a "
-"@code{mail-aliases-service-type} service present in your "
-"@code{operating-system} (even if it has no aliases)."
+"@code{mail-aliases-service-type} service present in your @code{operating-"
+"system} (even if it has no aliases)."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:14293
+#: doc/guix.texi:14338
 #, no-wrap
 msgid "{Data Type} exim-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:14295
+#: doc/guix.texi:14340
 msgid "Data type representing the configuration of exim."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14297
+#: doc/guix.texi:14342
 #, no-wrap
 msgid "@code{package} (default: @var{exim})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14299
+#: doc/guix.texi:14344
 msgid "Package object of the Exim server."
 msgstr ""
 
-#. type: item
-#: doc/guix.texi:14300
-#, no-wrap
-msgid "@code{config-file} (default: @code{#f})"
-msgstr ""
-
 #. type: table
-#: doc/guix.texi:14306
+#: doc/guix.texi:14351
 msgid ""
 "File-like object of the Exim configuration file to use. If its value is "
 "@code{#f} then use the default configuration file from the package provided "
@@ -30632,38 +31512,38 @@ msgid ""
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:14310
+#: doc/guix.texi:14355
 #, no-wrap
 msgid "Mail Aliases Service"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:14312
+#: doc/guix.texi:14357
 #, no-wrap
 msgid "email aliases"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:14313
+#: doc/guix.texi:14358
 #, no-wrap
 msgid "aliases, for email addresses"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:14315
+#: doc/guix.texi:14360
 #, no-wrap
 msgid "{Scheme Variable} mail-aliases-service-type"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:14318
+#: doc/guix.texi:14363
 msgid ""
 "This is the type of the service which provides @code{/etc/aliases}, "
 "specifying how to deliver mail to users on this system."
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:14323
+#: doc/guix.texi:14368
 #, no-wrap
 msgid ""
 "(service mail-aliases-service-type\n"
@@ -30672,17 +31552,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:14331
+#: doc/guix.texi:14376
 msgid ""
 "The configuration for a @code{mail-aliases-service-type} service is an "
-"association list denoting how to deliver mail that comes to this "
-"system. Each entry is of the form @code{(alias addresses ...)}, with "
-"@code{alias} specifying the local alias and @code{addresses} specifying "
-"where to deliver this user's mail."
+"association list denoting how to deliver mail that comes to this system. "
+"Each entry is of the form @code{(alias addresses ...)}, with @code{alias} "
+"specifying the local alias and @code{addresses} specifying where to deliver "
+"this user's mail."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:14337
+#: doc/guix.texi:14382
 msgid ""
 "The aliases aren't required to exist as users on the local system. In the "
 "above example, there doesn't need to be a @code{postmaster} entry in the "
@@ -30692,44 +31572,44 @@ msgid ""
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:14341
+#: doc/guix.texi:14386
 #, no-wrap
 msgid "messaging"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:14342
+#: doc/guix.texi:14387
 #, no-wrap
 msgid "jabber"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:14343
+#: doc/guix.texi:14388
 #, no-wrap
 msgid "XMPP"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:14346
+#: doc/guix.texi:14391
 msgid ""
 "The @code{(gnu services messaging)} module provides Guix service definitions "
 "for messaging services: currently only Prosody is supported."
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:14347
+#: doc/guix.texi:14392
 #, no-wrap
 msgid "Prosody Service"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:14349
+#: doc/guix.texi:14394
 #, no-wrap
 msgid "{Scheme Variable} prosody-service-type"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:14353
+#: doc/guix.texi:14398
 msgid ""
 "This is the type for the @uref{https://prosody.im, Prosody XMPP "
 "communication server}.  Its value must be a @code{prosody-configuration} "
@@ -30737,13 +31617,12 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:14368
+#: doc/guix.texi:14413
 #, no-wrap
 msgid ""
 "(service prosody-service-type\n"
 "         (prosody-configuration\n"
-"          (modules-enabled (cons \"groups\" \"mam\" "
-"%default-modules-enabled))\n"
+"          (modules-enabled (cons \"groups\" \"mam\" %default-modules-enabled))\n"
 "          (int-components\n"
 "           (list\n"
 "            (int-component-configuration\n"
@@ -30757,12 +31636,12 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:14371
+#: doc/guix.texi:14416
 msgid "See below for details about @code{prosody-configuration}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:14377
+#: doc/guix.texi:14422
 msgid ""
 "By default, Prosody does not need much configuration.  Only one "
 "@code{virtualhosts} field is needed: it specifies the domain you wish "
@@ -30770,14 +31649,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:14380
+#: doc/guix.texi:14425
 msgid ""
 "You can perform various sanity checks on the generated configuration with "
 "the @code{prosodyctl check} command."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:14384
+#: doc/guix.texi:14429
 msgid ""
 "Prosodyctl will also help you to import certificates from the "
 "@code{letsencrypt} directory so that the @code{prosody} user can access "
@@ -30785,13 +31664,13 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:14387
+#: doc/guix.texi:14432
 #, no-wrap
 msgid "prosodyctl --root cert import /etc/letsencrypt/live\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:14394
+#: doc/guix.texi:14439
 msgid ""
 "The available configuration parameters follow.  Each parameter definition is "
 "preceded by its type; for example, @samp{string-list foo} indicates that the "
@@ -30801,7 +31680,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:14398
+#: doc/guix.texi:14443
 msgid ""
 "There is also a way to specify the configuration as a string, if you have an "
 "old @code{prosody.cfg.lua} file that you want to port over from some other "
@@ -30809,50 +31688,49 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:14401
+#: doc/guix.texi:14446
 msgid ""
-"The @code{file-object} type designates either a file-like object "
-"(@pxref{G-Expressions, file-like objects}) or a file name."
+"The @code{file-object} type designates either a file-like object (@pxref{G-"
+"Expressions, file-like objects}) or a file name."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:14411
+#: doc/guix.texi:14456
 msgid "Available @code{prosody-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14412
+#: doc/guix.texi:14457
 #, no-wrap
 msgid "{@code{prosody-configuration} parameter} package prosody"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14414
+#: doc/guix.texi:14459
 msgid "The Prosody package."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14416
+#: doc/guix.texi:14461
 #, no-wrap
 msgid "{@code{prosody-configuration} parameter} file-name data-path"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14420
+#: doc/guix.texi:14465
 msgid ""
-"Location of the Prosody data storage directory.  See "
-"@url{https://prosody.im/doc/configure}.  Defaults to "
-"@samp{\"/var/lib/prosody\"}."
+"Location of the Prosody data storage directory.  See @url{https://prosody.im/"
+"doc/configure}.  Defaults to @samp{\"/var/lib/prosody\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14422
+#: doc/guix.texi:14467
 #, no-wrap
 msgid "{@code{prosody-configuration} parameter} file-object-list plugin-paths"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14426
+#: doc/guix.texi:14471
 msgid ""
 "Additional plugin directories.  They are searched in all the specified paths "
 "in order.  See @url{https://prosody.im/doc/plugins_directory}.  Defaults to "
@@ -30860,75 +31738,74 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14428
+#: doc/guix.texi:14473
 #, no-wrap
 msgid "{@code{prosody-configuration} parameter} file-name certificates"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14433
+#: doc/guix.texi:14478
 msgid ""
 "Every virtual host and component needs a certificate so that clients and "
 "servers can securely verify its identity.  Prosody will automatically load "
-"certificates/keys from the directory specified here.  Defaults to "
-"@samp{\"/etc/prosody/certs\"}."
+"certificates/keys from the directory specified here.  Defaults to @samp{\"/"
+"etc/prosody/certs\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14435
+#: doc/guix.texi:14480
 #, no-wrap
 msgid "{@code{prosody-configuration} parameter} string-list admins"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14441
+#: doc/guix.texi:14486
 msgid ""
 "This is a list of accounts that are admins for the server.  Note that you "
-"must create the accounts separately.  See "
-"@url{https://prosody.im/doc/admins} and "
-"@url{https://prosody.im/doc/creating_accounts}.  Example: @code{(admins "
-"'(\"user1@@example.com\" \"user2@@example.net\"))} Defaults to @samp{()}."
+"must create the accounts separately.  See @url{https://prosody.im/doc/"
+"admins} and @url{https://prosody.im/doc/creating_accounts}.  Example: "
+"@code{(admins '(\"user1@@example.com\" \"user2@@example.net\"))} Defaults to "
+"@samp{()}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14443
+#: doc/guix.texi:14488
 #, no-wrap
 msgid "{@code{prosody-configuration} parameter} boolean use-libevent?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14447
+#: doc/guix.texi:14492
 msgid ""
 "Enable use of libevent for better performance under high load.  See "
 "@url{https://prosody.im/doc/libevent}.  Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14449
+#: doc/guix.texi:14494
 #, no-wrap
 msgid "{@code{prosody-configuration} parameter} module-list modules-enabled"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14455
+#: doc/guix.texi:14500
 msgid ""
 "This is the list of modules Prosody will load on startup.  It looks for "
 "@code{mod_modulename.lua} in the plugins folder, so make sure that exists "
-"too.  Documentation on modules can be found at: "
-"@url{https://prosody.im/doc/modules}.  Defaults to @samp{(\"roster\" "
-"\"saslauth\" \"tls\" \"dialback\" \"disco\" \"carbons\" \"private\" "
-"\"blocklist\" \"vcard\" \"version\" \"uptime\" \"time\" \"ping\" \"pep\" "
-"\"register\" \"admin_adhoc\")}."
+"too.  Documentation on modules can be found at: @url{https://prosody.im/doc/"
+"modules}.  Defaults to @samp{(\"roster\" \"saslauth\" \"tls\" \"dialback\" "
+"\"disco\" \"carbons\" \"private\" \"blocklist\" \"vcard\" \"version\" "
+"\"uptime\" \"time\" \"ping\" \"pep\" \"register\" \"admin_adhoc\")}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14457
+#: doc/guix.texi:14502
 #, no-wrap
 msgid "{@code{prosody-configuration} parameter} string-list modules-disabled"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14461
+#: doc/guix.texi:14506
 msgid ""
 "@samp{\"offline\"}, @samp{\"c2s\"} and @samp{\"s2s\"} are auto-loaded, but "
 "should you want to disable them then add them to this list.  Defaults to "
@@ -30936,41 +31813,41 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14463
+#: doc/guix.texi:14508
 #, no-wrap
 msgid "{@code{prosody-configuration} parameter} file-object groups-file"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14468
+#: doc/guix.texi:14513
 msgid ""
 "Path to a text file where the shared groups are defined.  If this path is "
-"empty then @samp{mod_groups} does nothing.  See "
-"@url{https://prosody.im/doc/modules/mod_groups}.  Defaults to "
-"@samp{\"/var/lib/prosody/sharedgroups.txt\"}."
+"empty then @samp{mod_groups} does nothing.  See @url{https://prosody.im/doc/"
+"modules/mod_groups}.  Defaults to @samp{\"/var/lib/prosody/sharedgroups.txt"
+"\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14470
+#: doc/guix.texi:14515
 #, no-wrap
 msgid "{@code{prosody-configuration} parameter} boolean allow-registration?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14474
+#: doc/guix.texi:14519
 msgid ""
-"Disable account creation by default, for security.  See "
-"@url{https://prosody.im/doc/creating_accounts}.  Defaults to @samp{#f}."
+"Disable account creation by default, for security.  See @url{https://prosody."
+"im/doc/creating_accounts}.  Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14476
+#: doc/guix.texi:14521
 #, no-wrap
 msgid "{@code{prosody-configuration} parameter} maybe-ssl-configuration ssl"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14481
+#: doc/guix.texi:14526
 msgid ""
 "These are the SSL/TLS-related settings.  Most of them are disabled so to use "
 "Prosody's defaults.  If you do not completely understand these options, do "
@@ -30979,51 +31856,51 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14483
+#: doc/guix.texi:14528
 msgid "Available @code{ssl-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14484
+#: doc/guix.texi:14529
 #, no-wrap
 msgid "{@code{ssl-configuration} parameter} maybe-string protocol"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14486
+#: doc/guix.texi:14531
 msgid "This determines what handshake to use."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14488
+#: doc/guix.texi:14533
 #, no-wrap
 msgid "{@code{ssl-configuration} parameter} maybe-file-name key"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14490
+#: doc/guix.texi:14535
 msgid "Path to your private key file."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14492
+#: doc/guix.texi:14537
 #, no-wrap
 msgid "{@code{ssl-configuration} parameter} maybe-file-name certificate"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14494
+#: doc/guix.texi:14539
 msgid "Path to your certificate file."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14496
+#: doc/guix.texi:14541
 #, no-wrap
 msgid "{@code{ssl-configuration} parameter} file-object capath"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14500
+#: doc/guix.texi:14545
 msgid ""
 "Path to directory containing root certificates that you wish Prosody to "
 "trust when verifying the certificates of remote servers.  Defaults to "
@@ -31031,39 +31908,39 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14502
+#: doc/guix.texi:14547
 #, no-wrap
 msgid "{@code{ssl-configuration} parameter} maybe-file-object cafile"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14505
+#: doc/guix.texi:14550
 msgid ""
 "Path to a file containing root certificates that you wish Prosody to trust.  "
 "Similar to @code{capath} but with all certificates concatenated together."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14507
+#: doc/guix.texi:14552
 #, no-wrap
 msgid "{@code{ssl-configuration} parameter} maybe-string-list verify"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14510
+#: doc/guix.texi:14555
 msgid ""
 "A list of verification options (these mostly map to OpenSSL's "
 "@code{set_verify()} flags)."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14512
+#: doc/guix.texi:14557
 #, no-wrap
 msgid "{@code{ssl-configuration} parameter} maybe-string-list options"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14516
+#: doc/guix.texi:14561
 msgid ""
 "A list of general options relating to SSL/TLS.  These map to OpenSSL's "
 "@code{set_options()}.  For a full list of options available in LuaSec, see "
@@ -31071,143 +31948,142 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14518
+#: doc/guix.texi:14563
 #, no-wrap
 msgid "{@code{ssl-configuration} parameter} maybe-non-negative-integer depth"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14521
+#: doc/guix.texi:14566
 msgid ""
 "How long a chain of certificate authorities to check when looking for a "
 "trusted root certificate."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14523
+#: doc/guix.texi:14568
 #, no-wrap
 msgid "{@code{ssl-configuration} parameter} maybe-string ciphers"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14526
+#: doc/guix.texi:14571
 msgid ""
 "An OpenSSL cipher string.  This selects what ciphers Prosody will offer to "
 "clients, and in what order."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14528
+#: doc/guix.texi:14573
 #, no-wrap
 msgid "{@code{ssl-configuration} parameter} maybe-file-name dhparam"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14532
+#: doc/guix.texi:14577
 msgid ""
 "A path to a file containing parameters for Diffie-Hellman key exchange.  You "
-"can create such a file with: @code{openssl dhparam -out "
-"/etc/prosody/certs/dh-2048.pem 2048}"
+"can create such a file with: @code{openssl dhparam -out /etc/prosody/certs/"
+"dh-2048.pem 2048}"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14534
+#: doc/guix.texi:14579
 #, no-wrap
 msgid "{@code{ssl-configuration} parameter} maybe-string curve"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14537
+#: doc/guix.texi:14582
 msgid ""
 "Curve for Elliptic curve Diffie-Hellman. Prosody's default is "
 "@samp{\"secp384r1\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14539
+#: doc/guix.texi:14584
 #, no-wrap
 msgid "{@code{ssl-configuration} parameter} maybe-string-list verifyext"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14541
+#: doc/guix.texi:14586
 msgid "A list of \"extra\" verification options."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14543
+#: doc/guix.texi:14588
 #, no-wrap
 msgid "{@code{ssl-configuration} parameter} maybe-string password"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14545
+#: doc/guix.texi:14590
 msgid "Password for encrypted private keys."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14549
+#: doc/guix.texi:14594
 #, no-wrap
 msgid "{@code{prosody-configuration} parameter} boolean c2s-require-encryption?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14553
+#: doc/guix.texi:14598
 msgid ""
 "Whether to force all client-to-server connections to be encrypted or not.  "
 "See @url{https://prosody.im/doc/modules/mod_tls}.  Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14555
+#: doc/guix.texi:14600
 #, no-wrap
 msgid "{@code{prosody-configuration} parameter} string-list disable-sasl-mechanisms"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14559
+#: doc/guix.texi:14604
 msgid ""
-"Set of mechanisms that will never be offered.  See "
-"@url{https://prosody.im/doc/modules/mod_saslauth}.  Defaults to "
-"@samp{(\"DIGEST-MD5\")}."
+"Set of mechanisms that will never be offered.  See @url{https://prosody.im/"
+"doc/modules/mod_saslauth}.  Defaults to @samp{(\"DIGEST-MD5\")}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14561
+#: doc/guix.texi:14606
 #, no-wrap
 msgid "{@code{prosody-configuration} parameter} boolean s2s-require-encryption?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14565
+#: doc/guix.texi:14610
 msgid ""
 "Whether to force all server-to-server connections to be encrypted or not.  "
 "See @url{https://prosody.im/doc/modules/mod_tls}.  Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14567
+#: doc/guix.texi:14612
 #, no-wrap
 msgid "{@code{prosody-configuration} parameter} boolean s2s-secure-auth?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14573
+#: doc/guix.texi:14618
 msgid ""
 "Whether to require encryption and certificate authentication.  This provides "
 "ideal security, but requires servers you communicate with to support "
-"encryption AND present valid, trusted certificates.  See "
-"@url{https://prosody.im/doc/s2s#security}.  Defaults to @samp{#f}."
+"encryption AND present valid, trusted certificates.  See @url{https://"
+"prosody.im/doc/s2s#security}.  Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14575
+#: doc/guix.texi:14620
 #, no-wrap
 msgid "{@code{prosody-configuration} parameter} string-list s2s-insecure-domains"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14581
+#: doc/guix.texi:14626
 msgid ""
 "Many servers don't support encryption or have invalid or self-signed "
 "certificates.  You can list domains here that will not be required to "
@@ -31216,13 +32092,13 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14583
+#: doc/guix.texi:14628
 #, no-wrap
 msgid "{@code{prosody-configuration} parameter} string-list s2s-secure-domains"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14588
+#: doc/guix.texi:14633
 msgid ""
 "Even if you leave @code{s2s-secure-auth?} disabled, you can still require "
 "valid certificates for some domains by specifying a list here.  See "
@@ -31230,31 +32106,30 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14590
+#: doc/guix.texi:14635
 #, no-wrap
 msgid "{@code{prosody-configuration} parameter} string authentication"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14598
+#: doc/guix.texi:14643
 msgid ""
 "Select the authentication backend to use.  The default provider stores "
 "passwords in plaintext and uses Prosody's configured data storage to store "
 "the authentication data.  If you do not trust your server please see "
 "@url{https://prosody.im/doc/modules/mod_auth_internal_hashed} for "
-"information about using the hashed backend.  See also "
-"@url{https://prosody.im/doc/authentication} Defaults to "
-"@samp{\"internal_plain\"}."
+"information about using the hashed backend.  See also @url{https://prosody."
+"im/doc/authentication} Defaults to @samp{\"internal_plain\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14600
+#: doc/guix.texi:14645
 #, no-wrap
 msgid "{@code{prosody-configuration} parameter} maybe-string log"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14604
+#: doc/guix.texi:14649
 msgid ""
 "Set logging options.  Advanced logging configuration is not yet supported by "
 "the GuixSD Prosody Service.  See @url{https://prosody.im/doc/logging}.  "
@@ -31262,66 +32137,61 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14606
+#: doc/guix.texi:14651
 #, no-wrap
 msgid "{@code{prosody-configuration} parameter} file-name pidfile"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14609
+#: doc/guix.texi:14654
 msgid ""
 "File to write pid in.  See @url{https://prosody.im/doc/modules/mod_posix}.  "
 "Defaults to @samp{\"/var/run/prosody/prosody.pid\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14611
+#: doc/guix.texi:14656
 #, no-wrap
-msgid ""
-"{@code{prosody-configuration} parameter} maybe-non-negative-integer "
-"http-max-content-size"
+msgid "{@code{prosody-configuration} parameter} maybe-non-negative-integer http-max-content-size"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14613
+#: doc/guix.texi:14658
 msgid "Maximum allowed size of the HTTP body (in bytes)."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14615
+#: doc/guix.texi:14660
 #, no-wrap
 msgid "{@code{prosody-configuration} parameter} maybe-string http-external-url"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14620
+#: doc/guix.texi:14665
 msgid ""
 "Some modules expose their own URL in various ways.  This URL is built from "
 "the protocol, host and port used.  If Prosody sits behind a proxy, the "
-"public URL will be @code{http-external-url} instead.  See "
-"@url{https://prosody.im/doc/http#external_url}."
+"public URL will be @code{http-external-url} instead.  See @url{https://"
+"prosody.im/doc/http#external_url}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14622
+#: doc/guix.texi:14667
 #, no-wrap
-msgid ""
-"{@code{prosody-configuration} parameter} virtualhost-configuration-list "
-"virtualhosts"
+msgid "{@code{prosody-configuration} parameter} virtualhost-configuration-list virtualhosts"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14627
+#: doc/guix.texi:14672
 msgid ""
 "A host in Prosody is a domain on which user accounts can be created.  For "
-"example if you want your users to have addresses like "
-"@samp{\"john.smith@@example.com\"} then you need to add a host "
-"@samp{\"example.com\"}.  All options in this list will apply only to this "
-"host."
+"example if you want your users to have addresses like @samp{\"john."
+"smith@@example.com\"} then you need to add a host @samp{\"example.com\"}.  "
+"All options in this list will apply only to this host."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14633
+#: doc/guix.texi:14678
 msgid ""
 "Note: the name \"virtual\" host is used in configuration to avoid confusion "
 "with the actual physical host that Prosody is installed on.  A single "
@@ -31331,58 +32201,55 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14635
+#: doc/guix.texi:14680
 msgid "See @url{https://prosody.im/doc/configure#virtual_host_settings}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14637
+#: doc/guix.texi:14682
 msgid "Available @code{virtualhost-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14639 doc/guix.texi:14661 doc/guix.texi:14714
+#: doc/guix.texi:14684 doc/guix.texi:14706 doc/guix.texi:14759
 msgid ""
-"all these @code{prosody-configuration} fields: @code{admins}, "
-"@code{use-libevent?}, @code{modules-enabled}, @code{modules-disabled}, "
-"@code{groups-file}, @code{allow-registration?}, @code{ssl}, "
-"@code{c2s-require-encryption?}, @code{disable-sasl-mechanisms}, "
-"@code{s2s-require-encryption?}, @code{s2s-secure-auth?}, "
-"@code{s2s-insecure-domains}, @code{s2s-secure-domains}, "
-"@code{authentication}, @code{log}, @code{http-max-content-size}, "
-"@code{http-external-url}, @code{raw-content}, plus:"
+"all these @code{prosody-configuration} fields: @code{admins}, @code{use-"
+"libevent?}, @code{modules-enabled}, @code{modules-disabled}, @code{groups-"
+"file}, @code{allow-registration?}, @code{ssl}, @code{c2s-require-"
+"encryption?}, @code{disable-sasl-mechanisms}, @code{s2s-require-"
+"encryption?}, @code{s2s-secure-auth?}, @code{s2s-insecure-domains}, "
+"@code{s2s-secure-domains}, @code{authentication}, @code{log}, @code{http-max-"
+"content-size}, @code{http-external-url}, @code{raw-content}, plus:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14639
+#: doc/guix.texi:14684
 #, no-wrap
 msgid "{@code{virtualhost-configuration} parameter} string domain"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14641
+#: doc/guix.texi:14686
 msgid "Domain you wish Prosody to serve."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14645
+#: doc/guix.texi:14690
 #, no-wrap
-msgid ""
-"{@code{prosody-configuration} parameter} int-component-configuration-list "
-"int-components"
+msgid "{@code{prosody-configuration} parameter} int-component-configuration-list int-components"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14650
+#: doc/guix.texi:14695
 msgid ""
 "Components are extra services on a server which are available to clients, "
-"usually on a subdomain of the main server (such as "
-"@samp{\"mycomponent.example.com\"}).  Example components might be chatroom "
-"servers, user directories, or gateways to other protocols."
+"usually on a subdomain of the main server (such as @samp{\"mycomponent."
+"example.com\"}).  Example components might be chatroom servers, user "
+"directories, or gateways to other protocols."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14654
+#: doc/guix.texi:14699
 msgid ""
 "Internal components are implemented with Prosody-specific plugins.  To add "
 "an internal component, you simply fill the hostname field, and the plugin "
@@ -31390,128 +32257,119 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14657
+#: doc/guix.texi:14702
 msgid "See @url{https://prosody.im/doc/components}.  Defaults to @samp{()}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14659
+#: doc/guix.texi:14704
 msgid "Available @code{int-component-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14661
+#: doc/guix.texi:14706
 #, no-wrap
 msgid "{@code{int-component-configuration} parameter} string hostname"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14663 doc/guix.texi:14720
+#: doc/guix.texi:14708 doc/guix.texi:14765
 msgid "Hostname of the component."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14665
+#: doc/guix.texi:14710
 #, no-wrap
 msgid "{@code{int-component-configuration} parameter} string plugin"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14667
+#: doc/guix.texi:14712
 msgid "Plugin you wish to use for the component."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14669
+#: doc/guix.texi:14714
 #, no-wrap
-msgid ""
-"{@code{int-component-configuration} parameter} maybe-mod-muc-configuration "
-"mod-muc"
+msgid "{@code{int-component-configuration} parameter} maybe-mod-muc-configuration mod-muc"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14672
+#: doc/guix.texi:14717
 msgid ""
 "Multi-user chat (MUC) is Prosody's module for allowing you to create hosted "
 "chatrooms/conferences for XMPP users."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14676
+#: doc/guix.texi:14721
 msgid ""
 "General information on setting up and using multi-user chatrooms can be "
-"found in the \"Chatrooms\" documentation "
-"(@url{https://prosody.im/doc/chatrooms}), which you should read if you are "
-"new to XMPP chatrooms."
+"found in the \"Chatrooms\" documentation (@url{https://prosody.im/doc/"
+"chatrooms}), which you should read if you are new to XMPP chatrooms."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14678
+#: doc/guix.texi:14723
 msgid "See also @url{https://prosody.im/doc/modules/mod_muc}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14680
+#: doc/guix.texi:14725
 msgid "Available @code{mod-muc-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14681
+#: doc/guix.texi:14726
 #, no-wrap
 msgid "{@code{mod-muc-configuration} parameter} string name"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14684
+#: doc/guix.texi:14729
 msgid ""
 "The name to return in service discovery responses.  Defaults to "
 "@samp{\"Prosody Chatrooms\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14686
+#: doc/guix.texi:14731
 #, no-wrap
-msgid ""
-"{@code{mod-muc-configuration} parameter} string-or-boolean "
-"restrict-room-creation"
+msgid "{@code{mod-muc-configuration} parameter} string-or-boolean restrict-room-creation"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14693
+#: doc/guix.texi:14738
 msgid ""
 "If @samp{#t}, this will only allow admins to create new chatrooms.  "
 "Otherwise anyone can create a room.  The value @samp{\"local\"} restricts "
-"room creation to users on the service's parent domain.  "
-"E.g. @samp{user@@example.com} can create rooms on @samp{rooms.example.com}.  "
-"The value @samp{\"admin\"} restricts to service administrators only.  "
-"Defaults to @samp{#f}."
+"room creation to users on the service's parent domain.  E.g. "
+"@samp{user@@example.com} can create rooms on @samp{rooms.example.com}.  The "
+"value @samp{\"admin\"} restricts to service administrators only.  Defaults "
+"to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14695
+#: doc/guix.texi:14740
 #, no-wrap
-msgid ""
-"{@code{mod-muc-configuration} parameter} non-negative-integer "
-"max-history-messages"
+msgid "{@code{mod-muc-configuration} parameter} non-negative-integer max-history-messages"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14699
+#: doc/guix.texi:14744
 msgid ""
 "Maximum number of history messages that will be sent to the member that has "
 "just joined the room.  Defaults to @samp{20}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14705
+#: doc/guix.texi:14750
 #, no-wrap
-msgid ""
-"{@code{prosody-configuration} parameter} ext-component-configuration-list "
-"ext-components"
+msgid "{@code{prosody-configuration} parameter} ext-component-configuration-list ext-components"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14710
+#: doc/guix.texi:14755
 msgid ""
 "External components use XEP-0114, which most standalone components support.  "
 "To add an external component, you simply fill the hostname field.  See "
@@ -31519,68 +32377,66 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14712
+#: doc/guix.texi:14757
 msgid "Available @code{ext-component-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14714
+#: doc/guix.texi:14759
 #, no-wrap
 msgid "{@code{ext-component-configuration} parameter} string component-secret"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14716
+#: doc/guix.texi:14761
 msgid "Password which the component will use to log in."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14718
+#: doc/guix.texi:14763
 #, no-wrap
 msgid "{@code{ext-component-configuration} parameter} string hostname"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14724
+#: doc/guix.texi:14769
 #, no-wrap
-msgid ""
-"{@code{prosody-configuration} parameter} non-negative-integer-list "
-"component-ports"
+msgid "{@code{prosody-configuration} parameter} non-negative-integer-list component-ports"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14727
+#: doc/guix.texi:14772
 msgid ""
 "Port(s) Prosody listens on for component connections.  Defaults to "
 "@samp{(5347)}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14729
+#: doc/guix.texi:14774
 #, no-wrap
 msgid "{@code{prosody-configuration} parameter} string component-interface"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14732
+#: doc/guix.texi:14777
 msgid ""
 "Interface Prosody listens on for component connections.  Defaults to "
 "@samp{\"127.0.0.1\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14734
+#: doc/guix.texi:14779
 #, no-wrap
 msgid "{@code{prosody-configuration} parameter} maybe-raw-content raw-content"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14736
+#: doc/guix.texi:14781
 msgid "Raw content that will be added to the configuration file."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:14744
+#: doc/guix.texi:14789
 msgid ""
 "It could be that you just want to get a @code{prosody.cfg.lua} up and "
 "running.  In that case, you can pass an @code{opaque-prosody-configuration} "
@@ -31590,36 +32446,36 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14745
+#: doc/guix.texi:14790
 #, no-wrap
 msgid "{@code{opaque-prosody-configuration} parameter} package prosody"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14747
+#: doc/guix.texi:14792
 msgid "The prosody package."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14749
+#: doc/guix.texi:14794
 #, no-wrap
 msgid "{@code{opaque-prosody-configuration} parameter} string prosody.cfg.lua"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14751
+#: doc/guix.texi:14796
 msgid "The contents of the @code{prosody.cfg.lua} to use."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:14755
+#: doc/guix.texi:14800
 msgid ""
 "For example, if your @code{prosody.cfg.lua} is just the empty string, you "
 "could instantiate a prosody service like this:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:14760
+#: doc/guix.texi:14805
 #, no-wrap
 msgid ""
 "(service prosody-service-type\n"
@@ -31628,88 +32484,88 @@ msgid ""
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:14764
+#: doc/guix.texi:14809
 #, no-wrap
 msgid "BitlBee Service"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:14766
+#: doc/guix.texi:14811
 #, no-wrap
 msgid "IRC (Internet Relay Chat)"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:14767
+#: doc/guix.texi:14812
 #, no-wrap
 msgid "IRC gateway"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:14770
+#: doc/guix.texi:14815
 msgid ""
 "@url{http://bitlbee.org,BitlBee} is a gateway that provides an IRC interface "
 "to a variety of messaging protocols such as XMPP."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:14771
+#: doc/guix.texi:14816
 #, no-wrap
 msgid "{Scheme Variable} bitlbee-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:14775
+#: doc/guix.texi:14820
 msgid ""
 "This is the service type for the @url{http://bitlbee.org,BitlBee} IRC "
 "gateway daemon.  Its value is a @code{bitlbee-configuration} (see below)."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:14778
+#: doc/guix.texi:14823
 msgid ""
 "To have BitlBee listen on port 6667 on localhost, add this line to your "
 "services:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:14781
+#: doc/guix.texi:14826
 #, no-wrap
 msgid "(service bitlbee-service-type)\n"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:14784
+#: doc/guix.texi:14829
 #, no-wrap
 msgid "{Data Type} bitlbee-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:14786
+#: doc/guix.texi:14831
 msgid "This is the configuration for BitlBee, with the following fields:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14788
+#: doc/guix.texi:14833
 #, no-wrap
 msgid "@code{interface} (default: @code{\"127.0.0.1\"})"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:14789
+#: doc/guix.texi:14834
 #, no-wrap
 msgid "@code{port} (default: @code{6667})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14792
+#: doc/guix.texi:14837
 msgid ""
 "Listen on the network interface corresponding to the IP address specified in "
 "@var{interface}, on @var{port}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14796
+#: doc/guix.texi:14841
 msgid ""
 "When @var{interface} is @code{127.0.0.1}, only local clients can connect; "
 "when it is @code{0.0.0.0}, connections can come from any networking "
@@ -31717,61 +32573,61 @@ msgid ""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14797
+#: doc/guix.texi:14842
 #, no-wrap
 msgid "@code{package} (default: @code{bitlbee})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14799
+#: doc/guix.texi:14844
 msgid "The BitlBee package to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14800
+#: doc/guix.texi:14845
 #, no-wrap
 msgid "@code{extra-settings} (default: @code{\"\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14802
+#: doc/guix.texi:14847
 msgid "Configuration snippet added as-is to the BitlBee configuration file."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:14809
+#: doc/guix.texi:14854
 #, no-wrap
 msgid "Murmur (VoIP server)"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:14810
+#: doc/guix.texi:14855
 #, no-wrap
 msgid "VoIP server"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:14814
+#: doc/guix.texi:14859
 msgid ""
 "This section describes how to set up and run a Murmur server.  Murmur is the "
 "server of the @uref{https://mumble.info, Mumble} voice-over-IP (VoIP) suite."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:14815
+#: doc/guix.texi:14860
 #, no-wrap
 msgid "{Data Type} murmur-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:14818
+#: doc/guix.texi:14863
 msgid ""
 "The service type for the Murmur server.  An example configuration can look "
 "like this:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:14827
+#: doc/guix.texi:14872
 #, no-wrap
 msgid ""
 "(service murmur-service-type\n"
@@ -31779,14 +32635,12 @@ msgid ""
 "          (welcome-text\n"
 "            \"Welcome to this Mumble server running on GuixSD!\")\n"
 "          (cert-required? #t) ;disallow text password logins\n"
-"          (ssl-cert "
-"\"/etc/letsencrypt/live/mumble.example.com/fullchain.pem\")\n"
-"          (ssl-key "
-"\"/etc/letsencrypt/live/mumble.example.com/privkey.pem\")))\n"
+"          (ssl-cert \"/etc/letsencrypt/live/mumble.example.com/fullchain.pem\")\n"
+"          (ssl-key \"/etc/letsencrypt/live/mumble.example.com/privkey.pem\")))\n"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:14831
+#: doc/guix.texi:14876
 msgid ""
 "After reconfiguring your system, you can manually set the murmur "
 "@code{SuperUser} password with the command that is printed during the "
@@ -31794,7 +32648,7 @@ msgid ""
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:14840
+#: doc/guix.texi:14885
 msgid ""
 "It is recommended to register a normal Mumble user account and grant it "
 "admin or moderator rights.  You can use the @code{mumble} client to login as "
@@ -31805,239 +32659,240 @@ msgid ""
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:14842
+#: doc/guix.texi:14887
 msgid "Available @code{murmur-configuration} fields are:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14844
+#: doc/guix.texi:14889
 #, no-wrap
 msgid "@code{package} (default: @code{mumble})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14846
+#: doc/guix.texi:14891
 msgid "Package that contains @code{bin/murmurd}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14847
+#: doc/guix.texi:14892
 #, no-wrap
 msgid "@code{user} (default: @code{\"murmur\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14849
+#: doc/guix.texi:14894
 msgid "User who will run the Murmur server."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14850
+#: doc/guix.texi:14895
 #, no-wrap
 msgid "@code{group} (default: @code{\"murmur\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14852
+#: doc/guix.texi:14897
 msgid "Group of the user who will run the murmur server."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14853
+#: doc/guix.texi:14898
 #, no-wrap
 msgid "@code{port} (default: @code{64738})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14855
+#: doc/guix.texi:14900
 msgid "Port on which the server will listen."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14856
+#: doc/guix.texi:14901
 #, no-wrap
 msgid "@code{welcome-text} (default: @code{\"\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14858
+#: doc/guix.texi:14903
 msgid "Welcome text sent to clients when they connect."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14859
+#: doc/guix.texi:14904
 #, no-wrap
 msgid "@code{server-password} (default: @code{\"\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14861
+#: doc/guix.texi:14906
 msgid "Password the clients have to enter in order to connect."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14862
+#: doc/guix.texi:14907
 #, no-wrap
 msgid "@code{max-users} (default: @code{100})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14864
+#: doc/guix.texi:14909
 msgid "Maximum of users that can be connected to the server at once."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14865
+#: doc/guix.texi:14910
 #, no-wrap
 msgid "@code{max-user-bandwidth} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14867
+#: doc/guix.texi:14912
 msgid "Maximum voice traffic a user can send per second."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14868
+#: doc/guix.texi:14913
 #, no-wrap
 msgid "@code{database-file} (default: @code{\"/var/lib/murmur/db.sqlite\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14871
+#: doc/guix.texi:14916
 msgid ""
 "File name of the sqlite database.  The service's user will become the owner "
 "of the directory."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14872
+#: doc/guix.texi:14917
 #, no-wrap
 msgid "@code{log-file} (default: @code{\"/var/log/murmur/murmur.log\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14875
+#: doc/guix.texi:14920
 msgid ""
 "File name of the log file.  The service's user will become the owner of the "
 "directory."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14876
+#: doc/guix.texi:14921
 #, no-wrap
 msgid "@code{autoban-attempts} (default: @code{10})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14879
+#: doc/guix.texi:14924
 msgid ""
 "Maximum number of logins a user can make in @code{autoban-timeframe} without "
 "getting auto banned for @code{autoban-time}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14880
+#: doc/guix.texi:14925
 #, no-wrap
 msgid "@code{autoban-timeframe} (default: @code{120})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14882
+#: doc/guix.texi:14927
 msgid "Timeframe for autoban in seconds."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14883
+#: doc/guix.texi:14928
 #, no-wrap
 msgid "@code{autoban-time} (default: @code{300})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14886
+#: doc/guix.texi:14931
 msgid ""
 "Amount of time in seconds for which a client gets banned when violating the "
 "autoban limits."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14887
+#: doc/guix.texi:14932
 #, no-wrap
 msgid "@code{opus-threshold} (default: @code{100})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14890
+#: doc/guix.texi:14935
 msgid ""
 "Percentage of clients that need to support opus before switching over to "
 "opus audio codec."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14891
+#: doc/guix.texi:14936
 #, no-wrap
 msgid "@code{channel-nesting-limit} (default: @code{10})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14893
+#: doc/guix.texi:14938
 msgid "How deep channels can be nested at maximum."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14894
+#: doc/guix.texi:14939
 #, no-wrap
 msgid "@code{channelname-regex} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14896
+#: doc/guix.texi:14941
 msgid ""
 "A string in from of a Qt regular expression that channel names must conform "
 "to."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14897
+#: doc/guix.texi:14942
 #, no-wrap
 msgid "@code{username-regex} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14899
-msgid "A string in from of a Qt regular expression that user names must conform to."
+#: doc/guix.texi:14944
+msgid ""
+"A string in from of a Qt regular expression that user names must conform to."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14900
+#: doc/guix.texi:14945
 #, no-wrap
 msgid "@code{text-message-length} (default: @code{5000})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14902
+#: doc/guix.texi:14947
 msgid "Maximum size in bytes that a user can send in one text chat message."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14903
+#: doc/guix.texi:14948
 #, no-wrap
 msgid "@code{image-message-length} (default: @code{(* 128 1024)})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14905
+#: doc/guix.texi:14950
 msgid "Maximum size in bytes that a user can send in one image message."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14906
+#: doc/guix.texi:14951
 #, no-wrap
 msgid "@code{cert-required?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14909
+#: doc/guix.texi:14954
 msgid ""
 "If it is set to @code{#t} clients that use weak password authentification "
 "will not be accepted. Users must have completed the certificate wizard to "
@@ -32045,39 +32900,39 @@ msgid ""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14910
+#: doc/guix.texi:14955
 #, no-wrap
 msgid "@code{remember-channel?} (defualt @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14913
+#: doc/guix.texi:14958
 msgid ""
 "Should murmur remember the last channel each user was in when they "
 "disconnected and put them into the remembered channel when they rejoin."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14914
+#: doc/guix.texi:14959
 #, no-wrap
 msgid "@code{allow-html?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14916
+#: doc/guix.texi:14961
 msgid ""
 "Should html be allowed in text messages, user comments, and channel "
 "descriptions."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14917
+#: doc/guix.texi:14962
 #, no-wrap
 msgid "@code{allow-ping?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14921
+#: doc/guix.texi:14966
 msgid ""
 "Setting to true exposes the current user count, the maximum user count, and "
 "the server's maximum bandwidth per client to unauthenticated users. In the "
@@ -32085,42 +32940,42 @@ msgid ""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14923
+#: doc/guix.texi:14968
 msgid "Disabling this setting will prevent public listing of the server."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14924
+#: doc/guix.texi:14969
 #, no-wrap
 msgid "@code{bonjour?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14926
+#: doc/guix.texi:14971
 msgid ""
 "Should the server advertise itself in the local network through the bonjour "
 "protocol."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14927
+#: doc/guix.texi:14972
 #, no-wrap
 msgid "@code{send-version?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14929
+#: doc/guix.texi:14974
 msgid "Should the murmur server version be exposed in ping requests."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14930
+#: doc/guix.texi:14975
 #, no-wrap
 msgid "@code{log-days} (default: @code{31})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14934
+#: doc/guix.texi:14979
 msgid ""
 "Murmur also stores logs in the database, which are accessible via RPC.  The "
 "default is 31 days of months, but you can set this setting to 0 to keep logs "
@@ -32128,88 +32983,87 @@ msgid ""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14935
+#: doc/guix.texi:14980
 #, no-wrap
 msgid "@code{obfuscate-ips?} (default @code{#t})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14937
+#: doc/guix.texi:14982
 msgid "Should logged ips be obfuscated to protect the privacy of users."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14938
+#: doc/guix.texi:14983
 #, no-wrap
 msgid "@code{ssl-cert} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14940
+#: doc/guix.texi:14985
 msgid "File name of the SSL/TLS certificate used for encrypted connections."
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:14943
+#: doc/guix.texi:14988
 #, no-wrap
 msgid "(ssl-cert \"/etc/letsencrypt/live/example.com/fullchain.pem\")\n"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14944
+#: doc/guix.texi:14989
 #, no-wrap
 msgid "@code{ssl-key} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14946
+#: doc/guix.texi:14991
 msgid "Filepath to the ssl private key used for encrypted connections."
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:14948
+#: doc/guix.texi:14993
 #, no-wrap
 msgid "(ssl-key \"/etc/letsencrypt/live/example.com/privkey.pem\")\n"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14950
+#: doc/guix.texi:14995
 #, no-wrap
 msgid "@code{ssl-dh-params} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14955
+#: doc/guix.texi:15000
 msgid ""
-"File name of a PEM-encoded file with Diffie-Hellman parameters for the "
-"SSL/TLS encryption.  Alternatively you set it to @code{\"@@ffdhe2048\"}, "
+"File name of a PEM-encoded file with Diffie-Hellman parameters for the SSL/"
+"TLS encryption.  Alternatively you set it to @code{\"@@ffdhe2048\"}, "
 "@code{\"@@ffdhe3072\"}, @code{\"@@ffdhe4096\"}, @code{\"@@ffdhe6144\"} or "
 "@code{\"@@ffdhe8192\"} to use bundled parameters from RFC 7919."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14956
+#: doc/guix.texi:15001
 #, no-wrap
 msgid "@code{ssl-ciphers} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14959
+#: doc/guix.texi:15004
 msgid ""
 "The @code{ssl-ciphers} option chooses the cipher suites to make available "
 "for use in SSL/TLS."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14963
+#: doc/guix.texi:15008
 msgid ""
-"This option is specified using "
-"@uref{https://www.openssl.org/docs/apps/ciphers.html#CIPHER-LIST-FORMAT, "
-"OpenSSL cipher list notation}."
+"This option is specified using @uref{https://www.openssl.org/docs/apps/"
+"ciphers.html#CIPHER-LIST-FORMAT, OpenSSL cipher list notation}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14968
+#: doc/guix.texi:15013
 msgid ""
 "It is recommended that you try your cipher string using 'openssl ciphers "
 "<string>' before setting it here, to get a feel for which cipher suites you "
@@ -32219,7 +33073,7 @@ msgid ""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14972
+#: doc/guix.texi:15017
 msgid ""
 "Note: Changing this option may impact the backwards compatibility of your "
 "Murmur server, and can remove the ability for older Mumble clients to be "
@@ -32227,133 +33081,132 @@ msgid ""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14973
+#: doc/guix.texi:15018
 #, no-wrap
 msgid "@code{public-registration} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14975
+#: doc/guix.texi:15020
 msgid ""
 "Must be a @code{<murmur-public-registration-configuration>} record or "
 "@code{#f}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14980
+#: doc/guix.texi:15025
 msgid ""
 "You can optionally register your server in the public server list that the "
 "@code{mumble} client shows on startup.  You cannot register your server if "
-"you have set a @code{server-password}, or set @code{allow-ping} to "
-"@code{#f}."
+"you have set a @code{server-password}, or set @code{allow-ping} to @code{#f}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14982
+#: doc/guix.texi:15027
 msgid "It might take a few hours until it shows up in the public list."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14983 doc/guix.texi:15554
+#: doc/guix.texi:15028 doc/guix.texi:15599
 #, no-wrap
 msgid "@code{file} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14985
+#: doc/guix.texi:15030
 msgid "Optional alternative override for this configuration."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:14988
+#: doc/guix.texi:15033
 #, no-wrap
 msgid "{Data Type} murmur-public-registration-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:14990
+#: doc/guix.texi:15035
 msgid "Configuration for public registration of a murmur service."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14994
+#: doc/guix.texi:15039
 msgid ""
-"This is a display name for your server. Not to be confused with the "
-"hostname."
+"This is a display name for your server. Not to be confused with the hostname."
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:14995 doc/guix.texi:19885
+#: doc/guix.texi:15040 doc/guix.texi:19930
 #, no-wrap
 msgid "password"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14998
+#: doc/guix.texi:15043
 msgid ""
 "A password to identify your registration.  Subsequent updates will need the "
 "same password. Don't lose your password."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:14999
+#: doc/guix.texi:15044
 #, no-wrap
 msgid "url"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15002
-msgid "This should be a @code{http://} or @code{https://} link to your web site."
+#: doc/guix.texi:15047
+msgid ""
+"This should be a @code{http://} or @code{https://} link to your web site."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15003
+#: doc/guix.texi:15048
 #, no-wrap
 msgid "@code{hostname} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15006
+#: doc/guix.texi:15051
 msgid ""
 "By default your server will be listed by its IP address.  If it is set your "
 "server will be linked by this host name instead."
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:15014
+#: doc/guix.texi:15059
 #, no-wrap
 msgid "Tailon Service"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:15018
+#: doc/guix.texi:15063
 msgid ""
 "@uref{https://tailon.readthedocs.io/, Tailon} is a web application for "
 "viewing and searching log files."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:15021
+#: doc/guix.texi:15066
 msgid ""
 "The following example will configure the service with default values.  By "
 "default, Tailon can be accessed on port 8080 (@code{http://localhost:8080})."
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:15024
+#: doc/guix.texi:15069
 #, no-wrap
 msgid "(service tailon-service-type)\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:15028
+#: doc/guix.texi:15073
 msgid ""
 "The following example customises more of the Tailon configuration, adding "
 "@command{sed} to the list of allowed commands."
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:15035
+#: doc/guix.texi:15080
 #, no-wrap
 msgid ""
 "(service tailon-service-type\n"
@@ -32364,41 +33217,40 @@ msgid ""
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:15038
+#: doc/guix.texi:15083
 #, no-wrap
 msgid "{Data Type} tailon-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:15041
+#: doc/guix.texi:15086
 msgid ""
 "Data type representing the configuration of Tailon.  This type has the "
 "following parameters:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15043
+#: doc/guix.texi:15088
 #, no-wrap
 msgid "@code{config-file} (default: @code{(tailon-configuration-file)})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15047
+#: doc/guix.texi:15092
 msgid ""
-"The configuration file to use for Tailon. This can be set to a "
-"@dfn{tailon-configuration-file} record value, or any gexp "
-"(@pxref{G-Expressions})."
+"The configuration file to use for Tailon. This can be set to a @dfn{tailon-"
+"configuration-file} record value, or any gexp (@pxref{G-Expressions})."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15050
+#: doc/guix.texi:15095
 msgid ""
 "For example, to instead use a local file, the @code{local-file} function can "
 "be used:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:15055
+#: doc/guix.texi:15100
 #, no-wrap
 msgid ""
 "(service tailon-service-type\n"
@@ -32407,37 +33259,37 @@ msgid ""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15057
+#: doc/guix.texi:15102
 #, no-wrap
 msgid "@code{package} (default: @code{tailon})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15059
+#: doc/guix.texi:15104
 msgid "The tailon package to use."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:15063
+#: doc/guix.texi:15108
 #, no-wrap
 msgid "{Data Type} tailon-configuration-file"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:15066
+#: doc/guix.texi:15111
 msgid ""
 "Data type representing the configuration options for Tailon.  This type has "
 "the following parameters:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15068
+#: doc/guix.texi:15113
 #, no-wrap
 msgid "@code{files} (default: @code{(list \"/var/log\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15073
+#: doc/guix.texi:15118
 msgid ""
 "List of files to display. The list can include strings for a single file or "
 "directory, or a list, where the first item is the name of a subsection, and "
@@ -32445,90 +33297,90 @@ msgid ""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15074
+#: doc/guix.texi:15119
 #, no-wrap
 msgid "@code{bind} (default: @code{\"localhost:8080\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15076
+#: doc/guix.texi:15121
 msgid "Address and port to which Tailon should bind on."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15077
+#: doc/guix.texi:15122
 #, no-wrap
 msgid "@code{relative-root} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15079
+#: doc/guix.texi:15124
 msgid "URL path to use for Tailon, set to @code{#f} to not use a path."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15080
+#: doc/guix.texi:15125
 #, no-wrap
 msgid "@code{allow-transfers?} (default: @code{#t})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15082
+#: doc/guix.texi:15127
 msgid "Allow downloading the log files in the web interface."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15083
+#: doc/guix.texi:15128
 #, no-wrap
 msgid "@code{follow-names?} (default: @code{#t})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15085
+#: doc/guix.texi:15130
 msgid "Allow tailing of not-yet existent files."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15086
+#: doc/guix.texi:15131
 #, no-wrap
 msgid "@code{tail-lines} (default: @code{200})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15088
+#: doc/guix.texi:15133
 msgid "Number of lines to read initially from each file."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15089
+#: doc/guix.texi:15134
 #, no-wrap
 msgid "@code{allowed-commands} (default: @code{(list \"tail\" \"grep\" \"awk\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15091
+#: doc/guix.texi:15136
 msgid "Commands to allow running. By default, @code{sed} is disabled."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15092
+#: doc/guix.texi:15137
 #, no-wrap
 msgid "@code{debug?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15094
+#: doc/guix.texi:15139
 msgid "Set @code{debug?} to @code{#t} to show debug messages."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15095
+#: doc/guix.texi:15140
 #, no-wrap
 msgid "@code{wrap-lines} (default: @code{#t})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15099
+#: doc/guix.texi:15144
 msgid ""
 "Initial line wrapping state in the web interface. Set to @code{#t} to "
 "initially wrap lines (the default), or to @code{#f} to initially not wrap "
@@ -32536,26 +33388,26 @@ msgid ""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15100
+#: doc/guix.texi:15145
 #, no-wrap
 msgid "@code{http-auth} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15104
+#: doc/guix.texi:15149
 msgid ""
 "HTTP authentication type to use. Set to @code{#f} to disable authentication "
 "(the default). Supported values are @code{\"digest\"} or @code{\"basic\"}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15105
+#: doc/guix.texi:15150
 #, no-wrap
 msgid "@code{users} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15110
+#: doc/guix.texi:15155
 msgid ""
 "If HTTP authentication is enabled (see @code{http-auth}), access will be "
 "restricted to the credentials provided here. To configure users, use a list "
@@ -32564,7 +33416,7 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:15116
+#: doc/guix.texi:15161
 #, no-wrap
 msgid ""
 "(tailon-configuration-file\n"
@@ -32574,32 +33426,32 @@ msgid ""
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:15122
+#: doc/guix.texi:15167
 #, no-wrap
 msgid "Darkstat Service"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:15123
+#: doc/guix.texi:15168
 #, no-wrap
 msgid "darkstat"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:15126
+#: doc/guix.texi:15171
 msgid ""
 "Darkstat is a packet sniffer that captures network traffic, calculates "
 "statistics about usage, and serves reports over HTTP."
 msgstr ""
 
 #. type: defvar
-#: doc/guix.texi:15127
+#: doc/guix.texi:15172
 #, no-wrap
 msgid "{Scheme Variable} darkstat-service-type"
 msgstr ""
 
 #. type: defvar
-#: doc/guix.texi:15132
+#: doc/guix.texi:15177
 msgid ""
 "This is the service type for the @uref{https://unix4lyfe.org/darkstat/, "
 "darkstat} service, its value must be a @code{darkstat-configuration} record "
@@ -32607,7 +33459,7 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:15137
+#: doc/guix.texi:15182
 #, no-wrap
 msgid ""
 "(service darkstat-service-type\n"
@@ -32616,94 +33468,94 @@ msgid ""
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:15140
+#: doc/guix.texi:15185
 #, no-wrap
 msgid "{Data Type} darkstat-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:15142
+#: doc/guix.texi:15187
 msgid "Data type representing the configuration of @command{darkstat}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15144
+#: doc/guix.texi:15189
 #, no-wrap
 msgid "@code{package} (default: @code{darkstat})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15146
+#: doc/guix.texi:15191
 msgid "The darkstat package to use."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:15147
+#: doc/guix.texi:15192
 #, no-wrap
 msgid "interface"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15149
+#: doc/guix.texi:15194
 msgid "Capture traffic on the specified network interface."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15150
+#: doc/guix.texi:15195
 #, no-wrap
 msgid "@code{port} (default: @code{\"667\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15152
+#: doc/guix.texi:15197
 msgid "Bind the web interface to the specified port."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15153
+#: doc/guix.texi:15198
 #, no-wrap
 msgid "@code{bind-address} (default: @code{\"127.0.0.1\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15155
+#: doc/guix.texi:15200
 msgid "Bind the web interface to the specified address."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15156
+#: doc/guix.texi:15201
 #, no-wrap
 msgid "@code{base} (default: @code{\"/\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15159
+#: doc/guix.texi:15204
 msgid ""
 "Specify the path of the base URL.  This can be useful if @command{darkstat} "
 "is accessed via a reverse proxy."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:15166
+#: doc/guix.texi:15211
 #, no-wrap
 msgid "Kerberos"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:15170
+#: doc/guix.texi:15215
 msgid ""
 "The @code{(gnu services kerberos)} module provides services relating to the "
 "authentication protocol @dfn{Kerberos}."
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:15171
+#: doc/guix.texi:15216
 #, no-wrap
 msgid "Krb5 Service"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:15178
+#: doc/guix.texi:15223
 msgid ""
 "Programs using a Kerberos client library normally expect a configuration "
 "file in @file{/etc/krb5.conf}.  This service generates such a file from a "
@@ -32712,7 +33564,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:15182
+#: doc/guix.texi:15227
 msgid ""
 "No ``keytab'' files are provided by this service---you must explicitly "
 "create them.  This service is known to work with the MIT client library, "
@@ -32720,23 +33572,23 @@ msgid ""
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:15183
+#: doc/guix.texi:15228
 #, no-wrap
 msgid "{Scheme Variable} krb5-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:15185
+#: doc/guix.texi:15230
 msgid "A service type for Kerberos 5 clients."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:15189
+#: doc/guix.texi:15234
 msgid "Here is an example of its use:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:15203
+#: doc/guix.texi:15248
 #, no-wrap
 msgid ""
 "(service krb5-service-type\n"
@@ -32755,62 +33607,63 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:15207
+#: doc/guix.texi:15252
 msgid "This example provides a Kerberos@tie{}5 client configuration which:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15208
+#: doc/guix.texi:15253
 #, no-wrap
 msgid "Recognizes two realms, @i{viz:} ``EXAMPLE.COM'' and ``ARGRX.EDU'', both"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:15210
-msgid "of which have distinct administration servers and key distribution centers;"
+#: doc/guix.texi:15255
+msgid ""
+"of which have distinct administration servers and key distribution centers;"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15210
+#: doc/guix.texi:15255
 #, no-wrap
 msgid "Will default to the realm ``EXAMPLE.COM'' if the realm is not explicitly"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:15212
+#: doc/guix.texi:15257
 msgid "specified by clients;"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15212
+#: doc/guix.texi:15257
 #, no-wrap
 msgid "Accepts services which only support encryption types known to be weak."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:15220
+#: doc/guix.texi:15265
 msgid ""
 "The @code{krb5-realm} and @code{krb5-configuration} types have many fields.  "
 "Only the most commonly used ones are described here.  For a full list, and "
-"more detailed explanation of each, see the MIT "
-"@uref{http://web.mit.edu/kerberos/krb5-devel/doc/admin/conf_files/krb5_conf.html,,krb5.conf} "
+"more detailed explanation of each, see the MIT @uref{http://web.mit.edu/"
+"kerberos/krb5-devel/doc/admin/conf_files/krb5_conf.html,,krb5.conf} "
 "documentation."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:15222
+#: doc/guix.texi:15267
 #, no-wrap
 msgid "{Data Type} krb5-realm"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:15223
+#: doc/guix.texi:15268
 #, no-wrap
 msgid "realm, kerberos"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15229
+#: doc/guix.texi:15274
 msgid ""
 "This field is a string identifying the name of the realm.  A common "
 "convention is to use the fully qualified DNS name of your organization, "
@@ -32818,58 +33671,57 @@ msgid ""
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:15230
+#: doc/guix.texi:15275
 #, no-wrap
 msgid "admin-server"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15233
+#: doc/guix.texi:15278
 msgid ""
 "This field is a string identifying the host where the administration server "
 "is running."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:15234
+#: doc/guix.texi:15279
 #, no-wrap
 msgid "kdc"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15237
+#: doc/guix.texi:15282
 msgid ""
-"This field is a string identifying the key distribution center for the "
-"realm."
+"This field is a string identifying the key distribution center for the realm."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:15240
+#: doc/guix.texi:15285
 #, no-wrap
 msgid "{Data Type} krb5-configuration"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15243
+#: doc/guix.texi:15288
 #, no-wrap
 msgid "@code{allow-weak-crypto?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15246
+#: doc/guix.texi:15291
 msgid ""
 "If this flag is @code{#t} then services which only offer encryption "
 "algorithms known to be weak will be accepted."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15247
+#: doc/guix.texi:15292
 #, no-wrap
 msgid "@code{default-realm} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15254
+#: doc/guix.texi:15299
 msgid ""
 "This field should be a string identifying the default Kerberos realm for the "
 "client.  You should set this field to the name of your Kerberos realm.  If "
@@ -32878,13 +33730,13 @@ msgid ""
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:15255
+#: doc/guix.texi:15300
 #, no-wrap
 msgid "realms"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15260
+#: doc/guix.texi:15305
 msgid ""
 "This should be a non-empty list of @code{krb5-realm} objects, which clients "
 "may access.  Normally, one of them will have a @code{name} field matching "
@@ -32892,19 +33744,19 @@ msgid ""
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:15264
+#: doc/guix.texi:15309
 #, no-wrap
 msgid "PAM krb5 Service"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:15265
+#: doc/guix.texi:15310
 #, no-wrap
 msgid "pam-krb5"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:15271
+#: doc/guix.texi:15316
 msgid ""
 "The @code{pam-krb5} service allows for login authentication and password "
 "management via Kerberos.  You will need this service if you want PAM enabled "
@@ -32912,48 +33764,48 @@ msgid ""
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:15272
+#: doc/guix.texi:15317
 #, no-wrap
 msgid "{Scheme Variable} pam-krb5-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:15274
+#: doc/guix.texi:15319
 msgid "A service type for the Kerberos 5 PAM module."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:15276
+#: doc/guix.texi:15321
 #, no-wrap
 msgid "{Data Type} pam-krb5-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:15279
+#: doc/guix.texi:15324
 msgid ""
 "Data type representing the configuration of the Kerberos 5 PAM module This "
 "type has the following parameters:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15280
+#: doc/guix.texi:15325
 #, no-wrap
 msgid "@code{pam-krb5} (default: @code{pam-krb5})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15282
+#: doc/guix.texi:15327
 msgid "The pam-krb5 package to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15283
+#: doc/guix.texi:15328
 #, no-wrap
 msgid "@code{minimum-uid} (default: @code{1000})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15286
+#: doc/guix.texi:15331
 msgid ""
 "The smallest user ID for which Kerberos authentications should be "
 "attempted.  Local accounts with lower values will silently fail to "
@@ -32961,57 +33813,57 @@ msgid ""
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:15293
+#: doc/guix.texi:15338
 #, no-wrap
 msgid "web"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:15294
+#: doc/guix.texi:15339
 #, no-wrap
 msgid "www"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:15295
+#: doc/guix.texi:15340
 #, no-wrap
 msgid "HTTP"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:15298
+#: doc/guix.texi:15343
 msgid ""
 "The @code{(gnu services web)} module provides the Apache HTTP Server, the "
 "nginx web server, and also a fastcgi wrapper daemon."
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:15299
+#: doc/guix.texi:15344
 #, no-wrap
 msgid "Apache HTTP Server"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:15301
+#: doc/guix.texi:15346
 #, no-wrap
 msgid "{Scheme Variable} httpd-service-type"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:15305
+#: doc/guix.texi:15350
 msgid ""
 "Service type for the @uref{https://httpd.apache.org/,Apache HTTP} server "
-"(@dfn{httpd}).  The value for this service type is a "
-"@code{https-configuration} record."
+"(@dfn{httpd}).  The value for this service type is a @code{https-"
+"configuration} record."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:15307 doc/guix.texi:15458
+#: doc/guix.texi:15352 doc/guix.texi:15503
 msgid "A simple example configuration is given below."
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:15315
+#: doc/guix.texi:15360
 #, no-wrap
 msgid ""
 "(service httpd-service-type\n"
@@ -33023,14 +33875,14 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:15319
+#: doc/guix.texi:15364
 msgid ""
 "Other services can also extend the @code{httpd-service-type} to add to the "
 "configuration."
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:15328 doc/guix.texi:15438
+#: doc/guix.texi:15373 doc/guix.texi:15483
 #, no-wrap
 msgid ""
 "(simple-service 'my-extra-server httpd-service-type\n"
@@ -33039,12 +33891,11 @@ msgid ""
 "                    \"*:80\"\n"
 "                    (list (string-append\n"
 "                           \"ServerName \"www.example.com\n"
-"                            DocumentRoot "
-"\\\"/srv/http/www.example.com\\\"\")))))\n"
+"                            DocumentRoot \\\"/srv/http/www.example.com\\\"\")))))\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:15334
+#: doc/guix.texi:15379
 msgid ""
 "The details for the @code{httpd-configuration}, @code{httpd-module}, "
 "@code{httpd-config-file} and @code{httpd-virtualhost} record types are given "
@@ -33052,110 +33903,110 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:15335
+#: doc/guix.texi:15380
 #, no-wrap
 msgid "{Data Type} httpd-configuration"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:15337
+#: doc/guix.texi:15382
 msgid "This data type represents the configuration for the httpd service."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15339
+#: doc/guix.texi:15384
 #, no-wrap
 msgid "@code{package} (default: @code{httpd})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15341
+#: doc/guix.texi:15386
 msgid "The httpd package to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15342 doc/guix.texi:15401
+#: doc/guix.texi:15387 doc/guix.texi:15446
 #, no-wrap
 msgid "@code{pid-file} (default: @code{\"/var/run/httpd\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15344
+#: doc/guix.texi:15389
 msgid "The pid file used by the shepherd-service."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15345
+#: doc/guix.texi:15390
 #, no-wrap
 msgid "@code{config} (default: @code{(httpd-config-file)})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15350
+#: doc/guix.texi:15395
 msgid ""
 "The configuration file to use with the httpd service. The default value is a "
-"@code{httpd-config-file} record, but this can also be a different "
-"G-expression that generates a file, for example a @code{plain-file}. A file "
+"@code{httpd-config-file} record, but this can also be a different G-"
+"expression that generates a file, for example a @code{plain-file}. A file "
 "outside of the store can also be specified through a string."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:15354
+#: doc/guix.texi:15399
 #, no-wrap
 msgid "{Data Type} httpd-module"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:15356
+#: doc/guix.texi:15401
 msgid "This data type represents a module for the httpd service."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15360
+#: doc/guix.texi:15405
 msgid "The name of the module."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15366
+#: doc/guix.texi:15411
 msgid ""
 "The file for the module. This can be relative to the httpd package being "
 "used, the absolute location of a file, or a G-expression for a file within "
-"the store, for example @code{(file-append mod-wsgi "
-"\"/modules/mod_wsgi.so\")}."
+"the store, for example @code{(file-append mod-wsgi \"/modules/mod_wsgi.so"
+"\")}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:15370
+#: doc/guix.texi:15415
 #, no-wrap
 msgid "{Data Type} httpd-config-file"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:15372
+#: doc/guix.texi:15417
 msgid "This data type represents a configuration file for the httpd service."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15374
+#: doc/guix.texi:15419
 #, no-wrap
 msgid "@code{modules} (default: @code{%default-httpd-modules})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15377
+#: doc/guix.texi:15422
 msgid ""
 "The modules to load. Additional modules can be added here, or loaded by "
 "additional configuration."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15378
+#: doc/guix.texi:15423
 #, no-wrap
 msgid "@code{server-root} (default: @code{httpd})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15382
+#: doc/guix.texi:15427
 msgid ""
 "The @code{ServerRoot} in the configuration file, defaults to the httpd "
 "package. Directives including @code{Include} and @code{LoadModule} are taken "
@@ -33163,44 +34014,44 @@ msgid ""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15383
+#: doc/guix.texi:15428
 #, no-wrap
 msgid "@code{server-name} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15387
+#: doc/guix.texi:15432
 msgid ""
 "The @code{ServerName} in the configuration file, used to specify the request "
 "scheme, hostname and port that the server uses to identify itself."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15391
+#: doc/guix.texi:15436
 msgid ""
 "This doesn't need to be set in the server config, and can be specifyed in "
 "virtual hosts. The default is @code{#f} to not specify a @code{ServerName}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15392
+#: doc/guix.texi:15437
 #, no-wrap
 msgid "@code{document-root} (default: @code{\"/srv/http\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15394
+#: doc/guix.texi:15439
 msgid "The @code{DocumentRoot} from which files will be served."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15395
+#: doc/guix.texi:15440
 #, no-wrap
 msgid "@code{listen} (default: @code{'(\"80\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15400
+#: doc/guix.texi:15445
 msgid ""
 "The list of values for the @code{Listen} directives in the config file. The "
 "value should be a list of strings, when each string can specify the port "
@@ -33208,7 +34059,7 @@ msgid ""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15405
+#: doc/guix.texi:15450
 msgid ""
 "The @code{PidFile} to use. This should match the @code{pid-file} set in the "
 "@code{httpd-configuration} so that the Shepherd service is configured "
@@ -33216,121 +34067,120 @@ msgid ""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15406
+#: doc/guix.texi:15451
 #, no-wrap
 msgid "@code{error-log} (default: @code{\"/var/log/httpd/error_log\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15408
+#: doc/guix.texi:15453
 msgid "The @code{ErrorLog} to which the server will log errors."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15409
+#: doc/guix.texi:15454
 #, no-wrap
 msgid "@code{user} (default: @code{\"httpd\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15411
+#: doc/guix.texi:15456
 msgid "The @code{User} which the server will answer requests as."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15412
+#: doc/guix.texi:15457
 #, no-wrap
 msgid "@code{group} (default: @code{\"httpd\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15414
+#: doc/guix.texi:15459
 msgid "The @code{Group} which the server will answer requests as."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15415
+#: doc/guix.texi:15460
 #, no-wrap
-msgid ""
-"@code{extra-config} (default: @code{(list \"TypesConfig "
-"etc/httpd/mime.types\")})"
+msgid "@code{extra-config} (default: @code{(list \"TypesConfig etc/httpd/mime.types\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15418
+#: doc/guix.texi:15463
 msgid ""
 "A flat list of strings and G-expressions which will be added to the end of "
 "the configuration file."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15421
-msgid "Any values which the service is extended with will be appended to this list."
+#: doc/guix.texi:15466
+msgid ""
+"Any values which the service is extended with will be appended to this list."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:15425
+#: doc/guix.texi:15470
 #, no-wrap
 msgid "{Data Type} httpd-virtualhost"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:15427
+#: doc/guix.texi:15472
 msgid ""
 "This data type represents a virtualhost configuration block for the httpd "
 "service."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:15429
+#: doc/guix.texi:15474
 msgid "These should be added to the extra-config for the httpd-service."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:15441
+#: doc/guix.texi:15486
 #, no-wrap
 msgid "addresses-and-ports"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15443
+#: doc/guix.texi:15488
 msgid "The addresses and ports for the @code{VirtualHost} directive."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:15444
+#: doc/guix.texi:15489
 #, no-wrap
 msgid "contents"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15447
+#: doc/guix.texi:15492
 msgid ""
 "The contents of the @code{VirtualHost} directive, this should be a list of "
 "strings and G-expressions."
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:15451
+#: doc/guix.texi:15496
 #, no-wrap
 msgid "NGINX"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:15453
+#: doc/guix.texi:15498
 #, no-wrap
 msgid "{Scheme Variable} nginx-service-type"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:15456
+#: doc/guix.texi:15501
 msgid ""
 "Service type for the @uref{https://nginx.org/,NGinx} web server.  The value "
 "for this service type is a @code{<nginx-configuration>} record."
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:15466 doc/guix.texi:15520
+#: doc/guix.texi:15511 doc/guix.texi:15565
 #, no-wrap
 msgid ""
 "(service nginx-service-type\n"
@@ -33342,7 +34192,7 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:15471
+#: doc/guix.texi:15516
 msgid ""
 "In addition to adding server blocks to the service configuration directly, "
 "this service can be extended by other services to add server blocks, as in "
@@ -33350,7 +34200,7 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:15477
+#: doc/guix.texi:15522
 #, no-wrap
 msgid ""
 "(simple-service 'my-extra-server nginx-service-type\n"
@@ -33360,26 +34210,26 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:15488
+#: doc/guix.texi:15533
 msgid ""
 "At startup, @command{nginx} has not yet read its configuration file, so it "
 "uses a default file to log error messages.  If it fails to load its "
 "configuration file, that is where error messages are logged.  After the "
 "configuration file is loaded, the default error log file changes as per "
-"configuration.  In our case, startup error messages can be found in "
-"@file{/var/run/nginx/logs/error.log}, and after configuration in "
-"@file{/var/log/nginx/error.log}.  The second location can be changed with "
-"the @var{log-directory} configuration option."
+"configuration.  In our case, startup error messages can be found in @file{/"
+"var/run/nginx/logs/error.log}, and after configuration in @file{/var/log/"
+"nginx/error.log}.  The second location can be changed with the @var{log-"
+"directory} configuration option."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:15489
+#: doc/guix.texi:15534
 #, no-wrap
 msgid "{Data Type} nginx-configuration"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:15493
+#: doc/guix.texi:15538
 msgid ""
 "This data type represents the configuration for NGinx. Some configuration "
 "can be done through this and the other provided record types, or "
@@ -33387,75 +34237,75 @@ msgid ""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15495
+#: doc/guix.texi:15540
 #, no-wrap
 msgid "@code{nginx} (default: @code{nginx})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15497
+#: doc/guix.texi:15542
 msgid "The nginx package to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15498
+#: doc/guix.texi:15543
 #, no-wrap
 msgid "@code{log-directory} (default: @code{\"/var/log/nginx\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15500
+#: doc/guix.texi:15545
 msgid "The directory to which NGinx will write log files."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15501
+#: doc/guix.texi:15546
 #, no-wrap
 msgid "@code{run-directory} (default: @code{\"/var/run/nginx\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15504
+#: doc/guix.texi:15549
 msgid ""
 "The directory in which NGinx will create a pid file, and write temporary "
 "files."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15505
+#: doc/guix.texi:15550
 #, no-wrap
 msgid "@code{server-blocks} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15509
+#: doc/guix.texi:15554
 msgid ""
 "A list of @dfn{server blocks} to create in the generated configuration file, "
 "the elements should be of type @code{<nginx-server-configuration>}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15513
+#: doc/guix.texi:15558
 msgid ""
 "The following example would setup NGinx to serve @code{www.example.com} from "
 "the @code{/srv/http/www.example.com} directory, without using HTTPS."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15522
+#: doc/guix.texi:15567
 #, no-wrap
 msgid "@code{upstream-blocks} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15526
+#: doc/guix.texi:15571
 msgid ""
 "A list of @dfn{upstream blocks} to create in the generated configuration "
 "file, the elements should be of type @code{<nginx-upstream-configuration>}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15533
+#: doc/guix.texi:15578
 msgid ""
 "Configuring upstreams through the @code{upstream-blocks} can be useful when "
 "combined with @code{locations} in the @code{<nginx-server-configuration>} "
@@ -33465,7 +34315,7 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:15552
+#: doc/guix.texi:15597
 #, no-wrap
 msgid ""
 "(service\n"
@@ -33488,7 +34338,7 @@ msgid ""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15560
+#: doc/guix.texi:15605
 msgid ""
 "If a configuration @var{file} is provided, this will be used, rather than "
 "generating a configuration file from the provided @code{log-directory}, "
@@ -33498,58 +34348,58 @@ msgid ""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15564
+#: doc/guix.texi:15609
 msgid ""
 "This can be useful if you have an existing configuration file, or it's not "
-"possible to do what is required through the other parts of the "
-"nginx-configuration record."
+"possible to do what is required through the other parts of the nginx-"
+"configuration record."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15565
+#: doc/guix.texi:15610
 #, no-wrap
 msgid "@code{server-names-hash-bucket-size} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15568
+#: doc/guix.texi:15613
 msgid ""
 "Bucket size for the server names hash tables, defaults to @code{#f} to use "
 "the size of the processors cache line."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15569
+#: doc/guix.texi:15614
 #, no-wrap
 msgid "@code{server-names-hash-bucket-max-size} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15571
+#: doc/guix.texi:15616
 msgid "Maximum bucket size for the server names hash tables."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:15575
+#: doc/guix.texi:15620
 #, no-wrap
 msgid "{Data Type} nginx-server-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:15578
+#: doc/guix.texi:15623
 msgid ""
 "Data type representing the configuration of an nginx server block.  This "
 "type has the following parameters:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15580
+#: doc/guix.texi:15625
 #, no-wrap
 msgid "@code{listen} (default: @code{'(\"80\" \"443 ssl\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15585
+#: doc/guix.texi:15630
 msgid ""
 "Each @code{listen} directive sets the address and port for IP, or the path "
 "for a UNIX-domain socket on which the server will accept requests.  Both "
@@ -33558,188 +34408,187 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:15588
+#: doc/guix.texi:15633
 #, no-wrap
 msgid "'(\"127.0.0.1:8000\" \"127.0.0.1\" \"8000\" \"*:8000\" \"localhost:8000\")\n"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15590
+#: doc/guix.texi:15635
 #, no-wrap
 msgid "@code{server-name} (default: @code{(list 'default)})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15593
+#: doc/guix.texi:15638
 msgid ""
 "A list of server names this server represents. @code{'default} represents "
 "the default server for connections matching no other server."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15594
+#: doc/guix.texi:15639
 #, no-wrap
 msgid "@code{root} (default: @code{\"/srv/http\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15596
+#: doc/guix.texi:15641
 msgid "Root of the website nginx will serve."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15597
+#: doc/guix.texi:15642
 #, no-wrap
 msgid "@code{locations} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15601
+#: doc/guix.texi:15646
 msgid ""
-"A list of @dfn{nginx-location-configuration} or "
-"@dfn{nginx-named-location-configuration} records to use within this server "
-"block."
+"A list of @dfn{nginx-location-configuration} or @dfn{nginx-named-location-"
+"configuration} records to use within this server block."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15602
+#: doc/guix.texi:15647
 #, no-wrap
 msgid "@code{index} (default: @code{(list \"index.html\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15605
+#: doc/guix.texi:15650
 msgid ""
 "Index files to look for when clients ask for a directory.  If it cannot be "
 "found, Nginx will send the list of files in the directory."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15606
+#: doc/guix.texi:15651
 #, no-wrap
 msgid "@code{try-files} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15609
+#: doc/guix.texi:15654
 msgid ""
 "A list of files whose existence is checked in the specified order.  "
 "@code{nginx} will use the first file it finds to process the request."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15610
+#: doc/guix.texi:15655
 #, no-wrap
 msgid "@code{ssl-certificate} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15613
+#: doc/guix.texi:15658
 msgid ""
 "Where to find the certificate for secure connections.  Set it to @code{#f} "
 "if you don't have a certificate or you don't want to use HTTPS."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15614
+#: doc/guix.texi:15659
 #, no-wrap
 msgid "@code{ssl-certificate-key} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15617
+#: doc/guix.texi:15662
 msgid ""
 "Where to find the private key for secure connections.  Set it to @code{#f} "
 "if you don't have a key or you don't want to use HTTPS."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15618
+#: doc/guix.texi:15663
 #, no-wrap
 msgid "@code{server-tokens?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15620
+#: doc/guix.texi:15665
 msgid "Whether the server should add its configuration to response."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15621
+#: doc/guix.texi:15666
 #, no-wrap
 msgid "@code{raw-content} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15623
+#: doc/guix.texi:15668
 msgid "A list of raw lines added to the server block."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:15627
+#: doc/guix.texi:15672
 #, no-wrap
 msgid "{Data Type} nginx-upstream-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:15630
+#: doc/guix.texi:15675
 msgid ""
 "Data type representing the configuration of an nginx @code{upstream} block.  "
 "This type has the following parameters:"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15634
+#: doc/guix.texi:15679
 msgid "Name for this group of servers."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:15635
+#: doc/guix.texi:15680
 #, no-wrap
 msgid "servers"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15642
+#: doc/guix.texi:15687
 msgid ""
 "Specify the addresses of the servers in the group.  The address can be "
-"specified as a IP address (e.g. @samp{127.0.0.1}), domain name "
-"(e.g. @samp{backend1.example.com}) or a path to a UNIX socket using the "
-"prefix @samp{unix:}.  For addresses using an IP address or domain name, the "
-"default port is 80, and a different port can be specified explicitly."
+"specified as a IP address (e.g. @samp{127.0.0.1}), domain name (e.g. "
+"@samp{backend1.example.com}) or a path to a UNIX socket using the prefix "
+"@samp{unix:}.  For addresses using an IP address or domain name, the default "
+"port is 80, and a different port can be specified explicitly."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:15646
+#: doc/guix.texi:15691
 #, no-wrap
 msgid "{Data Type} nginx-location-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:15649
+#: doc/guix.texi:15694
 msgid ""
 "Data type representing the configuration of an nginx @code{location} block.  "
 "This type has the following parameters:"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15653
+#: doc/guix.texi:15698
 msgid "URI which this location block matches."
 msgstr ""
 
 #. type: anchor{#1}
-#: doc/guix.texi:15655
+#: doc/guix.texi:15700
 msgid "nginx-location-configuration body"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:15655 doc/guix.texi:15676
+#: doc/guix.texi:15700 doc/guix.texi:15721
 #, no-wrap
 msgid "body"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15662
+#: doc/guix.texi:15707
 msgid ""
 "Body of the location block, specified as a list of strings. This can contain "
 "many configuration directives.  For example, to pass requests to a upstream "
@@ -33749,13 +34598,13 @@ msgid ""
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:15666
+#: doc/guix.texi:15711
 #, no-wrap
 msgid "{Data Type} nginx-named-location-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:15671
+#: doc/guix.texi:15716
 msgid ""
 "Data type representing the configuration of an nginx named location block.  "
 "Named location blocks are used for request redirection, and not used for "
@@ -33763,33 +34612,33 @@ msgid ""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15675
+#: doc/guix.texi:15720
 msgid "Name to identify this location block."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15681
+#: doc/guix.texi:15726
 msgid ""
 "@xref{nginx-location-configuration body}, as the body for named location "
-"blocks can be used in a similar way to the "
-"@code{nginx-location-configuration body}.  One restriction is that the body "
-"of a named location block cannot contain location blocks."
+"blocks can be used in a similar way to the @code{nginx-location-"
+"configuration body}.  One restriction is that the body of a named location "
+"block cannot contain location blocks."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:15685
+#: doc/guix.texi:15730
 #, no-wrap
 msgid "fastcgi"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:15686
+#: doc/guix.texi:15731
 #, no-wrap
 msgid "fcgiwrap"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:15693
+#: doc/guix.texi:15738
 msgid ""
 "FastCGI is an interface between the front-end and the back-end of a web "
 "service.  It is a somewhat legacy facility; new web services should "
@@ -33799,7 +34648,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:15700
+#: doc/guix.texi:15745
 msgid ""
 "To use FastCGI, you configure the front-end web server (e.g., nginx) to "
 "dispatch some subset of its requests to the fastcgi backend, which listens "
@@ -33810,69 +34659,69 @@ msgid ""
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:15701
+#: doc/guix.texi:15746
 #, no-wrap
 msgid "{Scheme Variable} fcgiwrap-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:15703
+#: doc/guix.texi:15748
 msgid "A service type for the @code{fcgiwrap} FastCGI proxy."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:15705
+#: doc/guix.texi:15750
 #, no-wrap
 msgid "{Data Type} fcgiwrap-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:15708
+#: doc/guix.texi:15753
 msgid ""
 "Data type representing the configuration of the @code{fcgiwrap} serice.  "
 "This type has the following parameters:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15709
+#: doc/guix.texi:15754
 #, no-wrap
 msgid "@code{package} (default: @code{fcgiwrap})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15711
+#: doc/guix.texi:15756
 msgid "The fcgiwrap package to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15712
+#: doc/guix.texi:15757
 #, no-wrap
 msgid "@code{socket} (default: @code{tcp:127.0.0.1:9000})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15718
+#: doc/guix.texi:15763
 msgid ""
 "The socket on which the @code{fcgiwrap} process should listen, as a string.  "
 "Valid @var{socket} values include @code{unix:@var{/path/to/unix/socket}}, "
-"@code{tcp:@var{dot.ted.qu.ad}:@var{port}} and "
-"@code{tcp6:[@var{ipv6_addr}]:port}."
+"@code{tcp:@var{dot.ted.qu.ad}:@var{port}} and @code{tcp6:[@var{ipv6_addr}]:"
+"port}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15719
+#: doc/guix.texi:15764
 #, no-wrap
 msgid "@code{user} (default: @code{fcgiwrap})"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:15720
+#: doc/guix.texi:15765
 #, no-wrap
 msgid "@code{group} (default: @code{fcgiwrap})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15725
+#: doc/guix.texi:15770
 msgid ""
 "The user and group names, as strings, under which to run the @code{fcgiwrap} "
 "process.  The @code{fastcgi} service will ensure that if the user asks for "
@@ -33881,7 +34730,7 @@ msgid ""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15732
+#: doc/guix.texi:15777
 msgid ""
 "It is possible to configure a FastCGI-backed web service to pass HTTP "
 "authentication information from the front-end to the back-end, and to allow "
@@ -33892,284 +34741,276 @@ msgid ""
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:15735
+#: doc/guix.texi:15780
 #, no-wrap
 msgid "php-fpm"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:15738
+#: doc/guix.texi:15783
 msgid ""
 "PHP-FPM (FastCGI Process Manager) is an alternative PHP FastCGI "
 "implementation with some additional features useful for sites of any size."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:15740
+#: doc/guix.texi:15785
 msgid "These features include:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15741
+#: doc/guix.texi:15786
 #, no-wrap
 msgid "Adaptive process spawning"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15742
+#: doc/guix.texi:15787
 #, no-wrap
 msgid "Basic statistics (similar to Apache's mod_status)"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15743
+#: doc/guix.texi:15788
 #, no-wrap
 msgid "Advanced process management with graceful stop/start"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15744
+#: doc/guix.texi:15789
 #, no-wrap
 msgid "Ability to start workers with different uid/gid/chroot/environment"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:15746
+#: doc/guix.texi:15791
 msgid "and different php.ini (replaces safe_mode)"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15746
+#: doc/guix.texi:15791
 #, no-wrap
 msgid "Stdout & stderr logging"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15747
+#: doc/guix.texi:15792
 #, no-wrap
 msgid "Emergency restart in case of accidental opcode cache destruction"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15748
+#: doc/guix.texi:15793
 #, no-wrap
 msgid "Accelerated upload support"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15749
+#: doc/guix.texi:15794
 #, no-wrap
 msgid "Support for a \"slowlog\""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15750
+#: doc/guix.texi:15795
 #, no-wrap
 msgid "Enhancements to FastCGI, such as fastcgi_finish_request() -"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:15753
+#: doc/guix.texi:15798
 msgid ""
 "a special function to finish request & flush all data while continuing to do "
 "something time-consuming (video converting, stats processing, etc.)"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:15755
+#: doc/guix.texi:15800
 msgid "... and much more."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:15756
+#: doc/guix.texi:15801
 #, no-wrap
 msgid "{Scheme Variable} php-fpm-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:15758
+#: doc/guix.texi:15803
 msgid "A Service type for @code{php-fpm}."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:15760
+#: doc/guix.texi:15805
 #, no-wrap
 msgid "{Data Type} php-fpm-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:15762
+#: doc/guix.texi:15807
 msgid "Data Type for php-fpm service configuration."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15763
+#: doc/guix.texi:15808
 #, no-wrap
 msgid "@code{php} (default: @code{php})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15765
+#: doc/guix.texi:15810
 msgid "The php package to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15765
+#: doc/guix.texi:15810
 #, no-wrap
-msgid ""
-"@code{socket} (default: @code{(string-append \"/var/run/php\" (version-major "
-"(package-version php)) \"-fpm.sock\")})"
+msgid "@code{socket} (default: @code{(string-append \"/var/run/php\" (version-major (package-version php)) \"-fpm.sock\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15767
+#: doc/guix.texi:15812
 msgid "The address on which to accept FastCGI requests.  Valid syntaxes are:"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:15768
+#: doc/guix.texi:15813
 #, no-wrap
 msgid "\"ip.add.re.ss:port\""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15770
+#: doc/guix.texi:15815
 msgid "Listen on a TCP socket to a specific address on a specific port."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:15770
+#: doc/guix.texi:15815
 #, no-wrap
 msgid "\"port\""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15772
+#: doc/guix.texi:15817
 msgid "Listen on a TCP socket to all addresses on a specific port."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:15772
+#: doc/guix.texi:15817
 #, no-wrap
 msgid "\"/path/to/unix/socket\""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15774
+#: doc/guix.texi:15819
 msgid "Listen on a unix socket."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15776
+#: doc/guix.texi:15821
 #, no-wrap
 msgid "@code{user} (default: @code{php-fpm})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15778
+#: doc/guix.texi:15823
 msgid "User who will own the php worker processes."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15778
+#: doc/guix.texi:15823
 #, no-wrap
 msgid "@code{group} (default: @code{php-fpm})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15780
+#: doc/guix.texi:15825
 msgid "Group of the worker processes."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15780
+#: doc/guix.texi:15825
 #, no-wrap
 msgid "@code{socket-user} (default: @code{php-fpm})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15782
+#: doc/guix.texi:15827
 msgid "User who can speak to the php-fpm socket."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15782
+#: doc/guix.texi:15827
 #, no-wrap
 msgid "@code{socket-group} (default: @code{php-fpm})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15784
+#: doc/guix.texi:15829
 msgid "Group that can speak to the php-fpm socket."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15784
+#: doc/guix.texi:15829
 #, no-wrap
-msgid ""
-"@code{pid-file} (default: @code{(string-append \"/var/run/php\" "
-"(version-major (package-version php)) \"-fpm.pid\")})"
+msgid "@code{pid-file} (default: @code{(string-append \"/var/run/php\" (version-major (package-version php)) \"-fpm.pid\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15787
+#: doc/guix.texi:15832
 msgid ""
 "The process id of the php-fpm process is written to this file once the "
 "service has started."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15787
+#: doc/guix.texi:15832
 #, no-wrap
-msgid ""
-"@code{log-file} (default: @code{(string-append \"/var/log/php\" "
-"(version-major (package-version php)) \"-fpm.log\")})"
+msgid "@code{log-file} (default: @code{(string-append \"/var/log/php\" (version-major (package-version php)) \"-fpm.log\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15789
+#: doc/guix.texi:15834
 msgid "Log for the php-fpm master process."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15789
+#: doc/guix.texi:15834
 #, no-wrap
-msgid ""
-"@code{process-manager} (default: "
-"@code{(php-fpm-dynamic-process-manager-configuration)})"
+msgid "@code{process-manager} (default: @code{(php-fpm-dynamic-process-manager-configuration)})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15792
+#: doc/guix.texi:15837
 msgid "Detailed settings for the php-fpm process manager.  Must be either:"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:15793
+#: doc/guix.texi:15838
 #, no-wrap
 msgid "<php-fpm-dynamic-process-manager-configuration>"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:15794
+#: doc/guix.texi:15839
 #, no-wrap
 msgid "<php-fpm-static-process-manager-configuration>"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:15795
+#: doc/guix.texi:15840
 #, no-wrap
 msgid "<php-fpm-on-demand-process-manager-configuration>"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15797
+#: doc/guix.texi:15842
 #, no-wrap
 msgid "@code{display-errors} (default @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15802
+#: doc/guix.texi:15847
 msgid ""
 "Determines whether php errors and warning should be sent to clients and "
 "displayed in their browsers.  This is useful for local php development, but "
@@ -34178,41 +35019,39 @@ msgid ""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15802
+#: doc/guix.texi:15847
 #, no-wrap
-msgid ""
-"@code{workers-logfile} (default @code{(string-append \"/var/log/php\" "
-"(version-major (package-version php)) \"-fpm.www.log\")})"
+msgid "@code{workers-logfile} (default @code{(string-append \"/var/log/php\" (version-major (package-version php)) \"-fpm.www.log\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15805
+#: doc/guix.texi:15850
 msgid ""
 "This file will log the @code{stderr} outputs of php worker processes.  Can "
 "be set to @code{#f} to disable logging."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15805
+#: doc/guix.texi:15850
 #, no-wrap
 msgid "@code{file} (default @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15808
+#: doc/guix.texi:15853
 msgid ""
 "An optional override of the whole configuration.  You can use the "
 "@code{mixed-text-file} function or an absolute filepath for it."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:15811
+#: doc/guix.texi:15856
 #, no-wrap
 msgid "{Data type} php-fpm-dynamic-process-manager-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:15815
+#: doc/guix.texi:15860
 msgid ""
 "Data Type for the @code{dynamic} php-fpm process manager.  With the "
 "@code{dynamic} process manager, spare worker processes are kept around based "
@@ -34220,57 +35059,57 @@ msgid ""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15816 doc/guix.texi:15832 doc/guix.texi:15842
+#: doc/guix.texi:15861 doc/guix.texi:15877 doc/guix.texi:15887
 #, no-wrap
 msgid "@code{max-children} (default: @code{5})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15818 doc/guix.texi:15834 doc/guix.texi:15844
+#: doc/guix.texi:15863 doc/guix.texi:15879 doc/guix.texi:15889
 msgid "Maximum of worker processes."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15818
+#: doc/guix.texi:15863
 #, no-wrap
 msgid "@code{start-servers} (default: @code{2})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15820
+#: doc/guix.texi:15865
 msgid "How many worker processes should be started on start-up."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15820
+#: doc/guix.texi:15865
 #, no-wrap
 msgid "@code{min-spare-servers} (default: @code{1})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15822
+#: doc/guix.texi:15867
 msgid "How many spare worker processes should be kept around at minimum."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15822
+#: doc/guix.texi:15867
 #, no-wrap
 msgid "@code{max-spare-servers} (default: @code{3})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15824
+#: doc/guix.texi:15869
 msgid "How many spare worker processes should be kept around at maximum."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:15827
+#: doc/guix.texi:15872
 #, no-wrap
 msgid "{Data type} php-fpm-static-process-manager-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:15831
+#: doc/guix.texi:15876
 msgid ""
 "Data Type for the @code{static} php-fpm process manager.  With the "
 "@code{static} process manager, an unchanging number of worker processes are "
@@ -34278,13 +35117,13 @@ msgid ""
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:15837
+#: doc/guix.texi:15882
 #, no-wrap
 msgid "{Data type} php-fpm-on-demand-process-manager-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:15841
+#: doc/guix.texi:15886
 msgid ""
 "Data Type for the @code{on-demand} php-fpm process manager.  With the "
 "@code{on-demand} process manager, worker processes are only created as "
@@ -34292,37 +35131,37 @@ msgid ""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15844
+#: doc/guix.texi:15889
 #, no-wrap
 msgid "@code{process-idle-timeout} (default: @code{10})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15846
+#: doc/guix.texi:15891
 msgid "The time in seconds after which a process with no requests is killed."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:15850
+#: doc/guix.texi:15895
 #, no-wrap
 msgid "{Scheme Procedure} nginx-php-fpm-location @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:15856
+#: doc/guix.texi:15901
 msgid ""
-"[#:nginx-package nginx] @ [socket (string-append \"/var/run/php\" @ "
-"(version-major (package-version php)) @ \"-fpm.sock\")] A helper function to "
-"quickly add php to an @code{nginx-server-configuration}."
+"[#:nginx-package nginx] @ [socket (string-append \"/var/run/php\" @ (version-"
+"major (package-version php)) @ \"-fpm.sock\")] A helper function to quickly "
+"add php to an @code{nginx-server-configuration}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:15859
+#: doc/guix.texi:15904
 msgid "A simple services setup for nginx with php can look like this:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:15872
+#: doc/guix.texi:15917
 #, no-wrap
 msgid ""
 "(services (cons* (dhcp-client-service)\n"
@@ -34340,44 +35179,43 @@ msgid ""
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:15874
+#: doc/guix.texi:15919
 #, no-wrap
 msgid "cat-avatar-generator"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:15878
+#: doc/guix.texi:15923
 msgid ""
-"The cat avatar generator is a simple service to demonstrate the use of "
-"php-fpm in @code{Nginx}.  It is used to generate cat avatar from a seed, for "
+"The cat avatar generator is a simple service to demonstrate the use of php-"
+"fpm in @code{Nginx}.  It is used to generate cat avatar from a seed, for "
 "instance the hash of a user's email address."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:15879
+#: doc/guix.texi:15924
 #, no-wrap
 msgid "{Scheme Procedure} cat-avatar-generator-serice @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:15887
+#: doc/guix.texi:15932
 msgid ""
-"[#:cache-dir \"/var/cache/cat-avatar-generator\"] @ [#:package "
-"cat-avatar-generator] @ [#:configuration (nginx-server-configuration)] "
-"Returns an nginx-server-configuration that inherits @code{configuration}.  "
-"It extends the nginx configuration to add a server block that serves "
-"@code{package}, a version of cat-avatar-generator.  During execution, "
-"cat-avatar-generator will be able to use @code{cache-dir} as its cache "
-"directory."
+"[#:cache-dir \"/var/cache/cat-avatar-generator\"] @ [#:package cat-avatar-"
+"generator] @ [#:configuration (nginx-server-configuration)] Returns an nginx-"
+"server-configuration that inherits @code{configuration}.  It extends the "
+"nginx configuration to add a server block that serves @code{package}, a "
+"version of cat-avatar-generator.  During execution, cat-avatar-generator "
+"will be able to use @code{cache-dir} as its cache directory."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:15890
+#: doc/guix.texi:15935
 msgid "A simple setup for cat-avatar-generator can look like this:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:15897
+#: doc/guix.texi:15942
 #, no-wrap
 msgid ""
 "(services (cons* (cat-avatar-generator-service\n"
@@ -34389,31 +35227,31 @@ msgid ""
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:15902
+#: doc/guix.texi:15947
 #, no-wrap
 msgid "Web"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:15903
+#: doc/guix.texi:15948
 #, no-wrap
 msgid "HTTP, HTTPS"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:15904
+#: doc/guix.texi:15949
 #, no-wrap
 msgid "Let's Encrypt"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:15905
+#: doc/guix.texi:15950
 #, no-wrap
 msgid "TLS certificates"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:15912
+#: doc/guix.texi:15957
 msgid ""
 "The @code{(gnu services certbot)} module provides a service to automatically "
 "obtain a valid TLS certificate from the Let's Encrypt certificate "
@@ -34423,7 +35261,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:15924
+#: doc/guix.texi:15969
 msgid ""
 "@url{https://letsencrypt.org/, Let's Encrypt} provides the @code{certbot} "
 "tool to automate the certification process.  This tool first securely "
@@ -34438,7 +35276,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:15931
+#: doc/guix.texi:15976
 msgid ""
 "The certbot service automates this process: the initial key generation, the "
 "initial certification request to the Let's Encrypt service, the web server "
@@ -34448,7 +35286,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:15937
+#: doc/guix.texi:15982
 msgid ""
 "Certbot is run twice a day, at a random minute within the hour.  It won't do "
 "anything until your certificates are due for renewal or revoked, but running "
@@ -34457,27 +35295,27 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:15941
+#: doc/guix.texi:15986
 msgid ""
 "By using this service, you agree to the ACME Subscriber Agreement, which can "
 "be found there: @url{https://acme-v01.api.letsencrypt.org/directory}."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:15942
+#: doc/guix.texi:15987
 #, no-wrap
 msgid "{Scheme Variable} certbot-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:15945
+#: doc/guix.texi:15990
 msgid ""
 "A service type for the @code{certbot} Let's Encrypt client.  Its value must "
 "be a @code{certbot-configuration} record as in this example:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:15952
+#: doc/guix.texi:15997
 #, no-wrap
 msgid ""
 "(define %nginx-deploy-hook\n"
@@ -34489,7 +35327,7 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:15963
+#: doc/guix.texi:16008
 #, no-wrap
 msgid ""
 "(service certbot-service-type\n"
@@ -34505,55 +35343,54 @@ msgid ""
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:15966
+#: doc/guix.texi:16011
 msgid "See below for details about @code{certbot-configuration}."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:15968
+#: doc/guix.texi:16013
 #, no-wrap
 msgid "{Data Type} certbot-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:15971
+#: doc/guix.texi:16016
 msgid ""
 "Data type representing the configuration of the @code{certbot} service.  "
 "This type has the following parameters:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15973
+#: doc/guix.texi:16018
 #, no-wrap
 msgid "@code{package} (default: @code{certbot})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15975
+#: doc/guix.texi:16020
 msgid "The certbot package to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15976
+#: doc/guix.texi:16021
 #, no-wrap
 msgid "@code{webroot} (default: @code{/var/www})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15979
+#: doc/guix.texi:16024
 msgid ""
-"The directory from which to serve the Let's Encrypt challenge/response "
-"files."
+"The directory from which to serve the Let's Encrypt challenge/response files."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15980
+#: doc/guix.texi:16025
 #, no-wrap
 msgid "@code{certificates} (default: @code{()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15984
+#: doc/guix.texi:16029
 msgid ""
 "A list of @code{certificates-configuration}s for which to generate "
 "certificates and request signatures.  Each certificate has a @code{name} and "
@@ -34561,50 +35398,50 @@ msgid ""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15988
+#: doc/guix.texi:16033
 msgid ""
 "Mandatory email used for registration, recovery contact, and important "
 "account notifications."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15989
+#: doc/guix.texi:16034
 #, no-wrap
 msgid "@code{rsa-key-size} (default: @code{2048})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15991
+#: doc/guix.texi:16036
 msgid "Size of the RSA key."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15992
+#: doc/guix.texi:16037
 #, no-wrap
 msgid "@code{default-location} (default: @i{see below})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16001
+#: doc/guix.texi:16046
 msgid ""
 "The default @code{nginx-location-configuration}.  Because @code{certbot} "
 "needs to be able to serve challenges and responses, it needs to be able to "
 "run a web server.  It does so by extending the @code{nginx} web service with "
 "an @code{nginx-server-configuration} listening on the @var{domains} on port "
-"80, and which has a @code{nginx-location-configuration} for the "
-"@code{/.well-known/} URI path subspace used by Let's Encrypt.  @xref{Web "
-"Services}, for more on these nginx configuration data types."
+"80, and which has a @code{nginx-location-configuration} for the @code{/.well-"
+"known/} URI path subspace used by Let's Encrypt.  @xref{Web Services}, for "
+"more on these nginx configuration data types."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16005
+#: doc/guix.texi:16050
 msgid ""
 "Requests to other URL paths will be matched by the @code{default-location}, "
 "which if present is added to all @code{nginx-server-configuration}s."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16009
+#: doc/guix.texi:16054
 msgid ""
 "By default, the @code{default-location} will issue a redirect from "
 "@code{http://@var{domain}/...} to @code{https://@var{domain}/...}, leaving "
@@ -34612,31 +35449,31 @@ msgid ""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16011
+#: doc/guix.texi:16056
 msgid "Pass @code{#f} to not issue a default location."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:16014
+#: doc/guix.texi:16059
 #, no-wrap
 msgid "{Data Type} certificate-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:16017
+#: doc/guix.texi:16062
 msgid ""
 "Data type representing the configuration of a certificate.  This type has "
 "the following parameters:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16019
+#: doc/guix.texi:16064
 #, no-wrap
 msgid "@code{name} (default: @i{see below})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16023
+#: doc/guix.texi:16068
 msgid ""
 "This name is used by Certbot for housekeeping and in file paths; it doesn't "
 "affect the content of the certificate itself.  To see certificate names, run "
@@ -34644,43 +35481,42 @@ msgid ""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16025
+#: doc/guix.texi:16070
 msgid "Its default is the first provided domain."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16026
+#: doc/guix.texi:16071
 #, no-wrap
 msgid "@code{domains} (default: @code{()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16029
+#: doc/guix.texi:16074
 msgid ""
 "The first domain provided will be the subject CN of the certificate, and all "
 "domains will be Subject Alternative Names on the certificate."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16030
+#: doc/guix.texi:16075
 #, no-wrap
 msgid "@code{deploy-hook} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16038
+#: doc/guix.texi:16083
 msgid ""
 "Command to be run in a shell once for each successfully issued certificate.  "
 "For this command, the shell variable @code{$RENEWED_LINEAGE} will point to "
-"the config live subdirectory (for example, "
-"@samp{\"/etc/letsencrypt/live/example.com\"}) containing the new "
-"certificates and keys; the shell variable @code{$RENEWED_DOMAINS} will "
-"contain a space-delimited list of renewed certificate domains (for example, "
-"@samp{\"example.com www.example.com\"}."
+"the config live subdirectory (for example, @samp{\"/etc/letsencrypt/live/"
+"example.com\"}) containing the new certificates and keys; the shell variable "
+"@code{$RENEWED_DOMAINS} will contain a space-delimited list of renewed "
+"certificate domains (for example, @samp{\"example.com www.example.com\"}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:16045
+#: doc/guix.texi:16090
 msgid ""
 "For each @code{certificate-configuration}, the certificate is saved to "
 "@code{/etc/letsencrypt/live/@var{name}/fullchain.pem} and the key is saved "
@@ -34688,19 +35524,19 @@ msgid ""
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:16047
+#: doc/guix.texi:16092
 #, no-wrap
 msgid "DNS (domain name system)"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:16048
+#: doc/guix.texi:16093
 #, no-wrap
 msgid "domain name system (DNS)"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:16054
+#: doc/guix.texi:16099
 msgid ""
 "The @code{(gnu services dns)} module provides services related to the "
 "@dfn{domain name system} (DNS).  It provides a server service for hosting an "
@@ -34709,14 +35545,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:16057
+#: doc/guix.texi:16102
 msgid ""
 "An example configuration of an authoritative server for two zones, one "
 "master and one slave, is:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:16064
+#: doc/guix.texi:16109
 #, no-wrap
 msgid ""
 "(define-zone-entries example.org.zone\n"
@@ -34728,7 +35564,7 @@ msgid ""
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:16071
+#: doc/guix.texi:16116
 #, no-wrap
 msgid ""
 "(define master-zone\n"
@@ -34741,7 +35577,7 @@ msgid ""
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:16077
+#: doc/guix.texi:16122
 #, no-wrap
 msgid ""
 "(define slave-zone\n"
@@ -34753,7 +35589,7 @@ msgid ""
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:16082
+#: doc/guix.texi:16127
 #, no-wrap
 msgid ""
 "(define plop-master\n"
@@ -34764,7 +35600,7 @@ msgid ""
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:16091
+#: doc/guix.texi:16136
 #, no-wrap
 msgid ""
 "(operating-system\n"
@@ -34778,18 +35614,18 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:16093
+#: doc/guix.texi:16138
 #, no-wrap
 msgid "{Scheme Variable} knot-service-type"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:16095
+#: doc/guix.texi:16140
 msgid "This is the type for the Knot DNS server."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:16103
+#: doc/guix.texi:16148
 msgid ""
 "Knot DNS is an authoritative DNS server, meaning that it can serve multiple "
 "zones, that is to say domain names you would buy from a registrar.  This "
@@ -34802,87 +35638,88 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:16105
+#: doc/guix.texi:16150
 msgid "The following data types are used to configure the Knot DNS server:"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:16107
+#: doc/guix.texi:16152
 #, no-wrap
 msgid "{Data Type} knot-key-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:16110
+#: doc/guix.texi:16155
 msgid "Data type representing a key.  This type has the following parameters:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16112 doc/guix.texi:16132 doc/guix.texi:16247 doc/guix.texi:16273 doc/guix.texi:16308
+#: doc/guix.texi:16157 doc/guix.texi:16177 doc/guix.texi:16292
+#: doc/guix.texi:16318 doc/guix.texi:16353
 #, no-wrap
 msgid "@code{id} (default: @code{\"\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16115
+#: doc/guix.texi:16160
 msgid ""
 "An identifier for other configuration fields to refer to this key. IDs must "
 "be unique and must not be empty."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16116
+#: doc/guix.texi:16161
 #, no-wrap
 msgid "@code{algorithm} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16120
+#: doc/guix.texi:16165
 msgid ""
 "The algorithm to use.  Choose between @code{#f}, @code{'hmac-md5}, "
-"@code{'hmac-sha1}, @code{'hmac-sha224}, @code{'hmac-sha256}, "
-"@code{'hmac-sha384} and @code{'hmac-sha512}."
+"@code{'hmac-sha1}, @code{'hmac-sha224}, @code{'hmac-sha256}, @code{'hmac-"
+"sha384} and @code{'hmac-sha512}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16121
+#: doc/guix.texi:16166
 #, no-wrap
 msgid "@code{secret} (default: @code{\"\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16123
+#: doc/guix.texi:16168
 msgid "The secret key itself."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:16127
+#: doc/guix.texi:16172
 #, no-wrap
 msgid "{Data Type} knot-acl-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:16130
+#: doc/guix.texi:16175
 msgid ""
 "Data type representing an Access Control List (ACL) configuration.  This "
 "type has the following parameters:"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16135
+#: doc/guix.texi:16180
 msgid ""
 "An identifier for ether configuration fields to refer to this key. IDs must "
 "be unique and must not be empty."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16136 doc/guix.texi:16251
+#: doc/guix.texi:16181 doc/guix.texi:16296
 #, no-wrap
 msgid "@code{address} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16140
+#: doc/guix.texi:16185
 msgid ""
 "An ordered list of IP addresses, network subnets, or network ranges "
 "represented with strings.  The query must match one of them.  Empty value "
@@ -34890,13 +35727,13 @@ msgid ""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16141
+#: doc/guix.texi:16186
 #, no-wrap
 msgid "@code{key} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16145
+#: doc/guix.texi:16190
 msgid ""
 "An ordered list of references to keys represented with strings.  The string "
 "must match a key ID defined in a @code{knot-key-configuration}.  No key "
@@ -34904,13 +35741,13 @@ msgid ""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16146
+#: doc/guix.texi:16191
 #, no-wrap
 msgid "@code{action} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16150
+#: doc/guix.texi:16195
 msgid ""
 "An ordered list of actions that are permitted or forbidden by this ACL.  "
 "Possible values are lists of zero or more elements from @code{'transfer}, "
@@ -34918,39 +35755,39 @@ msgid ""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16151
+#: doc/guix.texi:16196
 #, no-wrap
 msgid "@code{deny?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16154
+#: doc/guix.texi:16199
 msgid ""
 "When true, the ACL defines restrictions.  Listed actions are forbidden.  "
 "When false, listed actions are allowed."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:16158
+#: doc/guix.texi:16203
 #, no-wrap
 msgid "{Data Type} zone-entry"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:16161
+#: doc/guix.texi:16206
 msgid ""
 "Data type represnting a record entry in a zone file.  This type has the "
 "following parameters:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16163
+#: doc/guix.texi:16208
 #, no-wrap
 msgid "@code{name} (default: @code{\"@@\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16169
+#: doc/guix.texi:16214
 msgid ""
 "The name of the record.  @code{\"@@\"} refers to the origin of the zone.  "
 "Names are relative to the origin of the zone.  For example, in the "
@@ -34960,37 +35797,38 @@ msgid ""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16170
+#: doc/guix.texi:16215
 #, no-wrap
 msgid "@code{ttl} (default: @code{\"\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16172
-msgid "The Time-To-Live (TTL) of this record.  If not set, the default TTL is used."
+#: doc/guix.texi:16217
+msgid ""
+"The Time-To-Live (TTL) of this record.  If not set, the default TTL is used."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16173
+#: doc/guix.texi:16218
 #, no-wrap
 msgid "@code{class} (default: @code{\"IN\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16176
+#: doc/guix.texi:16221
 msgid ""
 "The class of the record.  Knot currently supports only @code{\"IN\"} and "
 "partially @code{\"CH\"}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16177
+#: doc/guix.texi:16222
 #, no-wrap
 msgid "@code{type} (default: @code{\"A\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16181
+#: doc/guix.texi:16226
 msgid ""
 "The type of the record.  Common types include A (IPv4 address), AAAA (IPv6 "
 "address), NS (Name Server) and MX (Mail eXchange).  Many other types are "
@@ -34998,13 +35836,13 @@ msgid ""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16182
+#: doc/guix.texi:16227
 #, no-wrap
 msgid "@code{data} (default: @code{\"\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16186
+#: doc/guix.texi:16231
 msgid ""
 "The data contained in the record.  For instance an IP address associated "
 "with an A record, or a domain name associated with an NS record.  Remember "
@@ -35012,20 +35850,20 @@ msgid ""
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:16190
+#: doc/guix.texi:16235
 #, no-wrap
 msgid "{Data Type} zone-file"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:16193
+#: doc/guix.texi:16238
 msgid ""
 "Data type representing the content of a zone file.  This type has the "
 "following parameters:"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16202
+#: doc/guix.texi:16247
 msgid ""
 "The list of entries.  The SOA record is taken care of, so you don't need to "
 "put it in the list of entries.  This list should probably contain an entry "
@@ -35036,24 +35874,24 @@ msgid ""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16203
+#: doc/guix.texi:16248
 #, no-wrap
 msgid "@code{origin} (default: @code{\"\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16205
+#: doc/guix.texi:16250
 msgid "The name of your zone.  This parameter cannot be empty."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16206
+#: doc/guix.texi:16251
 #, no-wrap
 msgid "@code{ns} (default: @code{\"ns\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16211
+#: doc/guix.texi:16256
 msgid ""
 "The domain of your primary authoritative DNS server.  The name is relative "
 "to the origin, unless it ends with a dot.  It is mandatory that this primary "
@@ -35062,26 +35900,26 @@ msgid ""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16212
+#: doc/guix.texi:16257
 #, no-wrap
 msgid "@code{mail} (default: @code{\"hostmaster\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16215
+#: doc/guix.texi:16260
 msgid ""
 "An email address people can contact you at, as the owner of the zone.  This "
 "is translated as @code{<mail>@@<origin>}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16216
+#: doc/guix.texi:16261
 #, no-wrap
 msgid "@code{serial} (default: @code{1})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16220
+#: doc/guix.texi:16265
 msgid ""
 "The serial number of the zone.  As this is used to keep track of changes by "
 "both slaves and resolvers, it is mandatory that it @emph{never} decreases.  "
@@ -35089,13 +35927,13 @@ msgid ""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16221
+#: doc/guix.texi:16266
 #, no-wrap
 msgid "@code{refresh} (default: @code{(* 2 24 3600)})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16225
+#: doc/guix.texi:16270
 msgid ""
 "The frequency at which slaves will do a zone transfer.  This value is a "
 "number of seconds.  It can be computed by multiplications or with "
@@ -35103,26 +35941,26 @@ msgid ""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16226
+#: doc/guix.texi:16271
 #, no-wrap
 msgid "@code{retry} (default: @code{(* 15 60)})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16229
+#: doc/guix.texi:16274
 msgid ""
 "The period after which a slave will retry to contact its master when it "
 "fails to do so a first time."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16230
+#: doc/guix.texi:16275
 #, no-wrap
 msgid "@code{expiry} (default: @code{(* 14 24 3600)})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16234
+#: doc/guix.texi:16279
 msgid ""
 "Default TTL of records.  Existing records are considered correct for at most "
 "this amount of time.  After this period, resolvers will invalidate their "
@@ -35130,40 +35968,40 @@ msgid ""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16235
+#: doc/guix.texi:16280
 #, no-wrap
 msgid "@code{nx} (default: @code{3600})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16238
+#: doc/guix.texi:16283
 msgid ""
 "Default TTL of inexistant records.  This delay is usually short because you "
 "want your new domains to reach everyone quickly."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:16242
+#: doc/guix.texi:16287
 #, no-wrap
 msgid "{Data Type} knot-remote-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:16245
+#: doc/guix.texi:16290
 msgid ""
 "Data type representing a remote configuration.  This type has the following "
 "parameters:"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16250
+#: doc/guix.texi:16295
 msgid ""
 "An identifier for other configuration fields to refer to this remote. IDs "
 "must be unique and must not be empty."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16255
+#: doc/guix.texi:16300
 msgid ""
 "An ordered list of destination IP addresses.  Addresses are tried in "
 "sequence.  An optional port can be given with the @@ separator.  For "
@@ -35171,13 +36009,13 @@ msgid ""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16256
+#: doc/guix.texi:16301
 #, no-wrap
 msgid "@code{via} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16260
+#: doc/guix.texi:16305
 msgid ""
 "An ordered list of source IP addresses.  An empty list will have Knot choose "
 "an appropriate source IP.  An optional port can be given with the @@ "
@@ -35185,70 +36023,71 @@ msgid ""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16261
+#: doc/guix.texi:16306
 #, no-wrap
 msgid "@code{key} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16264
+#: doc/guix.texi:16309
 msgid ""
 "A reference to a key, that is a string containing the identifier of a key "
 "defined in a @code{knot-key-configuration} field."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:16268
+#: doc/guix.texi:16313
 #, no-wrap
 msgid "{Data Type} knot-keystore-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:16271
+#: doc/guix.texi:16316
 msgid ""
 "Data type representing a keystore to hold dnssec keys.  This type has the "
 "following parameters:"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16275
+#: doc/guix.texi:16320
 msgid "The id of the keystore.  It must not be empty."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16276
+#: doc/guix.texi:16321
 #, no-wrap
 msgid "@code{backend} (default: @code{'pem})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16278
-msgid "The backend to store the keys in.  Can be @code{'pem} or @code{'pkcs11}."
+#: doc/guix.texi:16323
+msgid ""
+"The backend to store the keys in.  Can be @code{'pem} or @code{'pkcs11}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16279
+#: doc/guix.texi:16324
 #, no-wrap
 msgid "@code{config} (default: @code{\"/var/lib/knot/keys/keys\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16283
+#: doc/guix.texi:16328
 msgid ""
 "The configuration string of the backend.  An example for the PKCS#11 is: "
-"@code{\"pkcs11:token=knot;pin-value=1234 "
-"/gnu/store/.../lib/pkcs11/libsofthsm2.so\"}.  For the pem backend, the "
-"string reprensents a path in the file system."
+"@code{\"pkcs11:token=knot;pin-value=1234 /gnu/store/.../lib/pkcs11/"
+"libsofthsm2.so\"}.  For the pem backend, the string reprensents a path in "
+"the file system."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:16287
+#: doc/guix.texi:16332
 #, no-wrap
 msgid "{Data Type} knot-policy-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:16291
+#: doc/guix.texi:16336
 msgid ""
 "Data type representing a dnssec policy.  Knot DNS is able to automatically "
 "sign your zones.  It can either generate and manage your keys automatically "
@@ -35256,7 +36095,7 @@ msgid ""
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:16298
+#: doc/guix.texi:16343
 msgid ""
 "Dnssec is usually implemented using two keys: a Key Signing Key (KSK) that "
 "is used to sign the second, and a Zone Signing Key (ZSK) that is used to "
@@ -35268,7 +36107,7 @@ msgid ""
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:16304
+#: doc/guix.texi:16349
 msgid ""
 "The policy also defines the lifetime of keys.  Usually, ZSK can be changed "
 "easily and use weaker cryptographic functions (they use lower parameters) in "
@@ -35278,23 +36117,23 @@ msgid ""
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:16306
+#: doc/guix.texi:16351
 msgid "This type has the following parameters:"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16310
+#: doc/guix.texi:16355
 msgid "The id of the policy.  It must not be empty."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16311
+#: doc/guix.texi:16356
 #, no-wrap
 msgid "@code{keystore} (default: @code{\"default\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16316
+#: doc/guix.texi:16361
 msgid ""
 "A reference to a keystore, that is a string containing the identifier of a "
 "keystore defined in a @code{knot-keystore-configuration} field.  The "
@@ -35303,436 +36142,437 @@ msgid ""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16317
+#: doc/guix.texi:16362
 #, no-wrap
 msgid "@code{manual?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16319
+#: doc/guix.texi:16364
 msgid "Whether the key management is manual or automatic."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16320
+#: doc/guix.texi:16365
 #, no-wrap
 msgid "@code{single-type-signing?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16322
+#: doc/guix.texi:16367
 msgid "When @code{#t}, use the Single-Type Signing Scheme."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16323
+#: doc/guix.texi:16368
 #, no-wrap
 msgid "@code{algorithm} (default: @code{\"ecdsap256sha256\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16325
+#: doc/guix.texi:16370
 msgid "An algorithm of signing keys and issued signatures."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16326
+#: doc/guix.texi:16371
 #, no-wrap
 msgid "@code{ksk-size} (default: @code{256})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16329
+#: doc/guix.texi:16374
 msgid ""
 "The length of the KSK.  Note that this value is correct for the default "
 "algorithm, but would be unsecure for other algorithms."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16330
+#: doc/guix.texi:16375
 #, no-wrap
 msgid "@code{zsk-size} (default: @code{256})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16333
+#: doc/guix.texi:16378
 msgid ""
 "The length of the ZSK.  Note that this value is correct for the default "
 "algorithm, but would be unsecure for other algorithms."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16334
+#: doc/guix.texi:16379
 #, no-wrap
 msgid "@code{dnskey-ttl} (default: @code{'default})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16337
+#: doc/guix.texi:16382
 msgid ""
 "The TTL value for DNSKEY records added into zone apex.  The special "
 "@code{'default} value means same as the zone SOA TTL."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16338
+#: doc/guix.texi:16383
 #, no-wrap
 msgid "@code{zsk-lifetime} (default: @code{(* 30 24 3600)})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16340
+#: doc/guix.texi:16385
 msgid "The period between ZSK publication and the next rollover initiation."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16341
+#: doc/guix.texi:16386
 #, no-wrap
 msgid "@code{propagation-delay} (default: @code{(* 24 3600)})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16344
+#: doc/guix.texi:16389
 msgid ""
 "An extra delay added for each key rollover step.  This value should be high "
 "enough to cover propagation of data from the master server to all slaves."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16345
+#: doc/guix.texi:16390
 #, no-wrap
 msgid "@code{rrsig-lifetime} (default: @code{(* 14 24 3600)})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16347
+#: doc/guix.texi:16392
 msgid "A validity period of newly issued signatures."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16348
+#: doc/guix.texi:16393
 #, no-wrap
 msgid "@code{rrsig-refresh} (default: @code{(* 7 24 3600)})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16350
+#: doc/guix.texi:16395
 msgid ""
 "A period how long before a signature expiration the signature will be "
 "refreshed."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16351
+#: doc/guix.texi:16396
 #, no-wrap
 msgid "@code{nsec3?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16353
+#: doc/guix.texi:16398
 msgid "When @code{#t}, NSEC3 will be used instead of NSEC."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16354
+#: doc/guix.texi:16399
 #, no-wrap
 msgid "@code{nsec3-iterations} (default: @code{5})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16356
+#: doc/guix.texi:16401
 msgid "The number of additional times the hashing is performed."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16357
+#: doc/guix.texi:16402
 #, no-wrap
 msgid "@code{nsec3-salt-length} (default: @code{8})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16360
+#: doc/guix.texi:16405
 msgid ""
 "The length of a salt field in octets, which is appended to the original "
 "owner name before hashing."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16361
+#: doc/guix.texi:16406
 #, no-wrap
 msgid "@code{nsec3-salt-lifetime} (default: @code{(* 30 24 3600)})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16363
+#: doc/guix.texi:16408
 msgid "The validity period of newly issued salt field."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:16367
+#: doc/guix.texi:16412
 #, no-wrap
 msgid "{Data Type} knot-zone-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:16370
+#: doc/guix.texi:16415
 msgid ""
 "Data type representing a zone served by Knot.  This type has the following "
 "parameters:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16372
+#: doc/guix.texi:16417
 #, no-wrap
 msgid "@code{domain} (default: @code{\"\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16374
+#: doc/guix.texi:16419
 msgid "The domain served by this configuration.  It must not be empty."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16375
+#: doc/guix.texi:16420
 #, no-wrap
 msgid "@code{file} (default: @code{\"\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16378
+#: doc/guix.texi:16423
 msgid ""
 "The file where this zone is saved.  This parameter is ignored by master "
 "zones.  Empty means default location that depends on the domain name."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16379
+#: doc/guix.texi:16424
 #, no-wrap
 msgid "@code{zone} (default: @code{(zone-file)})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16382
+#: doc/guix.texi:16427
 msgid ""
 "The content of the zone file.  This parameter is ignored by slave zones.  It "
 "must contain a zone-file record."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16383
+#: doc/guix.texi:16428
 #, no-wrap
 msgid "@code{master} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16386
+#: doc/guix.texi:16431
 msgid ""
 "A list of master remotes.  When empty, this zone is a master.  When set, "
 "this zone is a slave.  This is a list of remotes identifiers."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16387
+#: doc/guix.texi:16432
 #, no-wrap
 msgid "@code{ddns-master} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16390
+#: doc/guix.texi:16435
 msgid ""
 "The main master.  When empty, it defaults to the first master in the list of "
 "masters."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16391
+#: doc/guix.texi:16436
 #, no-wrap
 msgid "@code{notify} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16393
+#: doc/guix.texi:16438
 msgid "A list of slave remote identifiers."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16394
+#: doc/guix.texi:16439
 #, no-wrap
 msgid "@code{acl} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16396
+#: doc/guix.texi:16441
 msgid "A list of acl identifiers."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16397
+#: doc/guix.texi:16442
 #, no-wrap
 msgid "@code{semantic-checks?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16399
+#: doc/guix.texi:16444
 msgid "When set, this adds more semantic checks to the zone."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16400
+#: doc/guix.texi:16445
 #, no-wrap
 msgid "@code{disable-any?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16402
+#: doc/guix.texi:16447
 msgid "When set, this forbids queries of the ANY type."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16403
+#: doc/guix.texi:16448
 #, no-wrap
 msgid "@code{zonefile-sync} (default: @code{0})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16406
+#: doc/guix.texi:16451
 msgid ""
 "The delay between a modification in memory and on disk.  0 means immediate "
 "synchronization."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16407
+#: doc/guix.texi:16452
 #, no-wrap
 msgid "@code{serial-policy} (default: @code{'increment})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16409
+#: doc/guix.texi:16454
 msgid "A policy between @code{'increment} and @code{'unixtime}."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:16413
+#: doc/guix.texi:16458
 #, no-wrap
 msgid "{Data Type} knot-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:16416
+#: doc/guix.texi:16461
 msgid ""
 "Data type representing the Knot configuration.  This type has the following "
 "parameters:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16418
+#: doc/guix.texi:16463
 #, no-wrap
 msgid "@code{knot} (default: @code{knot})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16420
+#: doc/guix.texi:16465
 msgid "The Knot package."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16421
+#: doc/guix.texi:16466
 #, no-wrap
 msgid "@code{run-directory} (default: @code{\"/var/run/knot\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16423
-msgid "The run directory.  This directory will be used for pid file and sockets."
+#: doc/guix.texi:16468
+msgid ""
+"The run directory.  This directory will be used for pid file and sockets."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16424
+#: doc/guix.texi:16469
 #, no-wrap
 msgid "@code{listen-v4} (default: @code{\"0.0.0.0\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16426 doc/guix.texi:16429
+#: doc/guix.texi:16471 doc/guix.texi:16474
 msgid "An ip address on which to listen."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16427
+#: doc/guix.texi:16472
 #, no-wrap
 msgid "@code{listen-v6} (default: @code{\"::\"})"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16430
+#: doc/guix.texi:16475
 #, no-wrap
 msgid "@code{listen-port} (default: @code{53})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16432
+#: doc/guix.texi:16477
 msgid "A port on which to listen."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16433
+#: doc/guix.texi:16478
 #, no-wrap
 msgid "@code{keys} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16435
+#: doc/guix.texi:16480
 msgid "The list of knot-key-configuration used by this configuration."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16436
+#: doc/guix.texi:16481
 #, no-wrap
 msgid "@code{acls} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16438
+#: doc/guix.texi:16483
 msgid "The list of knot-acl-configuration used by this configuration."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16439
+#: doc/guix.texi:16484
 #, no-wrap
 msgid "@code{remotes} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16441
+#: doc/guix.texi:16486
 msgid "The list of knot-remote-configuration used by this configuration."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16442
+#: doc/guix.texi:16487
 #, no-wrap
 msgid "@code{zones} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16444
+#: doc/guix.texi:16489
 msgid "The list of knot-zone-configuration used by this configuration."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:16451
+#: doc/guix.texi:16496
 #, no-wrap
 msgid "VPN (virtual private network)"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:16452
+#: doc/guix.texi:16497
 #, no-wrap
 msgid "virtual private network (VPN)"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:16458
+#: doc/guix.texi:16503
 msgid ""
 "The @code{(gnu services vpn)} module provides services related to "
 "@dfn{virtual private networks} (VPNs).  It provides a @emph{client} service "
@@ -35742,482 +36582,484 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:16459
+#: doc/guix.texi:16504
 #, no-wrap
 msgid "{Scheme Procedure} openvpn-client-service @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:16461
+#: doc/guix.texi:16506
 msgid "[#:config (openvpn-client-configuration)]"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:16463
-msgid "Return a service that runs @command{openvpn}, a VPN daemon, as a client."
+#: doc/guix.texi:16508
+msgid ""
+"Return a service that runs @command{openvpn}, a VPN daemon, as a client."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:16465
+#: doc/guix.texi:16510
 #, no-wrap
 msgid "{Scheme Procedure} openvpn-server-service @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:16467
+#: doc/guix.texi:16512
 msgid "[#:config (openvpn-server-configuration)]"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:16469
-msgid "Return a service that runs @command{openvpn}, a VPN daemon, as a server."
+#: doc/guix.texi:16514
+msgid ""
+"Return a service that runs @command{openvpn}, a VPN daemon, as a server."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:16471
+#: doc/guix.texi:16516
 msgid "Both can be run simultaneously."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:16476
+#: doc/guix.texi:16521
 msgid "Available @code{openvpn-client-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16477
+#: doc/guix.texi:16522
 #, no-wrap
 msgid "{@code{openvpn-client-configuration} parameter} package openvpn"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16479 doc/guix.texi:16615
+#: doc/guix.texi:16524 doc/guix.texi:16660
 msgid "The OpenVPN package."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16482
+#: doc/guix.texi:16527
 #, no-wrap
 msgid "{@code{openvpn-client-configuration} parameter} string pid-file"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16484 doc/guix.texi:16620
+#: doc/guix.texi:16529 doc/guix.texi:16665
 msgid "The OpenVPN pid file."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16486 doc/guix.texi:16622
+#: doc/guix.texi:16531 doc/guix.texi:16667
 msgid "Defaults to @samp{\"/var/run/openvpn/openvpn.pid\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16489
+#: doc/guix.texi:16534
 #, no-wrap
 msgid "{@code{openvpn-client-configuration} parameter} proto proto"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16492 doc/guix.texi:16628
+#: doc/guix.texi:16537 doc/guix.texi:16673
 msgid ""
-"The protocol (UDP or TCP) used to open a channel between clients and "
-"servers."
+"The protocol (UDP or TCP) used to open a channel between clients and servers."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16494 doc/guix.texi:16630
+#: doc/guix.texi:16539 doc/guix.texi:16675
 msgid "Defaults to @samp{udp}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16497
+#: doc/guix.texi:16542
 #, no-wrap
 msgid "{@code{openvpn-client-configuration} parameter} dev dev"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16499 doc/guix.texi:16635
+#: doc/guix.texi:16544 doc/guix.texi:16680
 msgid "The device type used to represent the VPN connection."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16501 doc/guix.texi:16637
+#: doc/guix.texi:16546 doc/guix.texi:16682
 msgid "Defaults to @samp{tun}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16504
+#: doc/guix.texi:16549
 #, no-wrap
 msgid "{@code{openvpn-client-configuration} parameter} string ca"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16506 doc/guix.texi:16642
+#: doc/guix.texi:16551 doc/guix.texi:16687
 msgid "The certificate authority to check connections against."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16508 doc/guix.texi:16644
+#: doc/guix.texi:16553 doc/guix.texi:16689
 msgid "Defaults to @samp{\"/etc/openvpn/ca.crt\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16511
+#: doc/guix.texi:16556
 #, no-wrap
 msgid "{@code{openvpn-client-configuration} parameter} string cert"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16514 doc/guix.texi:16650
+#: doc/guix.texi:16559 doc/guix.texi:16695
 msgid ""
 "The certificate of the machine the daemon is running on.  It should be "
 "signed by the authority given in @code{ca}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16516 doc/guix.texi:16652
+#: doc/guix.texi:16561 doc/guix.texi:16697
 msgid "Defaults to @samp{\"/etc/openvpn/client.crt\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16519
+#: doc/guix.texi:16564
 #, no-wrap
 msgid "{@code{openvpn-client-configuration} parameter} string key"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16522 doc/guix.texi:16658
+#: doc/guix.texi:16567 doc/guix.texi:16703
 msgid ""
 "The key of the machine the daemon is running on.  It must be the key whose "
 "certificate is @code{cert}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16524 doc/guix.texi:16660
+#: doc/guix.texi:16569 doc/guix.texi:16705
 msgid "Defaults to @samp{\"/etc/openvpn/client.key\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16527
+#: doc/guix.texi:16572
 #, no-wrap
 msgid "{@code{openvpn-client-configuration} parameter} boolean comp-lzo?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16529 doc/guix.texi:16665
+#: doc/guix.texi:16574 doc/guix.texi:16710
 msgid "Whether to use the lzo compression algorithm."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16534
+#: doc/guix.texi:16579
 #, no-wrap
 msgid "{@code{openvpn-client-configuration} parameter} boolean persist-key?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16536 doc/guix.texi:16672
+#: doc/guix.texi:16581 doc/guix.texi:16717
 msgid "Don't re-read key files across SIGUSR1 or --ping-restart."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16541
+#: doc/guix.texi:16586
 #, no-wrap
 msgid "{@code{openvpn-client-configuration} parameter} boolean persist-tun?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16544 doc/guix.texi:16680
+#: doc/guix.texi:16589 doc/guix.texi:16725
 msgid ""
 "Don't close and reopen TUN/TAP device or run up/down scripts across SIGUSR1 "
 "or --ping-restart restarts."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16549
+#: doc/guix.texi:16594
 #, no-wrap
 msgid "{@code{openvpn-client-configuration} parameter} number verbosity"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16551 doc/guix.texi:16687
+#: doc/guix.texi:16596 doc/guix.texi:16732
 msgid "Verbosity level."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16553 doc/guix.texi:16689 doc/guix.texi:17966 doc/guix.texi:18189
+#: doc/guix.texi:16598 doc/guix.texi:16734 doc/guix.texi:18011
+#: doc/guix.texi:18234
 msgid "Defaults to @samp{3}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16556
+#: doc/guix.texi:16601
 #, no-wrap
 msgid "{@code{openvpn-client-configuration} parameter} tls-auth-client tls-auth"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16559 doc/guix.texi:16695
+#: doc/guix.texi:16604 doc/guix.texi:16740
 msgid ""
 "Add an additional layer of HMAC authentication on top of the TLS control "
 "channel to protect against DoS attacks."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16564
+#: doc/guix.texi:16609
 #, no-wrap
 msgid "{@code{openvpn-client-configuration} parameter} key-usage verify-key-usage?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16566
+#: doc/guix.texi:16611
 msgid "Whether to check the server certificate has server usage extension."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16571
+#: doc/guix.texi:16616
 #, no-wrap
 msgid "{@code{openvpn-client-configuration} parameter} bind bind?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16573
+#: doc/guix.texi:16618
 msgid "Bind to a specific local port number."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16578
+#: doc/guix.texi:16623
 #, no-wrap
 msgid "{@code{openvpn-client-configuration} parameter} resolv-retry resolv-retry?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16580
+#: doc/guix.texi:16625
 msgid "Retry resolving server address."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16585
+#: doc/guix.texi:16630
 #, no-wrap
 msgid "{@code{openvpn-client-configuration} parameter} openvpn-remote-list remote"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16587
+#: doc/guix.texi:16632
 msgid "A list of remote servers to connect to."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16591
+#: doc/guix.texi:16636
 msgid "Available @code{openvpn-remote-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16592
+#: doc/guix.texi:16637
 #, no-wrap
 msgid "{@code{openvpn-remote-configuration} parameter} string name"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16594
+#: doc/guix.texi:16639
 msgid "Server name."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16596
+#: doc/guix.texi:16641
 msgid "Defaults to @samp{\"my-server\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16599
+#: doc/guix.texi:16644
 #, no-wrap
 msgid "{@code{openvpn-remote-configuration} parameter} number port"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16601
+#: doc/guix.texi:16646
 msgid "Port number the server listens to."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16603 doc/guix.texi:16704
+#: doc/guix.texi:16648 doc/guix.texi:16749
 msgid "Defaults to @samp{1194}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:16612
+#: doc/guix.texi:16657
 msgid "Available @code{openvpn-server-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16613
+#: doc/guix.texi:16658
 #, no-wrap
 msgid "{@code{openvpn-server-configuration} parameter} package openvpn"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16618
+#: doc/guix.texi:16663
 #, no-wrap
 msgid "{@code{openvpn-server-configuration} parameter} string pid-file"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16625
+#: doc/guix.texi:16670
 #, no-wrap
 msgid "{@code{openvpn-server-configuration} parameter} proto proto"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16633
+#: doc/guix.texi:16678
 #, no-wrap
 msgid "{@code{openvpn-server-configuration} parameter} dev dev"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16640
+#: doc/guix.texi:16685
 #, no-wrap
 msgid "{@code{openvpn-server-configuration} parameter} string ca"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16647
+#: doc/guix.texi:16692
 #, no-wrap
 msgid "{@code{openvpn-server-configuration} parameter} string cert"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16655
+#: doc/guix.texi:16700
 #, no-wrap
 msgid "{@code{openvpn-server-configuration} parameter} string key"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16663
+#: doc/guix.texi:16708
 #, no-wrap
 msgid "{@code{openvpn-server-configuration} parameter} boolean comp-lzo?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16670
+#: doc/guix.texi:16715
 #, no-wrap
 msgid "{@code{openvpn-server-configuration} parameter} boolean persist-key?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16677
+#: doc/guix.texi:16722
 #, no-wrap
 msgid "{@code{openvpn-server-configuration} parameter} boolean persist-tun?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16685
+#: doc/guix.texi:16730
 #, no-wrap
 msgid "{@code{openvpn-server-configuration} parameter} number verbosity"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16692
+#: doc/guix.texi:16737
 #, no-wrap
 msgid "{@code{openvpn-server-configuration} parameter} tls-auth-server tls-auth"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16700
+#: doc/guix.texi:16745
 #, no-wrap
 msgid "{@code{openvpn-server-configuration} parameter} number port"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16702
+#: doc/guix.texi:16747
 msgid "Specifies the port number on which the server listens."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16707
+#: doc/guix.texi:16752
 #, no-wrap
 msgid "{@code{openvpn-server-configuration} parameter} ip-mask server"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16709
+#: doc/guix.texi:16754
 msgid "An ip and mask specifying the subnet inside the virtual network."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16711
+#: doc/guix.texi:16756
 msgid "Defaults to @samp{\"10.8.0.0 255.255.255.0\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16714
+#: doc/guix.texi:16759
 #, no-wrap
 msgid "{@code{openvpn-server-configuration} parameter} cidr6 server-ipv6"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16716
+#: doc/guix.texi:16761
 msgid "A CIDR notation specifying the IPv6 subnet inside the virtual network."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16721
+#: doc/guix.texi:16766
 #, no-wrap
 msgid "{@code{openvpn-server-configuration} parameter} string dh"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16723
+#: doc/guix.texi:16768
 msgid "The Diffie-Hellman parameters file."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16725
+#: doc/guix.texi:16770
 msgid "Defaults to @samp{\"/etc/openvpn/dh2048.pem\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16728
+#: doc/guix.texi:16773
 #, no-wrap
 msgid "{@code{openvpn-server-configuration} parameter} string ifconfig-pool-persist"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16730
+#: doc/guix.texi:16775
 msgid "The file that records client IPs."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16732
+#: doc/guix.texi:16777
 msgid "Defaults to @samp{\"/etc/openvpn/ipp.txt\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16735
+#: doc/guix.texi:16780
 #, no-wrap
 msgid "{@code{openvpn-server-configuration} parameter} gateway redirect-gateway?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16737
+#: doc/guix.texi:16782
 msgid "When true, the server will act as a gateway for its clients."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16742
+#: doc/guix.texi:16787
 #, no-wrap
 msgid "{@code{openvpn-server-configuration} parameter} boolean client-to-client?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16744
+#: doc/guix.texi:16789
 msgid "When true, clients are allowed to talk to each other inside the VPN."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16749
+#: doc/guix.texi:16794
 #, no-wrap
 msgid "{@code{openvpn-server-configuration} parameter} keepalive keepalive"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16755
+#: doc/guix.texi:16800
 msgid ""
 "Causes ping-like messages to be sent back and forth over the link so that "
 "each side knows when the other side has gone down.  @code{keepalive} "
@@ -36226,98 +37068,96 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16758
+#: doc/guix.texi:16803
 #, no-wrap
 msgid "{@code{openvpn-server-configuration} parameter} number max-clients"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16760
+#: doc/guix.texi:16805
 msgid "The maximum number of clients."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16765
+#: doc/guix.texi:16810
 #, no-wrap
 msgid "{@code{openvpn-server-configuration} parameter} string status"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16768
+#: doc/guix.texi:16813
 msgid ""
 "The status file.  This file shows a small report on current connection.  It "
 "is truncated and rewritten every minute."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16770
+#: doc/guix.texi:16815
 msgid "Defaults to @samp{\"/var/run/openvpn/status\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16773
+#: doc/guix.texi:16818
 #, no-wrap
-msgid ""
-"{@code{openvpn-server-configuration} parameter} openvpn-ccd-list "
-"client-config-dir"
+msgid "{@code{openvpn-server-configuration} parameter} openvpn-ccd-list client-config-dir"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16775
+#: doc/guix.texi:16820
 msgid "The list of configuration for some clients."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16779
+#: doc/guix.texi:16824
 msgid "Available @code{openvpn-ccd-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16780
+#: doc/guix.texi:16825
 #, no-wrap
 msgid "{@code{openvpn-ccd-configuration} parameter} string name"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16782
+#: doc/guix.texi:16827
 msgid "Client name."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16784
+#: doc/guix.texi:16829
 msgid "Defaults to @samp{\"client\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16787
+#: doc/guix.texi:16832
 #, no-wrap
 msgid "{@code{openvpn-ccd-configuration} parameter} ip-mask iroute"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16789
+#: doc/guix.texi:16834
 msgid "Client own network"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16794
+#: doc/guix.texi:16839
 #, no-wrap
 msgid "{@code{openvpn-ccd-configuration} parameter} ip-mask ifconfig-push"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16796
+#: doc/guix.texi:16841
 msgid "Client VPN IP."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:16809
+#: doc/guix.texi:16854
 #, no-wrap
 msgid "NFS"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:16814
+#: doc/guix.texi:16859
 msgid ""
 "The @code{(gnu services nfs)} module provides the following services, which "
 "are most commonly used in relation to mounting or exporting directory trees "
@@ -36325,19 +37165,19 @@ msgid ""
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:16815
+#: doc/guix.texi:16860
 #, no-wrap
 msgid "RPC Bind Service"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:16816
+#: doc/guix.texi:16861
 #, no-wrap
 msgid "rpcbind"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:16822
+#: doc/guix.texi:16867
 msgid ""
 "The RPC Bind service provides a facility to map program numbers into "
 "universal addresses.  Many NFS related services use this facility.  Hence it "
@@ -36345,139 +37185,139 @@ msgid ""
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:16823
+#: doc/guix.texi:16868
 #, no-wrap
 msgid "{Scheme Variable} rpcbind-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:16825
+#: doc/guix.texi:16870
 msgid "A service type for the RPC portmapper daemon."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:16828
+#: doc/guix.texi:16873
 #, no-wrap
 msgid "{Data Type} rpcbind-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:16831
+#: doc/guix.texi:16876
 msgid ""
 "Data type representing the configuration of the RPC Bind Service.  This type "
 "has the following parameters:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16832
+#: doc/guix.texi:16877
 #, no-wrap
 msgid "@code{rpcbind} (default: @code{rpcbind})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16834
+#: doc/guix.texi:16879
 msgid "The rpcbind package to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16835
+#: doc/guix.texi:16880
 #, no-wrap
 msgid "@code{warm-start?} (default: @code{#t})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16839
+#: doc/guix.texi:16884
 msgid ""
 "If this parameter is @code{#t}, then the daemon will read a state file on "
 "startup thus reloading state information saved by a previous instance."
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:16843
+#: doc/guix.texi:16888
 #, no-wrap
 msgid "Pipefs Pseudo File System"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:16844
+#: doc/guix.texi:16889
 #, no-wrap
 msgid "pipefs"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:16845
+#: doc/guix.texi:16890
 #, no-wrap
 msgid "rpc_pipefs"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:16849
+#: doc/guix.texi:16894
 msgid ""
 "The pipefs file system is used to transfer NFS related data between the "
 "kernel and user space programs."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:16850
+#: doc/guix.texi:16895
 #, no-wrap
 msgid "{Scheme Variable} pipefs-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:16852
+#: doc/guix.texi:16897
 msgid "A service type for the pipefs pseudo file system."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:16854
+#: doc/guix.texi:16899
 #, no-wrap
 msgid "{Data Type} pipefs-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:16857
+#: doc/guix.texi:16902
 msgid ""
 "Data type representing the configuration of the pipefs pseudo file system "
 "service.  This type has the following parameters:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16858
+#: doc/guix.texi:16903
 #, no-wrap
 msgid "@code{mount-point} (default: @code{\"/var/lib/nfs/rpc_pipefs\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16860
+#: doc/guix.texi:16905
 msgid "The directory to which the file system is to be attached."
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:16864
+#: doc/guix.texi:16909
 #, no-wrap
 msgid "GSS Daemon Service"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:16865
+#: doc/guix.texi:16910
 #, no-wrap
 msgid "GSSD"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:16866
+#: doc/guix.texi:16911
 #, no-wrap
 msgid "GSS"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:16867
+#: doc/guix.texi:16912
 #, no-wrap
 msgid "global security system"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:16874
+#: doc/guix.texi:16919
 msgid ""
 "The @dfn{global security system} (GSS) daemon provides strong security for "
 "RPC based protocols.  Before exchanging RPC requests an RPC client must "
@@ -36487,126 +37327,126 @@ msgid ""
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:16875
+#: doc/guix.texi:16920
 #, no-wrap
 msgid "{Scheme Variable} gss-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:16877
+#: doc/guix.texi:16922
 msgid "A service type for the Global Security System (GSS) daemon."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:16879
+#: doc/guix.texi:16924
 #, no-wrap
 msgid "{Data Type} gss-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:16882
+#: doc/guix.texi:16927
 msgid ""
 "Data type representing the configuration of the GSS daemon service.  This "
 "type has the following parameters:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16883 doc/guix.texi:16908
+#: doc/guix.texi:16928 doc/guix.texi:16953
 #, no-wrap
 msgid "@code{nfs-utils} (default: @code{nfs-utils})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16885
+#: doc/guix.texi:16930
 msgid "The package in which the @command{rpc.gssd} command is to be found."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16886 doc/guix.texi:16911
+#: doc/guix.texi:16931 doc/guix.texi:16956
 #, no-wrap
 msgid "@code{pipefs-directory} (default: @code{\"/var/lib/nfs/rpc_pipefs\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16888 doc/guix.texi:16913
+#: doc/guix.texi:16933 doc/guix.texi:16958
 msgid "The directory where the pipefs file system is mounted."
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:16893
+#: doc/guix.texi:16938
 #, no-wrap
 msgid "IDMAP Daemon Service"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:16894
+#: doc/guix.texi:16939
 #, no-wrap
 msgid "idmapd"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:16895
+#: doc/guix.texi:16940
 #, no-wrap
 msgid "name mapper"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:16899
+#: doc/guix.texi:16944
 msgid ""
 "The idmap daemon service provides mapping between user IDs and user names.  "
 "Typically it is required in order to access file systems mounted via NFSv4."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:16900
+#: doc/guix.texi:16945
 #, no-wrap
 msgid "{Scheme Variable} idmap-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:16902
+#: doc/guix.texi:16947
 msgid "A service type for the Identity Mapper (IDMAP) daemon."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:16904
+#: doc/guix.texi:16949
 #, no-wrap
 msgid "{Data Type} idmap-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:16907
+#: doc/guix.texi:16952
 msgid ""
 "Data type representing the configuration of the IDMAP daemon service.  This "
 "type has the following parameters:"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16910
+#: doc/guix.texi:16955
 msgid "The package in which the @command{rpc.idmapd} command is to be found."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16914
+#: doc/guix.texi:16959
 #, no-wrap
 msgid "@code{domain} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16918
+#: doc/guix.texi:16963
 msgid ""
 "The local NFSv4 domain name.  This must be a string or @code{#f}.  If it is "
 "@code{#f} then the daemon will use the host's fully qualified domain name."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:16925
+#: doc/guix.texi:16970
 #, no-wrap
 msgid "continuous integration"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:16929
+#: doc/guix.texi:16974
 msgid ""
 "@uref{https://notabug.org/mthl/cuirass, Cuirass} is a continuous integration "
 "tool for Guix.  It can be used both for development and for providing "
@@ -36614,25 +37454,26 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:16931
-msgid "The @code{(gnu services cuirass)} module provides the following service."
+#: doc/guix.texi:16976
+msgid ""
+"The @code{(gnu services cuirass)} module provides the following service."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:16932
+#: doc/guix.texi:16977
 #, no-wrap
 msgid "{Scheme Procedure} cuirass-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:16935
+#: doc/guix.texi:16980
 msgid ""
-"The type of the Cuirass service.  Its value must be a "
-"@code{cuirass-configuration} object, as described below."
+"The type of the Cuirass service.  Its value must be a @code{cuirass-"
+"configuration} object, as described below."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:16942
+#: doc/guix.texi:16987
 msgid ""
 "To add build jobs, you have to set the @code{specifications} field of the "
 "configuration.  Here is an example of a service defining a build job based "
@@ -36642,7 +37483,7 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:16954
+#: doc/guix.texi:16999
 #, no-wrap
 msgid ""
 "(let ((spec #~((#:name . \"guix\")\n"
@@ -36658,7 +37499,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:16959
+#: doc/guix.texi:17004
 msgid ""
 "While information related to build jobs is located directly in the "
 "specifications, global settings for the @command{cuirass} process are "
@@ -36666,195 +37507,195 @@ msgid ""
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:16960
+#: doc/guix.texi:17005
 #, no-wrap
 msgid "{Data Type} cuirass-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:16962
+#: doc/guix.texi:17007
 msgid "Data type representing the configuration of Cuirass."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16964
+#: doc/guix.texi:17009
 #, no-wrap
 msgid "@code{log-file} (default: @code{\"/var/log/cuirass.log\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16966
+#: doc/guix.texi:17011
 msgid "Location of the log file."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16967
+#: doc/guix.texi:17012
 #, no-wrap
 msgid "@code{cache-directory} (default: @code{\"/var/cache/cuirass\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16969
+#: doc/guix.texi:17014
 msgid "Location of the repository cache."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16970
+#: doc/guix.texi:17015
 #, no-wrap
 msgid "@code{user} (default: @code{\"cuirass\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16972
+#: doc/guix.texi:17017
 msgid "Owner of the @code{cuirass} process."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16973
+#: doc/guix.texi:17018
 #, no-wrap
 msgid "@code{group} (default: @code{\"cuirass\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16975
+#: doc/guix.texi:17020
 msgid "Owner's group of the @code{cuirass} process."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16976
+#: doc/guix.texi:17021
 #, no-wrap
 msgid "@code{interval} (default: @code{60})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16979
+#: doc/guix.texi:17024
 msgid ""
 "Number of seconds between the poll of the repositories followed by the "
 "Cuirass jobs."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16980
+#: doc/guix.texi:17025
 #, no-wrap
 msgid "@code{database} (default: @code{\"/var/run/cuirass/cuirass.db\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16983
+#: doc/guix.texi:17028
 msgid ""
 "Location of sqlite database which contains the build results and previously "
 "added specifications."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16984
+#: doc/guix.texi:17029
 #, no-wrap
 msgid "@code{port} (default: @code{8081})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16986
+#: doc/guix.texi:17031
 msgid "Port number used by the HTTP server."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16990
+#: doc/guix.texi:17035
 msgid ""
 "Listen on the network interface for @var{host}.  The default is to accept "
 "connections from localhost."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16991
+#: doc/guix.texi:17036
 #, no-wrap
 msgid "@code{specifications} (default: @code{#~'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16997
+#: doc/guix.texi:17042
 msgid ""
 "A gexp (@pxref{G-Expressions}) that evaluates to a list of specifications, "
 "where a specification is an association list (@pxref{Associations Lists,,, "
-"guile, GNU Guile Reference Manual}) whose keys are keywords "
-"(@code{#:keyword-example}) as shown in the example above."
+"guile, GNU Guile Reference Manual}) whose keys are keywords (@code{#:keyword-"
+"example}) as shown in the example above."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16998
+#: doc/guix.texi:17043
 #, no-wrap
 msgid "@code{use-substitutes?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17001
+#: doc/guix.texi:17046
 msgid ""
 "This allows using substitutes to avoid building every dependencies of a job "
 "from source."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:17002
+#: doc/guix.texi:17047
 #, no-wrap
 msgid "@code{one-shot?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17004
+#: doc/guix.texi:17049
 msgid "Only evaluate specifications and build derivations once."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:17005
+#: doc/guix.texi:17050
 #, no-wrap
 msgid "@code{fallback?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17008
+#: doc/guix.texi:17053
 msgid ""
 "When substituting a pre-built binary fails, fall back to building packages "
 "locally."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:17009
+#: doc/guix.texi:17054
 #, no-wrap
 msgid "@code{load-path} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17012
+#: doc/guix.texi:17057
 msgid ""
 "This allows users to define their own packages and make them visible to "
 "cuirass as in @command{guix build} command."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:17013
+#: doc/guix.texi:17058
 #, no-wrap
 msgid "@code{cuirass} (default: @code{cuirass})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17015
+#: doc/guix.texi:17060
 msgid "The Cuirass package to use."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:17021
+#: doc/guix.texi:17066
 #, no-wrap
 msgid "power management with TLP"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:17024
+#: doc/guix.texi:17069
 msgid ""
 "The @code{(gnu services pm)} module provides a Guix service definition for "
 "the Linux power management tool TLP."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:17030
+#: doc/guix.texi:17075
 msgid ""
 "TLP enables various powersaving modes in userspace and kernel.  Contrary to "
 "@code{upower-service}, it is not a passive, monitoring tool, as it will "
@@ -36864,33 +37705,33 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:17031
+#: doc/guix.texi:17076
 #, no-wrap
 msgid "{Scheme Variable} tlp-service-type"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:17035
+#: doc/guix.texi:17080
 msgid ""
 "The service type for the TLP tool.  Its value should be a valid TLP "
 "configuration (see below).  To use the default settings, simply write:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:17037
+#: doc/guix.texi:17082
 #, no-wrap
 msgid "(service tlp-service-type)\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:17042
+#: doc/guix.texi:17087
 msgid ""
 "By default TLP does not need much configuration but most TLP parameters can "
 "be tweaked using @code{tlp-configuration}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:17048
+#: doc/guix.texi:17093
 msgid ""
 "Each parameter definition is preceded by its type; for example, "
 "@samp{boolean foo} indicates that the @code{foo} parameter should be "
@@ -36899,129 +37740,120 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:17058
+#: doc/guix.texi:17103
 msgid "Available @code{tlp-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17059
+#: doc/guix.texi:17104
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} package tlp"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17061
+#: doc/guix.texi:17106
 msgid "The TLP package."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17064
+#: doc/guix.texi:17109
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} boolean tlp-enable?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17066
+#: doc/guix.texi:17111
 msgid "Set to true if you wish to enable TLP."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17071
+#: doc/guix.texi:17116
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} string tlp-default-mode"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17074
+#: doc/guix.texi:17119
 msgid ""
 "Default mode when no power supply can be detected.  Alternatives are AC and "
 "BAT."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17076
+#: doc/guix.texi:17121
 msgid "Defaults to @samp{\"AC\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17079
+#: doc/guix.texi:17124
 #, no-wrap
-msgid ""
-"{@code{tlp-configuration} parameter} non-negative-integer "
-"disk-idle-secs-on-ac"
+msgid "{@code{tlp-configuration} parameter} non-negative-integer disk-idle-secs-on-ac"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17082
+#: doc/guix.texi:17127
 msgid ""
 "Number of seconds Linux kernel has to wait after the disk goes idle, before "
 "syncing on AC."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17087
+#: doc/guix.texi:17132
 #, no-wrap
-msgid ""
-"{@code{tlp-configuration} parameter} non-negative-integer "
-"disk-idle-secs-on-bat"
+msgid "{@code{tlp-configuration} parameter} non-negative-integer disk-idle-secs-on-bat"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17089
+#: doc/guix.texi:17134
 msgid "Same as @code{disk-idle-ac} but on BAT mode."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17091
+#: doc/guix.texi:17136
 msgid "Defaults to @samp{2}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17094
+#: doc/guix.texi:17139
 #, no-wrap
-msgid ""
-"{@code{tlp-configuration} parameter} non-negative-integer "
-"max-lost-work-secs-on-ac"
+msgid "{@code{tlp-configuration} parameter} non-negative-integer max-lost-work-secs-on-ac"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17096
+#: doc/guix.texi:17141
 msgid "Dirty pages flushing periodicity, expressed in seconds."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17098 doc/guix.texi:17321 doc/guix.texi:18638 doc/guix.texi:18646
+#: doc/guix.texi:17143 doc/guix.texi:17366 doc/guix.texi:18683
+#: doc/guix.texi:18691
 msgid "Defaults to @samp{15}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17101
+#: doc/guix.texi:17146
 #, no-wrap
-msgid ""
-"{@code{tlp-configuration} parameter} non-negative-integer "
-"max-lost-work-secs-on-bat"
+msgid "{@code{tlp-configuration} parameter} non-negative-integer max-lost-work-secs-on-bat"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17103
+#: doc/guix.texi:17148
 msgid "Same as @code{max-lost-work-secs-on-ac} but on BAT mode."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17105
+#: doc/guix.texi:17150
 msgid "Defaults to @samp{60}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17108
+#: doc/guix.texi:17153
 #, no-wrap
-msgid ""
-"{@code{tlp-configuration} parameter} maybe-space-separated-string-list "
-"cpu-scaling-governor-on-ac"
+msgid "{@code{tlp-configuration} parameter} maybe-space-separated-string-list cpu-scaling-governor-on-ac"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17112
+#: doc/guix.texi:17157
 msgid ""
 "CPU frequency scaling governor on AC mode.  With intel_pstate driver, "
 "alternatives are powersave and performance.  With acpi-cpufreq driver, "
@@ -37029,602 +37861,568 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17114 doc/guix.texi:17121 doc/guix.texi:17128 doc/guix.texi:17135 doc/guix.texi:17142 doc/guix.texi:17149 doc/guix.texi:17157 doc/guix.texi:17165 doc/guix.texi:17172 doc/guix.texi:17179 doc/guix.texi:17186 doc/guix.texi:17193 doc/guix.texi:17223 doc/guix.texi:17261 doc/guix.texi:17268 doc/guix.texi:17277 doc/guix.texi:17299 doc/guix.texi:17307 doc/guix.texi:17314 doc/guix.texi:17469 doc/guix.texi:17489 doc/guix.texi:17504 doc/guix.texi:17511
+#: doc/guix.texi:17159 doc/guix.texi:17166 doc/guix.texi:17173
+#: doc/guix.texi:17180 doc/guix.texi:17187 doc/guix.texi:17194
+#: doc/guix.texi:17202 doc/guix.texi:17210 doc/guix.texi:17217
+#: doc/guix.texi:17224 doc/guix.texi:17231 doc/guix.texi:17238
+#: doc/guix.texi:17268 doc/guix.texi:17306 doc/guix.texi:17313
+#: doc/guix.texi:17322 doc/guix.texi:17344 doc/guix.texi:17352
+#: doc/guix.texi:17359 doc/guix.texi:17514 doc/guix.texi:17534
+#: doc/guix.texi:17549 doc/guix.texi:17556
 msgid "Defaults to @samp{disabled}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17117
+#: doc/guix.texi:17162
 #, no-wrap
-msgid ""
-"{@code{tlp-configuration} parameter} maybe-space-separated-string-list "
-"cpu-scaling-governor-on-bat"
+msgid "{@code{tlp-configuration} parameter} maybe-space-separated-string-list cpu-scaling-governor-on-bat"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17119
+#: doc/guix.texi:17164
 msgid "Same as @code{cpu-scaling-governor-on-ac} but on BAT mode."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17124
+#: doc/guix.texi:17169
 #, no-wrap
-msgid ""
-"{@code{tlp-configuration} parameter} maybe-non-negative-integer "
-"cpu-scaling-min-freq-on-ac"
+msgid "{@code{tlp-configuration} parameter} maybe-non-negative-integer cpu-scaling-min-freq-on-ac"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17126
+#: doc/guix.texi:17171
 msgid "Set the min available frequency for the scaling governor on AC."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17131
+#: doc/guix.texi:17176
 #, no-wrap
-msgid ""
-"{@code{tlp-configuration} parameter} maybe-non-negative-integer "
-"cpu-scaling-max-freq-on-ac"
+msgid "{@code{tlp-configuration} parameter} maybe-non-negative-integer cpu-scaling-max-freq-on-ac"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17133
+#: doc/guix.texi:17178
 msgid "Set the max available frequency for the scaling governor on AC."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17138
+#: doc/guix.texi:17183
 #, no-wrap
-msgid ""
-"{@code{tlp-configuration} parameter} maybe-non-negative-integer "
-"cpu-scaling-min-freq-on-bat"
+msgid "{@code{tlp-configuration} parameter} maybe-non-negative-integer cpu-scaling-min-freq-on-bat"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17140
+#: doc/guix.texi:17185
 msgid "Set the min available frequency for the scaling governor on BAT."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17145
+#: doc/guix.texi:17190
 #, no-wrap
-msgid ""
-"{@code{tlp-configuration} parameter} maybe-non-negative-integer "
-"cpu-scaling-max-freq-on-bat"
+msgid "{@code{tlp-configuration} parameter} maybe-non-negative-integer cpu-scaling-max-freq-on-bat"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17147
+#: doc/guix.texi:17192
 msgid "Set the max available frequency for the scaling governor on BAT."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17152
+#: doc/guix.texi:17197
 #, no-wrap
-msgid ""
-"{@code{tlp-configuration} parameter} maybe-non-negative-integer "
-"cpu-min-perf-on-ac"
+msgid "{@code{tlp-configuration} parameter} maybe-non-negative-integer cpu-min-perf-on-ac"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17155
+#: doc/guix.texi:17200
 msgid ""
 "Limit the min P-state to control the power dissipation of the CPU, in AC "
 "mode.  Values are stated as a percentage of the available performance."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17160
+#: doc/guix.texi:17205
 #, no-wrap
-msgid ""
-"{@code{tlp-configuration} parameter} maybe-non-negative-integer "
-"cpu-max-perf-on-ac"
+msgid "{@code{tlp-configuration} parameter} maybe-non-negative-integer cpu-max-perf-on-ac"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17163
+#: doc/guix.texi:17208
 msgid ""
 "Limit the max P-state to control the power dissipation of the CPU, in AC "
 "mode.  Values are stated as a percentage of the available performance."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17168
+#: doc/guix.texi:17213
 #, no-wrap
-msgid ""
-"{@code{tlp-configuration} parameter} maybe-non-negative-integer "
-"cpu-min-perf-on-bat"
+msgid "{@code{tlp-configuration} parameter} maybe-non-negative-integer cpu-min-perf-on-bat"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17170
+#: doc/guix.texi:17215
 msgid "Same as @code{cpu-min-perf-on-ac} on BAT mode."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17175
+#: doc/guix.texi:17220
 #, no-wrap
-msgid ""
-"{@code{tlp-configuration} parameter} maybe-non-negative-integer "
-"cpu-max-perf-on-bat"
+msgid "{@code{tlp-configuration} parameter} maybe-non-negative-integer cpu-max-perf-on-bat"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17177
+#: doc/guix.texi:17222
 msgid "Same as @code{cpu-max-perf-on-ac} on BAT mode."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17182
+#: doc/guix.texi:17227
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} maybe-boolean cpu-boost-on-ac?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17184
+#: doc/guix.texi:17229
 msgid "Enable CPU turbo boost feature on AC mode."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17189
+#: doc/guix.texi:17234
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} maybe-boolean cpu-boost-on-bat?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17191
+#: doc/guix.texi:17236
 msgid "Same as @code{cpu-boost-on-ac?} on BAT mode."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17196
+#: doc/guix.texi:17241
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} boolean sched-powersave-on-ac?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17199
+#: doc/guix.texi:17244
 msgid ""
 "Allow Linux kernel to minimize the number of CPU cores/hyper-threads used "
 "under light load conditions."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17204
+#: doc/guix.texi:17249
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} boolean sched-powersave-on-bat?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17206
+#: doc/guix.texi:17251
 msgid "Same as @code{sched-powersave-on-ac?} but on BAT mode."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17211
+#: doc/guix.texi:17256
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} boolean nmi-watchdog?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17213
+#: doc/guix.texi:17258
 msgid "Enable Linux kernel NMI watchdog."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17218
+#: doc/guix.texi:17263
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} maybe-string phc-controls"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17221
+#: doc/guix.texi:17266
 msgid ""
 "For Linux kernels with PHC patch applied, change CPU voltages.  An example "
 "value would be @samp{\"F:V F:V F:V F:V\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17226
+#: doc/guix.texi:17271
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} string energy-perf-policy-on-ac"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17229
+#: doc/guix.texi:17274
 msgid ""
 "Set CPU performance versus energy saving policy on AC.  Alternatives are "
 "performance, normal, powersave."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17231 doc/guix.texi:17329 doc/guix.texi:17359
+#: doc/guix.texi:17276 doc/guix.texi:17374 doc/guix.texi:17404
 msgid "Defaults to @samp{\"performance\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17234
+#: doc/guix.texi:17279
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} string energy-perf-policy-on-bat"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17236
+#: doc/guix.texi:17281
 msgid "Same as @code{energy-perf-policy-ac} but on BAT mode."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17238 doc/guix.texi:17336
+#: doc/guix.texi:17283 doc/guix.texi:17381
 msgid "Defaults to @samp{\"powersave\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17241
+#: doc/guix.texi:17286
 #, no-wrap
-msgid ""
-"{@code{tlp-configuration} parameter} space-separated-string-list "
-"disks-devices"
+msgid "{@code{tlp-configuration} parameter} space-separated-string-list disks-devices"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17243
+#: doc/guix.texi:17288
 msgid "Hard disk devices."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17246
+#: doc/guix.texi:17291
 #, no-wrap
-msgid ""
-"{@code{tlp-configuration} parameter} space-separated-string-list "
-"disk-apm-level-on-ac"
+msgid "{@code{tlp-configuration} parameter} space-separated-string-list disk-apm-level-on-ac"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17248
+#: doc/guix.texi:17293
 msgid "Hard disk advanced power management level."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17251
+#: doc/guix.texi:17296
 #, no-wrap
-msgid ""
-"{@code{tlp-configuration} parameter} space-separated-string-list "
-"disk-apm-level-on-bat"
+msgid "{@code{tlp-configuration} parameter} space-separated-string-list disk-apm-level-on-bat"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17253
+#: doc/guix.texi:17298
 msgid "Same as @code{disk-apm-bat} but on BAT mode."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17256
+#: doc/guix.texi:17301
 #, no-wrap
-msgid ""
-"{@code{tlp-configuration} parameter} maybe-space-separated-string-list "
-"disk-spindown-timeout-on-ac"
+msgid "{@code{tlp-configuration} parameter} maybe-space-separated-string-list disk-spindown-timeout-on-ac"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17259
+#: doc/guix.texi:17304
 msgid ""
 "Hard disk spin down timeout.  One value has to be specified for each "
 "declared hard disk."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17264
+#: doc/guix.texi:17309
 #, no-wrap
-msgid ""
-"{@code{tlp-configuration} parameter} maybe-space-separated-string-list "
-"disk-spindown-timeout-on-bat"
+msgid "{@code{tlp-configuration} parameter} maybe-space-separated-string-list disk-spindown-timeout-on-bat"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17266
+#: doc/guix.texi:17311
 msgid "Same as @code{disk-spindown-timeout-on-ac} but on BAT mode."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17271
+#: doc/guix.texi:17316
 #, no-wrap
-msgid ""
-"{@code{tlp-configuration} parameter} maybe-space-separated-string-list "
-"disk-iosched"
+msgid "{@code{tlp-configuration} parameter} maybe-space-separated-string-list disk-iosched"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17275
+#: doc/guix.texi:17320
 msgid ""
 "Select IO scheduler for disk devices.  One value has to be specified for "
 "each declared hard disk.  Example alternatives are cfq, deadline and noop."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17280
+#: doc/guix.texi:17325
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} string sata-linkpwr-on-ac"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17283
+#: doc/guix.texi:17328
 msgid ""
 "SATA aggressive link power management (ALPM) level.  Alternatives are "
 "min_power, medium_power, max_performance."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17285
+#: doc/guix.texi:17330
 msgid "Defaults to @samp{\"max_performance\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17288
+#: doc/guix.texi:17333
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} string sata-linkpwr-on-bat"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17290
+#: doc/guix.texi:17335
 msgid "Same as @code{sata-linkpwr-ac} but on BAT mode."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17292
+#: doc/guix.texi:17337
 msgid "Defaults to @samp{\"min_power\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17295
+#: doc/guix.texi:17340
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} maybe-string sata-linkpwr-blacklist"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17297
+#: doc/guix.texi:17342
 msgid "Exclude specified SATA host devices for link power management."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17302
+#: doc/guix.texi:17347
 #, no-wrap
+msgid "{@code{tlp-configuration} parameter} maybe-on-off-boolean ahci-runtime-pm-on-ac?"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:17350
 msgid ""
-"{@code{tlp-configuration} parameter} maybe-on-off-boolean "
-"ahci-runtime-pm-on-ac?"
+"Enable Runtime Power Management for AHCI controller and disks on AC mode."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17305
-msgid "Enable Runtime Power Management for AHCI controller and disks on AC mode."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:17310
+#: doc/guix.texi:17355
 #, no-wrap
-msgid ""
-"{@code{tlp-configuration} parameter} maybe-on-off-boolean "
-"ahci-runtime-pm-on-bat?"
+msgid "{@code{tlp-configuration} parameter} maybe-on-off-boolean ahci-runtime-pm-on-bat?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17312
+#: doc/guix.texi:17357
 msgid "Same as @code{ahci-runtime-pm-on-ac} on BAT mode."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17317
+#: doc/guix.texi:17362
 #, no-wrap
-msgid ""
-"{@code{tlp-configuration} parameter} non-negative-integer "
-"ahci-runtime-pm-timeout"
+msgid "{@code{tlp-configuration} parameter} non-negative-integer ahci-runtime-pm-timeout"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17319
+#: doc/guix.texi:17364
 msgid "Seconds of inactivity before disk is suspended."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17324
+#: doc/guix.texi:17369
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} string pcie-aspm-on-ac"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17327
+#: doc/guix.texi:17372
 msgid ""
 "PCI Express Active State Power Management level.  Alternatives are default, "
 "performance, powersave."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17332
+#: doc/guix.texi:17377
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} string pcie-aspm-on-bat"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17334
+#: doc/guix.texi:17379
 msgid "Same as @code{pcie-aspm-ac} but on BAT mode."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17339
+#: doc/guix.texi:17384
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} string radeon-power-profile-on-ac"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17342
+#: doc/guix.texi:17387
 msgid ""
 "Radeon graphics clock speed level.  Alternatives are low, mid, high, auto, "
 "default."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17344
+#: doc/guix.texi:17389
 msgid "Defaults to @samp{\"high\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17347
+#: doc/guix.texi:17392
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} string radeon-power-profile-on-bat"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17349
+#: doc/guix.texi:17394
 msgid "Same as @code{radeon-power-ac} but on BAT mode."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17351
+#: doc/guix.texi:17396
 msgid "Defaults to @samp{\"low\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17354
+#: doc/guix.texi:17399
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} string radeon-dpm-state-on-ac"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17357
+#: doc/guix.texi:17402
 msgid ""
 "Radeon dynamic power management method (DPM).  Alternatives are battery, "
 "performance."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17362
+#: doc/guix.texi:17407
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} string radeon-dpm-state-on-bat"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17364
+#: doc/guix.texi:17409
 msgid "Same as @code{radeon-dpm-state-ac} but on BAT mode."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17366
+#: doc/guix.texi:17411
 msgid "Defaults to @samp{\"battery\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17369
+#: doc/guix.texi:17414
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} string radeon-dpm-perf-level-on-ac"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17371
+#: doc/guix.texi:17416
 msgid "Radeon DPM performance level.  Alternatives are auto, low, high."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17373 doc/guix.texi:17380 doc/guix.texi:17454
+#: doc/guix.texi:17418 doc/guix.texi:17425 doc/guix.texi:17499
 msgid "Defaults to @samp{\"auto\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17376
+#: doc/guix.texi:17421
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} string radeon-dpm-perf-level-on-bat"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17378
+#: doc/guix.texi:17423
 msgid "Same as @code{radeon-dpm-perf-ac} but on BAT mode."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17383
+#: doc/guix.texi:17428
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} on-off-boolean wifi-pwr-on-ac?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17385
+#: doc/guix.texi:17430
 msgid "Wifi power saving mode."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17390
+#: doc/guix.texi:17435
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} on-off-boolean wifi-pwr-on-bat?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17392
+#: doc/guix.texi:17437
 msgid "Same as @code{wifi-power-ac?} but on BAT mode."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17397
+#: doc/guix.texi:17442
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} y-n-boolean wol-disable?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17399
+#: doc/guix.texi:17444
 msgid "Disable wake on LAN."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17404
+#: doc/guix.texi:17449
 #, no-wrap
-msgid ""
-"{@code{tlp-configuration} parameter} non-negative-integer "
-"sound-power-save-on-ac"
+msgid "{@code{tlp-configuration} parameter} non-negative-integer sound-power-save-on-ac"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17407
+#: doc/guix.texi:17452
 msgid ""
 "Timeout duration in seconds before activating audio power saving on Intel "
 "HDA and AC97 devices.  A value of 0 disables power saving."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17412
+#: doc/guix.texi:17457
 #, no-wrap
-msgid ""
-"{@code{tlp-configuration} parameter} non-negative-integer "
-"sound-power-save-on-bat"
+msgid "{@code{tlp-configuration} parameter} non-negative-integer sound-power-save-on-bat"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17414
+#: doc/guix.texi:17459
 msgid "Same as @code{sound-powersave-ac} but on BAT mode."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17416 doc/guix.texi:17931 doc/guix.texi:18075
+#: doc/guix.texi:17461 doc/guix.texi:17976 doc/guix.texi:18120
 msgid "Defaults to @samp{1}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17419
+#: doc/guix.texi:17464
 #, no-wrap
-msgid ""
-"{@code{tlp-configuration} parameter} y-n-boolean "
-"sound-power-save-controller?"
+msgid "{@code{tlp-configuration} parameter} y-n-boolean sound-power-save-controller?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17421
+#: doc/guix.texi:17466
 msgid "Disable controller in powersaving mode on Intel HDA devices."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17426
+#: doc/guix.texi:17471
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} boolean bay-poweroff-on-bat?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17430
+#: doc/guix.texi:17475
 msgid ""
 "Enable optical drive in UltraBay/MediaBay on BAT mode.  Drive can be powered "
 "on again by releasing (and reinserting) the eject lever or by pressing the "
@@ -37632,180 +38430,172 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17435
+#: doc/guix.texi:17480
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} string bay-device"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17437
+#: doc/guix.texi:17482
 msgid "Name of the optical drive device to power off."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17439
+#: doc/guix.texi:17484
 msgid "Defaults to @samp{\"sr0\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17442
+#: doc/guix.texi:17487
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} string runtime-pm-on-ac"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17445
+#: doc/guix.texi:17490
 msgid ""
 "Runtime Power Management for PCI(e) bus devices.  Alternatives are on and "
 "auto."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17447
+#: doc/guix.texi:17492
 msgid "Defaults to @samp{\"on\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17450
+#: doc/guix.texi:17495
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} string runtime-pm-on-bat"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17452
+#: doc/guix.texi:17497
 msgid "Same as @code{runtime-pm-ac} but on BAT mode."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17457
+#: doc/guix.texi:17502
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} boolean runtime-pm-all?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17460
+#: doc/guix.texi:17505
 msgid ""
-"Runtime Power Management for all PCI(e) bus devices, except blacklisted "
-"ones."
+"Runtime Power Management for all PCI(e) bus devices, except blacklisted ones."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17465
+#: doc/guix.texi:17510
 #, no-wrap
+msgid "{@code{tlp-configuration} parameter} maybe-space-separated-string-list runtime-pm-blacklist"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:17512
 msgid ""
-"{@code{tlp-configuration} parameter} maybe-space-separated-string-list "
-"runtime-pm-blacklist"
+"Exclude specified PCI(e) device addresses from Runtime Power Management."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17467
-msgid "Exclude specified PCI(e) device addresses from Runtime Power Management."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:17472
+#: doc/guix.texi:17517
 #, no-wrap
-msgid ""
-"{@code{tlp-configuration} parameter} space-separated-string-list "
-"runtime-pm-driver-blacklist"
+msgid "{@code{tlp-configuration} parameter} space-separated-string-list runtime-pm-driver-blacklist"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17475
+#: doc/guix.texi:17520
 msgid ""
 "Exclude PCI(e) devices assigned to the specified drivers from Runtime Power "
 "Management."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17478
+#: doc/guix.texi:17523
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} boolean usb-autosuspend?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17480
+#: doc/guix.texi:17525
 msgid "Enable USB autosuspend feature."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17485
+#: doc/guix.texi:17530
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} maybe-string usb-blacklist"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17487
+#: doc/guix.texi:17532
 msgid "Exclude specified devices from USB autosuspend."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17492
+#: doc/guix.texi:17537
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} boolean usb-blacklist-wwan?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17494
+#: doc/guix.texi:17539
 msgid "Exclude WWAN devices from USB autosuspend."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17499
+#: doc/guix.texi:17544
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} maybe-string usb-whitelist"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17502
+#: doc/guix.texi:17547
 msgid ""
 "Include specified devices into USB autosuspend, even if they are already "
 "excluded by the driver or via @code{usb-blacklist-wwan?}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17507
+#: doc/guix.texi:17552
 #, no-wrap
-msgid ""
-"{@code{tlp-configuration} parameter} maybe-boolean "
-"usb-autosuspend-disable-on-shutdown?"
+msgid "{@code{tlp-configuration} parameter} maybe-boolean usb-autosuspend-disable-on-shutdown?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17509
+#: doc/guix.texi:17554
 msgid "Enable USB autosuspend before shutdown."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17514
+#: doc/guix.texi:17559
 #, no-wrap
-msgid ""
-"{@code{tlp-configuration} parameter} boolean "
-"restore-device-state-on-startup?"
+msgid "{@code{tlp-configuration} parameter} boolean restore-device-state-on-startup?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17517
+#: doc/guix.texi:17562
 msgid ""
 "Restore radio device state (bluetooth, wifi, wwan) from previous shutdown on "
 "system startup."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:17525
+#: doc/guix.texi:17570
 msgid ""
 "The @code{(gnu services pm)} module provides an interface to thermald, a CPU "
 "frequency scaling service which helps prevent overheating."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:17526
+#: doc/guix.texi:17571
 #, no-wrap
 msgid "{Scheme Variable} thermald-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:17531
+#: doc/guix.texi:17576
 msgid ""
 "This is the service type for @uref{https://01.org/linux-thermal-daemon/, "
 "thermald}, the Linux Thermal Daemon, which is responsible for controlling "
@@ -37813,59 +38603,60 @@ msgid ""
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:17533
+#: doc/guix.texi:17578
 #, no-wrap
 msgid "{Data Type} thermald-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:17535
-msgid "Data type representing the configuration of @code{thermald-service-type}."
+#: doc/guix.texi:17580
+msgid ""
+"Data type representing the configuration of @code{thermald-service-type}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:17537
+#: doc/guix.texi:17582
 #, no-wrap
 msgid "@code{ignore-cpuid-check?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17539
+#: doc/guix.texi:17584
 msgid "Ignore cpuid check for supported CPU models."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:17540
+#: doc/guix.texi:17585
 #, no-wrap
 msgid "@code{thermald} (default: @var{thermald})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17542
+#: doc/guix.texi:17587
 msgid "Package object of thermald."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:17551
+#: doc/guix.texi:17596
 msgid ""
 "The @code{(gnu services audio)} module provides a service to start MPD (the "
 "Music Player Daemon)."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:17552
+#: doc/guix.texi:17597
 #, no-wrap
 msgid "mpd"
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:17553
+#: doc/guix.texi:17598
 #, no-wrap
 msgid "Music Player Daemon"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:17558
+#: doc/guix.texi:17603
 msgid ""
 "The Music Player Daemon (MPD) is a service that can play music while being "
 "controlled from the local machine or over the network by a variety of "
@@ -37873,14 +38664,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:17561
+#: doc/guix.texi:17606
 msgid ""
-"The following example shows how one might run @code{mpd} as user "
-"@code{\"bob\"} on port @code{6666}.  It uses pulseaudio for output."
+"The following example shows how one might run @code{mpd} as user @code{\"bob"
+"\"} on port @code{6666}.  It uses pulseaudio for output."
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:17567
+#: doc/guix.texi:17612
 #, no-wrap
 msgid ""
 "(service mpd-service-type\n"
@@ -37890,92 +38681,92 @@ msgid ""
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:17569
+#: doc/guix.texi:17614
 #, no-wrap
 msgid "{Scheme Variable} mpd-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:17571
+#: doc/guix.texi:17616
 msgid "The service type for @command{mpd}"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:17573
+#: doc/guix.texi:17618
 #, no-wrap
 msgid "{Data Type} mpd-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:17575
+#: doc/guix.texi:17620
 msgid "Data type representing the configuration of @command{mpd}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:17577
+#: doc/guix.texi:17622
 #, no-wrap
 msgid "@code{user} (default: @code{\"mpd\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17579
+#: doc/guix.texi:17624
 msgid "The user to run mpd as."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:17580
+#: doc/guix.texi:17625
 #, no-wrap
 msgid "@code{music-dir} (default: @code{\"~/Music\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17582
+#: doc/guix.texi:17627
 msgid "The directory to scan for music files."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:17583
+#: doc/guix.texi:17628
 #, no-wrap
 msgid "@code{playlist-dir} (default: @code{\"~/.mpd/playlists\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17585
+#: doc/guix.texi:17630
 msgid "The directory to store playlists."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:17586
+#: doc/guix.texi:17631
 #, no-wrap
 msgid "@code{port} (default: @code{\"6600\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17588
+#: doc/guix.texi:17633
 msgid "The port to run mpd on."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:17589
+#: doc/guix.texi:17634
 #, no-wrap
 msgid "@code{address} (default: @code{\"any\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17592
+#: doc/guix.texi:17637
 msgid ""
 "The address that mpd will bind to.  To use a Unix domain socket, an absolute "
 "path can be specified here."
 msgstr ""
 
 #. type: subsubsection
-#: doc/guix.texi:17597
+#: doc/guix.texi:17642
 #, no-wrap
 msgid "Virtualization services"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:17602
+#: doc/guix.texi:17647
 msgid ""
 "The @code{(gnu services virtualization)} module provides services for the "
 "libvirt and virtlog daemons, as well as other virtualization-related "
@@ -37983,13 +38774,13 @@ msgid ""
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:17603
+#: doc/guix.texi:17648
 #, no-wrap
 msgid "Libvirt daemon"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:17607
+#: doc/guix.texi:17652
 msgid ""
 "@code{libvirtd} is the server side daemon component of the libvirt "
 "virtualization management system. This daemon runs on host servers and "
@@ -37997,20 +38788,20 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:17608
+#: doc/guix.texi:17653
 #, no-wrap
 msgid "{Scheme Variable} libvirt-service-type"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:17611
+#: doc/guix.texi:17656
 msgid ""
 "This is the type of the @uref{https://libvirt.org, libvirt daemon}.  Its "
 "value must be a @code{libvirt-configuration}."
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:17617
+#: doc/guix.texi:17662
 #, no-wrap
 msgid ""
 "(service libvirt-service-type\n"
@@ -38020,56 +38811,56 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:17622
+#: doc/guix.texi:17667
 msgid "Available @code{libvirt-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17623
+#: doc/guix.texi:17668
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} package libvirt"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17625
+#: doc/guix.texi:17670
 msgid "Libvirt package."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17628
+#: doc/guix.texi:17673
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} boolean listen-tls?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17631
+#: doc/guix.texi:17676
 msgid ""
 "Flag listening for secure TLS connections on the public TCP/IP port.  must "
 "set @code{listen} for this to have any effect."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17634
+#: doc/guix.texi:17679
 msgid ""
 "It is necessary to setup a CA and issue server certificates before using "
 "this capability."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17639
+#: doc/guix.texi:17684
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} boolean listen-tcp?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17642
+#: doc/guix.texi:17687
 msgid ""
 "Listen for unencrypted TCP connections on the public TCP/IP port.  must set "
 "@code{listen} for this to have any effect."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17646
+#: doc/guix.texi:17691
 msgid ""
 "Using the TCP socket requires SASL authentication by default.  Only SASL "
 "mechanisms which support data encryption are allowed.  This is DIGEST_MD5 "
@@ -38077,137 +38868,137 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17651
+#: doc/guix.texi:17696
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} string tls-port"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17654
+#: doc/guix.texi:17699
 msgid ""
 "Port for accepting secure TLS connections This can be a port number, or "
 "service name"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17656
+#: doc/guix.texi:17701
 msgid "Defaults to @samp{\"16514\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17659
+#: doc/guix.texi:17704
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} string tcp-port"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17662
+#: doc/guix.texi:17707
 msgid ""
 "Port for accepting insecure TCP connections This can be a port number, or "
 "service name"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17664
+#: doc/guix.texi:17709
 msgid "Defaults to @samp{\"16509\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17667
+#: doc/guix.texi:17712
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} string listen-addr"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17669
+#: doc/guix.texi:17714
 msgid "IP address or hostname used for client connections."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17671
+#: doc/guix.texi:17716
 msgid "Defaults to @samp{\"0.0.0.0\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17674
+#: doc/guix.texi:17719
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} boolean mdns-adv?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17676
+#: doc/guix.texi:17721
 msgid "Flag toggling mDNS advertisement of the libvirt service."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17679
+#: doc/guix.texi:17724
 msgid ""
 "Alternatively can disable for all services on a host by stopping the Avahi "
 "daemon."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17684
+#: doc/guix.texi:17729
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} string mdns-name"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17687
+#: doc/guix.texi:17732
 msgid ""
 "Default mDNS advertisement name.  This must be unique on the immediate "
 "broadcast network."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17689
+#: doc/guix.texi:17734
 msgid "Defaults to @samp{\"Virtualization Host <hostname>\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17692
+#: doc/guix.texi:17737
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} string unix-sock-group"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17696
+#: doc/guix.texi:17741
 msgid ""
 "UNIX domain socket group ownership.  This can be used to allow a 'trusted' "
 "set of users access to management capabilities without becoming root."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17698
+#: doc/guix.texi:17743
 msgid "Defaults to @samp{\"root\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17701
+#: doc/guix.texi:17746
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} string unix-sock-ro-perms"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17704
+#: doc/guix.texi:17749
 msgid ""
 "UNIX socket permissions for the R/O socket.  This is used for monitoring VM "
 "status only."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17706 doc/guix.texi:17724
+#: doc/guix.texi:17751 doc/guix.texi:17769
 msgid "Defaults to @samp{\"0777\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17709
+#: doc/guix.texi:17754
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} string unix-sock-rw-perms"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17713
+#: doc/guix.texi:17758
 msgid ""
 "UNIX socket permissions for the R/W socket.  Default allows only root.  If "
 "PolicyKit is enabled on the socket, the default will change to allow "
@@ -38215,18 +39006,18 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17715
+#: doc/guix.texi:17760
 msgid "Defaults to @samp{\"0770\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17718
+#: doc/guix.texi:17763
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} string unix-sock-admin-perms"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17722
+#: doc/guix.texi:17767
 msgid ""
 "UNIX socket permissions for the admin socket.  Default allows only owner "
 "(root), do not change it unless you are sure to whom you are exposing the "
@@ -38234,47 +39025,47 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17727
+#: doc/guix.texi:17772
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} string unix-sock-dir"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17729
+#: doc/guix.texi:17774
 msgid "The directory in which sockets will be found/created."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17731
+#: doc/guix.texi:17776
 msgid "Defaults to @samp{\"/var/run/libvirt\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17734
+#: doc/guix.texi:17779
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} string auth-unix-ro"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17737
+#: doc/guix.texi:17782
 msgid ""
 "Authentication scheme for UNIX read-only sockets.  By default socket "
 "permissions allow anyone to connect"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17739 doc/guix.texi:17748
+#: doc/guix.texi:17784 doc/guix.texi:17793
 msgid "Defaults to @samp{\"polkit\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17742
+#: doc/guix.texi:17787
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} string auth-unix-rw"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17746
+#: doc/guix.texi:17791
 msgid ""
 "Authentication scheme for UNIX read-write sockets.  By default socket "
 "permissions only allow root.  If PolicyKit support was compiled into "
@@ -38282,31 +39073,31 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17751
+#: doc/guix.texi:17796
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} string auth-tcp"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17755
+#: doc/guix.texi:17800
 msgid ""
 "Authentication scheme for TCP sockets.  If you don't enable SASL, then all "
 "TCP traffic is cleartext.  Don't do this outside of a dev/test scenario."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17757
+#: doc/guix.texi:17802
 msgid "Defaults to @samp{\"sasl\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17760
+#: doc/guix.texi:17805
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} string auth-tls"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17764
+#: doc/guix.texi:17809
 msgid ""
 "Authentication scheme for TLS sockets.  TLS sockets already have encryption "
 "provided by the TLS layer, and limited authentication is done by "
@@ -38314,118 +39105,118 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17767
+#: doc/guix.texi:17812
 msgid ""
 "It is possible to make use of any SASL authentication mechanism as well, by "
 "using 'sasl' for this option"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17769
+#: doc/guix.texi:17814
 msgid "Defaults to @samp{\"none\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17772
+#: doc/guix.texi:17817
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} optional-list access-drivers"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17774
+#: doc/guix.texi:17819
 msgid "API access control scheme."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17777
+#: doc/guix.texi:17822
 msgid ""
 "By default an authenticated user is allowed access to all APIs.  Access "
 "drivers can place restrictions on this."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17782
+#: doc/guix.texi:17827
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} string key-file"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17785
+#: doc/guix.texi:17830
 msgid ""
 "Server key file path.  If set to an empty string, then no private key is "
 "loaded."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17790
+#: doc/guix.texi:17835
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} string cert-file"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17793
+#: doc/guix.texi:17838
 msgid ""
 "Server key file path.  If set to an empty string, then no certificate is "
 "loaded."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17798
+#: doc/guix.texi:17843
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} string ca-file"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17801
+#: doc/guix.texi:17846
 msgid ""
 "Server key file path.  If set to an empty string, then no CA certificate is "
 "loaded."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17806
+#: doc/guix.texi:17851
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} string crl-file"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17809
+#: doc/guix.texi:17854
 msgid ""
 "Certificate revocation list path.  If set to an empty string, then no CRL is "
 "loaded."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17814
+#: doc/guix.texi:17859
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} boolean tls-no-sanity-cert"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17816
+#: doc/guix.texi:17861
 msgid "Disable verification of our own server certificates."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17819
+#: doc/guix.texi:17864
 msgid ""
 "When libvirtd starts it performs some sanity checks against its own "
 "certificates."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17824
+#: doc/guix.texi:17869
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} boolean tls-no-verify-cert"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17826
+#: doc/guix.texi:17871
 msgid "Disable verification of client certificates."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17830
+#: doc/guix.texi:17875
 msgid ""
 "Client certificate verification is the primary authentication mechanism.  "
 "Any client which does not present a certificate signed by the CA will be "
@@ -38433,39 +39224,37 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17835
+#: doc/guix.texi:17880
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} optional-list tls-allowed-dn-list"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17837
+#: doc/guix.texi:17882
 msgid "Whitelist of allowed x509 Distinguished Name."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17842
+#: doc/guix.texi:17887
 #, no-wrap
-msgid ""
-"{@code{libvirt-configuration} parameter} optional-list "
-"sasl-allowed-usernames"
+msgid "{@code{libvirt-configuration} parameter} optional-list sasl-allowed-usernames"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17845
+#: doc/guix.texi:17890
 msgid ""
 "Whitelist of allowed SASL usernames.  The format for username depends on the "
 "SASL authentication mechanism."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17850
+#: doc/guix.texi:17895
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} string tls-priority"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17854
+#: doc/guix.texi:17899
 msgid ""
 "Override the compile time default TLS priority string.  The default is "
 "usually \"NORMAL\" unless overridden at build time.  Only set this is it is "
@@ -38473,36 +39262,36 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17856
+#: doc/guix.texi:17901
 msgid "Defaults to @samp{\"NORMAL\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17859
+#: doc/guix.texi:17904
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} integer max-clients"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17862 doc/guix.texi:18285
+#: doc/guix.texi:17907 doc/guix.texi:18330
 msgid ""
 "Maximum number of concurrent client connections to allow over all sockets "
 "combined."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17864
+#: doc/guix.texi:17909
 msgid "Defaults to @samp{5000}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17867
+#: doc/guix.texi:17912
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} integer max-queued-clients"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17871
+#: doc/guix.texi:17916
 msgid ""
 "Maximum length of queue of connections waiting to be accepted by the "
 "daemon.  Note, that some protocols supporting retransmission may obey this "
@@ -38510,47 +39299,47 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17876
+#: doc/guix.texi:17921
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} integer max-anonymous-clients"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17879
+#: doc/guix.texi:17924
 msgid ""
 "Maximum length of queue of accepted but not yet authenticated clients.  Set "
 "this to zero to turn this feature off"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17881 doc/guix.texi:17899 doc/guix.texi:17915
+#: doc/guix.texi:17926 doc/guix.texi:17944 doc/guix.texi:17960
 msgid "Defaults to @samp{20}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17884
+#: doc/guix.texi:17929
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} integer min-workers"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17886
+#: doc/guix.texi:17931
 msgid "Number of workers to start up initially."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17891
+#: doc/guix.texi:17936
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} integer max-workers"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17893
+#: doc/guix.texi:17938
 msgid "Maximum number of worker threads."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17897
+#: doc/guix.texi:17942
 msgid ""
 "If the number of active clients exceeds @code{min-workers}, then more "
 "threads are spawned, up to max_workers limit.  Typically you'd want "
@@ -38558,13 +39347,13 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17902
+#: doc/guix.texi:17947
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} integer prio-workers"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17906
+#: doc/guix.texi:17951
 msgid ""
 "Number of priority workers.  If all workers from above pool are stuck, some "
 "calls marked as high priority (notably domainDestroy) can be executed in "
@@ -38572,24 +39361,24 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17911
+#: doc/guix.texi:17956
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} integer max-requests"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17913
+#: doc/guix.texi:17958
 msgid "Total global limit on concurrent RPC calls."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17918
+#: doc/guix.texi:17963
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} integer max-client-requests"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17922
+#: doc/guix.texi:17967
 msgid ""
 "Limit on concurrent requests from a single client connection.  To avoid one "
 "client monopolizing the server this should be a small fraction of the global "
@@ -38597,101 +39386,101 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17927
+#: doc/guix.texi:17972
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} integer admin-min-workers"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17929
+#: doc/guix.texi:17974
 msgid "Same as @code{min-workers} but for the admin interface."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17934
+#: doc/guix.texi:17979
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} integer admin-max-workers"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17936
+#: doc/guix.texi:17981
 msgid "Same as @code{max-workers} but for the admin interface."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17941
+#: doc/guix.texi:17986
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} integer admin-max-clients"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17943
+#: doc/guix.texi:17988
 msgid "Same as @code{max-clients} but for the admin interface."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17948
+#: doc/guix.texi:17993
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} integer admin-max-queued-clients"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17950
+#: doc/guix.texi:17995
 msgid "Same as @code{max-queued-clients} but for the admin interface."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17955
+#: doc/guix.texi:18000
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} integer admin-max-client-requests"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17957
+#: doc/guix.texi:18002
 msgid "Same as @code{max-client-requests} but for the admin interface."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17962
+#: doc/guix.texi:18007
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} integer log-level"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17964 doc/guix.texi:18187
+#: doc/guix.texi:18009 doc/guix.texi:18232
 msgid "Logging level.  4 errors, 3 warnings, 2 information, 1 debug."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17969
+#: doc/guix.texi:18014
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} string log-filters"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17971 doc/guix.texi:18194
+#: doc/guix.texi:18016 doc/guix.texi:18239
 msgid "Logging filters."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17974 doc/guix.texi:18197
+#: doc/guix.texi:18019 doc/guix.texi:18242
 msgid ""
 "A filter allows to select a different logging level for a given category of "
 "logs The format for a filter is one of:"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:17978 doc/guix.texi:18201
+#: doc/guix.texi:18023 doc/guix.texi:18246
 msgid "x:name"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:17981 doc/guix.texi:18204
+#: doc/guix.texi:18026 doc/guix.texi:18249
 msgid "x:+name"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17991 doc/guix.texi:18214
+#: doc/guix.texi:18036 doc/guix.texi:18259
 msgid ""
 "where @code{name} is a string which is matched against the category given in "
 "the @code{VIR_LOG_INIT()} at the top of each libvirt source file, e.g., "
@@ -38703,203 +39492,208 @@ msgid ""
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:17995 doc/guix.texi:18040 doc/guix.texi:18218 doc/guix.texi:18263
+#: doc/guix.texi:18040 doc/guix.texi:18085 doc/guix.texi:18263
+#: doc/guix.texi:18308
 msgid "1: DEBUG"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:17998 doc/guix.texi:18043 doc/guix.texi:18221 doc/guix.texi:18266
+#: doc/guix.texi:18043 doc/guix.texi:18088 doc/guix.texi:18266
+#: doc/guix.texi:18311
 msgid "2: INFO"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:18001 doc/guix.texi:18046 doc/guix.texi:18224 doc/guix.texi:18269
+#: doc/guix.texi:18046 doc/guix.texi:18091 doc/guix.texi:18269
+#: doc/guix.texi:18314
 msgid "3: WARNING"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:18004 doc/guix.texi:18049 doc/guix.texi:18227 doc/guix.texi:18272
+#: doc/guix.texi:18049 doc/guix.texi:18094 doc/guix.texi:18272
+#: doc/guix.texi:18317
 msgid "4: ERROR"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18009 doc/guix.texi:18232
+#: doc/guix.texi:18054 doc/guix.texi:18277
 msgid ""
 "Multiple filters can be defined in a single filters statement, they just "
 "need to be separated by spaces."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18011 doc/guix.texi:18234
+#: doc/guix.texi:18056 doc/guix.texi:18279
 msgid "Defaults to @samp{\"3:remote 4:event\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18014
+#: doc/guix.texi:18059
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} string log-outputs"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18016 doc/guix.texi:18239
+#: doc/guix.texi:18061 doc/guix.texi:18284
 msgid "Logging outputs."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18019 doc/guix.texi:18242
+#: doc/guix.texi:18064 doc/guix.texi:18287
 msgid ""
 "An output is one of the places to save logging information The format for an "
 "output can be:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18021 doc/guix.texi:18244
+#: doc/guix.texi:18066 doc/guix.texi:18289
 #, no-wrap
 msgid "x:stderr"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18023 doc/guix.texi:18246
+#: doc/guix.texi:18068 doc/guix.texi:18291
 msgid "output goes to stderr"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18024 doc/guix.texi:18247
+#: doc/guix.texi:18069 doc/guix.texi:18292
 #, no-wrap
 msgid "x:syslog:name"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18026 doc/guix.texi:18249
+#: doc/guix.texi:18071 doc/guix.texi:18294
 msgid "use syslog for the output and use the given name as the ident"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18027 doc/guix.texi:18250
+#: doc/guix.texi:18072 doc/guix.texi:18295
 #, no-wrap
 msgid "x:file:file_path"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18029 doc/guix.texi:18252
+#: doc/guix.texi:18074 doc/guix.texi:18297
 msgid "output to a file, with the given filepath"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18030 doc/guix.texi:18253
+#: doc/guix.texi:18075 doc/guix.texi:18298
 #, no-wrap
 msgid "x:journald"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18032 doc/guix.texi:18255
+#: doc/guix.texi:18077 doc/guix.texi:18300
 msgid "output to journald logging system"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18036 doc/guix.texi:18259
+#: doc/guix.texi:18081 doc/guix.texi:18304
 msgid "In all case the x prefix is the minimal level, acting as a filter"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18054 doc/guix.texi:18277
-msgid "Multiple outputs can be defined, they just need to be separated by spaces."
+#: doc/guix.texi:18099 doc/guix.texi:18322
+msgid ""
+"Multiple outputs can be defined, they just need to be separated by spaces."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18056 doc/guix.texi:18279
+#: doc/guix.texi:18101 doc/guix.texi:18324
 msgid "Defaults to @samp{\"3:stderr\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18059
+#: doc/guix.texi:18104
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} integer audit-level"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18061
+#: doc/guix.texi:18106
 msgid "Allows usage of the auditing subsystem to be altered"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:18065
+#: doc/guix.texi:18110
 msgid "0: disable all auditing"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:18068
+#: doc/guix.texi:18113
 msgid "1: enable auditing, only if enabled on host"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:18071
+#: doc/guix.texi:18116
 msgid "2: enable auditing, and exit if disabled on host."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18078
+#: doc/guix.texi:18123
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} boolean audit-logging"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18080
+#: doc/guix.texi:18125
 msgid "Send audit messages via libvirt logging infrastructure."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18085
+#: doc/guix.texi:18130
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} optional-string host-uuid"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18087
+#: doc/guix.texi:18132
 msgid "Host UUID.  UUID must not have all digits be the same."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18092
+#: doc/guix.texi:18137
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} string host-uuid-source"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18094
+#: doc/guix.texi:18139
 msgid "Source to read host UUID."
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:18098
+#: doc/guix.texi:18143
 msgid "@code{smbios}: fetch the UUID from @code{dmidecode -s system-uuid}"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:18101
+#: doc/guix.texi:18146
 msgid "@code{machine-id}: fetch the UUID from @code{/etc/machine-id}"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18106
+#: doc/guix.texi:18151
 msgid ""
 "If @code{dmidecode} does not provide a valid UUID a temporary UUID will be "
 "generated."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18108
+#: doc/guix.texi:18153
 msgid "Defaults to @samp{\"smbios\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18111
+#: doc/guix.texi:18156
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} integer keepalive-interval"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18116
+#: doc/guix.texi:18161
 msgid ""
 "A keepalive message is sent to a client after @code{keepalive_interval} "
 "seconds of inactivity to check if the client is still responding.  If set to "
@@ -38908,13 +39702,13 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18121
+#: doc/guix.texi:18166
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} integer keepalive-count"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18125
+#: doc/guix.texi:18170
 msgid ""
 "Maximum number of keepalive messages that are allowed to be sent to the "
 "client without getting any response before the connection is considered "
@@ -38922,7 +39716,7 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18132
+#: doc/guix.texi:18177
 msgid ""
 "In other words, the connection is automatically closed approximately after "
 "@code{keepalive_interval * (keepalive_count + 1)} seconds since the last "
@@ -38932,35 +39726,35 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18137
+#: doc/guix.texi:18182
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} integer admin-keepalive-interval"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18139 doc/guix.texi:18146
+#: doc/guix.texi:18184 doc/guix.texi:18191
 msgid "Same as above but for admin interface."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18144
+#: doc/guix.texi:18189
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} integer admin-keepalive-count"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18151
+#: doc/guix.texi:18196
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} integer ovs-timeout"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18153
+#: doc/guix.texi:18198
 msgid "Timeout for Open vSwitch calls."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18157
+#: doc/guix.texi:18202
 msgid ""
 "The @code{ovs-vsctl} utility is used for the configuration and its timeout "
 "option is set by default to 5 seconds to avoid potential infinite waits "
@@ -38968,44 +39762,44 @@ msgid ""
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:18164
+#: doc/guix.texi:18209
 #, no-wrap
 msgid "Virtlog daemon"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:18167
+#: doc/guix.texi:18212
 msgid ""
 "The virtlogd service is a server side daemon component of libvirt that is "
 "used to manage logs from virtual machine consoles."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:18173
+#: doc/guix.texi:18218
 msgid ""
 "This daemon is not used directly by libvirt client applications, rather it "
 "is called on their behalf by @code{libvirtd}. By maintaining the logs in a "
 "standalone daemon, the main @code{libvirtd} daemon can be restarted without "
-"risk of losing logs. The @code{virtlogd} daemon has the ability to re-exec()  "
-"itself upon receiving @code{SIGUSR1}, to allow live upgrades without "
+"risk of losing logs. The @code{virtlogd} daemon has the ability to re-"
+"exec()  itself upon receiving @code{SIGUSR1}, to allow live upgrades without "
 "downtime."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:18174
+#: doc/guix.texi:18219
 #, no-wrap
 msgid "{Scheme Variable} virtlog-service-type"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:18177
+#: doc/guix.texi:18222
 msgid ""
-"This is the type of the virtlog daemon.  Its value must be a "
-"@code{virtlog-configuration}."
+"This is the type of the virtlog daemon.  Its value must be a @code{virtlog-"
+"configuration}."
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:18182
+#: doc/guix.texi:18227
 #, no-wrap
 msgid ""
 "(service virtlog-service-type\n"
@@ -39014,86 +39808,86 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18185
+#: doc/guix.texi:18230
 #, no-wrap
 msgid "{@code{virtlog-configuration} parameter} integer log-level"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18192
+#: doc/guix.texi:18237
 #, no-wrap
 msgid "{@code{virtlog-configuration} parameter} string log-filters"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18237
+#: doc/guix.texi:18282
 #, no-wrap
 msgid "{@code{virtlog-configuration} parameter} string log-outputs"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18282
+#: doc/guix.texi:18327
 #, no-wrap
 msgid "{@code{virtlog-configuration} parameter} integer max-clients"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18287
+#: doc/guix.texi:18332
 msgid "Defaults to @samp{1024}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18290
+#: doc/guix.texi:18335
 #, no-wrap
 msgid "{@code{virtlog-configuration} parameter} integer max-size"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18292
+#: doc/guix.texi:18337
 msgid "Maximum file size before rolling over."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18294
+#: doc/guix.texi:18339
 msgid "Defaults to @samp{2MB}"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18297
+#: doc/guix.texi:18342
 #, no-wrap
 msgid "{@code{virtlog-configuration} parameter} integer max-backups"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18299
+#: doc/guix.texi:18344
 msgid "Maximum number of backup files to keep."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18301
+#: doc/guix.texi:18346
 msgid "Defaults to @samp{3}"
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:18304
+#: doc/guix.texi:18349
 #, no-wrap
 msgid "Transparent Emulation with QEMU"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:18306
+#: doc/guix.texi:18351
 #, no-wrap
 msgid "emulation"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:18307
+#: doc/guix.texi:18352
 #, no-wrap
 msgid "binfmt_misc"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:18313
+#: doc/guix.texi:18358
 msgid ""
 "@code{qemu-binfmt-service-type} provides support for transparent emulation "
 "of program binaries built for different architectures---e.g., it allows you "
@@ -39103,13 +39897,13 @@ msgid ""
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:18314
+#: doc/guix.texi:18359
 #, no-wrap
 msgid "{Scheme Variable} qemu-binfmt-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:18319
+#: doc/guix.texi:18364
 msgid ""
 "This is the type of the QEMU/binfmt service for transparent emulation.  Its "
 "value must be a @code{qemu-binfmt-configuration} object, which specifies the "
@@ -39117,17 +39911,16 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:18324
+#: doc/guix.texi:18369
 #, no-wrap
 msgid ""
 "(service qemu-binfmt-service-type\n"
 "         (qemu-binfmt-configuration\n"
-"           (platforms (lookup-qemu-platforms \"arm\" \"aarch64\" "
-"\"ppc\"))))\n"
+"           (platforms (lookup-qemu-platforms \"arm\" \"aarch64\" \"ppc\"))))\n"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:18330
+#: doc/guix.texi:18375
 msgid ""
 "In this example, we enable transparent emulation for the ARM and aarch64 "
 "platforms.  Running @code{herd stop qemu-binfmt} turns it off, and running "
@@ -39136,54 +39929,54 @@ msgid ""
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:18332
+#: doc/guix.texi:18377
 #, no-wrap
 msgid "{Data Type} qemu-binfmt-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:18334
+#: doc/guix.texi:18379
 msgid "This is the configuration for the @code{qemu-binfmt} service."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18336
+#: doc/guix.texi:18381
 #, no-wrap
 msgid "@code{platforms} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18339
+#: doc/guix.texi:18384
 msgid ""
 "The list of emulated QEMU platforms.  Each item must be a @dfn{platform "
 "object} as returned by @code{lookup-qemu-platforms} (see below)."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18340
+#: doc/guix.texi:18385
 #, no-wrap
 msgid "@code{guix-support?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18346
+#: doc/guix.texi:18391
 msgid ""
 "When it is true, QEMU and all its dependencies are added to the build "
-"environment of @command{guix-daemon} (@pxref{Invoking guix-daemon, "
-"@code{--chroot-directory} option}).  This allows the @code{binfmt_misc} "
-"handlers to be used within the build environment, which in turn means that "
-"you can transparently build programs for another architecture."
+"environment of @command{guix-daemon} (@pxref{Invoking guix-daemon, @code{--"
+"chroot-directory} option}).  This allows the @code{binfmt_misc} handlers to "
+"be used within the build environment, which in turn means that you can "
+"transparently build programs for another architecture."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18349
+#: doc/guix.texi:18394
 msgid ""
 "For example, let's suppose you're on an x86_64 machine and you have this "
 "service:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:18355
+#: doc/guix.texi:18400
 #, no-wrap
 msgid ""
 "(service qemu-binfmt-service-type\n"
@@ -39193,18 +39986,18 @@ msgid ""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18358
+#: doc/guix.texi:18403
 msgid "You can run:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:18361
+#: doc/guix.texi:18406
 #, no-wrap
 msgid "guix build -s armhf-linux inkscape\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18368
+#: doc/guix.texi:18413
 msgid ""
 "and it will build Inkscape for ARMv7 @emph{as if it were a native build}, "
 "transparently using QEMU to emulate the ARMv7 CPU.  Pretty handy if you'd "
@@ -39212,55 +40005,55 @@ msgid ""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18369
+#: doc/guix.texi:18414
 #, no-wrap
 msgid "@code{qemu} (default: @code{qemu})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18371
+#: doc/guix.texi:18416
 msgid "The QEMU package to use."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:18374
+#: doc/guix.texi:18419
 #, no-wrap
 msgid "{Scheme Procedure} lookup-qemu-platforms @var{platforms}@dots{}"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:18379
+#: doc/guix.texi:18424
 msgid ""
-"Return the list of QEMU platform objects corresponding to "
-"@var{platforms}@dots{}.  @var{platforms} must be a list of strings "
-"corresponding to platform names, such as @code{\"arm\"}, @code{\"sparc\"}, "
-"@code{\"mips64el\"}, and so on."
+"Return the list of QEMU platform objects corresponding to @var{platforms}"
+"@dots{}.  @var{platforms} must be a list of strings corresponding to "
+"platform names, such as @code{\"arm\"}, @code{\"sparc\"}, @code{\"mips64el"
+"\"}, and so on."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:18381
+#: doc/guix.texi:18426
 #, no-wrap
 msgid "{Scheme Procedure} qemu-platform? @var{obj}"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:18383
+#: doc/guix.texi:18428
 msgid "Return true if @var{obj} is a platform object."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:18385
+#: doc/guix.texi:18430
 #, no-wrap
 msgid "{Scheme Procedure} qemu-platform-name @var{platform}"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:18387
+#: doc/guix.texi:18432
 msgid "Return the name of @var{platform}---a string such as @code{\"arm\"}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:18399
+#: doc/guix.texi:18444
 msgid ""
 "The @code{(gnu services version-control)} module provides a service to allow "
 "remote access to local Git repositories.  There are three options: the "
@@ -39271,71 +40064,70 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:18400
+#: doc/guix.texi:18445
 #, no-wrap
 msgid "{Scheme Procedure} git-daemon-service [#:config (git-daemon-configuration)]"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:18404
+#: doc/guix.texi:18449
 msgid ""
 "Return a service that runs @command{git daemon}, a simple TCP server to "
 "expose repositories over the Git protocol for anonymous access."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:18410
+#: doc/guix.texi:18455
 msgid ""
-"The optional @var{config} argument should be a "
-"@code{<git-daemon-configuration>} object, by default it allows read-only "
-"access to exported@footnote{By creating the magic file "
-"\"git-daemon-export-ok\" in the repository directory.} repositories under "
-"@file{/srv/git}."
+"The optional @var{config} argument should be a @code{<git-daemon-"
+"configuration>} object, by default it allows read-only access to "
+"exported@footnote{By creating the magic file \"git-daemon-export-ok\" in the "
+"repository directory.} repositories under @file{/srv/git}."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:18413
+#: doc/guix.texi:18458
 #, no-wrap
 msgid "{Data Type} git-daemon-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:18415
+#: doc/guix.texi:18460
 msgid "Data type representing the configuration for @code{git-daemon-service}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18417 doc/guix.texi:18473
+#: doc/guix.texi:18462 doc/guix.texi:18518
 #, no-wrap
 msgid "@code{package} (default: @var{git})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18419 doc/guix.texi:18475
+#: doc/guix.texi:18464 doc/guix.texi:18520
 msgid "Package object of the Git distributed version control system."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18420 doc/guix.texi:18479
+#: doc/guix.texi:18465 doc/guix.texi:18524
 #, no-wrap
 msgid "@code{export-all?} (default: @var{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18423
+#: doc/guix.texi:18468
 msgid ""
 "Whether to allow access for all Git repositories, even if they do not have "
 "the @file{git-daemon-export-ok} file."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18424
+#: doc/guix.texi:18469
 #, no-wrap
 msgid "@code{base-path} (default: @file{/srv/git})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18429
+#: doc/guix.texi:18474
 msgid ""
 "Whether to remap all the path requests as relative to the given path.  If "
 "you run git daemon with @var{(base-path \"/srv/git\")} on example.com, then "
@@ -39344,13 +40136,13 @@ msgid ""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18430
+#: doc/guix.texi:18475
 #, no-wrap
 msgid "@code{user-path} (default: @var{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18437
+#: doc/guix.texi:18482
 msgid ""
 "Whether to allow @code{~user} notation to be used in requests.  When "
 "specified with empty string, requests to @code{git://host/~alice/foo} is "
@@ -39361,53 +40153,54 @@ msgid ""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18438
+#: doc/guix.texi:18483
 #, no-wrap
 msgid "@code{listen} (default: @var{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18441
-msgid "Whether to listen on specific IP addresses or hostnames, defaults to all."
+#: doc/guix.texi:18486
+msgid ""
+"Whether to listen on specific IP addresses or hostnames, defaults to all."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18442
+#: doc/guix.texi:18487
 #, no-wrap
 msgid "@code{port} (default: @var{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18444
+#: doc/guix.texi:18489
 msgid "Whether to listen on an alternative port, which defaults to 9418."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18445
+#: doc/guix.texi:18490
 #, no-wrap
 msgid "@code{whitelist} (default: @var{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18447
+#: doc/guix.texi:18492
 msgid "If not empty, only allow access to this list of directories."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18448
+#: doc/guix.texi:18493
 #, no-wrap
 msgid "@code{extra-options} (default: @var{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18451
+#: doc/guix.texi:18496
 msgid ""
 "Extra options will be passed to @code{git daemon}, please run @command{man "
 "git-daemon} for more information."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:18465
+#: doc/guix.texi:18510
 msgid ""
 "The @code{git://} protocol lacks authentication.  When you pull from a "
 "repository fetched via @code{git://}, you don't know that the data you "
@@ -39415,78 +40208,78 @@ msgid ""
 "your connection is subject to eavesdropping.  It's better to use an "
 "authenticated and encrypted transport, such as @code{https}.  Although Git "
 "allows you to serve repositories using unsophisticated file-based web "
-"servers, there is a faster protocol implemented by the "
-"@code{git-http-backend} program.  This program is the back-end of a proper "
-"Git web service.  It is designed to sit behind a FastCGI proxy.  @xref{Web "
+"servers, there is a faster protocol implemented by the @code{git-http-"
+"backend} program.  This program is the back-end of a proper Git web "
+"service.  It is designed to sit behind a FastCGI proxy.  @xref{Web "
 "Services}, for more on running the necessary @code{fcgiwrap} daemon."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:18468
+#: doc/guix.texi:18513
 msgid ""
 "Guix has a separate configuration data type for serving Git repositories "
 "over HTTP."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:18469
+#: doc/guix.texi:18514
 #, no-wrap
 msgid "{Data Type} git-http-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:18471
+#: doc/guix.texi:18516
 msgid "Data type representing the configuration for @code{git-http-service}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18476
+#: doc/guix.texi:18521
 #, no-wrap
 msgid "@code{git-root} (default: @file{/srv/git})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18478
+#: doc/guix.texi:18523
 msgid "Directory containing the Git repositories to expose to the world."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18482
+#: doc/guix.texi:18527
 msgid ""
 "Whether to expose access for all Git repositories in @var{git-root}, even if "
 "they do not have the @file{git-daemon-export-ok} file."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18483
+#: doc/guix.texi:18528
 #, no-wrap
 msgid "@code{uri-path} (default: @file{/git/})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18488
+#: doc/guix.texi:18533
 msgid ""
 "Path prefix for Git access.  With the default @code{/git/} prefix, this will "
-"map @code{http://@var{server}/git/@var{repo}.git} to "
-"@code{/srv/git/@var{repo}.git}.  Requests whose URI paths do not begin with "
-"this prefix are not passed on to this Git instance."
+"map @code{http://@var{server}/git/@var{repo}.git} to @code{/srv/git/"
+"@var{repo}.git}.  Requests whose URI paths do not begin with this prefix are "
+"not passed on to this Git instance."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18489
+#: doc/guix.texi:18534
 #, no-wrap
 msgid "@code{fcgiwrap-socket} (default: @code{127.0.0.1:9000})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18492
+#: doc/guix.texi:18537
 msgid ""
 "The socket on which the @code{fcgiwrap} daemon is listening.  @xref{Web "
 "Services}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:18499
+#: doc/guix.texi:18544
 msgid ""
 "There is no @code{git-http-service-type}, currently; instead you can create "
 "an @code{nginx-location-configuration} from a @code{git-http-configuration} "
@@ -39494,22 +40287,22 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:18500
+#: doc/guix.texi:18545
 #, no-wrap
 msgid "{Scheme Procedure} git-http-nginx-location-configuration @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:18505
+#: doc/guix.texi:18550
 msgid ""
-"[config=(git-http-configuration)] Compute an "
-"@code{nginx-location-configuration} that corresponds to the given Git http "
-"configuration.  An example nginx service definition to serve the default "
-"@file{/srv/git} over HTTPS might be:"
+"[config=(git-http-configuration)] Compute an @code{nginx-location-"
+"configuration} that corresponds to the given Git http configuration.  An "
+"example nginx service definition to serve the default @file{/srv/git} over "
+"HTTPS might be:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:18522
+#: doc/guix.texi:18567
 #, no-wrap
 msgid ""
 "(service nginx-service-type\n"
@@ -39530,7 +40323,7 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:18529
+#: doc/guix.texi:18574
 msgid ""
 "This example assumes that you are using Let's Encrypt to get your TLS "
 "certificate.  @xref{Certificate Services}.  The default @code{certbot} "
@@ -39540,347 +40333,347 @@ msgid ""
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:18531
+#: doc/guix.texi:18576
 #, no-wrap
 msgid "Cgit Service"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:18533
+#: doc/guix.texi:18578
 #, no-wrap
 msgid "Cgit service"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:18534
+#: doc/guix.texi:18579
 #, no-wrap
 msgid "Git, web interface"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:18537
+#: doc/guix.texi:18582
 msgid ""
 "@uref{https://git.zx2c4.com/cgit/, Cgit} is a web frontend for Git "
 "repositories written in C."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:18540
+#: doc/guix.texi:18585
 msgid ""
 "The following example will configure the service with default values.  By "
 "default, Cgit can be accessed on port 80 (@code{http://localhost:80})."
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:18543
+#: doc/guix.texi:18588
 #, no-wrap
 msgid "(service cgit-service-type)\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:18547
+#: doc/guix.texi:18592
 msgid ""
-"The @code{file-object} type designates either a file-like object "
-"(@pxref{G-Expressions, file-like objects}) or a string."
+"The @code{file-object} type designates either a file-like object (@pxref{G-"
+"Expressions, file-like objects}) or a string."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:18551
+#: doc/guix.texi:18596
 msgid "Available @code{cgit-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18552
+#: doc/guix.texi:18597
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} package package"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18554
+#: doc/guix.texi:18599
 msgid "The CGIT package."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18557
+#: doc/guix.texi:18602
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} nginx-server-configuration-list nginx"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18559
+#: doc/guix.texi:18604
 msgid "NGINX configuration."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18562
+#: doc/guix.texi:18607
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} file-object about-filter"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18565
+#: doc/guix.texi:18610
 msgid ""
 "Specifies a command which will be invoked to format the content of about "
 "pages (both top-level and for each repository)."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18570
+#: doc/guix.texi:18615
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} string agefile"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18573
+#: doc/guix.texi:18618
 msgid ""
 "Specifies a path, relative to each repository path, which can be used to "
 "specify the date and time of the youngest commit in the repository."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18578
+#: doc/guix.texi:18623
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} file-object auth-filter"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18581
+#: doc/guix.texi:18626
 msgid ""
 "Specifies a command that will be invoked for authenticating repository "
 "access."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18586
+#: doc/guix.texi:18631
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} string branch-sort"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18589
+#: doc/guix.texi:18634
 msgid ""
 "Flag which, when set to @samp{age}, enables date ordering in the branch ref "
 "list, and when set @samp{name} enables ordering by branch name."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18591
+#: doc/guix.texi:18636
 msgid "Defaults to @samp{\"name\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18594
+#: doc/guix.texi:18639
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} string cache-root"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18596
+#: doc/guix.texi:18641
 msgid "Path used to store the cgit cache entries."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18598
+#: doc/guix.texi:18643
 msgid "Defaults to @samp{\"/var/cache/cgit\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18601
+#: doc/guix.texi:18646
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} integer cache-static-ttl"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18604
+#: doc/guix.texi:18649
 msgid ""
 "Number which specifies the time-to-live, in minutes, for the cached version "
 "of repository pages accessed with a fixed SHA1."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18606 doc/guix.texi:19049
+#: doc/guix.texi:18651 doc/guix.texi:19094
 msgid "Defaults to @samp{-1}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18609
+#: doc/guix.texi:18654
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} integer cache-dynamic-ttl"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18612
+#: doc/guix.texi:18657
 msgid ""
 "Number which specifies the time-to-live, in minutes, for the cached version "
 "of repository pages accessed without a fixed SHA1."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18617
+#: doc/guix.texi:18662
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} integer cache-repo-ttl"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18620
+#: doc/guix.texi:18665
 msgid ""
 "Number which specifies the time-to-live, in minutes, for the cached version "
 "of the repository summary page."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18625
+#: doc/guix.texi:18670
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} integer cache-root-ttl"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18628
+#: doc/guix.texi:18673
 msgid ""
 "Number which specifies the time-to-live, in minutes, for the cached version "
 "of the repository index page."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18633
+#: doc/guix.texi:18678
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} integer cache-scanrc-ttl"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18636
+#: doc/guix.texi:18681
 msgid ""
 "Number which specifies the time-to-live, in minutes, for the result of "
 "scanning a path for Git repositories."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18641
+#: doc/guix.texi:18686
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} integer cache-about-ttl"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18644
+#: doc/guix.texi:18689
 msgid ""
 "Number which specifies the time-to-live, in minutes, for the cached version "
 "of the repository about page."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18649
+#: doc/guix.texi:18694
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} integer cache-snapshot-ttl"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18652
+#: doc/guix.texi:18697
 msgid ""
 "Number which specifies the time-to-live, in minutes, for the cached version "
 "of snapshots."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18657
+#: doc/guix.texi:18702
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} integer cache-size"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18660
+#: doc/guix.texi:18705
 msgid ""
 "The maximum number of entries in the cgit cache.  When set to @samp{0}, "
 "caching is disabled."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18665
+#: doc/guix.texi:18710
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} boolean case-sensitive-sort?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18667
+#: doc/guix.texi:18712
 msgid "Sort items in the repo list case sensitively."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18672
+#: doc/guix.texi:18717
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} list clone-prefix"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18675
+#: doc/guix.texi:18720
 msgid ""
 "List of common prefixes which, when combined with a repository URL, "
 "generates valid clone URLs for the repository."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18680
+#: doc/guix.texi:18725
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} list clone-url"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18682
+#: doc/guix.texi:18727
 msgid "List of @code{clone-url} templates."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18687
+#: doc/guix.texi:18732
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} file-object commit-filter"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18689
+#: doc/guix.texi:18734
 msgid "Command which will be invoked to format commit messages."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18694
+#: doc/guix.texi:18739
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} string commit-sort"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18698 doc/guix.texi:19256
+#: doc/guix.texi:18743 doc/guix.texi:19301
 msgid ""
 "Flag which, when set to @samp{date}, enables strict date ordering in the "
 "commit log, and when set to @samp{topo} enables strict topological ordering."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18700
+#: doc/guix.texi:18745
 msgid "Defaults to @samp{\"git log\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18703
+#: doc/guix.texi:18748
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} file-object css"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18705
+#: doc/guix.texi:18750
 msgid "URL which specifies the css document to include in all cgit pages."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18707
+#: doc/guix.texi:18752
 msgid "Defaults to @samp{\"/share/cgit/cgit.css\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18710
+#: doc/guix.texi:18755
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} file-object email-filter"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18714
+#: doc/guix.texi:18759
 msgid ""
 "Specifies a command which will be invoked to format names and email address "
 "of committers, authors, and taggers, as represented in various places "
@@ -39888,141 +40681,142 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18719
+#: doc/guix.texi:18764
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} boolean embedded?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18722
+#: doc/guix.texi:18767
 msgid ""
 "Flag which, when set to @samp{#t}, will make cgit generate a HTML fragment "
 "suitable for embedding in other HTML pages."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18727
+#: doc/guix.texi:18772
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} boolean enable-commit-graph?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18731
+#: doc/guix.texi:18776
 msgid ""
 "Flag which, when set to @samp{#t}, will make cgit print an ASCII-art commit "
 "history graph to the left of the commit messages in the repository log page."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18736
+#: doc/guix.texi:18781
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} boolean enable-filter-overrides?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18739
+#: doc/guix.texi:18784
 msgid ""
 "Flag which, when set to @samp{#t}, allows all filter settings to be "
 "overridden in repository-specific cgitrc files."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18744
+#: doc/guix.texi:18789
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} boolean enable-follow-links?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18747
+#: doc/guix.texi:18792
 msgid ""
 "Flag which, when set to @samp{#t}, allows users to follow a file in the log "
 "view."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18752
+#: doc/guix.texi:18797
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} boolean enable-http-clone?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18755
-msgid "If set to @samp{#t}, cgit will act as an dumb HTTP endpoint for Git clones."
+#: doc/guix.texi:18800
+msgid ""
+"If set to @samp{#t}, cgit will act as an dumb HTTP endpoint for Git clones."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18760
+#: doc/guix.texi:18805
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} boolean enable-index-links?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18763
+#: doc/guix.texi:18808
 msgid ""
 "Flag which, when set to @samp{#t}, will make cgit generate extra links "
 "\"summary\", \"commit\", \"tree\" for each repo in the repository index."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18768
+#: doc/guix.texi:18813
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} boolean enable-index-owner?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18771
+#: doc/guix.texi:18816
 msgid ""
 "Flag which, when set to @samp{#t}, will make cgit display the owner of each "
 "repo in the repository index."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18776
+#: doc/guix.texi:18821
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} boolean enable-log-filecount?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18779
+#: doc/guix.texi:18824
 msgid ""
 "Flag which, when set to @samp{#t}, will make cgit print the number of "
 "modified files for each commit on the repository log page."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18784
+#: doc/guix.texi:18829
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} boolean enable-log-linecount?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18787
+#: doc/guix.texi:18832
 msgid ""
 "Flag which, when set to @samp{#t}, will make cgit print the number of added "
 "and removed lines for each commit on the repository log page."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18792
+#: doc/guix.texi:18837
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} boolean enable-remote-branches?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18795 doc/guix.texi:19319
+#: doc/guix.texi:18840 doc/guix.texi:19364
 msgid ""
 "Flag which, when set to @code{#t}, will make cgit display remote branches in "
 "the summary and refs views."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18800
+#: doc/guix.texi:18845
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} boolean enable-subject-links?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18804
+#: doc/guix.texi:18849
 msgid ""
 "Flag which, when set to @code{1}, will make cgit use the subject of the "
 "parent commit as link text when generating links to parent commits in commit "
@@ -40030,13 +40824,13 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18809
+#: doc/guix.texi:18854
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} boolean enable-html-serving?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18813
+#: doc/guix.texi:18858
 msgid ""
 "Flag which, when set to @samp{#t}, will make cgit use the subject of the "
 "parent commit as link text when generating links to parent commits in commit "
@@ -40044,363 +40838,366 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18818
+#: doc/guix.texi:18863
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} boolean enable-tree-linenumbers?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18821
+#: doc/guix.texi:18866
 msgid ""
 "Flag which, when set to @samp{#t}, will make cgit generate linenumber links "
 "for plaintext blobs printed in the tree view."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18826
+#: doc/guix.texi:18871
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} boolean enable-git-config?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18829
+#: doc/guix.texi:18874
 msgid ""
 "Flag which, when set to @samp{#f}, will allow cgit to use Git config to set "
 "any repo specific settings."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18834
+#: doc/guix.texi:18879
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} file-object favicon"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18836
+#: doc/guix.texi:18881
 msgid "URL used as link to a shortcut icon for cgit."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18838
+#: doc/guix.texi:18883
 msgid "Defaults to @samp{\"/favicon.ico\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18841
+#: doc/guix.texi:18886
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} string footer"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18845
+#: doc/guix.texi:18890
 msgid ""
 "The content of the file specified with this option will be included verbatim "
-"at the bottom of all pages (i.e.  it replaces the standard \"generated "
-"by...\" message)."
+"at the bottom of all pages (i.e.  it replaces the standard \"generated by..."
+"\" message)."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18850
+#: doc/guix.texi:18895
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} string head-include"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18853
+#: doc/guix.texi:18898
 msgid ""
 "The content of the file specified with this option will be included verbatim "
 "in the HTML HEAD section on all pages."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18858
+#: doc/guix.texi:18903
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} string header"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18861
+#: doc/guix.texi:18906
 msgid ""
 "The content of the file specified with this option will be included verbatim "
 "at the top of all pages."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18866
+#: doc/guix.texi:18911
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} file-object include"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18869
+#: doc/guix.texi:18914
 msgid ""
 "Name of a configfile to include before the rest of the current config- file "
 "is parsed."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18874
+#: doc/guix.texi:18919
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} string index-header"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18877
+#: doc/guix.texi:18922
 msgid ""
 "The content of the file specified with this option will be included verbatim "
 "above the repository index."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18882
+#: doc/guix.texi:18927
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} string index-info"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18885
+#: doc/guix.texi:18930
 msgid ""
 "The content of the file specified with this option will be included verbatim "
 "below the heading on the repository index page."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18890
+#: doc/guix.texi:18935
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} boolean local-time?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18893
+#: doc/guix.texi:18938
 msgid ""
 "Flag which, if set to @samp{#t}, makes cgit print commit and tag times in "
 "the servers timezone."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18898
+#: doc/guix.texi:18943
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} file-object logo"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18901
+#: doc/guix.texi:18946
 msgid ""
 "URL which specifies the source of an image which will be used as a logo on "
 "all cgit pages."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18903
+#: doc/guix.texi:18948
 msgid "Defaults to @samp{\"/share/cgit/cgit.png\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18906
+#: doc/guix.texi:18951
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} string logo-link"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18908 doc/guix.texi:19365
+#: doc/guix.texi:18953 doc/guix.texi:19410
 msgid "URL loaded when clicking on the cgit logo image."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18913
+#: doc/guix.texi:18958
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} file-object owner-filter"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18916
-msgid "Command which will be invoked to format the Owner column of the main page."
+#: doc/guix.texi:18961
+msgid ""
+"Command which will be invoked to format the Owner column of the main page."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18921
+#: doc/guix.texi:18966
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} integer max-atom-items"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18923
+#: doc/guix.texi:18968
 msgid "Number of items to display in atom feeds view."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18925 doc/guix.texi:19160 doc/guix.texi:19168 doc/guix.texi:19176
+#: doc/guix.texi:18970 doc/guix.texi:19205 doc/guix.texi:19213
+#: doc/guix.texi:19221
 msgid "Defaults to @samp{10}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18928
+#: doc/guix.texi:18973
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} integer max-commit-count"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18930
+#: doc/guix.texi:18975
 msgid "Number of entries to list per page in \"log\" view."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18932 doc/guix.texi:18947
+#: doc/guix.texi:18977 doc/guix.texi:18992
 msgid "Defaults to @samp{50}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18935
+#: doc/guix.texi:18980
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} integer max-message-length"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18937
+#: doc/guix.texi:18982
 msgid "Number of commit message characters to display in \"log\" view."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18939 doc/guix.texi:18955
+#: doc/guix.texi:18984 doc/guix.texi:19000
 msgid "Defaults to @samp{80}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18942
+#: doc/guix.texi:18987
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} integer max-repo-count"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18945
+#: doc/guix.texi:18990
 msgid ""
 "Specifies the number of entries to list per page on the repository index "
 "page."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18950
+#: doc/guix.texi:18995
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} integer max-repodesc-length"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18953
+#: doc/guix.texi:18998
 msgid ""
 "Specifies the maximum number of repo description characters to display on "
 "the repository index page."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18958
+#: doc/guix.texi:19003
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} integer max-blob-size"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18960
+#: doc/guix.texi:19005
 msgid "Specifies the maximum size of a blob to display HTML for in KBytes."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18965
+#: doc/guix.texi:19010
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} string max-stats"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18968
+#: doc/guix.texi:19013
 msgid ""
 "Maximum statistics period.  Valid values are @samp{week},@samp{month}, "
 "@samp{quarter} and @samp{year}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18973
+#: doc/guix.texi:19018
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} mimetype-alist mimetype"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18975
+#: doc/guix.texi:19020
 msgid "Mimetype for the specified filename extension."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18979
+#: doc/guix.texi:19024
 msgid ""
-"Defaults to @samp{((gif \"image/gif\") (html \"text/html\") (jpg "
-"\"image/jpeg\") (jpeg \"image/jpeg\") (pdf \"application/pdf\") (png "
-"\"image/png\") (svg \"image/svg+xml\"))}."
+"Defaults to @samp{((gif \"image/gif\") (html \"text/html\") (jpg \"image/jpeg"
+"\") (jpeg \"image/jpeg\") (pdf \"application/pdf\") (png \"image/png\") (svg "
+"\"image/svg+xml\"))}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18982
+#: doc/guix.texi:19027
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} file-object mimetype-file"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18984
+#: doc/guix.texi:19029
 msgid "Specifies the file to use for automatic mimetype lookup."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18989
+#: doc/guix.texi:19034
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} string module-link"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18992
+#: doc/guix.texi:19037
 msgid ""
 "Text which will be used as the formatstring for a hyperlink when a submodule "
 "is printed in a directory listing."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18997
+#: doc/guix.texi:19042
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} boolean nocache?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18999
+#: doc/guix.texi:19044
 msgid "If set to the value @samp{#t} caching will be disabled."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19004
+#: doc/guix.texi:19049
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} boolean noplainemail?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19007
-msgid "If set to @samp{#t} showing full author email addresses will be disabled."
+#: doc/guix.texi:19052
+msgid ""
+"If set to @samp{#t} showing full author email addresses will be disabled."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19012
+#: doc/guix.texi:19057
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} boolean noheader?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19015
+#: doc/guix.texi:19060
 msgid ""
 "Flag which, when set to @samp{#t}, will make cgit omit the standard header "
 "on all pages."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19020
+#: doc/guix.texi:19065
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} list project-list"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19024
+#: doc/guix.texi:19069
 msgid ""
 "A list of subdirectories inside of @code{repository-directory}, relative to "
 "it, that should loaded as Git repositories.  An empty list means that all "
@@ -40408,24 +41205,24 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19029
+#: doc/guix.texi:19074
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} file-object readme"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19031
+#: doc/guix.texi:19076
 msgid "Text which will be used as default value for @code{cgit-repo-readme}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19036
+#: doc/guix.texi:19081
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} boolean remove-suffix?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19040
+#: doc/guix.texi:19085
 msgid ""
 "If set to @code{#t} and @code{repository-directory} is enabled, if any "
 "repositories are found with a suffix of @code{.git}, this suffix will be "
@@ -40433,382 +41230,371 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19045
+#: doc/guix.texi:19090
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} integer renamelimit"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19047
+#: doc/guix.texi:19092
 msgid "Maximum number of files to consider when detecting renames."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19052
+#: doc/guix.texi:19097
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} string repository-sort"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19054
+#: doc/guix.texi:19099
 msgid "The way in which repositories in each section are sorted."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19059
+#: doc/guix.texi:19104
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} robots-list robots"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19061
+#: doc/guix.texi:19106
 msgid "Text used as content for the @code{robots} meta-tag."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19063
+#: doc/guix.texi:19108
 msgid "Defaults to @samp{(\"noindex\" \"nofollow\")}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19066
+#: doc/guix.texi:19111
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} string root-desc"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19068
+#: doc/guix.texi:19113
 msgid "Text printed below the heading on the repository index page."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19070
+#: doc/guix.texi:19115
 msgid "Defaults to @samp{\"a fast webinterface for the git dscm\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19073
+#: doc/guix.texi:19118
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} string root-readme"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19076
+#: doc/guix.texi:19121
 msgid ""
 "The content of the file specified with this option will be included verbatim "
 "below thef \"about\" link on the repository index page."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19081
+#: doc/guix.texi:19126
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} string root-title"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19083
+#: doc/guix.texi:19128
 msgid "Text printed as heading on the repository index page."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19088
+#: doc/guix.texi:19133
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} boolean scan-hidden-path"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19094
+#: doc/guix.texi:19139
 msgid ""
-"If set to @samp{#t} and repository-directory is enabled, "
-"repository-directory will recurse into directories whose name starts with a "
-"period.  Otherwise, repository-directory will stay away from such "
-"directories, considered as \"hidden\".  Note that this does not apply to the "
-"\".git\" directory in non-bare repos."
+"If set to @samp{#t} and repository-directory is enabled, repository-"
+"directory will recurse into directories whose name starts with a period.  "
+"Otherwise, repository-directory will stay away from such directories, "
+"considered as \"hidden\".  Note that this does not apply to the \".git\" "
+"directory in non-bare repos."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19099
+#: doc/guix.texi:19144
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} list snapshots"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19102
+#: doc/guix.texi:19147
 msgid ""
 "Text which specifies the default set of snapshot formats that cgit generates "
 "links for."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19107
+#: doc/guix.texi:19152
 #, no-wrap
-msgid ""
-"{@code{cgit-configuration} parameter} repository-directory "
-"repository-directory"
+msgid "{@code{cgit-configuration} parameter} repository-directory repository-directory"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19110
+#: doc/guix.texi:19155
 msgid ""
-"Name of the directory to scan for repositories (represents "
-"@code{scan-path})."
+"Name of the directory to scan for repositories (represents @code{scan-path})."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19112
+#: doc/guix.texi:19157
 msgid "Defaults to @samp{\"/srv/git\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19115
+#: doc/guix.texi:19160
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} string section"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19118 doc/guix.texi:19434
+#: doc/guix.texi:19163 doc/guix.texi:19479
 msgid ""
 "The name of the current repository section - all repositories defined after "
 "this option will inherit the current section name."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19123
+#: doc/guix.texi:19168
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} string section-sort"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19126
+#: doc/guix.texi:19171
 msgid ""
 "Flag which, when set to @samp{1}, will sort the sections on the repository "
 "listing by name."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19131
+#: doc/guix.texi:19176
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} integer section-from-path"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19134
+#: doc/guix.texi:19179
 msgid ""
 "A number which, if defined prior to repository-directory, specifies how many "
 "path elements from each repo path to use as a default section name."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19139
+#: doc/guix.texi:19184
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} boolean side-by-side-diffs?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19142
+#: doc/guix.texi:19187
 msgid ""
-"If set to @samp{#t} shows side-by-side diffs instead of unidiffs per "
-"default."
+"If set to @samp{#t} shows side-by-side diffs instead of unidiffs per default."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19147
+#: doc/guix.texi:19192
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} file-object source-filter"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19150
+#: doc/guix.texi:19195
 msgid ""
 "Specifies a command which will be invoked to format plaintext blobs in the "
 "tree view."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19155
+#: doc/guix.texi:19200
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} integer summary-branches"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19158
+#: doc/guix.texi:19203
 msgid ""
 "Specifies the number of branches to display in the repository \"summary\" "
 "view."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19163
+#: doc/guix.texi:19208
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} integer summary-log"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19166
+#: doc/guix.texi:19211
 msgid ""
 "Specifies the number of log entries to display in the repository \"summary\" "
 "view."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19171
+#: doc/guix.texi:19216
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} integer summary-tags"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19174
-msgid "Specifies the number of tags to display in the repository \"summary\" view."
+#: doc/guix.texi:19219
+msgid ""
+"Specifies the number of tags to display in the repository \"summary\" view."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19179
+#: doc/guix.texi:19224
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} string strict-export"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19182
+#: doc/guix.texi:19227
 msgid ""
 "Filename which, if specified, needs to be present within the repository for "
 "cgit to allow access to that repository."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19187
+#: doc/guix.texi:19232
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} string virtual-root"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19189
+#: doc/guix.texi:19234
 msgid "URL which, if specified, will be used as root for all cgit links."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19191
+#: doc/guix.texi:19236
 msgid "Defaults to @samp{\"/\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19194
+#: doc/guix.texi:19239
 #, no-wrap
-msgid ""
-"{@code{cgit-configuration} parameter} repository-cgit-configuration-list "
-"repositories"
+msgid "{@code{cgit-configuration} parameter} repository-cgit-configuration-list repositories"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19196
+#: doc/guix.texi:19241
 msgid "A list of @dfn{cgit-repo} records to use with config."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19200
+#: doc/guix.texi:19245
 msgid "Available @code{repository-cgit-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19201
+#: doc/guix.texi:19246
 #, no-wrap
 msgid "{@code{repository-cgit-configuration} parameter} repo-list snapshots"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19204
+#: doc/guix.texi:19249
 msgid ""
 "A mask of snapshot formats for this repo that cgit generates links for, "
 "restricted by the global @code{snapshots} setting."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19209
+#: doc/guix.texi:19254
 #, no-wrap
-msgid ""
-"{@code{repository-cgit-configuration} parameter} repo-file-object "
-"source-filter"
+msgid "{@code{repository-cgit-configuration} parameter} repo-file-object source-filter"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19211
+#: doc/guix.texi:19256
 msgid "Override the default @code{source-filter}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19216
+#: doc/guix.texi:19261
 #, no-wrap
 msgid "{@code{repository-cgit-configuration} parameter} repo-string url"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19218
+#: doc/guix.texi:19263
 msgid "The relative URL used to access the repository."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19223
+#: doc/guix.texi:19268
 #, no-wrap
-msgid ""
-"{@code{repository-cgit-configuration} parameter} repo-file-object "
-"about-filter"
+msgid "{@code{repository-cgit-configuration} parameter} repo-file-object about-filter"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19225
+#: doc/guix.texi:19270
 msgid "Override the default @code{about-filter}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19230
+#: doc/guix.texi:19275
 #, no-wrap
 msgid "{@code{repository-cgit-configuration} parameter} repo-string branch-sort"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19233
+#: doc/guix.texi:19278
 msgid ""
 "Flag which, when set to @samp{age}, enables date ordering in the branch ref "
 "list, and when set to @samp{name} enables ordering by branch name."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19238
+#: doc/guix.texi:19283
 #, no-wrap
 msgid "{@code{repository-cgit-configuration} parameter} repo-list clone-url"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19240
+#: doc/guix.texi:19285
 msgid "A list of URLs which can be used to clone repo."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19245
+#: doc/guix.texi:19290
 #, no-wrap
-msgid ""
-"{@code{repository-cgit-configuration} parameter} repo-file-object "
-"commit-filter"
+msgid "{@code{repository-cgit-configuration} parameter} repo-file-object commit-filter"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19247
+#: doc/guix.texi:19292
 msgid "Override the default @code{commit-filter}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19252
+#: doc/guix.texi:19297
 #, no-wrap
 msgid "{@code{repository-cgit-configuration} parameter} repo-string commit-sort"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19261
+#: doc/guix.texi:19306
 #, no-wrap
 msgid "{@code{repository-cgit-configuration} parameter} repo-string defbranch"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19266
+#: doc/guix.texi:19311
 msgid ""
 "The name of the default branch for this repository.  If no such branch "
 "exists in the repository, the first branch name (when sorted) is used as "
@@ -40817,187 +41603,171 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19271
+#: doc/guix.texi:19316
 #, no-wrap
 msgid "{@code{repository-cgit-configuration} parameter} repo-string desc"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19273
+#: doc/guix.texi:19318
 msgid "The value to show as repository description."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19278
+#: doc/guix.texi:19323
 #, no-wrap
 msgid "{@code{repository-cgit-configuration} parameter} repo-string homepage"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19280
+#: doc/guix.texi:19325
 msgid "The value to show as repository homepage."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19285
+#: doc/guix.texi:19330
 #, no-wrap
-msgid ""
-"{@code{repository-cgit-configuration} parameter} repo-file-object "
-"email-filter"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:19287
-msgid "Override the default @code{email-filter}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:19292
-#, no-wrap
-msgid ""
-"{@code{repository-cgit-configuration} parameter} repo-boolean "
-"enable-commit-graph?"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:19295
-msgid ""
-"A flag which can be used to disable the global setting "
-"@code{enable-commit-graph?}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:19300
-#, no-wrap
-msgid ""
-"{@code{repository-cgit-configuration} parameter} repo-boolean "
-"enable-log-filecount?"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:19303
-msgid ""
-"A flag which can be used to disable the global setting "
-"@code{enable-log-filecount?}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:19308
-#, no-wrap
-msgid ""
-"{@code{repository-cgit-configuration} parameter} repo-boolean "
-"enable-log-linecount?"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:19311
-msgid ""
-"A flag which can be used to disable the global setting "
-"@code{enable-log-linecount?}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:19316
-#, no-wrap
-msgid ""
-"{@code{repository-cgit-configuration} parameter} repo-boolean "
-"enable-remote-branches?"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:19324
-#, no-wrap
-msgid ""
-"{@code{repository-cgit-configuration} parameter} repo-boolean "
-"enable-subject-links?"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:19327
-msgid ""
-"A flag which can be used to override the global setting "
-"@code{enable-subject-links?}."
+msgid "{@code{repository-cgit-configuration} parameter} repo-file-object email-filter"
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:19332
-#, no-wrap
-msgid ""
-"{@code{repository-cgit-configuration} parameter} repo-boolean "
-"enable-html-serving?"
+msgid "Override the default @code{email-filter}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19335
-msgid ""
-"A flag which can be used to override the global setting "
-"@code{enable-html-serving?}."
+#: doc/guix.texi:19337
+#, no-wrap
+msgid "{@code{repository-cgit-configuration} parameter} repo-boolean enable-commit-graph?"
 msgstr ""
 
 #. type: deftypevr
 #: doc/guix.texi:19340
+msgid ""
+"A flag which can be used to disable the global setting @code{enable-commit-"
+"graph?}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:19345
+#, no-wrap
+msgid "{@code{repository-cgit-configuration} parameter} repo-boolean enable-log-filecount?"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:19348
+msgid ""
+"A flag which can be used to disable the global setting @code{enable-log-"
+"filecount?}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:19353
+#, no-wrap
+msgid "{@code{repository-cgit-configuration} parameter} repo-boolean enable-log-linecount?"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:19356
+msgid ""
+"A flag which can be used to disable the global setting @code{enable-log-"
+"linecount?}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:19361
+#, no-wrap
+msgid "{@code{repository-cgit-configuration} parameter} repo-boolean enable-remote-branches?"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:19369
+#, no-wrap
+msgid "{@code{repository-cgit-configuration} parameter} repo-boolean enable-subject-links?"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:19372
+msgid ""
+"A flag which can be used to override the global setting @code{enable-subject-"
+"links?}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:19377
+#, no-wrap
+msgid "{@code{repository-cgit-configuration} parameter} repo-boolean enable-html-serving?"
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:19380
+msgid ""
+"A flag which can be used to override the global setting @code{enable-html-"
+"serving?}."
+msgstr ""
+
+#. type: deftypevr
+#: doc/guix.texi:19385
 #, no-wrap
 msgid "{@code{repository-cgit-configuration} parameter} repo-boolean hide?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19343
+#: doc/guix.texi:19388
 msgid ""
 "Flag which, when set to @code{#t}, hides the repository from the repository "
 "index."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19348
+#: doc/guix.texi:19393
 #, no-wrap
 msgid "{@code{repository-cgit-configuration} parameter} repo-boolean ignore?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19350
+#: doc/guix.texi:19395
 msgid "Flag which, when set to @samp{#t}, ignores the repository."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19355
+#: doc/guix.texi:19400
 #, no-wrap
 msgid "{@code{repository-cgit-configuration} parameter} repo-file-object logo"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19358
+#: doc/guix.texi:19403
 msgid ""
 "URL which specifies the source of an image which will be used as a logo on "
 "this repo’s pages."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19363
+#: doc/guix.texi:19408
 #, no-wrap
 msgid "{@code{repository-cgit-configuration} parameter} repo-string logo-link"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19370
+#: doc/guix.texi:19415
 #, no-wrap
-msgid ""
-"{@code{repository-cgit-configuration} parameter} repo-file-object "
-"owner-filter"
+msgid "{@code{repository-cgit-configuration} parameter} repo-file-object owner-filter"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19372
+#: doc/guix.texi:19417
 msgid "Override the default @code{owner-filter}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19377
+#: doc/guix.texi:19422
 #, no-wrap
 msgid "{@code{repository-cgit-configuration} parameter} repo-string module-link"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19381
+#: doc/guix.texi:19426
 msgid ""
 "Text which will be used as the formatstring for a hyperlink when a submodule "
 "is printed in a directory listing.  The arguments for the formatstring are "
@@ -41005,102 +41775,100 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19386
+#: doc/guix.texi:19431
 #, no-wrap
-msgid ""
-"{@code{repository-cgit-configuration} parameter} module-link-path "
-"module-link-path"
+msgid "{@code{repository-cgit-configuration} parameter} module-link-path module-link-path"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19390
+#: doc/guix.texi:19435
 msgid ""
 "Text which will be used as the formatstring for a hyperlink when a submodule "
 "with the specified subdirectory path is printed in a directory listing."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19395
+#: doc/guix.texi:19440
 #, no-wrap
 msgid "{@code{repository-cgit-configuration} parameter} repo-string max-stats"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19397
+#: doc/guix.texi:19442
 msgid "Override the default maximum statistics period."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19402
+#: doc/guix.texi:19447
 #, no-wrap
 msgid "{@code{repository-cgit-configuration} parameter} repo-string name"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19404
+#: doc/guix.texi:19449
 msgid "The value to show as repository name."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19409
+#: doc/guix.texi:19454
 #, no-wrap
 msgid "{@code{repository-cgit-configuration} parameter} repo-string owner"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19411
+#: doc/guix.texi:19456
 msgid "A value used to identify the owner of the repository."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19416
+#: doc/guix.texi:19461
 #, no-wrap
 msgid "{@code{repository-cgit-configuration} parameter} repo-string path"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19418
+#: doc/guix.texi:19463
 msgid "An absolute path to the repository directory."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19423
+#: doc/guix.texi:19468
 #, no-wrap
 msgid "{@code{repository-cgit-configuration} parameter} repo-string readme"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19426
+#: doc/guix.texi:19471
 msgid ""
 "A path (relative to repo) which specifies a file to include verbatim as the "
 "\"About\" page for this repo."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19431
+#: doc/guix.texi:19476
 #, no-wrap
 msgid "{@code{repository-cgit-configuration} parameter} repo-string section"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19439
+#: doc/guix.texi:19484
 #, no-wrap
 msgid "{@code{repository-cgit-configuration} parameter} repo-list extra-options"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19441 doc/guix.texi:19450
+#: doc/guix.texi:19486 doc/guix.texi:19495
 msgid "Extra options will be appended to cgitrc file."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19448
+#: doc/guix.texi:19493
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} list extra-options"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:19462
+#: doc/guix.texi:19507
 msgid ""
 "However, it could be that you just want to get a @code{cgitrc} up and "
 "running.  In that case, you can pass an @code{opaque-cgit-configuration} as "
@@ -41109,41 +41877,41 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:19464
+#: doc/guix.texi:19509
 msgid "Available @code{opaque-cgit-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19465
+#: doc/guix.texi:19510
 #, no-wrap
 msgid "{@code{opaque-cgit-configuration} parameter} package cgit"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19467
+#: doc/guix.texi:19512
 msgid "The cgit package."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19469
+#: doc/guix.texi:19514
 #, no-wrap
 msgid "{@code{opaque-cgit-configuration} parameter} string string"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:19471
+#: doc/guix.texi:19516
 msgid "The contents of the @code{cgitrc}, as a string."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:19475
+#: doc/guix.texi:19520
 msgid ""
 "For example, if your @code{cgitrc} is just the empty string, you could "
 "instantiate a cgit service like this:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:19480
+#: doc/guix.texi:19525
 #, no-wrap
 msgid ""
 "(service cgit-service-type\n"
@@ -41152,19 +41920,19 @@ msgid ""
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:19486
+#: doc/guix.texi:19531
 #, no-wrap
 msgid "The Battle for Wesnoth Service"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:19487
+#: doc/guix.texi:19532
 #, no-wrap
 msgid "wesnothd"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:19491
+#: doc/guix.texi:19536
 msgid ""
 "@uref{https://wesnoth.org, The Battle for Wesnoth} is a fantasy, turn based "
 "tactical strategy game, with several single player campaigns, and "
@@ -41172,85 +41940,85 @@ msgid ""
 msgstr ""
 
 #. type: defvar
-#: doc/guix.texi:19492
+#: doc/guix.texi:19537
 #, no-wrap
 msgid "{Scheme Variable} wesnothd-service-type"
 msgstr ""
 
 #. type: defvar
-#: doc/guix.texi:19496
+#: doc/guix.texi:19541
 msgid ""
-"Service type for the wesnothd service.  Its value must be a "
-"@code{wesnothd-configuration} object.  To run wesnothd in the default "
-"configuration, instantiate it as:"
+"Service type for the wesnothd service.  Its value must be a @code{wesnothd-"
+"configuration} object.  To run wesnothd in the default configuration, "
+"instantiate it as:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:19499
+#: doc/guix.texi:19544
 #, no-wrap
 msgid "(service wesnothd-service-type)\n"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:19502
+#: doc/guix.texi:19547
 #, no-wrap
 msgid "{Data Type} wesnothd-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:19504
+#: doc/guix.texi:19549
 msgid "Data type representing the configuration of @command{wesnothd}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19506
+#: doc/guix.texi:19551
 #, no-wrap
 msgid "@code{package} (default: @code{wesnoth-server})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19508
+#: doc/guix.texi:19553
 msgid "The wesnoth server package to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19509
+#: doc/guix.texi:19554
 #, no-wrap
 msgid "@code{port} (default: @code{15000})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19511
+#: doc/guix.texi:19556
 msgid "The port to bind the server to."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:19517
+#: doc/guix.texi:19562
 #, no-wrap
 msgid "sysctl"
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:19518
+#: doc/guix.texi:19563
 #, no-wrap
 msgid "System Control Service"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:19522
+#: doc/guix.texi:19567
 msgid ""
 "The @code{(gnu services sysctl)} provides a service to configure kernel "
 "parameters at boot."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:19523
+#: doc/guix.texi:19568
 #, no-wrap
 msgid "{Scheme Variable} sysctl-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:19527
+#: doc/guix.texi:19572
 msgid ""
 "The service type for @command{sysctl}, which modifies kernel parameters "
 "under @file{/proc/sys/}.  To enable IPv4 forwarding, it can be instantiated "
@@ -41258,7 +42026,7 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:19532
+#: doc/guix.texi:19577
 #, no-wrap
 msgid ""
 "(service sysctl-service-type\n"
@@ -41267,63 +42035,63 @@ msgid ""
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:19535
+#: doc/guix.texi:19580
 #, no-wrap
 msgid "{Data Type} sysctl-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:19537
+#: doc/guix.texi:19582
 msgid "The data type representing the configuration of @command{sysctl}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19539
+#: doc/guix.texi:19584
 #, no-wrap
 msgid "@code{sysctl} (default: @code{(file-append procps \"/sbin/sysctl\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19541
+#: doc/guix.texi:19586
 msgid "The @command{sysctl} executable to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19542
+#: doc/guix.texi:19587
 #, no-wrap
 msgid "@code{settings} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19544
+#: doc/guix.texi:19589
 msgid "An association list specifies kernel parameters and their values."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:19547
+#: doc/guix.texi:19592
 #, no-wrap
 msgid "lirc"
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:19548
+#: doc/guix.texi:19593
 #, no-wrap
 msgid "Lirc Service"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:19551
+#: doc/guix.texi:19596
 msgid "The @code{(gnu services lirc)} module provides the following service."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:19552
+#: doc/guix.texi:19597
 #, no-wrap
 msgid "{Scheme Procedure} lirc-service [#:lirc lirc] @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:19557
+#: doc/guix.texi:19602
 msgid ""
 "[#:device #f] [#:driver #f] [#:config-file #f] @ [#:extra-options '()] "
 "Return a service that runs @url{http://www.lirc.org,LIRC}, a daemon that "
@@ -41331,44 +42099,44 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:19561
+#: doc/guix.texi:19606
 msgid ""
 "Optionally, @var{device}, @var{driver} and @var{config-file} (configuration "
 "file name) may be specified.  See @command{lircd} manual for details."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:19564
+#: doc/guix.texi:19609
 msgid ""
 "Finally, @var{extra-options} is a list of additional command-line options "
 "passed to @command{lircd}."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:19566
+#: doc/guix.texi:19611
 #, no-wrap
 msgid "spice"
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:19567
+#: doc/guix.texi:19612
 #, no-wrap
 msgid "Spice Service"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:19570
+#: doc/guix.texi:19615
 msgid "The @code{(gnu services spice)} module provides the following service."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:19571
+#: doc/guix.texi:19616
 #, no-wrap
 msgid "{Scheme Procedure} spice-vdagent-service [#:spice-vdagent]"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:19575
+#: doc/guix.texi:19620
 msgid ""
 "Returns a service that runs @url{http://www.spice-space.org,VDAGENT}, a "
 "daemon that enables sharing the clipboard with a vm and setting the guest "
@@ -41376,37 +42144,37 @@ msgid ""
 msgstr ""
 
 #. type: subsubsection
-#: doc/guix.texi:19577
+#: doc/guix.texi:19622
 #, no-wrap
 msgid "Dictionary Services"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:19578
+#: doc/guix.texi:19623
 #, no-wrap
 msgid "dictionary"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:19580
+#: doc/guix.texi:19625
 msgid "The @code{(gnu services dict)} module provides the following service:"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:19581
+#: doc/guix.texi:19626
 #, no-wrap
 msgid "{Scheme Procedure} dicod-service [#:config (dicod-configuration)]"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:19584
+#: doc/guix.texi:19629
 msgid ""
 "Return a service that runs the @command{dicod} daemon, an implementation of "
 "DICT server (@pxref{Dicod,,, dico, GNU Dico Manual})."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:19588
+#: doc/guix.texi:19633
 msgid ""
 "The optional @var{config} argument specifies the configuration for "
 "@command{dicod}, which should be a @code{<dicod-configuration>} object, by "
@@ -41414,7 +42182,7 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:19592
+#: doc/guix.texi:19637
 msgid ""
 "You can add @command{open localhost} to your @file{~/.dico} file to make "
 "@code{localhost} the default server for @command{dico} client "
@@ -41422,35 +42190,35 @@ msgid ""
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:19594
+#: doc/guix.texi:19639
 #, no-wrap
 msgid "{Data Type} dicod-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:19596
+#: doc/guix.texi:19641
 msgid "Data type representing the configuration of dicod."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19598
+#: doc/guix.texi:19643
 #, no-wrap
 msgid "@code{dico} (default: @var{dico})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19600
+#: doc/guix.texi:19645
 msgid "Package object of the GNU Dico dictionary server."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19601
+#: doc/guix.texi:19646
 #, no-wrap
 msgid "@code{interfaces} (default: @var{'(\"localhost\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19605
+#: doc/guix.texi:19650
 msgid ""
 "This is the list of IP addresses and ports and possibly socket file names to "
 "listen to (@pxref{Server Settings, @code{listen} directive,, dico, GNU Dico "
@@ -41458,51 +42226,53 @@ msgid ""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19606
+#: doc/guix.texi:19651
 #, no-wrap
 msgid "@code{handlers} (default: @var{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19608
-msgid "List of @code{<dicod-handler>} objects denoting handlers (module instances)."
+#: doc/guix.texi:19653
+msgid ""
+"List of @code{<dicod-handler>} objects denoting handlers (module instances)."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19609
+#: doc/guix.texi:19654
 #, no-wrap
 msgid "@code{databases} (default: @var{(list %dicod-database:gcide)})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19611
-msgid "List of @code{<dicod-database>} objects denoting dictionaries to be served."
+#: doc/guix.texi:19656
+msgid ""
+"List of @code{<dicod-database>} objects denoting dictionaries to be served."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:19614
+#: doc/guix.texi:19659
 #, no-wrap
 msgid "{Data Type} dicod-handler"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:19616
+#: doc/guix.texi:19661
 msgid "Data type representing a dictionary handler (module instance)."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19620
+#: doc/guix.texi:19665
 msgid "Name of the handler (module instance)."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19621
+#: doc/guix.texi:19666
 #, no-wrap
 msgid "@code{module} (default: @var{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19625
+#: doc/guix.texi:19670
 msgid ""
 "Name of the dicod module of the handler (instance).  If it is @code{#f}, the "
 "module has the same name as the handler.  (@pxref{Modules,,, dico, GNU Dico "
@@ -41510,85 +42280,86 @@ msgid ""
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:19626 doc/guix.texi:19646
+#: doc/guix.texi:19671 doc/guix.texi:19691
 #, no-wrap
 msgid "options"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19628
-msgid "List of strings or gexps representing the arguments for the module handler"
+#: doc/guix.texi:19673
+msgid ""
+"List of strings or gexps representing the arguments for the module handler"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:19631
+#: doc/guix.texi:19676
 #, no-wrap
 msgid "{Data Type} dicod-database"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:19633
+#: doc/guix.texi:19678
 msgid "Data type representing a dictionary database."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19637
+#: doc/guix.texi:19682
 msgid "Name of the database, will be used in DICT commands."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:19638
+#: doc/guix.texi:19683
 #, no-wrap
 msgid "handler"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19641
+#: doc/guix.texi:19686
 msgid ""
 "Name of the dicod handler (module instance) used by this database "
 "(@pxref{Handlers,,, dico, GNU Dico Manual})."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19642
+#: doc/guix.texi:19687
 #, no-wrap
 msgid "@code{complex?} (default: @var{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19645
+#: doc/guix.texi:19690
 msgid ""
 "Whether the database configuration complex.  The complex configuration will "
 "need a corresponding @code{<dicod-handler>} object, otherwise not."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19649
+#: doc/guix.texi:19694
 msgid ""
 "List of strings or gexps representing the arguments for the database "
 "(@pxref{Databases,,, dico, GNU Dico Manual})."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:19652
+#: doc/guix.texi:19697
 #, no-wrap
 msgid "{Scheme Variable} %dicod-database:gcide"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:19655
+#: doc/guix.texi:19700
 msgid ""
 "A @code{<dicod-database>} object serving the GNU Collaborative International "
 "Dictionary of English using the @code{gcide} package."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:19658
+#: doc/guix.texi:19703
 msgid "The following is an example @code{dicod-service} configuration."
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:19673
+#: doc/guix.texi:19718
 #, no-wrap
 msgid ""
 "(dicod-service #:config\n"
@@ -41607,13 +42378,13 @@ msgid ""
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:19678
+#: doc/guix.texi:19723
 #, no-wrap
 msgid "setuid programs"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:19688
+#: doc/guix.texi:19733
 msgid ""
 "Some programs need to run with ``root'' privileges, even when they are "
 "launched by unprivileged users.  A notorious example is the @command{passwd} "
@@ -41626,7 +42397,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:19695
+#: doc/guix.texi:19740
 msgid ""
 "The store itself @emph{cannot} contain setuid programs: that would be a "
 "security issue since any user on the system can write derivations that "
@@ -41637,74 +42408,74 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:19701
+#: doc/guix.texi:19746
 msgid ""
 "The @code{setuid-programs} field of an @code{operating-system} declaration "
-"contains a list of G-expressions denoting the names of programs to be "
-"setuid-root (@pxref{Using the Configuration System}).  For instance, the "
+"contains a list of G-expressions denoting the names of programs to be setuid-"
+"root (@pxref{Using the Configuration System}).  For instance, the "
 "@command{passwd} program, which is part of the Shadow package, can be "
 "designated by this G-expression (@pxref{G-Expressions}):"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:19704
+#: doc/guix.texi:19749
 #, no-wrap
 msgid "#~(string-append #$shadow \"/bin/passwd\")\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:19708
+#: doc/guix.texi:19753
 msgid ""
 "A default set of setuid programs is defined by the @code{%setuid-programs} "
 "variable of the @code{(gnu system)} module."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:19709
+#: doc/guix.texi:19754
 #, no-wrap
 msgid "{Scheme Variable} %setuid-programs"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:19711
+#: doc/guix.texi:19756
 msgid "A list of G-expressions denoting common programs that are setuid-root."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:19714
+#: doc/guix.texi:19759
 msgid ""
 "The list includes commands such as @command{passwd}, @command{ping}, "
 "@command{su}, and @command{sudo}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:19720
+#: doc/guix.texi:19765
 msgid ""
-"Under the hood, the actual setuid programs are created in the "
-"@file{/run/setuid-programs} directory at system activation time.  The files "
-"in this directory refer to the ``real'' binaries, which are in the store."
+"Under the hood, the actual setuid programs are created in the @file{/run/"
+"setuid-programs} directory at system activation time.  The files in this "
+"directory refer to the ``real'' binaries, which are in the store."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:19724
+#: doc/guix.texi:19769
 #, no-wrap
 msgid "HTTPS, certificates"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:19725
+#: doc/guix.texi:19770
 #, no-wrap
 msgid "X.509 certificates"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:19726
+#: doc/guix.texi:19771
 #, no-wrap
 msgid "TLS"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:19733
+#: doc/guix.texi:19778
 msgid ""
 "Web servers available over HTTPS (that is, HTTP over the transport-layer "
 "security mechanism, TLS) send client programs an @dfn{X.509 certificate} "
@@ -41715,15 +42486,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:19737
+#: doc/guix.texi:19782
 msgid ""
 "Web browsers such as GNU@tie{}IceCat include their own set of CA "
-"certificates, such that they are able to verify CA signatures "
-"out-of-the-box."
+"certificates, such that they are able to verify CA signatures out-of-the-box."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:19741
+#: doc/guix.texi:19786
 msgid ""
 "However, most other programs that can talk HTTPS---@command{wget}, "
 "@command{git}, @command{w3m}, etc.---need to be told where CA certificates "
@@ -41731,7 +42501,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:19748
+#: doc/guix.texi:19793
 msgid ""
 "In GuixSD, this is done by adding a package that provides certificates to "
 "the @code{packages} field of the @code{operating-system} declaration "
@@ -41741,7 +42511,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:19753
+#: doc/guix.texi:19798
 msgid ""
 "Note that it is @emph{not} part of @var{%base-packages}, so you need to "
 "explicitly add it.  The @file{/etc/ssl/certs} directory, which is where most "
@@ -41750,7 +42520,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:19763
+#: doc/guix.texi:19808
 msgid ""
 "Unprivileged users, including users of Guix on a foreign distro, can also "
 "install their own certificate package in their profile.  A number of "
@@ -41763,18 +42533,17 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:19769
+#: doc/guix.texi:19814
 #, no-wrap
 msgid ""
 "$ guix package -i nss-certs\n"
 "$ export SSL_CERT_DIR=\"$HOME/.guix-profile/etc/ssl/certs\"\n"
-"$ export "
-"SSL_CERT_FILE=\"$HOME/.guix-profile/etc/ssl/certs/ca-certificates.crt\"\n"
+"$ export SSL_CERT_FILE=\"$HOME/.guix-profile/etc/ssl/certs/ca-certificates.crt\"\n"
 "$ export GIT_SSL_CAINFO=\"$SSL_CERT_FILE\"\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:19774
+#: doc/guix.texi:19819
 msgid ""
 "As another example, R requires the @code{CURL_CA_BUNDLE} environment "
 "variable to point to a certificate bundle, so you would have to run "
@@ -41782,35 +42551,34 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:19778
+#: doc/guix.texi:19823
 #, no-wrap
 msgid ""
 "$ guix package -i nss-certs\n"
-"$ export "
-"CURL_CA_BUNDLE=\"$HOME/.guix-profile/etc/ssl/certs/ca-certificates.crt\"\n"
+"$ export CURL_CA_BUNDLE=\"$HOME/.guix-profile/etc/ssl/certs/ca-certificates.crt\"\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:19782
+#: doc/guix.texi:19827
 msgid ""
 "For other applications you may want to look up the required environment "
 "variable in the relevant documentation."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:19787
+#: doc/guix.texi:19832
 #, no-wrap
 msgid "name service switch"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:19788
+#: doc/guix.texi:19833
 #, no-wrap
 msgid "NSS"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:19797
+#: doc/guix.texi:19842
 msgid ""
 "The @code{(gnu system nss)} module provides bindings to the configuration "
 "file of the libc @dfn{name service switch} or @dfn{NSS} (@pxref{NSS "
@@ -41823,7 +42591,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:19804
+#: doc/guix.texi:19849
 msgid ""
 "The NSS configuration specifies, for each system database, which lookup "
 "method is to be used, and how the various methods are chained together---for "
@@ -41834,28 +42602,28 @@ msgid ""
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:19805
+#: doc/guix.texi:19850
 #, no-wrap
 msgid "nss-mdns"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:19806
+#: doc/guix.texi:19851
 #, no-wrap
 msgid ".local, host name lookup"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:19811
+#: doc/guix.texi:19856
 msgid ""
 "As an example, the declaration below configures the NSS to use the "
-"@uref{http://0pointer.de/lennart/projects/nss-mdns/, @code{nss-mdns} "
-"back-end}, which supports host name lookups over multicast DNS (mDNS)  for "
-"host names ending in @code{.local}:"
+"@uref{http://0pointer.de/lennart/projects/nss-mdns/, @code{nss-mdns} back-"
+"end}, which supports host name lookups over multicast DNS (mDNS)  for host "
+"names ending in @code{.local}:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:19815
+#: doc/guix.texi:19860
 #, no-wrap
 msgid ""
 "(name-service-switch\n"
@@ -41864,7 +42632,7 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:19820
+#: doc/guix.texi:19865
 #, no-wrap
 msgid ""
 "                ;; If the above did not succeed, try\n"
@@ -41875,7 +42643,7 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:19826
+#: doc/guix.texi:19871
 #, no-wrap
 msgid ""
 "                  ;; 'mdns_minimal' is authoritative for\n"
@@ -41887,7 +42655,7 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:19830
+#: doc/guix.texi:19875
 #, no-wrap
 msgid ""
 "                ;; Then fall back to DNS.\n"
@@ -41897,7 +42665,7 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:19834
+#: doc/guix.texi:19879
 #, no-wrap
 msgid ""
 "                ;; Finally, try with the \"full\" 'mdns'.\n"
@@ -41906,7 +42674,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:19839
+#: doc/guix.texi:19884
 msgid ""
 "Do not worry: the @code{%mdns-host-lookup-nss} variable (see below)  "
 "contains this configuration, so you will not have to type it if all you want "
@@ -41914,49 +42682,50 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:19847
+#: doc/guix.texi:19892
 msgid ""
-"Note that, in this case, in addition to setting the "
-"@code{name-service-switch} of the @code{operating-system} declaration, you "
-"also need to use @code{avahi-service} (@pxref{Networking Services, "
-"@code{avahi-service}}), or @var{%desktop-services}, which includes it "
-"(@pxref{Desktop Services}).  Doing this makes @code{nss-mdns} accessible to "
-"the name service cache daemon (@pxref{Base Services, @code{nscd-service}})."
+"Note that, in this case, in addition to setting the @code{name-service-"
+"switch} of the @code{operating-system} declaration, you also need to use "
+"@code{avahi-service} (@pxref{Networking Services, @code{avahi-service}}), or "
+"@var{%desktop-services}, which includes it (@pxref{Desktop Services}).  "
+"Doing this makes @code{nss-mdns} accessible to the name service cache daemon "
+"(@pxref{Base Services, @code{nscd-service}})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:19850
-msgid "For convenience, the following variables provide typical NSS configurations."
+#: doc/guix.texi:19895
+msgid ""
+"For convenience, the following variables provide typical NSS configurations."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:19851
+#: doc/guix.texi:19896
 #, no-wrap
 msgid "{Scheme Variable} %default-nss"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:19854
+#: doc/guix.texi:19899
 msgid ""
-"This is the default name service switch configuration, a "
-"@code{name-service-switch} object."
+"This is the default name service switch configuration, a @code{name-service-"
+"switch} object."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:19856
+#: doc/guix.texi:19901
 #, no-wrap
 msgid "{Scheme Variable} %mdns-host-lookup-nss"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:19859
+#: doc/guix.texi:19904
 msgid ""
 "This is the name service switch configuration with support for host name "
 "lookup over multicast DNS (mDNS) for host names ending in @code{.local}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:19869
+#: doc/guix.texi:19914
 msgid ""
 "The reference for name service switch configuration is given below.  It is a "
 "direct mapping of the configuration file format of the C library , so please "
@@ -41969,13 +42738,13 @@ msgid ""
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:19870
+#: doc/guix.texi:19915
 #, no-wrap
 msgid "{Data Type} name-service-switch"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:19875
+#: doc/guix.texi:19920
 msgid ""
 "This is the data type representation the configuration of libc's name "
 "service switch (NSS).  Each field below represents one of the supported "
@@ -41983,109 +42752,109 @@ msgid ""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19877
+#: doc/guix.texi:19922
 #, no-wrap
 msgid "aliases"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:19878
+#: doc/guix.texi:19923
 #, no-wrap
 msgid "ethers"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:19880
+#: doc/guix.texi:19925
 #, no-wrap
 msgid "gshadow"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:19881
+#: doc/guix.texi:19926
 #, no-wrap
 msgid "hosts"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:19882
+#: doc/guix.texi:19927
 #, no-wrap
 msgid "initgroups"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:19883
+#: doc/guix.texi:19928
 #, no-wrap
 msgid "netgroup"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:19884
+#: doc/guix.texi:19929
 #, no-wrap
 msgid "networks"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:19886
+#: doc/guix.texi:19931
 #, no-wrap
 msgid "public-key"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:19887
+#: doc/guix.texi:19932
 #, no-wrap
 msgid "rpc"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:19889
+#: doc/guix.texi:19934
 #, no-wrap
 msgid "shadow"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19892
+#: doc/guix.texi:19937
 msgid ""
 "The system databases handled by the NSS.  Each of these fields must be a "
 "list of @code{<name-service>} objects (see below)."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:19895
+#: doc/guix.texi:19940
 #, no-wrap
 msgid "{Data Type} name-service"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:19899
+#: doc/guix.texi:19944
 msgid ""
 "This is the data type representing an actual name service and the associated "
 "lookup action."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19904
+#: doc/guix.texi:19949
 msgid ""
 "A string denoting the name service (@pxref{Services in the NSS "
 "configuration,,, libc, The GNU C Library Reference Manual})."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19909
+#: doc/guix.texi:19954
 msgid ""
 "Note that name services listed here must be visible to nscd.  This is "
-"achieved by passing the @code{#:name-services} argument to "
-"@code{nscd-service} the list of packages providing the needed name services "
+"achieved by passing the @code{#:name-services} argument to @code{nscd-"
+"service} the list of packages providing the needed name services "
 "(@pxref{Base Services, @code{nscd-service}})."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19910
+#: doc/guix.texi:19955
 #, no-wrap
 msgid "reaction"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19914
+#: doc/guix.texi:19959
 msgid ""
 "An action specified using the @code{lookup-specification} macro "
 "(@pxref{Actions in the NSS configuration,,, libc, The GNU C Library "
@@ -42093,7 +42862,7 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:19918
+#: doc/guix.texi:19963
 #, no-wrap
 msgid ""
 "(lookup-specification (unavailable => continue)\n"
@@ -42101,7 +42870,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:19932
+#: doc/guix.texi:19977
 msgid ""
 "For bootstrapping purposes, the Linux-Libre kernel is passed an @dfn{initial "
 "RAM disk}, or @dfn{initrd}.  An initrd contains a temporary root file system "
@@ -42111,7 +42880,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:19941
+#: doc/guix.texi:19986
 msgid ""
 "The @code{initrd-modules} field of an @code{operating-system} declaration "
 "allows you to specify Linux-libre kernel modules that must be available in "
@@ -42123,7 +42892,7 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:19946
+#: doc/guix.texi:19991
 #, no-wrap
 msgid ""
 "(operating-system\n"
@@ -42132,29 +42901,28 @@ msgid ""
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:19948
+#: doc/guix.texi:19993
 #, no-wrap
 msgid "{Scheme Variable} %base-initrd-modules"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:19950
+#: doc/guix.texi:19995
 msgid "This is the list of kernel modules included in the initrd by default."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:19958
+#: doc/guix.texi:20003
 msgid ""
 "Furthermore, if you need lower-level customization, the @code{initrd} field "
 "of an @code{operating-system} declaration allows you to specify which initrd "
 "you would like to use.  The @code{(gnu system linux-initrd)} module provides "
 "three ways to build an initrd: the high-level @code{base-initrd} procedure "
-"and the low-level @code{raw-initrd} and @code{expression->initrd} "
-"procedures."
+"and the low-level @code{raw-initrd} and @code{expression->initrd} procedures."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:19963
+#: doc/guix.texi:20008
 msgid ""
 "The @code{base-initrd} procedure is intended to cover most common uses.  For "
 "example, if you want to add a bunch of kernel modules to be loaded at boot "
@@ -42163,7 +42931,7 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:19971
+#: doc/guix.texi:20016
 #, no-wrap
 msgid ""
 "(initrd (lambda (file-systems . rest)\n"
@@ -42175,7 +42943,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:19976
+#: doc/guix.texi:20021
 msgid ""
 "The @code{base-initrd} procedure also handles common use cases that involves "
 "using the system as a QEMU guest, or as a ``live'' system with volatile root "
@@ -42183,7 +42951,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:19983
+#: doc/guix.texi:20028
 msgid ""
 "The @code{base-initrd} procedure is built from @code{raw-initrd} procedure.  "
 "Unlike @code{base-initrd}, @code{raw-initrd} doesn't do anything high-level, "
@@ -42194,29 +42962,29 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:19988
+#: doc/guix.texi:20033
 msgid ""
 "The initial RAM disk produced by @code{base-initrd} or @code{raw-initrd} "
 "honors several options passed on the Linux kernel command line (that is, "
-"arguments passed @i{via} the @code{linux} command of GRUB, or the "
-"@code{-append} option of QEMU), notably:"
+"arguments passed @i{via} the @code{linux} command of GRUB, or the @code{-"
+"append} option of QEMU), notably:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19990
+#: doc/guix.texi:20035
 #, no-wrap
 msgid "--load=@var{boot}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19993
+#: doc/guix.texi:20038
 msgid ""
 "Tell the initial RAM disk to load @var{boot}, a file containing a Scheme "
 "program, once it has mounted the root file system."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19997
+#: doc/guix.texi:20042
 msgid ""
 "GuixSD uses this option to yield control to a boot program that runs the "
 "service activation programs and then spawns the GNU@tie{}Shepherd, the "
@@ -42224,45 +42992,45 @@ msgid ""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19998
+#: doc/guix.texi:20043
 #, no-wrap
 msgid "--root=@var{root}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20002
+#: doc/guix.texi:20047
 msgid ""
 "Mount @var{root} as the root file system.  @var{root} can be a device name "
 "like @code{/dev/sda1}, a file system label, or a file system UUID."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20006
+#: doc/guix.texi:20051
 msgid ""
 "Have @file{/run/booted-system} and @file{/run/current-system} point to "
 "@var{system}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20007
+#: doc/guix.texi:20052
 #, no-wrap
 msgid "modprobe.blacklist=@var{modules}@dots{}"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:20008
+#: doc/guix.texi:20053
 #, no-wrap
 msgid "module, black-listing"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:20009
+#: doc/guix.texi:20054
 #, no-wrap
 msgid "black list, of kernel modules"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20014
+#: doc/guix.texi:20059
 msgid ""
 "Instruct the initial RAM disk as well as the @command{modprobe} command "
 "(from the kmod package) to refuse to load @var{modules}.  @var{modules} must "
@@ -42270,13 +43038,13 @@ msgid ""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20015
+#: doc/guix.texi:20060
 #, no-wrap
 msgid "--repl"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20021
+#: doc/guix.texi:20066
 msgid ""
 "Start a read-eval-print loop (REPL) from the initial RAM disk before it "
 "tries to load kernel modules and to mount the root file system.  Our "
@@ -42286,7 +43054,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20027
+#: doc/guix.texi:20072
 msgid ""
 "Now that you know all the features that initial RAM disks produced by "
 "@code{base-initrd} and @code{raw-initrd} provide, here is how to use it and "
@@ -42294,18 +43062,18 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:20030
+#: doc/guix.texi:20075
 #, no-wrap
 msgid "{Monadic Procedure} raw-initrd @var{file-systems} @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:20042
+#: doc/guix.texi:20087
 msgid ""
-"[#:linux-modules '()] [#:mapped-devices '()] @ [#:helper-packages '()] "
-"[#:qemu-networking? #f] [#:volatile-root? #f] Return a monadic derivation "
-"that builds a raw initrd.  @var{file-systems} is a list of file systems to "
-"be mounted by the initrd, possibly in addition to the root file system "
+"[#:linux-modules '()] [#:mapped-devices '()] @ [#:helper-packages '()] [#:"
+"qemu-networking? #f] [#:volatile-root? #f] Return a monadic derivation that "
+"builds a raw initrd.  @var{file-systems} is a list of file systems to be "
+"mounted by the initrd, possibly in addition to the root file system "
 "specified on the kernel command line via @code{--root}.  @var{linux-modules} "
 "is a list of kernel modules to be loaded at boot time.  @var{mapped-devices} "
 "is a list of device mappings to realize before @var{file-systems} are "
@@ -42315,7 +43083,7 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:20046
+#: doc/guix.texi:20091
 msgid ""
 "When @var{qemu-networking?} is true, set up networking with the standard "
 "QEMU parameters.  When @var{virtio?} is true, load additional modules so "
@@ -42324,39 +43092,39 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:20049
+#: doc/guix.texi:20094
 msgid ""
 "When @var{volatile-root?} is true, the root file system is writable but any "
 "changes to it are lost."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:20051
+#: doc/guix.texi:20096
 #, no-wrap
 msgid "{Monadic Procedure} base-initrd @var{file-systems} @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:20059
+#: doc/guix.texi:20104
 msgid ""
-"[#:mapped-devices '()] [#:qemu-networking? #f] [#:volatile-root? #f]@ "
-"[#:linux-modules '()] Return a monadic derivation that builds a generic "
-"initrd, with kernel modules taken from @var{linux}.  @var{file-systems} is a "
-"list of file-systems to be mounted by the initrd, possibly in addition to "
-"the root file system specified on the kernel command line via "
-"@code{--root}.  @var{mapped-devices} is a list of device mappings to realize "
-"before @var{file-systems} are mounted."
+"[#:mapped-devices '()] [#:qemu-networking? #f] [#:volatile-root? #f]@ [#:"
+"linux-modules '()] Return a monadic derivation that builds a generic initrd, "
+"with kernel modules taken from @var{linux}.  @var{file-systems} is a list of "
+"file-systems to be mounted by the initrd, possibly in addition to the root "
+"file system specified on the kernel command line via @code{--root}.  "
+"@var{mapped-devices} is a list of device mappings to realize before "
+"@var{file-systems} are mounted."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:20061
+#: doc/guix.texi:20106
 msgid ""
-"@var{qemu-networking?} and @var{volatile-root?} behaves as in "
-"@code{raw-initrd}."
+"@var{qemu-networking?} and @var{volatile-root?} behaves as in @code{raw-"
+"initrd}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:20066
+#: doc/guix.texi:20111
 msgid ""
 "The initrd is automatically populated with all the kernel modules necessary "
 "for @var{file-systems} and for the given options.  Additional kernel modules "
@@ -42365,7 +43133,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20073
+#: doc/guix.texi:20118
 msgid ""
 "Needless to say, the initrds we produce and use embed a statically-linked "
 "Guile, and the initialization program is a Guile program.  That gives a lot "
@@ -42374,13 +43142,13 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:20074
+#: doc/guix.texi:20119
 #, no-wrap
 msgid "{Monadic Procedure} expression->initrd @var{exp} @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:20080
+#: doc/guix.texi:20125
 msgid ""
 "[#:guile %guile-static-stripped] [#:name \"guile-initrd\"] Return a "
 "derivation that builds a Linux initrd (a gzipped cpio archive)  containing "
@@ -42390,13 +43158,13 @@ msgid ""
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:20086
+#: doc/guix.texi:20131
 #, no-wrap
 msgid "boot loader"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20093
+#: doc/guix.texi:20138
 msgid ""
 "The operating system supports multiple bootloaders.  The bootloader is "
 "configured using @code{bootloader-configuration} declaration.  All the "
@@ -42406,61 +43174,61 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20098
+#: doc/guix.texi:20143
 msgid ""
-"Some of the bootloaders do not honor every field of "
-"@code{bootloader-configuration}.  For instance, the extlinux bootloader does "
-"not support themes and thus ignores the @code{theme} field."
+"Some of the bootloaders do not honor every field of @code{bootloader-"
+"configuration}.  For instance, the extlinux bootloader does not support "
+"themes and thus ignores the @code{theme} field."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:20099
+#: doc/guix.texi:20144
 #, no-wrap
 msgid "{Data Type} bootloader-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:20101
+#: doc/guix.texi:20146
 msgid "The type of a bootloader configuration declaration."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:20105
+#: doc/guix.texi:20150
 #, no-wrap
 msgid "EFI, bootloader"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:20106
+#: doc/guix.texi:20151
 #, no-wrap
 msgid "UEFI, bootloader"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:20107
+#: doc/guix.texi:20152
 #, no-wrap
 msgid "BIOS, bootloader"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20113
+#: doc/guix.texi:20158
 msgid ""
-"The bootloader to use, as a @code{bootloader} object. For now "
-"@code{grub-bootloader}, @code{grub-efi-bootloader}, "
-"@code{extlinux-bootloader} and @code{u-boot-bootloader} are supported.  "
-"@code{grub-efi-bootloader} allows to boot on modern systems using the "
-"@dfn{Unified Extensible Firmware Interface} (UEFI)."
+"The bootloader to use, as a @code{bootloader} object. For now @code{grub-"
+"bootloader}, @code{grub-efi-bootloader}, @code{extlinux-bootloader} and "
+"@code{u-boot-bootloader} are supported.  @code{grub-efi-bootloader} allows "
+"to boot on modern systems using the @dfn{Unified Extensible Firmware "
+"Interface} (UEFI)."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20116
+#: doc/guix.texi:20161
 msgid ""
 "Available bootloaders are described in @code{(gnu bootloader @dots{})} "
 "modules."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20126
+#: doc/guix.texi:20171
 msgid ""
 "This is a string denoting the target onto which to install the bootloader.  "
 "The exact interpretation depends on the bootloader in question; for "
@@ -42472,13 +43240,13 @@ msgid ""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20127
+#: doc/guix.texi:20172
 #, no-wrap
 msgid "@code{menu-entries} (default: @code{()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20131
+#: doc/guix.texi:20176
 msgid ""
 "A possibly empty list of @code{menu-entry} objects (see below), denoting "
 "entries to appear in the bootloader menu, in addition to the current system "
@@ -42486,52 +43254,52 @@ msgid ""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20132
+#: doc/guix.texi:20177
 #, no-wrap
 msgid "@code{default-entry} (default: @code{0})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20135
+#: doc/guix.texi:20180
 msgid ""
 "The index of the default boot menu entry.  Index 0 is for the entry of the "
 "current system."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20136
+#: doc/guix.texi:20181
 #, no-wrap
 msgid "@code{timeout} (default: @code{5})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20139
+#: doc/guix.texi:20184
 msgid ""
 "The number of seconds to wait for keyboard input before booting.  Set to 0 "
 "to boot immediately, and to -1 to wait indefinitely."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20140
+#: doc/guix.texi:20185
 #, no-wrap
 msgid "@code{theme} (default: @var{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20144
+#: doc/guix.texi:20189
 msgid ""
 "The bootloader theme object describing the theme to use.  If no theme is "
 "provided, some bootloaders might use a default theme, that's true for GRUB."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20145
+#: doc/guix.texi:20190
 #, no-wrap
 msgid "@code{terminal-outputs} (default: @code{'gfxterm})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20152
+#: doc/guix.texi:20197
 msgid ""
 "The output terminals used for the bootloader boot menu, as a list of "
 "symbols.  GRUB accepts the values: @code{console}, @code{serial}, "
@@ -42542,13 +43310,13 @@ msgid ""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20153
+#: doc/guix.texi:20198
 #, no-wrap
 msgid "@code{terminal-inputs} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20161
+#: doc/guix.texi:20206
 msgid ""
 "The input terminals used for the bootloader boot menu, as a list of "
 "symbols.  For GRUB, the default is the native platform terminal as "
@@ -42559,13 +43327,13 @@ msgid ""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20162
+#: doc/guix.texi:20207
 #, no-wrap
 msgid "@code{serial-unit} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20166
+#: doc/guix.texi:20211
 msgid ""
 "The serial unit used by the bootloader, as an integer from 0 to 3.  For "
 "GRUB, it is chosen at run-time; currently GRUB chooses 0, which corresponds "
@@ -42573,13 +43341,13 @@ msgid ""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20167
+#: doc/guix.texi:20212
 #, no-wrap
 msgid "@code{serial-speed} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20171
+#: doc/guix.texi:20216
 msgid ""
 "The speed of the serial interface, as an integer.  For GRUB, the default "
 "value is chosen at run-time; currently GRUB chooses 9600@tie{}bps "
@@ -42587,29 +43355,28 @@ msgid ""
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:20175
+#: doc/guix.texi:20220
 #, no-wrap
 msgid "dual boot"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:20176
+#: doc/guix.texi:20221
 #, no-wrap
 msgid "boot menu"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20182
+#: doc/guix.texi:20227
 msgid ""
-"Should you want to list additional boot menu entries @i{via} the "
-"@code{menu-entries} field above, you will need to create them with the "
-"@code{menu-entry} form.  For example, imagine you want to be able to boot "
-"another distro (hard to imagine!), you can define a menu entry along these "
-"lines:"
+"Should you want to list additional boot menu entries @i{via} the @code{menu-"
+"entries} field above, you will need to create them with the @code{menu-"
+"entry} form.  For example, imagine you want to be able to boot another "
+"distro (hard to imagine!), you can define a menu entry along these lines:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:20189
+#: doc/guix.texi:20234
 #, no-wrap
 msgid ""
 "(menu-entry\n"
@@ -42620,51 +43387,51 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20192
+#: doc/guix.texi:20237
 msgid "Details below."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:20193
+#: doc/guix.texi:20238
 #, no-wrap
 msgid "{Data Type} menu-entry"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:20195
+#: doc/guix.texi:20240
 msgid "The type of an entry in the bootloader menu."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:20198
+#: doc/guix.texi:20243
 #, no-wrap
 msgid "label"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20200
+#: doc/guix.texi:20245
 msgid "The label to show in the menu---e.g., @code{\"GNU\"}."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:20201
+#: doc/guix.texi:20246
 #, no-wrap
 msgid "linux"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20203
+#: doc/guix.texi:20248
 msgid "The Linux kernel image to boot, for example:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:20206
+#: doc/guix.texi:20251
 #, no-wrap
 msgid "(file-append linux-libre \"/bzImage\")\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20211
+#: doc/guix.texi:20256
 msgid ""
 "For GRUB, it is also possible to specify a device explicitly in the file "
 "path using GRUB's device naming convention (@pxref{Naming convention,,, "
@@ -42672,53 +43439,53 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:20214
+#: doc/guix.texi:20259
 #, no-wrap
 msgid "\"(hd0,msdos1)/boot/vmlinuz\"\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20218
+#: doc/guix.texi:20263
 msgid ""
 "If the device is specified explicitly as above, then the @code{device} field "
 "is ignored entirely."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20219
+#: doc/guix.texi:20264
 #, no-wrap
 msgid "@code{linux-arguments} (default: @code{()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20222
+#: doc/guix.texi:20267
 msgid ""
 "The list of extra Linux kernel command-line arguments---e.g., "
 "@code{(\"console=ttyS0\")}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20226
+#: doc/guix.texi:20271
 msgid ""
 "A G-Expression or string denoting the file name of the initial RAM disk to "
 "use (@pxref{G-Expressions})."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20226
+#: doc/guix.texi:20271
 #, no-wrap
 msgid "@code{device} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20229
+#: doc/guix.texi:20274
 msgid ""
 "The device where the kernel and initrd are to be found---i.e., for GRUB, "
 "@dfn{root} for this menu entry (@pxref{root,,, grub, GNU GRUB manual})."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20235
+#: doc/guix.texi:20280
 msgid ""
 "This may be a file system label (a string), a file system UUID (a "
 "bytevector, @pxref{File Systems}), or @code{#f}, in which case the "
@@ -42728,32 +43495,33 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20242
+#: doc/guix.texi:20287
 msgid ""
 "Fow now only GRUB has theme support. GRUB themes are created using the "
 "@code{grub-theme} form, which is not documented yet."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:20247
+#: doc/guix.texi:20292
 msgid ""
 "This is the default GRUB theme used by the operating system if no "
 "@code{theme} field is specified in @code{bootloader-configuration} record."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:20250
-msgid "It comes with a fancy background image displaying the GNU and Guix logos."
+#: doc/guix.texi:20295
+msgid ""
+"It comes with a fancy background image displaying the GNU and Guix logos."
 msgstr ""
 
 #. type: subsection
-#: doc/guix.texi:20254
+#: doc/guix.texi:20299
 #, no-wrap
 msgid "Invoking @code{guix system}"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20259
+#: doc/guix.texi:20304
 msgid ""
 "Once you have written an operating system declaration as seen in the "
 "previous section, it can be @dfn{instantiated} using the @command{guix "
@@ -42761,13 +43529,13 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:20262
+#: doc/guix.texi:20307
 #, no-wrap
 msgid "guix system @var{options}@dots{} @var{action} @var{file}\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20268
+#: doc/guix.texi:20313
 msgid ""
 "@var{file} must be the name of a file containing an @code{operating-system} "
 "declaration.  @var{action} specifies how the operating system is "
@@ -42775,20 +43543,20 @@ msgid ""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20270
+#: doc/guix.texi:20315
 #, no-wrap
 msgid "search"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20273
+#: doc/guix.texi:20318
 msgid ""
 "Display available service type definitions that match the given regular "
 "expressions, sorted by relevance:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:20285
+#: doc/guix.texi:20330
 #, no-wrap
 msgid ""
 "$ guix system search console font\n"
@@ -42805,7 +43573,7 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:20291
+#: doc/guix.texi:20336
 #, no-wrap
 msgid ""
 "name: mingetty\n"
@@ -42817,7 +43585,7 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:20298
+#: doc/guix.texi:20343
 #, no-wrap
 msgid ""
 "name: login\n"
@@ -42830,13 +43598,13 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:20300
+#: doc/guix.texi:20345
 #, no-wrap
 msgid "@dots{}\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20305
+#: doc/guix.texi:20350
 msgid ""
 "As for @command{guix package --search}, the result is written in "
 "@code{recutils} format, which makes it easy to filter the output "
@@ -42844,13 +43612,13 @@ msgid ""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20306
+#: doc/guix.texi:20351
 #, no-wrap
 msgid "reconfigure"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20311
+#: doc/guix.texi:20356
 msgid ""
 "Build the operating system described in @var{file}, activate it, and switch "
 "to it@footnote{This action (and the related actions @code{switch-generation} "
@@ -42858,7 +43626,7 @@ msgid ""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20318
+#: doc/guix.texi:20363
 msgid ""
 "This effects all the configuration specified in @var{file}: user accounts, "
 "system services, global package list, setuid programs, etc.  The command "
@@ -42868,7 +43636,7 @@ msgid ""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20324
+#: doc/guix.texi:20369
 msgid ""
 "This command creates a new generation whose number is one greater than the "
 "current generation (as reported by @command{guix system list-generations}).  "
@@ -42877,7 +43645,7 @@ msgid ""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20329
+#: doc/guix.texi:20374
 msgid ""
 "It also adds a bootloader menu entry for the new OS configuration, ---unless "
 "@option{--no-bootloader} is passed.  For GRUB, it moves entries for older "
@@ -42886,7 +43654,7 @@ msgid ""
 msgstr ""
 
 #. type: quotation
-#: doc/guix.texi:20337
+#: doc/guix.texi:20382
 msgid ""
 "It is highly recommended to run @command{guix pull} once before you run "
 "@command{guix system reconfigure} for the first time (@pxref{Invoking guix "
@@ -42895,13 +43663,13 @@ msgid ""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20339
+#: doc/guix.texi:20384
 #, no-wrap
 msgid "switch-generation"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20348
+#: doc/guix.texi:20393
 msgid ""
 "Switch to an existing system generation.  This action atomically switches "
 "the system profile to the specified system generation.  It also rearranges "
@@ -42913,27 +43681,27 @@ msgid ""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20352
+#: doc/guix.texi:20397
 msgid ""
 "The bootloader itself is not being reinstalled when using this command.  "
 "Thus, the installed bootloader is used with an updated configuration file."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20356
+#: doc/guix.texi:20401
 msgid ""
 "The target generation can be specified explicitly by its generation number.  "
 "For example, the following invocation would switch to system generation 7:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:20359
+#: doc/guix.texi:20404
 #, no-wrap
 msgid "guix system switch-generation 7\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20367
+#: doc/guix.texi:20412
 msgid ""
 "The target generation can also be specified relative to the current "
 "generation with the form @code{+N} or @code{-N}, where @code{+3} means ``3 "
@@ -42944,13 +43712,13 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:20370
+#: doc/guix.texi:20415
 #, no-wrap
 msgid "guix system switch-generation -- -1\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20378
+#: doc/guix.texi:20423
 msgid ""
 "Currently, the effect of invoking this action is @emph{only} to switch the "
 "system profile to an existing generation and rearrange the bootloader menu "
@@ -42961,18 +43729,18 @@ msgid ""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20380
+#: doc/guix.texi:20425
 msgid "This action will fail if the specified generation does not exist."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20381
+#: doc/guix.texi:20426
 #, no-wrap
 msgid "roll-back"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20387
+#: doc/guix.texi:20432
 msgid ""
 "Switch to the preceding system generation.  The next time the system boots, "
 "it will use the preceding system generation.  This is the inverse of "
@@ -42981,14 +43749,14 @@ msgid ""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20391
+#: doc/guix.texi:20436
 msgid ""
 "Currently, as with @command{switch-generation}, you must reboot after "
 "running this action to actually start using the preceding system generation."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20396
+#: doc/guix.texi:20441
 msgid ""
 "Build the derivation of the operating system, which includes all the "
 "configuration files and programs needed to boot and run the system.  This "
@@ -42996,13 +43764,13 @@ msgid ""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20397
+#: doc/guix.texi:20442
 #, no-wrap
 msgid "init"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20401
+#: doc/guix.texi:20446
 msgid ""
 "Populate the given directory with all the files necessary to run the "
 "operating system specified in @var{file}.  This is useful for first-time "
@@ -43010,53 +43778,53 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:20404
+#: doc/guix.texi:20449
 #, no-wrap
 msgid "guix system init my-os-config.scm /mnt\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20411
+#: doc/guix.texi:20456
 msgid ""
 "copies to @file{/mnt} all the store items required by the configuration "
 "specified in @file{my-os-config.scm}.  This includes configuration files, "
 "packages, and so on.  It also creates other essential files needed for the "
-"system to operate correctly---e.g., the @file{/etc}, @file{/var}, and "
-"@file{/run} directories, and the @file{/bin/sh} file."
+"system to operate correctly---e.g., the @file{/etc}, @file{/var}, and @file{/"
+"run} directories, and the @file{/bin/sh} file."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20415
+#: doc/guix.texi:20460
 msgid ""
-"This command also installs bootloader on the target specified in "
-"@file{my-os-config}, unless the @option{--no-bootloader} option was passed."
+"This command also installs bootloader on the target specified in @file{my-os-"
+"config}, unless the @option{--no-bootloader} option was passed."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20416
+#: doc/guix.texi:20461
 #, no-wrap
 msgid "vm"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:20417 doc/guix.texi:20681
+#: doc/guix.texi:20462 doc/guix.texi:20726
 #, no-wrap
 msgid "virtual machine"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:20418
+#: doc/guix.texi:20463
 #, no-wrap
 msgid "VM"
 msgstr ""
 
 #. type: anchor{#1}
-#: doc/guix.texi:20425
+#: doc/guix.texi:20470
 msgid "guix system vm"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20425
+#: doc/guix.texi:20470
 msgid ""
 "Build a virtual machine that contains the operating system declared in "
 "@var{file}, and return a script to run that virtual machine (VM).  Arguments "
@@ -43065,18 +43833,18 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:20428
+#: doc/guix.texi:20473
 #, no-wrap
 msgid "$ /gnu/store/@dots{}-run-vm.sh -m 1024 -net user\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20431
+#: doc/guix.texi:20476
 msgid "The VM shares its store with the host system."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20436
+#: doc/guix.texi:20481
 msgid ""
 "Additional file systems can be shared between the host and the VM using the "
 "@code{--share} and @code{--expose} command-line options: the former "
@@ -43085,15 +43853,15 @@ msgid ""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20440
+#: doc/guix.texi:20485
 msgid ""
 "The example below creates a VM in which the user's home directory is "
-"accessible read-only, and where the @file{/exchange} directory is a "
-"read-write mapping of @file{$HOME/tmp} on the host:"
+"accessible read-only, and where the @file{/exchange} directory is a read-"
+"write mapping of @file{$HOME/tmp} on the host:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:20444
+#: doc/guix.texi:20489
 #, no-wrap
 msgid ""
 "guix system vm my-config.scm \\\n"
@@ -43101,7 +43869,7 @@ msgid ""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20449
+#: doc/guix.texi:20494
 msgid ""
 "On GNU/Linux, the default is to boot directly to the kernel; this has the "
 "advantage of requiring only a very tiny root disk image since the store of "
@@ -43109,7 +43877,7 @@ msgid ""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20455
+#: doc/guix.texi:20500
 msgid ""
 "The @code{--full-boot} option forces a complete boot sequence, starting with "
 "the bootloader.  This requires more disk space since a root image containing "
@@ -43118,37 +43886,37 @@ msgid ""
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:20456
+#: doc/guix.texi:20501
 #, no-wrap
 msgid "System images, creation in various formats"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:20457
+#: doc/guix.texi:20502
 #, no-wrap
 msgid "Creating system images in various formats"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20458
+#: doc/guix.texi:20503
 #, no-wrap
 msgid "vm-image"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:20459
+#: doc/guix.texi:20504
 #, no-wrap
 msgid "disk-image"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:20460
+#: doc/guix.texi:20505
 #, no-wrap
 msgid "docker-image"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20468
+#: doc/guix.texi:20513
 msgid ""
 "Return a virtual machine, disk image, or Docker image of the operating "
 "system declared in @var{file} that stands alone.  By default, @command{guix "
@@ -43159,14 +43927,14 @@ msgid ""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20471
+#: doc/guix.texi:20516
 msgid ""
-"You can specify the root file system type by using the "
-"@option{--file-system-type} option.  It defaults to @code{ext4}."
+"You can specify the root file system type by using the @option{--file-system-"
+"type} option.  It defaults to @code{ext4}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20475
+#: doc/guix.texi:20520
 msgid ""
 "When using @code{vm-image}, the returned image is in qcow2 format, which the "
 "QEMU emulator can efficiently use. @xref{Running GuixSD in a VM}, for more "
@@ -43174,7 +43942,7 @@ msgid ""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20480
+#: doc/guix.texi:20525
 msgid ""
 "When using @code{disk-image}, a raw disk image is produced; it can be copied "
 "as is to a USB stick, for instance.  Assuming @code{/dev/sdc} is the device "
@@ -43183,13 +43951,13 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:20483
+#: doc/guix.texi:20528
 #, no-wrap
 msgid "# dd if=$(guix system disk-image my-os.scm) of=/dev/sdc\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20490
+#: doc/guix.texi:20535
 msgid ""
 "When using @code{docker-image}, a Docker image is produced.  Guix builds the "
 "image from scratch, not from a pre-existing Docker base image.  As a result, "
@@ -43199,7 +43967,7 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:20496
+#: doc/guix.texi:20541
 #, no-wrap
 msgid ""
 "image_id=\"$(docker load < guixsd-docker-image.tar.gz)\"\n"
@@ -43209,7 +43977,7 @@ msgid ""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20506
+#: doc/guix.texi:20551
 msgid ""
 "This command starts a new Docker container from the specified image.  It "
 "will boot the GuixSD system in the usual manner, which means it will start "
@@ -43221,7 +43989,7 @@ msgid ""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20514
+#: doc/guix.texi:20559
 msgid ""
 "Return a script to run the operating system declared in @var{file} within a "
 "container.  Containers are a set of lightweight isolation mechanisms "
@@ -43232,14 +44000,14 @@ msgid ""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20518
+#: doc/guix.texi:20563
 msgid ""
 "Currently, the script must be run as root in order to support more than a "
 "single user and group.  The container shares its store with the host system."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20522
+#: doc/guix.texi:20567
 msgid ""
 "As with the @code{vm} action (@pxref{guix system vm}), additional file "
 "systems to be shared between the host and container can be specified using "
@@ -43247,7 +44015,7 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:20526
+#: doc/guix.texi:20571
 #, no-wrap
 msgid ""
 "guix system container my-config.scm \\\n"
@@ -43255,12 +44023,12 @@ msgid ""
 msgstr ""
 
 #. type: quotation
-#: doc/guix.texi:20530
+#: doc/guix.texi:20575
 msgid "This option requires Linux-libre 3.19 or newer."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20537
+#: doc/guix.texi:20582
 msgid ""
 "@var{options} can contain any of the common build options (@pxref{Common "
 "Build Options}).  In addition, @var{options} can contain one of the "
@@ -43268,7 +44036,7 @@ msgid ""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20546
+#: doc/guix.texi:20591
 msgid ""
 "Consider the operating-system @var{expr} evaluates to.  This is an "
 "alternative to specifying a file which evaluates to an operating system.  "
@@ -43277,76 +44045,76 @@ msgid ""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20551
+#: doc/guix.texi:20596
 msgid ""
 "Attempt to build for @var{system} instead of the host system type.  This "
 "works as per @command{guix build} (@pxref{Invoking guix build})."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20552
+#: doc/guix.texi:20597
 #, no-wrap
 msgid "--derivation"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20556
+#: doc/guix.texi:20601
 msgid ""
 "Return the derivation file name of the given operating system without "
 "building anything."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20557
+#: doc/guix.texi:20602
 #, no-wrap
 msgid "--file-system-type=@var{type}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20561
+#: doc/guix.texi:20606
 msgid ""
 "For the @code{disk-image} action, create a file system of the given "
 "@var{type} on the image."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20563
+#: doc/guix.texi:20608
 msgid "When this option is omitted, @command{guix system} uses @code{ext4}."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:20564
+#: doc/guix.texi:20609
 #, no-wrap
 msgid "ISO-9660 format"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:20565
+#: doc/guix.texi:20610
 #, no-wrap
 msgid "CD image format"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:20566
+#: doc/guix.texi:20611
 #, no-wrap
 msgid "DVD image format"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20569
+#: doc/guix.texi:20614
 msgid ""
 "@code{--file-system-type=iso9660} produces an ISO-9660 image, suitable for "
 "burning on CDs and DVDs."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20570
+#: doc/guix.texi:20615
 #, no-wrap
 msgid "--image-size=@var{size}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20575
+#: doc/guix.texi:20620
 msgid ""
 "For the @code{vm-image} and @code{disk-image} actions, create an image of "
 "the given @var{size}.  @var{size} may be a number of bytes, or it may "
@@ -43355,7 +44123,7 @@ msgid ""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20579
+#: doc/guix.texi:20624
 msgid ""
 "When this option is omitted, @command{guix system} computes an estimate of "
 "the image size as a function of the size of the system declared in "
@@ -43363,18 +44131,18 @@ msgid ""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20585
+#: doc/guix.texi:20630
 #, no-wrap
 msgid "--skip-checks"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20587
+#: doc/guix.texi:20632
 msgid "Skip pre-installation safety checks."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20594
+#: doc/guix.texi:20639
 msgid ""
 "By default, @command{guix system init} and @command{guix system reconfigure} "
 "perform safety checks: they make sure the file systems that appear in the "
@@ -43385,48 +44153,48 @@ msgid ""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20595
+#: doc/guix.texi:20640
 #, no-wrap
 msgid "--on-error=@var{strategy}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20598
+#: doc/guix.texi:20643
 msgid ""
 "Apply @var{strategy} when an error occurs when reading @var{file}.  "
 "@var{strategy} may be one of the following:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20600
+#: doc/guix.texi:20645
 #, no-wrap
 msgid "nothing-special"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20602
+#: doc/guix.texi:20647
 msgid "Report the error concisely and exit.  This is the default strategy."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20603
+#: doc/guix.texi:20648
 #, no-wrap
 msgid "backtrace"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20605
+#: doc/guix.texi:20650
 msgid "Likewise, but also display a backtrace."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20606
+#: doc/guix.texi:20651
 #, no-wrap
 msgid "debug"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20612
+#: doc/guix.texi:20657
 msgid ""
 "Report the error and enter Guile's debugger.  From there, you can run "
 "commands such as @code{,bt} to get a backtrace, @code{,locals} to display "
@@ -43436,7 +44204,7 @@ msgid ""
 msgstr ""
 
 #. type: quotation
-#: doc/guix.texi:20622
+#: doc/guix.texi:20667
 msgid ""
 "All the actions above, except @code{build} and @code{init}, can use KVM "
 "support in the Linux-libre kernel.  Specifically, if the machine has "
@@ -43447,7 +44215,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20628
+#: doc/guix.texi:20673
 msgid ""
 "Once you have built, configured, re-configured, and re-re-configured your "
 "GuixSD installation, you may find it useful to list the operating system "
@@ -43456,13 +44224,13 @@ msgid ""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20631
+#: doc/guix.texi:20676
 #, no-wrap
 msgid "list-generations"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20636
+#: doc/guix.texi:20681
 msgid ""
 "List a summary of each generation of the operating system available on disk, "
 "in a human-readable way.  This is similar to the @option{--list-generations} "
@@ -43470,7 +44238,7 @@ msgid ""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20641
+#: doc/guix.texi:20686
 msgid ""
 "Optionally, one can specify a pattern, with the same syntax that is used in "
 "@command{guix package --list-generations}, to restrict the list of "
@@ -43479,32 +44247,32 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:20644
+#: doc/guix.texi:20689
 #, no-wrap
 msgid "$ guix system list-generations 10d\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20651
+#: doc/guix.texi:20696
 msgid ""
-"The @command{guix system} command has even more to offer! The following "
-"sub-commands allow you to visualize how your system services relate to each "
+"The @command{guix system} command has even more to offer! The following sub-"
+"commands allow you to visualize how your system services relate to each "
 "other:"
 msgstr ""
 
 #. type: anchor{#1}
-#: doc/guix.texi:20653
+#: doc/guix.texi:20698
 msgid "system-extension-graph"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20655
+#: doc/guix.texi:20700
 #, no-wrap
 msgid "extension-graph"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20660
+#: doc/guix.texi:20705
 msgid ""
 "Emit in Dot/Graphviz format to standard output the @dfn{service extension "
 "graph} of the operating system defined in @var{file} (@pxref{Service "
@@ -43512,34 +44280,34 @@ msgid ""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20662
+#: doc/guix.texi:20707
 msgid "The command:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:20665
+#: doc/guix.texi:20710
 #, no-wrap
 msgid "$ guix system extension-graph @var{file} | dot -Tpdf > services.pdf\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20668
+#: doc/guix.texi:20713
 msgid "produces a PDF file showing the extension relations among services."
 msgstr ""
 
 #. type: anchor{#1}
-#: doc/guix.texi:20670
+#: doc/guix.texi:20715
 msgid "system-shepherd-graph"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20670
+#: doc/guix.texi:20715
 #, no-wrap
 msgid "shepherd-graph"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20675
+#: doc/guix.texi:20720
 msgid ""
 "Emit in Dot/Graphviz format to standard output the @dfn{dependency graph} of "
 "shepherd services of the operating system defined in @var{file}.  "
@@ -43547,31 +44315,30 @@ msgid ""
 msgstr ""
 
 #. type: subsection
-#: doc/guix.texi:20679
+#: doc/guix.texi:20724
 #, no-wrap
 msgid "Running GuixSD in a Virtual Machine"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20689
+#: doc/guix.texi:20734
 msgid ""
 "To run GuixSD in a virtual machine (VM), one can either use the pre-built "
-"GuixSD VM image distributed at "
-"@indicateurl{ftp://alpha.gnu.org/guix/guixsd-vm-image-@value{VERSION}.@var{system}.tar.xz} "
-", or build their own virtual machine image using @command{guix system "
-"vm-image} (@pxref{Invoking guix system}).  The returned image is in qcow2 "
-"format, which the @uref{http://qemu.org/, QEMU emulator} can efficiently "
-"use."
+"GuixSD VM image distributed at @indicateurl{ftp://alpha.gnu.org/guix/guixsd-"
+"vm-image-@value{VERSION}.@var{system}.tar.xz} , or build their own virtual "
+"machine image using @command{guix system vm-image} (@pxref{Invoking guix "
+"system}).  The returned image is in qcow2 format, which the @uref{http://"
+"qemu.org/, QEMU emulator} can efficiently use."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:20690
+#: doc/guix.texi:20735
 #, no-wrap
 msgid "QEMU"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20697
+#: doc/guix.texi:20742
 msgid ""
 "If you built your own image, you must copy it out of the store (@pxref{The "
 "Store}) and give yourself permission to write to the copy before you can use "
@@ -43581,7 +44348,7 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:20702
+#: doc/guix.texi:20747
 #, no-wrap
 msgid ""
 "$ qemu-system-x86_64 \\\n"
@@ -43590,31 +44357,30 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20705
+#: doc/guix.texi:20750
 msgid "Here is what each of these options means:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20707
+#: doc/guix.texi:20752
 #, no-wrap
 msgid "qemu-system-x86_64"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20710
+#: doc/guix.texi:20755
 msgid ""
-"This specifies the hardware platform to emulate.  This should match the "
-"host."
+"This specifies the hardware platform to emulate.  This should match the host."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20711
+#: doc/guix.texi:20756
 #, no-wrap
 msgid "-net user"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20715
+#: doc/guix.texi:20760
 msgid ""
 "Enable the unprivileged user-mode network stack.  The guest OS can access "
 "the host but not vice versa.  This is the simplest way to get the guest OS "
@@ -43622,107 +44388,106 @@ msgid ""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20716
+#: doc/guix.texi:20761
 #, no-wrap
 msgid "-net nic,model=virtio"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20721
+#: doc/guix.texi:20766
 msgid ""
 "You must create a network interface of a given model.  If you do not create "
 "a NIC, the boot will fail.  Assuming your hardware platform is x86_64, you "
-"can get a list of available NIC models by running "
-"@command{qemu-system-x86_64 -net nic,model=help}."
+"can get a list of available NIC models by running @command{qemu-system-"
+"x86_64 -net nic,model=help}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20722
+#: doc/guix.texi:20767
 #, no-wrap
 msgid "-enable-kvm"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20726
+#: doc/guix.texi:20771
 msgid ""
 "If your system has hardware virtualization extensions, enabling the virtual "
 "machine support (KVM) of the Linux kernel will make things run faster."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20727
+#: doc/guix.texi:20772
 #, no-wrap
 msgid "-m 256"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20730
+#: doc/guix.texi:20775
 msgid ""
 "RAM available to the guest OS, in mebibytes.  Defaults to 128@tie{}MiB, "
 "which may be insufficient for some operations."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20731
+#: doc/guix.texi:20776
 #, no-wrap
 msgid "/tmp/qemu-image"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20733
+#: doc/guix.texi:20778
 msgid "The file name of the qcow2 image."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20743
+#: doc/guix.texi:20788
 msgid ""
 "The default @command{run-vm.sh} script that is returned by an invocation of "
 "@command{guix system vm} does not add a @command{-net user} flag by "
-"default.  To get network access from within the vm add the "
-"@code{(dhcp-client-service)} to your system definition and start the VM "
-"using @command{`guix system vm config.scm` -net user}.  An important caveat "
-"of using @command{-net user} for networking is that @command{ping} will not "
+"default.  To get network access from within the vm add the @code{(dhcp-"
+"client-service)} to your system definition and start the VM using "
+"@command{`guix system vm config.scm` -net user}.  An important caveat of "
+"using @command{-net user} for networking is that @command{ping} will not "
 "work, because it uses the ICMP protocol.  You'll have to use a different "
 "command to check for network connectivity, for example @command{guix "
 "download}."
 msgstr ""
 
 #. type: subsubsection
-#: doc/guix.texi:20744
+#: doc/guix.texi:20789
 #, no-wrap
 msgid "Connecting Through SSH"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20753
+#: doc/guix.texi:20798
 msgid ""
-"To enable SSH inside a VM you need to add a SSH server like "
-"@code{(dropbear-service)} or @code{(lsh-service)} to your VM.  The "
-"@code{(lsh-service}) doesn't currently boot unsupervised.  It requires you "
-"to type some characters to initialize the randomness generator.  In addition "
-"you need to forward the SSH port, 22 by default, to the host.  You can do "
-"this with"
+"To enable SSH inside a VM you need to add a SSH server like @code{(dropbear-"
+"service)} or @code{(lsh-service)} to your VM.  The @code{(lsh-service}) "
+"doesn't currently boot unsupervised.  It requires you to type some "
+"characters to initialize the randomness generator.  In addition you need to "
+"forward the SSH port, 22 by default, to the host.  You can do this with"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:20756
+#: doc/guix.texi:20801
 #, no-wrap
 msgid "`guix system vm config.scm` -net user,hostfwd=tcp::10022-:22\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20759
+#: doc/guix.texi:20804
 msgid "To connect to the VM you can run"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:20762
+#: doc/guix.texi:20807
 #, no-wrap
 msgid "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 10022\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20769
+#: doc/guix.texi:20814
 msgid ""
 "The @command{-p} tells @command{ssh} the port you want to connect to.  "
 "@command{-o UserKnownHostsFile=/dev/null} prevents @command{ssh} from "
@@ -43732,13 +44497,13 @@ msgid ""
 msgstr ""
 
 #. type: subsubsection
-#: doc/guix.texi:20770
+#: doc/guix.texi:20815
 #, no-wrap
 msgid "Using @command{virt-viewer} with Spice"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20776
+#: doc/guix.texi:20821
 msgid ""
 "As an alternative to the default @command{qemu} graphical client you can use "
 "the @command{remote-viewer} from the @command{virt-viewer} package.  To "
@@ -43748,7 +44513,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20779
+#: doc/guix.texi:20824
 msgid ""
 "Spice also allows you to do some nice stuff like share your clipboard with "
 "your VM.  To enable that you'll also have to pass the following flags to "
@@ -43756,23 +44521,23 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:20785
+#: doc/guix.texi:20830
 #, no-wrap
 msgid ""
-"-device "
-"virtio-serial-pci,id=virtio-serial0,max_ports=16,bus=pci.0,addr=0x5\n"
+"-device virtio-serial-pci,id=virtio-serial0,max_ports=16,bus=pci.0,addr=0x5\n"
 "-chardev spicevmc,name=vdagent,id=vdagent\n"
 "-device virtserialport,nr=1,bus=virtio-serial0.0,chardev=vdagent,\n"
 "name=com.redhat.spice.0\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20788
-msgid "You'll also need to add the @pxref{Miscellaneous Services, Spice service}."
+#: doc/guix.texi:20833
+msgid ""
+"You'll also need to add the @pxref{Miscellaneous Services, Spice service}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20795
+#: doc/guix.texi:20840
 msgid ""
 "The previous sections show the available services and how one can combine "
 "them in an @code{operating-system} declaration.  But how do we define them "
@@ -43780,13 +44545,13 @@ msgid ""
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:20807
+#: doc/guix.texi:20852
 #, no-wrap
 msgid "daemons"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20820
+#: doc/guix.texi:20865
 msgid ""
 "Here we define a @dfn{service} as, broadly, something that extends the "
 "functionality of the operating system.  Often a service is a process---a "
@@ -43802,29 +44567,28 @@ msgid ""
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:20821
+#: doc/guix.texi:20866
 #, no-wrap
 msgid "service extensions"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20833
+#: doc/guix.texi:20878
 msgid ""
 "GuixSD services are connected by @dfn{extensions}.  For instance, the secure "
 "shell service @emph{extends} the Shepherd---the GuixSD initialization "
 "system, running as PID@tie{}1---by giving it the command lines to start and "
-"stop the secure shell daemon (@pxref{Networking Services, "
-"@code{lsh-service}}); the UPower service extends the D-Bus service by "
-"passing it its @file{.service} specification, and extends the udev service "
-"by passing it device management rules (@pxref{Desktop Services, "
-"@code{upower-service}}); the Guix daemon service extends the Shepherd by "
-"passing it the command lines to start and stop the daemon, and extends the "
-"account service by passing it a list of required build user accounts "
-"(@pxref{Base Services})."
+"stop the secure shell daemon (@pxref{Networking Services, @code{lsh-"
+"service}}); the UPower service extends the D-Bus service by passing it its "
+"@file{.service} specification, and extends the udev service by passing it "
+"device management rules (@pxref{Desktop Services, @code{upower-service}}); "
+"the Guix daemon service extends the Shepherd by passing it the command lines "
+"to start and stop the daemon, and extends the account service by passing it "
+"a list of required build user accounts (@pxref{Base Services})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20837
+#: doc/guix.texi:20882
 msgid ""
 "All in all, services and their ``extends'' relations form a directed acyclic "
 "graph (DAG).  If we represent services as boxes and extensions as arrows, a "
@@ -43832,18 +44596,18 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20839
+#: doc/guix.texi:20884
 msgid "@image{images/service-graph,,5in,Typical service extension graph.}"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:20840
+#: doc/guix.texi:20885
 #, no-wrap
 msgid "system service"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20848
+#: doc/guix.texi:20893
 msgid ""
 "At the bottom, we see the @dfn{system service}, which produces the directory "
 "containing everything to run and boot the system, as returned by the "
@@ -43854,13 +44618,13 @@ msgid ""
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:20849
+#: doc/guix.texi:20894
 #, no-wrap
 msgid "service types"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20855
+#: doc/guix.texi:20900
 msgid ""
 "Technically, developers can define @dfn{service types} to express these "
 "relations.  There can be any number of services of a given type on the "
@@ -43870,14 +44634,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20858
+#: doc/guix.texi:20903
 msgid ""
 "The following section describes the programming interface for service types "
 "and services."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20865
+#: doc/guix.texi:20910
 msgid ""
 "A @dfn{service type} is a node in the DAG described above.  Let us start "
 "with a simple example, the service type for the Guix build daemon "
@@ -43885,32 +44649,31 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:20875
+#: doc/guix.texi:20920
 #, no-wrap
 msgid ""
 "(define guix-service-type\n"
 "  (service-type\n"
 "   (name 'guix)\n"
 "   (extensions\n"
-"    (list (service-extension shepherd-root-service-type "
-"guix-shepherd-service)\n"
+"    (list (service-extension shepherd-root-service-type guix-shepherd-service)\n"
 "          (service-extension account-service-type guix-accounts)\n"
 "          (service-extension activation-service-type guix-activation)))\n"
 "   (default-value (guix-configuration))))\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20879
+#: doc/guix.texi:20924
 msgid "It defines three things:"
 msgstr ""
 
 #. type: enumerate
-#: doc/guix.texi:20883
+#: doc/guix.texi:20928
 msgid "A name, whose sole purpose is to make inspection and debugging easier."
 msgstr ""
 
 #. type: enumerate
-#: doc/guix.texi:20888
+#: doc/guix.texi:20933
 msgid ""
 "A list of @dfn{service extensions}, where each extension designates the "
 "target service type and a procedure that, given the parameters of the "
@@ -43918,30 +44681,30 @@ msgid ""
 msgstr ""
 
 #. type: enumerate
-#: doc/guix.texi:20891
+#: doc/guix.texi:20936
 msgid ""
 "Every service type has at least one service extension.  The only exception "
 "is the @dfn{boot service type}, which is the ultimate service."
 msgstr ""
 
 #. type: enumerate
-#: doc/guix.texi:20894
+#: doc/guix.texi:20939
 msgid "Optionally, a default value for instances of this type."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20897
+#: doc/guix.texi:20942
 msgid "In this example, @var{guix-service-type} extends three services:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20899
+#: doc/guix.texi:20944
 #, no-wrap
 msgid "shepherd-root-service-type"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20904
+#: doc/guix.texi:20949
 msgid ""
 "The @var{guix-shepherd-service} procedure defines how the Shepherd service "
 "is extended.  Namely, it returns a @code{<shepherd-service>} object that "
@@ -43950,13 +44713,13 @@ msgid ""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20905
+#: doc/guix.texi:20950
 #, no-wrap
 msgid "account-service-type"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20910
+#: doc/guix.texi:20955
 msgid ""
 "This extension for this service is computed by @var{guix-accounts}, which "
 "returns a list of @code{user-group} and @code{user-account} objects "
@@ -43964,13 +44727,13 @@ msgid ""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20911
+#: doc/guix.texi:20956
 #, no-wrap
 msgid "activation-service-type"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20915
+#: doc/guix.texi:20960
 msgid ""
 "Here @var{guix-activation} is a procedure that returns a gexp, which is a "
 "code snippet to run at ``activation time''---e.g., when the service is "
@@ -43978,12 +44741,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20918
+#: doc/guix.texi:20963
 msgid "A service of this type is instantiated like this:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:20924
+#: doc/guix.texi:20969
 #, no-wrap
 msgid ""
 "(service guix-service-type\n"
@@ -43993,35 +44756,35 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20932
+#: doc/guix.texi:20977
 msgid ""
 "The second argument to the @code{service} form is a value representing the "
-"parameters of this specific service instance.  "
-"@xref{guix-configuration-type, @code{guix-configuration}}, for information "
-"about the @code{guix-configuration} data type.  When the value is omitted, "
-"the default value specified by @code{guix-service-type} is used:"
+"parameters of this specific service instance.  @xref{guix-configuration-"
+"type, @code{guix-configuration}}, for information about the @code{guix-"
+"configuration} data type.  When the value is omitted, the default value "
+"specified by @code{guix-service-type} is used:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:20935
+#: doc/guix.texi:20980
 #, no-wrap
 msgid "(service guix-service-type)\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20939
+#: doc/guix.texi:20984
 msgid ""
 "@var{guix-service-type} is quite simple because it extends other services "
 "but is not extensible itself."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20943
+#: doc/guix.texi:20988
 msgid "The service type for an @emph{extensible} service looks like this:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:20950
+#: doc/guix.texi:20995
 #, no-wrap
 msgid ""
 "(define udev-service-type\n"
@@ -44033,7 +44796,7 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:20958
+#: doc/guix.texi:21003
 #, no-wrap
 msgid ""
 "                (compose concatenate)       ;concatenate the list of rules\n"
@@ -44046,49 +44809,49 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20964
+#: doc/guix.texi:21009
 msgid ""
-"This is the service type for the "
-"@uref{https://wiki.gentoo.org/wiki/Project:Eudev, eudev device management "
-"daemon}.  Compared to the previous example, in addition to an extension of "
-"@var{shepherd-root-service-type}, we see two new fields:"
+"This is the service type for the @uref{https://wiki.gentoo.org/wiki/Project:"
+"Eudev, eudev device management daemon}.  Compared to the previous example, "
+"in addition to an extension of @var{shepherd-root-service-type}, we see two "
+"new fields:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20966
+#: doc/guix.texi:21011
 #, no-wrap
 msgid "compose"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20969
+#: doc/guix.texi:21014
 msgid ""
 "This is the procedure to @dfn{compose} the list of extensions to services of "
 "this type."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20972
+#: doc/guix.texi:21017
 msgid ""
 "Services can extend the udev service by passing it lists of rules; we "
 "compose those extensions simply by concatenating them."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20973
+#: doc/guix.texi:21018
 #, no-wrap
 msgid "extend"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20976
+#: doc/guix.texi:21021
 msgid ""
 "This procedure defines how the value of the service is @dfn{extended} with "
 "the composition of the extensions."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20981
+#: doc/guix.texi:21026
 msgid ""
 "Udev extensions are composed into a list of rules, but the udev service "
 "value is itself a @code{<udev-configuration>} record.  So here, we extend "
@@ -44097,7 +44860,7 @@ msgid ""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20987
+#: doc/guix.texi:21032
 msgid ""
 "This is a string giving an overview of the service type.  The string can "
 "contain Texinfo markup (@pxref{Overview,,, texinfo, GNU Texinfo}).  The "
@@ -44106,7 +44869,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20992
+#: doc/guix.texi:21037
 msgid ""
 "There can be only one instance of an extensible service type such as "
 "@var{udev-service-type}.  If there were more, the @code{service-extension} "
@@ -44114,14 +44877,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20995
+#: doc/guix.texi:21040
 msgid ""
 "Still here? The next section provides a reference of the programming "
 "interface for services."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21003
+#: doc/guix.texi:21048
 msgid ""
 "We have seen an overview of service types (@pxref{Service Types and "
 "Services}).  This section provides a reference on how to manipulate services "
@@ -44130,13 +44893,13 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:21004
+#: doc/guix.texi:21049
 #, no-wrap
 msgid "{Scheme Procedure} service @var{type} [@var{value}]"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:21008
+#: doc/guix.texi:21053
 msgid ""
 "Return a new service of @var{type}, a @code{<service-type>} object (see "
 "below.)  @var{value} can be any object; it represents the parameters of this "
@@ -44144,30 +44907,30 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:21012
+#: doc/guix.texi:21057
 msgid ""
 "When @var{value} is omitted, the default value specified by @var{type} is "
 "used; if @var{type} does not specify a default value, an error is raised."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:21014
+#: doc/guix.texi:21059
 msgid "For instance, this:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:21017
+#: doc/guix.texi:21062
 #, no-wrap
 msgid "(service openssh-service-type)\n"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:21021
+#: doc/guix.texi:21066
 msgid "is equivalent to this:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:21025
+#: doc/guix.texi:21070
 #, no-wrap
 msgid ""
 "(service openssh-service-type\n"
@@ -44175,54 +44938,55 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:21029
+#: doc/guix.texi:21074
 msgid ""
 "In both cases the result is an instance of @code{openssh-service-type} with "
 "the default configuration."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:21031
+#: doc/guix.texi:21076
 #, no-wrap
 msgid "{Scheme Procedure} service? @var{obj}"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:21033
+#: doc/guix.texi:21078
 msgid "Return true if @var{obj} is a service."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:21035
+#: doc/guix.texi:21080
 #, no-wrap
 msgid "{Scheme Procedure} service-kind @var{service}"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:21037
-msgid "Return the type of @var{service}---i.e., a @code{<service-type>} object."
+#: doc/guix.texi:21082
+msgid ""
+"Return the type of @var{service}---i.e., a @code{<service-type>} object."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:21039
+#: doc/guix.texi:21084
 #, no-wrap
 msgid "{Scheme Procedure} service-value @var{service}"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:21042
+#: doc/guix.texi:21087
 msgid ""
 "Return the value associated with @var{service}.  It represents its "
 "parameters."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21045
+#: doc/guix.texi:21090
 msgid "Here is an example of how a service is created and manipulated:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:21054
+#: doc/guix.texi:21099
 #, no-wrap
 msgid ""
 "(define s\n"
@@ -44236,7 +45000,7 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:21057
+#: doc/guix.texi:21102
 #, no-wrap
 msgid ""
 "(service? s)\n"
@@ -44245,7 +45009,7 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:21060
+#: doc/guix.texi:21105
 #, no-wrap
 msgid ""
 "(eq? (service-kind s) nginx-service-type)\n"
@@ -44253,7 +45017,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21070
+#: doc/guix.texi:21115
 msgid ""
 "The @code{modify-services} form provides a handy way to change the "
 "parameters of some of the services of a list such as @var{%base-services} "
@@ -44265,31 +45029,31 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:21071
+#: doc/guix.texi:21116
 #, no-wrap
 msgid "{Scheme Syntax} modify-services @var{services} @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:21073
+#: doc/guix.texi:21118
 msgid "(@var{type} @var{variable} => @var{body}) @dots{}"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:21076
+#: doc/guix.texi:21121
 msgid ""
 "Modify the services listed in @var{services} according to the given "
 "clauses.  Each clause has the form:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:21079
+#: doc/guix.texi:21124
 #, no-wrap
 msgid "(@var{type} @var{variable} => @var{body})\n"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:21086
+#: doc/guix.texi:21131
 msgid ""
 "where @var{type} is a service type---e.g., @code{guix-service-type}---and "
 "@var{variable} is an identifier that is bound within the @var{body} to the "
@@ -44298,7 +45062,7 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:21093
+#: doc/guix.texi:21138
 msgid ""
 "The @var{body} should evaluate to the new service parameters, which will be "
 "used to configure the new service.  This new service will replace the "
@@ -44309,12 +45073,12 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:21095
+#: doc/guix.texi:21140
 msgid "@xref{Using the Configuration System}, for example usage."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21102
+#: doc/guix.texi:21147
 msgid ""
 "Next comes the programming interface for service types.  This is something "
 "you want to know when writing new service definitions, but not necessarily "
@@ -44323,56 +45087,55 @@ msgid ""
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:21103
+#: doc/guix.texi:21148
 #, no-wrap
 msgid "{Data Type} service-type"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:21104
+#: doc/guix.texi:21149
 #, no-wrap
 msgid "service type"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:21107
+#: doc/guix.texi:21152
 msgid ""
 "This is the representation of a @dfn{service type} (@pxref{Service Types and "
 "Services})."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21111
+#: doc/guix.texi:21156
 msgid "This is a symbol, used only to simplify inspection and debugging."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:21112
+#: doc/guix.texi:21157
 #, no-wrap
 msgid "extensions"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21114
+#: doc/guix.texi:21159
 msgid "A non-empty list of @code{<service-extension>} objects (see below)."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21115
+#: doc/guix.texi:21160
 #, no-wrap
 msgid "@code{compose} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21119
+#: doc/guix.texi:21164
 msgid ""
 "If this is @code{#f}, then the service type denotes services that cannot be "
-"extended---i.e., services that do not receive ``values'' from other "
-"services."
+"extended---i.e., services that do not receive ``values'' from other services."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21123
+#: doc/guix.texi:21168
 msgid ""
 "Otherwise, it must be a one-argument procedure.  The procedure is called by "
 "@code{fold-services} and is passed a list of values collected from "
@@ -44380,18 +45143,18 @@ msgid ""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21124
+#: doc/guix.texi:21169
 #, no-wrap
 msgid "@code{extend} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21126
+#: doc/guix.texi:21171
 msgid "If this is @code{#f}, services of this type cannot be extended."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21132
+#: doc/guix.texi:21177
 msgid ""
 "Otherwise, it must be a two-argument procedure: @code{fold-services} calls "
 "it, passing it the initial value of the service as the first argument and "
@@ -44401,39 +45164,38 @@ msgid ""
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:21135
+#: doc/guix.texi:21180
 msgid "@xref{Service Types and Services}, for examples."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:21137
+#: doc/guix.texi:21182
 #, no-wrap
 msgid "{Scheme Procedure} service-extension @var{target-type} @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:21143
+#: doc/guix.texi:21188
 msgid ""
-"@var{compute} Return a new extension for services of type "
-"@var{target-type}.  @var{compute} must be a one-argument procedure: "
-"@code{fold-services} calls it, passing it the value associated with the "
-"service that provides the extension; it must return a valid value for the "
-"target service."
+"@var{compute} Return a new extension for services of type @var{target-"
+"type}.  @var{compute} must be a one-argument procedure: @code{fold-services} "
+"calls it, passing it the value associated with the service that provides the "
+"extension; it must return a valid value for the target service."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:21145
+#: doc/guix.texi:21190
 #, no-wrap
 msgid "{Scheme Procedure} service-extension? @var{obj}"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:21147
+#: doc/guix.texi:21192
 msgid "Return true if @var{obj} is a service extension."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21153
+#: doc/guix.texi:21198
 msgid ""
 "Occasionally, you might want to simply extend an existing service.  This "
 "involves creating a new service type and specifying the extension of "
@@ -44442,13 +45204,13 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:21154
+#: doc/guix.texi:21199
 #, no-wrap
 msgid "{Scheme Procedure} simple-service @var{name} @var{target} @var{value}"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:21158
+#: doc/guix.texi:21203
 msgid ""
 "Return a service that extends @var{target} with @var{value}.  This works by "
 "creating a singleton service type @var{name}, of which the returned service "
@@ -44456,14 +45218,14 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:21161
+#: doc/guix.texi:21206
 msgid ""
 "For example, this extends mcron (@pxref{Scheduled Job Execution}) with an "
 "additional job:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:21165
+#: doc/guix.texi:21210
 #, no-wrap
 msgid ""
 "(simple-service 'my-mcron-job mcron-service-type\n"
@@ -44471,7 +45233,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21175
+#: doc/guix.texi:21220
 msgid ""
 "At the core of the service abstraction lies the @code{fold-services} "
 "procedure, which is responsible for ``compiling'' a list of services down to "
@@ -44483,13 +45245,13 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:21176
+#: doc/guix.texi:21221
 #, no-wrap
 msgid "{Scheme Procedure} fold-services @var{services} @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:21180
+#: doc/guix.texi:21225
 msgid ""
 "[#:target-type @var{system-service-type}] Fold @var{services} by propagating "
 "their extensions down to the root of type @var{target-type}; return the root "
@@ -44497,87 +45259,86 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21184
+#: doc/guix.texi:21229
 msgid ""
 "Lastly, the @code{(gnu services)} module also defines several essential "
 "service types, some of which are listed below."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:21185
+#: doc/guix.texi:21230
 #, no-wrap
 msgid "{Scheme Variable} system-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:21188
+#: doc/guix.texi:21233
 msgid ""
 "This is the root of the service graph.  It produces the system directory as "
 "returned by the @command{guix system build} command."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:21190
+#: doc/guix.texi:21235
 #, no-wrap
 msgid "{Scheme Variable} boot-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:21193
+#: doc/guix.texi:21238
 msgid ""
 "The type of the ``boot service'', which produces the @dfn{boot script}.  The "
 "boot script is what the initial RAM disk runs when booting."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:21195
+#: doc/guix.texi:21240
 #, no-wrap
 msgid "{Scheme Variable} etc-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:21199
+#: doc/guix.texi:21244
 msgid ""
 "The type of the @file{/etc} service.  This service is used to create files "
-"under @file{/etc} and can be extended by passing it name/file tuples such "
-"as:"
+"under @file{/etc} and can be extended by passing it name/file tuples such as:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:21202
+#: doc/guix.texi:21247
 #, no-wrap
 msgid "(list `(\"issue\" ,(plain-file \"issue\" \"Welcome!\\n\")))\n"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:21206
+#: doc/guix.texi:21251
 msgid ""
 "In this example, the effect would be to add an @file{/etc/issue} file "
 "pointing to the given file."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:21208
+#: doc/guix.texi:21253
 #, no-wrap
 msgid "{Scheme Variable} setuid-program-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:21212
+#: doc/guix.texi:21257
 msgid ""
 "Type for the ``setuid-program service''.  This service collects lists of "
-"executable file names, passed as gexps, and adds them to the set of "
-"setuid-root programs on the system (@pxref{Setuid Programs})."
+"executable file names, passed as gexps, and adds them to the set of setuid-"
+"root programs on the system (@pxref{Setuid Programs})."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:21214
+#: doc/guix.texi:21259
 #, no-wrap
 msgid "{Scheme Variable} profile-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:21218
+#: doc/guix.texi:21263
 msgid ""
 "Type of the service that populates the @dfn{system profile}---i.e., the "
 "programs under @file{/run/current-system/profile}.  Other services can "
@@ -44585,25 +45346,25 @@ msgid ""
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:21224
+#: doc/guix.texi:21269
 #, no-wrap
 msgid "shepherd services"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:21225
+#: doc/guix.texi:21270
 #, no-wrap
 msgid "PID 1"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:21226
+#: doc/guix.texi:21271
 #, no-wrap
 msgid "init system"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21232
+#: doc/guix.texi:21277
 msgid ""
 "The @code{(gnu services shepherd)} module provides a way to define services "
 "managed by the GNU@tie{}Shepherd, which is the GuixSD initialization "
@@ -44612,7 +45373,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21238
+#: doc/guix.texi:21283
 msgid ""
 "Services in the Shepherd can depend on each other.  For instance, the SSH "
 "daemon may need to be started after the syslog daemon has been started, "
@@ -44622,50 +45383,50 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21240
+#: doc/guix.texi:21285
 msgid "@image{images/shepherd-graph,,5in,Typical shepherd service graph.}"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21244
+#: doc/guix.texi:21289
 msgid ""
 "You can actually generate such a graph for any operating system definition "
-"using the @command{guix system shepherd-graph} command "
-"(@pxref{system-shepherd-graph, @command{guix system shepherd-graph}})."
+"using the @command{guix system shepherd-graph} command (@pxref{system-"
+"shepherd-graph, @command{guix system shepherd-graph}})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21248
+#: doc/guix.texi:21293
 msgid ""
-"The @var{%shepherd-root-service} is a service object representing "
-"PID@tie{}1, of type @var{shepherd-root-service-type}; it can be extended by "
-"passing it lists of @code{<shepherd-service>} objects."
+"The @var{%shepherd-root-service} is a service object representing PID@tie{}"
+"1, of type @var{shepherd-root-service-type}; it can be extended by passing "
+"it lists of @code{<shepherd-service>} objects."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:21249
+#: doc/guix.texi:21294
 #, no-wrap
 msgid "{Data Type} shepherd-service"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:21251
+#: doc/guix.texi:21296
 msgid "The data type representing a service managed by the Shepherd."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:21253
+#: doc/guix.texi:21298
 #, no-wrap
 msgid "provision"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21255
+#: doc/guix.texi:21300
 msgid "This is a list of symbols denoting what the service provides."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21260
+#: doc/guix.texi:21305
 msgid ""
 "These are the names that may be passed to @command{herd start}, "
 "@command{herd status}, and similar commands (@pxref{Invoking herd,,, "
@@ -44674,43 +45435,43 @@ msgid ""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21261
+#: doc/guix.texi:21306
 #, no-wrap
 msgid "@code{requirements} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21263
+#: doc/guix.texi:21308
 msgid "List of symbols denoting the Shepherd services this one depends on."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21264
+#: doc/guix.texi:21309
 #, no-wrap
 msgid "@code{respawn?} (default: @code{#t})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21267
+#: doc/guix.texi:21312
 msgid ""
 "Whether to restart the service when it stops, for instance when the "
 "underlying process dies."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:21268
+#: doc/guix.texi:21313
 #, no-wrap
 msgid "start"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:21269
+#: doc/guix.texi:21314
 #, no-wrap
 msgid "@code{stop} (default: @code{#~(const #f)})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21275
+#: doc/guix.texi:21320
 msgid ""
 "The @code{start} and @code{stop} fields refer to the Shepherd's facilities "
 "to start and stop processes (@pxref{Service De- and Constructors,,, "
@@ -44719,49 +45480,49 @@ msgid ""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21278
+#: doc/guix.texi:21323
 msgid "A documentation string, as shown when running:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:21281
+#: doc/guix.texi:21326
 #, no-wrap
 msgid "herd doc @var{service-name}\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21285
+#: doc/guix.texi:21330
 msgid ""
 "where @var{service-name} is one of the symbols in @var{provision} "
 "(@pxref{Invoking herd,,, shepherd, The GNU Shepherd Manual})."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21286
+#: doc/guix.texi:21331
 #, no-wrap
 msgid "@code{modules} (default: @var{%default-modules})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21289
+#: doc/guix.texi:21334
 msgid ""
 "This is the list of modules that must be in scope when @code{start} and "
 "@code{stop} are evaluated."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:21293
+#: doc/guix.texi:21338
 #, no-wrap
 msgid "{Scheme Variable} shepherd-root-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:21295
+#: doc/guix.texi:21340
 msgid "The service type for the Shepherd ``root service''---i.e., PID@tie{}1."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:21299
+#: doc/guix.texi:21344
 msgid ""
 "This is the service type that extensions target when they want to create "
 "shepherd services (@pxref{Service Types and Services}, for an example).  "
@@ -44769,48 +45530,48 @@ msgid ""
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:21301
+#: doc/guix.texi:21346
 #, no-wrap
 msgid "{Scheme Variable} %shepherd-root-service"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:21303
+#: doc/guix.texi:21348
 msgid "This service represents PID@tie{}1."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:21309
+#: doc/guix.texi:21354
 #, no-wrap
 msgid "documentation, searching for"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:21310
+#: doc/guix.texi:21355
 #, no-wrap
 msgid "searching for documentation"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:21311
+#: doc/guix.texi:21356
 #, no-wrap
 msgid "Info, documentation format"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:21312
+#: doc/guix.texi:21357
 #, no-wrap
 msgid "man pages"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:21313
+#: doc/guix.texi:21358
 #, no-wrap
 msgid "manual pages"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21320
+#: doc/guix.texi:21365
 msgid ""
 "In most cases packages installed with Guix come with documentation.  There "
 "are two main documentation formats: ``Info'', a browseable hypertext format "
@@ -44821,7 +45582,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21324
+#: doc/guix.texi:21369
 msgid ""
 "You can look for documentation of software installed on your system by "
 "keyword.  For example, the following command searches for information about "
@@ -44829,7 +45590,7 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:21332
+#: doc/guix.texi:21377
 #, no-wrap
 msgid ""
 "$ info -k TLS\n"
@@ -44841,12 +45602,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21336
+#: doc/guix.texi:21381
 msgid "The command below searches for the same keyword in man pages:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:21342
+#: doc/guix.texi:21387
 #, no-wrap
 msgid ""
 "$ man -k TLS\n"
@@ -44856,7 +45617,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21348
+#: doc/guix.texi:21393
 msgid ""
 "These searches are purely local to your computer so you have the guarantee "
 "that documentation you find corresponds to what you have actually installed, "
@@ -44864,31 +45625,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21351
+#: doc/guix.texi:21396
 msgid ""
 "Once you have these results, you can view the relevant documentation by "
 "running, say:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:21354
+#: doc/guix.texi:21399
 #, no-wrap
 msgid "$ info \"(gnutls)Core TLS API\"\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21358
+#: doc/guix.texi:21403
 msgid "or:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:21361
+#: doc/guix.texi:21406
 #, no-wrap
 msgid "$ man certtool\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21369
+#: doc/guix.texi:21414
 msgid ""
 "Info manuals contain sections and indices as well as hyperlinks like those "
 "found in Web pages.  The @command{info} reader (@pxref{Top, Info reader,, "
@@ -44899,13 +45660,13 @@ msgid ""
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:21373
+#: doc/guix.texi:21418
 #, no-wrap
 msgid "debugging files"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21379
+#: doc/guix.texi:21424
 msgid ""
 "Program binaries, as produced by the GCC compilers for instance, are "
 "typically written in the ELF format, with a section containing "
@@ -44915,7 +45676,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21387
+#: doc/guix.texi:21432
 msgid ""
 "The problem with debugging information is that is takes up a fair amount of "
 "disk space.  For example, debugging information for the GNU C Library weighs "
@@ -44927,7 +45688,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21394
+#: doc/guix.texi:21439
 msgid ""
 "Thankfully, the GNU Binary Utilities (Binutils) and GDB provide a mechanism "
 "that allows users to get the best of both worlds: debugging information can "
@@ -44937,7 +45698,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21402
+#: doc/guix.texi:21447
 msgid ""
 "The GNU distribution takes advantage of this by storing debugging "
 "information in the @code{lib/debug} sub-directory of a separate package "
@@ -44948,13 +45709,13 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:21405
+#: doc/guix.texi:21450
 #, no-wrap
 msgid "guix package -i glibc:debug guile:debug\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21411
+#: doc/guix.texi:21456
 msgid ""
 "GDB must then be told to look for debug files in the user's profile, by "
 "setting the @code{debug-file-directory} variable (consider setting it from "
@@ -44962,20 +45723,20 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:21414
+#: doc/guix.texi:21459
 #, no-wrap
 msgid "(gdb) set debug-file-directory ~/.guix-profile/lib/debug\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21418
+#: doc/guix.texi:21463
 msgid ""
 "From there on, GDB will pick up debugging information from the @code{.debug} "
 "files under @file{~/.guix-profile/lib/debug}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21425
+#: doc/guix.texi:21470
 msgid ""
 "In addition, you will most likely want GDB to be able to show the source "
 "code being debugged.  To do that, you will have to unpack the source code of "
@@ -44986,25 +45747,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21434
+#: doc/guix.texi:21479
 msgid ""
-"The @code{debug} output mechanism in Guix is implemented by the "
-"@code{gnu-build-system} (@pxref{Build Systems}).  Currently, it is "
-"opt-in---debugging information is available only for the packages with "
-"definitions explicitly declaring a @code{debug} output.  This may be changed "
-"to opt-out in the future if our build farm servers can handle the load.  To "
-"check whether a package has a @code{debug} output, use @command{guix package "
-"--list-available} (@pxref{Invoking guix package})."
+"The @code{debug} output mechanism in Guix is implemented by the @code{gnu-"
+"build-system} (@pxref{Build Systems}).  Currently, it is opt-in---debugging "
+"information is available only for the packages with definitions explicitly "
+"declaring a @code{debug} output.  This may be changed to opt-out in the "
+"future if our build farm servers can handle the load.  To check whether a "
+"package has a @code{debug} output, use @command{guix package --list-"
+"available} (@pxref{Invoking guix package})."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:21439
+#: doc/guix.texi:21484
 #, no-wrap
 msgid "security updates"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21448
+#: doc/guix.texi:21493
 msgid ""
 "Occasionally, important security vulnerabilities are discovered in software "
 "packages and must be patched.  Guix developers try hard to keep track of "
@@ -45016,33 +45777,30 @@ msgid ""
 msgstr ""
 
 #. type: smallexample
-#: doc/guix.texi:21455
+#: doc/guix.texi:21500
 #, no-wrap
 msgid ""
 "$ guix lint -c cve\n"
-"gnu/packages/base.scm:652:2: glibc@@2.21: probably vulnerable to "
-"CVE-2015-1781, CVE-2015-7547\n"
-"gnu/packages/gcc.scm:334:2: gcc@@4.9.3: probably vulnerable to "
-"CVE-2015-5276\n"
-"gnu/packages/image.scm:312:2: openjpeg@@2.1.0: probably vulnerable to "
-"CVE-2016-1923, CVE-2016-1924\n"
+"gnu/packages/base.scm:652:2: glibc@@2.21: probably vulnerable to CVE-2015-1781, CVE-2015-7547\n"
+"gnu/packages/gcc.scm:334:2: gcc@@4.9.3: probably vulnerable to CVE-2015-5276\n"
+"gnu/packages/image.scm:312:2: openjpeg@@2.1.0: probably vulnerable to CVE-2016-1923, CVE-2016-1924\n"
 "@dots{}\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21458
+#: doc/guix.texi:21503
 msgid "@xref{Invoking guix lint}, for more information."
 msgstr ""
 
 #. type: quotation
-#: doc/guix.texi:21462
+#: doc/guix.texi:21507
 msgid ""
 "As of version @value{VERSION}, the feature described below is considered "
 "``beta''."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21472
+#: doc/guix.texi:21517
 msgid ""
 "Guix follows a functional package management discipline "
 "(@pxref{Introduction}), which implies that, when a package is changed, "
@@ -45054,13 +45812,13 @@ msgid ""
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:21473
+#: doc/guix.texi:21518
 #, no-wrap
 msgid "grafts"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21481
+#: doc/guix.texi:21526
 msgid ""
 "To address this, Guix implements @dfn{grafts}, a mechanism that allows for "
 "fast deployment of critical updates without the costs associated with a "
@@ -45072,13 +45830,13 @@ msgid ""
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:21482
+#: doc/guix.texi:21527
 #, no-wrap
 msgid "replacements of packages, for grafts"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21488
+#: doc/guix.texi:21533
 msgid ""
 "For instance, suppose a security update needs to be applied to Bash.  Guix "
 "developers will provide a package definition for the ``fixed'' Bash, say "
@@ -45088,7 +45846,7 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:21495
+#: doc/guix.texi:21540
 #, no-wrap
 msgid ""
 "(define bash\n"
@@ -45099,7 +45857,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21505
+#: doc/guix.texi:21550
 msgid ""
 "From there on, any package depending directly or indirectly on Bash---as "
 "reported by @command{guix gc --requisites} (@pxref{Invoking guix gc})---that "
@@ -45112,7 +45870,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21513
+#: doc/guix.texi:21558
 msgid ""
 "Currently, the length of the name and version of the graft and that of the "
 "package it replaces (@var{bash-fixed} and @var{bash} in the example above) "
@@ -45124,7 +45882,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21517
+#: doc/guix.texi:21562
 msgid ""
 "The @option{--no-grafts} command-line option allows you to forcefully avoid "
 "grafting (@pxref{Common Build Options, @option{--no-grafts}}).  Thus, the "
@@ -45132,70 +45890,70 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:21520
+#: doc/guix.texi:21565
 #, no-wrap
 msgid "guix build bash --no-grafts\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21524
+#: doc/guix.texi:21569
 msgid "returns the store file name of the original Bash, whereas:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:21527
+#: doc/guix.texi:21572
 #, no-wrap
 msgid "guix build bash\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21532
+#: doc/guix.texi:21577
 msgid ""
 "returns the store file name of the ``fixed'', replacement Bash.  This allows "
 "you to distinguish between the two variants of Bash."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21535
+#: doc/guix.texi:21580
 msgid ""
 "To verify which Bash your whole profile refers to, you can run "
 "(@pxref{Invoking guix gc}):"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:21538
+#: doc/guix.texi:21583
 #, no-wrap
 msgid "guix gc -R `readlink -f ~/.guix-profile` | grep bash\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21543
+#: doc/guix.texi:21588
 msgid ""
 "@dots{} and compare the store file names that you get with those above.  "
 "Likewise for a complete GuixSD system generation:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:21546
+#: doc/guix.texi:21591
 #, no-wrap
 msgid "guix gc -R `guix system build my-config.scm` | grep bash\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21550
+#: doc/guix.texi:21595
 msgid ""
 "Lastly, to check which Bash running processes are using, you can use the "
 "@command{lsof} command:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:21553
+#: doc/guix.texi:21598
 #, no-wrap
 msgid "lsof | grep /gnu/store/.*bash\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21570
+#: doc/guix.texi:21615
 msgid ""
 "From a programming viewpoint, the package definitions of the GNU "
 "distribution are provided by Guile modules in the @code{(gnu packages "
@@ -45211,7 +45969,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21577
+#: doc/guix.texi:21622
 msgid ""
 "The @code{(gnu packages @dots{})} module name space is automatically scanned "
 "for packages by the command-line tools.  For instance, when running "
@@ -45222,13 +45980,13 @@ msgid ""
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:21579
+#: doc/guix.texi:21624
 #, no-wrap
 msgid "package module search path"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21596
+#: doc/guix.texi:21641
 msgid ""
 "Users can store package definitions in modules with different names---e.g., "
 "@code{(my-packages emacs)}@footnote{Note that the file name and module name "
@@ -45247,13 +46005,13 @@ msgid ""
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:21597
+#: doc/guix.texi:21642
 #, no-wrap
 msgid "{Environment Variable} GUIX_PACKAGE_PATH"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:21601
+#: doc/guix.texi:21646
 msgid ""
 "This is a colon-separated list of directories to search for additional "
 "package modules.  Directories listed in this variable take precedence over "
@@ -45261,7 +46019,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21609
+#: doc/guix.texi:21654
 msgid ""
 "The distribution is fully @dfn{bootstrapped} and @dfn{self-contained}: each "
 "package is built based solely on other packages in the distribution.  The "
@@ -45271,13 +46029,13 @@ msgid ""
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:21613
+#: doc/guix.texi:21658
 #, no-wrap
 msgid "packages, creating"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21618
+#: doc/guix.texi:21663
 msgid ""
 "The GNU distribution is nascent and may well lack some of your favorite "
 "packages.  This section describes how you can help make the distribution "
@@ -45285,7 +46043,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21626
+#: doc/guix.texi:21671
 msgid ""
 "Free software packages are usually distributed in the form of @dfn{source "
 "code tarballs}---typically @file{tar.gz} files that contain all the source "
@@ -45297,20 +46055,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21635
+#: doc/guix.texi:21680
 msgid ""
 "In Guix all this information is embodied in @dfn{package definitions}.  "
 "Package definitions provide a high-level view of the package.  They are "
 "written using the syntax of the Scheme programming language; in fact, for "
 "each package we define a variable bound to the package definition, and "
-"export that variable from a module (@pxref{Package Modules}).  However, "
-"in-depth Scheme knowledge is @emph{not} a prerequisite for creating "
-"packages.  For more information on package definitions, @pxref{Defining "
-"Packages}."
+"export that variable from a module (@pxref{Package Modules}).  However, in-"
+"depth Scheme knowledge is @emph{not} a prerequisite for creating packages.  "
+"For more information on package definitions, @pxref{Defining Packages}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21641
+#: doc/guix.texi:21686
 msgid ""
 "Once a package definition is in place, stored in a file in the Guix source "
 "tree, it can be tested using the @command{guix build} command "
@@ -45320,13 +46077,13 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:21644
+#: doc/guix.texi:21689
 #, no-wrap
 msgid "./pre-inst-env guix build gnew --keep-failed\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21650
+#: doc/guix.texi:21695
 msgid ""
 "Using @code{--keep-failed} makes it easier to debug build failures since it "
 "provides access to the failed build tree.  Another useful command-line "
@@ -45334,7 +46091,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21655
+#: doc/guix.texi:21700
 msgid ""
 "If the package is unknown to the @command{guix} command, it may be that the "
 "source file contains a syntax error, or lacks a @code{define-public} clause "
@@ -45343,30 +46100,29 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:21658
+#: doc/guix.texi:21703
 #, no-wrap
 msgid "./pre-inst-env guile -c '(use-modules (gnu packages gnew))'\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21666
+#: doc/guix.texi:21711
 msgid ""
 "Once your package builds correctly, please send us a patch "
 "(@pxref{Contributing}).  Well, if you need help, we will be happy to help "
 "you too.  Once the patch is committed in the Guix repository, the new "
-"package automatically gets built on the supported platforms by "
-"@url{http://hydra.gnu.org/jobset/gnu/master, our continuous integration "
-"system}."
+"package automatically gets built on the supported platforms by @url{http://"
+"hydra.gnu.org/jobset/gnu/master, our continuous integration system}."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:21667
+#: doc/guix.texi:21712
 #, no-wrap
 msgid "substituter"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21674
+#: doc/guix.texi:21719
 msgid ""
 "Users can obtain the new package definition simply by running @command{guix "
 "pull} (@pxref{Invoking guix pull}).  When @code{hydra.gnu.org} is done "
@@ -45376,13 +46132,13 @@ msgid ""
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:21691
+#: doc/guix.texi:21736
 #, no-wrap
 msgid "free software"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21699
+#: doc/guix.texi:21744
 msgid ""
 "The GNU operating system has been developed so that users can have freedom "
 "in their computing.  GNU is @dfn{free software}, meaning that users have the "
@@ -45394,17 +46150,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21705
+#: doc/guix.texi:21750
 msgid ""
-"In addition, the GNU distribution follow the "
-"@url{http://www.gnu.org/distros/free-system-distribution-guidelines.html,free "
-"software distribution guidelines}.  Among other things, these guidelines "
-"reject non-free firmware, recommendations of non-free software, and discuss "
-"ways to deal with trademarks and patents."
+"In addition, the GNU distribution follow the @url{http://www.gnu.org/distros/"
+"free-system-distribution-guidelines.html,free software distribution "
+"guidelines}.  Among other things, these guidelines reject non-free firmware, "
+"recommendations of non-free software, and discuss ways to deal with "
+"trademarks and patents."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21713
+#: doc/guix.texi:21758
 msgid ""
 "Some otherwise free upstream package sources contain a small and optional "
 "subset that violates the above guidelines, for instance because this subset "
@@ -45415,13 +46171,13 @@ msgid ""
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:21718
+#: doc/guix.texi:21763
 #, no-wrap
 msgid "package name"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21726
+#: doc/guix.texi:21771
 msgid ""
 "A package has actually two names associated with it: First, there is the "
 "name of the @emph{Scheme variable}, the one following @code{define-public}.  "
@@ -45432,16 +46188,16 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21731
+#: doc/guix.texi:21776
 msgid ""
 "Both are usually the same and correspond to the lowercase conversion of the "
 "project name chosen upstream, with underscores replaced with hyphens.  For "
-"instance, GNUnet is available as @code{gnunet}, and SDL_net as "
-"@code{sdl-net}."
+"instance, GNUnet is available as @code{gnunet}, and SDL_net as @code{sdl-"
+"net}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21736
+#: doc/guix.texi:21781
 msgid ""
 "We do not add @code{lib} prefixes for library packages, unless these are "
 "already part of the official project name.  But @pxref{Python Modules} and "
@@ -45450,18 +46206,18 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21738
+#: doc/guix.texi:21783
 msgid "Font package names are handled differently, @pxref{Fonts}."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:21743
+#: doc/guix.texi:21788
 #, no-wrap
 msgid "package version"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21752
+#: doc/guix.texi:21797
 msgid ""
 "We usually package only the latest version of a given free software "
 "project.  But sometimes, for instance for incompatible library versions, two "
@@ -45473,21 +46229,21 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21755
+#: doc/guix.texi:21800
 msgid ""
 "The name inside the package definition is the same for all versions of a "
 "package and does not contain any version number."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21757
+#: doc/guix.texi:21802
 msgid ""
 "For instance, the versions 2.24.20 and 3.9.12 of GTK+ may be packaged as "
 "follows:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:21769
+#: doc/guix.texi:21814
 #, no-wrap
 msgid ""
 "(define-public gtk+\n"
@@ -45503,12 +46259,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21771
+#: doc/guix.texi:21816
 msgid "If we also wanted GTK+ 3.8.2, this would be packaged as"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:21777
+#: doc/guix.texi:21822
 #, no-wrap
 msgid ""
 "(define-public gtk+-3.8\n"
@@ -45519,13 +46275,13 @@ msgid ""
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:21781
+#: doc/guix.texi:21826
 #, no-wrap
 msgid "version number, for VCS snapshots"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21787
+#: doc/guix.texi:21832
 msgid ""
 "Occasionally, we package snapshots of upstream's version control system "
 "(VCS) instead of formal releases.  This should remain exceptional, because "
@@ -45535,7 +46291,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21795
+#: doc/guix.texi:21840
 msgid ""
 "Clearly, we need to make the commit identifier of the VCS snapshot visible "
 "in the version string, but we also need to make sure that the version string "
@@ -45547,7 +46303,7 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:21804
+#: doc/guix.texi:21849
 #, no-wrap
 msgid ""
 "2.0.11-3.cabba9e\n"
@@ -45560,7 +46316,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21813
+#: doc/guix.texi:21858
 msgid ""
 "It is a good idea to strip commit identifiers in the @code{version} field "
 "to, say, 7 digits.  It avoids an aesthetic annoyance (assuming aesthetics "
@@ -45571,7 +46327,7 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:21829
+#: doc/guix.texi:21874
 #, no-wrap
 msgid ""
 "(define my-package\n"
@@ -45591,19 +46347,19 @@ msgid ""
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:21834
+#: doc/guix.texi:21879
 #, no-wrap
 msgid "package description"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:21835
+#: doc/guix.texi:21880
 #, no-wrap
 msgid "package synopsis"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21842
+#: doc/guix.texi:21887
 msgid ""
 "As we have seen before, each package in GNU@tie{}Guix includes a synopsis "
 "and a description (@pxref{Defining Packages}).  Synopses and descriptions "
@@ -45614,7 +46370,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21850
+#: doc/guix.texi:21895
 msgid ""
 "Synopses must start with a capital letter and must not end with a period.  "
 "They must not start with ``a'' or ``the'', which usually does not bring "
@@ -45625,7 +46381,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21860
+#: doc/guix.texi:21905
 msgid ""
 "Keep in mind that the synopsis must be meaningful for a very wide audience.  "
 "For example, ``Manipulate alignments in the SAM format'' might make sense "
@@ -45638,47 +46394,46 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21868
+#: doc/guix.texi:21913
 msgid ""
 "Descriptions should take between five and ten lines.  Use full sentences, "
 "and avoid using acronyms without first introducing them.  Please avoid "
 "marketing phrases such as ``world-leading'', ``industrial-strength'', and "
-"``next-generation'', and avoid superlatives like ``the most "
-"advanced''---they are not helpful to users looking for a package and may "
-"even sound suspicious.  Instead, try to be factual, mentioning use cases and "
-"features."
+"``next-generation'', and avoid superlatives like ``the most advanced''---"
+"they are not helpful to users looking for a package and may even sound "
+"suspicious.  Instead, try to be factual, mentioning use cases and features."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:21869
+#: doc/guix.texi:21914
 #, no-wrap
 msgid "Texinfo markup, in package descriptions"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21878
+#: doc/guix.texi:21923
 msgid ""
 "Descriptions can include Texinfo markup, which is useful to introduce "
 "ornaments such as @code{@@code} or @code{@@dfn}, bullet lists, or hyperlinks "
 "(@pxref{Overview,,, texinfo, GNU Texinfo}).  However you should be careful "
 "when using some characters for example @samp{@@} and curly braces which are "
 "the basic special characters in Texinfo (@pxref{Special Characters,,, "
-"texinfo, GNU Texinfo}).  User interfaces such as @command{guix package "
-"--show} take care of rendering it appropriately."
+"texinfo, GNU Texinfo}).  User interfaces such as @command{guix package --"
+"show} take care of rendering it appropriately."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21884
+#: doc/guix.texi:21929
 msgid ""
-"Synopses and descriptions are translated by volunteers "
-"@uref{http://translationproject.org/domain/guix-packages.html, at the "
-"Translation Project} so that as many users as possible can read them in "
-"their native language.  User interfaces search them and display them in the "
-"language specified by the current locale."
+"Synopses and descriptions are translated by volunteers @uref{http://"
+"translationproject.org/domain/guix-packages.html, at the Translation "
+"Project} so that as many users as possible can read them in their native "
+"language.  User interfaces search them and display them in the language "
+"specified by the current locale."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21889
+#: doc/guix.texi:21934
 msgid ""
 "To allow @command{xgettext} to extract them as translatable strings, "
 "synopses and descriptions @emph{must be literal strings}.  This means that "
@@ -45687,7 +46442,7 @@ msgid ""
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:21895
+#: doc/guix.texi:21940
 #, no-wrap
 msgid ""
 "(package\n"
@@ -45697,7 +46452,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21903
+#: doc/guix.texi:21948
 msgid ""
 "Translation is a lot of work so, as a packager, please pay even more "
 "attention to your synopses and descriptions as every change may entail "
@@ -45707,7 +46462,7 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:21908
+#: doc/guix.texi:21953
 #, no-wrap
 msgid ""
 ";; TRANSLATORS: \"X11 resize-and-rotate\" should not be translated.\n"
@@ -45716,13 +46471,13 @@ msgid ""
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:21914
+#: doc/guix.texi:21959
 #, no-wrap
 msgid "python"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21920
+#: doc/guix.texi:21965
 msgid ""
 "We currently package Python 2 and Python 3, under the Scheme variable names "
 "@code{python-2} and @code{python} as explained in @ref{Version Numbers}.  To "
@@ -45732,7 +46487,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21926
+#: doc/guix.texi:21971
 msgid ""
 "Some modules are compatible with only one version of Python, others with "
 "both.  If the package Foo compiles only with Python 3, we name it "
@@ -45742,7 +46497,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21932
+#: doc/guix.texi:21977
 msgid ""
 "If a project already contains the word @code{python}, we drop this; for "
 "instance, the module python-dateutil is packaged under the names "
@@ -45752,27 +46507,27 @@ msgid ""
 msgstr ""
 
 #. type: subsubsection
-#: doc/guix.texi:21933
+#: doc/guix.texi:21978
 #, no-wrap
 msgid "Specifying Dependencies"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:21934
+#: doc/guix.texi:21979
 #, no-wrap
 msgid "inputs, for Python packages"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21939
+#: doc/guix.texi:21984
 msgid ""
 "Dependency information for Python packages is usually available in the "
-"package source tree, with varying degrees of accuracy: in the "
-"@file{setup.py} file, in @file{requirements.txt}, or in @file{tox.ini}."
+"package source tree, with varying degrees of accuracy: in the @file{setup."
+"py} file, in @file{requirements.txt}, or in @file{tox.ini}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21945
+#: doc/guix.texi:21990
 msgid ""
 "Your mission, when writing a recipe for a Python package, is to map these "
 "dependencies to the appropriate type of ``input'' (@pxref{package Reference, "
@@ -45782,7 +46537,7 @@ msgid ""
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:21953
+#: doc/guix.texi:21998
 msgid ""
 "We currently package Python 2 with @code{setuptools} and @code{pip} "
 "installed like Python 3.4 has per default.  Thus you don't need to specify "
@@ -45790,7 +46545,7 @@ msgid ""
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:21959
+#: doc/guix.texi:22004
 msgid ""
 "Python dependencies required at run time go into @code{propagated-inputs}.  "
 "They are typically defined with the @code{install_requires} keyword in "
@@ -45798,26 +46553,26 @@ msgid ""
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:21967
+#: doc/guix.texi:22012
 msgid ""
 "Python packages required only at build time---e.g., those listed with the "
-"@code{setup_requires} keyword in @file{setup.py}---or only for "
-"testing---e.g., those in @code{tests_require}---go into "
-"@code{native-inputs}.  The rationale is that (1) they do not need to be "
-"propagated because they are not needed at run time, and (2) in a "
-"cross-compilation context, it's the ``native'' input that we'd want."
+"@code{setup_requires} keyword in @file{setup.py}---or only for testing---e."
+"g., those in @code{tests_require}---go into @code{native-inputs}.  The "
+"rationale is that (1) they do not need to be propagated because they are not "
+"needed at run time, and (2) in a cross-compilation context, it's the "
+"``native'' input that we'd want."
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:21971
+#: doc/guix.texi:22016
 msgid ""
 "Examples are the @code{pytest}, @code{mock}, and @code{nose} test "
-"frameworks.  Of course if any of these packages is also required at "
-"run-time, it needs to go to @code{propagated-inputs}."
+"frameworks.  Of course if any of these packages is also required at run-"
+"time, it needs to go to @code{propagated-inputs}."
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:21976
+#: doc/guix.texi:22021
 msgid ""
 "Anything that does not fall in the previous categories goes to "
 "@code{inputs}, for example programs or C libraries required for building "
@@ -45825,21 +46580,21 @@ msgid ""
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:21982
+#: doc/guix.texi:22027
 msgid ""
 "If a Python package has optional dependencies (@code{extras_require}), it is "
-"up to you to decide whether to add them or not, based on their "
-"usefulness/overhead ratio (@pxref{Submitting Patches, @command{guix size}})."
+"up to you to decide whether to add them or not, based on their usefulness/"
+"overhead ratio (@pxref{Submitting Patches, @command{guix size}})."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:21989
+#: doc/guix.texi:22034
 #, no-wrap
 msgid "perl"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:22000
+#: doc/guix.texi:22045
 msgid ""
 "Perl programs standing for themselves are named as any other package, using "
 "the lowercase upstream name.  For Perl packages containing a single class, "
@@ -45853,20 +46608,20 @@ msgid ""
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:22005
+#: doc/guix.texi:22050
 #, no-wrap
 msgid "java"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:22008
+#: doc/guix.texi:22053
 msgid ""
 "Java programs standing for themselves are named as any other package, using "
 "the lowercase upstream name."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:22014
+#: doc/guix.texi:22059
 msgid ""
 "To avoid confusion and naming clashes with other programming languages, it "
 "is desirable that the name of a package for a Java package is prefixed with "
@@ -45876,7 +46631,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:22020
+#: doc/guix.texi:22065
 msgid ""
 "For Java packages containing a single class or a small class hierarchy, we "
 "use the lowercase class name, replace all occurrences of @code{.} by dashes "
@@ -45885,7 +46640,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:22031
+#: doc/guix.texi:22076
 msgid ""
 "For fonts that are in general not installed by a user for typesetting "
 "purposes, or that are distributed as part of a larger software package, we "
@@ -45895,7 +46650,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:22035
+#: doc/guix.texi:22080
 msgid ""
 "To make it easier for a user to search for fonts, names for other packages "
 "containing only fonts are constructed as follows, independently of the "
@@ -45903,7 +46658,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:22043
+#: doc/guix.texi:22088
 msgid ""
 "The name of a package containing only one font family starts with "
 "@code{font-}; it is followed by the foundry name and a dash @code{-} if the "
@@ -45914,35 +46669,34 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:22052
+#: doc/guix.texi:22097
 msgid ""
 "For a package containing several font families, the name of the collection "
 "is used in the place of the font family name.  For instance, the Liberation "
 "fonts consist of three families, Liberation Sans, Liberation Serif and "
 "Liberation Mono.  These could be packaged separately under the names "
 "@code{font-liberation-sans} and so on; but as they are distributed together "
-"under a common name, we prefer to package them together as "
-"@code{font-liberation}."
+"under a common name, we prefer to package them together as @code{font-"
+"liberation}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:22058
+#: doc/guix.texi:22103
 msgid ""
 "In the case where several formats of the same font family or font collection "
 "are packaged separately, a short form of the format, prepended by a dash, is "
-"added to the package name.  We use @code{-ttf} for TrueType fonts, "
-"@code{-otf} for OpenType fonts and @code{-type1} for PostScript Type 1 "
-"fonts."
+"added to the package name.  We use @code{-ttf} for TrueType fonts, @code{-"
+"otf} for OpenType fonts and @code{-type1} for PostScript Type 1 fonts."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:22066
+#: doc/guix.texi:22111
 #, no-wrap
 msgid "bootstrapping"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:22076
+#: doc/guix.texi:22121
 msgid ""
 "Bootstrapping in our context refers to how the distribution gets built "
 "``from nothing''.  Remember that the build environment of a derivation "
@@ -45954,18 +46708,18 @@ msgid ""
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:22077 doc/guix.texi:22199
+#: doc/guix.texi:22122 doc/guix.texi:22244
 #, no-wrap
 msgid "bootstrap binaries"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:22087
+#: doc/guix.texi:22132
 msgid ""
 "The GNU system is primarily made of C code, with libc at its core.  The GNU "
-"build system itself assumes the availability of a Bourne shell and "
-"command-line tools provided by GNU Coreutils, Awk, Findutils, `sed', and "
-"`grep'.  Furthermore, build programs---programs that run @code{./configure}, "
+"build system itself assumes the availability of a Bourne shell and command-"
+"line tools provided by GNU Coreutils, Awk, Findutils, `sed', and `grep'.  "
+"Furthermore, build programs---programs that run @code{./configure}, "
 "@code{make}, etc.---are written in Guile Scheme (@pxref{Derivations}).  "
 "Consequently, to be able to build anything at all, from scratch, Guix relies "
 "on pre-built binaries of Guile, GCC, Binutils, libc, and the other packages "
@@ -45973,27 +46727,27 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:22090
+#: doc/guix.texi:22135
 msgid ""
-"These bootstrap binaries are ``taken for granted'', though we can also "
-"re-create them if needed (more on that later)."
+"These bootstrap binaries are ``taken for granted'', though we can also re-"
+"create them if needed (more on that later)."
 msgstr ""
 
 #. type: unnumberedsubsec
-#: doc/guix.texi:22091
+#: doc/guix.texi:22136
 #, no-wrap
 msgid "Preparing to Use the Bootstrap Binaries"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:22096
+#: doc/guix.texi:22141
 msgid ""
 "@image{images/bootstrap-graph,6in,,Dependency graph of the early bootstrap "
 "derivations}"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:22101
+#: doc/guix.texi:22146
 msgid ""
 "The figure above shows the very beginning of the dependency graph of the "
 "distribution, corresponding to the package definitions of the @code{(gnu "
@@ -46002,7 +46756,7 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:22106
+#: doc/guix.texi:22151
 #, no-wrap
 msgid ""
 "guix graph -t derivation \\\n"
@@ -46011,7 +46765,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:22115
+#: doc/guix.texi:22160
 msgid ""
 "At this level of detail, things are slightly complex.  First, Guile itself "
 "consists of an ELF executable, along with many source and compiled Scheme "
@@ -46022,7 +46776,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:22124
+#: doc/guix.texi:22169
 msgid ""
 "But how do we write a derivation that unpacks this tarball and adds it to "
 "the store? To solve this problem, the @code{guile-bootstrap-2.0.drv} "
@@ -46035,36 +46789,36 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:22136
+#: doc/guix.texi:22181
 msgid ""
 "Once @code{guile-bootstrap-2.0.drv} is built, we have a functioning Guile "
 "that can be used to run subsequent build programs.  Its first task is to "
 "download tarballs containing the other pre-built binaries---this is what the "
-"@code{.tar.xz.drv} derivations do.  Guix modules such as "
-"@code{ftp-client.scm} are used for this purpose.  The "
-"@code{module-import.drv} derivations import those modules in a directory in "
-"the store, using the original layout.  The @code{module-import-compiled.drv} "
-"derivations compile those modules, and write them in an output directory "
-"with the right layout.  This corresponds to the @code{#:modules} argument of "
-"@code{build-expression->derivation} (@pxref{Derivations})."
+"@code{.tar.xz.drv} derivations do.  Guix modules such as @code{ftp-client."
+"scm} are used for this purpose.  The @code{module-import.drv} derivations "
+"import those modules in a directory in the store, using the original "
+"layout.  The @code{module-import-compiled.drv} derivations compile those "
+"modules, and write them in an output directory with the right layout.  This "
+"corresponds to the @code{#:modules} argument of @code{build-expression-"
+">derivation} (@pxref{Derivations})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:22140
+#: doc/guix.texi:22185
 msgid ""
-"Finally, the various tarballs are unpacked by the derivations "
-"@code{gcc-bootstrap-0.drv}, @code{glibc-bootstrap-0.drv}, etc., at which "
-"point we have a working C tool chain."
+"Finally, the various tarballs are unpacked by the derivations @code{gcc-"
+"bootstrap-0.drv}, @code{glibc-bootstrap-0.drv}, etc., at which point we have "
+"a working C tool chain."
 msgstr ""
 
 #. type: unnumberedsubsec
-#: doc/guix.texi:22142
+#: doc/guix.texi:22187
 #, no-wrap
 msgid "Building the Build Tools"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:22151
+#: doc/guix.texi:22196
 msgid ""
 "Bootstrapping is complete when we have a full tool chain that does not "
 "depend on the pre-built bootstrap tools discussed above.  This no-dependency "
@@ -46076,7 +46830,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:22158
+#: doc/guix.texi:22203
 msgid ""
 "The @command{guix graph} command allows us to ``zoom out'' compared to the "
 "graph above, by looking at the level of package objects instead of "
@@ -46087,7 +46841,7 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:22163
+#: doc/guix.texi:22208
 #, no-wrap
 msgid ""
 "guix graph -t bag \\\n"
@@ -46096,7 +46850,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:22170
+#: doc/guix.texi:22215
 msgid ""
 "produces the dependency graph leading to the ``final'' C "
 "library@footnote{You may notice the @code{glibc-intermediate} label, "
@@ -46105,31 +46859,30 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:22172
+#: doc/guix.texi:22217
 msgid ""
-"@image{images/bootstrap-packages,6in,,Dependency graph of the early "
-"packages}"
+"@image{images/bootstrap-packages,6in,,Dependency graph of the early packages}"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:22178
+#: doc/guix.texi:22223
 msgid ""
-"The first tool that gets built with the bootstrap binaries is "
-"GNU@tie{}Make---noted @code{make-boot0} above---which is a prerequisite for "
-"all the following packages.  From there Findutils and Diffutils get built."
+"The first tool that gets built with the bootstrap binaries is GNU@tie{}"
+"Make---noted @code{make-boot0} above---which is a prerequisite for all the "
+"following packages.  From there Findutils and Diffutils get built."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:22183
+#: doc/guix.texi:22228
 msgid ""
-"Then come the first-stage Binutils and GCC, built as pseudo cross "
-"tools---i.e., with @code{--target} equal to @code{--host}.  They are used to "
-"build libc.  Thanks to this cross-build trick, this libc is guaranteed not "
-"to hold any reference to the initial tool chain."
+"Then come the first-stage Binutils and GCC, built as pseudo cross tools---i."
+"e., with @code{--target} equal to @code{--host}.  They are used to build "
+"libc.  Thanks to this cross-build trick, this libc is guaranteed not to hold "
+"any reference to the initial tool chain."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:22189
+#: doc/guix.texi:22234
 msgid ""
 "From there the final Binutils and GCC (not shown above) are built.  GCC uses "
 "@code{ld} from the final Binutils, and links programs against the just-built "
@@ -46138,7 +46891,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:22195
+#: doc/guix.texi:22240
 msgid ""
 "And voilà! At this point we have the complete set of build tools that the "
 "GNU Build System expects.  These are in the @code{%final-inputs} variable of "
@@ -46148,13 +46901,13 @@ msgid ""
 msgstr ""
 
 #. type: unnumberedsubsec
-#: doc/guix.texi:22197
+#: doc/guix.texi:22242
 #, no-wrap
 msgid "Building the Bootstrap Binaries"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:22204
+#: doc/guix.texi:22249
 msgid ""
 "Because the final tool chain does not depend on the bootstrap binaries, "
 "those rarely need to be updated.  Nevertheless, it is useful to have an "
@@ -46163,7 +46916,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:22208
+#: doc/guix.texi:22253
 msgid ""
 "The following command builds the tarballs containing the bootstrap binaries "
 "(Guile, Binutils, GCC, libc, and a tarball containing a mixture of Coreutils "
@@ -46171,13 +46924,13 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:22211
+#: doc/guix.texi:22256
 #, no-wrap
 msgid "guix build bootstrap-tarballs\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:22216
+#: doc/guix.texi:22261
 msgid ""
 "The generated tarballs are those that should be referred to in the "
 "@code{(gnu packages bootstrap)} module mentioned at the beginning of this "
@@ -46185,7 +46938,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:22222
+#: doc/guix.texi:22267
 msgid ""
 "Still here? Then perhaps by now you've started to wonder: when do we reach a "
 "fixed point? That is an interesting question! The answer is unknown, but if "
@@ -46194,13 +46947,13 @@ msgid ""
 msgstr ""
 
 #. type: unnumberedsubsec
-#: doc/guix.texi:22223
+#: doc/guix.texi:22268
 #, no-wrap
 msgid "Reducing the Set of Bootstrap Binaries"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:22231
+#: doc/guix.texi:22276
 msgid ""
 "Our bootstrap binaries currently include GCC, Guile, etc.  That's a lot of "
 "binary code! Why is that a problem? It's a problem because these big chunks "
@@ -46211,7 +46964,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:22237
+#: doc/guix.texi:22282
 msgid ""
 "This is mitigated by the fact that our bootstrap binaries were generated "
 "from an earlier Guix revision.  Nevertheless it lacks the level of "
@@ -46221,35 +46974,35 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:22243
+#: doc/guix.texi:22288
 msgid ""
-"The @uref{http://bootstrappable.org, Bootstrappable.org web site} lists "
-"on-going projects to do that.  One of these is about replacing the bootstrap "
+"The @uref{http://bootstrappable.org, Bootstrappable.org web site} lists on-"
+"going projects to do that.  One of these is about replacing the bootstrap "
 "GCC with a sequence of assemblers, interpreters, and compilers of increasing "
 "complexity, which could be built from source starting from a simple and "
 "auditable assembler.  Your help is welcome!"
 msgstr ""
 
 #. type: section
-#: doc/guix.texi:22246
+#: doc/guix.texi:22291
 #, no-wrap
 msgid "Porting to a New Platform"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:22255
+#: doc/guix.texi:22300
 msgid ""
-"As discussed above, the GNU distribution is self-contained, and "
-"self-containment is achieved by relying on pre-built ``bootstrap binaries'' "
-"(@pxref{Bootstrapping}).  These binaries are specific to an operating system "
-"kernel, CPU architecture, and application binary interface (ABI).  Thus, to "
-"port the distribution to a platform that is not yet supported, one must "
-"build those bootstrap binaries, and update the @code{(gnu packages "
-"bootstrap)} module to use them on that platform."
+"As discussed above, the GNU distribution is self-contained, and self-"
+"containment is achieved by relying on pre-built ``bootstrap "
+"binaries'' (@pxref{Bootstrapping}).  These binaries are specific to an "
+"operating system kernel, CPU architecture, and application binary interface "
+"(ABI).  Thus, to port the distribution to a platform that is not yet "
+"supported, one must build those bootstrap binaries, and update the "
+"@code{(gnu packages bootstrap)} module to use them on that platform."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:22260
+#: doc/guix.texi:22305
 msgid ""
 "Fortunately, Guix can @emph{cross compile} those bootstrap binaries.  When "
 "everything goes well, and assuming the GNU tool chain supports the target "
@@ -46257,23 +47010,23 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:22263
+#: doc/guix.texi:22308
 #, no-wrap
 msgid "guix build --target=armv5tel-linux-gnueabi bootstrap-tarballs\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:22270
+#: doc/guix.texi:22315
 msgid ""
 "For this to work, the @code{glibc-dynamic-linker} procedure in @code{(gnu "
 "packages bootstrap)} must be augmented to return the right file name for "
-"libc's dynamic linker on that platform; likewise, "
-"@code{system->linux-architecture} in @code{(gnu packages linux)} must be "
-"taught about the new platform."
+"libc's dynamic linker on that platform; likewise, @code{system->linux-"
+"architecture} in @code{(gnu packages linux)} must be taught about the new "
+"platform."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:22279
+#: doc/guix.texi:22324
 msgid ""
 "Once these are built, the @code{(gnu packages bootstrap)} module needs to be "
 "updated to refer to these binaries on the target platform.  That is, the "
@@ -46285,7 +47038,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:22288
+#: doc/guix.texi:22333
 msgid ""
 "In practice, there may be some complications.  First, it may be that the "
 "extended GNU triplet that specifies an ABI (like the @code{eabi} suffix "
@@ -46297,13 +47050,13 @@ msgid ""
 msgstr ""
 
 #. type: include
-#: doc/guix.texi:22290
+#: doc/guix.texi:22335
 #, no-wrap
 msgid "contributing.texi"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:22303
+#: doc/guix.texi:22348
 msgid ""
 "Guix is based on the @uref{http://nixos.org/nix/, Nix package manager}, "
 "which was designed and implemented by Eelco Dolstra, with contributions from "
@@ -46315,14 +47068,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:22306
+#: doc/guix.texi:22351
 msgid ""
 "The Nix-based software distributions, Nixpkgs and NixOS, have also been an "
 "inspiration for Guix."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:22312
+#: doc/guix.texi:22357
 msgid ""
 "GNU@tie{}Guix itself is a collective work with contributions from a number "
 "of people.  See the @file{AUTHORS} file in Guix for more information on "
@@ -46332,13 +47085,13 @@ msgid ""
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:22317
+#: doc/guix.texi:22362
 #, no-wrap
 msgid "license, GNU Free Documentation License"
 msgstr ""
 
 #. type: include
-#: doc/guix.texi:22318
+#: doc/guix.texi:22363
 #, no-wrap
 msgid "fdl-1.3.texi"
 msgstr ""
diff --git a/po/doc/local.mk b/po/doc/local.mk
index 4e1c28307b..ca588ea916 100644
--- a/po/doc/local.mk
+++ b/po/doc/local.mk
@@ -17,15 +17,15 @@
 # along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 EXTRA_DIST = \
-  %D%/contributing.fr.po \
-  %D%/guix.fr.po
+  %D%/guix-manual.pot \
+  %D%/guix-manual.fr.po
 
 POT_OPTIONS = --package-name "guix" --package-version "$(VERSION)" \
 	          --copyright-holder "Ludovic Courtès" \
 			  --msgid-bugs-address "ludo@gnu.org"
 
-$(srcdir)/po/doc/guix.%.po: $(srcdir)/po/doc/guix.pot
-	@lang=`echo $$(basename "$@") | sed -e 's|^guix.||' -e 's|.po$$||'` ;\
+$(srcdir)/po/doc/guix-manual.%.po: $(srcdir)/po/doc/guix-manual.pot
+	@lang=`echo $$(basename "$@") | sed -e 's|^guix-manual.||' -e 's|.po$$||'` ;\
 	if test -f "$@"; then \
 	  test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
 	  echo "$${cdcmd}$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $@ $<"; \
@@ -43,35 +43,17 @@ $(srcdir)/po/doc/guix.%.po: $(srcdir)/po/doc/guix.pot
 	     exit 1; \
 	fi
 
-$(srcdir)/po/doc/contributing.%.po: $(srcdir)/po/doc/contributing.pot
-	@lang=`echo $$(basename "$@") | sed -e 's|^contributing.||' -e 's|.po$$||'` ;\
-	if test -f "$@"; then \
-	  test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
-	  echo "$${cdcmd}$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $@ $<"; \
-	  cd $(srcdir) \
-	    && { case `$(MSGMERGE_UPDATE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
-	        '' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \
-	          $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) $@ $<;; \
-	        *) \
-	          $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $@ $<;; \
-	      esac; \
-	    }; \
-	  touch "$@"; \
-	else \
-	     echo "File $@ does not exist. If you are a translator, you can create it through 'msginit'." 1>&2; \
-	     exit 1; \
-	fi
-
-$(srcdir)/po/doc/contributing.pot-update: doc/contributing.texi
+$(srcdir)/po/doc/%.pot-update: doc/%.texi
 	$(AM_V_PO4A)$(PO4A_UPDATEPO) -M UTF-8 -f texinfo -m "$<" \
 		-p "$$(echo $@ | sed 's|-update||')" $(POT_OPTIONS)
 	@touch "$$(echo $@ | sed 's|-update||')"
 
-$(srcdir)/po/doc/guix.pot-update: doc/guix.texi
-	$(AM_V_PO4A)$(PO4A_UPDATEPO) -M UTF-8 -f texinfo -m "$<" \
-		-p "$$(echo $@ | sed 's|-update||')" $(POT_OPTIONS)
-	@touch "$$(echo $@ | sed 's|-update||')"
+TMP_POT_FILES=contributing.pot guix.pot
 
 doc-pot-update:
-	$(MAKE) $(srcdir)/po/doc/guix.pot-update
-	$(MAKE) $(srcdir)/po/doc/contributing.pot-update
+	for f in $(TMP_POT_FILES); do \
+		$(MAKE) $(srcdir)/po/doc/guix.pot-update; \
+		$(MAKE) $(srcdir)/po/doc/contributing.pot-update; \
+	done
+	msgcat $(addprefix $(srcdir)/po/doc/, $(TMP_POT_FILES)) > $(srcdir)/po/doc/guix-manual.pot
+	rm -f $(addprefix $(srcdir)/po/doc/, $(TMP_POT_FILES))

From 50d70a727b93e5b348ddb5fa597f411da277e35d Mon Sep 17 00:00:00 2001
From: Julien Lepiller <julien@lepiller.eu>
Date: Tue, 13 Mar 2018 22:19:17 +0100
Subject: [PATCH 261/275] gnu: Add java-bouncycastle.

* gnu/packages/java.scm (java-bouncycastle): New variable.
(java-bouncycastle-bcprov, java-bouncycastle-bcpkix): Remove variable.
(java-kafka-clients)[inputs]: Use java-bouncycastle.
---
 gnu/packages/java.scm | 83 ++++++++++++++++---------------------------
 1 file changed, 31 insertions(+), 52 deletions(-)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 500f27dcf2..132671dc70 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -8145,70 +8145,50 @@ by technical operatives or consultants working with enterprise platforms.")
 algorithms and xxHash hashing algorithm.")
     (license license:asl2.0)))
 
-(define-public java-bouncycastle-bcprov
+(define-public java-bouncycastle
   (package
-    (name "java-bouncycastle-bcprov")
-    (version "1.58")
+    (name "java-bouncycastle")
+    (version "1.59")
     (source (origin
               (method url-fetch)
-              (uri "https://bouncycastle.org/download/bcprov-jdk15on-158.tar.gz")
+              (uri (string-append "https://github.com/bcgit/bc-java/archive/r"
+                                  (substring version 0 1) "rv"
+                                  (substring version 2 4) ".tar.gz"))
               (sha256
                (base32
-                "1hgkg96llbvgs8i0krwz2n0j7wlg6jfnq8w8kg0cc899j0wfmf3n"))))
+                "1bwl499whlbq896w18idqw2dkp8v0wp0npv9g71i5fgf8xjh0k3q"))
+              (modules '((guix build utils)))
+              (snippet
+               '(begin
+                  (for-each delete-file
+                            (find-files "." "\\.jar$"))
+                  #t))))
     (build-system ant-build-system)
     (arguments
-     `(#:jar-name "bouncycastle-bcprov.jar"
-       #:tests? #f; no tests
-       #:source-dir "src"
+     `(#:jdk ,icedtea-8
        #:phases
        (modify-phases %standard-phases
-         (add-before 'configure 'unzip-src
+         (replace 'build
            (lambda _
-             (mkdir-p "src")
-             (with-directory-excursion "src"
-               (invoke "unzip" "../src.zip"))
-             #t)))))
-    (native-inputs
-     `(("unzip" ,unzip)
-       ("junit" ,java-junit)))
-    (home-page "https://www.bouncycastle.org")
-    (synopsis "Cryptographic library")
-    (description "Bouncy Castle Provider (bcprov) is a cryptographic library
-for the Java programming language.")
-    (license license:expat)))
-
-(define-public java-bouncycastle-bcpkix
-  (package
-    (name "java-bouncycastle-bcpkix")
-    (version "1.58")
-    (source (origin
-              (method url-fetch)
-              (uri "https://bouncycastle.org/download/bcpkix-jdk15on-158.tar.gz")
-              (sha256
-               (base32
-                "0is7qay02803s9f7lhnfcjlz61ni3hq5d7apg0iil7nbqkbfbcq2"))))
-    (build-system ant-build-system)
-    (arguments
-     `(#:jar-name "bouncycastle-bcpkix.jar"
-       #:tests? #f; no tests
-       #:source-dir "src"
-       #:phases
-       (modify-phases %standard-phases
-         (add-before 'configure 'unzip-src
+             (invoke "ant" "-f" "ant/jdk15+.xml" "build-provider")
+             (invoke "ant" "-f" "ant/jdk15+.xml" "build")
+             #t))
+         (replace 'check
            (lambda _
-             (mkdir-p "src")
-             (with-directory-excursion "src"
-               (invoke "unzip" "../src.zip"))
-             #t)))))
-    (native-inputs
-     `(("unzip" ,unzip)
-       ("junit" ,java-junit)))
+             (invoke "ant" "-f" "ant/jdk15+.xml" "test")))
+         (replace 'install
+           (install-jars "build/artifacts/jdk1.5/jars")))))
     (inputs
-     `(("bcprov" ,java-bouncycastle-bcprov)))
+     `(("java-javax-mail" ,java-javax-mail)))
+    (native-inputs
+     `(("unzip" ,unzip)
+       ("junit" ,java-junit)
+       ("java-native-access" ,java-native-access)
+       ("java-native-access-platform" ,java-native-access-platform)))
     (home-page "https://www.bouncycastle.org")
     (synopsis "Cryptographic library")
-    (description "Bouncy Castle Java API for PKIX, CMS, EAC, TSP, PKCS, OCSP,
-CMP, and CRMF.")
+    (description "Bouncy Castle is a cryptographic library for the Java
+programming language.")
     (license license:expat)))
 
 (define-public java-lmax-disruptor
@@ -8631,8 +8611,7 @@ protocol-independent framework to build mail and messaging applications.")
        ("powermock-junit4-common" ,java-powermock-modules-junit4-common)
        ("powermock-junit4" ,java-powermock-modules-junit4)
        ("powermock-support" ,java-powermock-api-support)
-       ("bouncycastle" ,java-bouncycastle-bcprov)
-       ("bouncycastle-bcpkix" ,java-bouncycastle-bcpkix)))
+       ("java-bouncycastle" ,java-bouncycastle)))
     (home-page "https://kafka.apache.org")
     (synopsis "Distributed streaming platform")
     (description "Kafka is a distributed streaming platform, which means:

From 470674a541ffaf25022e371a3bbd6361f7329cff Mon Sep 17 00:00:00 2001
From: Julien Lepiller <julien@lepiller.eu>
Date: Thu, 5 Apr 2018 19:54:02 +0200
Subject: [PATCH 262/275] gnu: Add java-jsch-agentproxy-core.

* gnu/packages/java.scm (java-jsch-agentproxy-core): New variable.
---
 gnu/packages/java.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 132671dc70..b32134daf7 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -9584,3 +9584,27 @@ Java method invocation.")
 and mappings for a number of commonly used platform functions, including a
 large number of Win32 mappings as well as a set of utility classes that
 simplify native access.")))
+
+(define-public java-jsch-agentproxy-core
+  (package
+    (name "java-jsch-agentproxy-core")
+    (version "0.0.8")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://github.com/ymnk/jsch-agent-proxy/archive/"
+                                  version ".tar.gz"))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "02iqg6jbc1kxvfzqcg6wy9ygqxfm82bw5rf6vnswqy4y572niz4q"))))
+    (build-system ant-build-system)
+    (arguments
+     `(#:jar-name "jsch-agentproxy-core.jar"
+       #:source-dir "jsch-agent-proxy-core/src/main/java"
+       #:tests? #f)); no tests
+    (home-page "https://github.com/ymnk/jsch-agent-proxy")
+    (synopsis "Proxy to ssh-agent and Pageant in Java")
+    (description "jsch-agent-proxy is a proxy program to OpenSSH's ssh-agent
+and Pageant included Putty.  It will be easily integrated into JSch, and users
+will be allowed to use these programs for authentication.")
+    (license license:bsd-3)))

From f1d79c97bec792e9e08d61f1a8308e453cc9b337 Mon Sep 17 00:00:00 2001
From: Julien Lepiller <julien@lepiller.eu>
Date: Wed, 18 Apr 2018 17:00:30 +0200
Subject: [PATCH 263/275] gnu: Add java-jsch-agentproxy-sshagent.

* gnu/packages/java.scm (java-jsch-agentproxy-sshagent): New variable.
---
 gnu/packages/java.scm | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index b32134daf7..1ed965d3dc 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -9603,8 +9603,23 @@ simplify native access.")))
        #:source-dir "jsch-agent-proxy-core/src/main/java"
        #:tests? #f)); no tests
     (home-page "https://github.com/ymnk/jsch-agent-proxy")
-    (synopsis "Proxy to ssh-agent and Pageant in Java")
+    (synopsis "Core component of the proxy to ssh-agent and Pageant in Java")
     (description "jsch-agent-proxy is a proxy program to OpenSSH's ssh-agent
 and Pageant included Putty.  It will be easily integrated into JSch, and users
 will be allowed to use these programs for authentication.")
     (license license:bsd-3)))
+
+(define-public java-jsch-agentproxy-sshagent
+  (package
+    (inherit java-jsch-agentproxy-core)
+    (name "java-jsch-agentproxy-sshagent")
+    (arguments
+     `(#:jar-name "jsch-agentproxy-sshagent.jar"
+       #:source-dir "jsch-agent-proxy-sshagent/src/main/java"
+       #:tests? #f)); no tests
+    (inputs
+     `(("java-jsch-agentproxy-core" ,java-jsch-agentproxy-core)))
+    (synopsis "Proxy to ssh-agent")
+    (description "jsch-agent-proxy is a proxy program to OpenSSH's ssh-agent
+and Pageant included in Putty. This component contains the code for a proxy to
+ssh-agent.")))

From f438e63835390b0cd72f603763d0872ddf518f3e Mon Sep 17 00:00:00 2001
From: Julien Lepiller <julien@lepiller.eu>
Date: Wed, 18 Apr 2018 17:02:49 +0200
Subject: [PATCH 264/275] gnu: Add java-jsch-agentproxy-usocket-jna.

* gnu/packages/java.scm (java-jsch-agentproxy-usocket-jna): New
variable.
---
 gnu/packages/java.scm | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 1ed965d3dc..0b4656dff8 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -9623,3 +9623,19 @@ will be allowed to use these programs for authentication.")
     (description "jsch-agent-proxy is a proxy program to OpenSSH's ssh-agent
 and Pageant included in Putty. This component contains the code for a proxy to
 ssh-agent.")))
+
+(define-public java-jsch-agentproxy-usocket-jna
+  (package
+    (inherit java-jsch-agentproxy-core)
+    (name "java-jsch-agentproxy-usocket-jna")
+    (arguments
+     `(#:jar-name "jsch-agentproxy-usocket-jna.jar"
+       #:source-dir "jsch-agent-proxy-usocket-jna/src/main/java"
+       #:tests? #f)); no tests
+    (inputs
+     `(("java-jsch-agentproxy-core" ,java-jsch-agentproxy-core)
+       ("java-native-access" ,java-native-access)))
+    (synopsis "USocketFactory implementation using JNA")
+    (description "jsch-agent-proxy is a proxy program to OpenSSH's ssh-agent
+and Pageant included in Putty. This component contains an implementation of
+USocketFactory using @dfn{JNA} (Java Native Access).")))

From 475225e3064a4203595de0eacfc032f4fc6fb85b Mon Sep 17 00:00:00 2001
From: Julien Lepiller <julien@lepiller.eu>
Date: Wed, 18 Apr 2018 17:04:17 +0200
Subject: [PATCH 265/275] gnu: Add java-jsch-agentproxy-pageant.

* gnu/packages/java.scm (java-jsch-agentproxy-pageant): New variable.
---
 gnu/packages/java.scm | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 0b4656dff8..22d6f6fb04 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -9639,3 +9639,20 @@ ssh-agent.")))
     (description "jsch-agent-proxy is a proxy program to OpenSSH's ssh-agent
 and Pageant included in Putty. This component contains an implementation of
 USocketFactory using @dfn{JNA} (Java Native Access).")))
+
+(define-public java-jsch-agentproxy-pageant
+  (package
+    (inherit java-jsch-agentproxy-core)
+    (name "java-jsch-agentproxy-pageant")
+    (arguments
+     `(#:jar-name "jsch-agentproxy-pageant.jar"
+       #:source-dir "jsch-agent-proxy-pageant/src/main/java"
+       #:tests? #f)); no tests
+    (inputs
+     `(("java-jsch-agentproxy-core" ,java-jsch-agentproxy-core)
+       ("java-native-access" ,java-native-access)
+       ("java-native-access-platform" ,java-native-access-platform)))
+    (synopsis "Proxy to pageant")
+    (description "jsch-agent-proxy is a proxy program to OpenSSH's ssh-agent
+and Pageant included in Putty. This component contains the code for a proxy to
+pageant.")))

From 96d6d9c79749e5ad3e672ae6a4a470e312250923 Mon Sep 17 00:00:00 2001
From: Julien Lepiller <julien@lepiller.eu>
Date: Wed, 18 Apr 2018 17:05:39 +0200
Subject: [PATCH 266/275] gnu: Add java-jsch-agentproxy-usocket-nc.

* gnu/packages/java.scm (java-jsch-agentproxy-usocket-nc): New variable.
---
 gnu/packages/java.scm | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 22d6f6fb04..8d1f820d9c 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -9656,3 +9656,18 @@ USocketFactory using @dfn{JNA} (Java Native Access).")))
     (description "jsch-agent-proxy is a proxy program to OpenSSH's ssh-agent
 and Pageant included in Putty. This component contains the code for a proxy to
 pageant.")))
+
+(define-public java-jsch-agentproxy-usocket-nc
+  (package
+    (inherit java-jsch-agentproxy-core)
+    (name "java-jsch-agentproxy-usocket-nc")
+    (arguments
+     `(#:jar-name "jsch-agentproxy-usocket-nc.jar"
+       #:source-dir "jsch-agent-proxy-usocket-nc/src/main/java"
+       #:tests? #f)); no tests
+    (inputs
+     `(("java-jsch-agentproxy-core" ,java-jsch-agentproxy-core)))
+    (synopsis "USocketFactory implementation using netcat")
+    (description "jsch-agent-proxy is a proxy program to OpenSSH's ssh-agent
+and Pageant included in Putty. This component contains an implementation of
+USocketFactory using netcat.")))

From 5a46b17b129f1aed7c01d8a6c44199c2a27ab838 Mon Sep 17 00:00:00 2001
From: Julien Lepiller <julien@lepiller.eu>
Date: Wed, 18 Apr 2018 17:08:02 +0200
Subject: [PATCH 267/275] gnu: Add java-jsch-agentproxy-connector-factory.

* gnu/packages/java.scm (java-jsch-agentproxy-connector-factory): New
variable.
---
 gnu/packages/java.scm | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 8d1f820d9c..115d44ac6c 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -9671,3 +9671,21 @@ pageant.")))
     (description "jsch-agent-proxy is a proxy program to OpenSSH's ssh-agent
 and Pageant included in Putty. This component contains an implementation of
 USocketFactory using netcat.")))
+
+(define-public java-jsch-agentproxy-connector-factory
+  (package
+    (inherit java-jsch-agentproxy-core)
+    (name "java-jsch-agentproxy-connector-factory")
+    (arguments
+     `(#:jar-name "jsch-agentproxy-connector-factory.jar"
+       #:source-dir "jsch-agent-proxy-connector-factory/src/main/java"
+       #:tests? #f)); no tests
+    (inputs
+     `(("java-jsch-agentproxy-core" ,java-jsch-agentproxy-core)
+       ("java-jsch-agentproxy-sshagent" ,java-jsch-agentproxy-sshagent)
+       ("java-jsch-agentproxy-usocket-jna" ,java-jsch-agentproxy-usocket-jna)
+       ("java-jsch-agentproxy-pageant" ,java-jsch-agentproxy-pageant)
+       ("java-jsch-agentproxy-usocket-nc" ,java-jsch-agentproxy-usocket-nc)))
+    (synopsis "Connector factory for jsch agent proxy")
+    (description "jsch-agent-proxy is a proxy program to OpenSSH's ssh-agent
+and Pageant included in Putty. This component contains a connector factory.")))

From b0fbf59656442a44e18672a6b0ddfb9fb9c659a0 Mon Sep 17 00:00:00 2001
From: Julien Lepiller <julien@lepiller.eu>
Date: Wed, 18 Apr 2018 17:10:27 +0200
Subject: [PATCH 268/275] gnu: Add java-jsch-agentproxy-jsch.

* gnu/packages/java.scm (java-jsch-agentproxy-jsch): New variable.
---
 gnu/packages/java.scm | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 115d44ac6c..a63d9707fb 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -9689,3 +9689,19 @@ USocketFactory using netcat.")))
     (synopsis "Connector factory for jsch agent proxy")
     (description "jsch-agent-proxy is a proxy program to OpenSSH's ssh-agent
 and Pageant included in Putty. This component contains a connector factory.")))
+
+(define-public java-jsch-agentproxy-jsch
+  (package
+    (inherit java-jsch-agentproxy-core)
+    (name "java-jsch-agentproxy-jsch")
+    (arguments
+     `(#:jar-name "jsch-agentproxy-jsch.jar"
+       #:source-dir "jsch-agent-proxy-jsch/src/main/java"
+       #:tests? #f)); no tests
+    (inputs
+     `(("java-jsch" ,java-jsch)
+       ("java-jsch-agentproxy-core" ,java-jsch-agentproxy-core)))
+    (synopsis "JSch integration library for agentproxy")
+    (description "jsch-agent-proxy is a proxy program to OpenSSH's ssh-agent
+and Pageant included in Putty. This component contains a library to use
+jsch-agent-proxy with JSch.")))

From f1f4a4f016291509ed97034af0216573cdacf36c Mon Sep 17 00:00:00 2001
From: Julien Lepiller <julien@lepiller.eu>
Date: Wed, 18 Apr 2018 17:19:12 +0200
Subject: [PATCH 269/275] gnu: Add java-apache-ivy.

* gnu/package/java.scm (java-apache-ivy): New variable.
* gnu/packages/patches/java-apache-ivy-port-to-latest-bouncycastle.patch:
New file.
* gnu/local.mk (dist_patch_DATA): Add it.
---
 gnu/local.mk                                  |   1 +
 gnu/packages/java.scm                         | 101 ++++++++++++++++++
 ...ache-ivy-port-to-latest-bouncycastle.patch |  81 ++++++++++++++
 3 files changed, 183 insertions(+)
 create mode 100644 gnu/packages/patches/java-apache-ivy-port-to-latest-bouncycastle.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index cbf2c6f1b4..ec11b26632 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -792,6 +792,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/intltool-perl-compatibility.patch	\
   %D%/packages/patches/isl-0.11.1-aarch64-support.patch	\
   %D%/packages/patches/jacal-fix-texinfo.patch			\
+  %D%/packages/patches/java-apache-ivy-port-to-latest-bouncycastle.patch	\
   %D%/packages/patches/java-jeromq-fix-tests.patch		\
   %D%/packages/patches/java-powermock-fix-java-files.patch		\
   %D%/packages/patches/java-simple-xml-fix-tests.patch		\
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index a63d9707fb..90fd07c597 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -9705,3 +9705,104 @@ and Pageant included in Putty. This component contains a connector factory.")))
     (description "jsch-agent-proxy is a proxy program to OpenSSH's ssh-agent
 and Pageant included in Putty. This component contains a library to use
 jsch-agent-proxy with JSch.")))
+
+(define-public java-apache-ivy
+  (package
+    (name "java-apache-ivy")
+    (version "2.4.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://apache//ant/ivy/" version
+                                  "/apache-ivy-" version "-src.tar.gz"))
+              (sha256
+               (base32
+                "1xkfn57g2m7l6y0xdq75x5rnrgk52m9jx2xah70g3ggl8750hbr0"))
+              (patches
+                (search-patches
+                  "java-apache-ivy-port-to-latest-bouncycastle.patch"))))
+    (build-system ant-build-system)
+    (arguments
+     `(#:jar-name "ivy.jar"
+       #:tests? #f
+       #:phases
+       (modify-phases %standard-phases
+         (add-before 'build 'remove-example
+           (lambda _
+             (delete-file-recursively "src/example")
+             #t))
+         (add-before 'build 'copy-resources
+           (lambda _
+             (with-directory-excursion "src/java"
+               (for-each (lambda (file)
+                           (install-file file (string-append "../../build/classes/" (dirname file))))
+                 (append
+                   (find-files "." ".*.css")
+                   (find-files "." ".*.ent")
+                   (find-files "." ".*.html")
+                   (find-files "." ".*.properties")
+                   (find-files "." ".*.xsd")
+                   (find-files "." ".*.xsl")
+                   (find-files "." ".*.xml"))))))
+         (add-before 'build 'fix-vfs
+           (lambda _
+             (substitute*
+               '("src/java/org/apache/ivy/plugins/repository/vfs/VfsRepository.java"
+                 "src/java/org/apache/ivy/plugins/repository/vfs/VfsResource.java")
+               (("import org.apache.commons.vfs") "import org.apache.commons.vfs2"))
+             #t))
+         (add-before 'install 'copy-manifest
+           (lambda _
+             (install-file "META-INF/MANIFEST.MF" "build/classes/META-INF")
+             #t))
+         (add-before 'install 'repack
+           (lambda _
+             (invoke "jar" "-cmf" "build/classes/META-INF/MANIFEST.MF" "build/jar/ivy.jar"
+                     "-C" "build/classes" ".")
+             #t))
+         (add-after 'install 'install-bin
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((bin (string-append (assoc-ref outputs "out") "/bin"))
+                    (ivy (string-append bin "/ivy"))
+                    (jar (string-append (assoc-ref outputs "out") "/share/java/ivy.jar")))
+               (mkdir-p bin)
+               (with-output-to-file ivy
+                 (lambda _
+                   (display (string-append
+                              "#!" (which "sh") "\n"
+                              "if [[ -z $CLASSPATH ]]; then\n"
+                              "  cp=\"" (getenv "CLASSPATH") ":" jar "\"\n"
+                              "else\n"
+                              "  cp=\"" (getenv "CLASSPATH") ":" jar ":$CLASSPATH\"\n"
+                              "fi\n"
+                              (which "java") " -cp $cp org.apache.ivy.Main $@\n"))))
+               (chmod ivy #o755)
+               #t))))))
+    (inputs
+     `(("java-bouncycastle" ,java-bouncycastle)
+       ("java-commons-cli" ,java-commons-cli)
+       ("java-commons-collections" ,java-commons-collections)
+       ("java-commons-httpclient" ,java-commons-httpclient)
+       ("java-commons-lang" ,java-commons-lang)
+       ("java-commons-vfs" ,java-commons-vfs)
+       ("java-jakarta-oro" ,java-jakarta-oro)
+       ("java-jsch" ,java-jsch)
+       ("java-jsch-agentproxy-core" ,java-jsch-agentproxy-core)
+       ("java-jsch-agentproxy-connector-factory" ,java-jsch-agentproxy-connector-factory)
+       ("java-jsch-agentproxy-jsch" ,java-jsch-agentproxy-jsch)
+       ("java-junit" ,java-junit)))
+    (home-page "https://ant.apache.org/ivy")
+    (synopsis "Dependency manager for the Java programming language")
+    (description "Ivy is a tool for managing (recording, tracking, resolving
+and reporting) project dependencies.  It is characterized by the following:
+
+@itemize
+@item flexibility and configurability - Ivy is essentially process agnostic
+      and is not tied to any methodology or structure.  Instead it provides the
+      necessary flexibility and configurability to be adapted to a broad range
+      of dependency management and build processes.
+@item tight integration with Apache Ant - while available as a standalone tool,
+      Ivy works particularly well with Apache Ant providing a number of
+      powerful Ant tasks ranging from dependency resolution to dependency
+      reporting and publication.
+@end itemize")
+    (license license:asl2.0)))
diff --git a/gnu/packages/patches/java-apache-ivy-port-to-latest-bouncycastle.patch b/gnu/packages/patches/java-apache-ivy-port-to-latest-bouncycastle.patch
new file mode 100644
index 0000000000..506de833dd
--- /dev/null
+++ b/gnu/packages/patches/java-apache-ivy-port-to-latest-bouncycastle.patch
@@ -0,0 +1,81 @@
+From 29055a825af5405e44ffcd59a776f8952bdc7203 Mon Sep 17 00:00:00 2001
+From: Julien Lepiller <julien@lepiller.eu>
+Date: Fri, 15 Dec 2017 16:03:23 +0100
+Subject: [PATCH] Port to latest bouncycastle.
+
+---
+ .../bouncycastle/OpenPGPSignatureGenerator.java    | 34 ++++++++++------------
+ 1 file changed, 16 insertions(+), 18 deletions(-)
+
+diff --git a/src/java/org/apache/ivy/plugins/signer/bouncycastle/OpenPGPSignatureGenerator.java b/src/java/org/apache/ivy/plugins/signer/bouncycastle/OpenPGPSignatureGenerator.java
+index af7beae..34c204f 100644
+--- a/src/java/org/apache/ivy/plugins/signer/bouncycastle/OpenPGPSignatureGenerator.java
++++ b/src/java/org/apache/ivy/plugins/signer/bouncycastle/OpenPGPSignatureGenerator.java
+@@ -41,6 +41,11 @@ import org.bouncycastle.openpgp.PGPSecretKeyRingCollection;
+ import org.bouncycastle.openpgp.PGPSignature;
+ import org.bouncycastle.openpgp.PGPSignatureGenerator;
+ import org.bouncycastle.openpgp.PGPUtil;
++import org.bouncycastle.openpgp.operator.PBESecretKeyDecryptor;
++import org.bouncycastle.openpgp.operator.bc.BcPBESecretKeyDecryptorBuilder;
++import org.bouncycastle.openpgp.operator.bc.BcPGPDigestCalculatorProvider;
++import org.bouncycastle.openpgp.operator.bc.BcPGPContentSignerBuilder;
++import org.bouncycastle.openpgp.operator.bc.BcKeyFingerprintCalculator;
+ 
+ public class OpenPGPSignatureGenerator implements SignatureGenerator {
+ 
+@@ -101,11 +106,15 @@ public class OpenPGPSignatureGenerator implements SignatureGenerator {
+                 pgpSec = readSecretKey(keyIn);
+             }
+ 
+-            PGPPrivateKey pgpPrivKey = pgpSec.extractPrivateKey(password.toCharArray(),
+-                BouncyCastleProvider.PROVIDER_NAME);
+-            PGPSignatureGenerator sGen = new PGPSignatureGenerator(pgpSec.getPublicKey()
+-                    .getAlgorithm(), PGPUtil.SHA1, BouncyCastleProvider.PROVIDER_NAME);
+-            sGen.initSign(PGPSignature.BINARY_DOCUMENT, pgpPrivKey);
++            PBESecretKeyDecryptor decryptor =
++                    new BcPBESecretKeyDecryptorBuilder(new BcPGPDigestCalculatorProvider())
++                    .build(password.toCharArray());
++            PGPPrivateKey pgpPrivKey = pgpSec.extractPrivateKey(decryptor);
++            BcPGPContentSignerBuilder builder = new BcPGPContentSignerBuilder(
++                            pgpSec.getPublicKey().getAlgorithm(), PGPUtil.SHA1);
++
++            PGPSignatureGenerator sGen = new PGPSignatureGenerator(builder);
++            sGen.init(PGPSignature.BINARY_DOCUMENT, pgpPrivKey);
+ 
+             in = new FileInputStream(src);
+             out = new BCPGOutputStream(new ArmoredOutputStream(new FileOutputStream(dest)));
+@@ -116,22 +125,10 @@ public class OpenPGPSignatureGenerator implements SignatureGenerator {
+             }
+ 
+             sGen.generate().encode(out);
+-        } catch (SignatureException e) {
+-            IOException ioexc = new IOException();
+-            ioexc.initCause(e);
+-            throw ioexc;
+         } catch (PGPException e) {
+             IOException ioexc = new IOException();
+             ioexc.initCause(e);
+             throw ioexc;
+-        } catch (NoSuchAlgorithmException e) {
+-            IOException ioexc = new IOException();
+-            ioexc.initCause(e);
+-            throw ioexc;
+-        } catch (NoSuchProviderException e) {
+-            IOException ioexc = new IOException();
+-            ioexc.initCause(e);
+-            throw ioexc;
+         } finally {
+             if (out != null) {
+                 try {
+@@ -156,7 +153,8 @@ public class OpenPGPSignatureGenerator implements SignatureGenerator {
+ 
+     private PGPSecretKey readSecretKey(InputStream in) throws IOException, PGPException {
+         in = PGPUtil.getDecoderStream(in);
+-        PGPSecretKeyRingCollection pgpSec = new PGPSecretKeyRingCollection(in);
++        PGPSecretKeyRingCollection pgpSec = new PGPSecretKeyRingCollection(in,
++                        new BcKeyFingerprintCalculator());
+ 
+         PGPSecretKey key = null;
+         for (Iterator it = pgpSec.getKeyRings(); key == null && it.hasNext();) {
+-- 
+2.15.1

From c9436025a90b86047ba2203d58bbf238f8f9b2f9 Mon Sep 17 00:00:00 2001
From: Danny Milosavljevic <dannym@scratchpost.org>
Date: Mon, 30 Apr 2018 00:40:21 +0200
Subject: [PATCH 270/275] services: Move static-networking to (gnu services
 base).

* gnu/services/networking.scm (static-networking, static-networking?,
static-networking-interface, static-networking-ip, static-networking-netmask,
static-networking-gateway, static-networking-requirement,
static-networking-service, static-networking-service-type): Move to...
* gnu/services/base.scm: ...here.
---
 gnu/services/base.scm       | 160 +++++++++++++++++++++++++++++++++++-
 gnu/services/networking.scm | 160 +-----------------------------------
 2 files changed, 160 insertions(+), 160 deletions(-)

diff --git a/gnu/services/base.scm b/gnu/services/base.scm
index be1bfce578..694aab882e 100644
--- a/gnu/services/base.scm
+++ b/gnu/services/base.scm
@@ -26,7 +26,6 @@
   #:use-module (guix store)
   #:use-module (gnu services)
   #:use-module (gnu services shepherd)
-  #:use-module (gnu services networking)
   #:use-module (gnu system pam)
   #:use-module (gnu system shadow)                ; 'user-account', etc.
   #:use-module (gnu system uuid)
@@ -64,6 +63,18 @@
             console-font-service
             virtual-terminal-service-type
 
+            static-networking
+
+            static-networking?
+            static-networking-interface
+            static-networking-ip
+            static-networking-netmask
+            static-networking-gateway
+            static-networking-requirement
+
+            static-networking-service
+            static-networking-service-type
+
             udev-configuration
             udev-configuration?
             udev-configuration-rules
@@ -2045,6 +2056,153 @@ This service is not part of @var{%base-services}."
         (start #~(make-forkexec-constructor #$kmscon-command))
         (stop #~(make-kill-destructor)))))))
 
+(define-record-type* <static-networking>
+  static-networking make-static-networking
+  static-networking?
+  (interface static-networking-interface)
+  (ip static-networking-ip)
+  (netmask static-networking-netmask
+           (default #f))
+  (gateway static-networking-gateway              ;FIXME: doesn't belong here
+           (default #f))
+  (provision static-networking-provision
+             (default #f))
+  (requirement static-networking-requirement
+               (default '()))
+  (name-servers static-networking-name-servers    ;FIXME: doesn't belong here
+                (default '())))
+
+(define static-networking-shepherd-service
+  (match-lambda
+    (($ <static-networking> interface ip netmask gateway provision
+                            requirement name-servers)
+     (let ((loopback? (and provision (memq 'loopback provision))))
+       (shepherd-service
+
+        (documentation
+         "Bring up the networking interface using a static IP address.")
+        (requirement requirement)
+        (provision (or provision
+                       (list (symbol-append 'networking-
+                                            (string->symbol interface)))))
+
+        (start #~(lambda _
+                   ;; Return #t if successfully started.
+                   (let* ((addr     (inet-pton AF_INET #$ip))
+                          (sockaddr (make-socket-address AF_INET addr 0))
+                          (mask     (and #$netmask
+                                         (inet-pton AF_INET #$netmask)))
+                          (maskaddr (and mask
+                                         (make-socket-address AF_INET
+                                                              mask 0)))
+                          (gateway  (and #$gateway
+                                         (inet-pton AF_INET #$gateway)))
+                          (gatewayaddr (and gateway
+                                            (make-socket-address AF_INET
+                                                                 gateway 0))))
+                     (configure-network-interface #$interface sockaddr
+                                                  (logior IFF_UP
+                                                          #$(if loopback?
+                                                                #~IFF_LOOPBACK
+                                                                0))
+                                                  #:netmask maskaddr)
+                     (when gateway
+                       (let ((sock (socket AF_INET SOCK_DGRAM 0)))
+                         (add-network-route/gateway sock gatewayaddr)
+                         (close-port sock))))))
+        (stop #~(lambda _
+                  ;; Return #f is successfully stopped.
+                  (let ((sock (socket AF_INET SOCK_STREAM 0)))
+                    (when #$gateway
+                      (delete-network-route sock
+                                            (make-socket-address
+                                             AF_INET INADDR_ANY 0)))
+                    (set-network-interface-flags sock #$interface 0)
+                    (close-port sock)
+:                    #f)))
+        (respawn? #f))))))
+
+(define (static-networking-etc-files interfaces)
+  "Return a /etc/resolv.conf entry for INTERFACES or the empty list."
+  (match (delete-duplicates
+          (append-map static-networking-name-servers
+                      interfaces))
+    (()
+     '())
+    ((name-servers ...)
+     (let ((content (string-join
+                     (map (cut string-append "nameserver " <>)
+                          name-servers)
+                     "\n" 'suffix)))
+       `(("resolv.conf"
+          ,(plain-file "resolv.conf"
+                       (string-append "\
+# Generated by 'static-networking-service'.\n"
+                                      content))))))))
+
+(define (static-networking-shepherd-services interfaces)
+  "Return the list of Shepherd services to bring up INTERFACES, a list of
+<static-networking> objects."
+  (define (loopback? service)
+    (memq 'loopback (shepherd-service-provision service)))
+
+  (let ((services (map static-networking-shepherd-service interfaces)))
+    (match (remove loopback? services)
+      (()
+       ;; There's no interface other than 'loopback', so we assume that the
+       ;; 'networking' service will be provided by dhclient or similar.
+       services)
+      ((non-loopback ...)
+       ;; Assume we're providing all the interfaces, and thus, provide a
+       ;; 'networking' service.
+       (cons (shepherd-service
+              (provision '(networking))
+              (requirement (append-map shepherd-service-provision
+                                       services))
+              (start #~(const #t))
+              (stop #~(const #f))
+              (documentation "Bring up all the networking interfaces."))
+             services)))))
+
+(define static-networking-service-type
+  ;; The service type for statically-defined network interfaces.
+  (service-type (name 'static-networking)
+                (extensions
+                 (list
+                  (service-extension shepherd-root-service-type
+                                     static-networking-shepherd-services)
+                  (service-extension etc-service-type
+                                     static-networking-etc-files)))
+                (compose concatenate)
+                (extend append)
+                (description
+                 "Turn up the specified network interfaces upon startup,
+with the given IP address, gateway, netmask, and so on.  The value for
+services of this type is a list of @code{static-networking} objects, one per
+network interface.")))
+
+(define* (static-networking-service interface ip
+                                    #:key
+                                    netmask gateway provision
+                                    ;; Most interfaces require udev to be usable.
+                                    (requirement '(udev))
+                                    (name-servers '()))
+  "Return a service that starts @var{interface} with address @var{ip}.  If
+@var{netmask} is true, use it as the network mask.  If @var{gateway} is true,
+it must be a string specifying the default network gateway.
+
+This procedure can be called several times, one for each network
+interface of interest.  Behind the scenes what it does is extend
+@code{static-networking-service-type} with additional network interfaces
+to handle."
+  (simple-service 'static-network-interface
+                  static-networking-service-type
+                  (list (static-networking (interface interface) (ip ip)
+                                           (netmask netmask) (gateway gateway)
+                                           (provision provision)
+                                           (requirement requirement)
+                                           (name-servers name-servers)))))
+
 
 (define %base-services
   ;; Convenience variable holding the basic services.
diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm
index df67bd69c7..400b6919d2 100644
--- a/gnu/services/networking.scm
+++ b/gnu/services/networking.scm
@@ -24,6 +24,7 @@
 
 (define-module (gnu services networking)
   #:use-module (gnu services)
+  #:use-module (gnu services base)
   #:use-module (gnu services shepherd)
   #:use-module (gnu services dbus)
   #:use-module (gnu system shadow)
@@ -45,17 +46,6 @@
   #:use-module (srfi srfi-26)
   #:use-module (ice-9 match)
   #:export (%facebook-host-aliases
-            static-networking
-
-            static-networking?
-            static-networking-interface
-            static-networking-ip
-            static-networking-netmask
-            static-networking-gateway
-            static-networking-requirement
-
-            static-networking-service
-            static-networking-service-type
             dhcp-client-service
 
             dhcpd-service-type
@@ -146,154 +136,6 @@ fe80::1%lo0 connect.facebook.net
 fe80::1%lo0 www.connect.facebook.net
 fe80::1%lo0 apps.facebook.com\n")
 
-
-(define-record-type* <static-networking>
-  static-networking make-static-networking
-  static-networking?
-  (interface static-networking-interface)
-  (ip static-networking-ip)
-  (netmask static-networking-netmask
-           (default #f))
-  (gateway static-networking-gateway              ;FIXME: doesn't belong here
-           (default #f))
-  (provision static-networking-provision
-             (default #f))
-  (requirement static-networking-requirement
-               (default '()))
-  (name-servers static-networking-name-servers    ;FIXME: doesn't belong here
-                (default '())))
-
-(define static-networking-shepherd-service
-  (match-lambda
-    (($ <static-networking> interface ip netmask gateway provision
-                            requirement name-servers)
-     (let ((loopback? (and provision (memq 'loopback provision))))
-       (shepherd-service
-
-        (documentation
-         "Bring up the networking interface using a static IP address.")
-        (requirement requirement)
-        (provision (or provision
-                       (list (symbol-append 'networking-
-                                            (string->symbol interface)))))
-
-        (start #~(lambda _
-                   ;; Return #t if successfully started.
-                   (let* ((addr     (inet-pton AF_INET #$ip))
-                          (sockaddr (make-socket-address AF_INET addr 0))
-                          (mask     (and #$netmask
-                                         (inet-pton AF_INET #$netmask)))
-                          (maskaddr (and mask
-                                         (make-socket-address AF_INET
-                                                              mask 0)))
-                          (gateway  (and #$gateway
-                                         (inet-pton AF_INET #$gateway)))
-                          (gatewayaddr (and gateway
-                                            (make-socket-address AF_INET
-                                                                 gateway 0))))
-                     (configure-network-interface #$interface sockaddr
-                                                  (logior IFF_UP
-                                                          #$(if loopback?
-                                                                #~IFF_LOOPBACK
-                                                                0))
-                                                  #:netmask maskaddr)
-                     (when gateway
-                       (let ((sock (socket AF_INET SOCK_DGRAM 0)))
-                         (add-network-route/gateway sock gatewayaddr)
-                         (close-port sock))))))
-        (stop #~(lambda _
-                  ;; Return #f is successfully stopped.
-                  (let ((sock (socket AF_INET SOCK_STREAM 0)))
-                    (when #$gateway
-                      (delete-network-route sock
-                                            (make-socket-address
-                                             AF_INET INADDR_ANY 0)))
-                    (set-network-interface-flags sock #$interface 0)
-                    (close-port sock)
-                    #f)))
-        (respawn? #f))))))
-
-(define (static-networking-etc-files interfaces)
-  "Return a /etc/resolv.conf entry for INTERFACES or the empty list."
-  (match (delete-duplicates
-          (append-map static-networking-name-servers
-                      interfaces))
-    (()
-     '())
-    ((name-servers ...)
-     (let ((content (string-join
-                     (map (cut string-append "nameserver " <>)
-                          name-servers)
-                     "\n" 'suffix)))
-       `(("resolv.conf"
-          ,(plain-file "resolv.conf"
-                       (string-append "\
-# Generated by 'static-networking-service'.\n"
-                                      content))))))))
-
-(define (static-networking-shepherd-services interfaces)
-  "Return the list of Shepherd services to bring up INTERFACES, a list of
-<static-networking> objects."
-  (define (loopback? service)
-    (memq 'loopback (shepherd-service-provision service)))
-
-  (let ((services (map static-networking-shepherd-service interfaces)))
-    (match (remove loopback? services)
-      (()
-       ;; There's no interface other than 'loopback', so we assume that the
-       ;; 'networking' service will be provided by dhclient or similar.
-       services)
-      ((non-loopback ...)
-       ;; Assume we're providing all the interfaces, and thus, provide a
-       ;; 'networking' service.
-       (cons (shepherd-service
-              (provision '(networking))
-              (requirement (append-map shepherd-service-provision
-                                       services))
-              (start #~(const #t))
-              (stop #~(const #f))
-              (documentation "Bring up all the networking interfaces."))
-             services)))))
-
-(define static-networking-service-type
-  ;; The service type for statically-defined network interfaces.
-  (service-type (name 'static-networking)
-                (extensions
-                 (list
-                  (service-extension shepherd-root-service-type
-                                     static-networking-shepherd-services)
-                  (service-extension etc-service-type
-                                     static-networking-etc-files)))
-                (compose concatenate)
-                (extend append)
-                (description
-                 "Turn up the specified network interfaces upon startup,
-with the given IP address, gateway, netmask, and so on.  The value for
-services of this type is a list of @code{static-networking} objects, one per
-network interface.")))
-
-(define* (static-networking-service interface ip
-                                    #:key
-                                    netmask gateway provision
-                                    ;; Most interfaces require udev to be usable.
-                                    (requirement '(udev))
-                                    (name-servers '()))
-  "Return a service that starts @var{interface} with address @var{ip}.  If
-@var{netmask} is true, use it as the network mask.  If @var{gateway} is true,
-it must be a string specifying the default network gateway.
-
-This procedure can be called several times, one for each network
-interface of interest.  Behind the scenes what it does is extend
-@code{static-networking-service-type} with additional network interfaces
-to handle."
-  (simple-service 'static-network-interface
-                  static-networking-service-type
-                  (list (static-networking (interface interface) (ip ip)
-                                           (netmask netmask) (gateway gateway)
-                                           (provision provision)
-                                           (requirement requirement)
-                                           (name-servers name-servers)))))
-
 (define dhcp-client-service-type
   (shepherd-service-type
    'dhcp-client

From d94e81dbfc2613f2e3f89500e2a87421f57a032c Mon Sep 17 00:00:00 2001
From: Danny Milosavljevic <dannym@scratchpost.org>
Date: Fri, 30 Mar 2018 00:21:39 +0200
Subject: [PATCH 271/275] services: Add modem-manager-service-type.

* gnu/services/networking.scm (modem-manager-service-type): New variable.
(<modem-manager-configuration>): New variable.
(modem-manager-configuration): New procedure.
(modem-manager-configuration?): New procedure.
* doc/guix.texi (Networking Services): Document it.
* gnu/tests/networking.scm: Import (gnu services base).
---
 doc/guix.texi               | 22 +++++++++++++++++++++
 gnu/services/networking.scm | 39 +++++++++++++++++++++++++++++++++++++
 gnu/tests/networking.scm    |  1 +
 3 files changed, 62 insertions(+)

diff --git a/doc/guix.texi b/doc/guix.texi
index 75886e94b3..58c3688c03 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -10773,6 +10773,28 @@ several commands to interact with the daemon and configure networking:
 and @command{wicd-curses} user interfaces.
 @end deffn
 
+@cindex ModemManager
+
+@defvr {Scheme Variable} modem-manager-service-type
+This is the service type for the
+@uref{https://wiki.gnome.org/Projects/ModemManager, ModemManager}
+service. The value for this service type is a
+@code{modem-manager-configuration} record.
+
+This service is part of @code{%desktop-services} (@pxref{Desktop
+Services}).
+@end defvr
+
+@deftp {Data Type} modem-manager-configuration
+Data type representing the configuration of ModemManager.
+
+@table @asis
+@item @code{modem-manager} (default: @code{modem-manager})
+The ModemManager package to use.
+
+@end table
+@end deftp
+
 @cindex NetworkManager
 
 @defvr {Scheme Variable} network-manager-service-type
diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm
index 400b6919d2..67674e895e 100644
--- a/gnu/services/networking.scm
+++ b/gnu/services/networking.scm
@@ -31,6 +31,7 @@
   #:use-module (gnu system pam)
   #:use-module (gnu packages admin)
   #:use-module (gnu packages connman)
+  #:use-module (gnu packages freedesktop)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages tor)
   #:use-module (gnu packages messaging)
@@ -92,6 +93,9 @@
             connman-configuration?
             connman-service-type
 
+            modem-manager-configuration
+            modem-manager-configuration?
+            modem-manager-service-type
             wpa-supplicant-service-type
 
             openvswitch-service-type
@@ -809,6 +813,17 @@ several commands to interact with the daemon and configure networking:
 and @command{wicd-curses} user interfaces."
   (service wicd-service-type wicd))
 
+
+;;;
+;;; ModemManager
+;;;
+
+(define-record-type* <modem-manager-configuration>
+  modem-manager-configuration make-modem-manager-configuration
+  modem-manager-configuration?
+  (modem-manager modem-manager-configuration-modem-manager
+                   (default modem-manager)))
+
 
 ;;;
 ;;; NetworkManager
@@ -946,6 +961,30 @@ wireless networking."))))
                    "Run @url{https://01.org/connman,Connman},
 a network connection manager."))))
 
+
+;;;
+;;; Modem manager
+;;;
+
+(define modem-manager-service-type
+  (let ((config->package
+         (match-lambda
+          (($ <modem-manager-configuration> modem-manager)
+           (list modem-manager)))))
+    (service-type (name 'modem-manager)
+                  (extensions
+                   (list (service-extension dbus-root-service-type
+                                            config->package)
+                         (service-extension udev-service-type
+                                            config->package)
+                         (service-extension polkit-service-type
+                                            config->package)))
+                  (default-value (modem-manager-configuration))
+                  (description
+                   "Run @uref{https://wiki.gnome.org/Projects/ModemManager,
+ModemManager}, a modem management daemon that aims to simplify dialup
+networking."))))
+
 
 ;;;
 ;;; WPA supplicant
diff --git a/gnu/tests/networking.scm b/gnu/tests/networking.scm
index 171c636e5f..323679e7fc 100644
--- a/gnu/tests/networking.scm
+++ b/gnu/tests/networking.scm
@@ -22,6 +22,7 @@
   #:use-module (gnu system)
   #:use-module (gnu system vm)
   #:use-module (gnu services)
+  #:use-module (gnu services base)
   #:use-module (gnu services networking)
   #:use-module (guix gexp)
   #:use-module (guix store)

From 3026c61077ecf61000852fc8e907c5280e11a382 Mon Sep 17 00:00:00 2001
From: Mark H Weaver <mhw@netris.org>
Date: Mon, 30 Apr 2018 03:25:23 -0400
Subject: [PATCH 272/275] gnu: linux-libre@4.4: Update to 4.4.130.

* gnu/packages/linux.scm (linux-libre-4.4): Update to 4.4.130.
---
 gnu/packages/linux.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index bcbfc5dabd..5b8e1c50d8 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -417,8 +417,8 @@ It has been modified to remove all non-free binary blobs.")
                     #:configuration-file kernel-config))
 
 (define-public linux-libre-4.4
-  (make-linux-libre "4.4.129"
-                    "1m4434iabnpn77521lm59wzjprq5brx8vr1952jd5a4gqwilmnnb"
+  (make-linux-libre "4.4.130"
+                    "15cayafj7d9y5fs9flg115kzrcrjycbvax9hgfzz6yym94v9k8lk"
                     %intel-compatible-systems
                     #:configuration-file kernel-config))
 

From f34ea4afddbcda0823d6907752ee33354d8b5955 Mon Sep 17 00:00:00 2001
From: Mark H Weaver <mhw@netris.org>
Date: Mon, 30 Apr 2018 03:26:01 -0400
Subject: [PATCH 273/275] gnu: linux-libre@4.9: Update to 4.9.97.

* gnu/packages/linux.scm (linux-libre-4.9): Update to 4.9.97.
---
 gnu/packages/linux.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 5b8e1c50d8..b940ad536d 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -411,8 +411,8 @@ It has been modified to remove all non-free binary blobs.")
                     #:configuration-file kernel-config))
 
 (define-public linux-libre-4.9
-  (make-linux-libre "4.9.96"
-                    "0w4j8pfpa1qfyv1ipqvdalfydsw2d1ygqd4aj9ls7f16rxq3clw0"
+  (make-linux-libre "4.9.97"
+                    "1xc3mj1qi51n1kr5bxmdf1rlpyj78x9imhfc7gihn8qjc6zsf1sp"
                     %intel-compatible-systems
                     #:configuration-file kernel-config))
 

From 7be01574b73ebbf4bb484b7c7b6227c3c657b37e Mon Sep 17 00:00:00 2001
From: Mark H Weaver <mhw@netris.org>
Date: Mon, 30 Apr 2018 03:26:56 -0400
Subject: [PATCH 274/275] gnu: linux-libre@4.14: Update to 4.14.38.

* gnu/packages/linux.scm (%linux-libre-4.14-version): Update to 4.14.38.
(%linux-libre-4.14-hash): Update hash.
---
 gnu/packages/linux.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index b940ad536d..f38ab40fa3 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -401,8 +401,8 @@ It has been modified to remove all non-free binary blobs.")
                     %linux-compatible-systems
                     #:configuration-file kernel-config))
 
-(define %linux-libre-4.14-version "4.14.36")
-(define %linux-libre-4.14-hash "03iwsaa5bb43v2yq81n0i9ysj63fik0nnhlrvwq8zsk8ni9sl6yb")
+(define %linux-libre-4.14-version "4.14.38")
+(define %linux-libre-4.14-hash "09lmz8zbd3c1qf8z3d2lkhcqcwawajh76s85zdhgqdmd2idpwach")
 
 (define-public linux-libre-4.14
   (make-linux-libre %linux-libre-4.14-version

From 8c21c64e59d3f4d223d8aeef91f06fdde7de1ab7 Mon Sep 17 00:00:00 2001
From: Mark H Weaver <mhw@netris.org>
Date: Mon, 30 Apr 2018 03:27:52 -0400
Subject: [PATCH 275/275] gnu: linux-libre: Update to 4.16.6.

* gnu/packages/linux.scm (%linux-libre-version): Update to 4.16.6.
(%linux-libre-hash): Update hash.
---
 gnu/packages/linux.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index f38ab40fa3..196cc7785f 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -392,8 +392,8 @@ It has been modified to remove all non-free binary blobs.")
 ;; supports qemu "virt" machine and possibly a large number of ARM boards.
 ;; See : https://wiki.debian.org/DebianKernel/ARMMP.
 
-(define %linux-libre-version "4.16.4")
-(define %linux-libre-hash "0lq3yv88yd9zcz52bl4hfllb41vy1i826gcim6qjjc88assqib9i")
+(define %linux-libre-version "4.16.6")
+(define %linux-libre-hash "069bxqx27xib1gz4aayy8ar2hfp68cpdi8h51g6453k0w14pkchn")
 
 (define-public linux-libre
   (make-linux-libre %linux-libre-version