diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/build.scm | 4 | ||||
| -rw-r--r-- | doc/contributing.texi | 19 | ||||
| -rw-r--r-- | doc/guix.texi | 23 |
3 files changed, 29 insertions, 17 deletions
diff --git a/doc/build.scm b/doc/build.scm index 5d9fff9517..664766a1f5 100644 --- a/doc/build.scm +++ b/doc/build.scm @@ -1061,7 +1061,7 @@ must be the Guix top-level source directory, from which PO files are taken." (bindtextdomain "guix-manual" #+(guix-manual-text-domain source)) (bindtextdomain "iso_639-3" ;language names - #+(file-append iso-codes + #+(file-append iso-codes/pinned "/share/locale")) (setenv "LANGUAGE" ,language) (write (gettext ,str ,domain)))) @@ -1080,7 +1080,7 @@ must be the Guix top-level source directory, from which PO files are taken." (define %iso639-languages (vector->list (assoc-ref (call-with-input-file - #+(file-append iso-codes + #+(file-append iso-codes/pinned "/share/iso-codes/json/iso_639-3.json") json->scm) "639-3"))) diff --git a/doc/contributing.texi b/doc/contributing.texi index 73f7addbef..1b9a3b7beb 100644 --- a/doc/contributing.texi +++ b/doc/contributing.texi @@ -2677,14 +2677,17 @@ project for at least 6 months. This ensures enough interactions with the contributor, which is essential for mentoring and assessing whether they are ready to become a committer. Commit access should not be thought of as a ``badge of honor'' but rather as a responsibility a -contributor is willing to take to help the project. It is expected from -all contributors, and even more so from committers, to help build -consensus and make decisions based on consensus. By using consensus, we -are committed to finding solutions that everyone can live with. It -implies that no decision is made against significant concerns and these -concerns are actively resolved with proposals that work for everyone. A -contributor (which may or may not have commit access) wishing to block a -proposal bears a special responsibility for finding alternatives, +contributor is willing to take to help the project. + +It is expected from all contributors, and even more so from committers, +to help build consensus and make decisions based on consensus. By using +consensus, we are committed to finding solutions that everyone can live +with. It implies that no decision is made against significant concerns +and these concerns are actively resolved with proposals that work for +everyone. + +A contributor (who may or may not have commit access) wishing to block +a proposal bears a special responsibility for finding alternatives, proposing ideas/code or explain the rationale for the status quo to resolve the deadlock. To learn what consensus decision making means and understand its finer details, you are encouraged to read diff --git a/doc/guix.texi b/doc/guix.texi index 981ffb8c58..52e36e4354 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -23,7 +23,7 @@ @copying Copyright @copyright{} 2012-2024 Ludovic Courtès@* -Copyright @copyright{} 2013, 2014, 2016 Andreas Enge@* +Copyright @copyright{} 2013, 2014, 2016, 2024 Andreas Enge@* Copyright @copyright{} 2013 Nikita Karetnikov@* Copyright @copyright{} 2014, 2015, 2016 Alex Kost@* Copyright @copyright{} 2015, 2016 Mathieu Lirzin@* @@ -23088,6 +23088,10 @@ system to use for the upgrade. If no value is provided the #~(@@ (guix system install) installation-os))) @end lisp +@item @code{reboot?} (default: @code{#f}) +This field specifies whether the system should reboot after completing +an unattended upgrade. + @item @code{services-to-restart} (default: @code{'(mcron)}) This field specifies the Shepherd services to restart when the upgrade completes. @@ -39733,10 +39737,10 @@ coordinator. Possible record types are described below. The systems for which this agent should fetch builds. The agent process will use the current system it's running on as the default. -@item @code{max-parallel-builds} (default: @code{1}) +@item @code{max-parallel-builds} (default: @code{#f}) The number of builds to perform in parallel. -@item @code{max-parallel-uploads} (default: @code{1}) +@item @code{max-parallel-uploads} (default: @code{#f}) The number of uploads to perform in parallel. @item @code{max-allocated-builds} (default: @code{#f}) @@ -39759,6 +39763,8 @@ derivations aren't already available. URLs from which to attempt to fetch substitutes for build inputs, if the input store items aren't already available. +@item @code{extra-options} (default: @var{'()}) +Extra command line options for @code{guix-build-coordinator-agent}. @end table @end deftp @@ -47901,10 +47907,13 @@ the previous partition end. It defaults to @code{0} which means that there is no offset applied. @item @code{file-system} (default: @code{"ext4"}) -The partition file system as a string, defaulting to @code{"ext4"}. The -supported values are @code{"vfat"}, @code{"fat16"}, @code{"fat32"} and -@code{"ext4"}. @code{"vfat"}, @code{"fat16"} and @code{"fat32"} -partitions without the @code{'esp} flag are by default LBA compatible. +The partition file system as a string, defaulting to @code{"ext4"}. + +The supported values are @code{"vfat"}, @code{"fat16"}, @code{"fat32"}, +and @code{"ext4"}. + +@code{"vfat"}, @code{"fat16"}, and @code{"fat32"} partitions without the +@code{'esp} flag are by default LBA compatible. @item @code{file-system-options} (default: @code{'()}) The partition file system creation options that should be passed to the |