diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/build.scm | 2 | ||||
| -rw-r--r-- | doc/contributing.texi | 8 | ||||
| -rw-r--r-- | doc/guix-cookbook.texi | 3 | ||||
| -rw-r--r-- | doc/guix.texi | 14 | ||||
| -rw-r--r-- | doc/htmlxref.cnf | 4 | ||||
| -rw-r--r-- | doc/local.mk | 5 |
6 files changed, 27 insertions, 9 deletions
diff --git a/doc/build.scm b/doc/build.scm index fa71b8cde7..d0c4c70cc3 100644 --- a/doc/build.scm +++ b/doc/build.scm @@ -70,7 +70,7 @@ (define %cookbook-languages ;; Available translations for the 'guix-cookbook' text domain. - '("de" "en" "es" "fr" "it" "ko" "pt_BR" "ru" "sk" "sv")) + '("de" "en" "es" "fr" "it" "ko" "pt_BR" "ru" "sk" "sv" "zh_CN")) (define %languages ;; Available translations for the document being built. diff --git a/doc/contributing.texi b/doc/contributing.texi index 0f04ef7870..4aa8d34fe5 100644 --- a/doc/contributing.texi +++ b/doc/contributing.texi @@ -3369,7 +3369,13 @@ it), it may be removed after a @b{one-month review period} of the patch removing it (this applies even when the removal has additional motivations such as security problems affecting the package). -If it has many dependent packages---as is the case for example with +@quotation Note +Learn about pending package removals by checking +@uref{https://codeberg.org/guix/guix/issues?labels=445131, issues and +pull requests with the @samp{deprecation} label}. +@end quotation + +If the package has many dependent packages---as is the case for example with Python version@tie{}2---the relevant team must propose a deprecation removal agenda and seek consensus with other packagers for @b{at least one month}. It may also invite feedback from the broader user diff --git a/doc/guix-cookbook.texi b/doc/guix-cookbook.texi index bd2add4285..0e2e906db3 100644 --- a/doc/guix-cookbook.texi +++ b/doc/guix-cookbook.texi @@ -65,7 +65,8 @@ its API, and related concepts. @c TRANSLATORS: You can replace the following paragraph with information on @c how to join your own translation team and how to report issues with the @c translation. -This manual is also available in French (@pxref{Top,,, guix-cookbook.fr, +This manual is also available in Simplified Chinese (@pxref{Top,,, +guix-cookbook.zh_CN, GNU Guix 烹饪书}), French (@pxref{Top,,, guix-cookbook.fr, Livre de recettes de GNU Guix}), German (@pxref{Top,,, guix-cookbook.de, GNU-Guix-Kochbuch}), Korean (@pxref{Top,,, guix-cookbook.ko, GNU Guix 쿡북}), Spanish (@pxref{Top,,, guix-cookbook.es, Libro de recetas de GNU Guix}), diff --git a/doc/guix.texi b/doc/guix.texi index f3f3fe2129..a169288eca 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -37878,9 +37878,13 @@ Owner of the @code{cuirass} process. @item @code{group} (default: @code{"cuirass"}) Owner's group of the @code{cuirass} process. -@item @code{interval} (default: @code{60}) +@item @code{interval} (default: @code{300}) Number of seconds between the poll of the repositories followed by the -Cuirass jobs. +Cuirass jobs, by default. + +Note that individual jobset specifications may override this in their +@code{period} field; the value specified here is only used for +specifications that use the default @code{period} value, which is zero. @item @code{ttl} (default: @code{2592000}) Duration to keep build results' GC roots alive, in seconds. @@ -40572,6 +40576,10 @@ permissive OpenSSH secure shell daemon listening on port 2222 @item @code{qemu} (default: @code{qemu-minimal}) The QEMU package to use. +@item @code{type} (default: @code{'hurd-qcow2}) +The image type name. Use @code{'hurd-qcow2} for a 32-bit image or +@code{'hurd64-qcow2} for a 64-bit image. + @item @code{image} (default: @var{hurd-vm-disk-image}) The image object representing the disk image of this virtual machine (@pxref{System Images}). @@ -43471,7 +43479,7 @@ is a string representing the user to deploy the configuration under and the value is a home-environment configuration. @lisp -(use-modules (gnu home)) +(use-modules (gnu services guix)) (define my-home (home-environment diff --git a/doc/htmlxref.cnf b/doc/htmlxref.cnf index 1f4c51ffda..32e07ff114 100644 --- a/doc/htmlxref.cnf +++ b/doc/htmlxref.cnf @@ -2,7 +2,7 @@ # Modified by Ludovic Courtès <ludo@gnu.org> for the GNU Guix manual. # Further modified by Tomas Volf <~@wolfsden.cz>. -htmlxrefversion=2025-07-10.09; # UTC +htmlxrefversion=2025-08-31.16; # UTC # Copyright 2010-2020, 2022 Free Software Foundation, Inc. # @@ -455,6 +455,8 @@ GUIX_COOKBOOK = ${GUIX_ROOT}/cookbook guix-cookbook.sv node ${GUIX_COOKBOOK}/sv/html_node/ guix-cookbook mono ${GUIX_COOKBOOK}/en/guix-cookbook.html guix-cookbook node ${GUIX_COOKBOOK}/en/html_node/ + guix-cookbook.zh_CN mono ${GUIX_COOKBOOK}/zh-cn/guix-cookbook.zh_CN.html + guix-cookbook.zh_CN node ${GUIX_COOKBOOK}/zh-cn/html_node/ gv mono ${GS}/gv/manual/gv.html gv node ${GS}/gv/manual/html_node/ diff --git a/doc/local.mk b/doc/local.mk index 0082989b9f..a38771d49b 100644 --- a/doc/local.mk +++ b/doc/local.mk @@ -26,7 +26,7 @@ # If adding a language, update the following variables, and info_TEXINFOS. MANUAL_LANGUAGES = de es fr it pt_BR ru zh_CN -COOKBOOK_LANGUAGES = de es fr it ko pt_BR ru sk sv +COOKBOOK_LANGUAGES = de es fr it ko pt_BR ru sk sv zh_CN # Arg1: A list of languages codes. # Arg2: The file name stem. @@ -51,7 +51,8 @@ info_TEXINFOS = %D%/guix.texi \ %D%/guix-cookbook.pt_BR.texi \ %D%/guix-cookbook.ru.texi \ %D%/guix-cookbook.sk.texi \ - %D%/guix-cookbook.sv.texi + %D%/guix-cookbook.sv.texi \ + %D%/guix-cookbook.zh_CN.texi %C%_guix_TEXINFOS = \ $(OS_CONFIG_EXAMPLES_TEXI) \ |