diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2020-03-09 21:45:32 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2020-03-09 21:45:32 +0100 |
| commit | b3b5714fa72bf661003f27fbccba5697f5810115 (patch) | |
| tree | c4eedb0b21200ba438cd1d0d67cd79e6b63926f7 /doc | |
| parent | b6f946f039afad6cbc7027d52685072f7fbb8d35 (diff) | |
| parent | 51f30d4fdf197b1dad5ddb1405611fbaee55d1f2 (diff) | |
| download | patches-b3b5714fa72bf661003f27fbccba5697f5810115.tar patches-b3b5714fa72bf661003f27fbccba5697f5810115.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/contributing.texi | 2 | ||||
| -rw-r--r-- | doc/guix.texi | 14 |
2 files changed, 15 insertions, 1 deletions
diff --git a/doc/contributing.texi b/doc/contributing.texi index 9d45becf86..87d001c858 100644 --- a/doc/contributing.texi +++ b/doc/contributing.texi @@ -12,7 +12,7 @@ particularly welcome help on packaging (@pxref{Packaging Guidelines}). 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 +@url{https://contributor-covenant.org/}. You can find a local version in the @file{CODE-OF-CONDUCT} file in the source tree. Contributors are not required to use their legal name in patches and diff --git a/doc/guix.texi b/doc/guix.texi index fab9159530..1af80849cb 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -74,6 +74,7 @@ Copyright @copyright{} 2019, 2020 Simon Tournier@* Copyright @copyright{} 2020 Wiktor Żelazny@* Copyright @copyright{} 2020 Damien Cassou@* Copyright @copyright{} 2020 Jakub Kądziołka@* +Copyright @copyright{} 2020 Jack Hill@* Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or @@ -21008,6 +21009,10 @@ and several @code{domains}. Mandatory email used for registration, recovery contact, and important account notifications. +@item @code{server} (default: @code{#f}) +Optional URL of ACME server. Setting this overrides certbot's default, +which is the Let's Encrypt server. + @item @code{rsa-key-size} (default: @code{2048}) Size of the RSA key. @@ -22445,6 +22450,9 @@ Only evaluate specifications and build derivations once. When substituting a pre-built binary fails, fall back to building packages locally. +@item @code{extra-options} (default: @code{'()}) +Extra options to pass when running the Cuirass processes. + @item @code{cuirass} (default: @code{cuirass}) The Cuirass package to use. @end table @@ -25245,6 +25253,12 @@ If set, this is the @code{getmail-retriever-configuration} object with which to configure getmail to fetch mail from the guix-commits mailing list. +@item @code{extra-options} (default: @var{'()}) +Extra command line options for @code{guix-data-service}. + +@item @code{extra-process-jobs-options} (default: @var{'()}) +Extra command line options for @code{guix-data-service-process-jobs}. + @end table @end deftp |