From e254287b0c22fc89566bd08207dc72f4f8c9972d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 23 Jun 2021 02:35:22 +0200 Subject: services: cups: Fix ‘files-config’ typo/left-over. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/services/cups.scm (): Substitute for in documentation. * doc/guix.texi (Printing Services): Likewise. --- gnu/services/cups.scm | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'gnu/services/cups.scm') diff --git a/gnu/services/cups.scm b/gnu/services/cups.scm index 20e3917b93..5fe0a57e4d 100644 --- a/gnu/services/cups.scm +++ b/gnu/services/cups.scm @@ -292,11 +292,12 @@ methods. Otherwise apply to only the listed methods.") "Name of the policy.") (job-private-access (string "@OWNER @SYSTEM") - "Specifies an access list for a job's private values. @code{@@ACL} maps to -the printer's requesting-user-name-allowed or requesting-user-name-denied -values. @code{@@OWNER} maps to the job's owner. @code{@@SYSTEM} maps to the -groups listed for the @code{system-group} field of the @code{files-config} -configuration, which is reified into the @code{cups-files.conf(5)} file. + "Specifies an access list for a job's private values. +@code{@@ACL} maps to the printer's requesting-user-name-allowed or +requesting-user-name-denied values. @code{@@OWNER} maps to the job's owner. +@code{@@SYSTEM} maps to the groups listed for the @code{system-group} field of +the @code{files-configuration}, which is reified into the +@code{cups-files.conf(5)} file. Other possible elements of the access list include specific user names, and @code{@@@var{group}} to indicate members of a specific group. The access list may also be simply @code{all} or @code{default}.") @@ -312,11 +313,11 @@ may also be simply @code{all} or @code{default}.") @code{@@ACL} maps to the printer's requesting-user-name-allowed or requesting-user-name-denied values. @code{@@OWNER} maps to the job's owner. @code{@@SYSTEM} maps to the groups listed for the @code{system-group} field of -the @code{files-config} configuration, which is reified into the -@code{cups-files.conf(5)} file. Other possible elements of the access list -include specific user names, and @code{@@@var{group}} to indicate members of a -specific group. The access list may also be simply @code{all} or -@code{default}.") +the @code{files-configuration}, which is reified into the +@code{cups-files.conf(5)} file. +Other possible elements of the access list include specific user names, and +@code{@@@var{group}} to indicate members of a specific group. The access list +may also be simply @code{all} or @code{default}.") (subscription-private-values (string (string-join '("notify-events" "notify-pull-method" "notify-recipient-uri" "notify-subscriber-user-name" -- cgit v1.2.3 From 828ceee7db0ab74786049600108d6b15017851c5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 23 Jun 2021 03:26:12 +0200 Subject: services: cups: Remove obsolete KeepAliveTimeout directive. https://github.com/apple/cups/commit/461bd4e50142b2928a0d164bd1aae274e4d34da5 * gnu/services/cups.scm (): Remove keep-alive-timeout field. * doc/guix.texi (Printing Services): Likewise. --- doc/guix.texi | 6 ------ gnu/services/cups.scm | 3 --- 2 files changed, 9 deletions(-) (limited to 'gnu/services/cups.scm') diff --git a/doc/guix.texi b/doc/guix.texi index 23c122a543..15e8999447 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -18699,12 +18699,6 @@ Specifies whether to support HTTP keep-alive connections. Defaults to @samp{#t}. @end deftypevr -@deftypevr {@code{cups-configuration} parameter} non-negative-integer keep-alive-timeout -Specifies how long an idle client connection remains open, in seconds. - -Defaults to @samp{30}. -@end deftypevr - @deftypevr {@code{cups-configuration} parameter} non-negative-integer limit-request-body Specifies the maximum size of print files, IPP requests, and HTML form data. A limit of 0 disables the limit check. diff --git a/gnu/services/cups.scm b/gnu/services/cups.scm index 5fe0a57e4d..8bcb450ddf 100644 --- a/gnu/services/cups.scm +++ b/gnu/services/cups.scm @@ -615,9 +615,6 @@ policy is @code{retry-job} or @code{retry-current-job}.") (keep-alive? (boolean #t) "Specifies whether to support HTTP keep-alive connections.") - (keep-alive-timeout - (non-negative-integer 30) - "Specifies how long an idle client connection remains open, in seconds.") (limit-request-body (non-negative-integer 0) "Specifies the maximum size of print files, IPP requests, and HTML form -- cgit v1.2.3