diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/contributing.texi | 15 | ||||
| -rw-r--r-- | doc/guix.texi | 29 |
2 files changed, 35 insertions, 9 deletions
diff --git a/doc/contributing.texi b/doc/contributing.texi index b1d236c011..17a54f94cc 100644 --- a/doc/contributing.texi +++ b/doc/contributing.texi @@ -1627,14 +1627,23 @@ git config commit.gpgsign true git config user.signingkey CABBA6EA1DC0FF33 @end example -You can prevent yourself from accidentally pushing unsigned commits to -Savannah by using the pre-push Git hook located at -@file{etc/git/pre-push}: +To check that commits are signed with correct key, use: + +@example +make authenticate +@end example + +You can prevent yourself from accidentally pushing unsigned or signed +with the wrong key commits to Savannah by using the pre-push Git hook +located at @file{etc/git/pre-push}: @example cp etc/git/pre-push .git/hooks/pre-push @end example +It additionally calls @code{make check-channel-news} to be sure +@file{news.scm} file is correct. + @subsection Commit Policy If you get commit access, please make sure to follow diff --git a/doc/guix.texi b/doc/guix.texi index 246403bcba..20abfee772 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -98,7 +98,7 @@ Copyright @copyright{} 2021 pukkamustard@* Copyright @copyright{} 2021 Alice Brenon@* Copyright @copyright{} 2021, 2022 Josselin Poiret@* Copyright @copyright{} 2021 muradm@* -Copyright @copyright{} 2021 Andrew Tropin@* +Copyright @copyright{} 2021, 2022 Andrew Tropin@* Copyright @copyright{} 2021 Sarah Morgensen@* Copyright @copyright{} 2022 Remco van 't Veer@* Copyright @copyright{} 2022 Aleksandr Vityazev@* @@ -7322,6 +7322,14 @@ unavailable to the build process, possibly leading to a build failure. @xref{package Reference}, for a full description of possible fields. +@quotation Going further +@cindex Scheme programming language, getting started +Intimidated by the Scheme language or curious about it? The Cookbook +has a short section to get started that recaps some of the things shown +above and explains the fundamentals. @xref{A Scheme Crash Course,,, +guix-cookbook, GNU Guix Cookbook}, for more information. +@end quotation + 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 @@ -22748,15 +22756,16 @@ Enable polling the kernel for battery level changes. @item @code{ignore-lid?} (default: @code{#f}) Ignore the lid state, this can be useful if it's incorrect on a device. -@item @code{use-percentage-for-policy?} (default: @code{#f}) -Whether battery percentage based policy should be used. The default is to use -the time left, change to @code{#t} to use the percentage. +@item @code{use-percentage-for-policy?} (default: @code{#t}) +Whether a to use a policy based on battery percentage rather than on +estimated time left. A policy based on battery percentage is usually +more reliable. -@item @code{percentage-low} (default: @code{10}) +@item @code{percentage-low} (default: @code{20}) When @code{use-percentage-for-policy?} is @code{#t}, this sets the percentage at which the battery is considered low. -@item @code{percentage-critical} (default: @code{3}) +@item @code{percentage-critical} (default: @code{5}) When @code{use-percentage-for-policy?} is @code{#t}, this sets the percentage at which the battery is considered critical. @@ -28832,6 +28841,14 @@ types, or alternatively, a config file can be provided. @item @code{nginx} (default: @code{nginx}) The nginx package to use. +@item @code{shepherd-requirement} (default: @code{'()}) +This is a list of symbols naming Shepherd services the nginx service +will depend on. + +This is useful if you would like @command{nginx} to be started after a +back-end web server or a logging service such as Anonip has been +started. + @item @code{log-directory} (default: @code{"/var/log/nginx"}) The directory to which NGinx will write log files. |