diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-09-15 11:29:02 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-09-15 11:43:21 -0400 |
| commit | 4920f6e634eeecb37b501bdc024dfe0aab849ed0 (patch) | |
| tree | c7dd5859715071cb602133b67449a29488027f70 /doc | |
| parent | 513091dbd2eeba138b558f5f9bb1ee6e68eee01d (diff) | |
| parent | 3d297a0017210f1dd135592efb10846840a8af88 (diff) | |
| download | guix-4920f6e634eeecb37b501bdc024dfe0aab849ed0.tar.gz | |
Merge branch 'staging' into core-updates
Conflicts resolved in: gnu/local.mk gnu/packages/cmake.scm gnu/packages/glib.scm gnu/packages/gnome.scm gnu/packages/gtk.scm gnu/packages/sdl.scm pango-next, vala-next and librsvg-bootstrap were removed in the process.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/guix.texi | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/doc/guix.texi b/doc/guix.texi index 32414b6316..5bec94487b 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -36604,8 +36604,9 @@ extensions. @item @code{extra-jails} (default: @code{()}) (type: list-of-fail2ban-jail-configurations) Instances of @code{<fail2ban-jail-configuration>} explicitly provided. -@item @code{extra-content} (type: maybe-string) -Extra raw content to add to the end of the @file{jail.local} file. +@item @code{extra-content} (default: @code{()}) (type: text-config) +Extra raw content to add to the end of the @file{jail.local} file, +provided as a list of file-like objects. @end table @@ -36732,8 +36733,9 @@ The file names of the log files to be monitored. @item @code{action} (default: @code{()}) (type: list-of-fail2ban-jail-actions) A list of @code{<fail2ban-jail-action-configuration>}. -@item @code{extra-content} (type: maybe-string) -Extra content for the jail configuration. +@item @code{extra-content} (default: @code{()}) (type: text-config) +Extra content for the jail configuration, provided as a list of file-like +objects. @end table |